aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-02-11 10:42:14 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-02-12 13:10:09 +0000
commit5888d93ee1d9a2c4bda4dd77b1f4c05de427ef09 (patch)
tree275acf1aa67314f8a667c92ea2e5f074d36ee830
parent04e83b9b89c8b9e34a345f10e5ffa5eb590bb08a (diff)
downloadalpine_aports-5888d93ee1d9a2c4bda4dd77b1f4c05de427ef09.tar.bz2
alpine_aports-5888d93ee1d9a2c4bda4dd77b1f4c05de427ef09.tar.xz
alpine_aports-5888d93ee1d9a2c4bda4dd77b1f4c05de427ef09.zip
main/linux-grsec: upgrade to grsecurity-2.1.14-2.6.32.8-201002101507.patch
(cherry picked from commit 6bc59ddc42ba89878161036b9a16b1f1a7335a31)
Diffstat
-rw-r--r--main/linux-grsec/APKBUILD8
-rw-r--r--main/linux-grsec/grsecurity-2.1.14-2.6.32.8-201002101507.patch (renamed from main/linux-grsec/grsecurity-2.1.14-2.6.32.7-201001291848.patch)6768
2 files changed, 3421 insertions, 3355 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 8489324ab4..9c1ca5c955 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,7 +2,7 @@
2 2
3_flavor=grsec 3_flavor=grsec
4pkgname=linux-${_flavor} 4pkgname=linux-${_flavor}
5pkgver=2.6.32.7 5pkgver=2.6.32.8
6_kernver=2.6.32 6_kernver=2.6.32
7pkgrel=0 7pkgrel=0
8pkgdesc="Linux kernel with grsecurity" 8pkgdesc="Linux kernel with grsecurity"
@@ -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.7-201001291848.patch 17 grsecurity-2.1.14-2.6.32.8-201002101507.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
122a68305d3e77dddc9555ba58f678a1ce2 patch-2.6.32.7.bz2 122eabf01da4c72f7ea5b4e4bf8e8535e5f patch-2.6.32.8.bz2
1235c5a47b53816df4024c1a7ee7a3268cb grsecurity-2.1.14-2.6.32.7-201001291848.patch 123a38078822063e507a3edff69b25a5963 grsecurity-2.1.14-2.6.32.8-201002101507.patch
124281d56ac34b2903456df769fd42d81f2 kernelconfig.x86" 124281d56ac34b2903456df769fd42d81f2 kernelconfig.x86"
diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.32.7-201001291848.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.32.8-201002101507.patch
index 2cc847c47a..1a030cee3b 100644
--- a/main/linux-grsec/grsecurity-2.1.14-2.6.32.7-201001291848.patch
+++ b/main/linux-grsec/grsecurity-2.1.14-2.6.32.8-201002101507.patch
@@ -1,6 +1,6 @@
1diff -urNp linux-2.6.32.7/arch/alpha/include/asm/elf.h linux-2.6.32.7/arch/alpha/include/asm/elf.h 1diff -urNp linux-2.6.32.8/arch/alpha/include/asm/elf.h linux-2.6.32.8/arch/alpha/include/asm/elf.h
2--- linux-2.6.32.7/arch/alpha/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 2--- linux-2.6.32.8/arch/alpha/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
3+++ linux-2.6.32.7/arch/alpha/include/asm/elf.h 2010-01-25 17:39:40.226974977 -0500 3+++ linux-2.6.32.8/arch/alpha/include/asm/elf.h 2010-02-10 15:06:23.918010875 -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.7/arch/alpha/include/asm/elf.h linux-2.6.32.7/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.7/arch/alpha/include/asm/pgtable.h linux-2.6.32.7/arch/alpha/include/asm/pgtable.h 18diff -urNp linux-2.6.32.8/arch/alpha/include/asm/pgtable.h linux-2.6.32.8/arch/alpha/include/asm/pgtable.h
19--- linux-2.6.32.7/arch/alpha/include/asm/pgtable.h 2010-01-25 13:50:10.000000000 -0500 19--- linux-2.6.32.8/arch/alpha/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500
20+++ linux-2.6.32.7/arch/alpha/include/asm/pgtable.h 2010-01-25 17:39:40.227409538 -0500 20+++ linux-2.6.32.8/arch/alpha/include/asm/pgtable.h 2010-02-10 15:06:23.918010875 -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.7/arch/alpha/include/asm/pgtable.h linux-2.6.32.7/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.7/arch/alpha/kernel/module.c linux-2.6.32.7/arch/alpha/kernel/module.c 39diff -urNp linux-2.6.32.8/arch/alpha/kernel/module.c linux-2.6.32.8/arch/alpha/kernel/module.c
40--- linux-2.6.32.7/arch/alpha/kernel/module.c 2010-01-25 13:50:10.000000000 -0500 40--- linux-2.6.32.8/arch/alpha/kernel/module.c 2010-02-09 07:57:19.000000000 -0500
41+++ linux-2.6.32.7/arch/alpha/kernel/module.c 2010-01-25 17:39:40.227409538 -0500 41+++ linux-2.6.32.8/arch/alpha/kernel/module.c 2010-02-10 15:06:23.918010875 -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.7/arch/alpha/kernel/module.c linux-2.6.32.7/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.7/arch/alpha/kernel/osf_sys.c linux-2.6.32.7/arch/alpha/kernel/osf_sys.c 51diff -urNp linux-2.6.32.8/arch/alpha/kernel/osf_sys.c linux-2.6.32.8/arch/alpha/kernel/osf_sys.c
52--- linux-2.6.32.7/arch/alpha/kernel/osf_sys.c 2010-01-25 13:50:10.000000000 -0500 52--- linux-2.6.32.8/arch/alpha/kernel/osf_sys.c 2010-02-09 07:57:19.000000000 -0500
53+++ linux-2.6.32.7/arch/alpha/kernel/osf_sys.c 2010-01-25 17:39:40.227409538 -0500 53+++ linux-2.6.32.8/arch/alpha/kernel/osf_sys.c 2010-02-10 15:06:23.918010875 -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.7/arch/alpha/kernel/osf_sys.c linux-2.6.32.7/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.7/arch/alpha/mm/fault.c linux-2.6.32.7/arch/alpha/mm/fault.c 76diff -urNp linux-2.6.32.8/arch/alpha/mm/fault.c linux-2.6.32.8/arch/alpha/mm/fault.c
77--- linux-2.6.32.7/arch/alpha/mm/fault.c 2010-01-25 13:50:10.000000000 -0500 77--- linux-2.6.32.8/arch/alpha/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
78+++ linux-2.6.32.7/arch/alpha/mm/fault.c 2010-01-25 17:39:40.228183006 -0500 78+++ linux-2.6.32.8/arch/alpha/mm/fault.c 2010-02-10 15:06:23.918010875 -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.7/arch/alpha/mm/fault.c linux-2.6.32.7/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.7/arch/arm/include/asm/elf.h linux-2.6.32.7/arch/arm/include/asm/elf.h 235diff -urNp linux-2.6.32.8/arch/arm/include/asm/elf.h linux-2.6.32.8/arch/arm/include/asm/elf.h
236--- linux-2.6.32.7/arch/arm/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 236--- linux-2.6.32.8/arch/arm/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
237+++ linux-2.6.32.7/arch/arm/include/asm/elf.h 2010-01-25 17:39:40.228183006 -0500 237+++ linux-2.6.32.8/arch/arm/include/asm/elf.h 2010-02-10 15:06:23.918010875 -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.7/arch/arm/include/asm/elf.h linux-2.6.32.7/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.7/arch/arm/include/asm/kmap_types.h linux-2.6.32.7/arch/arm/include/asm/kmap_types.h 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
255--- linux-2.6.32.7/arch/arm/include/asm/kmap_types.h 2010-01-25 13:50:10.000000000 -0500 255--- linux-2.6.32.8/arch/arm/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500
256+++ linux-2.6.32.7/arch/arm/include/asm/kmap_types.h 2010-01-25 17:39:40.228183006 -0500 256+++ linux-2.6.32.8/arch/arm/include/asm/kmap_types.h 2010-02-10 15:06:23.918010875 -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.7/arch/arm/include/asm/kmap_types.h linux-2.6.32.7/arch/
262 KM_TYPE_NR 262 KM_TYPE_NR
263 }; 263 };
264 264
265diff -urNp linux-2.6.32.7/arch/arm/include/asm/uaccess.h linux-2.6.32.7/arch/arm/include/asm/uaccess.h 265diff -urNp linux-2.6.32.8/arch/arm/include/asm/uaccess.h linux-2.6.32.8/arch/arm/include/asm/uaccess.h
266--- linux-2.6.32.7/arch/arm/include/asm/uaccess.h 2010-01-25 13:50:10.000000000 -0500 266--- linux-2.6.32.8/arch/arm/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500
267+++ linux-2.6.32.7/arch/arm/include/asm/uaccess.h 2010-01-25 17:39:40.228183006 -0500 267+++ linux-2.6.32.8/arch/arm/include/asm/uaccess.h 2010-02-10 15:06:23.918010875 -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.7/arch/arm/include/asm/uaccess.h linux-2.6.32.7/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.7/arch/arm/kernel/kgdb.c linux-2.6.32.7/arch/arm/kernel/kgdb.c 288diff -urNp linux-2.6.32.8/arch/arm/kernel/kgdb.c linux-2.6.32.8/arch/arm/kernel/kgdb.c
289--- linux-2.6.32.7/arch/arm/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500 289--- linux-2.6.32.8/arch/arm/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500
290+++ linux-2.6.32.7/arch/arm/kernel/kgdb.c 2010-01-25 17:39:40.228183006 -0500 290+++ linux-2.6.32.8/arch/arm/kernel/kgdb.c 2010-02-10 15:06:23.918010875 -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.7/arch/arm/kernel/kgdb.c linux-2.6.32.7/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.7/arch/arm/mach-at91/pm.c linux-2.6.32.7/arch/arm/mach-at91/pm.c 300diff -urNp linux-2.6.32.8/arch/arm/mach-at91/pm.c linux-2.6.32.8/arch/arm/mach-at91/pm.c
301--- linux-2.6.32.7/arch/arm/mach-at91/pm.c 2010-01-25 13:50:10.000000000 -0500 301--- linux-2.6.32.8/arch/arm/mach-at91/pm.c 2010-02-09 07:57:19.000000000 -0500
302+++ linux-2.6.32.7/arch/arm/mach-at91/pm.c 2010-01-25 17:39:40.228183006 -0500 302+++ linux-2.6.32.8/arch/arm/mach-at91/pm.c 2010-02-10 15:06:23.918010875 -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.7/arch/arm/mach-at91/pm.c linux-2.6.32.7/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.7/arch/arm/mach-omap1/pm.c linux-2.6.32.7/arch/arm/mach-omap1/pm.c 312diff -urNp linux-2.6.32.8/arch/arm/mach-omap1/pm.c linux-2.6.32.8/arch/arm/mach-omap1/pm.c
313--- linux-2.6.32.7/arch/arm/mach-omap1/pm.c 2010-01-25 13:50:10.000000000 -0500 313--- linux-2.6.32.8/arch/arm/mach-omap1/pm.c 2010-02-09 07:57:19.000000000 -0500
314+++ linux-2.6.32.7/arch/arm/mach-omap1/pm.c 2010-01-25 17:39:40.228183006 -0500 314+++ linux-2.6.32.8/arch/arm/mach-omap1/pm.c 2010-02-10 15:06:23.918010875 -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.7/arch/arm/mach-omap1/pm.c linux-2.6.32.7/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.7/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c 324diff -urNp linux-2.6.32.8/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.8/arch/arm/mach-omap2/pm24xx.c
325--- linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c 2010-01-25 13:50:10.000000000 -0500 325--- linux-2.6.32.8/arch/arm/mach-omap2/pm24xx.c 2010-02-09 07:57:19.000000000 -0500
326+++ linux-2.6.32.7/arch/arm/mach-omap2/pm24xx.c 2010-01-25 17:39:40.228183006 -0500 326+++ linux-2.6.32.8/arch/arm/mach-omap2/pm24xx.c 2010-02-10 15:06:23.918010875 -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.7/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.7/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.7/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c 336diff -urNp linux-2.6.32.8/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.8/arch/arm/mach-omap2/pm34xx.c
337--- linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c 2010-01-25 13:50:10.000000000 -0500 337--- linux-2.6.32.8/arch/arm/mach-omap2/pm34xx.c 2010-02-09 07:57:19.000000000 -0500
338+++ linux-2.6.32.7/arch/arm/mach-omap2/pm34xx.c 2010-01-25 17:39:40.229409370 -0500 338+++ linux-2.6.32.8/arch/arm/mach-omap2/pm34xx.c 2010-02-10 15:06:23.922996854 -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.7/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.7/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.7/arch/arm/mach-pnx4008/pm.c linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c 348diff -urNp linux-2.6.32.8/arch/arm/mach-pnx4008/pm.c linux-2.6.32.8/arch/arm/mach-pnx4008/pm.c
349--- linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c 2010-01-25 13:50:10.000000000 -0500 349--- linux-2.6.32.8/arch/arm/mach-pnx4008/pm.c 2010-02-09 07:57:19.000000000 -0500
350+++ linux-2.6.32.7/arch/arm/mach-pnx4008/pm.c 2010-01-25 17:39:40.229409370 -0500 350+++ linux-2.6.32.8/arch/arm/mach-pnx4008/pm.c 2010-02-10 15:06:23.922996854 -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.7/arch/arm/mach-pnx4008/pm.c linux-2.6.32.7/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.7/arch/arm/mach-pxa/pm.c linux-2.6.32.7/arch/arm/mach-pxa/pm.c 360diff -urNp linux-2.6.32.8/arch/arm/mach-pxa/pm.c linux-2.6.32.8/arch/arm/mach-pxa/pm.c
361--- linux-2.6.32.7/arch/arm/mach-pxa/pm.c 2010-01-25 13:50:10.000000000 -0500 361--- linux-2.6.32.8/arch/arm/mach-pxa/pm.c 2010-02-09 07:57:19.000000000 -0500
362+++ linux-2.6.32.7/arch/arm/mach-pxa/pm.c 2010-01-25 17:39:40.229409370 -0500 362+++ linux-2.6.32.8/arch/arm/mach-pxa/pm.c 2010-02-10 15:06:23.922996854 -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.7/arch/arm/mach-pxa/pm.c linux-2.6.32.7/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.7/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c 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
373--- linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c 2010-01-25 13:50:10.000000000 -0500 373--- linux-2.6.32.8/arch/arm/mach-pxa/sharpsl_pm.c 2010-02-09 07:57:19.000000000 -0500
374+++ linux-2.6.32.7/arch/arm/mach-pxa/sharpsl_pm.c 2010-01-25 17:39:40.230112049 -0500 374+++ linux-2.6.32.8/arch/arm/mach-pxa/sharpsl_pm.c 2010-02-10 15:06:23.922996854 -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.7/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.7/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.7/arch/arm/mach-sa1100/pm.c linux-2.6.32.7/arch/arm/mach-sa1100/pm.c 384diff -urNp linux-2.6.32.8/arch/arm/mach-sa1100/pm.c linux-2.6.32.8/arch/arm/mach-sa1100/pm.c
385--- linux-2.6.32.7/arch/arm/mach-sa1100/pm.c 2010-01-25 13:50:10.000000000 -0500 385--- linux-2.6.32.8/arch/arm/mach-sa1100/pm.c 2010-02-09 07:57:19.000000000 -0500
386+++ linux-2.6.32.7/arch/arm/mach-sa1100/pm.c 2010-01-25 17:39:40.230112049 -0500 386+++ linux-2.6.32.8/arch/arm/mach-sa1100/pm.c 2010-02-10 15:06:23.922996854 -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,60 @@ diff -urNp linux-2.6.32.7/arch/arm/mach-sa1100/pm.c linux-2.6.32.7/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.7/arch/arm/mm/mmap.c linux-2.6.32.7/arch/arm/mm/mmap.c 396diff -urNp linux-2.6.32.8/arch/arm/mm/fault.c linux-2.6.32.8/arch/arm/mm/fault.c
397--- linux-2.6.32.7/arch/arm/mm/mmap.c 2010-01-25 13:50:10.000000000 -0500 397--- linux-2.6.32.8/arch/arm/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
398+++ linux-2.6.32.7/arch/arm/mm/mmap.c 2010-01-25 17:39:40.230112049 -0500 398+++ linux-2.6.32.8/arch/arm/mm/fault.c 2010-02-10 15:06:29.738308213 -0500
399@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
400 }
401 #endif
402
403+#ifdef CONFIG_PAX_PAGEEXEC
404+ if (fsr & FSR_LNX_PF) {
405+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
406+ do_group_exit(SIGKILL);
407+ }
408+#endif
409+
410 tsk->thread.address = addr;
411 tsk->thread.error_code = fsr;
412 tsk->thread.trap_no = 14;
413@@ -357,6 +364,33 @@ do_page_fault(unsigned long addr, unsign
414 }
415 #endif /* CONFIG_MMU */
416
417+#ifdef CONFIG_PAX_PAGEEXEC
418+void pax_report_insns(void *pc, void *sp)
419+{
420+ long i;
421+
422+ printk(KERN_ERR "PAX: bytes at PC: ");
423+ for (i = 0; i < 20; i++) {
424+ unsigned char c;
425+ if (get_user(c, (__force unsigned char __user *)pc+i))
426+ printk(KERN_CONT "?? ");
427+ else
428+ printk(KERN_CONT "%02x ", c);
429+ }
430+ printk("\n");
431+
432+ printk(KERN_ERR "PAX: bytes at SP-4: ");
433+ for (i = -1; i < 20; i++) {
434+ unsigned long c;
435+ if (get_user(c, (__force unsigned long __user *)sp+i))
436+ printk(KERN_CONT "???????? ");
437+ else
438+ printk(KERN_CONT "%08lx ", c);
439+ }
440+ printk("\n");
441+}
442+#endif
443+
444 /*
445 * First Level Translation Fault Handler
446 *
447diff -urNp linux-2.6.32.8/arch/arm/mm/mmap.c linux-2.6.32.8/arch/arm/mm/mmap.c
448--- linux-2.6.32.8/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-10 15:06:23.922996854 -0500
399@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp 450@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
400 if (len > TASK_SIZE) 451 if (len > TASK_SIZE)
401 return -ENOMEM; 452 return -ENOMEM;
@@ -432,9 +483,9 @@ diff -urNp linux-2.6.32.7/arch/arm/mm/mmap.c linux-2.6.32.7/arch/arm/mm/mmap.c
432 mm->cached_hole_size = 0; 483 mm->cached_hole_size = 0;
433 goto full_search; 484 goto full_search;
434 } 485 }
435diff -urNp linux-2.6.32.7/arch/arm/plat-s3c/pm.c linux-2.6.32.7/arch/arm/plat-s3c/pm.c 486diff -urNp linux-2.6.32.8/arch/arm/plat-s3c/pm.c linux-2.6.32.8/arch/arm/plat-s3c/pm.c
436--- linux-2.6.32.7/arch/arm/plat-s3c/pm.c 2010-01-25 13:50:10.000000000 -0500 487--- linux-2.6.32.8/arch/arm/plat-s3c/pm.c 2010-02-09 07:57:19.000000000 -0500
437+++ linux-2.6.32.7/arch/arm/plat-s3c/pm.c 2010-01-25 17:39:40.241617700 -0500 488+++ linux-2.6.32.8/arch/arm/plat-s3c/pm.c 2010-02-10 15:06:23.922996854 -0500
438@@ -355,7 +355,7 @@ static void s3c_pm_finish(void) 489@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
439 s3c_pm_check_cleanup(); 490 s3c_pm_check_cleanup();
440 } 491 }
@@ -444,9 +495,9 @@ diff -urNp linux-2.6.32.7/arch/arm/plat-s3c/pm.c linux-2.6.32.7/arch/arm/plat-s3
444 .enter = s3c_pm_enter, 495 .enter = s3c_pm_enter,
445 .prepare = s3c_pm_prepare, 496 .prepare = s3c_pm_prepare,
446 .finish = s3c_pm_finish, 497 .finish = s3c_pm_finish,
447diff -urNp linux-2.6.32.7/arch/avr32/include/asm/elf.h linux-2.6.32.7/arch/avr32/include/asm/elf.h 498diff -urNp linux-2.6.32.8/arch/avr32/include/asm/elf.h linux-2.6.32.8/arch/avr32/include/asm/elf.h
448--- linux-2.6.32.7/arch/avr32/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 499--- linux-2.6.32.8/arch/avr32/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
449+++ linux-2.6.32.7/arch/avr32/include/asm/elf.h 2010-01-25 17:39:40.241617700 -0500 500+++ linux-2.6.32.8/arch/avr32/include/asm/elf.h 2010-02-10 15:06:23.922996854 -0500
450@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg 501@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
451 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
452 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. */
@@ -463,9 +514,9 @@ diff -urNp linux-2.6.32.7/arch/avr32/include/asm/elf.h linux-2.6.32.7/arch/avr32
463 514
464 /* 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
465 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,
466diff -urNp linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h 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
467--- linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h 2010-01-25 13:50:10.000000000 -0500 518--- linux-2.6.32.8/arch/avr32/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500
468+++ linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h 2010-01-25 17:39:40.241617700 -0500 519+++ linux-2.6.32.8/arch/avr32/include/asm/kmap_types.h 2010-02-10 15:06:23.922996854 -0500
469@@ -22,7 +22,8 @@ D(10) KM_IRQ0, 520@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
470 D(11) KM_IRQ1, 521 D(11) KM_IRQ1,
471 D(12) KM_SOFTIRQ0, 522 D(12) KM_SOFTIRQ0,
@@ -476,9 +527,9 @@ diff -urNp linux-2.6.32.7/arch/avr32/include/asm/kmap_types.h linux-2.6.32.7/arc
476 }; 527 };
477 528
478 #undef D 529 #undef D
479diff -urNp linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c 530diff -urNp linux-2.6.32.8/arch/avr32/mach-at32ap/pm.c linux-2.6.32.8/arch/avr32/mach-at32ap/pm.c
480--- linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c 2010-01-25 13:50:10.000000000 -0500 531--- linux-2.6.32.8/arch/avr32/mach-at32ap/pm.c 2010-02-09 07:57:19.000000000 -0500
481+++ linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c 2010-01-25 17:39:40.241617700 -0500 532+++ linux-2.6.32.8/arch/avr32/mach-at32ap/pm.c 2010-02-10 15:06:23.922996854 -0500
482@@ -176,7 +176,7 @@ out: 533@@ -176,7 +176,7 @@ out:
483 return 0; 534 return 0;
484 } 535 }
@@ -488,9 +539,9 @@ diff -urNp linux-2.6.32.7/arch/avr32/mach-at32ap/pm.c linux-2.6.32.7/arch/avr32/
488 .valid = avr32_pm_valid_state, 539 .valid = avr32_pm_valid_state,
489 .enter = avr32_pm_enter, 540 .enter = avr32_pm_enter,
490 }; 541 };
491diff -urNp linux-2.6.32.7/arch/avr32/mm/fault.c linux-2.6.32.7/arch/avr32/mm/fault.c 542diff -urNp linux-2.6.32.8/arch/avr32/mm/fault.c linux-2.6.32.8/arch/avr32/mm/fault.c
492--- linux-2.6.32.7/arch/avr32/mm/fault.c 2010-01-25 13:50:10.000000000 -0500 543--- linux-2.6.32.8/arch/avr32/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
493+++ linux-2.6.32.7/arch/avr32/mm/fault.c 2010-01-25 17:39:40.241617700 -0500 544+++ linux-2.6.32.8/arch/avr32/mm/fault.c 2010-02-10 15:06:23.922996854 -0500
494@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru 545@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
495 546
496 int exception_trace = 1; 547 int exception_trace = 1;
@@ -532,9 +583,9 @@ diff -urNp linux-2.6.32.7/arch/avr32/mm/fault.c linux-2.6.32.7/arch/avr32/mm/fau
532 if (exception_trace && printk_ratelimit()) 583 if (exception_trace && printk_ratelimit())
533 printk("%s%s[%d]: segfault at %08lx pc %08lx " 584 printk("%s%s[%d]: segfault at %08lx pc %08lx "
534 "sp %08lx ecr %lu\n", 585 "sp %08lx ecr %lu\n",
535diff -urNp linux-2.6.32.7/arch/blackfin/kernel/kgdb.c linux-2.6.32.7/arch/blackfin/kernel/kgdb.c 586diff -urNp linux-2.6.32.8/arch/blackfin/kernel/kgdb.c linux-2.6.32.8/arch/blackfin/kernel/kgdb.c
536--- linux-2.6.32.7/arch/blackfin/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500 587--- linux-2.6.32.8/arch/blackfin/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500
537+++ linux-2.6.32.7/arch/blackfin/kernel/kgdb.c 2010-01-25 17:39:40.242404070 -0500 588+++ linux-2.6.32.8/arch/blackfin/kernel/kgdb.c 2010-02-10 15:06:23.922996854 -0500
538@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto 589@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
539 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 */
540 } 591 }
@@ -544,9 +595,9 @@ diff -urNp linux-2.6.32.7/arch/blackfin/kernel/kgdb.c linux-2.6.32.7/arch/blackf
544 .gdb_bpt_instr = {0xa1}, 595 .gdb_bpt_instr = {0xa1},
545 #ifdef CONFIG_SMP 596 #ifdef CONFIG_SMP
546 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, 597 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
547diff -urNp linux-2.6.32.7/arch/blackfin/mach-common/pm.c linux-2.6.32.7/arch/blackfin/mach-common/pm.c 598diff -urNp linux-2.6.32.8/arch/blackfin/mach-common/pm.c linux-2.6.32.8/arch/blackfin/mach-common/pm.c
548--- linux-2.6.32.7/arch/blackfin/mach-common/pm.c 2010-01-25 13:50:10.000000000 -0500 599--- linux-2.6.32.8/arch/blackfin/mach-common/pm.c 2010-02-09 07:57:19.000000000 -0500
549+++ linux-2.6.32.7/arch/blackfin/mach-common/pm.c 2010-01-25 17:39:40.254403041 -0500 600+++ linux-2.6.32.8/arch/blackfin/mach-common/pm.c 2010-02-10 15:06:23.922996854 -0500
550@@ -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
551 return 0; 602 return 0;
552 } 603 }
@@ -556,9 +607,9 @@ diff -urNp linux-2.6.32.7/arch/blackfin/mach-common/pm.c linux-2.6.32.7/arch/bla
556 .enter = bfin_pm_enter, 607 .enter = bfin_pm_enter,
557 .valid = bfin_pm_valid, 608 .valid = bfin_pm_valid,
558 }; 609 };
559diff -urNp linux-2.6.32.7/arch/frv/include/asm/kmap_types.h linux-2.6.32.7/arch/frv/include/asm/kmap_types.h 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
560--- linux-2.6.32.7/arch/frv/include/asm/kmap_types.h 2010-01-25 13:50:10.000000000 -0500 611--- linux-2.6.32.8/arch/frv/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500
561+++ linux-2.6.32.7/arch/frv/include/asm/kmap_types.h 2010-01-25 17:39:40.254403041 -0500 612+++ linux-2.6.32.8/arch/frv/include/asm/kmap_types.h 2010-02-10 15:06:23.922996854 -0500
562@@ -23,6 +23,7 @@ enum km_type { 613@@ -23,6 +23,7 @@ enum km_type {
563 KM_IRQ1, 614 KM_IRQ1,
564 KM_SOFTIRQ0, 615 KM_SOFTIRQ0,
@@ -567,9 +618,9 @@ diff -urNp linux-2.6.32.7/arch/frv/include/asm/kmap_types.h linux-2.6.32.7/arch/
567 KM_TYPE_NR 618 KM_TYPE_NR
568 }; 619 };
569 620
570diff -urNp linux-2.6.32.7/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.7/arch/ia64/hp/common/hwsw_iommu.c 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
571--- linux-2.6.32.7/arch/ia64/hp/common/hwsw_iommu.c 2010-01-25 13:50:10.000000000 -0500 622--- linux-2.6.32.8/arch/ia64/hp/common/hwsw_iommu.c 2010-02-09 07:57:19.000000000 -0500
572+++ linux-2.6.32.7/arch/ia64/hp/common/hwsw_iommu.c 2010-01-25 17:39:40.254403041 -0500 623+++ linux-2.6.32.8/arch/ia64/hp/common/hwsw_iommu.c 2010-02-10 15:06:23.922996854 -0500
573@@ -17,7 +17,7 @@ 624@@ -17,7 +17,7 @@
574 #include <linux/swiotlb.h> 625 #include <linux/swiotlb.h>
575 #include <asm/machvec.h> 626 #include <asm/machvec.h>
@@ -588,9 +639,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.7/arch/i
588 { 639 {
589 if (use_swiotlb(dev)) 640 if (use_swiotlb(dev))
590 return &swiotlb_dma_ops; 641 return &swiotlb_dma_ops;
591diff -urNp linux-2.6.32.7/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.7/arch/ia64/hp/common/sba_iommu.c 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
592--- linux-2.6.32.7/arch/ia64/hp/common/sba_iommu.c 2010-01-25 13:50:10.000000000 -0500 643--- linux-2.6.32.8/arch/ia64/hp/common/sba_iommu.c 2010-02-09 07:57:19.000000000 -0500
593+++ linux-2.6.32.7/arch/ia64/hp/common/sba_iommu.c 2010-01-25 17:39:40.255155838 -0500 644+++ linux-2.6.32.8/arch/ia64/hp/common/sba_iommu.c 2010-02-10 15:06:23.922996854 -0500
594@@ -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
595 }, 646 },
596 }; 647 };
@@ -609,9 +660,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.7/arch/ia
609 .alloc_coherent = sba_alloc_coherent, 660 .alloc_coherent = sba_alloc_coherent,
610 .free_coherent = sba_free_coherent, 661 .free_coherent = sba_free_coherent,
611 .map_page = sba_map_page, 662 .map_page = sba_map_page,
612diff -urNp linux-2.6.32.7/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.7/arch/ia64/ia32/binfmt_elf32.c 663diff -urNp linux-2.6.32.8/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.8/arch/ia64/ia32/binfmt_elf32.c
613--- linux-2.6.32.7/arch/ia64/ia32/binfmt_elf32.c 2010-01-25 13:50:10.000000000 -0500 664--- linux-2.6.32.8/arch/ia64/ia32/binfmt_elf32.c 2010-02-09 07:57:19.000000000 -0500
614+++ linux-2.6.32.7/arch/ia64/ia32/binfmt_elf32.c 2010-01-25 17:39:40.255155838 -0500 665+++ linux-2.6.32.8/arch/ia64/ia32/binfmt_elf32.c 2010-02-10 15:06:23.922996854 -0500
615@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ 666@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
616 667
617 #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))
@@ -626,9 +677,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.7/arch/ia64
626 /* Ugly but avoids duplication */ 677 /* Ugly but avoids duplication */
627 #include "../../../fs/binfmt_elf.c" 678 #include "../../../fs/binfmt_elf.c"
628 679
629diff -urNp linux-2.6.32.7/arch/ia64/ia32/ia32priv.h linux-2.6.32.7/arch/ia64/ia32/ia32priv.h 680diff -urNp linux-2.6.32.8/arch/ia64/ia32/ia32priv.h linux-2.6.32.8/arch/ia64/ia32/ia32priv.h
630--- linux-2.6.32.7/arch/ia64/ia32/ia32priv.h 2010-01-25 13:50:10.000000000 -0500 681--- linux-2.6.32.8/arch/ia64/ia32/ia32priv.h 2010-02-09 07:57:19.000000000 -0500
631+++ linux-2.6.32.7/arch/ia64/ia32/ia32priv.h 2010-01-25 17:39:40.255155838 -0500 682+++ linux-2.6.32.8/arch/ia64/ia32/ia32priv.h 2010-02-10 15:06:23.922996854 -0500
632@@ -296,7 +296,14 @@ typedef struct compat_siginfo { 683@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
633 #define ELF_DATA ELFDATA2LSB 684 #define ELF_DATA ELFDATA2LSB
634 #define ELF_ARCH EM_386 685 #define ELF_ARCH EM_386
@@ -645,9 +696,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/ia32/ia32priv.h linux-2.6.32.7/arch/ia64/ia3
645 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET 696 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET
646 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE 697 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
647 698
648diff -urNp linux-2.6.32.7/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.7/arch/ia64/include/asm/dma-mapping.h 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
649--- linux-2.6.32.7/arch/ia64/include/asm/dma-mapping.h 2010-01-25 13:50:10.000000000 -0500 700--- linux-2.6.32.8/arch/ia64/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500
650+++ linux-2.6.32.7/arch/ia64/include/asm/dma-mapping.h 2010-01-25 17:39:40.255155838 -0500 701+++ linux-2.6.32.8/arch/ia64/include/asm/dma-mapping.h 2010-02-10 15:06:23.922996854 -0500
651@@ -12,7 +12,7 @@ 702@@ -12,7 +12,7 @@
652 703
653 #define ARCH_HAS_DMA_GET_REQUIRED_MASK 704 #define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -691,9 +742,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.7/arc
691 return ops->dma_supported(dev, mask); 742 return ops->dma_supported(dev, mask);
692 } 743 }
693 744
694diff -urNp linux-2.6.32.7/arch/ia64/include/asm/elf.h linux-2.6.32.7/arch/ia64/include/asm/elf.h 745diff -urNp linux-2.6.32.8/arch/ia64/include/asm/elf.h linux-2.6.32.8/arch/ia64/include/asm/elf.h
695--- linux-2.6.32.7/arch/ia64/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 746--- linux-2.6.32.8/arch/ia64/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
696+++ linux-2.6.32.7/arch/ia64/include/asm/elf.h 2010-01-25 17:39:40.255155838 -0500 747+++ linux-2.6.32.8/arch/ia64/include/asm/elf.h 2010-02-10 15:06:23.922996854 -0500
697@@ -43,6 +43,13 @@ 748@@ -43,6 +43,13 @@
698 */ 749 */
699 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) 750 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -708,9 +759,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/include/asm/elf.h linux-2.6.32.7/arch/ia64/i
708 #define PT_IA_64_UNWIND 0x70000001 759 #define PT_IA_64_UNWIND 0x70000001
709 760
710 /* IA-64 relocations: */ 761 /* IA-64 relocations: */
711diff -urNp linux-2.6.32.7/arch/ia64/include/asm/machvec.h linux-2.6.32.7/arch/ia64/include/asm/machvec.h 762diff -urNp linux-2.6.32.8/arch/ia64/include/asm/machvec.h linux-2.6.32.8/arch/ia64/include/asm/machvec.h
712--- linux-2.6.32.7/arch/ia64/include/asm/machvec.h 2010-01-25 13:50:10.000000000 -0500 763--- linux-2.6.32.8/arch/ia64/include/asm/machvec.h 2010-02-09 07:57:19.000000000 -0500
713+++ linux-2.6.32.7/arch/ia64/include/asm/machvec.h 2010-01-25 17:39:40.255155838 -0500 764+++ linux-2.6.32.8/arch/ia64/include/asm/machvec.h 2010-02-10 15:06:23.922996854 -0500
714@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event 765@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
715 /* DMA-mapping interface: */ 766 /* DMA-mapping interface: */
716 typedef void ia64_mv_dma_init (void); 767 typedef void ia64_mv_dma_init (void);
@@ -729,9 +780,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/include/asm/machvec.h linux-2.6.32.7/arch/ia
729 780
730 /* 781 /*
731 * 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
732diff -urNp linux-2.6.32.7/arch/ia64/include/asm/pgtable.h linux-2.6.32.7/arch/ia64/include/asm/pgtable.h 783diff -urNp linux-2.6.32.8/arch/ia64/include/asm/pgtable.h linux-2.6.32.8/arch/ia64/include/asm/pgtable.h
733--- linux-2.6.32.7/arch/ia64/include/asm/pgtable.h 2010-01-25 13:50:10.000000000 -0500 784--- linux-2.6.32.8/arch/ia64/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500
734+++ linux-2.6.32.7/arch/ia64/include/asm/pgtable.h 2010-01-25 17:39:40.256405587 -0500 785+++ linux-2.6.32.8/arch/ia64/include/asm/pgtable.h 2010-02-10 15:06:23.922996854 -0500
735@@ -143,6 +143,17 @@ 786@@ -143,6 +143,17 @@
736 #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)
737 #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)
@@ -750,9 +801,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/include/asm/pgtable.h linux-2.6.32.7/arch/ia
750 #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)
751 #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)
752 #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)
753diff -urNp linux-2.6.32.7/arch/ia64/include/asm/uaccess.h linux-2.6.32.7/arch/ia64/include/asm/uaccess.h 804diff -urNp linux-2.6.32.8/arch/ia64/include/asm/uaccess.h linux-2.6.32.8/arch/ia64/include/asm/uaccess.h
754--- linux-2.6.32.7/arch/ia64/include/asm/uaccess.h 2010-01-25 13:50:10.000000000 -0500 805--- linux-2.6.32.8/arch/ia64/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500
755+++ linux-2.6.32.7/arch/ia64/include/asm/uaccess.h 2010-01-25 17:39:40.256405587 -0500 806+++ linux-2.6.32.8/arch/ia64/include/asm/uaccess.h 2010-02-10 15:06:23.926995504 -0500
756@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ 807@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
757 const void *__cu_from = (from); \ 808 const void *__cu_from = (from); \
758 long __cu_len = (n); \ 809 long __cu_len = (n); \
@@ -771,9 +822,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/include/asm/uaccess.h linux-2.6.32.7/arch/ia
771 __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); \
772 __cu_len; \ 823 __cu_len; \
773 }) 824 })
774diff -urNp linux-2.6.32.7/arch/ia64/kernel/dma-mapping.c linux-2.6.32.7/arch/ia64/kernel/dma-mapping.c 825diff -urNp linux-2.6.32.8/arch/ia64/kernel/dma-mapping.c linux-2.6.32.8/arch/ia64/kernel/dma-mapping.c
775--- linux-2.6.32.7/arch/ia64/kernel/dma-mapping.c 2010-01-25 13:50:10.000000000 -0500 826--- linux-2.6.32.8/arch/ia64/kernel/dma-mapping.c 2010-02-09 07:57:19.000000000 -0500
776+++ linux-2.6.32.7/arch/ia64/kernel/dma-mapping.c 2010-01-25 17:39:40.256405587 -0500 827+++ linux-2.6.32.8/arch/ia64/kernel/dma-mapping.c 2010-02-10 15:06:23.926995504 -0500
777@@ -3,7 +3,7 @@ 828@@ -3,7 +3,7 @@
778 /* 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 */
779 int iommu_detected __read_mostly; 830 int iommu_detected __read_mostly;
@@ -792,9 +843,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/kernel/dma-mapping.c linux-2.6.32.7/arch/ia6
792 { 843 {
793 return dma_ops; 844 return dma_ops;
794 } 845 }
795diff -urNp linux-2.6.32.7/arch/ia64/kernel/module.c linux-2.6.32.7/arch/ia64/kernel/module.c 846diff -urNp linux-2.6.32.8/arch/ia64/kernel/module.c linux-2.6.32.8/arch/ia64/kernel/module.c
796--- linux-2.6.32.7/arch/ia64/kernel/module.c 2010-01-25 13:50:10.000000000 -0500 847--- linux-2.6.32.8/arch/ia64/kernel/module.c 2010-02-09 07:57:19.000000000 -0500
797+++ linux-2.6.32.7/arch/ia64/kernel/module.c 2010-01-25 17:39:40.256405587 -0500 848+++ linux-2.6.32.8/arch/ia64/kernel/module.c 2010-02-10 15:06:23.926995504 -0500
798@@ -315,8 +315,7 @@ module_alloc (unsigned long size) 849@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
799 void 850 void
800 module_free (struct module *mod, void *module_region) 851 module_free (struct module *mod, void *module_region)
@@ -883,9 +934,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/kernel/module.c linux-2.6.32.7/arch/ia64/ker
883 mod->arch.gp = gp; 934 mod->arch.gp = gp;
884 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); 935 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
885 } 936 }
886diff -urNp linux-2.6.32.7/arch/ia64/kernel/pci-dma.c linux-2.6.32.7/arch/ia64/kernel/pci-dma.c 937diff -urNp linux-2.6.32.8/arch/ia64/kernel/pci-dma.c linux-2.6.32.8/arch/ia64/kernel/pci-dma.c
887--- linux-2.6.32.7/arch/ia64/kernel/pci-dma.c 2010-01-25 13:50:10.000000000 -0500 938--- linux-2.6.32.8/arch/ia64/kernel/pci-dma.c 2010-02-09 07:57:19.000000000 -0500
888+++ linux-2.6.32.7/arch/ia64/kernel/pci-dma.c 2010-01-25 17:39:40.256405587 -0500 939+++ linux-2.6.32.8/arch/ia64/kernel/pci-dma.c 2010-02-10 15:06:23.926995504 -0500
889@@ -43,7 +43,7 @@ struct device fallback_dev = { 940@@ -43,7 +43,7 @@ struct device fallback_dev = {
890 .dma_mask = &fallback_dev.coherent_dma_mask, 941 .dma_mask = &fallback_dev.coherent_dma_mask,
891 }; 942 };
@@ -895,9 +946,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/kernel/pci-dma.c linux-2.6.32.7/arch/ia64/ke
895 946
896 static int __init pci_iommu_init(void) 947 static int __init pci_iommu_init(void)
897 { 948 {
898diff -urNp linux-2.6.32.7/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.7/arch/ia64/kernel/pci-swiotlb.c 949diff -urNp linux-2.6.32.8/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.8/arch/ia64/kernel/pci-swiotlb.c
899--- linux-2.6.32.7/arch/ia64/kernel/pci-swiotlb.c 2010-01-25 13:50:10.000000000 -0500 950--- linux-2.6.32.8/arch/ia64/kernel/pci-swiotlb.c 2010-02-09 07:57:19.000000000 -0500
900+++ linux-2.6.32.7/arch/ia64/kernel/pci-swiotlb.c 2010-01-25 17:39:40.257491087 -0500 951+++ linux-2.6.32.8/arch/ia64/kernel/pci-swiotlb.c 2010-02-10 15:06:23.926995504 -0500
901@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent 952@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
902 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); 953 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
903 } 954 }
@@ -907,9 +958,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.7/arch/ia6
907 .alloc_coherent = ia64_swiotlb_alloc_coherent, 958 .alloc_coherent = ia64_swiotlb_alloc_coherent,
908 .free_coherent = swiotlb_free_coherent, 959 .free_coherent = swiotlb_free_coherent,
909 .map_page = swiotlb_map_page, 960 .map_page = swiotlb_map_page,
910diff -urNp linux-2.6.32.7/arch/ia64/kernel/sys_ia64.c linux-2.6.32.7/arch/ia64/kernel/sys_ia64.c 961diff -urNp linux-2.6.32.8/arch/ia64/kernel/sys_ia64.c linux-2.6.32.8/arch/ia64/kernel/sys_ia64.c
911--- linux-2.6.32.7/arch/ia64/kernel/sys_ia64.c 2010-01-25 13:50:10.000000000 -0500 962--- linux-2.6.32.8/arch/ia64/kernel/sys_ia64.c 2010-02-09 07:57:19.000000000 -0500
912+++ linux-2.6.32.7/arch/ia64/kernel/sys_ia64.c 2010-01-25 17:39:40.257491087 -0500 963+++ linux-2.6.32.8/arch/ia64/kernel/sys_ia64.c 2010-02-10 15:06:23.926995504 -0500
913@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil 964@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
914 if (REGION_NUMBER(addr) == RGN_HPAGE) 965 if (REGION_NUMBER(addr) == RGN_HPAGE)
915 addr = 0; 966 addr = 0;
@@ -936,9 +987,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/kernel/sys_ia64.c linux-2.6.32.7/arch/ia64/k
936 goto full_search; 987 goto full_search;
937 } 988 }
938 return -ENOMEM; 989 return -ENOMEM;
939diff -urNp linux-2.6.32.7/arch/ia64/kernel/topology.c linux-2.6.32.7/arch/ia64/kernel/topology.c 990diff -urNp linux-2.6.32.8/arch/ia64/kernel/topology.c linux-2.6.32.8/arch/ia64/kernel/topology.c
940--- linux-2.6.32.7/arch/ia64/kernel/topology.c 2010-01-25 13:50:10.000000000 -0500 991--- linux-2.6.32.8/arch/ia64/kernel/topology.c 2010-02-09 07:57:19.000000000 -0500
941+++ linux-2.6.32.7/arch/ia64/kernel/topology.c 2010-01-25 17:39:40.257491087 -0500 992+++ linux-2.6.32.8/arch/ia64/kernel/topology.c 2010-02-10 15:06:23.926995504 -0500
942@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject 993@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
943 return ret; 994 return ret;
944 } 995 }
@@ -948,9 +999,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/kernel/topology.c linux-2.6.32.7/arch/ia64/k
948 .show = cache_show 999 .show = cache_show
949 }; 1000 };
950 1001
951diff -urNp linux-2.6.32.7/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.7/arch/ia64/kernel/vmlinux.lds.S 1002diff -urNp linux-2.6.32.8/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.8/arch/ia64/kernel/vmlinux.lds.S
952--- linux-2.6.32.7/arch/ia64/kernel/vmlinux.lds.S 2010-01-25 13:50:10.000000000 -0500 1003--- linux-2.6.32.8/arch/ia64/kernel/vmlinux.lds.S 2010-02-09 07:57:19.000000000 -0500
953+++ linux-2.6.32.7/arch/ia64/kernel/vmlinux.lds.S 2010-01-25 17:39:40.257491087 -0500 1004+++ linux-2.6.32.8/arch/ia64/kernel/vmlinux.lds.S 2010-02-10 15:06:23.926995504 -0500
954@@ -190,7 +190,7 @@ SECTIONS 1005@@ -190,7 +190,7 @@ SECTIONS
955 /* Per-cpu data: */ 1006 /* Per-cpu data: */
956 . = ALIGN(PERCPU_PAGE_SIZE); 1007 . = ALIGN(PERCPU_PAGE_SIZE);
@@ -960,9 +1011,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.7/arch/ia6
960 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits 1011 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
961 * into percpu page size 1012 * into percpu page size
962 */ 1013 */
963diff -urNp linux-2.6.32.7/arch/ia64/mm/fault.c linux-2.6.32.7/arch/ia64/mm/fault.c 1014diff -urNp linux-2.6.32.8/arch/ia64/mm/fault.c linux-2.6.32.8/arch/ia64/mm/fault.c
964--- linux-2.6.32.7/arch/ia64/mm/fault.c 2010-01-25 13:50:10.000000000 -0500 1015--- linux-2.6.32.8/arch/ia64/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
965+++ linux-2.6.32.7/arch/ia64/mm/fault.c 2010-01-25 17:39:40.257491087 -0500 1016+++ linux-2.6.32.8/arch/ia64/mm/fault.c 2010-02-10 15:06:23.926995504 -0500
966@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 1017@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
967 return pte_present(pte); 1018 return pte_present(pte);
968 } 1019 }
@@ -1012,9 +1063,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/mm/fault.c linux-2.6.32.7/arch/ia64/mm/fault
1012 survive: 1063 survive:
1013 /* 1064 /*
1014 * 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
1015diff -urNp linux-2.6.32.7/arch/ia64/mm/init.c linux-2.6.32.7/arch/ia64/mm/init.c 1066diff -urNp linux-2.6.32.8/arch/ia64/mm/init.c linux-2.6.32.8/arch/ia64/mm/init.c
1016--- linux-2.6.32.7/arch/ia64/mm/init.c 2010-01-25 13:50:10.000000000 -0500 1067--- linux-2.6.32.8/arch/ia64/mm/init.c 2010-02-09 07:57:19.000000000 -0500
1017+++ linux-2.6.32.7/arch/ia64/mm/init.c 2010-01-25 17:39:40.257491087 -0500 1068+++ linux-2.6.32.8/arch/ia64/mm/init.c 2010-02-10 15:06:23.926995504 -0500
1018@@ -122,6 +122,19 @@ ia64_init_addr_space (void) 1069@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
1019 vma->vm_start = current->thread.rbs_bot & PAGE_MASK; 1070 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
1020 vma->vm_end = vma->vm_start + PAGE_SIZE; 1071 vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1035,9 +1086,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/mm/init.c linux-2.6.32.7/arch/ia64/mm/init.c
1035 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 1086 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
1036 down_write(&current->mm->mmap_sem); 1087 down_write(&current->mm->mmap_sem);
1037 if (insert_vm_struct(current->mm, vma)) { 1088 if (insert_vm_struct(current->mm, vma)) {
1038diff -urNp linux-2.6.32.7/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.7/arch/ia64/sn/pci/pci_dma.c 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
1039--- linux-2.6.32.7/arch/ia64/sn/pci/pci_dma.c 2010-01-25 13:50:10.000000000 -0500 1090--- linux-2.6.32.8/arch/ia64/sn/pci/pci_dma.c 2010-02-09 07:57:19.000000000 -0500
1040+++ linux-2.6.32.7/arch/ia64/sn/pci/pci_dma.c 2010-01-25 17:39:40.258405199 -0500 1091+++ linux-2.6.32.8/arch/ia64/sn/pci/pci_dma.c 2010-02-10 15:06:23.926995504 -0500
1041@@ -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 *
1042 return ret; 1093 return ret;
1043 } 1094 }
@@ -1047,9 +1098,9 @@ diff -urNp linux-2.6.32.7/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.7/arch/ia64/sn
1047 .alloc_coherent = sn_dma_alloc_coherent, 1098 .alloc_coherent = sn_dma_alloc_coherent,
1048 .free_coherent = sn_dma_free_coherent, 1099 .free_coherent = sn_dma_free_coherent,
1049 .map_page = sn_dma_map_page, 1100 .map_page = sn_dma_map_page,
1050diff -urNp linux-2.6.32.7/arch/m32r/lib/usercopy.c linux-2.6.32.7/arch/m32r/lib/usercopy.c 1101diff -urNp linux-2.6.32.8/arch/m32r/lib/usercopy.c linux-2.6.32.8/arch/m32r/lib/usercopy.c
1051--- linux-2.6.32.7/arch/m32r/lib/usercopy.c 2010-01-25 13:50:10.000000000 -0500 1102--- linux-2.6.32.8/arch/m32r/lib/usercopy.c 2010-02-09 07:57:19.000000000 -0500
1052+++ linux-2.6.32.7/arch/m32r/lib/usercopy.c 2010-01-25 17:39:40.258405199 -0500 1103+++ linux-2.6.32.8/arch/m32r/lib/usercopy.c 2010-02-10 15:06:23.926995504 -0500
1053@@ -14,6 +14,9 @@ 1104@@ -14,6 +14,9 @@
1054 unsigned long 1105 unsigned long
1055 __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)
@@ -1070,9 +1121,9 @@ diff -urNp linux-2.6.32.7/arch/m32r/lib/usercopy.c linux-2.6.32.7/arch/m32r/lib/
1070 prefetchw(to); 1121 prefetchw(to);
1071 if (access_ok(VERIFY_READ, from, n)) 1122 if (access_ok(VERIFY_READ, from, n))
1072 __copy_user_zeroing(to,from,n); 1123 __copy_user_zeroing(to,from,n);
1073diff -urNp linux-2.6.32.7/arch/mips/alchemy/devboards/pm.c linux-2.6.32.7/arch/mips/alchemy/devboards/pm.c 1124diff -urNp linux-2.6.32.8/arch/mips/alchemy/devboards/pm.c linux-2.6.32.8/arch/mips/alchemy/devboards/pm.c
1074--- linux-2.6.32.7/arch/mips/alchemy/devboards/pm.c 2010-01-25 13:50:10.000000000 -0500 1125--- linux-2.6.32.8/arch/mips/alchemy/devboards/pm.c 2010-02-09 07:57:19.000000000 -0500
1075+++ linux-2.6.32.7/arch/mips/alchemy/devboards/pm.c 2010-01-25 17:39:40.258405199 -0500 1126+++ linux-2.6.32.8/arch/mips/alchemy/devboards/pm.c 2010-02-10 15:06:23.926995504 -0500
1076@@ -78,7 +78,7 @@ static void db1x_pm_end(void) 1127@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
1077 1128
1078 } 1129 }
@@ -1082,9 +1133,9 @@ diff -urNp linux-2.6.32.7/arch/mips/alchemy/devboards/pm.c linux-2.6.32.7/arch/m
1082 .valid = suspend_valid_only_mem, 1133 .valid = suspend_valid_only_mem,
1083 .begin = db1x_pm_begin, 1134 .begin = db1x_pm_begin,
1084 .enter = db1x_pm_enter, 1135 .enter = db1x_pm_enter,
1085diff -urNp linux-2.6.32.7/arch/mips/include/asm/elf.h linux-2.6.32.7/arch/mips/include/asm/elf.h 1136diff -urNp linux-2.6.32.8/arch/mips/include/asm/elf.h linux-2.6.32.8/arch/mips/include/asm/elf.h
1086--- linux-2.6.32.7/arch/mips/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 1137--- linux-2.6.32.8/arch/mips/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
1087+++ linux-2.6.32.7/arch/mips/include/asm/elf.h 2010-01-25 17:39:40.258405199 -0500 1138+++ linux-2.6.32.8/arch/mips/include/asm/elf.h 2010-02-10 15:06:23.926995504 -0500
1088@@ -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
1089 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) 1140 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1090 #endif 1141 #endif
@@ -1097,9 +1148,9 @@ diff -urNp linux-2.6.32.7/arch/mips/include/asm/elf.h linux-2.6.32.7/arch/mips/i
1097+#endif 1148+#endif
1098+ 1149+
1099 #endif /* _ASM_ELF_H */ 1150 #endif /* _ASM_ELF_H */
1100diff -urNp linux-2.6.32.7/arch/mips/include/asm/page.h linux-2.6.32.7/arch/mips/include/asm/page.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
1101--- linux-2.6.32.7/arch/mips/include/asm/page.h 2010-01-25 13:50:10.000000000 -0500 1152--- linux-2.6.32.8/arch/mips/include/asm/page.h 2010-02-09 07:57:19.000000000 -0500
1102+++ linux-2.6.32.7/arch/mips/include/asm/page.h 2010-01-25 17:39:40.258405199 -0500 1153+++ linux-2.6.32.8/arch/mips/include/asm/page.h 2010-02-10 15:06:23.926995504 -0500
1103@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa 1154@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
1104 #ifdef CONFIG_CPU_MIPS32 1155 #ifdef CONFIG_CPU_MIPS32
1105 typedef struct { unsigned long pte_low, pte_high; } pte_t; 1156 typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1109,9 +1160,9 @@ diff -urNp linux-2.6.32.7/arch/mips/include/asm/page.h linux-2.6.32.7/arch/mips/
1109 #else 1160 #else
1110 typedef struct { unsigned long long pte; } pte_t; 1161 typedef struct { unsigned long long pte; } pte_t;
1111 #define pte_val(x) ((x).pte) 1162 #define pte_val(x) ((x).pte)
1112diff -urNp linux-2.6.32.7/arch/mips/include/asm/system.h linux-2.6.32.7/arch/mips/include/asm/system.h 1163diff -urNp linux-2.6.32.8/arch/mips/include/asm/system.h linux-2.6.32.8/arch/mips/include/asm/system.h
1113--- linux-2.6.32.7/arch/mips/include/asm/system.h 2010-01-25 13:50:10.000000000 -0500 1164--- linux-2.6.32.8/arch/mips/include/asm/system.h 2010-02-09 07:57:19.000000000 -0500
1114+++ linux-2.6.32.7/arch/mips/include/asm/system.h 2010-01-25 17:39:40.258405199 -0500 1165+++ linux-2.6.32.8/arch/mips/include/asm/system.h 2010-02-10 15:06:23.926995504 -0500
1115@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); 1166@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
1116 */ 1167 */
1117 #define __ARCH_WANT_UNLOCKED_CTXSW 1168 #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1120,9 +1171,9 @@ diff -urNp linux-2.6.32.7/arch/mips/include/asm/system.h linux-2.6.32.7/arch/mip
1120+#define arch_align_stack(x) ((x) & ALMASK) 1171+#define arch_align_stack(x) ((x) & ALMASK)
1121 1172
1122 #endif /* _ASM_SYSTEM_H */ 1173 #endif /* _ASM_SYSTEM_H */
1123diff -urNp linux-2.6.32.7/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.7/arch/mips/kernel/binfmt_elfn32.c 1174diff -urNp linux-2.6.32.8/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.8/arch/mips/kernel/binfmt_elfn32.c
1124--- linux-2.6.32.7/arch/mips/kernel/binfmt_elfn32.c 2010-01-25 13:50:10.000000000 -0500 1175--- linux-2.6.32.8/arch/mips/kernel/binfmt_elfn32.c 2010-02-09 07:57:19.000000000 -0500
1125+++ linux-2.6.32.7/arch/mips/kernel/binfmt_elfn32.c 2010-01-25 17:39:40.259407304 -0500 1176+++ linux-2.6.32.8/arch/mips/kernel/binfmt_elfn32.c 2010-02-10 15:06:23.926995504 -0500
1126@@ -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
1127 #undef ELF_ET_DYN_BASE 1178 #undef ELF_ET_DYN_BASE
1128 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) 1179 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1137,9 +1188,9 @@ diff -urNp linux-2.6.32.7/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.7/arch/m
1137 #include <asm/processor.h> 1188 #include <asm/processor.h>
1138 #include <linux/module.h> 1189 #include <linux/module.h>
1139 #include <linux/elfcore.h> 1190 #include <linux/elfcore.h>
1140diff -urNp linux-2.6.32.7/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.7/arch/mips/kernel/binfmt_elfo32.c 1191diff -urNp linux-2.6.32.8/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.8/arch/mips/kernel/binfmt_elfo32.c
1141--- linux-2.6.32.7/arch/mips/kernel/binfmt_elfo32.c 2010-01-25 13:50:10.000000000 -0500 1192--- linux-2.6.32.8/arch/mips/kernel/binfmt_elfo32.c 2010-02-09 07:57:19.000000000 -0500
1142+++ linux-2.6.32.7/arch/mips/kernel/binfmt_elfo32.c 2010-01-25 17:39:40.259407304 -0500 1193+++ linux-2.6.32.8/arch/mips/kernel/binfmt_elfo32.c 2010-02-10 15:06:23.926995504 -0500
1143@@ -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
1144 #undef ELF_ET_DYN_BASE 1195 #undef ELF_ET_DYN_BASE
1145 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) 1196 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1154,9 +1205,9 @@ diff -urNp linux-2.6.32.7/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.7/arch/m
1154 #include <asm/processor.h> 1205 #include <asm/processor.h>
1155 1206
1156 /* 1207 /*
1157diff -urNp linux-2.6.32.7/arch/mips/kernel/kgdb.c linux-2.6.32.7/arch/mips/kernel/kgdb.c 1208diff -urNp linux-2.6.32.8/arch/mips/kernel/kgdb.c linux-2.6.32.8/arch/mips/kernel/kgdb.c
1158--- linux-2.6.32.7/arch/mips/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500 1209--- linux-2.6.32.8/arch/mips/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500
1159+++ linux-2.6.32.7/arch/mips/kernel/kgdb.c 2010-01-25 17:39:40.259407304 -0500 1210+++ linux-2.6.32.8/arch/mips/kernel/kgdb.c 2010-02-10 15:06:23.926995504 -0500
1160@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto 1211@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
1161 return -1; 1212 return -1;
1162 } 1213 }
@@ -1165,9 +1216,9 @@ diff -urNp linux-2.6.32.7/arch/mips/kernel/kgdb.c linux-2.6.32.7/arch/mips/kerne
1165 struct kgdb_arch arch_kgdb_ops; 1216 struct kgdb_arch arch_kgdb_ops;
1166 1217
1167 /* 1218 /*
1168diff -urNp linux-2.6.32.7/arch/mips/kernel/process.c linux-2.6.32.7/arch/mips/kernel/process.c 1219diff -urNp linux-2.6.32.8/arch/mips/kernel/process.c linux-2.6.32.8/arch/mips/kernel/process.c
1169--- linux-2.6.32.7/arch/mips/kernel/process.c 2010-01-25 13:50:10.000000000 -0500 1220--- linux-2.6.32.8/arch/mips/kernel/process.c 2010-02-09 07:57:19.000000000 -0500
1170+++ linux-2.6.32.7/arch/mips/kernel/process.c 2010-01-25 17:39:40.259407304 -0500 1221+++ linux-2.6.32.8/arch/mips/kernel/process.c 2010-02-10 15:06:23.926995504 -0500
1171@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru 1222@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
1172 out: 1223 out:
1173 return pc; 1224 return pc;
@@ -1184,9 +1235,9 @@ diff -urNp linux-2.6.32.7/arch/mips/kernel/process.c linux-2.6.32.7/arch/mips/ke
1184- 1235-
1185- return sp & ALMASK; 1236- return sp & ALMASK;
1186-} 1237-}
1187diff -urNp linux-2.6.32.7/arch/mips/kernel/syscall.c linux-2.6.32.7/arch/mips/kernel/syscall.c 1238diff -urNp linux-2.6.32.8/arch/mips/kernel/syscall.c linux-2.6.32.8/arch/mips/kernel/syscall.c
1188--- linux-2.6.32.7/arch/mips/kernel/syscall.c 2010-01-25 13:50:10.000000000 -0500 1239--- linux-2.6.32.8/arch/mips/kernel/syscall.c 2010-02-09 07:57:19.000000000 -0500
1189+++ linux-2.6.32.7/arch/mips/kernel/syscall.c 2010-01-25 17:39:40.259407304 -0500 1240+++ linux-2.6.32.8/arch/mips/kernel/syscall.c 2010-02-10 15:06:23.926995504 -0500
1190@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str 1241@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str
1191 do_color_align = 0; 1242 do_color_align = 0;
1192 if (filp || (flags & MAP_SHARED)) 1243 if (filp || (flags & MAP_SHARED))
@@ -1208,9 +1259,9 @@ diff -urNp linux-2.6.32.7/arch/mips/kernel/syscall.c linux-2.6.32.7/arch/mips/ke
1208 if (do_color_align) 1259 if (do_color_align)
1209 addr = COLOUR_ALIGN(addr, pgoff); 1260 addr = COLOUR_ALIGN(addr, pgoff);
1210 else 1261 else
1211diff -urNp linux-2.6.32.7/arch/mips/mm/fault.c linux-2.6.32.7/arch/mips/mm/fault.c 1262diff -urNp linux-2.6.32.8/arch/mips/mm/fault.c linux-2.6.32.8/arch/mips/mm/fault.c
1212--- linux-2.6.32.7/arch/mips/mm/fault.c 2010-01-25 13:50:10.000000000 -0500 1263--- linux-2.6.32.8/arch/mips/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
1213+++ linux-2.6.32.7/arch/mips/mm/fault.c 2010-01-25 17:39:40.259407304 -0500 1264+++ linux-2.6.32.8/arch/mips/mm/fault.c 2010-02-10 15:06:23.926995504 -0500
1214@@ -26,6 +26,23 @@ 1265@@ -26,6 +26,23 @@
1215 #include <asm/ptrace.h> 1266 #include <asm/ptrace.h>
1216 #include <asm/highmem.h> /* For VMALLOC_END */ 1267 #include <asm/highmem.h> /* For VMALLOC_END */
@@ -1235,9 +1286,9 @@ diff -urNp linux-2.6.32.7/arch/mips/mm/fault.c linux-2.6.32.7/arch/mips/mm/fault
1235 /* 1286 /*
1236 * This routine handles page faults. It determines the address, 1287 * This routine handles page faults. It determines the address,
1237 * 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
1238diff -urNp linux-2.6.32.7/arch/parisc/include/asm/elf.h linux-2.6.32.7/arch/parisc/include/asm/elf.h 1289diff -urNp linux-2.6.32.8/arch/parisc/include/asm/elf.h linux-2.6.32.8/arch/parisc/include/asm/elf.h
1239--- linux-2.6.32.7/arch/parisc/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 1290--- linux-2.6.32.8/arch/parisc/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
1240+++ linux-2.6.32.7/arch/parisc/include/asm/elf.h 2010-01-25 17:39:40.259407304 -0500 1291+++ linux-2.6.32.8/arch/parisc/include/asm/elf.h 2010-02-10 15:06:23.926995504 -0500
1241@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. 1292@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
1242 1293
1243 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) 1294 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1252,9 +1303,9 @@ diff -urNp linux-2.6.32.7/arch/parisc/include/asm/elf.h linux-2.6.32.7/arch/pari
1252 /* 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
1253 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,
1254 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. */
1255diff -urNp linux-2.6.32.7/arch/parisc/include/asm/pgtable.h linux-2.6.32.7/arch/parisc/include/asm/pgtable.h 1306diff -urNp linux-2.6.32.8/arch/parisc/include/asm/pgtable.h linux-2.6.32.8/arch/parisc/include/asm/pgtable.h
1256--- linux-2.6.32.7/arch/parisc/include/asm/pgtable.h 2010-01-25 13:50:10.000000000 -0500 1307--- linux-2.6.32.8/arch/parisc/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500
1257+++ linux-2.6.32.7/arch/parisc/include/asm/pgtable.h 2010-01-25 17:39:40.260411489 -0500 1308+++ linux-2.6.32.8/arch/parisc/include/asm/pgtable.h 2010-02-10 15:06:23.931021836 -0500
1258@@ -207,6 +207,17 @@ 1309@@ -207,6 +207,17 @@
1259 #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)
1260 #define PAGE_COPY PAGE_EXECREAD 1311 #define PAGE_COPY PAGE_EXECREAD
@@ -1273,9 +1324,9 @@ diff -urNp linux-2.6.32.7/arch/parisc/include/asm/pgtable.h linux-2.6.32.7/arch/
1273 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) 1324 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
1274 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) 1325 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
1275 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) 1326 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
1276diff -urNp linux-2.6.32.7/arch/parisc/kernel/module.c linux-2.6.32.7/arch/parisc/kernel/module.c 1327diff -urNp linux-2.6.32.8/arch/parisc/kernel/module.c linux-2.6.32.8/arch/parisc/kernel/module.c
1277--- linux-2.6.32.7/arch/parisc/kernel/module.c 2010-01-25 13:50:10.000000000 -0500 1328--- linux-2.6.32.8/arch/parisc/kernel/module.c 2010-02-09 07:57:19.000000000 -0500
1278+++ linux-2.6.32.7/arch/parisc/kernel/module.c 2010-01-25 17:39:40.260411489 -0500 1329+++ linux-2.6.32.8/arch/parisc/kernel/module.c 2010-02-10 15:06:23.931021836 -0500
1279@@ -95,16 +95,38 @@ 1330@@ -95,16 +95,38 @@
1280 1331
1281 /* three functions to determine where in the module core 1332 /* three functions to determine where in the module core
@@ -1376,9 +1427,9 @@ diff -urNp linux-2.6.32.7/arch/parisc/kernel/module.c linux-2.6.32.7/arch/parisc
1376 1427
1377 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",
1378 me->arch.unwind_section, table, end, gp); 1429 me->arch.unwind_section, table, end, gp);
1379diff -urNp linux-2.6.32.7/arch/parisc/kernel/sys_parisc.c linux-2.6.32.7/arch/parisc/kernel/sys_parisc.c 1430diff -urNp linux-2.6.32.8/arch/parisc/kernel/sys_parisc.c linux-2.6.32.8/arch/parisc/kernel/sys_parisc.c
1380--- linux-2.6.32.7/arch/parisc/kernel/sys_parisc.c 2010-01-25 13:50:10.000000000 -0500 1431--- linux-2.6.32.8/arch/parisc/kernel/sys_parisc.c 2010-02-09 07:57:19.000000000 -0500
1381+++ linux-2.6.32.7/arch/parisc/kernel/sys_parisc.c 2010-01-25 17:39:40.260411489 -0500 1432+++ linux-2.6.32.8/arch/parisc/kernel/sys_parisc.c 2010-02-10 15:06:23.931021836 -0500
1382@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str 1433@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str
1383 if (flags & MAP_FIXED) 1434 if (flags & MAP_FIXED)
1384 return addr; 1435 return addr;
@@ -1388,9 +1439,9 @@ diff -urNp linux-2.6.32.7/arch/parisc/kernel/sys_parisc.c linux-2.6.32.7/arch/pa
1388 1439
1389 if (filp) { 1440 if (filp) {
1390 addr = get_shared_area(filp->f_mapping, addr, len, pgoff); 1441 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
1391diff -urNp linux-2.6.32.7/arch/parisc/kernel/traps.c linux-2.6.32.7/arch/parisc/kernel/traps.c 1442diff -urNp linux-2.6.32.8/arch/parisc/kernel/traps.c linux-2.6.32.8/arch/parisc/kernel/traps.c
1392--- linux-2.6.32.7/arch/parisc/kernel/traps.c 2010-01-25 13:50:10.000000000 -0500 1443--- linux-2.6.32.8/arch/parisc/kernel/traps.c 2010-02-09 07:57:19.000000000 -0500
1393+++ linux-2.6.32.7/arch/parisc/kernel/traps.c 2010-01-25 17:39:40.260411489 -0500 1444+++ linux-2.6.32.8/arch/parisc/kernel/traps.c 2010-02-10 15:06:23.931021836 -0500
1394@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod 1445@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
1395 1446
1396 down_read(&current->mm->mmap_sem); 1447 down_read(&current->mm->mmap_sem);
@@ -1402,9 +1453,9 @@ diff -urNp linux-2.6.32.7/arch/parisc/kernel/traps.c linux-2.6.32.7/arch/parisc/
1402 fault_address = regs->iaoq[0]; 1453 fault_address = regs->iaoq[0];
1403 fault_space = regs->iasq[0]; 1454 fault_space = regs->iasq[0];
1404 1455
1405diff -urNp linux-2.6.32.7/arch/parisc/mm/fault.c linux-2.6.32.7/arch/parisc/mm/fault.c 1456diff -urNp linux-2.6.32.8/arch/parisc/mm/fault.c linux-2.6.32.8/arch/parisc/mm/fault.c
1406--- linux-2.6.32.7/arch/parisc/mm/fault.c 2010-01-25 13:50:10.000000000 -0500 1457--- linux-2.6.32.8/arch/parisc/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
1407+++ linux-2.6.32.7/arch/parisc/mm/fault.c 2010-01-25 17:39:40.261410306 -0500 1458+++ linux-2.6.32.8/arch/parisc/mm/fault.c 2010-02-10 15:06:23.931021836 -0500
1408@@ -15,6 +15,7 @@ 1459@@ -15,6 +15,7 @@
1409 #include <linux/sched.h> 1460 #include <linux/sched.h>
1410 #include <linux/interrupt.h> 1461 #include <linux/interrupt.h>
@@ -1574,9 +1625,9 @@ diff -urNp linux-2.6.32.7/arch/parisc/mm/fault.c linux-2.6.32.7/arch/parisc/mm/f
1574 1625
1575 /* 1626 /*
1576 * 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
1577diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/device.h linux-2.6.32.7/arch/powerpc/include/asm/device.h 1628diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/device.h linux-2.6.32.8/arch/powerpc/include/asm/device.h
1578--- linux-2.6.32.7/arch/powerpc/include/asm/device.h 2010-01-25 13:50:10.000000000 -0500 1629--- linux-2.6.32.8/arch/powerpc/include/asm/device.h 2010-02-09 07:57:19.000000000 -0500
1579+++ linux-2.6.32.7/arch/powerpc/include/asm/device.h 2010-01-25 17:39:40.261410306 -0500 1630+++ linux-2.6.32.8/arch/powerpc/include/asm/device.h 2010-02-10 15:06:23.931021836 -0500
1580@@ -14,7 +14,7 @@ struct dev_archdata { 1631@@ -14,7 +14,7 @@ struct dev_archdata {
1581 struct device_node *of_node; 1632 struct device_node *of_node;
1582 1633
@@ -1586,9 +1637,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/device.h linux-2.6.32.7/arch/
1586 1637
1587 /* 1638 /*
1588 * 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
1589diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.7/arch/powerpc/include/asm/dma-mapping.h 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
1590--- linux-2.6.32.7/arch/powerpc/include/asm/dma-mapping.h 2010-01-25 13:50:10.000000000 -0500 1641--- linux-2.6.32.8/arch/powerpc/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500
1591+++ linux-2.6.32.7/arch/powerpc/include/asm/dma-mapping.h 2010-01-25 17:39:40.261410306 -0500 1642+++ linux-2.6.32.8/arch/powerpc/include/asm/dma-mapping.h 2010-02-10 15:06:23.931021836 -0500
1592@@ -67,11 +67,11 @@ static inline unsigned long device_to_ma 1643@@ -67,11 +67,11 @@ static inline unsigned long device_to_ma
1593 * Available generic sets of operations 1644 * Available generic sets of operations
1594 */ 1645 */
@@ -1658,9 +1709,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.7/
1658 1709
1659 if (dma_ops->mapping_error) 1710 if (dma_ops->mapping_error)
1660 return dma_ops->mapping_error(dev, dma_addr); 1711 return dma_ops->mapping_error(dev, dma_addr);
1661diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/elf.h linux-2.6.32.7/arch/powerpc/include/asm/elf.h 1712diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/elf.h linux-2.6.32.8/arch/powerpc/include/asm/elf.h
1662--- linux-2.6.32.7/arch/powerpc/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 1713--- linux-2.6.32.8/arch/powerpc/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
1663+++ linux-2.6.32.7/arch/powerpc/include/asm/elf.h 2010-01-25 17:39:40.261410306 -0500 1714+++ linux-2.6.32.8/arch/powerpc/include/asm/elf.h 2010-02-10 15:06:23.931021836 -0500
1664@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E 1715@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
1665 the loader. We need to make sure that it is out of the way of the program 1716 the loader. We need to make sure that it is out of the way of the program
1666 that it will "exec", and that there is sufficient room for the brk. */ 1717 that it will "exec", and that there is sufficient room for the brk. */
@@ -1683,7 +1734,7 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/elf.h linux-2.6.32.7/arch/pow
1683 1734
1684 /* 1735 /*
1685 * Our registers are always unsigned longs, whether we're a 32 bit 1736 * Our registers are always unsigned longs, whether we're a 32 bit
1686@@ -279,9 +290,6 @@ extern int arch_setup_additional_pages(s 1737@@ -275,9 +286,6 @@ extern int arch_setup_additional_pages(s
1687 (0x7ff >> (PAGE_SHIFT - 12)) : \ 1738 (0x7ff >> (PAGE_SHIFT - 12)) : \
1688 (0x3ffff >> (PAGE_SHIFT - 12))) 1739 (0x3ffff >> (PAGE_SHIFT - 12)))
1689 1740
@@ -1693,9 +1744,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/elf.h linux-2.6.32.7/arch/pow
1693 #endif /* __KERNEL__ */ 1744 #endif /* __KERNEL__ */
1694 1745
1695 /* 1746 /*
1696diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/iommu.h linux-2.6.32.7/arch/powerpc/include/asm/iommu.h 1747diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/iommu.h linux-2.6.32.8/arch/powerpc/include/asm/iommu.h
1697--- linux-2.6.32.7/arch/powerpc/include/asm/iommu.h 2010-01-25 13:50:10.000000000 -0500 1748--- linux-2.6.32.8/arch/powerpc/include/asm/iommu.h 2010-02-09 07:57:19.000000000 -0500
1698+++ linux-2.6.32.7/arch/powerpc/include/asm/iommu.h 2010-01-25 17:39:40.261410306 -0500 1749+++ linux-2.6.32.8/arch/powerpc/include/asm/iommu.h 2010-02-10 15:06:23.931021836 -0500
1699@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi 1750@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
1700 extern void iommu_init_early_dart(void); 1751 extern void iommu_init_early_dart(void);
1701 extern void iommu_init_early_pasemi(void); 1752 extern void iommu_init_early_pasemi(void);
@@ -1706,9 +1757,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/iommu.h linux-2.6.32.7/arch/p
1706 #ifdef CONFIG_PCI 1757 #ifdef CONFIG_PCI
1707 extern void pci_iommu_init(void); 1758 extern void pci_iommu_init(void);
1708 extern void pci_direct_iommu_init(void); 1759 extern void pci_direct_iommu_init(void);
1709diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.7/arch/powerpc/include/asm/kmap_types.h 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
1710--- linux-2.6.32.7/arch/powerpc/include/asm/kmap_types.h 2010-01-25 13:50:10.000000000 -0500 1761--- linux-2.6.32.8/arch/powerpc/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500
1711+++ linux-2.6.32.7/arch/powerpc/include/asm/kmap_types.h 2010-01-25 17:39:40.261410306 -0500 1762+++ linux-2.6.32.8/arch/powerpc/include/asm/kmap_types.h 2010-02-10 15:06:23.931021836 -0500
1712@@ -26,6 +26,7 @@ enum km_type { 1763@@ -26,6 +26,7 @@ enum km_type {
1713 KM_SOFTIRQ1, 1764 KM_SOFTIRQ1,
1714 KM_PPC_SYNC_PAGE, 1765 KM_PPC_SYNC_PAGE,
@@ -1717,9 +1768,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.7/a
1717 KM_TYPE_NR 1768 KM_TYPE_NR
1718 }; 1769 };
1719 1770
1720diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/page_64.h linux-2.6.32.7/arch/powerpc/include/asm/page_64.h 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
1721--- linux-2.6.32.7/arch/powerpc/include/asm/page_64.h 2010-01-25 13:50:10.000000000 -0500 1772--- linux-2.6.32.8/arch/powerpc/include/asm/page_64.h 2010-02-09 07:57:19.000000000 -0500
1722+++ linux-2.6.32.7/arch/powerpc/include/asm/page_64.h 2010-01-25 17:39:40.262409905 -0500 1773+++ linux-2.6.32.8/arch/powerpc/include/asm/page_64.h 2010-02-10 15:06:23.931021836 -0500
1723@@ -180,15 +180,18 @@ do { \ 1774@@ -180,15 +180,18 @@ do { \
1724 * stack by default, so in the absense of a PT_GNU_STACK program header 1775 * stack by default, so in the absense of a PT_GNU_STACK program header
1725 * we turn execute permission off. 1776 * we turn execute permission off.
@@ -1741,9 +1792,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/page_64.h linux-2.6.32.7/arch
1741 1792
1742 #include <asm-generic/getorder.h> 1793 #include <asm-generic/getorder.h>
1743 1794
1744diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/page.h linux-2.6.32.7/arch/powerpc/include/asm/page.h 1795diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/page.h linux-2.6.32.8/arch/powerpc/include/asm/page.h
1745--- linux-2.6.32.7/arch/powerpc/include/asm/page.h 2010-01-25 13:50:10.000000000 -0500 1796--- linux-2.6.32.8/arch/powerpc/include/asm/page.h 2010-02-09 07:57:19.000000000 -0500
1746+++ linux-2.6.32.7/arch/powerpc/include/asm/page.h 2010-01-25 17:39:40.262409905 -0500 1797+++ linux-2.6.32.8/arch/powerpc/include/asm/page.h 2010-02-10 15:06:23.931021836 -0500
1747@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; 1798@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
1748 * and needs to be executable. This means the whole heap ends 1799 * and needs to be executable. This means the whole heap ends
1749 * up being executable. 1800 * up being executable.
@@ -1756,9 +1807,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/page.h linux-2.6.32.7/arch/po
1756 1807
1757 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ 1808 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
1758 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) 1809 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
1759diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/pci.h linux-2.6.32.7/arch/powerpc/include/asm/pci.h 1810diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/pci.h linux-2.6.32.8/arch/powerpc/include/asm/pci.h
1760--- linux-2.6.32.7/arch/powerpc/include/asm/pci.h 2010-01-25 13:50:10.000000000 -0500 1811--- linux-2.6.32.8/arch/powerpc/include/asm/pci.h 2010-02-09 07:57:19.000000000 -0500
1761+++ linux-2.6.32.7/arch/powerpc/include/asm/pci.h 2010-01-25 17:39:40.262409905 -0500 1812+++ linux-2.6.32.8/arch/powerpc/include/asm/pci.h 2010-02-10 15:06:23.931021836 -0500
1762@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq 1813@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
1763 } 1814 }
1764 1815
@@ -1770,9 +1821,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/pci.h linux-2.6.32.7/arch/pow
1770 #else /* CONFIG_PCI */ 1821 #else /* CONFIG_PCI */
1771 #define set_pci_dma_ops(d) 1822 #define set_pci_dma_ops(d)
1772 #define get_pci_dma_ops() NULL 1823 #define get_pci_dma_ops() NULL
1773diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/pte-common.h linux-2.6.32.7/arch/powerpc/include/asm/pte-common.h 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
1774--- linux-2.6.32.7/arch/powerpc/include/asm/pte-common.h 2010-01-25 13:50:10.000000000 -0500 1825--- linux-2.6.32.8/arch/powerpc/include/asm/pte-common.h 2010-02-09 07:57:19.000000000 -0500
1775+++ linux-2.6.32.7/arch/powerpc/include/asm/pte-common.h 2010-01-25 17:39:40.262409905 -0500 1826+++ linux-2.6.32.8/arch/powerpc/include/asm/pte-common.h 2010-02-10 15:06:23.931021836 -0500
1776@@ -123,11 +123,11 @@ extern unsigned long bad_call_to_PMD_PAG 1827@@ -123,11 +123,11 @@ extern unsigned long bad_call_to_PMD_PAG
1777 */ 1828 */
1778 #define PAGE_NONE __pgprot(_PAGE_BASE) 1829 #define PAGE_NONE __pgprot(_PAGE_BASE)
@@ -1788,9 +1839,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/pte-common.h linux-2.6.32.7/a
1788 1839
1789 #define __P000 PAGE_NONE 1840 #define __P000 PAGE_NONE
1790 #define __P001 PAGE_READONLY 1841 #define __P001 PAGE_READONLY
1791diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.7/arch/powerpc/include/asm/pte-hash32.h 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
1792--- linux-2.6.32.7/arch/powerpc/include/asm/pte-hash32.h 2010-01-25 13:50:10.000000000 -0500 1843--- linux-2.6.32.8/arch/powerpc/include/asm/pte-hash32.h 2010-02-09 07:57:19.000000000 -0500
1793+++ linux-2.6.32.7/arch/powerpc/include/asm/pte-hash32.h 2010-01-25 17:39:40.262409905 -0500 1844+++ linux-2.6.32.8/arch/powerpc/include/asm/pte-hash32.h 2010-02-10 15:06:23.931021836 -0500
1794@@ -21,6 +21,7 @@ 1845@@ -21,6 +21,7 @@
1795 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ 1846 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
1796 #define _PAGE_USER 0x004 /* usermode access allowed */ 1847 #define _PAGE_USER 0x004 /* usermode access allowed */
@@ -1799,9 +1850,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.7/a
1799 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ 1850 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
1800 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ 1851 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
1801 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ 1852 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
1802diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/reg.h linux-2.6.32.7/arch/powerpc/include/asm/reg.h 1853diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/reg.h linux-2.6.32.8/arch/powerpc/include/asm/reg.h
1803--- linux-2.6.32.7/arch/powerpc/include/asm/reg.h 2010-01-25 13:50:10.000000000 -0500 1854--- linux-2.6.32.8/arch/powerpc/include/asm/reg.h 2010-02-09 07:57:19.000000000 -0500
1804+++ linux-2.6.32.7/arch/powerpc/include/asm/reg.h 2010-01-25 17:39:40.262409905 -0500 1855+++ linux-2.6.32.8/arch/powerpc/include/asm/reg.h 2010-02-10 15:06:23.931021836 -0500
1805@@ -191,6 +191,7 @@ 1856@@ -191,6 +191,7 @@
1806 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ 1857 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
1807 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ 1858 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -1810,9 +1861,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/reg.h linux-2.6.32.7/arch/pow
1810 #define DSISR_PROTFAULT 0x08000000 /* protection fault */ 1861 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
1811 #define DSISR_ISSTORE 0x02000000 /* access was a store */ 1862 #define DSISR_ISSTORE 0x02000000 /* access was a store */
1812 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ 1863 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
1813diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.7/arch/powerpc/include/asm/swiotlb.h 1864diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.8/arch/powerpc/include/asm/swiotlb.h
1814--- linux-2.6.32.7/arch/powerpc/include/asm/swiotlb.h 2010-01-25 13:50:10.000000000 -0500 1865--- linux-2.6.32.8/arch/powerpc/include/asm/swiotlb.h 2010-02-09 07:57:19.000000000 -0500
1815+++ linux-2.6.32.7/arch/powerpc/include/asm/swiotlb.h 2010-01-25 17:39:40.263419284 -0500 1866+++ linux-2.6.32.8/arch/powerpc/include/asm/swiotlb.h 2010-02-10 15:06:23.931021836 -0500
1816@@ -13,7 +13,7 @@ 1867@@ -13,7 +13,7 @@
1817 1868
1818 #include <linux/swiotlb.h> 1869 #include <linux/swiotlb.h>
@@ -1822,9 +1873,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.7/arch
1822 1873
1823 static inline void dma_mark_clean(void *addr, size_t size) {} 1874 static inline void dma_mark_clean(void *addr, size_t size) {}
1824 1875
1825diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/uaccess.h linux-2.6.32.7/arch/powerpc/include/asm/uaccess.h 1876diff -urNp linux-2.6.32.8/arch/powerpc/include/asm/uaccess.h linux-2.6.32.8/arch/powerpc/include/asm/uaccess.h
1826--- linux-2.6.32.7/arch/powerpc/include/asm/uaccess.h 2010-01-25 13:50:10.000000000 -0500 1877--- linux-2.6.32.8/arch/powerpc/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500
1827+++ linux-2.6.32.7/arch/powerpc/include/asm/uaccess.h 2010-01-25 17:39:40.263419284 -0500 1878+++ linux-2.6.32.8/arch/powerpc/include/asm/uaccess.h 2010-02-10 15:06:23.931021836 -0500
1828@@ -327,52 +327,6 @@ do { \ 1879@@ -327,52 +327,6 @@ do { \
1829 extern unsigned long __copy_tofrom_user(void __user *to, 1880 extern unsigned long __copy_tofrom_user(void __user *to,
1830 const void __user *from, unsigned long size); 1881 const void __user *from, unsigned long size);
@@ -1993,9 +2044,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/include/asm/uaccess.h linux-2.6.32.7/arch
1993 extern unsigned long __clear_user(void __user *addr, unsigned long size); 2044 extern unsigned long __clear_user(void __user *addr, unsigned long size);
1994 2045
1995 static inline unsigned long clear_user(void __user *addr, unsigned long size) 2046 static inline unsigned long clear_user(void __user *addr, unsigned long size)
1996diff -urNp linux-2.6.32.7/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.7/arch/powerpc/kernel/cacheinfo.c 2047diff -urNp linux-2.6.32.8/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.8/arch/powerpc/kernel/cacheinfo.c
1997--- linux-2.6.32.7/arch/powerpc/kernel/cacheinfo.c 2010-01-25 13:50:10.000000000 -0500 2048--- linux-2.6.32.8/arch/powerpc/kernel/cacheinfo.c 2010-02-09 07:57:19.000000000 -0500
1998+++ linux-2.6.32.7/arch/powerpc/kernel/cacheinfo.c 2010-01-25 17:39:40.263419284 -0500 2049+++ linux-2.6.32.8/arch/powerpc/kernel/cacheinfo.c 2010-02-10 15:06:23.931021836 -0500
1999@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde 2050@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
2000 &cache_assoc_attr, 2051 &cache_assoc_attr,
2001 }; 2052 };
@@ -2005,9 +2056,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.7/arch/po
2005 .show = cache_index_show, 2056 .show = cache_index_show,
2006 }; 2057 };
2007 2058
2008diff -urNp linux-2.6.32.7/arch/powerpc/kernel/dma.c linux-2.6.32.7/arch/powerpc/kernel/dma.c 2059diff -urNp linux-2.6.32.8/arch/powerpc/kernel/dma.c linux-2.6.32.8/arch/powerpc/kernel/dma.c
2009--- linux-2.6.32.7/arch/powerpc/kernel/dma.c 2010-01-25 13:50:10.000000000 -0500 2060--- linux-2.6.32.8/arch/powerpc/kernel/dma.c 2010-02-09 07:57:19.000000000 -0500
2010+++ linux-2.6.32.7/arch/powerpc/kernel/dma.c 2010-01-25 17:39:40.263419284 -0500 2061+++ linux-2.6.32.8/arch/powerpc/kernel/dma.c 2010-02-10 15:06:23.931021836 -0500
2011@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl 2062@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
2012 } 2063 }
2013 #endif 2064 #endif
@@ -2017,9 +2068,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/dma.c linux-2.6.32.7/arch/powerpc/
2017 .alloc_coherent = dma_direct_alloc_coherent, 2068 .alloc_coherent = dma_direct_alloc_coherent,
2018 .free_coherent = dma_direct_free_coherent, 2069 .free_coherent = dma_direct_free_coherent,
2019 .map_sg = dma_direct_map_sg, 2070 .map_sg = dma_direct_map_sg,
2020diff -urNp linux-2.6.32.7/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.7/arch/powerpc/kernel/dma-iommu.c 2071diff -urNp linux-2.6.32.8/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.8/arch/powerpc/kernel/dma-iommu.c
2021--- linux-2.6.32.7/arch/powerpc/kernel/dma-iommu.c 2010-01-25 13:50:10.000000000 -0500 2072--- linux-2.6.32.8/arch/powerpc/kernel/dma-iommu.c 2010-02-09 07:57:19.000000000 -0500
2022+++ linux-2.6.32.7/arch/powerpc/kernel/dma-iommu.c 2010-01-25 17:39:40.263419284 -0500 2073+++ linux-2.6.32.8/arch/powerpc/kernel/dma-iommu.c 2010-02-10 15:06:23.931021836 -0500
2023@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de 2074@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
2024 } 2075 }
2025 2076
@@ -2038,9 +2089,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.7/arch/po
2038 .alloc_coherent = dma_iommu_alloc_coherent, 2089 .alloc_coherent = dma_iommu_alloc_coherent,
2039 .free_coherent = dma_iommu_free_coherent, 2090 .free_coherent = dma_iommu_free_coherent,
2040 .map_sg = dma_iommu_map_sg, 2091 .map_sg = dma_iommu_map_sg,
2041diff -urNp linux-2.6.32.7/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.7/arch/powerpc/kernel/dma-swiotlb.c 2092diff -urNp linux-2.6.32.8/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.8/arch/powerpc/kernel/dma-swiotlb.c
2042--- linux-2.6.32.7/arch/powerpc/kernel/dma-swiotlb.c 2010-01-25 13:50:10.000000000 -0500 2093--- linux-2.6.32.8/arch/powerpc/kernel/dma-swiotlb.c 2010-02-09 07:57:19.000000000 -0500
2043+++ linux-2.6.32.7/arch/powerpc/kernel/dma-swiotlb.c 2010-01-25 17:39:40.263419284 -0500 2094+++ linux-2.6.32.8/arch/powerpc/kernel/dma-swiotlb.c 2010-02-10 15:06:23.931021836 -0500
2044@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; 2095@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
2045 * map_page, and unmap_page on highmem, use normal dma_ops 2096 * map_page, and unmap_page on highmem, use normal dma_ops
2046 * for everything else. 2097 * for everything else.
@@ -2050,9 +2101,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.7/arch/
2050 .alloc_coherent = dma_direct_alloc_coherent, 2101 .alloc_coherent = dma_direct_alloc_coherent,
2051 .free_coherent = dma_direct_free_coherent, 2102 .free_coherent = dma_direct_free_coherent,
2052 .map_sg = swiotlb_map_sg_attrs, 2103 .map_sg = swiotlb_map_sg_attrs,
2053diff -urNp linux-2.6.32.7/arch/powerpc/kernel/ibmebus.c linux-2.6.32.7/arch/powerpc/kernel/ibmebus.c 2104diff -urNp linux-2.6.32.8/arch/powerpc/kernel/ibmebus.c linux-2.6.32.8/arch/powerpc/kernel/ibmebus.c
2054--- linux-2.6.32.7/arch/powerpc/kernel/ibmebus.c 2010-01-25 13:50:10.000000000 -0500 2105--- linux-2.6.32.8/arch/powerpc/kernel/ibmebus.c 2010-02-09 07:57:19.000000000 -0500
2055+++ linux-2.6.32.7/arch/powerpc/kernel/ibmebus.c 2010-01-25 17:39:40.264411227 -0500 2106+++ linux-2.6.32.8/arch/powerpc/kernel/ibmebus.c 2010-02-10 15:06:23.931021836 -0500
2056@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct 2107@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
2057 return 1; 2108 return 1;
2058 } 2109 }
@@ -2062,9 +2113,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/ibmebus.c linux-2.6.32.7/arch/powe
2062 .alloc_coherent = ibmebus_alloc_coherent, 2113 .alloc_coherent = ibmebus_alloc_coherent,
2063 .free_coherent = ibmebus_free_coherent, 2114 .free_coherent = ibmebus_free_coherent,
2064 .map_sg = ibmebus_map_sg, 2115 .map_sg = ibmebus_map_sg,
2065diff -urNp linux-2.6.32.7/arch/powerpc/kernel/kgdb.c linux-2.6.32.7/arch/powerpc/kernel/kgdb.c 2116diff -urNp linux-2.6.32.8/arch/powerpc/kernel/kgdb.c linux-2.6.32.8/arch/powerpc/kernel/kgdb.c
2066--- linux-2.6.32.7/arch/powerpc/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500 2117--- linux-2.6.32.8/arch/powerpc/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500
2067+++ linux-2.6.32.7/arch/powerpc/kernel/kgdb.c 2010-01-25 17:39:40.264411227 -0500 2118+++ linux-2.6.32.8/arch/powerpc/kernel/kgdb.c 2010-02-10 15:06:23.931021836 -0500
2068@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct 2119@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
2069 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) 2120 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
2070 return 0; 2121 return 0;
@@ -2083,9 +2134,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/kgdb.c linux-2.6.32.7/arch/powerpc
2083 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, 2134 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
2084 }; 2135 };
2085 2136
2086diff -urNp linux-2.6.32.7/arch/powerpc/kernel/module_32.c linux-2.6.32.7/arch/powerpc/kernel/module_32.c 2137diff -urNp linux-2.6.32.8/arch/powerpc/kernel/module_32.c linux-2.6.32.8/arch/powerpc/kernel/module_32.c
2087--- linux-2.6.32.7/arch/powerpc/kernel/module_32.c 2010-01-25 13:50:10.000000000 -0500 2138--- linux-2.6.32.8/arch/powerpc/kernel/module_32.c 2010-02-09 07:57:19.000000000 -0500
2088+++ linux-2.6.32.7/arch/powerpc/kernel/module_32.c 2010-01-25 17:39:40.264411227 -0500 2139+++ linux-2.6.32.8/arch/powerpc/kernel/module_32.c 2010-02-10 15:06:23.931021836 -0500
2089@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr 2140@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
2090 me->arch.core_plt_section = i; 2141 me->arch.core_plt_section = i;
2091 } 2142 }
@@ -2115,9 +2166,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/module_32.c linux-2.6.32.7/arch/po
2115 2166
2116 /* Find this entry, or if that fails, the next avail. entry */ 2167 /* Find this entry, or if that fails, the next avail. entry */
2117 while (entry->jump[0]) { 2168 while (entry->jump[0]) {
2118diff -urNp linux-2.6.32.7/arch/powerpc/kernel/pci-common.c linux-2.6.32.7/arch/powerpc/kernel/pci-common.c 2169diff -urNp linux-2.6.32.8/arch/powerpc/kernel/pci-common.c linux-2.6.32.8/arch/powerpc/kernel/pci-common.c
2119--- linux-2.6.32.7/arch/powerpc/kernel/pci-common.c 2010-01-25 13:50:10.000000000 -0500 2170--- linux-2.6.32.8/arch/powerpc/kernel/pci-common.c 2010-02-09 07:57:19.000000000 -0500
2120+++ linux-2.6.32.7/arch/powerpc/kernel/pci-common.c 2010-01-25 17:39:40.264411227 -0500 2171+++ linux-2.6.32.8/arch/powerpc/kernel/pci-common.c 2010-02-10 15:06:23.931021836 -0500
2121@@ -50,14 +50,14 @@ resource_size_t isa_mem_base; 2172@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
2122 unsigned int ppc_pci_flags = 0; 2173 unsigned int ppc_pci_flags = 0;
2123 2174
@@ -2136,10 +2187,10 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/pci-common.c linux-2.6.32.7/arch/p
2136 { 2187 {
2137 return pci_dma_ops; 2188 return pci_dma_ops;
2138 } 2189 }
2139diff -urNp linux-2.6.32.7/arch/powerpc/kernel/process.c linux-2.6.32.7/arch/powerpc/kernel/process.c 2190diff -urNp linux-2.6.32.8/arch/powerpc/kernel/process.c linux-2.6.32.8/arch/powerpc/kernel/process.c
2140--- linux-2.6.32.7/arch/powerpc/kernel/process.c 2010-01-25 13:50:10.000000000 -0500 2191--- linux-2.6.32.8/arch/powerpc/kernel/process.c 2010-02-09 07:57:19.000000000 -0500
2141+++ linux-2.6.32.7/arch/powerpc/kernel/process.c 2010-01-25 17:39:40.265431637 -0500 2192+++ linux-2.6.32.8/arch/powerpc/kernel/process.c 2010-02-10 15:06:23.935496272 -0500
2142@@ -1153,51 +1153,3 @@ unsigned long arch_align_stack(unsigned 2193@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned
2143 sp -= get_random_int() & ~PAGE_MASK; 2194 sp -= get_random_int() & ~PAGE_MASK;
2144 return sp & ~0xf; 2195 return sp & ~0xf;
2145 } 2196 }
@@ -2191,9 +2242,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/process.c linux-2.6.32.7/arch/powe
2191- 2242-
2192- return ret; 2243- return ret;
2193-} 2244-}
2194diff -urNp linux-2.6.32.7/arch/powerpc/kernel/signal_32.c linux-2.6.32.7/arch/powerpc/kernel/signal_32.c 2245diff -urNp linux-2.6.32.8/arch/powerpc/kernel/signal_32.c linux-2.6.32.8/arch/powerpc/kernel/signal_32.c
2195--- linux-2.6.32.7/arch/powerpc/kernel/signal_32.c 2010-01-25 13:50:10.000000000 -0500 2246--- linux-2.6.32.8/arch/powerpc/kernel/signal_32.c 2010-02-09 07:57:19.000000000 -0500
2196+++ linux-2.6.32.7/arch/powerpc/kernel/signal_32.c 2010-01-25 17:39:40.265431637 -0500 2247+++ linux-2.6.32.8/arch/powerpc/kernel/signal_32.c 2010-02-10 15:06:23.935496272 -0500
2197@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig 2248@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
2198 /* Save user registers on the stack */ 2249 /* Save user registers on the stack */
2199 frame = &rt_sf->uc.uc_mcontext; 2250 frame = &rt_sf->uc.uc_mcontext;
@@ -2203,9 +2254,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/signal_32.c linux-2.6.32.7/arch/po
2203 if (save_user_regs(regs, frame, 0, 1)) 2254 if (save_user_regs(regs, frame, 0, 1))
2204 goto badframe; 2255 goto badframe;
2205 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; 2256 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
2206diff -urNp linux-2.6.32.7/arch/powerpc/kernel/signal_64.c linux-2.6.32.7/arch/powerpc/kernel/signal_64.c 2257diff -urNp linux-2.6.32.8/arch/powerpc/kernel/signal_64.c linux-2.6.32.8/arch/powerpc/kernel/signal_64.c
2207--- linux-2.6.32.7/arch/powerpc/kernel/signal_64.c 2010-01-25 13:50:10.000000000 -0500 2258--- linux-2.6.32.8/arch/powerpc/kernel/signal_64.c 2010-02-09 07:57:19.000000000 -0500
2208+++ linux-2.6.32.7/arch/powerpc/kernel/signal_64.c 2010-01-25 17:39:40.265431637 -0500 2259+++ linux-2.6.32.8/arch/powerpc/kernel/signal_64.c 2010-02-10 15:06:23.935496272 -0500
2209@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct 2260@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
2210 current->thread.fpscr.val = 0; 2261 current->thread.fpscr.val = 0;
2211 2262
@@ -2215,9 +2266,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/signal_64.c linux-2.6.32.7/arch/po
2215 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; 2266 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
2216 } else { 2267 } else {
2217 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); 2268 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
2218diff -urNp linux-2.6.32.7/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.7/arch/powerpc/kernel/sys_ppc32.c 2269diff -urNp linux-2.6.32.8/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.8/arch/powerpc/kernel/sys_ppc32.c
2219--- linux-2.6.32.7/arch/powerpc/kernel/sys_ppc32.c 2010-01-25 13:50:10.000000000 -0500 2270--- linux-2.6.32.8/arch/powerpc/kernel/sys_ppc32.c 2010-02-09 07:57:19.000000000 -0500
2220+++ linux-2.6.32.7/arch/powerpc/kernel/sys_ppc32.c 2010-01-25 17:39:40.265431637 -0500 2271+++ linux-2.6.32.8/arch/powerpc/kernel/sys_ppc32.c 2010-02-10 15:06:23.935496272 -0500
2221@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct 2272@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
2222 if (oldlenp) { 2273 if (oldlenp) {
2223 if (!error) { 2274 if (!error) {
@@ -2231,9 +2282,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.7/arch/po
2231 } 2282 }
2232 return error; 2283 return error;
2233 } 2284 }
2234diff -urNp linux-2.6.32.7/arch/powerpc/kernel/vdso.c linux-2.6.32.7/arch/powerpc/kernel/vdso.c 2285diff -urNp linux-2.6.32.8/arch/powerpc/kernel/vdso.c linux-2.6.32.8/arch/powerpc/kernel/vdso.c
2235--- linux-2.6.32.7/arch/powerpc/kernel/vdso.c 2010-01-25 13:50:10.000000000 -0500 2286--- linux-2.6.32.8/arch/powerpc/kernel/vdso.c 2010-02-09 07:57:19.000000000 -0500
2236+++ linux-2.6.32.7/arch/powerpc/kernel/vdso.c 2010-01-25 17:39:40.265431637 -0500 2287+++ linux-2.6.32.8/arch/powerpc/kernel/vdso.c 2010-02-10 15:06:23.935496272 -0500
2237@@ -36,6 +36,7 @@ 2288@@ -36,6 +36,7 @@
2238 #include <asm/firmware.h> 2289 #include <asm/firmware.h>
2239 #include <asm/vdso.h> 2290 #include <asm/vdso.h>
@@ -2260,9 +2311,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/vdso.c linux-2.6.32.7/arch/powerpc
2260 if (IS_ERR_VALUE(vdso_base)) { 2311 if (IS_ERR_VALUE(vdso_base)) {
2261 rc = vdso_base; 2312 rc = vdso_base;
2262 goto fail_mmapsem; 2313 goto fail_mmapsem;
2263diff -urNp linux-2.6.32.7/arch/powerpc/kernel/vio.c linux-2.6.32.7/arch/powerpc/kernel/vio.c 2314diff -urNp linux-2.6.32.8/arch/powerpc/kernel/vio.c linux-2.6.32.8/arch/powerpc/kernel/vio.c
2264--- linux-2.6.32.7/arch/powerpc/kernel/vio.c 2010-01-25 13:50:10.000000000 -0500 2315--- linux-2.6.32.8/arch/powerpc/kernel/vio.c 2010-02-09 07:57:19.000000000 -0500
2265+++ linux-2.6.32.7/arch/powerpc/kernel/vio.c 2010-01-25 17:39:40.266406212 -0500 2316+++ linux-2.6.32.8/arch/powerpc/kernel/vio.c 2010-02-10 15:06:23.935496272 -0500
2266@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc 2317@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
2267 vio_cmo_dealloc(viodev, alloc_size); 2318 vio_cmo_dealloc(viodev, alloc_size);
2268 } 2319 }
@@ -2285,9 +2336,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/kernel/vio.c linux-2.6.32.7/arch/powerpc/
2285 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; 2336 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
2286 } 2337 }
2287 2338
2288diff -urNp linux-2.6.32.7/arch/powerpc/lib/usercopy_64.c linux-2.6.32.7/arch/powerpc/lib/usercopy_64.c 2339diff -urNp linux-2.6.32.8/arch/powerpc/lib/usercopy_64.c linux-2.6.32.8/arch/powerpc/lib/usercopy_64.c
2289--- linux-2.6.32.7/arch/powerpc/lib/usercopy_64.c 2010-01-25 13:50:10.000000000 -0500 2340--- linux-2.6.32.8/arch/powerpc/lib/usercopy_64.c 2010-02-09 07:57:19.000000000 -0500
2290+++ linux-2.6.32.7/arch/powerpc/lib/usercopy_64.c 2010-01-25 17:39:40.266406212 -0500 2341+++ linux-2.6.32.8/arch/powerpc/lib/usercopy_64.c 2010-02-10 15:06:23.935496272 -0500
2291@@ -9,22 +9,6 @@ 2342@@ -9,22 +9,6 @@
2292 #include <linux/module.h> 2343 #include <linux/module.h>
2293 #include <asm/uaccess.h> 2344 #include <asm/uaccess.h>
@@ -2319,9 +2370,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/lib/usercopy_64.c linux-2.6.32.7/arch/pow
2319-EXPORT_SYMBOL(copy_to_user); 2370-EXPORT_SYMBOL(copy_to_user);
2320 EXPORT_SYMBOL(copy_in_user); 2371 EXPORT_SYMBOL(copy_in_user);
2321 2372
2322diff -urNp linux-2.6.32.7/arch/powerpc/mm/fault.c linux-2.6.32.7/arch/powerpc/mm/fault.c 2373diff -urNp linux-2.6.32.8/arch/powerpc/mm/fault.c linux-2.6.32.8/arch/powerpc/mm/fault.c
2323--- linux-2.6.32.7/arch/powerpc/mm/fault.c 2010-01-25 13:50:10.000000000 -0500 2374--- linux-2.6.32.8/arch/powerpc/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
2324+++ linux-2.6.32.7/arch/powerpc/mm/fault.c 2010-01-25 17:39:40.266406212 -0500 2375+++ linux-2.6.32.8/arch/powerpc/mm/fault.c 2010-02-10 15:06:23.935496272 -0500
2325@@ -30,6 +30,10 @@ 2376@@ -30,6 +30,10 @@
2326 #include <linux/kprobes.h> 2377 #include <linux/kprobes.h>
2327 #include <linux/kdebug.h> 2378 #include <linux/kdebug.h>
@@ -2426,9 +2477,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/mm/fault.c linux-2.6.32.7/arch/powerpc/mm
2426 _exception(SIGSEGV, regs, code, address); 2477 _exception(SIGSEGV, regs, code, address);
2427 return 0; 2478 return 0;
2428 } 2479 }
2429diff -urNp linux-2.6.32.7/arch/powerpc/mm/mmap_64.c linux-2.6.32.7/arch/powerpc/mm/mmap_64.c 2480diff -urNp linux-2.6.32.8/arch/powerpc/mm/mmap_64.c linux-2.6.32.8/arch/powerpc/mm/mmap_64.c
2430--- linux-2.6.32.7/arch/powerpc/mm/mmap_64.c 2010-01-25 13:50:10.000000000 -0500 2481--- linux-2.6.32.8/arch/powerpc/mm/mmap_64.c 2010-02-09 07:57:19.000000000 -0500
2431+++ linux-2.6.32.7/arch/powerpc/mm/mmap_64.c 2010-01-25 17:39:40.266406212 -0500 2482+++ linux-2.6.32.8/arch/powerpc/mm/mmap_64.c 2010-02-10 15:06:23.935496272 -0500
2432@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str 2483@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
2433 */ 2484 */
2434 if (mmap_is_legacy()) { 2485 if (mmap_is_legacy()) {
@@ -2452,9 +2503,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/mm/mmap_64.c linux-2.6.32.7/arch/powerpc/
2452 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 2503 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
2453 mm->unmap_area = arch_unmap_area_topdown; 2504 mm->unmap_area = arch_unmap_area_topdown;
2454 } 2505 }
2455diff -urNp linux-2.6.32.7/arch/powerpc/mm/slice.c linux-2.6.32.7/arch/powerpc/mm/slice.c 2506diff -urNp linux-2.6.32.8/arch/powerpc/mm/slice.c linux-2.6.32.8/arch/powerpc/mm/slice.c
2456--- linux-2.6.32.7/arch/powerpc/mm/slice.c 2010-01-25 13:50:10.000000000 -0500 2507--- linux-2.6.32.8/arch/powerpc/mm/slice.c 2010-02-09 07:57:19.000000000 -0500
2457+++ linux-2.6.32.7/arch/powerpc/mm/slice.c 2010-01-25 17:39:40.267414851 -0500 2508+++ linux-2.6.32.8/arch/powerpc/mm/slice.c 2010-02-10 15:06:23.935496272 -0500
2458@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un 2509@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
2459 if (fixed && addr > (mm->task_size - len)) 2510 if (fixed && addr > (mm->task_size - len))
2460 return -EINVAL; 2511 return -EINVAL;
@@ -2467,9 +2518,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/mm/slice.c linux-2.6.32.7/arch/powerpc/mm
2467 /* If hint, make sure it matches our alignment restrictions */ 2518 /* If hint, make sure it matches our alignment restrictions */
2468 if (!fixed && addr) { 2519 if (!fixed && addr) {
2469 addr = _ALIGN_UP(addr, 1ul << pshift); 2520 addr = _ALIGN_UP(addr, 1ul << pshift);
2470diff -urNp linux-2.6.32.7/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.7/arch/powerpc/platforms/52xx/lite5200_pm.c 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
2471--- linux-2.6.32.7/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-01-25 13:50:10.000000000 -0500 2522--- linux-2.6.32.8/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-02-09 07:57:19.000000000 -0500
2472+++ linux-2.6.32.7/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-01-25 17:39:40.267414851 -0500 2523+++ linux-2.6.32.8/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-02-10 15:06:23.935496272 -0500
2473@@ -235,7 +235,7 @@ static void lite5200_pm_end(void) 2524@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
2474 lite5200_pm_target_state = PM_SUSPEND_ON; 2525 lite5200_pm_target_state = PM_SUSPEND_ON;
2475 } 2526 }
@@ -2479,9 +2530,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32
2479 .valid = lite5200_pm_valid, 2530 .valid = lite5200_pm_valid,
2480 .begin = lite5200_pm_begin, 2531 .begin = lite5200_pm_begin,
2481 .prepare = lite5200_pm_prepare, 2532 .prepare = lite5200_pm_prepare,
2482diff -urNp linux-2.6.32.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c 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
2483--- linux-2.6.32.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-01-25 13:50:10.000000000 -0500 2534--- linux-2.6.32.8/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-02-09 07:57:19.000000000 -0500
2484+++ linux-2.6.32.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-01-25 17:39:40.267414851 -0500 2535+++ linux-2.6.32.8/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-02-10 15:06:23.935496272 -0500
2485@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) 2536@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
2486 iounmap(mbar); 2537 iounmap(mbar);
2487 } 2538 }
@@ -2491,9 +2542,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.
2491 .valid = mpc52xx_pm_valid, 2542 .valid = mpc52xx_pm_valid,
2492 .prepare = mpc52xx_pm_prepare, 2543 .prepare = mpc52xx_pm_prepare,
2493 .enter = mpc52xx_pm_enter, 2544 .enter = mpc52xx_pm_enter,
2494diff -urNp linux-2.6.32.7/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.7/arch/powerpc/platforms/83xx/suspend.c 2545diff -urNp linux-2.6.32.8/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.8/arch/powerpc/platforms/83xx/suspend.c
2495--- linux-2.6.32.7/arch/powerpc/platforms/83xx/suspend.c 2010-01-25 13:50:10.000000000 -0500 2546--- linux-2.6.32.8/arch/powerpc/platforms/83xx/suspend.c 2010-02-09 07:57:19.000000000 -0500
2496+++ linux-2.6.32.7/arch/powerpc/platforms/83xx/suspend.c 2010-01-25 17:39:40.267414851 -0500 2547+++ linux-2.6.32.8/arch/powerpc/platforms/83xx/suspend.c 2010-02-10 15:06:23.935496272 -0500
2497@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) 2548@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
2498 return ret; 2549 return ret;
2499 } 2550 }
@@ -2503,9 +2554,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.7/a
2503 .valid = mpc83xx_suspend_valid, 2554 .valid = mpc83xx_suspend_valid,
2504 .begin = mpc83xx_suspend_begin, 2555 .begin = mpc83xx_suspend_begin,
2505 .enter = mpc83xx_suspend_enter, 2556 .enter = mpc83xx_suspend_enter,
2506diff -urNp linux-2.6.32.7/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.7/arch/powerpc/platforms/cell/iommu.c 2557diff -urNp linux-2.6.32.8/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.8/arch/powerpc/platforms/cell/iommu.c
2507--- linux-2.6.32.7/arch/powerpc/platforms/cell/iommu.c 2010-01-25 13:50:10.000000000 -0500 2558--- linux-2.6.32.8/arch/powerpc/platforms/cell/iommu.c 2010-02-09 07:57:19.000000000 -0500
2508+++ linux-2.6.32.7/arch/powerpc/platforms/cell/iommu.c 2010-01-25 17:39:40.268213794 -0500 2559+++ linux-2.6.32.8/arch/powerpc/platforms/cell/iommu.c 2010-02-10 15:06:23.935496272 -0500
2509@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc 2560@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
2510 2561
2511 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); 2562 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -2515,9 +2566,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.7/arc
2515 .alloc_coherent = dma_fixed_alloc_coherent, 2566 .alloc_coherent = dma_fixed_alloc_coherent,
2516 .free_coherent = dma_fixed_free_coherent, 2567 .free_coherent = dma_fixed_free_coherent,
2517 .map_sg = dma_fixed_map_sg, 2568 .map_sg = dma_fixed_map_sg,
2518diff -urNp linux-2.6.32.7/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.7/arch/powerpc/platforms/ps3/system-bus.c 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
2519--- linux-2.6.32.7/arch/powerpc/platforms/ps3/system-bus.c 2010-01-25 13:50:10.000000000 -0500 2570--- linux-2.6.32.8/arch/powerpc/platforms/ps3/system-bus.c 2010-02-09 07:57:19.000000000 -0500
2520+++ linux-2.6.32.7/arch/powerpc/platforms/ps3/system-bus.c 2010-01-25 17:39:40.268213794 -0500 2571+++ linux-2.6.32.8/arch/powerpc/platforms/ps3/system-bus.c 2010-02-10 15:06:23.935496272 -0500
2521@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi 2572@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
2522 return mask >= DMA_BIT_MASK(32); 2573 return mask >= DMA_BIT_MASK(32);
2523 } 2574 }
@@ -2536,9 +2587,9 @@ diff -urNp linux-2.6.32.7/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.7
2536 .alloc_coherent = ps3_alloc_coherent, 2587 .alloc_coherent = ps3_alloc_coherent,
2537 .free_coherent = ps3_free_coherent, 2588 .free_coherent = ps3_free_coherent,
2538 .map_sg = ps3_ioc0_map_sg, 2589 .map_sg = ps3_ioc0_map_sg,
2539diff -urNp linux-2.6.32.7/arch/s390/include/asm/uaccess.h linux-2.6.32.7/arch/s390/include/asm/uaccess.h 2590diff -urNp linux-2.6.32.8/arch/s390/include/asm/uaccess.h linux-2.6.32.8/arch/s390/include/asm/uaccess.h
2540--- linux-2.6.32.7/arch/s390/include/asm/uaccess.h 2010-01-25 13:50:10.000000000 -0500 2591--- linux-2.6.32.8/arch/s390/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500
2541+++ linux-2.6.32.7/arch/s390/include/asm/uaccess.h 2010-01-25 17:39:40.268213794 -0500 2592+++ linux-2.6.32.8/arch/s390/include/asm/uaccess.h 2010-02-10 15:06:23.935496272 -0500
2542@@ -232,6 +232,10 @@ static inline unsigned long __must_check 2593@@ -232,6 +232,10 @@ static inline unsigned long __must_check
2543 copy_to_user(void __user *to, const void *from, unsigned long n) 2594 copy_to_user(void __user *to, const void *from, unsigned long n)
2544 { 2595 {
@@ -2571,9 +2622,9 @@ diff -urNp linux-2.6.32.7/arch/s390/include/asm/uaccess.h linux-2.6.32.7/arch/s3
2571 if (access_ok(VERIFY_READ, from, n)) 2622 if (access_ok(VERIFY_READ, from, n))
2572 n = __copy_from_user(to, from, n); 2623 n = __copy_from_user(to, from, n);
2573 else 2624 else
2574diff -urNp linux-2.6.32.7/arch/s390/kernel/module.c linux-2.6.32.7/arch/s390/kernel/module.c 2625diff -urNp linux-2.6.32.8/arch/s390/kernel/module.c linux-2.6.32.8/arch/s390/kernel/module.c
2575--- linux-2.6.32.7/arch/s390/kernel/module.c 2010-01-25 13:50:10.000000000 -0500 2626--- linux-2.6.32.8/arch/s390/kernel/module.c 2010-02-09 07:57:19.000000000 -0500
2576+++ linux-2.6.32.7/arch/s390/kernel/module.c 2010-01-25 17:39:40.268213794 -0500 2627+++ linux-2.6.32.8/arch/s390/kernel/module.c 2010-02-10 15:06:23.935496272 -0500
2577@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, 2628@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
2578 2629
2579 /* Increase core size by size of got & plt and set start 2630 /* Increase core size by size of got & plt and set start
@@ -2645,9 +2696,9 @@ diff -urNp linux-2.6.32.7/arch/s390/kernel/module.c linux-2.6.32.7/arch/s390/ker
2645 rela->r_addend - loc; 2696 rela->r_addend - loc;
2646 if (r_type == R_390_GOTPC) 2697 if (r_type == R_390_GOTPC)
2647 *(unsigned int *) loc = val; 2698 *(unsigned int *) loc = val;
2648diff -urNp linux-2.6.32.7/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.7/arch/sh/boards/mach-hp6xx/pm.c 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
2649--- linux-2.6.32.7/arch/sh/boards/mach-hp6xx/pm.c 2010-01-25 13:50:10.000000000 -0500 2700--- linux-2.6.32.8/arch/sh/boards/mach-hp6xx/pm.c 2010-02-09 07:57:19.000000000 -0500
2650+++ linux-2.6.32.7/arch/sh/boards/mach-hp6xx/pm.c 2010-01-25 17:39:40.268213794 -0500 2701+++ linux-2.6.32.8/arch/sh/boards/mach-hp6xx/pm.c 2010-02-10 15:06:23.935496272 -0500
2651@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ 2702@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
2652 return 0; 2703 return 0;
2653 } 2704 }
@@ -2657,9 +2708,9 @@ diff -urNp linux-2.6.32.7/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.7/arch/sh/
2657 .enter = hp6x0_pm_enter, 2708 .enter = hp6x0_pm_enter,
2658 .valid = suspend_valid_only_mem, 2709 .valid = suspend_valid_only_mem,
2659 }; 2710 };
2660diff -urNp linux-2.6.32.7/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.7/arch/sh/kernel/cpu/sh4/sq.c 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
2661--- linux-2.6.32.7/arch/sh/kernel/cpu/sh4/sq.c 2010-01-25 13:50:10.000000000 -0500 2712--- linux-2.6.32.8/arch/sh/kernel/cpu/sh4/sq.c 2010-02-09 07:57:19.000000000 -0500
2662+++ linux-2.6.32.7/arch/sh/kernel/cpu/sh4/sq.c 2010-01-25 17:39:40.269407003 -0500 2713+++ linux-2.6.32.8/arch/sh/kernel/cpu/sh4/sq.c 2010-02-10 15:06:23.935496272 -0500
2663@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ 2714@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
2664 NULL, 2715 NULL,
2665 }; 2716 };
@@ -2669,9 +2720,9 @@ diff -urNp linux-2.6.32.7/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.7/arch/sh/ker
2669 .show = sq_sysfs_show, 2720 .show = sq_sysfs_show,
2670 .store = sq_sysfs_store, 2721 .store = sq_sysfs_store,
2671 }; 2722 };
2672diff -urNp linux-2.6.32.7/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.7/arch/sh/kernel/cpu/shmobile/pm.c 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
2673--- linux-2.6.32.7/arch/sh/kernel/cpu/shmobile/pm.c 2010-01-25 13:50:10.000000000 -0500 2724--- linux-2.6.32.8/arch/sh/kernel/cpu/shmobile/pm.c 2010-02-09 07:57:19.000000000 -0500
2674+++ linux-2.6.32.7/arch/sh/kernel/cpu/shmobile/pm.c 2010-01-25 17:39:40.269407003 -0500 2725+++ linux-2.6.32.8/arch/sh/kernel/cpu/shmobile/pm.c 2010-02-10 15:06:23.939491571 -0500
2675@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s 2726@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
2676 return 0; 2727 return 0;
2677 } 2728 }
@@ -2681,9 +2732,9 @@ diff -urNp linux-2.6.32.7/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.7/arch/s
2681 .enter = sh_pm_enter, 2732 .enter = sh_pm_enter,
2682 .valid = suspend_valid_only_mem, 2733 .valid = suspend_valid_only_mem,
2683 }; 2734 };
2684diff -urNp linux-2.6.32.7/arch/sh/kernel/kgdb.c linux-2.6.32.7/arch/sh/kernel/kgdb.c 2735diff -urNp linux-2.6.32.8/arch/sh/kernel/kgdb.c linux-2.6.32.8/arch/sh/kernel/kgdb.c
2685--- linux-2.6.32.7/arch/sh/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500 2736--- linux-2.6.32.8/arch/sh/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500
2686+++ linux-2.6.32.7/arch/sh/kernel/kgdb.c 2010-01-25 17:39:40.269407003 -0500 2737+++ linux-2.6.32.8/arch/sh/kernel/kgdb.c 2010-02-10 15:06:23.939491571 -0500
2687@@ -271,7 +271,7 @@ void kgdb_arch_exit(void) 2738@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
2688 { 2739 {
2689 } 2740 }
@@ -2693,9 +2744,9 @@ diff -urNp linux-2.6.32.7/arch/sh/kernel/kgdb.c linux-2.6.32.7/arch/sh/kernel/kg
2693 /* Breakpoint instruction: trapa #0x3c */ 2744 /* Breakpoint instruction: trapa #0x3c */
2694 #ifdef CONFIG_CPU_LITTLE_ENDIAN 2745 #ifdef CONFIG_CPU_LITTLE_ENDIAN
2695 .gdb_bpt_instr = { 0x3c, 0xc3 }, 2746 .gdb_bpt_instr = { 0x3c, 0xc3 },
2696diff -urNp linux-2.6.32.7/arch/sparc/include/asm/atomic_64.h linux-2.6.32.7/arch/sparc/include/asm/atomic_64.h 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
2697--- linux-2.6.32.7/arch/sparc/include/asm/atomic_64.h 2010-01-25 13:50:10.000000000 -0500 2748--- linux-2.6.32.8/arch/sparc/include/asm/atomic_64.h 2010-02-09 07:57:19.000000000 -0500
2698+++ linux-2.6.32.7/arch/sparc/include/asm/atomic_64.h 2010-01-25 17:39:40.269407003 -0500 2749+++ linux-2.6.32.8/arch/sparc/include/asm/atomic_64.h 2010-02-10 15:06:23.939491571 -0500
2699@@ -14,18 +14,26 @@ 2750@@ -14,18 +14,26 @@
2700 #define ATOMIC64_INIT(i) { (i) } 2751 #define ATOMIC64_INIT(i) { (i) }
2701 2752
@@ -2807,9 +2858,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/atomic_64.h linux-2.6.32.7/arch
2807 } 2858 }
2808 2859
2809 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) 2860 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
2810diff -urNp linux-2.6.32.7/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.7/arch/sparc/include/asm/dma-mapping.h 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
2811--- linux-2.6.32.7/arch/sparc/include/asm/dma-mapping.h 2010-01-25 13:50:10.000000000 -0500 2862--- linux-2.6.32.8/arch/sparc/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500
2812+++ linux-2.6.32.7/arch/sparc/include/asm/dma-mapping.h 2010-01-25 17:39:40.269407003 -0500 2863+++ linux-2.6.32.8/arch/sparc/include/asm/dma-mapping.h 2010-02-10 15:06:23.939491571 -0500
2813@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d 2864@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
2814 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) 2865 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
2815 #define dma_is_consistent(d, h) (1) 2866 #define dma_is_consistent(d, h) (1)
@@ -2841,9 +2892,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.7/ar
2841 2892
2842 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); 2893 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
2843 ops->free_coherent(dev, size, cpu_addr, dma_handle); 2894 ops->free_coherent(dev, size, cpu_addr, dma_handle);
2844diff -urNp linux-2.6.32.7/arch/sparc/include/asm/elf_32.h linux-2.6.32.7/arch/sparc/include/asm/elf_32.h 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
2845--- linux-2.6.32.7/arch/sparc/include/asm/elf_32.h 2010-01-25 13:50:10.000000000 -0500 2896--- linux-2.6.32.8/arch/sparc/include/asm/elf_32.h 2010-02-09 07:57:19.000000000 -0500
2846+++ linux-2.6.32.7/arch/sparc/include/asm/elf_32.h 2010-01-25 17:39:40.270305658 -0500 2897+++ linux-2.6.32.8/arch/sparc/include/asm/elf_32.h 2010-02-10 15:06:23.939491571 -0500
2847@@ -116,6 +116,13 @@ typedef struct { 2898@@ -116,6 +116,13 @@ typedef struct {
2848 2899
2849 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) 2900 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -2858,9 +2909,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/elf_32.h linux-2.6.32.7/arch/sp
2858 /* This yields a mask that user programs can use to figure out what 2909 /* This yields a mask that user programs can use to figure out what
2859 instruction set this cpu supports. This can NOT be done in userspace 2910 instruction set this cpu supports. This can NOT be done in userspace
2860 on Sparc. */ 2911 on Sparc. */
2861diff -urNp linux-2.6.32.7/arch/sparc/include/asm/elf_64.h linux-2.6.32.7/arch/sparc/include/asm/elf_64.h 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
2862--- linux-2.6.32.7/arch/sparc/include/asm/elf_64.h 2010-01-25 13:50:10.000000000 -0500 2913--- linux-2.6.32.8/arch/sparc/include/asm/elf_64.h 2010-02-09 07:57:19.000000000 -0500
2863+++ linux-2.6.32.7/arch/sparc/include/asm/elf_64.h 2010-01-25 17:39:40.270305658 -0500 2914+++ linux-2.6.32.8/arch/sparc/include/asm/elf_64.h 2010-02-10 15:06:23.939491571 -0500
2864@@ -163,6 +163,12 @@ typedef struct { 2915@@ -163,6 +163,12 @@ typedef struct {
2865 #define ELF_ET_DYN_BASE 0x0000010000000000UL 2916 #define ELF_ET_DYN_BASE 0x0000010000000000UL
2866 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL 2917 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -2874,9 +2925,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/elf_64.h linux-2.6.32.7/arch/sp
2874 2925
2875 /* This yields a mask that user programs can use to figure out what 2926 /* This yields a mask that user programs can use to figure out what
2876 instruction set this cpu supports. */ 2927 instruction set this cpu supports. */
2877diff -urNp linux-2.6.32.7/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.7/arch/sparc/include/asm/pgtable_32.h 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
2878--- linux-2.6.32.7/arch/sparc/include/asm/pgtable_32.h 2010-01-25 13:50:10.000000000 -0500 2929--- linux-2.6.32.8/arch/sparc/include/asm/pgtable_32.h 2010-02-09 07:57:19.000000000 -0500
2879+++ linux-2.6.32.7/arch/sparc/include/asm/pgtable_32.h 2010-01-25 17:39:40.270305658 -0500 2930+++ linux-2.6.32.8/arch/sparc/include/asm/pgtable_32.h 2010-02-10 15:06:23.939491571 -0500
2880@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) 2931@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
2881 BTFIXUPDEF_INT(page_none) 2932 BTFIXUPDEF_INT(page_none)
2882 BTFIXUPDEF_INT(page_copy) 2933 BTFIXUPDEF_INT(page_copy)
@@ -2908,9 +2959,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.7/arc
2908 extern unsigned long page_kernel; 2959 extern unsigned long page_kernel;
2909 2960
2910 #ifdef MODULE 2961 #ifdef MODULE
2911diff -urNp linux-2.6.32.7/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.7/arch/sparc/include/asm/pgtsrmmu.h 2962diff -urNp linux-2.6.32.8/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.8/arch/sparc/include/asm/pgtsrmmu.h
2912--- linux-2.6.32.7/arch/sparc/include/asm/pgtsrmmu.h 2010-01-25 13:50:10.000000000 -0500 2963--- linux-2.6.32.8/arch/sparc/include/asm/pgtsrmmu.h 2010-02-09 07:57:19.000000000 -0500
2913+++ linux-2.6.32.7/arch/sparc/include/asm/pgtsrmmu.h 2010-01-25 17:39:40.270305658 -0500 2964+++ linux-2.6.32.8/arch/sparc/include/asm/pgtsrmmu.h 2010-02-10 15:06:23.939491571 -0500
2914@@ -115,6 +115,13 @@ 2965@@ -115,6 +115,13 @@
2915 SRMMU_EXEC | SRMMU_REF) 2966 SRMMU_EXEC | SRMMU_REF)
2916 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ 2967 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -2925,9 +2976,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.7/arch/
2925 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ 2976 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
2926 SRMMU_DIRTY | SRMMU_REF) 2977 SRMMU_DIRTY | SRMMU_REF)
2927 2978
2928diff -urNp linux-2.6.32.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.7/arch/sparc/include/asm/spinlock_64.h 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
2929--- linux-2.6.32.7/arch/sparc/include/asm/spinlock_64.h 2010-01-25 13:50:10.000000000 -0500 2980--- linux-2.6.32.8/arch/sparc/include/asm/spinlock_64.h 2010-02-09 07:57:19.000000000 -0500
2930+++ linux-2.6.32.7/arch/sparc/include/asm/spinlock_64.h 2010-01-25 17:39:40.270305658 -0500 2981+++ linux-2.6.32.8/arch/sparc/include/asm/spinlock_64.h 2010-02-10 15:06:23.939491571 -0500
2931@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw 2982@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
2932 __asm__ __volatile__ ( 2983 __asm__ __volatile__ (
2933 "1: ldsw [%2], %0\n" 2984 "1: ldsw [%2], %0\n"
@@ -2979,9 +3030,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.7/ar
2979 " cas [%2], %0, %1\n" 3030 " cas [%2], %0, %1\n"
2980 " cmp %0, %1\n" 3031 " cmp %0, %1\n"
2981 " bne,pn %%xcc, 1b\n" 3032 " bne,pn %%xcc, 1b\n"
2982diff -urNp linux-2.6.32.7/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.7/arch/sparc/include/asm/uaccess_32.h 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
2983--- linux-2.6.32.7/arch/sparc/include/asm/uaccess_32.h 2010-01-25 13:50:10.000000000 -0500 3034--- linux-2.6.32.8/arch/sparc/include/asm/uaccess_32.h 2010-02-09 07:57:19.000000000 -0500
2984+++ linux-2.6.32.7/arch/sparc/include/asm/uaccess_32.h 2010-01-25 17:39:40.271168771 -0500 3035+++ linux-2.6.32.8/arch/sparc/include/asm/uaccess_32.h 2010-02-10 15:06:23.939491571 -0500
2985@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ 3036@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
2986 3037
2987 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) 3038 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3033,9 +3084,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.7/arc
3033 return __copy_user((__force void __user *) to, from, n); 3084 return __copy_user((__force void __user *) to, from, n);
3034 } 3085 }
3035 3086
3036diff -urNp linux-2.6.32.7/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.7/arch/sparc/include/asm/uaccess_64.h 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
3037--- linux-2.6.32.7/arch/sparc/include/asm/uaccess_64.h 2010-01-25 13:50:10.000000000 -0500 3088--- linux-2.6.32.8/arch/sparc/include/asm/uaccess_64.h 2010-02-09 07:57:19.000000000 -0500
3038+++ linux-2.6.32.7/arch/sparc/include/asm/uaccess_64.h 2010-01-25 17:39:40.271168771 -0500 3089+++ linux-2.6.32.8/arch/sparc/include/asm/uaccess_64.h 2010-02-10 15:06:23.939491571 -0500
3039@@ -9,6 +9,7 @@ 3090@@ -9,6 +9,7 @@
3040 #include <linux/compiler.h> 3091 #include <linux/compiler.h>
3041 #include <linux/string.h> 3092 #include <linux/string.h>
@@ -3086,9 +3137,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.7/arc
3086 if (unlikely(ret)) 3137 if (unlikely(ret))
3087 ret = copy_to_user_fixup(to, from, size); 3138 ret = copy_to_user_fixup(to, from, size);
3088 return ret; 3139 return ret;
3089diff -urNp linux-2.6.32.7/arch/sparc/kernel/iommu.c linux-2.6.32.7/arch/sparc/kernel/iommu.c 3140diff -urNp linux-2.6.32.8/arch/sparc/kernel/iommu.c linux-2.6.32.8/arch/sparc/kernel/iommu.c
3090--- linux-2.6.32.7/arch/sparc/kernel/iommu.c 2010-01-25 13:50:10.000000000 -0500 3141--- linux-2.6.32.8/arch/sparc/kernel/iommu.c 2010-02-09 07:57:19.000000000 -0500
3091+++ linux-2.6.32.7/arch/sparc/kernel/iommu.c 2010-01-25 17:39:40.271168771 -0500 3142+++ linux-2.6.32.8/arch/sparc/kernel/iommu.c 2010-02-10 15:06:23.939491571 -0500
3092@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc 3143@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
3093 spin_unlock_irqrestore(&iommu->lock, flags); 3144 spin_unlock_irqrestore(&iommu->lock, flags);
3094 } 3145 }
@@ -3107,9 +3158,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/iommu.c linux-2.6.32.7/arch/sparc/ke
3107 EXPORT_SYMBOL(dma_ops); 3158 EXPORT_SYMBOL(dma_ops);
3108 3159
3109 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); 3160 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
3110diff -urNp linux-2.6.32.7/arch/sparc/kernel/ioport.c linux-2.6.32.7/arch/sparc/kernel/ioport.c 3161diff -urNp linux-2.6.32.8/arch/sparc/kernel/ioport.c linux-2.6.32.8/arch/sparc/kernel/ioport.c
3111--- linux-2.6.32.7/arch/sparc/kernel/ioport.c 2010-01-25 13:50:10.000000000 -0500 3162--- linux-2.6.32.8/arch/sparc/kernel/ioport.c 2010-02-09 07:57:19.000000000 -0500
3112+++ linux-2.6.32.7/arch/sparc/kernel/ioport.c 2010-01-25 17:39:40.272167371 -0500 3163+++ linux-2.6.32.8/arch/sparc/kernel/ioport.c 2010-02-10 15:06:23.939491571 -0500
3113@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru 3164@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
3114 BUG(); 3165 BUG();
3115 } 3166 }
@@ -3137,9 +3188,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/ioport.c linux-2.6.32.7/arch/sparc/k
3137 .alloc_coherent = pci32_alloc_coherent, 3188 .alloc_coherent = pci32_alloc_coherent,
3138 .free_coherent = pci32_free_coherent, 3189 .free_coherent = pci32_free_coherent,
3139 .map_page = pci32_map_page, 3190 .map_page = pci32_map_page,
3140diff -urNp linux-2.6.32.7/arch/sparc/kernel/kgdb_32.c linux-2.6.32.7/arch/sparc/kernel/kgdb_32.c 3191diff -urNp linux-2.6.32.8/arch/sparc/kernel/kgdb_32.c linux-2.6.32.8/arch/sparc/kernel/kgdb_32.c
3141--- linux-2.6.32.7/arch/sparc/kernel/kgdb_32.c 2010-01-25 13:50:10.000000000 -0500 3192--- linux-2.6.32.8/arch/sparc/kernel/kgdb_32.c 2010-02-09 07:57:19.000000000 -0500
3142+++ linux-2.6.32.7/arch/sparc/kernel/kgdb_32.c 2010-01-25 17:39:40.272167371 -0500 3193+++ linux-2.6.32.8/arch/sparc/kernel/kgdb_32.c 2010-02-10 15:06:23.939491571 -0500
3143@@ -158,7 +158,7 @@ void kgdb_arch_exit(void) 3194@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
3144 { 3195 {
3145 } 3196 }
@@ -3149,9 +3200,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/kgdb_32.c linux-2.6.32.7/arch/sparc/
3149 /* Breakpoint instruction: ta 0x7d */ 3200 /* Breakpoint instruction: ta 0x7d */
3150 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, 3201 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
3151 }; 3202 };
3152diff -urNp linux-2.6.32.7/arch/sparc/kernel/kgdb_64.c linux-2.6.32.7/arch/sparc/kernel/kgdb_64.c 3203diff -urNp linux-2.6.32.8/arch/sparc/kernel/kgdb_64.c linux-2.6.32.8/arch/sparc/kernel/kgdb_64.c
3153--- linux-2.6.32.7/arch/sparc/kernel/kgdb_64.c 2010-01-25 13:50:10.000000000 -0500 3204--- linux-2.6.32.8/arch/sparc/kernel/kgdb_64.c 2010-02-09 07:57:19.000000000 -0500
3154+++ linux-2.6.32.7/arch/sparc/kernel/kgdb_64.c 2010-01-25 17:39:40.272167371 -0500 3205+++ linux-2.6.32.8/arch/sparc/kernel/kgdb_64.c 2010-02-10 15:06:23.939491571 -0500
3155@@ -180,7 +180,7 @@ void kgdb_arch_exit(void) 3206@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
3156 { 3207 {
3157 } 3208 }
@@ -3161,9 +3212,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/kgdb_64.c linux-2.6.32.7/arch/sparc/
3161 /* Breakpoint instruction: ta 0x72 */ 3212 /* Breakpoint instruction: ta 0x72 */
3162 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, 3213 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
3163 }; 3214 };
3164diff -urNp linux-2.6.32.7/arch/sparc/kernel/Makefile linux-2.6.32.7/arch/sparc/kernel/Makefile 3215diff -urNp linux-2.6.32.8/arch/sparc/kernel/Makefile linux-2.6.32.8/arch/sparc/kernel/Makefile
3165--- linux-2.6.32.7/arch/sparc/kernel/Makefile 2010-01-25 13:50:10.000000000 -0500 3216--- linux-2.6.32.8/arch/sparc/kernel/Makefile 2010-02-09 07:57:19.000000000 -0500
3166+++ linux-2.6.32.7/arch/sparc/kernel/Makefile 2010-01-25 17:39:40.272167371 -0500 3217+++ linux-2.6.32.8/arch/sparc/kernel/Makefile 2010-02-10 15:06:23.939491571 -0500
3167@@ -3,7 +3,7 @@ 3218@@ -3,7 +3,7 @@
3168 # 3219 #
3169 3220
@@ -3173,9 +3224,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/Makefile linux-2.6.32.7/arch/sparc/k
3173 3224
3174 extra-y := head_$(BITS).o 3225 extra-y := head_$(BITS).o
3175 extra-y += init_task.o 3226 extra-y += init_task.o
3176diff -urNp linux-2.6.32.7/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.7/arch/sparc/kernel/pci_sun4v.c 3227diff -urNp linux-2.6.32.8/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.8/arch/sparc/kernel/pci_sun4v.c
3177--- linux-2.6.32.7/arch/sparc/kernel/pci_sun4v.c 2010-01-25 13:50:10.000000000 -0500 3228--- linux-2.6.32.8/arch/sparc/kernel/pci_sun4v.c 2010-02-09 07:57:19.000000000 -0500
3178+++ linux-2.6.32.7/arch/sparc/kernel/pci_sun4v.c 2010-01-25 17:39:40.272167371 -0500 3229+++ linux-2.6.32.8/arch/sparc/kernel/pci_sun4v.c 2010-02-10 15:06:23.939491571 -0500
3179@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic 3230@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
3180 spin_unlock_irqrestore(&iommu->lock, flags); 3231 spin_unlock_irqrestore(&iommu->lock, flags);
3181 } 3232 }
@@ -3185,9 +3236,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.7/arch/spar
3185 .alloc_coherent = dma_4v_alloc_coherent, 3236 .alloc_coherent = dma_4v_alloc_coherent,
3186 .free_coherent = dma_4v_free_coherent, 3237 .free_coherent = dma_4v_free_coherent,
3187 .map_page = dma_4v_map_page, 3238 .map_page = dma_4v_map_page,
3188diff -urNp linux-2.6.32.7/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.7/arch/sparc/kernel/sys_sparc_32.c 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
3189--- linux-2.6.32.7/arch/sparc/kernel/sys_sparc_32.c 2010-01-25 13:50:10.000000000 -0500 3240--- linux-2.6.32.8/arch/sparc/kernel/sys_sparc_32.c 2010-02-09 07:57:19.000000000 -0500
3190+++ linux-2.6.32.7/arch/sparc/kernel/sys_sparc_32.c 2010-01-25 17:39:40.272167371 -0500 3241+++ linux-2.6.32.8/arch/sparc/kernel/sys_sparc_32.c 2010-02-10 15:06:23.939491571 -0500
3191@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str 3242@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
3192 if (ARCH_SUN4C && len > 0x20000000) 3243 if (ARCH_SUN4C && len > 0x20000000)
3193 return -ENOMEM; 3244 return -ENOMEM;
@@ -3197,9 +3248,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.7/arch/s
3197 3248
3198 if (flags & MAP_SHARED) 3249 if (flags & MAP_SHARED)
3199 addr = COLOUR_ALIGN(addr); 3250 addr = COLOUR_ALIGN(addr);
3200diff -urNp linux-2.6.32.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.7/arch/sparc/kernel/sys_sparc_64.c 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
3201--- linux-2.6.32.7/arch/sparc/kernel/sys_sparc_64.c 2010-01-25 13:50:10.000000000 -0500 3252--- linux-2.6.32.8/arch/sparc/kernel/sys_sparc_64.c 2010-02-09 07:57:19.000000000 -0500
3202+++ linux-2.6.32.7/arch/sparc/kernel/sys_sparc_64.c 2010-01-25 17:39:40.273112460 -0500 3253+++ linux-2.6.32.8/arch/sparc/kernel/sys_sparc_64.c 2010-02-10 15:06:23.939491571 -0500
3203@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str 3254@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
3204 /* We do not accept a shared mapping if it would violate 3255 /* We do not accept a shared mapping if it would violate
3205 * cache aliasing constraints. 3256 * cache aliasing constraints.
@@ -3278,9 +3329,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.7/arch/s
3278 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 3329 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
3279 mm->unmap_area = arch_unmap_area_topdown; 3330 mm->unmap_area = arch_unmap_area_topdown;
3280 } 3331 }
3281diff -urNp linux-2.6.32.7/arch/sparc/kernel/traps_64.c linux-2.6.32.7/arch/sparc/kernel/traps_64.c 3332diff -urNp linux-2.6.32.8/arch/sparc/kernel/traps_64.c linux-2.6.32.8/arch/sparc/kernel/traps_64.c
3282--- linux-2.6.32.7/arch/sparc/kernel/traps_64.c 2010-01-25 13:50:10.000000000 -0500 3333--- linux-2.6.32.8/arch/sparc/kernel/traps_64.c 2010-02-09 07:57:19.000000000 -0500
3283+++ linux-2.6.32.7/arch/sparc/kernel/traps_64.c 2010-01-25 17:39:40.273112460 -0500 3334+++ linux-2.6.32.8/arch/sparc/kernel/traps_64.c 2010-02-10 15:06:23.942842062 -0500
3284@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long 3335@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long
3285 3336
3286 lvl -= 0x100; 3337 lvl -= 0x100;
@@ -3312,9 +3363,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/kernel/traps_64.c linux-2.6.32.7/arch/sparc
3312 dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); 3363 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
3313 3364
3314 sprintf (buffer, "Bad trap %lx at tl>0", lvl); 3365 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
3315diff -urNp linux-2.6.32.7/arch/sparc/lib/atomic_64.S linux-2.6.32.7/arch/sparc/lib/atomic_64.S 3366diff -urNp linux-2.6.32.8/arch/sparc/lib/atomic_64.S linux-2.6.32.8/arch/sparc/lib/atomic_64.S
3316--- linux-2.6.32.7/arch/sparc/lib/atomic_64.S 2010-01-25 13:50:10.000000000 -0500 3367--- linux-2.6.32.8/arch/sparc/lib/atomic_64.S 2010-02-09 07:57:19.000000000 -0500
3317+++ linux-2.6.32.7/arch/sparc/lib/atomic_64.S 2010-01-25 17:39:40.273112460 -0500 3368+++ linux-2.6.32.8/arch/sparc/lib/atomic_64.S 2010-02-10 15:06:23.942842062 -0500
3318@@ -18,7 +18,12 @@ 3369@@ -18,7 +18,12 @@
3319 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ 3370 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
3320 BACKOFF_SETUP(%o2) 3371 BACKOFF_SETUP(%o2)
@@ -3508,9 +3559,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/lib/atomic_64.S linux-2.6.32.7/arch/sparc/l
3508 casx [%o1], %g1, %g7 3559 casx [%o1], %g1, %g7
3509 cmp %g1, %g7 3560 cmp %g1, %g7
3510 bne,pn %xcc, 2f 3561 bne,pn %xcc, 2f
3511diff -urNp linux-2.6.32.7/arch/sparc/lib/ksyms.c linux-2.6.32.7/arch/sparc/lib/ksyms.c 3562diff -urNp linux-2.6.32.8/arch/sparc/lib/ksyms.c linux-2.6.32.8/arch/sparc/lib/ksyms.c
3512--- linux-2.6.32.7/arch/sparc/lib/ksyms.c 2010-01-25 13:50:10.000000000 -0500 3563--- linux-2.6.32.8/arch/sparc/lib/ksyms.c 2010-02-09 07:57:19.000000000 -0500
3513+++ linux-2.6.32.7/arch/sparc/lib/ksyms.c 2010-01-25 17:39:40.273112460 -0500 3564+++ linux-2.6.32.8/arch/sparc/lib/ksyms.c 2010-02-10 15:06:23.942842062 -0500
3514@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); 3565@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write);
3515 3566
3516 /* Atomic counter implementation. */ 3567 /* Atomic counter implementation. */
@@ -3522,9 +3573,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/lib/ksyms.c linux-2.6.32.7/arch/sparc/lib/k
3522 EXPORT_SYMBOL(atomic_sub_ret); 3573 EXPORT_SYMBOL(atomic_sub_ret);
3523 EXPORT_SYMBOL(atomic64_add); 3574 EXPORT_SYMBOL(atomic64_add);
3524 EXPORT_SYMBOL(atomic64_add_ret); 3575 EXPORT_SYMBOL(atomic64_add_ret);
3525diff -urNp linux-2.6.32.7/arch/sparc/lib/rwsem_64.S linux-2.6.32.7/arch/sparc/lib/rwsem_64.S 3576diff -urNp linux-2.6.32.8/arch/sparc/lib/rwsem_64.S linux-2.6.32.8/arch/sparc/lib/rwsem_64.S
3526--- linux-2.6.32.7/arch/sparc/lib/rwsem_64.S 2010-01-25 13:50:10.000000000 -0500 3577--- linux-2.6.32.8/arch/sparc/lib/rwsem_64.S 2010-02-09 07:57:19.000000000 -0500
3527+++ linux-2.6.32.7/arch/sparc/lib/rwsem_64.S 2010-01-25 17:39:40.273112460 -0500 3578+++ linux-2.6.32.8/arch/sparc/lib/rwsem_64.S 2010-02-10 15:06:23.942842062 -0500
3528@@ -11,7 +11,12 @@ 3579@@ -11,7 +11,12 @@
3529 .globl __down_read 3580 .globl __down_read
3530 __down_read: 3581 __down_read:
@@ -3623,9 +3674,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/lib/rwsem_64.S linux-2.6.32.7/arch/sparc/li
3623 cas [%o0], %g3, %g7 3674 cas [%o0], %g3, %g7
3624 cmp %g3, %g7 3675 cmp %g3, %g7
3625 bne,pn %icc, 1b 3676 bne,pn %icc, 1b
3626diff -urNp linux-2.6.32.7/arch/sparc/Makefile linux-2.6.32.7/arch/sparc/Makefile 3677diff -urNp linux-2.6.32.8/arch/sparc/Makefile linux-2.6.32.8/arch/sparc/Makefile
3627--- linux-2.6.32.7/arch/sparc/Makefile 2010-01-25 13:50:10.000000000 -0500 3678--- linux-2.6.32.8/arch/sparc/Makefile 2010-02-09 07:57:19.000000000 -0500
3628+++ linux-2.6.32.7/arch/sparc/Makefile 2010-01-25 17:39:40.274409873 -0500 3679+++ linux-2.6.32.8/arch/sparc/Makefile 2010-02-10 15:06:23.942842062 -0500
3629@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc 3680@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
3630 # Export what is needed by arch/sparc/boot/Makefile 3681 # Export what is needed by arch/sparc/boot/Makefile
3631 export VMLINUX_INIT VMLINUX_MAIN 3682 export VMLINUX_INIT VMLINUX_MAIN
@@ -3635,9 +3686,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/Makefile linux-2.6.32.7/arch/sparc/Makefile
3635 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) 3686 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
3636 VMLINUX_MAIN += $(drivers-y) $(net-y) 3687 VMLINUX_MAIN += $(drivers-y) $(net-y)
3637 3688
3638diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_32.c linux-2.6.32.7/arch/sparc/mm/fault_32.c 3689diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_32.c linux-2.6.32.8/arch/sparc/mm/fault_32.c
3639--- linux-2.6.32.7/arch/sparc/mm/fault_32.c 2010-01-25 13:50:10.000000000 -0500 3690--- linux-2.6.32.8/arch/sparc/mm/fault_32.c 2010-02-09 07:57:19.000000000 -0500
3640+++ linux-2.6.32.7/arch/sparc/mm/fault_32.c 2010-01-25 17:39:40.274409873 -0500 3691+++ linux-2.6.32.8/arch/sparc/mm/fault_32.c 2010-02-10 15:06:23.942842062 -0500
3641@@ -21,6 +21,9 @@ 3692@@ -21,6 +21,9 @@
3642 #include <linux/interrupt.h> 3693 #include <linux/interrupt.h>
3643 #include <linux/module.h> 3694 #include <linux/module.h>
@@ -3941,9 +3992,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_32.c linux-2.6.32.7/arch/sparc/mm/
3941 /* Allow reads even for write-only mappings */ 3992 /* Allow reads even for write-only mappings */
3942 if(!(vma->vm_flags & (VM_READ | VM_EXEC))) 3993 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
3943 goto bad_area; 3994 goto bad_area;
3944diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_64.c linux-2.6.32.7/arch/sparc/mm/fault_64.c 3995diff -urNp linux-2.6.32.8/arch/sparc/mm/fault_64.c linux-2.6.32.8/arch/sparc/mm/fault_64.c
3945--- linux-2.6.32.7/arch/sparc/mm/fault_64.c 2010-01-25 13:50:10.000000000 -0500 3996--- linux-2.6.32.8/arch/sparc/mm/fault_64.c 2010-02-09 07:57:19.000000000 -0500
3946+++ linux-2.6.32.7/arch/sparc/mm/fault_64.c 2010-01-25 17:39:40.274409873 -0500 3997+++ linux-2.6.32.8/arch/sparc/mm/fault_64.c 2010-02-10 15:06:23.942842062 -0500
3947@@ -20,6 +20,9 @@ 3998@@ -20,6 +20,9 @@
3948 #include <linux/kprobes.h> 3999 #include <linux/kprobes.h>
3949 #include <linux/kdebug.h> 4000 #include <linux/kdebug.h>
@@ -4401,9 +4452,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/fault_64.c linux-2.6.32.7/arch/sparc/mm/
4401 /* Pure DTLB misses do not tell us whether the fault causing 4452 /* Pure DTLB misses do not tell us whether the fault causing
4402 * load/store/atomic was a write or not, it only says that there 4453 * load/store/atomic was a write or not, it only says that there
4403 * was no match. So in such a case we (carefully) read the 4454 * was no match. So in such a case we (carefully) read the
4404diff -urNp linux-2.6.32.7/arch/sparc/mm/init_32.c linux-2.6.32.7/arch/sparc/mm/init_32.c 4455diff -urNp linux-2.6.32.8/arch/sparc/mm/init_32.c linux-2.6.32.8/arch/sparc/mm/init_32.c
4405--- linux-2.6.32.7/arch/sparc/mm/init_32.c 2010-01-25 13:50:10.000000000 -0500 4456--- linux-2.6.32.8/arch/sparc/mm/init_32.c 2010-02-09 07:57:19.000000000 -0500
4406+++ linux-2.6.32.7/arch/sparc/mm/init_32.c 2010-01-25 17:39:40.274409873 -0500 4457+++ linux-2.6.32.8/arch/sparc/mm/init_32.c 2010-02-10 15:06:23.942842062 -0500
4407@@ -317,6 +317,9 @@ extern void device_scan(void); 4458@@ -317,6 +317,9 @@ extern void device_scan(void);
4408 pgprot_t PAGE_SHARED __read_mostly; 4459 pgprot_t PAGE_SHARED __read_mostly;
4409 EXPORT_SYMBOL(PAGE_SHARED); 4460 EXPORT_SYMBOL(PAGE_SHARED);
@@ -4438,9 +4489,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/init_32.c linux-2.6.32.7/arch/sparc/mm/i
4438 protection_map[12] = PAGE_READONLY; 4489 protection_map[12] = PAGE_READONLY;
4439 protection_map[13] = PAGE_READONLY; 4490 protection_map[13] = PAGE_READONLY;
4440 protection_map[14] = PAGE_SHARED; 4491 protection_map[14] = PAGE_SHARED;
4441diff -urNp linux-2.6.32.7/arch/sparc/mm/Makefile linux-2.6.32.7/arch/sparc/mm/Makefile 4492diff -urNp linux-2.6.32.8/arch/sparc/mm/Makefile linux-2.6.32.8/arch/sparc/mm/Makefile
4442--- linux-2.6.32.7/arch/sparc/mm/Makefile 2010-01-25 13:50:10.000000000 -0500 4493--- linux-2.6.32.8/arch/sparc/mm/Makefile 2010-02-09 07:57:19.000000000 -0500
4443+++ linux-2.6.32.7/arch/sparc/mm/Makefile 2010-01-25 17:39:40.275413253 -0500 4494+++ linux-2.6.32.8/arch/sparc/mm/Makefile 2010-02-10 15:06:23.942842062 -0500
4444@@ -2,7 +2,7 @@ 4495@@ -2,7 +2,7 @@
4445 # 4496 #
4446 4497
@@ -4450,9 +4501,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/Makefile linux-2.6.32.7/arch/sparc/mm/Ma
4450 4501
4451 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o 4502 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
4452 obj-y += fault_$(BITS).o 4503 obj-y += fault_$(BITS).o
4453diff -urNp linux-2.6.32.7/arch/sparc/mm/srmmu.c linux-2.6.32.7/arch/sparc/mm/srmmu.c 4504diff -urNp linux-2.6.32.8/arch/sparc/mm/srmmu.c linux-2.6.32.8/arch/sparc/mm/srmmu.c
4454--- linux-2.6.32.7/arch/sparc/mm/srmmu.c 2010-01-25 13:50:10.000000000 -0500 4505--- linux-2.6.32.8/arch/sparc/mm/srmmu.c 2010-02-09 07:57:19.000000000 -0500
4455+++ linux-2.6.32.7/arch/sparc/mm/srmmu.c 2010-01-25 17:39:40.275413253 -0500 4506+++ linux-2.6.32.8/arch/sparc/mm/srmmu.c 2010-02-10 15:06:23.942842062 -0500
4456@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) 4507@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
4457 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); 4508 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
4458 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); 4509 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -4467,9 +4518,9 @@ diff -urNp linux-2.6.32.7/arch/sparc/mm/srmmu.c linux-2.6.32.7/arch/sparc/mm/srm
4467 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); 4518 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
4468 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); 4519 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
4469 4520
4470diff -urNp linux-2.6.32.7/arch/um/include/asm/kmap_types.h linux-2.6.32.7/arch/um/include/asm/kmap_types.h 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
4471--- linux-2.6.32.7/arch/um/include/asm/kmap_types.h 2010-01-25 13:50:10.000000000 -0500 4522--- linux-2.6.32.8/arch/um/include/asm/kmap_types.h 2010-02-09 07:57:19.000000000 -0500
4472+++ linux-2.6.32.7/arch/um/include/asm/kmap_types.h 2010-01-25 17:39:40.275413253 -0500 4523+++ linux-2.6.32.8/arch/um/include/asm/kmap_types.h 2010-02-10 15:06:23.942842062 -0500
4473@@ -23,6 +23,7 @@ enum km_type { 4524@@ -23,6 +23,7 @@ enum km_type {
4474 KM_IRQ1, 4525 KM_IRQ1,
4475 KM_SOFTIRQ0, 4526 KM_SOFTIRQ0,
@@ -4478,9 +4529,9 @@ diff -urNp linux-2.6.32.7/arch/um/include/asm/kmap_types.h linux-2.6.32.7/arch/u
4478 KM_TYPE_NR 4529 KM_TYPE_NR
4479 }; 4530 };
4480 4531
4481diff -urNp linux-2.6.32.7/arch/um/include/asm/page.h linux-2.6.32.7/arch/um/include/asm/page.h 4532diff -urNp linux-2.6.32.8/arch/um/include/asm/page.h linux-2.6.32.8/arch/um/include/asm/page.h
4482--- linux-2.6.32.7/arch/um/include/asm/page.h 2010-01-25 13:50:10.000000000 -0500 4533--- linux-2.6.32.8/arch/um/include/asm/page.h 2010-02-09 07:57:19.000000000 -0500
4483+++ linux-2.6.32.7/arch/um/include/asm/page.h 2010-01-25 17:39:40.275413253 -0500 4534+++ linux-2.6.32.8/arch/um/include/asm/page.h 2010-02-10 15:06:23.942842062 -0500
4484@@ -14,6 +14,9 @@ 4535@@ -14,6 +14,9 @@
4485 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) 4536 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
4486 #define PAGE_MASK (~(PAGE_SIZE-1)) 4537 #define PAGE_MASK (~(PAGE_SIZE-1))
@@ -4491,9 +4542,9 @@ diff -urNp linux-2.6.32.7/arch/um/include/asm/page.h linux-2.6.32.7/arch/um/incl
4491 #ifndef __ASSEMBLY__ 4542 #ifndef __ASSEMBLY__
4492 4543
4493 struct page; 4544 struct page;
4494diff -urNp linux-2.6.32.7/arch/um/sys-i386/syscalls.c linux-2.6.32.7/arch/um/sys-i386/syscalls.c 4545diff -urNp linux-2.6.32.8/arch/um/sys-i386/syscalls.c linux-2.6.32.8/arch/um/sys-i386/syscalls.c
4495--- linux-2.6.32.7/arch/um/sys-i386/syscalls.c 2010-01-25 13:50:10.000000000 -0500 4546--- linux-2.6.32.8/arch/um/sys-i386/syscalls.c 2010-02-09 07:57:19.000000000 -0500
4496+++ linux-2.6.32.7/arch/um/sys-i386/syscalls.c 2010-01-25 17:39:40.275413253 -0500 4547+++ linux-2.6.32.8/arch/um/sys-i386/syscalls.c 2010-02-10 15:06:23.942842062 -0500
4497@@ -11,6 +11,21 @@ 4548@@ -11,6 +11,21 @@
4498 #include "asm/uaccess.h" 4549 #include "asm/uaccess.h"
4499 #include "asm/unistd.h" 4550 #include "asm/unistd.h"
@@ -4516,9 +4567,9 @@ diff -urNp linux-2.6.32.7/arch/um/sys-i386/syscalls.c linux-2.6.32.7/arch/um/sys
4516 /* 4567 /*
4517 * Perform the select(nd, in, out, ex, tv) and mmap() system 4568 * Perform the select(nd, in, out, ex, tv) and mmap() system
4518 * calls. Linux/i386 didn't use to be able to handle more than 4569 * calls. Linux/i386 didn't use to be able to handle more than
4519diff -urNp linux-2.6.32.7/arch/x86/boot/bitops.h linux-2.6.32.7/arch/x86/boot/bitops.h 4570diff -urNp linux-2.6.32.8/arch/x86/boot/bitops.h linux-2.6.32.8/arch/x86/boot/bitops.h
4520--- linux-2.6.32.7/arch/x86/boot/bitops.h 2010-01-25 13:50:10.000000000 -0500 4571--- linux-2.6.32.8/arch/x86/boot/bitops.h 2010-02-09 07:57:19.000000000 -0500
4521+++ linux-2.6.32.7/arch/x86/boot/bitops.h 2010-01-25 17:39:40.275413253 -0500 4572+++ linux-2.6.32.8/arch/x86/boot/bitops.h 2010-02-10 15:06:23.942842062 -0500
4522@@ -26,7 +26,7 @@ static inline int variable_test_bit(int 4573@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
4523 u8 v; 4574 u8 v;
4524 const u32 *p = (const u32 *)addr; 4575 const u32 *p = (const u32 *)addr;
@@ -4537,9 +4588,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/bitops.h linux-2.6.32.7/arch/x86/boot/bi
4537 } 4588 }
4538 4589
4539 #endif /* BOOT_BITOPS_H */ 4590 #endif /* BOOT_BITOPS_H */
4540diff -urNp linux-2.6.32.7/arch/x86/boot/boot.h linux-2.6.32.7/arch/x86/boot/boot.h 4591diff -urNp linux-2.6.32.8/arch/x86/boot/boot.h linux-2.6.32.8/arch/x86/boot/boot.h
4541--- linux-2.6.32.7/arch/x86/boot/boot.h 2010-01-25 13:50:10.000000000 -0500 4592--- linux-2.6.32.8/arch/x86/boot/boot.h 2010-02-09 07:57:19.000000000 -0500
4542+++ linux-2.6.32.7/arch/x86/boot/boot.h 2010-01-25 17:39:40.276403852 -0500 4593+++ linux-2.6.32.8/arch/x86/boot/boot.h 2010-02-10 15:06:23.942842062 -0500
4543@@ -82,7 +82,7 @@ static inline void io_delay(void) 4594@@ -82,7 +82,7 @@ static inline void io_delay(void)
4544 static inline u16 ds(void) 4595 static inline u16 ds(void)
4545 { 4596 {
@@ -4558,9 +4609,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/boot.h linux-2.6.32.7/arch/x86/boot/boot
4558 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); 4609 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
4559 return diff; 4610 return diff;
4560 } 4611 }
4561diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/head_32.S linux-2.6.32.7/arch/x86/boot/compressed/head_32.S 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
4562--- linux-2.6.32.7/arch/x86/boot/compressed/head_32.S 2010-01-25 13:50:10.000000000 -0500 4613--- linux-2.6.32.8/arch/x86/boot/compressed/head_32.S 2010-02-09 07:57:19.000000000 -0500
4563+++ linux-2.6.32.7/arch/x86/boot/compressed/head_32.S 2010-01-25 17:39:40.276403852 -0500 4614+++ linux-2.6.32.8/arch/x86/boot/compressed/head_32.S 2010-02-10 15:06:23.942842062 -0500
4564@@ -76,7 +76,7 @@ ENTRY(startup_32) 4615@@ -76,7 +76,7 @@ ENTRY(startup_32)
4565 notl %eax 4616 notl %eax
4566 andl %eax, %ebx 4617 andl %eax, %ebx
@@ -4589,9 +4640,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/head_32.S linux-2.6.32.7/arch
4589 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) 4640 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
4590 jmp 1b 4641 jmp 1b
4591 2: 4642 2:
4592diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/head_64.S linux-2.6.32.7/arch/x86/boot/compressed/head_64.S 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
4593--- linux-2.6.32.7/arch/x86/boot/compressed/head_64.S 2010-01-25 13:50:10.000000000 -0500 4644--- linux-2.6.32.8/arch/x86/boot/compressed/head_64.S 2010-02-09 07:57:19.000000000 -0500
4594+++ linux-2.6.32.7/arch/x86/boot/compressed/head_64.S 2010-01-25 17:39:40.276403852 -0500 4645+++ linux-2.6.32.8/arch/x86/boot/compressed/head_64.S 2010-02-10 15:06:23.945990506 -0500
4595@@ -91,7 +91,7 @@ ENTRY(startup_32) 4646@@ -91,7 +91,7 @@ ENTRY(startup_32)
4596 notl %eax 4647 notl %eax
4597 andl %eax, %ebx 4648 andl %eax, %ebx
@@ -4610,9 +4661,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/head_64.S linux-2.6.32.7/arch
4610 #endif 4661 #endif
4611 4662
4612 /* Target address to relocate to for decompression */ 4663 /* Target address to relocate to for decompression */
4613diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/misc.c linux-2.6.32.7/arch/x86/boot/compressed/misc.c 4664diff -urNp linux-2.6.32.8/arch/x86/boot/compressed/misc.c linux-2.6.32.8/arch/x86/boot/compressed/misc.c
4614--- linux-2.6.32.7/arch/x86/boot/compressed/misc.c 2010-01-25 13:50:10.000000000 -0500 4665--- linux-2.6.32.8/arch/x86/boot/compressed/misc.c 2010-02-09 07:57:19.000000000 -0500
4615+++ linux-2.6.32.7/arch/x86/boot/compressed/misc.c 2010-01-25 17:39:40.276403852 -0500 4666+++ linux-2.6.32.8/arch/x86/boot/compressed/misc.c 2010-02-10 15:06:23.945990506 -0500
4616@@ -288,7 +288,7 @@ static void parse_elf(void *output) 4667@@ -288,7 +288,7 @@ static void parse_elf(void *output)
4617 case PT_LOAD: 4668 case PT_LOAD:
4618 #ifdef CONFIG_RELOCATABLE 4669 #ifdef CONFIG_RELOCATABLE
@@ -4631,9 +4682,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/misc.c linux-2.6.32.7/arch/x8
4631 error("Wrong destination address"); 4682 error("Wrong destination address");
4632 #endif 4683 #endif
4633 4684
4634diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.7/arch/x86/boot/compressed/mkpiggy.c 4685diff -urNp linux-2.6.32.8/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.8/arch/x86/boot/compressed/mkpiggy.c
4635--- linux-2.6.32.7/arch/x86/boot/compressed/mkpiggy.c 2010-01-25 13:50:10.000000000 -0500 4686--- linux-2.6.32.8/arch/x86/boot/compressed/mkpiggy.c 2010-02-09 07:57:19.000000000 -0500
4636+++ linux-2.6.32.7/arch/x86/boot/compressed/mkpiggy.c 2010-01-25 17:39:40.276403852 -0500 4687+++ linux-2.6.32.8/arch/x86/boot/compressed/mkpiggy.c 2010-02-10 15:06:23.945990506 -0500
4637@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) 4688@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
4638 4689
4639 offs = (olen > ilen) ? olen - ilen : 0; 4690 offs = (olen > ilen) ? olen - ilen : 0;
@@ -4643,9 +4694,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.7/arch
4643 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ 4694 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
4644 4695
4645 printf(".section \".rodata.compressed\",\"a\",@progbits\n"); 4696 printf(".section \".rodata.compressed\",\"a\",@progbits\n");
4646diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/relocs.c linux-2.6.32.7/arch/x86/boot/compressed/relocs.c 4697diff -urNp linux-2.6.32.8/arch/x86/boot/compressed/relocs.c linux-2.6.32.8/arch/x86/boot/compressed/relocs.c
4647--- linux-2.6.32.7/arch/x86/boot/compressed/relocs.c 2010-01-25 13:50:10.000000000 -0500 4698--- linux-2.6.32.8/arch/x86/boot/compressed/relocs.c 2010-02-09 07:57:19.000000000 -0500
4648+++ linux-2.6.32.7/arch/x86/boot/compressed/relocs.c 2010-01-25 17:39:40.276403852 -0500 4699+++ linux-2.6.32.8/arch/x86/boot/compressed/relocs.c 2010-02-10 15:06:23.945990506 -0500
4649@@ -10,8 +10,11 @@ 4700@@ -10,8 +10,11 @@
4650 #define USE_BSD 4701 #define USE_BSD
4651 #include <endian.h> 4702 #include <endian.h>
@@ -4817,7 +4868,7 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/relocs.c linux-2.6.32.7/arch/
4817+ 4868+
4818+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32) 4869+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
4819+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */ 4870+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
4820+ if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext")) 4871+ if (!strcmp(sec_name(sym->st_shndx), ".data") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
4821+ continue; 4872+ continue;
4822+ if (!strcmp(sec_name(sym->st_shndx), ".init.text")) 4873+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
4823+ continue; 4874+ continue;
@@ -4846,9 +4897,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/compressed/relocs.c linux-2.6.32.7/arch/
4846 read_shdrs(fp); 4897 read_shdrs(fp);
4847 read_strtabs(fp); 4898 read_strtabs(fp);
4848 read_symtabs(fp); 4899 read_symtabs(fp);
4849diff -urNp linux-2.6.32.7/arch/x86/boot/cpucheck.c linux-2.6.32.7/arch/x86/boot/cpucheck.c 4900diff -urNp linux-2.6.32.8/arch/x86/boot/cpucheck.c linux-2.6.32.8/arch/x86/boot/cpucheck.c
4850--- linux-2.6.32.7/arch/x86/boot/cpucheck.c 2010-01-25 13:50:10.000000000 -0500 4901--- linux-2.6.32.8/arch/x86/boot/cpucheck.c 2010-02-09 07:57:19.000000000 -0500
4851+++ linux-2.6.32.7/arch/x86/boot/cpucheck.c 2010-01-25 17:39:40.276403852 -0500 4902+++ linux-2.6.32.8/arch/x86/boot/cpucheck.c 2010-02-10 15:06:23.945990506 -0500
4852@@ -74,7 +74,7 @@ static int has_fpu(void) 4903@@ -74,7 +74,7 @@ static int has_fpu(void)
4853 u16 fcw = -1, fsw = -1; 4904 u16 fcw = -1, fsw = -1;
4854 u32 cr0; 4905 u32 cr0;
@@ -4944,9 +4995,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/cpucheck.c linux-2.6.32.7/arch/x86/boot/
4944 4995
4945 err = check_flags(); 4996 err = check_flags();
4946 } 4997 }
4947diff -urNp linux-2.6.32.7/arch/x86/boot/header.S linux-2.6.32.7/arch/x86/boot/header.S 4998diff -urNp linux-2.6.32.8/arch/x86/boot/header.S linux-2.6.32.8/arch/x86/boot/header.S
4948--- linux-2.6.32.7/arch/x86/boot/header.S 2010-01-25 13:50:10.000000000 -0500 4999--- linux-2.6.32.8/arch/x86/boot/header.S 2010-02-09 07:57:19.000000000 -0500
4949+++ linux-2.6.32.7/arch/x86/boot/header.S 2010-01-25 17:39:40.277417530 -0500 5000+++ linux-2.6.32.8/arch/x86/boot/header.S 2010-02-10 15:06:23.945990506 -0500
4950@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical 5001@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
4951 # single linked list of 5002 # single linked list of
4952 # struct setup_data 5003 # struct setup_data
@@ -4956,9 +5007,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/header.S linux-2.6.32.7/arch/x86/boot/he
4956 5007
4957 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) 5008 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
4958 #define VO_INIT_SIZE (VO__end - VO__text) 5009 #define VO_INIT_SIZE (VO__end - VO__text)
4959diff -urNp linux-2.6.32.7/arch/x86/boot/video-vesa.c linux-2.6.32.7/arch/x86/boot/video-vesa.c 5010diff -urNp linux-2.6.32.8/arch/x86/boot/video-vesa.c linux-2.6.32.8/arch/x86/boot/video-vesa.c
4960--- linux-2.6.32.7/arch/x86/boot/video-vesa.c 2010-01-25 13:50:10.000000000 -0500 5011--- linux-2.6.32.8/arch/x86/boot/video-vesa.c 2010-02-09 07:57:19.000000000 -0500
4961+++ linux-2.6.32.7/arch/x86/boot/video-vesa.c 2010-01-25 17:39:40.277417530 -0500 5012+++ linux-2.6.32.8/arch/x86/boot/video-vesa.c 2010-02-10 15:06:23.945990506 -0500
4962@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) 5013@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
4963 5014
4964 boot_params.screen_info.vesapm_seg = oreg.es; 5015 boot_params.screen_info.vesapm_seg = oreg.es;
@@ -4967,9 +5018,9 @@ diff -urNp linux-2.6.32.7/arch/x86/boot/video-vesa.c linux-2.6.32.7/arch/x86/boo
4967 } 5018 }
4968 5019
4969 /* 5020 /*
4970diff -urNp linux-2.6.32.7/arch/x86/ia32/ia32_signal.c linux-2.6.32.7/arch/x86/ia32/ia32_signal.c 5021diff -urNp linux-2.6.32.8/arch/x86/ia32/ia32_signal.c linux-2.6.32.8/arch/x86/ia32/ia32_signal.c
4971--- linux-2.6.32.7/arch/x86/ia32/ia32_signal.c 2010-01-25 13:50:10.000000000 -0500 5022--- linux-2.6.32.8/arch/x86/ia32/ia32_signal.c 2010-02-09 07:57:19.000000000 -0500
4972+++ linux-2.6.32.7/arch/x86/ia32/ia32_signal.c 2010-01-25 17:39:40.277417530 -0500 5023+++ linux-2.6.32.8/arch/x86/ia32/ia32_signal.c 2010-02-10 15:06:23.945990506 -0500
4973@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 5024@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
4974 sp -= frame_size; 5025 sp -= frame_size;
4975 /* Align the stack pointer according to the i386 ABI, 5026 /* Align the stack pointer according to the i386 ABI,
@@ -4988,9 +5039,9 @@ diff -urNp linux-2.6.32.7/arch/x86/ia32/ia32_signal.c linux-2.6.32.7/arch/x86/ia
4988 }; 5039 };
4989 5040
4990 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); 5041 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
4991diff -urNp linux-2.6.32.7/arch/x86/include/asm/alternative.h linux-2.6.32.7/arch/x86/include/asm/alternative.h 5042diff -urNp linux-2.6.32.8/arch/x86/include/asm/alternative.h linux-2.6.32.8/arch/x86/include/asm/alternative.h
4992--- linux-2.6.32.7/arch/x86/include/asm/alternative.h 2010-01-25 13:50:10.000000000 -0500 5043--- linux-2.6.32.8/arch/x86/include/asm/alternative.h 2010-02-09 07:57:19.000000000 -0500
4993+++ linux-2.6.32.7/arch/x86/include/asm/alternative.h 2010-01-25 17:39:40.277417530 -0500 5044+++ linux-2.6.32.8/arch/x86/include/asm/alternative.h 2010-02-10 15:06:23.945990506 -0500
4994@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit 5045@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
4995 " .byte 662b-661b\n" /* sourcelen */ \ 5046 " .byte 662b-661b\n" /* sourcelen */ \
4996 " .byte 664f-663f\n" /* replacementlen */ \ 5047 " .byte 664f-663f\n" /* replacementlen */ \
@@ -5000,9 +5051,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/alternative.h linux-2.6.32.7/arch
5000 "663:\n\t" newinstr "\n664:\n" /* replacement */ \ 5051 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
5001 ".previous" 5052 ".previous"
5002 5053
5003diff -urNp linux-2.6.32.7/arch/x86/include/asm/apm.h linux-2.6.32.7/arch/x86/include/asm/apm.h 5054diff -urNp linux-2.6.32.8/arch/x86/include/asm/apm.h linux-2.6.32.8/arch/x86/include/asm/apm.h
5004--- linux-2.6.32.7/arch/x86/include/asm/apm.h 2010-01-25 13:50:10.000000000 -0500 5055--- linux-2.6.32.8/arch/x86/include/asm/apm.h 2010-02-09 07:57:19.000000000 -0500
5005+++ linux-2.6.32.7/arch/x86/include/asm/apm.h 2010-01-25 17:39:40.277417530 -0500 5056+++ linux-2.6.32.8/arch/x86/include/asm/apm.h 2010-02-10 15:06:23.945990506 -0500
5006@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 5057@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
5007 __asm__ __volatile__(APM_DO_ZERO_SEGS 5058 __asm__ __volatile__(APM_DO_ZERO_SEGS
5008 "pushl %%edi\n\t" 5059 "pushl %%edi\n\t"
@@ -5021,9 +5072,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/apm.h linux-2.6.32.7/arch/x86/inc
5021 "setc %%bl\n\t" 5072 "setc %%bl\n\t"
5022 "popl %%ebp\n\t" 5073 "popl %%ebp\n\t"
5023 "popl %%edi\n\t" 5074 "popl %%edi\n\t"
5024diff -urNp linux-2.6.32.7/arch/x86/include/asm/atomic_32.h linux-2.6.32.7/arch/x86/include/asm/atomic_32.h 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
5025--- linux-2.6.32.7/arch/x86/include/asm/atomic_32.h 2010-01-25 13:50:10.000000000 -0500 5076--- linux-2.6.32.8/arch/x86/include/asm/atomic_32.h 2010-02-09 07:57:19.000000000 -0500
5026+++ linux-2.6.32.7/arch/x86/include/asm/atomic_32.h 2010-01-25 17:39:40.277417530 -0500 5077+++ linux-2.6.32.8/arch/x86/include/asm/atomic_32.h 2010-02-10 15:06:23.945990506 -0500
5027@@ -25,6 +25,17 @@ static inline int atomic_read(const atom 5078@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
5028 } 5079 }
5029 5080
@@ -5354,9 +5405,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/atomic_32.h linux-2.6.32.7/arch/x
5354 #define ATOMIC64_INIT(val) { (val) } 5405 #define ATOMIC64_INIT(val) { (val) }
5355 5406
5356 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); 5407 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
5357diff -urNp linux-2.6.32.7/arch/x86/include/asm/atomic_64.h linux-2.6.32.7/arch/x86/include/asm/atomic_64.h 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
5358--- linux-2.6.32.7/arch/x86/include/asm/atomic_64.h 2010-01-25 13:50:10.000000000 -0500 5409--- linux-2.6.32.8/arch/x86/include/asm/atomic_64.h 2010-02-09 07:57:19.000000000 -0500
5359+++ linux-2.6.32.7/arch/x86/include/asm/atomic_64.h 2010-01-25 17:39:40.278401098 -0500 5410+++ linux-2.6.32.8/arch/x86/include/asm/atomic_64.h 2010-02-10 15:06:23.945990506 -0500
5360@@ -24,6 +24,17 @@ static inline int atomic_read(const atom 5411@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
5361 } 5412 }
5362 5413
@@ -5934,9 +5985,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/atomic_64.h linux-2.6.32.7/arch/x
5934 } 5985 }
5935 5986
5936 /** 5987 /**
5937diff -urNp linux-2.6.32.7/arch/x86/include/asm/boot.h linux-2.6.32.7/arch/x86/include/asm/boot.h 5988diff -urNp linux-2.6.32.8/arch/x86/include/asm/boot.h linux-2.6.32.8/arch/x86/include/asm/boot.h
5938--- linux-2.6.32.7/arch/x86/include/asm/boot.h 2010-01-25 13:50:10.000000000 -0500 5989--- linux-2.6.32.8/arch/x86/include/asm/boot.h 2010-02-09 07:57:19.000000000 -0500
5939+++ linux-2.6.32.7/arch/x86/include/asm/boot.h 2010-01-25 17:39:40.278401098 -0500 5990+++ linux-2.6.32.8/arch/x86/include/asm/boot.h 2010-02-10 15:06:23.945990506 -0500
5940@@ -11,10 +11,15 @@ 5991@@ -11,10 +11,15 @@
5941 #include <asm/pgtable_types.h> 5992 #include <asm/pgtable_types.h>
5942 5993
@@ -5954,9 +6005,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/boot.h linux-2.6.32.7/arch/x86/in
5954 /* Minimum kernel alignment, as a power of two */ 6005 /* Minimum kernel alignment, as a power of two */
5955 #ifdef CONFIG_X86_64 6006 #ifdef CONFIG_X86_64
5956 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT 6007 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
5957diff -urNp linux-2.6.32.7/arch/x86/include/asm/cache.h linux-2.6.32.7/arch/x86/include/asm/cache.h 6008diff -urNp linux-2.6.32.8/arch/x86/include/asm/cache.h linux-2.6.32.8/arch/x86/include/asm/cache.h
5958--- linux-2.6.32.7/arch/x86/include/asm/cache.h 2010-01-25 13:50:10.000000000 -0500 6009--- linux-2.6.32.8/arch/x86/include/asm/cache.h 2010-02-09 07:57:19.000000000 -0500
5959+++ linux-2.6.32.7/arch/x86/include/asm/cache.h 2010-01-25 17:39:40.278401098 -0500 6010+++ linux-2.6.32.8/arch/x86/include/asm/cache.h 2010-02-10 15:06:23.945990506 -0500
5960@@ -8,6 +8,7 @@ 6011@@ -8,6 +8,7 @@
5961 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) 6012 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5962 6013
@@ -5965,9 +6016,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/cache.h linux-2.6.32.7/arch/x86/i
5965 6016
5966 #ifdef CONFIG_X86_VSMP 6017 #ifdef CONFIG_X86_VSMP
5967 /* vSMP Internode cacheline shift */ 6018 /* vSMP Internode cacheline shift */
5968diff -urNp linux-2.6.32.7/arch/x86/include/asm/checksum_32.h linux-2.6.32.7/arch/x86/include/asm/checksum_32.h 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
5969--- linux-2.6.32.7/arch/x86/include/asm/checksum_32.h 2010-01-25 13:50:10.000000000 -0500 6020--- linux-2.6.32.8/arch/x86/include/asm/checksum_32.h 2010-02-09 07:57:19.000000000 -0500
5970+++ linux-2.6.32.7/arch/x86/include/asm/checksum_32.h 2010-01-25 17:39:40.278401098 -0500 6021+++ linux-2.6.32.8/arch/x86/include/asm/checksum_32.h 2010-02-10 15:06:23.945990506 -0500
5971@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene 6022@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
5972 int len, __wsum sum, 6023 int len, __wsum sum,
5973 int *src_err_ptr, int *dst_err_ptr); 6024 int *src_err_ptr, int *dst_err_ptr);
@@ -6001,9 +6052,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/checksum_32.h linux-2.6.32.7/arch
6001 len, sum, NULL, err_ptr); 6052 len, sum, NULL, err_ptr);
6002 6053
6003 if (len) 6054 if (len)
6004diff -urNp linux-2.6.32.7/arch/x86/include/asm/desc.h linux-2.6.32.7/arch/x86/include/asm/desc.h 6055diff -urNp linux-2.6.32.8/arch/x86/include/asm/desc.h linux-2.6.32.8/arch/x86/include/asm/desc.h
6005--- linux-2.6.32.7/arch/x86/include/asm/desc.h 2010-01-25 13:50:10.000000000 -0500 6056--- linux-2.6.32.8/arch/x86/include/asm/desc.h 2010-02-09 07:57:19.000000000 -0500
6006+++ linux-2.6.32.7/arch/x86/include/asm/desc.h 2010-01-25 17:39:40.278401098 -0500 6057+++ linux-2.6.32.8/arch/x86/include/asm/desc.h 2010-02-10 15:06:23.945990506 -0500
6007@@ -4,6 +4,7 @@ 6058@@ -4,6 +4,7 @@
6008 #include <asm/desc_defs.h> 6059 #include <asm/desc_defs.h>
6009 #include <asm/ldt.h> 6060 #include <asm/ldt.h>
@@ -6114,9 +6165,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/desc.h linux-2.6.32.7/arch/x86/in
6114+#endif 6165+#endif
6115+ 6166+
6116 #endif /* _ASM_X86_DESC_H */ 6167 #endif /* _ASM_X86_DESC_H */
6117diff -urNp linux-2.6.32.7/arch/x86/include/asm/device.h linux-2.6.32.7/arch/x86/include/asm/device.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
6118--- linux-2.6.32.7/arch/x86/include/asm/device.h 2010-01-25 13:50:10.000000000 -0500 6169--- linux-2.6.32.8/arch/x86/include/asm/device.h 2010-02-09 07:57:19.000000000 -0500
6119+++ linux-2.6.32.7/arch/x86/include/asm/device.h 2010-01-25 17:39:40.279405074 -0500 6170+++ linux-2.6.32.8/arch/x86/include/asm/device.h 2010-02-10 15:06:23.945990506 -0500
6120@@ -6,7 +6,7 @@ struct dev_archdata { 6171@@ -6,7 +6,7 @@ struct dev_archdata {
6121 void *acpi_handle; 6172 void *acpi_handle;
6122 #endif 6173 #endif
@@ -6126,9 +6177,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/device.h linux-2.6.32.7/arch/x86/
6126 #endif 6177 #endif
6127 #ifdef CONFIG_DMAR 6178 #ifdef CONFIG_DMAR
6128 void *iommu; /* hook for IOMMU specific extension */ 6179 void *iommu; /* hook for IOMMU specific extension */
6129diff -urNp linux-2.6.32.7/arch/x86/include/asm/dma-mapping.h linux-2.6.32.7/arch/x86/include/asm/dma-mapping.h 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
6130--- linux-2.6.32.7/arch/x86/include/asm/dma-mapping.h 2010-01-25 13:50:10.000000000 -0500 6181--- linux-2.6.32.8/arch/x86/include/asm/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500
6131+++ linux-2.6.32.7/arch/x86/include/asm/dma-mapping.h 2010-01-25 17:39:40.279405074 -0500 6182+++ linux-2.6.32.8/arch/x86/include/asm/dma-mapping.h 2010-02-10 15:06:23.945990506 -0500
6132@@ -25,9 +25,9 @@ extern int iommu_merge; 6183@@ -25,9 +25,9 @@ extern int iommu_merge;
6133 extern struct device x86_dma_fallback_dev; 6184 extern struct device x86_dma_fallback_dev;
6134 extern int panic_on_overflow; 6185 extern int panic_on_overflow;
@@ -6168,9 +6219,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/dma-mapping.h linux-2.6.32.7/arch
6168 6219
6169 WARN_ON(irqs_disabled()); /* for portability */ 6220 WARN_ON(irqs_disabled()); /* for portability */
6170 6221
6171diff -urNp linux-2.6.32.7/arch/x86/include/asm/e820.h linux-2.6.32.7/arch/x86/include/asm/e820.h 6222diff -urNp linux-2.6.32.8/arch/x86/include/asm/e820.h linux-2.6.32.8/arch/x86/include/asm/e820.h
6172--- linux-2.6.32.7/arch/x86/include/asm/e820.h 2010-01-25 13:50:10.000000000 -0500 6223--- linux-2.6.32.8/arch/x86/include/asm/e820.h 2010-02-09 07:57:19.000000000 -0500
6173+++ linux-2.6.32.7/arch/x86/include/asm/e820.h 2010-01-25 17:39:40.279405074 -0500 6224+++ linux-2.6.32.8/arch/x86/include/asm/e820.h 2010-02-10 15:06:23.945990506 -0500
6174@@ -133,7 +133,7 @@ extern char *default_machine_specific_me 6225@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
6175 #define ISA_END_ADDRESS 0x100000 6226 #define ISA_END_ADDRESS 0x100000
6176 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) 6227 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
@@ -6180,10 +6231,10 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/e820.h linux-2.6.32.7/arch/x86/in
6180 #define BIOS_END 0x00100000 6231 #define BIOS_END 0x00100000
6181 6232
6182 #ifdef __KERNEL__ 6233 #ifdef __KERNEL__
6183diff -urNp linux-2.6.32.7/arch/x86/include/asm/elf.h linux-2.6.32.7/arch/x86/include/asm/elf.h 6234diff -urNp linux-2.6.32.8/arch/x86/include/asm/elf.h linux-2.6.32.8/arch/x86/include/asm/elf.h
6184--- linux-2.6.32.7/arch/x86/include/asm/elf.h 2010-01-25 13:50:10.000000000 -0500 6235--- linux-2.6.32.8/arch/x86/include/asm/elf.h 2010-02-09 07:57:19.000000000 -0500
6185+++ linux-2.6.32.7/arch/x86/include/asm/elf.h 2010-01-25 17:39:40.279405074 -0500 6236+++ linux-2.6.32.8/arch/x86/include/asm/elf.h 2010-02-10 15:06:23.945990506 -0500
6186@@ -263,7 +263,25 @@ extern int force_personality32; 6237@@ -257,7 +257,25 @@ extern int force_personality32;
6187 the loader. We need to make sure that it is out of the way of the program 6238 the loader. We need to make sure that it is out of the way of the program
6188 that it will "exec", and that there is sufficient room for the brk. */ 6239 that it will "exec", and that there is sufficient room for the brk. */
6189 6240
@@ -6209,7 +6260,7 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/elf.h linux-2.6.32.7/arch/x86/inc
6209 6260
6210 /* This yields a mask that user programs can use to figure out what 6261 /* This yields a mask that user programs can use to figure out what
6211 instruction set this CPU supports. This could be done in user space, 6262 instruction set this CPU supports. This could be done in user space,
6212@@ -317,8 +335,7 @@ do { \ 6263@@ -311,8 +329,7 @@ do { \
6213 #define ARCH_DLINFO \ 6264 #define ARCH_DLINFO \
6214 do { \ 6265 do { \
6215 if (vdso_enabled) \ 6266 if (vdso_enabled) \
@@ -6219,7 +6270,7 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/elf.h linux-2.6.32.7/arch/x86/inc
6219 } while (0) 6270 } while (0)
6220 6271
6221 #define AT_SYSINFO 32 6272 #define AT_SYSINFO 32
6222@@ -329,7 +346,7 @@ do { \ 6273@@ -323,7 +340,7 @@ do { \
6223 6274
6224 #endif /* !CONFIG_X86_32 */ 6275 #endif /* !CONFIG_X86_32 */
6225 6276
@@ -6228,7 +6279,7 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/elf.h linux-2.6.32.7/arch/x86/inc
6228 6279
6229 #define VDSO_ENTRY \ 6280 #define VDSO_ENTRY \
6230 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall)) 6281 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
6231@@ -343,7 +360,4 @@ extern int arch_setup_additional_pages(s 6282@@ -337,7 +354,4 @@ extern int arch_setup_additional_pages(s
6232 extern int syscall32_setup_pages(struct linux_binprm *, int exstack); 6283 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
6233 #define compat_arch_setup_additional_pages syscall32_setup_pages 6284 #define compat_arch_setup_additional_pages syscall32_setup_pages
6234 6285
@@ -6236,9 +6287,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/elf.h linux-2.6.32.7/arch/x86/inc
6236-#define arch_randomize_brk arch_randomize_brk 6287-#define arch_randomize_brk arch_randomize_brk
6237- 6288-
6238 #endif /* _ASM_X86_ELF_H */ 6289 #endif /* _ASM_X86_ELF_H */
6239diff -urNp linux-2.6.32.7/arch/x86/include/asm/futex.h linux-2.6.32.7/arch/x86/include/asm/futex.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
6240--- linux-2.6.32.7/arch/x86/include/asm/futex.h 2010-01-25 13:50:10.000000000 -0500 6291--- linux-2.6.32.8/arch/x86/include/asm/futex.h 2010-02-09 07:57:19.000000000 -0500
6241+++ linux-2.6.32.7/arch/x86/include/asm/futex.h 2010-01-25 17:39:40.279405074 -0500 6292+++ linux-2.6.32.8/arch/x86/include/asm/futex.h 2010-02-10 15:06:23.945990506 -0500
6242@@ -11,6 +11,40 @@ 6293@@ -11,6 +11,40 @@
6243 #include <asm/processor.h> 6294 #include <asm/processor.h>
6244 #include <asm/system.h> 6295 #include <asm/system.h>
@@ -6350,9 +6401,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/futex.h linux-2.6.32.7/arch/x86/i
6350 : "memory" 6401 : "memory"
6351 ); 6402 );
6352 6403
6353diff -urNp linux-2.6.32.7/arch/x86/include/asm/i387.h linux-2.6.32.7/arch/x86/include/asm/i387.h 6404diff -urNp linux-2.6.32.8/arch/x86/include/asm/i387.h linux-2.6.32.8/arch/x86/include/asm/i387.h
6354--- linux-2.6.32.7/arch/x86/include/asm/i387.h 2010-01-25 13:50:10.000000000 -0500 6405--- linux-2.6.32.8/arch/x86/include/asm/i387.h 2010-02-09 07:57:19.000000000 -0500
6355+++ linux-2.6.32.7/arch/x86/include/asm/i387.h 2010-01-25 17:39:40.279405074 -0500 6406+++ linux-2.6.32.8/arch/x86/include/asm/i387.h 2010-02-10 15:06:23.945990506 -0500
6356@@ -195,13 +195,8 @@ static inline int fxrstor_checking(struc 6407@@ -195,13 +195,8 @@ static inline int fxrstor_checking(struc
6357 } 6408 }
6358 6409
@@ -6369,9 +6420,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/i387.h linux-2.6.32.7/arch/x86/in
6369 6420
6370 /* 6421 /*
6371 * These must be called with preempt disabled 6422 * These must be called with preempt disabled
6372diff -urNp linux-2.6.32.7/arch/x86/include/asm/io_64.h linux-2.6.32.7/arch/x86/include/asm/io_64.h 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
6373--- linux-2.6.32.7/arch/x86/include/asm/io_64.h 2010-01-25 13:50:10.000000000 -0500 6424--- linux-2.6.32.8/arch/x86/include/asm/io_64.h 2010-02-09 07:57:19.000000000 -0500
6374+++ linux-2.6.32.7/arch/x86/include/asm/io_64.h 2010-01-25 17:39:55.228950835 -0500 6425+++ linux-2.6.32.8/arch/x86/include/asm/io_64.h 2010-02-10 15:06:23.945990506 -0500
6375@@ -140,6 +140,17 @@ __OUTS(l) 6426@@ -140,6 +140,17 @@ __OUTS(l)
6376 6427
6377 #include <linux/vmalloc.h> 6428 #include <linux/vmalloc.h>
@@ -6390,9 +6441,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/io_64.h linux-2.6.32.7/arch/x86/i
6390 #include <asm-generic/iomap.h> 6441 #include <asm-generic/iomap.h>
6391 6442
6392 void __memcpy_fromio(void *, unsigned long, unsigned); 6443 void __memcpy_fromio(void *, unsigned long, unsigned);
6393diff -urNp linux-2.6.32.7/arch/x86/include/asm/iommu.h linux-2.6.32.7/arch/x86/include/asm/iommu.h 6444diff -urNp linux-2.6.32.8/arch/x86/include/asm/iommu.h linux-2.6.32.8/arch/x86/include/asm/iommu.h
6394--- linux-2.6.32.7/arch/x86/include/asm/iommu.h 2010-01-25 13:50:10.000000000 -0500 6445--- linux-2.6.32.8/arch/x86/include/asm/iommu.h 2010-02-09 07:57:19.000000000 -0500
6395+++ linux-2.6.32.7/arch/x86/include/asm/iommu.h 2010-01-25 17:39:40.280404200 -0500 6446+++ linux-2.6.32.8/arch/x86/include/asm/iommu.h 2010-02-10 15:06:23.945990506 -0500
6396@@ -3,7 +3,7 @@ 6447@@ -3,7 +3,7 @@
6397 6448
6398 extern void pci_iommu_shutdown(void); 6449 extern void pci_iommu_shutdown(void);
@@ -6402,9 +6453,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/iommu.h linux-2.6.32.7/arch/x86/i
6402 extern int force_iommu, no_iommu; 6453 extern int force_iommu, no_iommu;
6403 extern int iommu_detected; 6454 extern int iommu_detected;
6404 extern int iommu_pass_through; 6455 extern int iommu_pass_through;
6405diff -urNp linux-2.6.32.7/arch/x86/include/asm/irqflags.h linux-2.6.32.7/arch/x86/include/asm/irqflags.h 6456diff -urNp linux-2.6.32.8/arch/x86/include/asm/irqflags.h linux-2.6.32.8/arch/x86/include/asm/irqflags.h
6406--- linux-2.6.32.7/arch/x86/include/asm/irqflags.h 2010-01-25 13:50:10.000000000 -0500 6457--- linux-2.6.32.8/arch/x86/include/asm/irqflags.h 2010-02-09 07:57:19.000000000 -0500
6407+++ linux-2.6.32.7/arch/x86/include/asm/irqflags.h 2010-01-25 17:39:40.280404200 -0500 6458+++ linux-2.6.32.8/arch/x86/include/asm/irqflags.h 2010-02-10 15:06:23.945990506 -0500
6408@@ -146,6 +146,27 @@ static inline unsigned long __raw_local_ 6459@@ -146,6 +146,27 @@ static inline unsigned long __raw_local_
6409 #define INTERRUPT_RETURN iret 6460 #define INTERRUPT_RETURN iret
6410 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit 6461 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
@@ -6433,10 +6484,10 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/irqflags.h linux-2.6.32.7/arch/x8
6433 #endif 6484 #endif
6434 6485
6435 6486
6436diff -urNp linux-2.6.32.7/arch/x86/include/asm/kvm_host.h linux-2.6.32.7/arch/x86/include/asm/kvm_host.h 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
6437--- linux-2.6.32.7/arch/x86/include/asm/kvm_host.h 2010-01-25 13:50:10.000000000 -0500 6488--- linux-2.6.32.8/arch/x86/include/asm/kvm_host.h 2010-02-09 07:57:19.000000000 -0500
6438+++ linux-2.6.32.7/arch/x86/include/asm/kvm_host.h 2010-01-25 17:39:40.280404200 -0500 6489+++ linux-2.6.32.8/arch/x86/include/asm/kvm_host.h 2010-02-10 15:06:23.945990506 -0500
6439@@ -530,7 +530,7 @@ struct kvm_x86_ops { 6490@@ -531,7 +531,7 @@ struct kvm_x86_ops {
6440 const struct trace_print_flags *exit_reasons_str; 6491 const struct trace_print_flags *exit_reasons_str;
6441 }; 6492 };
6442 6493
@@ -6445,9 +6496,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/kvm_host.h linux-2.6.32.7/arch/x8
6445 6496
6446 int kvm_mmu_module_init(void); 6497 int kvm_mmu_module_init(void);
6447 void kvm_mmu_module_exit(void); 6498 void kvm_mmu_module_exit(void);
6448diff -urNp linux-2.6.32.7/arch/x86/include/asm/local.h linux-2.6.32.7/arch/x86/include/asm/local.h 6499diff -urNp linux-2.6.32.8/arch/x86/include/asm/local.h linux-2.6.32.8/arch/x86/include/asm/local.h
6449--- linux-2.6.32.7/arch/x86/include/asm/local.h 2010-01-25 13:50:10.000000000 -0500 6500--- linux-2.6.32.8/arch/x86/include/asm/local.h 2010-02-09 07:57:19.000000000 -0500
6450+++ linux-2.6.32.7/arch/x86/include/asm/local.h 2010-01-25 17:39:40.280404200 -0500 6501+++ linux-2.6.32.8/arch/x86/include/asm/local.h 2010-02-10 15:06:23.945990506 -0500
6451@@ -18,26 +18,90 @@ typedef struct { 6502@@ -18,26 +18,90 @@ typedef struct {
6452 6503
6453 static inline void local_inc(local_t *l) 6504 static inline void local_inc(local_t *l)
@@ -6672,9 +6723,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/local.h linux-2.6.32.7/arch/x86/i
6672 : "+r" (i), "+m" (l->a.counter) 6723 : "+r" (i), "+m" (l->a.counter)
6673 : : "memory"); 6724 : : "memory");
6674 return i + __i; 6725 return i + __i;
6675diff -urNp linux-2.6.32.7/arch/x86/include/asm/microcode.h linux-2.6.32.7/arch/x86/include/asm/microcode.h 6726diff -urNp linux-2.6.32.8/arch/x86/include/asm/microcode.h linux-2.6.32.8/arch/x86/include/asm/microcode.h
6676--- linux-2.6.32.7/arch/x86/include/asm/microcode.h 2010-01-25 13:50:10.000000000 -0500 6727--- linux-2.6.32.8/arch/x86/include/asm/microcode.h 2010-02-09 07:57:19.000000000 -0500
6677+++ linux-2.6.32.7/arch/x86/include/asm/microcode.h 2010-01-25 17:39:40.280404200 -0500 6728+++ linux-2.6.32.8/arch/x86/include/asm/microcode.h 2010-02-10 15:06:23.945990506 -0500
6678@@ -12,13 +12,13 @@ struct device; 6729@@ -12,13 +12,13 @@ struct device;
6679 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; 6730 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
6680 6731
@@ -6715,9 +6766,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/microcode.h linux-2.6.32.7/arch/x
6715 { 6766 {
6716 return NULL; 6767 return NULL;
6717 } 6768 }
6718diff -urNp linux-2.6.32.7/arch/x86/include/asm/mman.h linux-2.6.32.7/arch/x86/include/asm/mman.h 6769diff -urNp linux-2.6.32.8/arch/x86/include/asm/mman.h linux-2.6.32.8/arch/x86/include/asm/mman.h
6719--- linux-2.6.32.7/arch/x86/include/asm/mman.h 2010-01-25 13:50:10.000000000 -0500 6770--- linux-2.6.32.8/arch/x86/include/asm/mman.h 2010-02-09 07:57:19.000000000 -0500
6720+++ linux-2.6.32.7/arch/x86/include/asm/mman.h 2010-01-25 17:39:40.280404200 -0500 6771+++ linux-2.6.32.8/arch/x86/include/asm/mman.h 2010-02-10 15:06:23.945990506 -0500
6721@@ -5,4 +5,14 @@ 6772@@ -5,4 +5,14 @@
6722 6773
6723 #include <asm-generic/mman.h> 6774 #include <asm-generic/mman.h>
@@ -6733,9 +6784,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/mman.h linux-2.6.32.7/arch/x86/in
6733+#endif 6784+#endif
6734+ 6785+
6735 #endif /* _ASM_X86_MMAN_H */ 6786 #endif /* _ASM_X86_MMAN_H */
6736diff -urNp linux-2.6.32.7/arch/x86/include/asm/mmu_context.h linux-2.6.32.7/arch/x86/include/asm/mmu_context.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
6737--- linux-2.6.32.7/arch/x86/include/asm/mmu_context.h 2010-01-25 13:50:10.000000000 -0500 6788--- linux-2.6.32.8/arch/x86/include/asm/mmu_context.h 2010-02-09 07:57:19.000000000 -0500
6738+++ linux-2.6.32.7/arch/x86/include/asm/mmu_context.h 2010-01-25 17:39:40.281476056 -0500 6789+++ linux-2.6.32.8/arch/x86/include/asm/mmu_context.h 2010-02-10 15:06:23.945990506 -0500
6739@@ -34,11 +34,17 @@ static inline void switch_mm(struct mm_s 6790@@ -34,11 +34,17 @@ static inline void switch_mm(struct mm_s
6740 struct task_struct *tsk) 6791 struct task_struct *tsk)
6741 { 6792 {
@@ -6801,9 +6852,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/mmu_context.h linux-2.6.32.7/arch
6801 } 6852 }
6802 } 6853 }
6803 #endif 6854 #endif
6804diff -urNp linux-2.6.32.7/arch/x86/include/asm/mmu.h linux-2.6.32.7/arch/x86/include/asm/mmu.h 6855diff -urNp linux-2.6.32.8/arch/x86/include/asm/mmu.h linux-2.6.32.8/arch/x86/include/asm/mmu.h
6805--- linux-2.6.32.7/arch/x86/include/asm/mmu.h 2010-01-25 13:50:10.000000000 -0500 6856--- linux-2.6.32.8/arch/x86/include/asm/mmu.h 2010-02-09 07:57:19.000000000 -0500
6806+++ linux-2.6.32.7/arch/x86/include/asm/mmu.h 2010-01-25 17:39:40.281476056 -0500 6857+++ linux-2.6.32.8/arch/x86/include/asm/mmu.h 2010-02-10 15:06:23.945990506 -0500
6807@@ -9,10 +9,23 @@ 6858@@ -9,10 +9,23 @@
6808 * we put the segment information here. 6859 * we put the segment information here.
6809 */ 6860 */
@@ -6830,9 +6881,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/mmu.h linux-2.6.32.7/arch/x86/inc
6830 } mm_context_t; 6881 } mm_context_t;
6831 6882
6832 #ifdef CONFIG_SMP 6883 #ifdef CONFIG_SMP
6833diff -urNp linux-2.6.32.7/arch/x86/include/asm/module.h linux-2.6.32.7/arch/x86/include/asm/module.h 6884diff -urNp linux-2.6.32.8/arch/x86/include/asm/module.h linux-2.6.32.8/arch/x86/include/asm/module.h
6834--- linux-2.6.32.7/arch/x86/include/asm/module.h 2010-01-25 13:50:10.000000000 -0500 6885--- linux-2.6.32.8/arch/x86/include/asm/module.h 2010-02-09 07:57:19.000000000 -0500
6835+++ linux-2.6.32.7/arch/x86/include/asm/module.h 2010-01-25 17:39:40.281476056 -0500 6886+++ linux-2.6.32.8/arch/x86/include/asm/module.h 2010-02-10 15:06:23.945990506 -0500
6836@@ -65,7 +65,12 @@ 6887@@ -65,7 +65,12 @@
6837 # else 6888 # else
6838 # define MODULE_STACKSIZE "" 6889 # define MODULE_STACKSIZE ""
@@ -6847,9 +6898,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/module.h linux-2.6.32.7/arch/x86/
6847 #endif 6898 #endif
6848 6899
6849 #endif /* _ASM_X86_MODULE_H */ 6900 #endif /* _ASM_X86_MODULE_H */
6850diff -urNp linux-2.6.32.7/arch/x86/include/asm/page_32_types.h linux-2.6.32.7/arch/x86/include/asm/page_32_types.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
6851--- linux-2.6.32.7/arch/x86/include/asm/page_32_types.h 2010-01-25 13:50:10.000000000 -0500 6902--- linux-2.6.32.8/arch/x86/include/asm/page_32_types.h 2010-02-09 07:57:19.000000000 -0500
6852+++ linux-2.6.32.7/arch/x86/include/asm/page_32_types.h 2010-01-25 17:39:40.281476056 -0500 6903+++ linux-2.6.32.8/arch/x86/include/asm/page_32_types.h 2010-02-10 15:06:23.945990506 -0500
6853@@ -15,6 +15,10 @@ 6904@@ -15,6 +15,10 @@
6854 */ 6905 */
6855 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) 6906 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
@@ -6861,9 +6912,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/page_32_types.h linux-2.6.32.7/ar
6861 #ifdef CONFIG_4KSTACKS 6912 #ifdef CONFIG_4KSTACKS
6862 #define THREAD_ORDER 0 6913 #define THREAD_ORDER 0
6863 #else 6914 #else
6864diff -urNp linux-2.6.32.7/arch/x86/include/asm/page_64_types.h linux-2.6.32.7/arch/x86/include/asm/page_64_types.h 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
6865--- linux-2.6.32.7/arch/x86/include/asm/page_64_types.h 2010-01-25 13:50:10.000000000 -0500 6916--- linux-2.6.32.8/arch/x86/include/asm/page_64_types.h 2010-02-09 07:57:19.000000000 -0500
6866+++ linux-2.6.32.7/arch/x86/include/asm/page_64_types.h 2010-01-25 17:39:40.281476056 -0500 6917+++ linux-2.6.32.8/arch/x86/include/asm/page_64_types.h 2010-02-10 15:06:23.945990506 -0500
6867@@ -39,6 +39,9 @@ 6918@@ -39,6 +39,9 @@
6868 #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) 6919 #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START)
6869 #define __START_KERNEL_map _AC(0xffffffff80000000, UL) 6920 #define __START_KERNEL_map _AC(0xffffffff80000000, UL)
@@ -6874,9 +6925,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/page_64_types.h linux-2.6.32.7/ar
6874 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ 6925 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
6875 #define __PHYSICAL_MASK_SHIFT 46 6926 #define __PHYSICAL_MASK_SHIFT 46
6876 #define __VIRTUAL_MASK_SHIFT 47 6927 #define __VIRTUAL_MASK_SHIFT 47
6877diff -urNp linux-2.6.32.7/arch/x86/include/asm/paravirt.h linux-2.6.32.7/arch/x86/include/asm/paravirt.h 6928diff -urNp linux-2.6.32.8/arch/x86/include/asm/paravirt.h linux-2.6.32.8/arch/x86/include/asm/paravirt.h
6878--- linux-2.6.32.7/arch/x86/include/asm/paravirt.h 2010-01-25 13:50:10.000000000 -0500 6929--- linux-2.6.32.8/arch/x86/include/asm/paravirt.h 2010-02-09 07:57:19.000000000 -0500
6879+++ linux-2.6.32.7/arch/x86/include/asm/paravirt.h 2010-01-25 17:39:40.281476056 -0500 6930+++ linux-2.6.32.8/arch/x86/include/asm/paravirt.h 2010-02-10 15:06:23.951498753 -0500
6880@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned 6931@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
6881 pv_mmu_ops.set_fixmap(idx, phys, flags); 6932 pv_mmu_ops.set_fixmap(idx, phys, flags);
6882 } 6933 }
@@ -6949,9 +7000,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/paravirt.h linux-2.6.32.7/arch/x8
6949 #define GET_CR0_INTO_EAX \ 7000 #define GET_CR0_INTO_EAX \
6950 push %ecx; push %edx; \ 7001 push %ecx; push %edx; \
6951 call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \ 7002 call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
6952diff -urNp linux-2.6.32.7/arch/x86/include/asm/paravirt_types.h linux-2.6.32.7/arch/x86/include/asm/paravirt_types.h 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
6953--- linux-2.6.32.7/arch/x86/include/asm/paravirt_types.h 2010-01-25 13:50:10.000000000 -0500 7004--- linux-2.6.32.8/arch/x86/include/asm/paravirt_types.h 2010-02-09 07:57:19.000000000 -0500
6954+++ linux-2.6.32.7/arch/x86/include/asm/paravirt_types.h 2010-01-25 17:39:40.281476056 -0500 7005+++ linux-2.6.32.8/arch/x86/include/asm/paravirt_types.h 2010-02-10 15:06:23.951498753 -0500
6955@@ -316,6 +316,12 @@ struct pv_mmu_ops { 7006@@ -316,6 +316,12 @@ struct pv_mmu_ops {
6956 an mfn. We can tell which is which from the index. */ 7007 an mfn. We can tell which is which from the index. */
6957 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, 7008 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
@@ -6965,9 +7016,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/paravirt_types.h linux-2.6.32.7/a
6965 }; 7016 };
6966 7017
6967 struct raw_spinlock; 7018 struct raw_spinlock;
6968diff -urNp linux-2.6.32.7/arch/x86/include/asm/pci_x86.h linux-2.6.32.7/arch/x86/include/asm/pci_x86.h 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
6969--- linux-2.6.32.7/arch/x86/include/asm/pci_x86.h 2010-01-25 13:50:10.000000000 -0500 7020--- linux-2.6.32.8/arch/x86/include/asm/pci_x86.h 2010-02-09 07:57:19.000000000 -0500
6970+++ linux-2.6.32.7/arch/x86/include/asm/pci_x86.h 2010-01-25 17:39:40.282415771 -0500 7021+++ linux-2.6.32.8/arch/x86/include/asm/pci_x86.h 2010-02-10 15:06:23.951498753 -0500
6971@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct 7022@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
6972 extern void (*pcibios_disable_irq)(struct pci_dev *dev); 7023 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
6973 7024
@@ -6990,9 +7041,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pci_x86.h linux-2.6.32.7/arch/x86
6990 extern bool port_cf9_safe; 7041 extern bool port_cf9_safe;
6991 7042
6992 /* arch_initcall level */ 7043 /* arch_initcall level */
6993diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgalloc.h linux-2.6.32.7/arch/x86/include/asm/pgalloc.h 7044diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgalloc.h linux-2.6.32.8/arch/x86/include/asm/pgalloc.h
6994--- linux-2.6.32.7/arch/x86/include/asm/pgalloc.h 2010-01-25 13:50:10.000000000 -0500 7045--- linux-2.6.32.8/arch/x86/include/asm/pgalloc.h 2010-02-09 07:57:19.000000000 -0500
6995+++ linux-2.6.32.7/arch/x86/include/asm/pgalloc.h 2010-01-25 17:39:40.282415771 -0500 7046+++ linux-2.6.32.8/arch/x86/include/asm/pgalloc.h 2010-02-10 15:06:23.951498753 -0500
6996@@ -58,6 +58,13 @@ static inline void pmd_populate_kernel(s 7047@@ -58,6 +58,13 @@ static inline void pmd_populate_kernel(s
6997 pmd_t *pmd, pte_t *pte) 7048 pmd_t *pmd, pte_t *pte)
6998 { 7049 {
@@ -7007,9 +7058,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgalloc.h linux-2.6.32.7/arch/x86
7007 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); 7058 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
7008 } 7059 }
7009 7060
7010diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.7/arch/x86/include/asm/pgtable-2level.h 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
7011--- linux-2.6.32.7/arch/x86/include/asm/pgtable-2level.h 2010-01-25 13:50:10.000000000 -0500 7062--- linux-2.6.32.8/arch/x86/include/asm/pgtable-2level.h 2010-02-09 07:57:19.000000000 -0500
7012+++ linux-2.6.32.7/arch/x86/include/asm/pgtable-2level.h 2010-01-25 17:39:40.282415771 -0500 7063+++ linux-2.6.32.8/arch/x86/include/asm/pgtable-2level.h 2010-02-10 15:06:23.951498753 -0500
7013@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 7064@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
7014 7065
7015 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7066 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7020,9 +7071,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.7/a
7020 } 7071 }
7021 7072
7022 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) 7073 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
7023diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_32.h linux-2.6.32.7/arch/x86/include/asm/pgtable_32.h 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
7024--- linux-2.6.32.7/arch/x86/include/asm/pgtable_32.h 2010-01-25 13:50:10.000000000 -0500 7075--- linux-2.6.32.8/arch/x86/include/asm/pgtable_32.h 2010-02-09 07:57:19.000000000 -0500
7025+++ linux-2.6.32.7/arch/x86/include/asm/pgtable_32.h 2010-01-25 17:39:40.282415771 -0500 7076+++ linux-2.6.32.8/arch/x86/include/asm/pgtable_32.h 2010-02-10 15:06:23.951498753 -0500
7026@@ -26,8 +26,6 @@ 7077@@ -26,8 +26,6 @@
7027 struct mm_struct; 7078 struct mm_struct;
7028 struct vm_area_struct; 7079 struct vm_area_struct;
@@ -7064,9 +7115,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_32.h linux-2.6.32.7/arch/
7064 /* 7115 /*
7065 * kern_addr_valid() is (1) for FLATMEM and (0) for 7116 * kern_addr_valid() is (1) for FLATMEM and (0) for
7066 * SPARSEMEM and DISCONTIGMEM 7117 * SPARSEMEM and DISCONTIGMEM
7067diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.7/arch/x86/include/asm/pgtable_32_types.h 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
7068--- linux-2.6.32.7/arch/x86/include/asm/pgtable_32_types.h 2010-01-25 13:50:10.000000000 -0500 7119--- linux-2.6.32.8/arch/x86/include/asm/pgtable_32_types.h 2010-02-09 07:57:19.000000000 -0500
7069+++ linux-2.6.32.7/arch/x86/include/asm/pgtable_32_types.h 2010-01-25 17:39:40.282415771 -0500 7120+++ linux-2.6.32.8/arch/x86/include/asm/pgtable_32_types.h 2010-02-10 15:06:23.951498753 -0500
7070@@ -8,7 +8,7 @@ 7121@@ -8,7 +8,7 @@
7071 */ 7122 */
7072 #ifdef CONFIG_X86_PAE 7123 #ifdef CONFIG_X86_PAE
@@ -7096,9 +7147,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.7
7096 #define MODULES_VADDR VMALLOC_START 7147 #define MODULES_VADDR VMALLOC_START
7097 #define MODULES_END VMALLOC_END 7148 #define MODULES_END VMALLOC_END
7098 #define MODULES_LEN (MODULES_VADDR - MODULES_END) 7149 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
7099diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.7/arch/x86/include/asm/pgtable-3level.h 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
7100--- linux-2.6.32.7/arch/x86/include/asm/pgtable-3level.h 2010-01-25 13:50:10.000000000 -0500 7151--- linux-2.6.32.8/arch/x86/include/asm/pgtable-3level.h 2010-02-09 07:57:19.000000000 -0500
7101+++ linux-2.6.32.7/arch/x86/include/asm/pgtable-3level.h 2010-01-25 17:39:40.282415771 -0500 7152+++ linux-2.6.32.8/arch/x86/include/asm/pgtable-3level.h 2010-02-10 15:06:23.951498753 -0500
7102@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic 7153@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
7103 7154
7104 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7155 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7116,9 +7167,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.7/a
7116 } 7167 }
7117 7168
7118 /* 7169 /*
7119diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_64.h linux-2.6.32.7/arch/x86/include/asm/pgtable_64.h 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
7120--- linux-2.6.32.7/arch/x86/include/asm/pgtable_64.h 2010-01-25 13:50:10.000000000 -0500 7171--- linux-2.6.32.8/arch/x86/include/asm/pgtable_64.h 2010-02-09 07:57:19.000000000 -0500
7121+++ linux-2.6.32.7/arch/x86/include/asm/pgtable_64.h 2010-01-25 20:01:12.031334490 -0500 7172+++ linux-2.6.32.8/arch/x86/include/asm/pgtable_64.h 2010-02-10 15:06:23.951498753 -0500
7122@@ -16,9 +16,12 @@ 7173@@ -16,9 +16,12 @@
7123 7174
7124 extern pud_t level3_kernel_pgt[512]; 7175 extern pud_t level3_kernel_pgt[512];
@@ -7153,9 +7204,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_64.h linux-2.6.32.7/arch/
7153 } 7204 }
7154 7205
7155 static inline void native_pgd_clear(pgd_t *pgd) 7206 static inline void native_pgd_clear(pgd_t *pgd)
7156diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable.h linux-2.6.32.7/arch/x86/include/asm/pgtable.h 7207diff -urNp linux-2.6.32.8/arch/x86/include/asm/pgtable.h linux-2.6.32.8/arch/x86/include/asm/pgtable.h
7157--- linux-2.6.32.7/arch/x86/include/asm/pgtable.h 2010-01-25 13:50:10.000000000 -0500 7208--- linux-2.6.32.8/arch/x86/include/asm/pgtable.h 2010-02-09 07:57:19.000000000 -0500
7158+++ linux-2.6.32.7/arch/x86/include/asm/pgtable.h 2010-01-25 17:39:40.283404332 -0500 7209+++ linux-2.6.32.8/arch/x86/include/asm/pgtable.h 2010-02-10 15:06:23.951498753 -0500
7159@@ -74,12 +74,51 @@ extern struct list_head pgd_list; 7210@@ -74,12 +74,51 @@ extern struct list_head pgd_list;
7160 7211
7161 #define arch_end_context_switch(prev) do {} while(0) 7212 #define arch_end_context_switch(prev) do {} while(0)
@@ -7259,9 +7310,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable.h linux-2.6.32.7/arch/x86
7259 } 7310 }
7260 7311
7261 7312
7262diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_types.h linux-2.6.32.7/arch/x86/include/asm/pgtable_types.h 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
7263--- linux-2.6.32.7/arch/x86/include/asm/pgtable_types.h 2010-01-25 13:50:10.000000000 -0500 7314--- linux-2.6.32.8/arch/x86/include/asm/pgtable_types.h 2010-02-09 07:57:19.000000000 -0500
7264+++ linux-2.6.32.7/arch/x86/include/asm/pgtable_types.h 2010-01-25 17:39:40.283404332 -0500 7315+++ linux-2.6.32.8/arch/x86/include/asm/pgtable_types.h 2010-02-10 15:06:23.951498753 -0500
7265@@ -16,12 +16,11 @@ 7316@@ -16,12 +16,11 @@
7266 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ 7317 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
7267 #define _PAGE_BIT_PAT 7 /* on 4KB pages */ 7318 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -7346,9 +7397,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/pgtable_types.h linux-2.6.32.7/ar
7346 7397
7347 #define pgprot_writecombine pgprot_writecombine 7398 #define pgprot_writecombine pgprot_writecombine
7348 extern pgprot_t pgprot_writecombine(pgprot_t prot); 7399 extern pgprot_t pgprot_writecombine(pgprot_t prot);
7349diff -urNp linux-2.6.32.7/arch/x86/include/asm/processor.h linux-2.6.32.7/arch/x86/include/asm/processor.h 7400diff -urNp linux-2.6.32.8/arch/x86/include/asm/processor.h linux-2.6.32.8/arch/x86/include/asm/processor.h
7350--- linux-2.6.32.7/arch/x86/include/asm/processor.h 2010-01-25 13:50:10.000000000 -0500 7401--- linux-2.6.32.8/arch/x86/include/asm/processor.h 2010-02-09 07:57:19.000000000 -0500
7351+++ linux-2.6.32.7/arch/x86/include/asm/processor.h 2010-01-25 17:39:40.290401180 -0500 7402+++ linux-2.6.32.8/arch/x86/include/asm/processor.h 2010-02-10 15:06:23.951498753 -0500
7352@@ -272,7 +272,7 @@ struct tss_struct { 7403@@ -272,7 +272,7 @@ struct tss_struct {
7353 7404
7354 } ____cacheline_aligned; 7405 } ____cacheline_aligned;
@@ -7428,9 +7479,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/processor.h linux-2.6.32.7/arch/x
7428 #define KSTK_EIP(task) (task_pt_regs(task)->ip) 7479 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
7429 7480
7430 /* Get/set a process' ability to use the timestamp counter instruction */ 7481 /* Get/set a process' ability to use the timestamp counter instruction */
7431diff -urNp linux-2.6.32.7/arch/x86/include/asm/ptrace.h linux-2.6.32.7/arch/x86/include/asm/ptrace.h 7482diff -urNp linux-2.6.32.8/arch/x86/include/asm/ptrace.h linux-2.6.32.8/arch/x86/include/asm/ptrace.h
7432--- linux-2.6.32.7/arch/x86/include/asm/ptrace.h 2010-01-25 13:50:10.000000000 -0500 7483--- linux-2.6.32.8/arch/x86/include/asm/ptrace.h 2010-02-09 07:57:19.000000000 -0500
7433+++ linux-2.6.32.7/arch/x86/include/asm/ptrace.h 2010-01-25 17:39:40.290401180 -0500 7484+++ linux-2.6.32.8/arch/x86/include/asm/ptrace.h 2010-02-10 15:06:23.951498753 -0500
7434@@ -151,28 +151,29 @@ static inline unsigned long regs_return_ 7485@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
7435 } 7486 }
7436 7487
@@ -7467,9 +7518,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/ptrace.h linux-2.6.32.7/arch/x86/
7467 #endif 7518 #endif
7468 } 7519 }
7469 7520
7470diff -urNp linux-2.6.32.7/arch/x86/include/asm/reboot.h linux-2.6.32.7/arch/x86/include/asm/reboot.h 7521diff -urNp linux-2.6.32.8/arch/x86/include/asm/reboot.h linux-2.6.32.8/arch/x86/include/asm/reboot.h
7471--- linux-2.6.32.7/arch/x86/include/asm/reboot.h 2010-01-25 13:50:10.000000000 -0500 7522--- linux-2.6.32.8/arch/x86/include/asm/reboot.h 2010-02-09 07:57:19.000000000 -0500
7472+++ linux-2.6.32.7/arch/x86/include/asm/reboot.h 2010-01-25 17:39:40.290401180 -0500 7523+++ linux-2.6.32.8/arch/x86/include/asm/reboot.h 2010-02-10 15:06:23.951498753 -0500
7473@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; 7524@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
7474 7525
7475 void native_machine_crash_shutdown(struct pt_regs *regs); 7526 void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -7479,9 +7530,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/reboot.h linux-2.6.32.7/arch/x86/
7479 7530
7480 typedef void (*nmi_shootdown_cb)(int, struct die_args*); 7531 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
7481 void nmi_shootdown_cpus(nmi_shootdown_cb callback); 7532 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
7482diff -urNp linux-2.6.32.7/arch/x86/include/asm/rwsem.h linux-2.6.32.7/arch/x86/include/asm/rwsem.h 7533diff -urNp linux-2.6.32.8/arch/x86/include/asm/rwsem.h linux-2.6.32.8/arch/x86/include/asm/rwsem.h
7483--- linux-2.6.32.7/arch/x86/include/asm/rwsem.h 2010-01-25 13:50:10.000000000 -0500 7534--- linux-2.6.32.8/arch/x86/include/asm/rwsem.h 2010-02-09 07:57:19.000000000 -0500
7484+++ linux-2.6.32.7/arch/x86/include/asm/rwsem.h 2010-01-25 17:39:40.291407051 -0500 7535+++ linux-2.6.32.8/arch/x86/include/asm/rwsem.h 2010-02-10 15:06:23.951498753 -0500
7485@@ -106,10 +106,26 @@ static inline void __down_read(struct rw 7536@@ -106,10 +106,26 @@ static inline void __down_read(struct rw
7486 { 7537 {
7487 asm volatile("# beginning down_read\n\t" 7538 asm volatile("# beginning down_read\n\t"
@@ -7714,9 +7765,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/rwsem.h linux-2.6.32.7/arch/x86/i
7714 : "+r" (tmp), "+m" (sem->count) 7765 : "+r" (tmp), "+m" (sem->count)
7715 : : "memory"); 7766 : : "memory");
7716 7767
7717diff -urNp linux-2.6.32.7/arch/x86/include/asm/segment.h linux-2.6.32.7/arch/x86/include/asm/segment.h 7768diff -urNp linux-2.6.32.8/arch/x86/include/asm/segment.h linux-2.6.32.8/arch/x86/include/asm/segment.h
7718--- linux-2.6.32.7/arch/x86/include/asm/segment.h 2010-01-25 13:50:10.000000000 -0500 7769--- linux-2.6.32.8/arch/x86/include/asm/segment.h 2010-02-09 07:57:19.000000000 -0500
7719+++ linux-2.6.32.7/arch/x86/include/asm/segment.h 2010-01-25 17:39:40.291407051 -0500 7770+++ linux-2.6.32.8/arch/x86/include/asm/segment.h 2010-02-10 15:06:23.951498753 -0500
7720@@ -88,7 +88,7 @@ 7771@@ -88,7 +88,7 @@
7721 #define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14) 7772 #define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14)
7722 #define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8) 7773 #define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)
@@ -7748,9 +7799,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/segment.h linux-2.6.32.7/arch/x86
7748 7799
7749 7800
7750 #else 7801 #else
7751diff -urNp linux-2.6.32.7/arch/x86/include/asm/spinlock.h linux-2.6.32.7/arch/x86/include/asm/spinlock.h 7802diff -urNp linux-2.6.32.8/arch/x86/include/asm/spinlock.h linux-2.6.32.8/arch/x86/include/asm/spinlock.h
7752--- linux-2.6.32.7/arch/x86/include/asm/spinlock.h 2010-01-25 13:50:10.000000000 -0500 7803--- linux-2.6.32.8/arch/x86/include/asm/spinlock.h 2010-02-09 07:57:19.000000000 -0500
7753+++ linux-2.6.32.7/arch/x86/include/asm/spinlock.h 2010-01-25 17:39:40.291407051 -0500 7804+++ linux-2.6.32.8/arch/x86/include/asm/spinlock.h 2010-02-10 15:06:23.951498753 -0500
7754@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r 7805@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r
7755 static inline void __raw_read_lock(raw_rwlock_t *rw) 7806 static inline void __raw_read_lock(raw_rwlock_t *rw)
7756 { 7807 {
@@ -7854,9 +7905,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/spinlock.h linux-2.6.32.7/arch/x8
7854 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); 7905 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
7855 } 7906 }
7856 7907
7857diff -urNp linux-2.6.32.7/arch/x86/include/asm/system.h linux-2.6.32.7/arch/x86/include/asm/system.h 7908diff -urNp linux-2.6.32.8/arch/x86/include/asm/system.h linux-2.6.32.8/arch/x86/include/asm/system.h
7858--- linux-2.6.32.7/arch/x86/include/asm/system.h 2010-01-25 13:50:10.000000000 -0500 7909--- linux-2.6.32.8/arch/x86/include/asm/system.h 2010-02-09 07:57:19.000000000 -0500
7859+++ linux-2.6.32.7/arch/x86/include/asm/system.h 2010-01-25 17:39:40.291407051 -0500 7910+++ linux-2.6.32.8/arch/x86/include/asm/system.h 2010-02-10 15:06:23.951498753 -0500
7860@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un 7911@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
7861 { 7912 {
7862 unsigned long __limit; 7913 unsigned long __limit;
@@ -7875,9 +7926,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/system.h linux-2.6.32.7/arch/x86/
7875 extern void free_init_pages(char *what, unsigned long begin, unsigned long end); 7926 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
7876 7927
7877 void default_idle(void); 7928 void default_idle(void);
7878diff -urNp linux-2.6.32.7/arch/x86/include/asm/uaccess_32.h linux-2.6.32.7/arch/x86/include/asm/uaccess_32.h 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
7879--- linux-2.6.32.7/arch/x86/include/asm/uaccess_32.h 2010-01-25 13:50:10.000000000 -0500 7930--- linux-2.6.32.8/arch/x86/include/asm/uaccess_32.h 2010-02-09 07:57:19.000000000 -0500
7880+++ linux-2.6.32.7/arch/x86/include/asm/uaccess_32.h 2010-01-25 17:39:40.291407051 -0500 7931+++ linux-2.6.32.8/arch/x86/include/asm/uaccess_32.h 2010-02-10 15:06:23.951498753 -0500
7881@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u 7932@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
7882 static __always_inline unsigned long __must_check 7933 static __always_inline unsigned long __must_check
7883 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) 7934 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -8007,9 +8058,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/uaccess_32.h linux-2.6.32.7/arch/
8007 long __must_check strncpy_from_user(char *dst, const char __user *src, 8058 long __must_check strncpy_from_user(char *dst, const char __user *src,
8008 long count); 8059 long count);
8009 long __must_check __strncpy_from_user(char *dst, 8060 long __must_check __strncpy_from_user(char *dst,
8010diff -urNp linux-2.6.32.7/arch/x86/include/asm/uaccess_64.h linux-2.6.32.7/arch/x86/include/asm/uaccess_64.h 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
8011--- linux-2.6.32.7/arch/x86/include/asm/uaccess_64.h 2010-01-25 13:50:10.000000000 -0500 8062--- linux-2.6.32.8/arch/x86/include/asm/uaccess_64.h 2010-02-09 07:57:19.000000000 -0500
8012+++ linux-2.6.32.7/arch/x86/include/asm/uaccess_64.h 2010-01-25 17:39:40.291407051 -0500 8063+++ linux-2.6.32.8/arch/x86/include/asm/uaccess_64.h 2010-02-10 15:06:23.951498753 -0500
8013@@ -10,6 +10,8 @@ 8064@@ -10,6 +10,8 @@
8014 #include <linux/lockdep.h> 8065 #include <linux/lockdep.h>
8015 #include <asm/page.h> 8066 #include <asm/page.h>
@@ -8160,9 +8211,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/uaccess_64.h linux-2.6.32.7/arch/
8160 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); 8211 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
8161 8212
8162 #endif /* _ASM_X86_UACCESS_64_H */ 8213 #endif /* _ASM_X86_UACCESS_64_H */
8163diff -urNp linux-2.6.32.7/arch/x86/include/asm/uaccess.h linux-2.6.32.7/arch/x86/include/asm/uaccess.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
8164--- linux-2.6.32.7/arch/x86/include/asm/uaccess.h 2010-01-25 13:50:10.000000000 -0500 8215--- linux-2.6.32.8/arch/x86/include/asm/uaccess.h 2010-02-09 07:57:19.000000000 -0500
8165+++ linux-2.6.32.7/arch/x86/include/asm/uaccess.h 2010-01-25 17:39:40.292416759 -0500 8216+++ linux-2.6.32.8/arch/x86/include/asm/uaccess.h 2010-02-10 15:06:23.951498753 -0500
8166@@ -8,8 +8,11 @@ 8217@@ -8,8 +8,11 @@
8167 #include <linux/thread_info.h> 8218 #include <linux/thread_info.h>
8168 #include <linux/prefetch.h> 8219 #include <linux/prefetch.h>
@@ -8361,9 +8412,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/uaccess.h linux-2.6.32.7/arch/x86
8361 #ifdef CONFIG_X86_32 8412 #ifdef CONFIG_X86_32
8362 # include "uaccess_32.h" 8413 # include "uaccess_32.h"
8363 #else 8414 #else
8364diff -urNp linux-2.6.32.7/arch/x86/include/asm/vgtod.h linux-2.6.32.7/arch/x86/include/asm/vgtod.h 8415diff -urNp linux-2.6.32.8/arch/x86/include/asm/vgtod.h linux-2.6.32.8/arch/x86/include/asm/vgtod.h
8365--- linux-2.6.32.7/arch/x86/include/asm/vgtod.h 2010-01-25 13:50:10.000000000 -0500 8416--- linux-2.6.32.8/arch/x86/include/asm/vgtod.h 2010-02-09 07:57:19.000000000 -0500
8366+++ linux-2.6.32.7/arch/x86/include/asm/vgtod.h 2010-01-25 17:39:40.292416759 -0500 8417+++ linux-2.6.32.8/arch/x86/include/asm/vgtod.h 2010-02-10 15:06:23.951498753 -0500
8367@@ -14,6 +14,7 @@ struct vsyscall_gtod_data { 8418@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
8368 int sysctl_enabled; 8419 int sysctl_enabled;
8369 struct timezone sys_tz; 8420 struct timezone sys_tz;
@@ -8372,9 +8423,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/vgtod.h linux-2.6.32.7/arch/x86/i
8372 cycle_t (*vread)(void); 8423 cycle_t (*vread)(void);
8373 cycle_t cycle_last; 8424 cycle_t cycle_last;
8374 cycle_t mask; 8425 cycle_t mask;
8375diff -urNp linux-2.6.32.7/arch/x86/include/asm/vmi.h linux-2.6.32.7/arch/x86/include/asm/vmi.h 8426diff -urNp linux-2.6.32.8/arch/x86/include/asm/vmi.h linux-2.6.32.8/arch/x86/include/asm/vmi.h
8376--- linux-2.6.32.7/arch/x86/include/asm/vmi.h 2010-01-25 13:50:10.000000000 -0500 8427--- linux-2.6.32.8/arch/x86/include/asm/vmi.h 2010-02-09 07:57:19.000000000 -0500
8377+++ linux-2.6.32.7/arch/x86/include/asm/vmi.h 2010-01-25 17:39:40.292416759 -0500 8428+++ linux-2.6.32.8/arch/x86/include/asm/vmi.h 2010-02-10 15:06:23.955498800 -0500
8378@@ -191,6 +191,7 @@ struct vrom_header { 8429@@ -191,6 +191,7 @@ struct vrom_header {
8379 u8 reserved[96]; /* Reserved for headers */ 8430 u8 reserved[96]; /* Reserved for headers */
8380 char vmi_init[8]; /* VMI_Init jump point */ 8431 char vmi_init[8]; /* VMI_Init jump point */
@@ -8383,9 +8434,9 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/vmi.h linux-2.6.32.7/arch/x86/inc
8383 } __attribute__((packed)); 8434 } __attribute__((packed));
8384 8435
8385 struct pnp_header { 8436 struct pnp_header {
8386diff -urNp linux-2.6.32.7/arch/x86/include/asm/vsyscall.h linux-2.6.32.7/arch/x86/include/asm/vsyscall.h 8437diff -urNp linux-2.6.32.8/arch/x86/include/asm/vsyscall.h linux-2.6.32.8/arch/x86/include/asm/vsyscall.h
8387--- linux-2.6.32.7/arch/x86/include/asm/vsyscall.h 2010-01-25 13:50:10.000000000 -0500 8438--- linux-2.6.32.8/arch/x86/include/asm/vsyscall.h 2010-02-09 07:57:19.000000000 -0500
8388+++ linux-2.6.32.7/arch/x86/include/asm/vsyscall.h 2010-01-25 17:39:40.293192103 -0500 8439+++ linux-2.6.32.8/arch/x86/include/asm/vsyscall.h 2010-02-10 15:06:23.955498800 -0500
8389@@ -15,9 +15,10 @@ enum vsyscall_num { 8440@@ -15,9 +15,10 @@ enum vsyscall_num {
8390 8441
8391 #ifdef __KERNEL__ 8442 #ifdef __KERNEL__
@@ -8416,10 +8467,10 @@ diff -urNp linux-2.6.32.7/arch/x86/include/asm/vsyscall.h linux-2.6.32.7/arch/x8
8416 #endif /* __KERNEL__ */ 8467 #endif /* __KERNEL__ */
8417 8468
8418 #endif /* _ASM_X86_VSYSCALL_H */ 8469 #endif /* _ASM_X86_VSYSCALL_H */
8419diff -urNp linux-2.6.32.7/arch/x86/Kconfig linux-2.6.32.7/arch/x86/Kconfig 8470diff -urNp linux-2.6.32.8/arch/x86/Kconfig linux-2.6.32.8/arch/x86/Kconfig
8420--- linux-2.6.32.7/arch/x86/Kconfig 2010-01-25 13:50:10.000000000 -0500 8471--- linux-2.6.32.8/arch/x86/Kconfig 2010-02-09 07:57:19.000000000 -0500
8421+++ linux-2.6.32.7/arch/x86/Kconfig 2010-01-25 17:39:40.293192103 -0500 8472+++ linux-2.6.32.8/arch/x86/Kconfig 2010-02-10 15:06:23.955498800 -0500
8422@@ -1089,7 +1089,7 @@ config PAGE_OFFSET 8473@@ -1083,7 +1083,7 @@ config PAGE_OFFSET
8423 hex 8474 hex
8424 default 0xB0000000 if VMSPLIT_3G_OPT 8475 default 0xB0000000 if VMSPLIT_3G_OPT
8425 default 0x80000000 if VMSPLIT_2G 8476 default 0x80000000 if VMSPLIT_2G
@@ -8428,7 +8479,7 @@ diff -urNp linux-2.6.32.7/arch/x86/Kconfig linux-2.6.32.7/arch/x86/Kconfig
8428 default 0x40000000 if VMSPLIT_1G 8479 default 0x40000000 if VMSPLIT_1G
8429 default 0xC0000000 8480 default 0xC0000000
8430 depends on X86_32 8481 depends on X86_32
8431@@ -1415,7 +1415,7 @@ config ARCH_USES_PG_UNCACHED 8482@@ -1409,7 +1409,7 @@ config ARCH_USES_PG_UNCACHED
8432 8483
8433 config EFI 8484 config EFI
8434 bool "EFI runtime service support" 8485 bool "EFI runtime service support"
@@ -8437,7 +8488,7 @@ diff -urNp linux-2.6.32.7/arch/x86/Kconfig linux-2.6.32.7/arch/x86/Kconfig
8437 ---help--- 8488 ---help---
8438 This enables the kernel to use EFI runtime services that are 8489 This enables the kernel to use EFI runtime services that are
8439 available (such as the EFI variable services). 8490 available (such as the EFI variable services).
8440@@ -1502,6 +1502,7 @@ config KEXEC_JUMP 8491@@ -1496,6 +1496,7 @@ config KEXEC_JUMP
8441 config PHYSICAL_START 8492 config PHYSICAL_START
8442 hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP) 8493 hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
8443 default "0x1000000" 8494 default "0x1000000"
@@ -8445,7 +8496,7 @@ diff -urNp linux-2.6.32.7/arch/x86/Kconfig linux-2.6.32.7/arch/x86/Kconfig
8445 ---help--- 8496 ---help---
8446 This gives the physical address where the kernel is loaded. 8497 This gives the physical address where the kernel is loaded.
8447 8498
8448@@ -1566,6 +1567,7 @@ config PHYSICAL_ALIGN 8499@@ -1560,6 +1561,7 @@ config PHYSICAL_ALIGN
8449 hex 8500 hex
8450 prompt "Alignment value to which kernel should be aligned" if X86_32 8501 prompt "Alignment value to which kernel should be aligned" if X86_32
8451 default "0x1000000" 8502 default "0x1000000"
@@ -8453,7 +8504,7 @@ diff -urNp linux-2.6.32.7/arch/x86/Kconfig linux-2.6.32.7/arch/x86/Kconfig
8453 range 0x2000 0x1000000 8504 range 0x2000 0x1000000
8454 ---help--- 8505 ---help---
8455 This value puts the alignment restrictions on physical address 8506 This value puts the alignment restrictions on physical address
8456@@ -1597,9 +1599,10 @@ config HOTPLUG_CPU 8507@@ -1591,9 +1593,10 @@ config HOTPLUG_CPU
8457 Say N if you want to disable CPU hotplug. 8508 Say N if you want to disable CPU hotplug.
8458 8509
8459 config COMPAT_VDSO 8510 config COMPAT_VDSO
@@ -8465,9 +8516,9 @@ diff -urNp linux-2.6.32.7/arch/x86/Kconfig linux-2.6.32.7/arch/x86/Kconfig
8465 ---help--- 8516 ---help---
8466 Map the 32-bit VDSO to the predictable old-style address too. 8517 Map the 32-bit VDSO to the predictable old-style address too.
8467 ---help--- 8518 ---help---
8468diff -urNp linux-2.6.32.7/arch/x86/Kconfig.cpu linux-2.6.32.7/arch/x86/Kconfig.cpu 8519diff -urNp linux-2.6.32.8/arch/x86/Kconfig.cpu linux-2.6.32.8/arch/x86/Kconfig.cpu
8469--- linux-2.6.32.7/arch/x86/Kconfig.cpu 2010-01-25 13:50:10.000000000 -0500 8520--- linux-2.6.32.8/arch/x86/Kconfig.cpu 2010-02-09 07:57:19.000000000 -0500
8470+++ linux-2.6.32.7/arch/x86/Kconfig.cpu 2010-01-25 17:39:40.293192103 -0500 8521+++ linux-2.6.32.8/arch/x86/Kconfig.cpu 2010-02-10 15:06:23.955498800 -0500
8471@@ -340,7 +340,7 @@ config X86_PPRO_FENCE 8522@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
8472 8523
8473 config X86_F00F_BUG 8524 config X86_F00F_BUG
@@ -8495,9 +8546,9 @@ diff -urNp linux-2.6.32.7/arch/x86/Kconfig.cpu linux-2.6.32.7/arch/x86/Kconfig.c
8495 8546
8496 config X86_MINIMUM_CPU_FAMILY 8547 config X86_MINIMUM_CPU_FAMILY
8497 int 8548 int
8498diff -urNp linux-2.6.32.7/arch/x86/Kconfig.debug linux-2.6.32.7/arch/x86/Kconfig.debug 8549diff -urNp linux-2.6.32.8/arch/x86/Kconfig.debug linux-2.6.32.8/arch/x86/Kconfig.debug
8499--- linux-2.6.32.7/arch/x86/Kconfig.debug 2010-01-25 13:50:10.000000000 -0500 8550--- linux-2.6.32.8/arch/x86/Kconfig.debug 2010-02-09 07:57:19.000000000 -0500
8500+++ linux-2.6.32.7/arch/x86/Kconfig.debug 2010-01-25 17:39:40.293192103 -0500 8551+++ linux-2.6.32.8/arch/x86/Kconfig.debug 2010-02-10 15:06:23.955498800 -0500
8501@@ -99,7 +99,7 @@ config X86_PTDUMP 8552@@ -99,7 +99,7 @@ config X86_PTDUMP
8502 config DEBUG_RODATA 8553 config DEBUG_RODATA
8503 bool "Write protect kernel read-only data structures" 8554 bool "Write protect kernel read-only data structures"
@@ -8507,9 +8558,9 @@ diff -urNp linux-2.6.32.7/arch/x86/Kconfig.debug linux-2.6.32.7/arch/x86/Kconfig
8507 ---help--- 8558 ---help---
8508 Mark the kernel read-only data as write-protected in the pagetables, 8559 Mark the kernel read-only data as write-protected in the pagetables,
8509 in order to catch accidental (and incorrect) writes to such const 8560 in order to catch accidental (and incorrect) writes to such const
8510diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/boot.c linux-2.6.32.7/arch/x86/kernel/acpi/boot.c 8561diff -urNp linux-2.6.32.8/arch/x86/kernel/acpi/boot.c linux-2.6.32.8/arch/x86/kernel/acpi/boot.c
8511--- linux-2.6.32.7/arch/x86/kernel/acpi/boot.c 2010-01-25 13:50:10.000000000 -0500 8562--- linux-2.6.32.8/arch/x86/kernel/acpi/boot.c 2010-02-09 07:57:19.000000000 -0500
8512+++ linux-2.6.32.7/arch/x86/kernel/acpi/boot.c 2010-01-25 17:39:40.294400939 -0500 8563+++ linux-2.6.32.8/arch/x86/kernel/acpi/boot.c 2010-02-10 15:06:23.955498800 -0500
8513@@ -1508,7 +1508,7 @@ static struct dmi_system_id __initdata a 8564@@ -1508,7 +1508,7 @@ static struct dmi_system_id __initdata a
8514 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), 8565 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
8515 }, 8566 },
@@ -8519,9 +8570,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/boot.c linux-2.6.32.7/arch/x86/ke
8519 }; 8570 };
8520 8571
8521 /* 8572 /*
8522diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.7/arch/x86/kernel/acpi/realmode/wakeup.S 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
8523--- linux-2.6.32.7/arch/x86/kernel/acpi/realmode/wakeup.S 2010-01-25 13:50:10.000000000 -0500 8574--- linux-2.6.32.8/arch/x86/kernel/acpi/realmode/wakeup.S 2010-02-09 07:57:19.000000000 -0500
8524+++ linux-2.6.32.7/arch/x86/kernel/acpi/realmode/wakeup.S 2010-01-25 17:39:40.294400939 -0500 8575+++ linux-2.6.32.8/arch/x86/kernel/acpi/realmode/wakeup.S 2010-02-10 15:06:23.955498800 -0500
8525@@ -104,7 +104,7 @@ _start: 8576@@ -104,7 +104,7 @@ _start:
8526 movl %eax, %ecx 8577 movl %eax, %ecx
8527 orl %edx, %ecx 8578 orl %edx, %ecx
@@ -8531,9 +8582,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.7/
8531 wrmsr 8582 wrmsr
8532 1: 8583 1:
8533 8584
8534diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/sleep.c linux-2.6.32.7/arch/x86/kernel/acpi/sleep.c 8585diff -urNp linux-2.6.32.8/arch/x86/kernel/acpi/sleep.c linux-2.6.32.8/arch/x86/kernel/acpi/sleep.c
8535--- linux-2.6.32.7/arch/x86/kernel/acpi/sleep.c 2010-01-25 13:50:10.000000000 -0500 8586--- linux-2.6.32.8/arch/x86/kernel/acpi/sleep.c 2010-02-09 07:57:19.000000000 -0500
8536+++ linux-2.6.32.7/arch/x86/kernel/acpi/sleep.c 2010-01-25 17:39:40.294400939 -0500 8587+++ linux-2.6.32.8/arch/x86/kernel/acpi/sleep.c 2010-02-10 15:06:23.955498800 -0500
8537@@ -11,11 +11,12 @@ 8588@@ -11,11 +11,12 @@
8538 #include <linux/cpumask.h> 8589 #include <linux/cpumask.h>
8539 #include <asm/segment.h> 8590 #include <asm/segment.h>
@@ -8578,9 +8629,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/sleep.c linux-2.6.32.7/arch/x86/k
8578 } 8629 }
8579 8630
8580 8631
8581diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.7/arch/x86/kernel/acpi/wakeup_32.S 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
8582--- linux-2.6.32.7/arch/x86/kernel/acpi/wakeup_32.S 2010-01-25 13:50:10.000000000 -0500 8633--- linux-2.6.32.8/arch/x86/kernel/acpi/wakeup_32.S 2010-02-09 07:57:19.000000000 -0500
8583+++ linux-2.6.32.7/arch/x86/kernel/acpi/wakeup_32.S 2010-01-25 17:39:40.294400939 -0500 8634+++ linux-2.6.32.8/arch/x86/kernel/acpi/wakeup_32.S 2010-02-10 15:06:23.955498800 -0500
8584@@ -30,13 +30,11 @@ wakeup_pmode_return: 8635@@ -30,13 +30,11 @@ wakeup_pmode_return:
8585 # and restore the stack ... but you need gdt for this to work 8636 # and restore the stack ... but you need gdt for this to work
8586 movl saved_context_esp, %esp 8637 movl saved_context_esp, %esp
@@ -8597,9 +8648,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.7/arch/x
8597 8648
8598 bogus_magic: 8649 bogus_magic:
8599 jmp bogus_magic 8650 jmp bogus_magic
8600diff -urNp linux-2.6.32.7/arch/x86/kernel/alternative.c linux-2.6.32.7/arch/x86/kernel/alternative.c 8651diff -urNp linux-2.6.32.8/arch/x86/kernel/alternative.c linux-2.6.32.8/arch/x86/kernel/alternative.c
8601--- linux-2.6.32.7/arch/x86/kernel/alternative.c 2010-01-25 13:50:10.000000000 -0500 8652--- linux-2.6.32.8/arch/x86/kernel/alternative.c 2010-02-09 07:57:19.000000000 -0500
8602+++ linux-2.6.32.7/arch/x86/kernel/alternative.c 2010-01-25 17:39:55.420093098 -0500 8653+++ linux-2.6.32.8/arch/x86/kernel/alternative.c 2010-02-10 15:06:23.955498800 -0500
8603@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str 8654@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
8604 8655
8605 BUG_ON(p->len > MAX_PATCH_LEN); 8656 BUG_ON(p->len > MAX_PATCH_LEN);
@@ -8672,9 +8723,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/alternative.c linux-2.6.32.7/arch/x86/
8672+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); 8723+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]);
8673 return addr; 8724 return addr;
8674 } 8725 }
8675diff -urNp linux-2.6.32.7/arch/x86/kernel/amd_iommu.c linux-2.6.32.7/arch/x86/kernel/amd_iommu.c 8726diff -urNp linux-2.6.32.8/arch/x86/kernel/amd_iommu.c linux-2.6.32.8/arch/x86/kernel/amd_iommu.c
8676--- linux-2.6.32.7/arch/x86/kernel/amd_iommu.c 2010-01-25 13:50:10.000000000 -0500 8727--- linux-2.6.32.8/arch/x86/kernel/amd_iommu.c 2010-02-09 07:57:19.000000000 -0500
8677+++ linux-2.6.32.7/arch/x86/kernel/amd_iommu.c 2010-01-25 17:39:40.295486806 -0500 8728+++ linux-2.6.32.8/arch/x86/kernel/amd_iommu.c 2010-02-10 15:06:23.955498800 -0500
8678@@ -2073,7 +2073,7 @@ static void prealloc_protection_domains( 8729@@ -2073,7 +2073,7 @@ static void prealloc_protection_domains(
8679 } 8730 }
8680 } 8731 }
@@ -8684,9 +8735,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/amd_iommu.c linux-2.6.32.7/arch/x86/ke
8684 .alloc_coherent = alloc_coherent, 8735 .alloc_coherent = alloc_coherent,
8685 .free_coherent = free_coherent, 8736 .free_coherent = free_coherent,
8686 .map_page = map_page, 8737 .map_page = map_page,
8687diff -urNp linux-2.6.32.7/arch/x86/kernel/apic/io_apic.c linux-2.6.32.7/arch/x86/kernel/apic/io_apic.c 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
8688--- linux-2.6.32.7/arch/x86/kernel/apic/io_apic.c 2010-01-25 13:50:10.000000000 -0500 8739--- linux-2.6.32.8/arch/x86/kernel/apic/io_apic.c 2010-02-09 07:57:19.000000000 -0500
8689+++ linux-2.6.32.7/arch/x86/kernel/apic/io_apic.c 2010-01-25 17:39:40.295486806 -0500 8740+++ linux-2.6.32.8/arch/x86/kernel/apic/io_apic.c 2010-02-10 15:06:23.955498800 -0500
8690@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi 8741@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi
8691 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, 8742 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
8692 GFP_ATOMIC); 8743 GFP_ATOMIC);
@@ -8723,9 +8774,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/apic/io_apic.c linux-2.6.32.7/arch/x86
8723 { 8774 {
8724 spin_unlock(&vector_lock); 8775 spin_unlock(&vector_lock);
8725 } 8776 }
8726diff -urNp linux-2.6.32.7/arch/x86/kernel/apm_32.c linux-2.6.32.7/arch/x86/kernel/apm_32.c 8777diff -urNp linux-2.6.32.8/arch/x86/kernel/apm_32.c linux-2.6.32.8/arch/x86/kernel/apm_32.c
8727--- linux-2.6.32.7/arch/x86/kernel/apm_32.c 2010-01-25 13:50:10.000000000 -0500 8778--- linux-2.6.32.8/arch/x86/kernel/apm_32.c 2010-02-09 07:57:19.000000000 -0500
8728+++ linux-2.6.32.7/arch/x86/kernel/apm_32.c 2010-01-25 17:39:40.296403613 -0500 8779+++ linux-2.6.32.8/arch/x86/kernel/apm_32.c 2010-02-10 15:06:23.958532525 -0500
8729@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); 8780@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
8730 * This is for buggy BIOS's that refer to (real mode) segment 0x40 8781 * This is for buggy BIOS's that refer to (real mode) segment 0x40
8731 * even though they are called in protected mode. 8782 * even though they are called in protected mode.
@@ -8827,9 +8878,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/apm_32.c linux-2.6.32.7/arch/x86/kerne
8827 8878
8828 proc_create("apm", 0, NULL, &apm_file_ops); 8879 proc_create("apm", 0, NULL, &apm_file_ops);
8829 8880
8830diff -urNp linux-2.6.32.7/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.7/arch/x86/kernel/asm-offsets_32.c 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
8831--- linux-2.6.32.7/arch/x86/kernel/asm-offsets_32.c 2010-01-25 13:50:10.000000000 -0500 8882--- linux-2.6.32.8/arch/x86/kernel/asm-offsets_32.c 2010-02-09 07:57:19.000000000 -0500
8832+++ linux-2.6.32.7/arch/x86/kernel/asm-offsets_32.c 2010-01-25 17:39:40.296403613 -0500 8883+++ linux-2.6.32.8/arch/x86/kernel/asm-offsets_32.c 2010-02-10 15:06:23.958532525 -0500
8833@@ -115,6 +115,11 @@ void foo(void) 8884@@ -115,6 +115,11 @@ void foo(void)
8834 OFFSET(PV_CPU_iret, pv_cpu_ops, iret); 8885 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
8835 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 8886 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
@@ -8842,9 +8893,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.7/arch/x
8842 #endif 8893 #endif
8843 8894
8844 #ifdef CONFIG_XEN 8895 #ifdef CONFIG_XEN
8845diff -urNp linux-2.6.32.7/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.7/arch/x86/kernel/asm-offsets_64.c 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
8846--- linux-2.6.32.7/arch/x86/kernel/asm-offsets_64.c 2010-01-25 13:50:10.000000000 -0500 8897--- linux-2.6.32.8/arch/x86/kernel/asm-offsets_64.c 2010-02-09 07:57:19.000000000 -0500
8847+++ linux-2.6.32.7/arch/x86/kernel/asm-offsets_64.c 2010-01-25 17:39:40.296403613 -0500 8898+++ linux-2.6.32.8/arch/x86/kernel/asm-offsets_64.c 2010-02-10 15:06:23.958532525 -0500
8848@@ -115,6 +115,7 @@ int main(void) 8899@@ -115,6 +115,7 @@ int main(void)
8849 ENTRY(cr8); 8900 ENTRY(cr8);
8850 BLANK(); 8901 BLANK();
@@ -8853,9 +8904,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.7/arch/x
8853 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); 8904 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
8854 BLANK(); 8905 BLANK();
8855 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); 8906 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
8856diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/common.c linux-2.6.32.7/arch/x86/kernel/cpu/common.c 8907diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/common.c linux-2.6.32.8/arch/x86/kernel/cpu/common.c
8857--- linux-2.6.32.7/arch/x86/kernel/cpu/common.c 2010-01-25 13:50:10.000000000 -0500 8908--- linux-2.6.32.8/arch/x86/kernel/cpu/common.c 2010-02-09 07:57:19.000000000 -0500
8858+++ linux-2.6.32.7/arch/x86/kernel/cpu/common.c 2010-01-25 17:39:55.421135702 -0500 8909+++ linux-2.6.32.8/arch/x86/kernel/cpu/common.c 2010-02-10 15:06:23.958532525 -0500
8859@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon 8910@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
8860 8911
8861 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; 8912 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -8955,9 +9006,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/common.c linux-2.6.32.7/arch/x86/k
8955 struct thread_struct *thread = &curr->thread; 9006 struct thread_struct *thread = &curr->thread;
8956 9007
8957 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { 9008 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
8958diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 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
8959--- linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-01-25 13:50:10.000000000 -0500 9010--- linux-2.6.32.8/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-02-09 07:57:19.000000000 -0500
8960+++ linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-01-25 17:39:40.297126533 -0500 9011+++ linux-2.6.32.8/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-02-10 15:06:23.958532525 -0500
8961@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any 9012@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
8962 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), 9013 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
8963 }, 9014 },
@@ -8967,9 +9018,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.3
8967 }; 9018 };
8968 9019
8969 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) 9020 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
8970diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.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
8971--- linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-01-25 13:50:10.000000000 -0500 9022--- linux-2.6.32.8/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-02-09 07:57:19.000000000 -0500
8972+++ linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-01-25 17:39:40.297126533 -0500 9023+++ linux-2.6.32.8/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-02-10 15:06:23.958532525 -0500
8973@@ -225,7 +225,7 @@ static struct cpu_model models[] = 9024@@ -225,7 +225,7 @@ static struct cpu_model models[] =
8974 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, 9025 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
8975 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, 9026 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
@@ -8979,9 +9030,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux
8979 }; 9030 };
8980 #undef _BANIAS 9031 #undef _BANIAS
8981 #undef BANIAS 9032 #undef BANIAS
8982diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/intel.c linux-2.6.32.7/arch/x86/kernel/cpu/intel.c 9033diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/intel.c linux-2.6.32.8/arch/x86/kernel/cpu/intel.c
8983--- linux-2.6.32.7/arch/x86/kernel/cpu/intel.c 2010-01-25 20:04:14.597191200 -0500 9034--- linux-2.6.32.8/arch/x86/kernel/cpu/intel.c 2010-02-09 07:57:19.000000000 -0500
8984+++ linux-2.6.32.7/arch/x86/kernel/cpu/intel.c 2010-01-25 20:04:24.393099599 -0500 9035+++ linux-2.6.32.8/arch/x86/kernel/cpu/intel.c 2010-02-10 15:06:23.958532525 -0500
8985@@ -139,7 +139,7 @@ static void __cpuinit trap_init_f00f_bug 9036@@ -139,7 +139,7 @@ static void __cpuinit trap_init_f00f_bug
8986 * Update the IDT descriptor and reload the IDT so that 9037 * Update the IDT descriptor and reload the IDT so that
8987 * it uses the read-only mapped virtual address. 9038 * it uses the read-only mapped virtual address.
@@ -8991,9 +9042,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/intel.c linux-2.6.32.7/arch/x86/ke
8991 load_idt(&idt_descr); 9042 load_idt(&idt_descr);
8992 } 9043 }
8993 #endif 9044 #endif
8994diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.7/arch/x86/kernel/cpu/intel_cacheinfo.c 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
8995--- linux-2.6.32.7/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-01-25 13:50:10.000000000 -0500 9046--- linux-2.6.32.8/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-02-09 07:57:19.000000000 -0500
8996+++ linux-2.6.32.7/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-01-25 17:39:40.297126533 -0500 9047+++ linux-2.6.32.8/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-02-10 15:06:23.958532525 -0500
8997@@ -863,7 +863,7 @@ static ssize_t store(struct kobject *kob 9048@@ -863,7 +863,7 @@ static ssize_t store(struct kobject *kob
8998 return ret; 9049 return ret;
8999 } 9050 }
@@ -9003,9 +9054,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.7/a
9003 .show = show, 9054 .show = show,
9004 .store = store, 9055 .store = store,
9005 }; 9056 };
9006diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/Makefile linux-2.6.32.7/arch/x86/kernel/cpu/Makefile 9057diff -urNp linux-2.6.32.8/arch/x86/kernel/cpu/Makefile linux-2.6.32.8/arch/x86/kernel/cpu/Makefile
9007--- linux-2.6.32.7/arch/x86/kernel/cpu/Makefile 2010-01-25 13:50:10.000000000 -0500 9058--- linux-2.6.32.8/arch/x86/kernel/cpu/Makefile 2010-02-09 07:57:19.000000000 -0500
9008+++ linux-2.6.32.7/arch/x86/kernel/cpu/Makefile 2010-01-25 17:39:40.297126533 -0500 9059+++ linux-2.6.32.8/arch/x86/kernel/cpu/Makefile 2010-02-10 15:06:23.958532525 -0500
9009@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER 9060@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
9010 CFLAGS_REMOVE_common.o = -pg 9061 CFLAGS_REMOVE_common.o = -pg
9011 endif 9062 endif
@@ -9017,9 +9068,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/Makefile linux-2.6.32.7/arch/x86/k
9017 obj-y := intel_cacheinfo.o addon_cpuid_features.o 9068 obj-y := intel_cacheinfo.o addon_cpuid_features.o
9018 obj-y += proc.o capflags.o powerflags.o common.o 9069 obj-y += proc.o capflags.o powerflags.o common.o
9019 obj-y += vmware.o hypervisor.o sched.o 9070 obj-y += vmware.o hypervisor.o sched.o
9020diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce_amd.c 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
9021--- linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-01-25 13:50:10.000000000 -0500 9072--- linux-2.6.32.8/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-02-09 07:57:19.000000000 -0500
9022+++ linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-01-25 17:39:40.298400595 -0500 9073+++ linux-2.6.32.8/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-02-10 15:06:23.958532525 -0500
9023@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob 9074@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob
9024 return ret; 9075 return ret;
9025 } 9076 }
@@ -9029,9 +9080,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.7/ar
9029 .show = show, 9080 .show = show,
9030 .store = store, 9081 .store = store,
9031 }; 9082 };
9032diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce.c 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
9033--- linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce.c 2010-01-25 13:50:10.000000000 -0500 9084--- linux-2.6.32.8/arch/x86/kernel/cpu/mcheck/mce.c 2010-02-09 07:57:19.000000000 -0500
9034+++ linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce.c 2010-01-25 17:39:40.298400595 -0500 9085+++ linux-2.6.32.8/arch/x86/kernel/cpu/mcheck/mce.c 2010-02-10 15:06:23.958532525 -0500
9035@@ -1429,14 +1429,14 @@ void __cpuinit mcheck_init(struct cpuinf 9086@@ -1429,14 +1429,14 @@ void __cpuinit mcheck_init(struct cpuinf
9036 */ 9087 */
9037 9088
@@ -9075,9 +9126,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.7/arch/x
9075 }; 9126 };
9076 9127
9077 /* 9128 /*
9078diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/amd.c 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
9079--- linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/amd.c 2010-01-25 13:50:10.000000000 -0500 9130--- linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/amd.c 2010-02-09 07:57:19.000000000 -0500
9080+++ linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/amd.c 2010-01-25 17:39:40.298400595 -0500 9131+++ linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/amd.c 2010-02-10 15:06:23.958532525 -0500
9081@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base 9132@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
9082 return 0; 9133 return 0;
9083 } 9134 }
@@ -9087,9 +9138,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.7/arch/x86
9087 .vendor = X86_VENDOR_AMD, 9138 .vendor = X86_VENDOR_AMD,
9088 .set = amd_set_mtrr, 9139 .set = amd_set_mtrr,
9089 .get = amd_get_mtrr, 9140 .get = amd_get_mtrr,
9090diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/centaur.c 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
9091--- linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/centaur.c 2010-01-25 13:50:10.000000000 -0500 9142--- linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/centaur.c 2010-02-09 07:57:19.000000000 -0500
9092+++ linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/centaur.c 2010-01-25 17:39:40.298400595 -0500 9143+++ linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/centaur.c 2010-02-10 15:06:23.958532525 -0500
9093@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long 9144@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
9094 return 0; 9145 return 0;
9095 } 9146 }
@@ -9099,9 +9150,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.7/arch
9099 .vendor = X86_VENDOR_CENTAUR, 9150 .vendor = X86_VENDOR_CENTAUR,
9100 .set = centaur_set_mcr, 9151 .set = centaur_set_mcr,
9101 .get = centaur_get_mcr, 9152 .get = centaur_get_mcr,
9102diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/cyrix.c 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
9103--- linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-01-25 13:50:10.000000000 -0500 9154--- linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-02-09 07:57:19.000000000 -0500
9104+++ linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-01-25 17:39:40.298400595 -0500 9155+++ linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-02-10 15:06:23.958532525 -0500
9105@@ -265,7 +265,7 @@ static void cyrix_set_all(void) 9156@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
9106 post_set(); 9157 post_set();
9107 } 9158 }
@@ -9111,9 +9162,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.7/arch/x
9111 .vendor = X86_VENDOR_CYRIX, 9162 .vendor = X86_VENDOR_CYRIX,
9112 .set_all = cyrix_set_all, 9163 .set_all = cyrix_set_all,
9113 .set = cyrix_set_arr, 9164 .set = cyrix_set_arr,
9114diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/generic.c 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
9115--- linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/generic.c 2010-01-25 13:50:10.000000000 -0500 9166--- linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/generic.c 2010-02-09 07:57:19.000000000 -0500
9116+++ linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/generic.c 2010-01-25 17:39:40.299403598 -0500 9167+++ linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/generic.c 2010-02-10 15:06:23.958532525 -0500
9117@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra 9168@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
9118 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ 9169 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
9119 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ 9170 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
@@ -9132,9 +9183,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.7/arch
9132 .use_intel_if = 1, 9183 .use_intel_if = 1,
9133 .set_all = generic_set_all, 9184 .set_all = generic_set_all,
9134 .get = generic_get_mtrr, 9185 .get = generic_get_mtrr,
9135diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/main.c 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
9136--- linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/main.c 2010-01-25 13:50:10.000000000 -0500 9187--- linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/main.c 2010-02-09 07:57:19.000000000 -0500
9137+++ linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/main.c 2010-01-25 17:39:40.299403598 -0500 9188+++ linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/main.c 2010-02-10 15:06:23.958532525 -0500
9138@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); 9189@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
9139 u64 size_or_mask, size_and_mask; 9190 u64 size_or_mask, size_and_mask;
9140 static bool mtrr_aps_delayed_init; 9191 static bool mtrr_aps_delayed_init;
@@ -9153,9 +9204,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.7/arch/x8
9153 { 9204 {
9154 if (ops->vendor && ops->vendor < X86_VENDOR_NUM) 9205 if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
9155 mtrr_ops[ops->vendor] = ops; 9206 mtrr_ops[ops->vendor] = ops;
9156diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/mtrr.h 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
9157--- linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-01-25 13:50:10.000000000 -0500 9208--- linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-02-09 07:57:19.000000000 -0500
9158+++ linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-01-25 17:39:40.299403598 -0500 9209+++ linux-2.6.32.8/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-02-10 15:06:23.958532525 -0500
9159@@ -12,19 +12,19 @@ 9210@@ -12,19 +12,19 @@
9160 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; 9211 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
9161 9212
@@ -9206,9 +9257,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.7/arch/x8
9206 9257
9207 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) 9258 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
9208 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) 9259 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
9209diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.7/arch/x86/kernel/cpu/perfctr-watchdog.c 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
9210--- linux-2.6.32.7/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-01-25 13:50:10.000000000 -0500 9261--- linux-2.6.32.8/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-02-09 07:57:19.000000000 -0500
9211+++ linux-2.6.32.7/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-01-25 17:39:40.299403598 -0500 9262+++ linux-2.6.32.8/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-02-10 15:06:23.958532525 -0500
9212@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { 9263@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
9213 9264
9214 /* Interface defining a CPU specific perfctr watchdog */ 9265 /* Interface defining a CPU specific perfctr watchdog */
@@ -9242,9 +9293,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.7/
9242 static struct wd_ops intel_arch_wd_ops __read_mostly = { 9293 static struct wd_ops intel_arch_wd_ops __read_mostly = {
9243 .reserve = single_msr_reserve, 9294 .reserve = single_msr_reserve,
9244 .unreserve = single_msr_unreserve, 9295 .unreserve = single_msr_unreserve,
9245diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.7/arch/x86/kernel/cpu/perf_event.c 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
9246--- linux-2.6.32.7/arch/x86/kernel/cpu/perf_event.c 2010-01-25 13:50:10.000000000 -0500 9297--- linux-2.6.32.8/arch/x86/kernel/cpu/perf_event.c 2010-02-09 07:57:19.000000000 -0500
9247+++ linux-2.6.32.7/arch/x86/kernel/cpu/perf_event.c 2010-01-25 17:39:40.299403598 -0500 9298+++ linux-2.6.32.8/arch/x86/kernel/cpu/perf_event.c 2010-02-10 15:06:23.961992119 -0500
9248@@ -2252,7 +2252,7 @@ perf_callchain_user(struct pt_regs *regs 9299@@ -2252,7 +2252,7 @@ perf_callchain_user(struct pt_regs *regs
9249 break; 9300 break;
9250 9301
@@ -9254,9 +9305,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.7/arch/x
9254 } 9305 }
9255 } 9306 }
9256 9307
9257diff -urNp linux-2.6.32.7/arch/x86/kernel/crash.c linux-2.6.32.7/arch/x86/kernel/crash.c 9308diff -urNp linux-2.6.32.8/arch/x86/kernel/crash.c linux-2.6.32.8/arch/x86/kernel/crash.c
9258--- linux-2.6.32.7/arch/x86/kernel/crash.c 2010-01-25 13:50:10.000000000 -0500 9309--- linux-2.6.32.8/arch/x86/kernel/crash.c 2010-02-09 07:57:19.000000000 -0500
9259+++ linux-2.6.32.7/arch/x86/kernel/crash.c 2010-01-25 17:39:40.300403832 -0500 9310+++ linux-2.6.32.8/arch/x86/kernel/crash.c 2010-02-10 15:06:23.961992119 -0500
9260@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, 9311@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu,
9261 regs = args->regs; 9312 regs = args->regs;
9262 9313
@@ -9266,9 +9317,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/crash.c linux-2.6.32.7/arch/x86/kernel
9266 crash_fixup_ss_esp(&fixed_regs, regs); 9317 crash_fixup_ss_esp(&fixed_regs, regs);
9267 regs = &fixed_regs; 9318 regs = &fixed_regs;
9268 } 9319 }
9269diff -urNp linux-2.6.32.7/arch/x86/kernel/doublefault_32.c linux-2.6.32.7/arch/x86/kernel/doublefault_32.c 9320diff -urNp linux-2.6.32.8/arch/x86/kernel/doublefault_32.c linux-2.6.32.8/arch/x86/kernel/doublefault_32.c
9270--- linux-2.6.32.7/arch/x86/kernel/doublefault_32.c 2010-01-25 13:50:10.000000000 -0500 9321--- linux-2.6.32.8/arch/x86/kernel/doublefault_32.c 2010-02-09 07:57:19.000000000 -0500
9271+++ linux-2.6.32.7/arch/x86/kernel/doublefault_32.c 2010-01-25 17:39:40.300403832 -0500 9322+++ linux-2.6.32.8/arch/x86/kernel/doublefault_32.c 2010-02-10 15:06:23.961992119 -0500
9272@@ -11,7 +11,7 @@ 9323@@ -11,7 +11,7 @@
9273 9324
9274 #define DOUBLEFAULT_STACKSIZE (1024) 9325 #define DOUBLEFAULT_STACKSIZE (1024)
@@ -9300,9 +9351,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/doublefault_32.c linux-2.6.32.7/arch/x
9300 .fs = __KERNEL_PERCPU, 9351 .fs = __KERNEL_PERCPU,
9301 9352
9302 .__cr3 = __pa_nodebug(swapper_pg_dir), 9353 .__cr3 = __pa_nodebug(swapper_pg_dir),
9303diff -urNp linux-2.6.32.7/arch/x86/kernel/dumpstack_32.c linux-2.6.32.7/arch/x86/kernel/dumpstack_32.c 9354diff -urNp linux-2.6.32.8/arch/x86/kernel/dumpstack_32.c linux-2.6.32.8/arch/x86/kernel/dumpstack_32.c
9304--- linux-2.6.32.7/arch/x86/kernel/dumpstack_32.c 2010-01-25 13:50:10.000000000 -0500 9355--- linux-2.6.32.8/arch/x86/kernel/dumpstack_32.c 2010-02-09 07:57:19.000000000 -0500
9305+++ linux-2.6.32.7/arch/x86/kernel/dumpstack_32.c 2010-01-25 17:39:40.300403832 -0500 9356+++ linux-2.6.32.8/arch/x86/kernel/dumpstack_32.c 2010-02-10 15:06:23.961992119 -0500
9306@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs 9357@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
9307 * When in-kernel, we also print out the stack and code at the 9358 * When in-kernel, we also print out the stack and code at the
9308 * time of the fault.. 9359 * time of the fault..
@@ -9347,9 +9398,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/dumpstack_32.c linux-2.6.32.7/arch/x86
9347 if (ip < PAGE_OFFSET) 9398 if (ip < PAGE_OFFSET)
9348 return 0; 9399 return 0;
9349 if (probe_kernel_address((unsigned short *)ip, ud2)) 9400 if (probe_kernel_address((unsigned short *)ip, ud2))
9350diff -urNp linux-2.6.32.7/arch/x86/kernel/dumpstack.c linux-2.6.32.7/arch/x86/kernel/dumpstack.c 9401diff -urNp linux-2.6.32.8/arch/x86/kernel/dumpstack.c linux-2.6.32.8/arch/x86/kernel/dumpstack.c
9351--- linux-2.6.32.7/arch/x86/kernel/dumpstack.c 2010-01-25 13:50:10.000000000 -0500 9402--- linux-2.6.32.8/arch/x86/kernel/dumpstack.c 2010-02-09 07:57:19.000000000 -0500
9352+++ linux-2.6.32.7/arch/x86/kernel/dumpstack.c 2010-01-25 17:39:40.300403832 -0500 9403+++ linux-2.6.32.8/arch/x86/kernel/dumpstack.c 2010-02-10 15:06:23.961992119 -0500
9353@@ -180,7 +180,7 @@ void dump_stack(void) 9404@@ -180,7 +180,7 @@ void dump_stack(void)
9354 #endif 9405 #endif
9355 9406
@@ -9377,9 +9428,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/dumpstack.c linux-2.6.32.7/arch/x86/ke
9377 report_bug(regs->ip, regs); 9428 report_bug(regs->ip, regs);
9378 9429
9379 if (__die(str, regs, err)) 9430 if (__die(str, regs, err))
9380diff -urNp linux-2.6.32.7/arch/x86/kernel/e820.c linux-2.6.32.7/arch/x86/kernel/e820.c 9431diff -urNp linux-2.6.32.8/arch/x86/kernel/e820.c linux-2.6.32.8/arch/x86/kernel/e820.c
9381--- linux-2.6.32.7/arch/x86/kernel/e820.c 2010-01-25 13:50:10.000000000 -0500 9432--- linux-2.6.32.8/arch/x86/kernel/e820.c 2010-02-09 07:57:19.000000000 -0500
9382+++ linux-2.6.32.7/arch/x86/kernel/e820.c 2010-01-25 17:39:40.300403832 -0500 9433+++ linux-2.6.32.8/arch/x86/kernel/e820.c 2010-02-10 15:06:23.961992119 -0500
9383@@ -733,7 +733,10 @@ struct early_res { 9434@@ -733,7 +733,10 @@ struct early_res {
9384 }; 9435 };
9385 static struct early_res early_res[MAX_EARLY_RES] __initdata = { 9436 static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -9392,9 +9443,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/e820.c linux-2.6.32.7/arch/x86/kernel/
9392 }; 9443 };
9393 9444
9394 static int __init find_overlapped_early(u64 start, u64 end) 9445 static int __init find_overlapped_early(u64 start, u64 end)
9395diff -urNp linux-2.6.32.7/arch/x86/kernel/efi_32.c linux-2.6.32.7/arch/x86/kernel/efi_32.c 9446diff -urNp linux-2.6.32.8/arch/x86/kernel/efi_32.c linux-2.6.32.8/arch/x86/kernel/efi_32.c
9396--- linux-2.6.32.7/arch/x86/kernel/efi_32.c 2010-01-25 13:50:10.000000000 -0500 9447--- linux-2.6.32.8/arch/x86/kernel/efi_32.c 2010-02-09 07:57:19.000000000 -0500
9397+++ linux-2.6.32.7/arch/x86/kernel/efi_32.c 2010-01-25 17:39:40.300403832 -0500 9448+++ linux-2.6.32.8/arch/x86/kernel/efi_32.c 2010-02-10 15:06:23.961992119 -0500
9398@@ -38,70 +38,38 @@ 9449@@ -38,70 +38,38 @@
9399 */ 9450 */
9400 9451
@@ -9475,9 +9526,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/efi_32.c linux-2.6.32.7/arch/x86/kerne
9475 9526
9476 /* 9527 /*
9477 * After the lock is released, the original page table is restored. 9528 * After the lock is released, the original page table is restored.
9478diff -urNp linux-2.6.32.7/arch/x86/kernel/efi_stub_32.S linux-2.6.32.7/arch/x86/kernel/efi_stub_32.S 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
9479--- linux-2.6.32.7/arch/x86/kernel/efi_stub_32.S 2010-01-25 13:50:10.000000000 -0500 9530--- linux-2.6.32.8/arch/x86/kernel/efi_stub_32.S 2010-02-09 07:57:19.000000000 -0500
9480+++ linux-2.6.32.7/arch/x86/kernel/efi_stub_32.S 2010-01-25 17:39:40.301405221 -0500 9531+++ linux-2.6.32.8/arch/x86/kernel/efi_stub_32.S 2010-02-10 15:06:23.961992119 -0500
9481@@ -6,6 +6,7 @@ 9532@@ -6,6 +6,7 @@
9482 */ 9533 */
9483 9534
@@ -9576,9 +9627,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/efi_stub_32.S linux-2.6.32.7/arch/x86/
9576 saved_return_addr: 9627 saved_return_addr:
9577 .long 0 9628 .long 0
9578 efi_rt_function_ptr: 9629 efi_rt_function_ptr:
9579diff -urNp linux-2.6.32.7/arch/x86/kernel/entry_32.S linux-2.6.32.7/arch/x86/kernel/entry_32.S 9630diff -urNp linux-2.6.32.8/arch/x86/kernel/entry_32.S linux-2.6.32.8/arch/x86/kernel/entry_32.S
9580--- linux-2.6.32.7/arch/x86/kernel/entry_32.S 2010-01-25 13:50:10.000000000 -0500 9631--- linux-2.6.32.8/arch/x86/kernel/entry_32.S 2010-02-09 07:57:19.000000000 -0500
9581+++ linux-2.6.32.7/arch/x86/kernel/entry_32.S 2010-01-25 17:39:40.301405221 -0500 9632+++ linux-2.6.32.8/arch/x86/kernel/entry_32.S 2010-02-10 15:06:23.961992119 -0500
9582@@ -191,7 +191,7 @@ 9633@@ -191,7 +191,7 @@
9583 9634
9584 #endif /* CONFIG_X86_32_LAZY_GS */ 9635 #endif /* CONFIG_X86_32_LAZY_GS */
@@ -9832,9 +9883,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/entry_32.S linux-2.6.32.7/arch/x86/ker
9832 RESTORE_REGS 9883 RESTORE_REGS
9833 lss 12+4(%esp), %esp # back to espfix stack 9884 lss 12+4(%esp), %esp # back to espfix stack
9834 CFI_ADJUST_CFA_OFFSET -24 9885 CFI_ADJUST_CFA_OFFSET -24
9835diff -urNp linux-2.6.32.7/arch/x86/kernel/entry_64.S linux-2.6.32.7/arch/x86/kernel/entry_64.S 9886diff -urNp linux-2.6.32.8/arch/x86/kernel/entry_64.S linux-2.6.32.8/arch/x86/kernel/entry_64.S
9836--- linux-2.6.32.7/arch/x86/kernel/entry_64.S 2010-01-25 13:50:10.000000000 -0500 9887--- linux-2.6.32.8/arch/x86/kernel/entry_64.S 2010-02-09 07:57:19.000000000 -0500
9837+++ linux-2.6.32.7/arch/x86/kernel/entry_64.S 2010-01-25 17:39:40.301405221 -0500 9888+++ linux-2.6.32.8/arch/x86/kernel/entry_64.S 2010-02-10 15:06:23.961992119 -0500
9838@@ -1068,7 +1068,12 @@ ENTRY(\sym) 9889@@ -1068,7 +1068,12 @@ ENTRY(\sym)
9839 TRACE_IRQS_OFF 9890 TRACE_IRQS_OFF
9840 movq %rsp,%rdi /* pt_regs pointer */ 9891 movq %rsp,%rdi /* pt_regs pointer */
@@ -9849,9 +9900,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/entry_64.S linux-2.6.32.7/arch/x86/ker
9849 subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) 9900 subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
9850 call \do_sym 9901 call \do_sym
9851 addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) 9902 addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
9852diff -urNp linux-2.6.32.7/arch/x86/kernel/ftrace.c linux-2.6.32.7/arch/x86/kernel/ftrace.c 9903diff -urNp linux-2.6.32.8/arch/x86/kernel/ftrace.c linux-2.6.32.8/arch/x86/kernel/ftrace.c
9853--- linux-2.6.32.7/arch/x86/kernel/ftrace.c 2010-01-25 13:50:10.000000000 -0500 9904--- linux-2.6.32.8/arch/x86/kernel/ftrace.c 2010-02-09 07:57:19.000000000 -0500
9854+++ linux-2.6.32.7/arch/x86/kernel/ftrace.c 2010-01-25 17:39:40.302407595 -0500 9905+++ linux-2.6.32.8/arch/x86/kernel/ftrace.c 2010-02-10 15:06:23.961992119 -0500
9855@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) 9906@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
9856 { 9907 {
9857 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { 9908 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -9917,9 +9968,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/ftrace.c linux-2.6.32.7/arch/x86/kerne
9917 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) 9968 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
9918 return -EFAULT; 9969 return -EFAULT;
9919 9970
9920diff -urNp linux-2.6.32.7/arch/x86/kernel/head32.c linux-2.6.32.7/arch/x86/kernel/head32.c 9971diff -urNp linux-2.6.32.8/arch/x86/kernel/head32.c linux-2.6.32.8/arch/x86/kernel/head32.c
9921--- linux-2.6.32.7/arch/x86/kernel/head32.c 2010-01-25 13:50:10.000000000 -0500 9972--- linux-2.6.32.8/arch/x86/kernel/head32.c 2010-02-09 07:57:19.000000000 -0500
9922+++ linux-2.6.32.7/arch/x86/kernel/head32.c 2010-01-25 17:39:40.302407595 -0500 9973+++ linux-2.6.32.8/arch/x86/kernel/head32.c 2010-02-10 15:06:23.961992119 -0500
9923@@ -16,6 +16,7 @@ 9974@@ -16,6 +16,7 @@
9924 #include <asm/apic.h> 9975 #include <asm/apic.h>
9925 #include <asm/io_apic.h> 9976 #include <asm/io_apic.h>
@@ -9937,9 +9988,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head32.c linux-2.6.32.7/arch/x86/kerne
9937 9988
9938 #ifdef CONFIG_BLK_DEV_INITRD 9989 #ifdef CONFIG_BLK_DEV_INITRD
9939 /* Reserve INITRD */ 9990 /* Reserve INITRD */
9940diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kernel/head_32.S 9991diff -urNp linux-2.6.32.8/arch/x86/kernel/head_32.S linux-2.6.32.8/arch/x86/kernel/head_32.S
9941--- linux-2.6.32.7/arch/x86/kernel/head_32.S 2010-01-25 13:50:10.000000000 -0500 9992--- linux-2.6.32.8/arch/x86/kernel/head_32.S 2010-02-09 07:57:19.000000000 -0500
9942+++ linux-2.6.32.7/arch/x86/kernel/head_32.S 2010-01-25 17:39:40.302407595 -0500 9993+++ linux-2.6.32.8/arch/x86/kernel/head_32.S 2010-02-10 15:06:23.961992119 -0500
9943@@ -19,10 +19,17 @@ 9994@@ -19,10 +19,17 @@
9944 #include <asm/setup.h> 9995 #include <asm/setup.h>
9945 #include <asm/processor-flags.h> 9996 #include <asm/processor-flags.h>
@@ -10364,9 +10415,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_32.S linux-2.6.32.7/arch/x86/kern
10364+ /* Be sure this is zeroed to avoid false validations in Xen */ 10415+ /* Be sure this is zeroed to avoid false validations in Xen */
10365+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0 10416+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
10366+ .endr 10417+ .endr
10367diff -urNp linux-2.6.32.7/arch/x86/kernel/head_64.S linux-2.6.32.7/arch/x86/kernel/head_64.S 10418diff -urNp linux-2.6.32.8/arch/x86/kernel/head_64.S linux-2.6.32.8/arch/x86/kernel/head_64.S
10368--- linux-2.6.32.7/arch/x86/kernel/head_64.S 2010-01-25 13:50:10.000000000 -0500 10419--- linux-2.6.32.8/arch/x86/kernel/head_64.S 2010-02-09 07:57:19.000000000 -0500
10369+++ linux-2.6.32.7/arch/x86/kernel/head_64.S 2010-01-25 17:39:55.421135702 -0500 10420+++ linux-2.6.32.8/arch/x86/kernel/head_64.S 2010-02-10 15:06:23.961992119 -0500
10370@@ -38,6 +38,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET 10421@@ -38,6 +38,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET
10371 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET) 10422 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
10372 L4_START_KERNEL = pgd_index(__START_KERNEL_map) 10423 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
@@ -10607,9 +10658,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/head_64.S linux-2.6.32.7/arch/x86/kern
10607 10658
10608 __PAGE_ALIGNED_BSS 10659 __PAGE_ALIGNED_BSS
10609 .align PAGE_SIZE 10660 .align PAGE_SIZE
10610diff -urNp linux-2.6.32.7/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.7/arch/x86/kernel/i386_ksyms_32.c 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
10611--- linux-2.6.32.7/arch/x86/kernel/i386_ksyms_32.c 2010-01-25 13:50:10.000000000 -0500 10662--- linux-2.6.32.8/arch/x86/kernel/i386_ksyms_32.c 2010-02-09 07:57:19.000000000 -0500
10612+++ linux-2.6.32.7/arch/x86/kernel/i386_ksyms_32.c 2010-01-25 17:39:40.302407595 -0500 10663+++ linux-2.6.32.8/arch/x86/kernel/i386_ksyms_32.c 2010-02-10 15:06:23.961992119 -0500
10613@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); 10664@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
10614 EXPORT_SYMBOL(cmpxchg8b_emu); 10665 EXPORT_SYMBOL(cmpxchg8b_emu);
10615 #endif 10666 #endif
@@ -10631,9 +10682,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.7/arch/x8
10631+#ifdef CONFIG_PAX_KERNEXEC 10682+#ifdef CONFIG_PAX_KERNEXEC
10632+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); 10683+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
10633+#endif 10684+#endif
10634diff -urNp linux-2.6.32.7/arch/x86/kernel/init_task.c linux-2.6.32.7/arch/x86/kernel/init_task.c 10685diff -urNp linux-2.6.32.8/arch/x86/kernel/init_task.c linux-2.6.32.8/arch/x86/kernel/init_task.c
10635--- linux-2.6.32.7/arch/x86/kernel/init_task.c 2010-01-25 13:50:10.000000000 -0500 10686--- linux-2.6.32.8/arch/x86/kernel/init_task.c 2010-02-09 07:57:19.000000000 -0500
10636+++ linux-2.6.32.7/arch/x86/kernel/init_task.c 2010-01-25 17:39:40.303404542 -0500 10687+++ linux-2.6.32.8/arch/x86/kernel/init_task.c 2010-02-10 15:06:23.961992119 -0500
10637@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); 10688@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
10638 * section. Since TSS's are completely CPU-local, we want them 10689 * section. Since TSS's are completely CPU-local, we want them
10639 * on exact cacheline boundaries, to eliminate cacheline ping-pong. 10690 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -10642,9 +10693,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/init_task.c linux-2.6.32.7/arch/x86/ke
10642- 10693-
10643+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; 10694+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
10644+EXPORT_SYMBOL(init_tss); 10695+EXPORT_SYMBOL(init_tss);
10645diff -urNp linux-2.6.32.7/arch/x86/kernel/ioport.c linux-2.6.32.7/arch/x86/kernel/ioport.c 10696diff -urNp linux-2.6.32.8/arch/x86/kernel/ioport.c linux-2.6.32.8/arch/x86/kernel/ioport.c
10646--- linux-2.6.32.7/arch/x86/kernel/ioport.c 2010-01-25 13:50:10.000000000 -0500 10697--- linux-2.6.32.8/arch/x86/kernel/ioport.c 2010-02-09 07:57:19.000000000 -0500
10647+++ linux-2.6.32.7/arch/x86/kernel/ioport.c 2010-01-25 17:39:40.303404542 -0500 10698+++ linux-2.6.32.8/arch/x86/kernel/ioport.c 2010-02-10 15:06:23.961992119 -0500
10648@@ -6,6 +6,7 @@ 10699@@ -6,6 +6,7 @@
10649 #include <linux/sched.h> 10700 #include <linux/sched.h>
10650 #include <linux/kernel.h> 10701 #include <linux/kernel.h>
@@ -10689,9 +10740,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/ioport.c linux-2.6.32.7/arch/x86/kerne
10689 } 10740 }
10690 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); 10741 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
10691 10742
10692diff -urNp linux-2.6.32.7/arch/x86/kernel/irq_32.c linux-2.6.32.7/arch/x86/kernel/irq_32.c 10743diff -urNp linux-2.6.32.8/arch/x86/kernel/irq_32.c linux-2.6.32.8/arch/x86/kernel/irq_32.c
10693--- linux-2.6.32.7/arch/x86/kernel/irq_32.c 2010-01-25 13:50:10.000000000 -0500 10744--- linux-2.6.32.8/arch/x86/kernel/irq_32.c 2010-02-09 07:57:19.000000000 -0500
10694+++ linux-2.6.32.7/arch/x86/kernel/irq_32.c 2010-01-25 17:39:40.303404542 -0500 10745+++ linux-2.6.32.8/arch/x86/kernel/irq_32.c 2010-02-10 15:06:23.961992119 -0500
10695@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc 10746@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
10696 return 0; 10747 return 0;
10697 10748
@@ -10710,9 +10761,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/irq_32.c linux-2.6.32.7/arch/x86/kerne
10710 10761
10711 call_on_stack(__do_softirq, isp); 10762 call_on_stack(__do_softirq, isp);
10712 /* 10763 /*
10713diff -urNp linux-2.6.32.7/arch/x86/kernel/kgdb.c linux-2.6.32.7/arch/x86/kernel/kgdb.c 10764diff -urNp linux-2.6.32.8/arch/x86/kernel/kgdb.c linux-2.6.32.8/arch/x86/kernel/kgdb.c
10714--- linux-2.6.32.7/arch/x86/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500 10765--- linux-2.6.32.8/arch/x86/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500
10715+++ linux-2.6.32.7/arch/x86/kernel/kgdb.c 2010-01-25 17:39:40.303404542 -0500 10766+++ linux-2.6.32.8/arch/x86/kernel/kgdb.c 2010-02-10 15:06:23.961992119 -0500
10716@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception 10767@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
10717 return instruction_pointer(regs); 10768 return instruction_pointer(regs);
10718 } 10769 }
@@ -10722,9 +10773,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/kgdb.c linux-2.6.32.7/arch/x86/kernel/
10722 /* Breakpoint instruction: */ 10773 /* Breakpoint instruction: */
10723 .gdb_bpt_instr = { 0xcc }, 10774 .gdb_bpt_instr = { 0xcc },
10724 .flags = KGDB_HW_BREAKPOINT, 10775 .flags = KGDB_HW_BREAKPOINT,
10725diff -urNp linux-2.6.32.7/arch/x86/kernel/kprobes.c linux-2.6.32.7/arch/x86/kernel/kprobes.c 10776diff -urNp linux-2.6.32.8/arch/x86/kernel/kprobes.c linux-2.6.32.8/arch/x86/kernel/kprobes.c
10726--- linux-2.6.32.7/arch/x86/kernel/kprobes.c 2010-01-25 13:50:10.000000000 -0500 10777--- linux-2.6.32.8/arch/x86/kernel/kprobes.c 2010-02-09 07:57:19.000000000 -0500
10727+++ linux-2.6.32.7/arch/x86/kernel/kprobes.c 2010-01-25 17:39:40.303404542 -0500 10778+++ linux-2.6.32.8/arch/x86/kernel/kprobes.c 2010-02-10 15:06:23.966139206 -0500
10728@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f 10779@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
10729 char op; 10780 char op;
10730 s32 raddr; 10781 s32 raddr;
@@ -10807,9 +10858,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/kprobes.c linux-2.6.32.7/arch/x86/kern
10807 return ret; 10858 return ret;
10808 10859
10809 switch (val) { 10860 switch (val) {
10810diff -urNp linux-2.6.32.7/arch/x86/kernel/ldt.c linux-2.6.32.7/arch/x86/kernel/ldt.c 10861diff -urNp linux-2.6.32.8/arch/x86/kernel/ldt.c linux-2.6.32.8/arch/x86/kernel/ldt.c
10811--- linux-2.6.32.7/arch/x86/kernel/ldt.c 2010-01-25 13:50:10.000000000 -0500 10862--- linux-2.6.32.8/arch/x86/kernel/ldt.c 2010-02-09 07:57:19.000000000 -0500
10812+++ linux-2.6.32.7/arch/x86/kernel/ldt.c 2010-01-25 17:39:40.303404542 -0500 10863+++ linux-2.6.32.8/arch/x86/kernel/ldt.c 2010-02-10 15:06:23.966139206 -0500
10813@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i 10864@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
10814 if (reload) { 10865 if (reload) {
10815 #ifdef CONFIG_SMP 10866 #ifdef CONFIG_SMP
@@ -10874,9 +10925,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/ldt.c linux-2.6.32.7/arch/x86/kernel/l
10874 fill_ldt(&ldt, &ldt_info); 10925 fill_ldt(&ldt, &ldt_info);
10875 if (oldmode) 10926 if (oldmode)
10876 ldt.avl = 0; 10927 ldt.avl = 0;
10877diff -urNp linux-2.6.32.7/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.7/arch/x86/kernel/machine_kexec_32.c 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
10878--- linux-2.6.32.7/arch/x86/kernel/machine_kexec_32.c 2010-01-25 13:50:10.000000000 -0500 10929--- linux-2.6.32.8/arch/x86/kernel/machine_kexec_32.c 2010-02-09 07:57:19.000000000 -0500
10879+++ linux-2.6.32.7/arch/x86/kernel/machine_kexec_32.c 2010-01-25 17:39:40.304403861 -0500 10930+++ linux-2.6.32.8/arch/x86/kernel/machine_kexec_32.c 2010-02-10 15:06:23.966139206 -0500
10880@@ -26,7 +26,7 @@ 10931@@ -26,7 +26,7 @@
10881 #include <asm/system.h> 10932 #include <asm/system.h>
10882 #include <asm/cacheflush.h> 10933 #include <asm/cacheflush.h>
@@ -10904,9 +10955,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.7/arch
10904 10955
10905 relocate_kernel_ptr = control_page; 10956 relocate_kernel_ptr = control_page;
10906 page_list[PA_CONTROL_PAGE] = __pa(control_page); 10957 page_list[PA_CONTROL_PAGE] = __pa(control_page);
10907diff -urNp linux-2.6.32.7/arch/x86/kernel/microcode_amd.c linux-2.6.32.7/arch/x86/kernel/microcode_amd.c 10958diff -urNp linux-2.6.32.8/arch/x86/kernel/microcode_amd.c linux-2.6.32.8/arch/x86/kernel/microcode_amd.c
10908--- linux-2.6.32.7/arch/x86/kernel/microcode_amd.c 2010-01-25 13:50:10.000000000 -0500 10959--- linux-2.6.32.8/arch/x86/kernel/microcode_amd.c 2010-02-09 07:57:19.000000000 -0500
10909+++ linux-2.6.32.7/arch/x86/kernel/microcode_amd.c 2010-01-25 17:39:40.304403861 -0500 10960+++ linux-2.6.32.8/arch/x86/kernel/microcode_amd.c 2010-02-10 15:06:23.966139206 -0500
10910@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c 10961@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
10911 uci->mc = NULL; 10962 uci->mc = NULL;
10912 } 10963 }
@@ -10925,9 +10976,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/microcode_amd.c linux-2.6.32.7/arch/x8
10925 { 10976 {
10926 return &microcode_amd_ops; 10977 return &microcode_amd_ops;
10927 } 10978 }
10928diff -urNp linux-2.6.32.7/arch/x86/kernel/microcode_core.c linux-2.6.32.7/arch/x86/kernel/microcode_core.c 10979diff -urNp linux-2.6.32.8/arch/x86/kernel/microcode_core.c linux-2.6.32.8/arch/x86/kernel/microcode_core.c
10929--- linux-2.6.32.7/arch/x86/kernel/microcode_core.c 2010-01-25 13:50:10.000000000 -0500 10980--- linux-2.6.32.8/arch/x86/kernel/microcode_core.c 2010-02-09 07:57:19.000000000 -0500
10930+++ linux-2.6.32.7/arch/x86/kernel/microcode_core.c 2010-01-25 17:39:40.304403861 -0500 10981+++ linux-2.6.32.8/arch/x86/kernel/microcode_core.c 2010-02-10 15:06:23.966139206 -0500
10931@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); 10982@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
10932 10983
10933 #define MICROCODE_VERSION "2.00" 10984 #define MICROCODE_VERSION "2.00"
@@ -10937,9 +10988,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/microcode_core.c linux-2.6.32.7/arch/x
10937 10988
10938 /* 10989 /*
10939 * Synchronization. 10990 * Synchronization.
10940diff -urNp linux-2.6.32.7/arch/x86/kernel/microcode_intel.c linux-2.6.32.7/arch/x86/kernel/microcode_intel.c 10991diff -urNp linux-2.6.32.8/arch/x86/kernel/microcode_intel.c linux-2.6.32.8/arch/x86/kernel/microcode_intel.c
10941--- linux-2.6.32.7/arch/x86/kernel/microcode_intel.c 2010-01-25 13:50:10.000000000 -0500 10992--- linux-2.6.32.8/arch/x86/kernel/microcode_intel.c 2010-02-09 07:57:19.000000000 -0500
10942+++ linux-2.6.32.7/arch/x86/kernel/microcode_intel.c 2010-01-25 17:39:40.304403861 -0500 10993+++ linux-2.6.32.8/arch/x86/kernel/microcode_intel.c 2010-02-10 15:06:23.966139206 -0500
10943@@ -443,13 +443,13 @@ static enum ucode_state request_microcod 10994@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
10944 10995
10945 static int get_ucode_user(void *to, const void *from, size_t n) 10996 static int get_ucode_user(void *to, const void *from, size_t n)
@@ -10974,9 +11025,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/microcode_intel.c linux-2.6.32.7/arch/
10974 { 11025 {
10975 return &microcode_intel_ops; 11026 return &microcode_intel_ops;
10976 } 11027 }
10977diff -urNp linux-2.6.32.7/arch/x86/kernel/module.c linux-2.6.32.7/arch/x86/kernel/module.c 11028diff -urNp linux-2.6.32.8/arch/x86/kernel/module.c linux-2.6.32.8/arch/x86/kernel/module.c
10978--- linux-2.6.32.7/arch/x86/kernel/module.c 2010-01-25 13:50:10.000000000 -0500 11029--- linux-2.6.32.8/arch/x86/kernel/module.c 2010-02-09 07:57:19.000000000 -0500
10979+++ linux-2.6.32.7/arch/x86/kernel/module.c 2010-01-25 17:39:40.304403861 -0500 11030+++ linux-2.6.32.8/arch/x86/kernel/module.c 2010-02-10 15:06:23.966139206 -0500
10980@@ -34,7 +34,7 @@ 11031@@ -34,7 +34,7 @@
10981 #define DEBUGP(fmt...) 11032 #define DEBUGP(fmt...)
10982 #endif 11033 #endif
@@ -11148,9 +11199,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/module.c linux-2.6.32.7/arch/x86/kerne
11148 #if 0 11199 #if 0
11149 if ((s64)val != *(s32 *)loc) 11200 if ((s64)val != *(s32 *)loc)
11150 goto overflow; 11201 goto overflow;
11151diff -urNp linux-2.6.32.7/arch/x86/kernel/paravirt.c linux-2.6.32.7/arch/x86/kernel/paravirt.c 11202diff -urNp linux-2.6.32.8/arch/x86/kernel/paravirt.c linux-2.6.32.8/arch/x86/kernel/paravirt.c
11152--- linux-2.6.32.7/arch/x86/kernel/paravirt.c 2010-01-25 13:50:10.000000000 -0500 11203--- linux-2.6.32.8/arch/x86/kernel/paravirt.c 2010-02-09 07:57:19.000000000 -0500
11153+++ linux-2.6.32.7/arch/x86/kernel/paravirt.c 2010-01-25 17:39:40.305402009 -0500 11204+++ linux-2.6.32.8/arch/x86/kernel/paravirt.c 2010-02-10 15:06:23.966139206 -0500
11154@@ -120,9 +120,9 @@ unsigned paravirt_patch_jmp(void *insnbu 11205@@ -120,9 +120,9 @@ unsigned paravirt_patch_jmp(void *insnbu
11155 11206
11156 /* Neat trick to map patch type back to the call within the 11207 /* Neat trick to map patch type back to the call within the
@@ -11255,9 +11306,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/paravirt.c linux-2.6.32.7/arch/x86/ker
11255 }; 11306 };
11256 11307
11257 EXPORT_SYMBOL_GPL(pv_time_ops); 11308 EXPORT_SYMBOL_GPL(pv_time_ops);
11258diff -urNp linux-2.6.32.7/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.7/arch/x86/kernel/paravirt-spinlocks.c 11309diff -urNp linux-2.6.32.8/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.8/arch/x86/kernel/paravirt-spinlocks.c
11259--- linux-2.6.32.7/arch/x86/kernel/paravirt-spinlocks.c 2010-01-25 13:50:10.000000000 -0500 11310--- linux-2.6.32.8/arch/x86/kernel/paravirt-spinlocks.c 2010-02-09 07:57:19.000000000 -0500
11260+++ linux-2.6.32.7/arch/x86/kernel/paravirt-spinlocks.c 2010-01-25 17:39:40.305402009 -0500 11311+++ linux-2.6.32.8/arch/x86/kernel/paravirt-spinlocks.c 2010-02-10 15:06:23.966139206 -0500
11261@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * 11312@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
11262 __raw_spin_lock(lock); 11313 __raw_spin_lock(lock);
11263 } 11314 }
@@ -11267,9 +11318,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.7/ar
11267 #ifdef CONFIG_SMP 11318 #ifdef CONFIG_SMP
11268 .spin_is_locked = __ticket_spin_is_locked, 11319 .spin_is_locked = __ticket_spin_is_locked,
11269 .spin_is_contended = __ticket_spin_is_contended, 11320 .spin_is_contended = __ticket_spin_is_contended,
11270diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.7/arch/x86/kernel/pci-calgary_64.c 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
11271--- linux-2.6.32.7/arch/x86/kernel/pci-calgary_64.c 2010-01-25 13:50:10.000000000 -0500 11322--- linux-2.6.32.8/arch/x86/kernel/pci-calgary_64.c 2010-02-09 07:57:19.000000000 -0500
11272+++ linux-2.6.32.7/arch/x86/kernel/pci-calgary_64.c 2010-01-25 17:39:40.305402009 -0500 11323+++ linux-2.6.32.8/arch/x86/kernel/pci-calgary_64.c 2010-02-10 15:06:23.966139206 -0500
11273@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct 11324@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct
11274 free_pages((unsigned long)vaddr, get_order(size)); 11325 free_pages((unsigned long)vaddr, get_order(size));
11275 } 11326 }
@@ -11279,9 +11330,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.7/arch/x
11279 .alloc_coherent = calgary_alloc_coherent, 11330 .alloc_coherent = calgary_alloc_coherent,
11280 .free_coherent = calgary_free_coherent, 11331 .free_coherent = calgary_free_coherent,
11281 .map_sg = calgary_map_sg, 11332 .map_sg = calgary_map_sg,
11282diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-dma.c linux-2.6.32.7/arch/x86/kernel/pci-dma.c 11333diff -urNp linux-2.6.32.8/arch/x86/kernel/pci-dma.c linux-2.6.32.8/arch/x86/kernel/pci-dma.c
11283--- linux-2.6.32.7/arch/x86/kernel/pci-dma.c 2010-01-25 13:50:10.000000000 -0500 11334--- linux-2.6.32.8/arch/x86/kernel/pci-dma.c 2010-02-09 07:57:19.000000000 -0500
11284+++ linux-2.6.32.7/arch/x86/kernel/pci-dma.c 2010-01-25 17:39:40.305402009 -0500 11335+++ linux-2.6.32.8/arch/x86/kernel/pci-dma.c 2010-02-10 15:06:23.966139206 -0500
11285@@ -14,7 +14,7 @@ 11336@@ -14,7 +14,7 @@
11286 11337
11287 static int forbid_dac __read_mostly; 11338 static int forbid_dac __read_mostly;
@@ -11300,9 +11351,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-dma.c linux-2.6.32.7/arch/x86/kern
11300 11351
11301 #ifdef CONFIG_PCI 11352 #ifdef CONFIG_PCI
11302 if (mask > 0xffffffff && forbid_dac > 0) { 11353 if (mask > 0xffffffff && forbid_dac > 0) {
11303diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-gart_64.c linux-2.6.32.7/arch/x86/kernel/pci-gart_64.c 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
11304--- linux-2.6.32.7/arch/x86/kernel/pci-gart_64.c 2010-01-25 13:50:10.000000000 -0500 11355--- linux-2.6.32.8/arch/x86/kernel/pci-gart_64.c 2010-02-09 07:57:19.000000000 -0500
11305+++ linux-2.6.32.7/arch/x86/kernel/pci-gart_64.c 2010-01-25 17:39:40.306401380 -0500 11356+++ linux-2.6.32.8/arch/x86/kernel/pci-gart_64.c 2010-02-10 15:06:23.966139206 -0500
11306@@ -679,7 +679,7 @@ static __init int init_k8_gatt(struct ag 11357@@ -679,7 +679,7 @@ static __init int init_k8_gatt(struct ag
11307 return -1; 11358 return -1;
11308 } 11359 }
@@ -11312,9 +11363,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-gart_64.c linux-2.6.32.7/arch/x86/
11312 .map_sg = gart_map_sg, 11363 .map_sg = gart_map_sg,
11313 .unmap_sg = gart_unmap_sg, 11364 .unmap_sg = gart_unmap_sg,
11314 .map_page = gart_map_page, 11365 .map_page = gart_map_page,
11315diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-nommu.c linux-2.6.32.7/arch/x86/kernel/pci-nommu.c 11366diff -urNp linux-2.6.32.8/arch/x86/kernel/pci-nommu.c linux-2.6.32.8/arch/x86/kernel/pci-nommu.c
11316--- linux-2.6.32.7/arch/x86/kernel/pci-nommu.c 2010-01-25 13:50:10.000000000 -0500 11367--- linux-2.6.32.8/arch/x86/kernel/pci-nommu.c 2010-02-09 07:57:19.000000000 -0500
11317+++ linux-2.6.32.7/arch/x86/kernel/pci-nommu.c 2010-01-25 17:39:40.306401380 -0500 11368+++ linux-2.6.32.8/arch/x86/kernel/pci-nommu.c 2010-02-10 15:06:23.966139206 -0500
11318@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str 11369@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
11319 flush_write_buffers(); 11370 flush_write_buffers();
11320 } 11371 }
@@ -11324,9 +11375,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-nommu.c linux-2.6.32.7/arch/x86/ke
11324 .alloc_coherent = dma_generic_alloc_coherent, 11375 .alloc_coherent = dma_generic_alloc_coherent,
11325 .free_coherent = nommu_free_coherent, 11376 .free_coherent = nommu_free_coherent,
11326 .map_sg = nommu_map_sg, 11377 .map_sg = nommu_map_sg,
11327diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.7/arch/x86/kernel/pci-swiotlb.c 11378diff -urNp linux-2.6.32.8/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.8/arch/x86/kernel/pci-swiotlb.c
11328--- linux-2.6.32.7/arch/x86/kernel/pci-swiotlb.c 2010-01-25 13:50:10.000000000 -0500 11379--- linux-2.6.32.8/arch/x86/kernel/pci-swiotlb.c 2010-02-09 07:57:19.000000000 -0500
11329+++ linux-2.6.32.7/arch/x86/kernel/pci-swiotlb.c 2010-01-25 17:39:40.306401380 -0500 11380+++ linux-2.6.32.8/arch/x86/kernel/pci-swiotlb.c 2010-02-10 15:06:23.966139206 -0500
11330@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( 11381@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
11331 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); 11382 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
11332 } 11383 }
@@ -11336,9 +11387,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.7/arch/x86/
11336 .mapping_error = swiotlb_dma_mapping_error, 11387 .mapping_error = swiotlb_dma_mapping_error,
11337 .alloc_coherent = x86_swiotlb_alloc_coherent, 11388 .alloc_coherent = x86_swiotlb_alloc_coherent,
11338 .free_coherent = swiotlb_free_coherent, 11389 .free_coherent = swiotlb_free_coherent,
11339diff -urNp linux-2.6.32.7/arch/x86/kernel/process_32.c linux-2.6.32.7/arch/x86/kernel/process_32.c 11390diff -urNp linux-2.6.32.8/arch/x86/kernel/process_32.c linux-2.6.32.8/arch/x86/kernel/process_32.c
11340--- linux-2.6.32.7/arch/x86/kernel/process_32.c 2010-01-25 13:50:10.000000000 -0500 11391--- linux-2.6.32.8/arch/x86/kernel/process_32.c 2010-02-09 07:57:19.000000000 -0500
11341+++ linux-2.6.32.7/arch/x86/kernel/process_32.c 2010-01-25 17:39:40.306401380 -0500 11392+++ linux-2.6.32.8/arch/x86/kernel/process_32.c 2010-02-10 15:06:23.966139206 -0500
11342@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as 11393@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
11343 unsigned long thread_saved_pc(struct task_struct *tsk) 11394 unsigned long thread_saved_pc(struct task_struct *tsk)
11344 { 11395 {
@@ -11433,9 +11484,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/process_32.c linux-2.6.32.7/arch/x86/k
11433+ load_sp0(init_tss + smp_processor_id(), thread); 11484+ load_sp0(init_tss + smp_processor_id(), thread);
11434+} 11485+}
11435+#endif 11486+#endif
11436diff -urNp linux-2.6.32.7/arch/x86/kernel/process_64.c linux-2.6.32.7/arch/x86/kernel/process_64.c 11487diff -urNp linux-2.6.32.8/arch/x86/kernel/process_64.c linux-2.6.32.8/arch/x86/kernel/process_64.c
11437--- linux-2.6.32.7/arch/x86/kernel/process_64.c 2010-01-25 13:50:10.000000000 -0500 11488--- linux-2.6.32.8/arch/x86/kernel/process_64.c 2010-02-09 07:57:19.000000000 -0500
11438+++ linux-2.6.32.7/arch/x86/kernel/process_64.c 2010-01-25 17:39:40.306401380 -0500 11489+++ linux-2.6.32.8/arch/x86/kernel/process_64.c 2010-02-10 15:06:23.966139206 -0500
11439@@ -91,7 +91,7 @@ static void __exit_idle(void) 11490@@ -91,7 +91,7 @@ static void __exit_idle(void)
11440 void exit_idle(void) 11491 void exit_idle(void)
11441 { 11492 {
@@ -11463,7 +11514,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/process_64.c linux-2.6.32.7/arch/x86/k
11463 unsigned fsindex, gsindex; 11514 unsigned fsindex, gsindex;
11464 bool preload_fpu; 11515 bool preload_fpu;
11465 11516
11466@@ -549,12 +549,11 @@ unsigned long get_wchan(struct task_stru 11517@@ -560,12 +560,11 @@ unsigned long get_wchan(struct task_stru
11467 if (!p || p == current || p->state == TASK_RUNNING) 11518 if (!p || p == current || p->state == TASK_RUNNING)
11468 return 0; 11519 return 0;
11469 stack = (unsigned long)task_stack_page(p); 11520 stack = (unsigned long)task_stack_page(p);
@@ -11478,9 +11529,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/process_64.c linux-2.6.32.7/arch/x86/k
11478 return 0; 11529 return 0;
11479 ip = *(u64 *)(fp+8); 11530 ip = *(u64 *)(fp+8);
11480 if (!in_sched_functions(ip)) 11531 if (!in_sched_functions(ip))
11481diff -urNp linux-2.6.32.7/arch/x86/kernel/process.c linux-2.6.32.7/arch/x86/kernel/process.c 11532diff -urNp linux-2.6.32.8/arch/x86/kernel/process.c linux-2.6.32.8/arch/x86/kernel/process.c
11482--- linux-2.6.32.7/arch/x86/kernel/process.c 2010-01-25 13:50:10.000000000 -0500 11533--- linux-2.6.32.8/arch/x86/kernel/process.c 2010-02-09 07:57:19.000000000 -0500
11483+++ linux-2.6.32.7/arch/x86/kernel/process.c 2010-01-25 17:39:40.315113155 -0500 11534+++ linux-2.6.32.8/arch/x86/kernel/process.c 2010-02-10 15:06:23.966139206 -0500
11484@@ -73,7 +73,7 @@ void exit_thread(void) 11535@@ -73,7 +73,7 @@ void exit_thread(void)
11485 unsigned long *bp = t->io_bitmap_ptr; 11536 unsigned long *bp = t->io_bitmap_ptr;
11486 11537
@@ -11490,7 +11541,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/process.c linux-2.6.32.7/arch/x86/kern
11490 11541
11491 t->io_bitmap_ptr = NULL; 11542 t->io_bitmap_ptr = NULL;
11492 clear_thread_flag(TIF_IO_BITMAP); 11543 clear_thread_flag(TIF_IO_BITMAP);
11493@@ -105,6 +105,9 @@ void flush_thread(void) 11544@@ -93,6 +93,9 @@ void flush_thread(void)
11494 11545
11495 clear_tsk_thread_flag(tsk, TIF_DEBUG); 11546 clear_tsk_thread_flag(tsk, TIF_DEBUG);
11496 11547
@@ -11500,7 +11551,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/process.c linux-2.6.32.7/arch/x86/kern
11500 tsk->thread.debugreg0 = 0; 11551 tsk->thread.debugreg0 = 0;
11501 tsk->thread.debugreg1 = 0; 11552 tsk->thread.debugreg1 = 0;
11502 tsk->thread.debugreg2 = 0; 11553 tsk->thread.debugreg2 = 0;
11503@@ -596,17 +599,3 @@ static int __init idle_setup(char *str) 11554@@ -584,17 +587,3 @@ static int __init idle_setup(char *str)
11504 return 0; 11555 return 0;
11505 } 11556 }
11506 early_param("idle", idle_setup); 11557 early_param("idle", idle_setup);
@@ -11518,9 +11569,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/process.c linux-2.6.32.7/arch/x86/kern
11518- return randomize_range(mm->brk, range_end, 0) ? : mm->brk; 11569- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
11519-} 11570-}
11520- 11571-
11521diff -urNp linux-2.6.32.7/arch/x86/kernel/ptrace.c linux-2.6.32.7/arch/x86/kernel/ptrace.c 11572diff -urNp linux-2.6.32.8/arch/x86/kernel/ptrace.c linux-2.6.32.8/arch/x86/kernel/ptrace.c
11522--- linux-2.6.32.7/arch/x86/kernel/ptrace.c 2010-01-25 13:50:10.000000000 -0500 11573--- linux-2.6.32.8/arch/x86/kernel/ptrace.c 2010-02-09 07:57:19.000000000 -0500
11523+++ linux-2.6.32.7/arch/x86/kernel/ptrace.c 2010-01-25 17:39:40.315113155 -0500 11574+++ linux-2.6.32.8/arch/x86/kernel/ptrace.c 2010-02-10 15:06:23.966139206 -0500
11524@@ -925,7 +925,7 @@ static const struct user_regset_view use 11575@@ -925,7 +925,7 @@ static const struct user_regset_view use
11525 long arch_ptrace(struct task_struct *child, long request, long addr, long data) 11576 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
11526 { 11577 {
@@ -11589,9 +11640,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/ptrace.c linux-2.6.32.7/arch/x86/kerne
11589 11640
11590 /* Send us the fake SIGTRAP */ 11641 /* Send us the fake SIGTRAP */
11591 force_sig_info(SIGTRAP, &info, tsk); 11642 force_sig_info(SIGTRAP, &info, tsk);
11592diff -urNp linux-2.6.32.7/arch/x86/kernel/reboot.c linux-2.6.32.7/arch/x86/kernel/reboot.c 11643diff -urNp linux-2.6.32.8/arch/x86/kernel/reboot.c linux-2.6.32.8/arch/x86/kernel/reboot.c
11593--- linux-2.6.32.7/arch/x86/kernel/reboot.c 2010-01-25 13:50:10.000000000 -0500 11644--- linux-2.6.32.8/arch/x86/kernel/reboot.c 2010-02-09 07:57:19.000000000 -0500
11594+++ linux-2.6.32.7/arch/x86/kernel/reboot.c 2010-01-25 17:39:40.315113155 -0500 11645+++ linux-2.6.32.8/arch/x86/kernel/reboot.c 2010-02-10 15:06:23.966139206 -0500
11595@@ -33,7 +33,7 @@ void (*pm_power_off)(void); 11646@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
11596 EXPORT_SYMBOL(pm_power_off); 11647 EXPORT_SYMBOL(pm_power_off);
11597 11648
@@ -11601,7 +11652,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/reboot.c linux-2.6.32.7/arch/x86/kerne
11601 enum reboot_type reboot_type = BOOT_KBD; 11652 enum reboot_type reboot_type = BOOT_KBD;
11602 int reboot_force; 11653 int reboot_force;
11603 11654
11604@@ -267,7 +267,7 @@ static struct dmi_system_id __initdata r 11655@@ -276,7 +276,7 @@ static struct dmi_system_id __initdata r
11605 DMI_MATCH(DMI_BOARD_NAME, "P4S800"), 11656 DMI_MATCH(DMI_BOARD_NAME, "P4S800"),
11606 }, 11657 },
11607 }, 11658 },
@@ -11610,7 +11661,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/reboot.c linux-2.6.32.7/arch/x86/kerne
11610 }; 11661 };
11611 11662
11612 static int __init reboot_init(void) 11663 static int __init reboot_init(void)
11613@@ -283,12 +283,12 @@ core_initcall(reboot_init); 11664@@ -292,12 +292,12 @@ core_initcall(reboot_init);
11614 controller to pulse the CPU reset line, which is more thorough, but 11665 controller to pulse the CPU reset line, which is more thorough, but
11615 doesn't work with at least one type of 486 motherboard. It is easy 11666 doesn't work with at least one type of 486 motherboard. It is easy
11616 to stop this code working; hence the copious comments. */ 11667 to stop this code working; hence the copious comments. */
@@ -11628,7 +11679,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/reboot.c linux-2.6.32.7/arch/x86/kerne
11628 }; 11679 };
11629 11680
11630 static const struct desc_ptr 11681 static const struct desc_ptr
11631@@ -337,7 +337,7 @@ static const unsigned char jump_to_bios 11682@@ -346,7 +346,7 @@ static const unsigned char jump_to_bios
11632 * specified by the code and length parameters. 11683 * specified by the code and length parameters.
11633 * We assume that length will aways be less that 100! 11684 * We assume that length will aways be less that 100!
11634 */ 11685 */
@@ -11637,7 +11688,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/reboot.c linux-2.6.32.7/arch/x86/kerne
11637 { 11688 {
11638 local_irq_disable(); 11689 local_irq_disable();
11639 11690
11640@@ -357,8 +357,8 @@ void machine_real_restart(const unsigned 11691@@ -366,8 +366,8 @@ void machine_real_restart(const unsigned
11641 /* Remap the kernel at virtual address zero, as well as offset zero 11692 /* Remap the kernel at virtual address zero, as well as offset zero
11642 from the kernel segment. This assumes the kernel segment starts at 11693 from the kernel segment. This assumes the kernel segment starts at
11643 virtual address PAGE_OFFSET. */ 11694 virtual address PAGE_OFFSET. */
@@ -11648,7 +11699,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/reboot.c linux-2.6.32.7/arch/x86/kerne
11648 11699
11649 /* 11700 /*
11650 * Use `swapper_pg_dir' as our page directory. 11701 * Use `swapper_pg_dir' as our page directory.
11651@@ -370,16 +370,15 @@ void machine_real_restart(const unsigned 11702@@ -379,16 +379,15 @@ void machine_real_restart(const unsigned
11652 boot)". This seems like a fairly standard thing that gets set by 11703 boot)". This seems like a fairly standard thing that gets set by
11653 REBOOT.COM programs, and the previous reset routine did this 11704 REBOOT.COM programs, and the previous reset routine did this
11654 too. */ 11705 too. */
@@ -11668,10 +11719,10 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/reboot.c linux-2.6.32.7/arch/x86/kerne
11668 11719
11669 /* Set up the IDT for real mode. */ 11720 /* Set up the IDT for real mode. */
11670 load_idt(&real_mode_idt); 11721 load_idt(&real_mode_idt);
11671diff -urNp linux-2.6.32.7/arch/x86/kernel/setup.c linux-2.6.32.7/arch/x86/kernel/setup.c 11722diff -urNp linux-2.6.32.8/arch/x86/kernel/setup.c linux-2.6.32.8/arch/x86/kernel/setup.c
11672--- linux-2.6.32.7/arch/x86/kernel/setup.c 2010-01-25 13:50:10.000000000 -0500 11723--- linux-2.6.32.8/arch/x86/kernel/setup.c 2010-02-09 07:57:19.000000000 -0500
11673+++ linux-2.6.32.7/arch/x86/kernel/setup.c 2010-01-25 17:39:40.316230553 -0500 11724+++ linux-2.6.32.8/arch/x86/kernel/setup.c 2010-02-10 15:06:23.969991579 -0500
11674@@ -763,14 +763,14 @@ void __init setup_arch(char **cmdline_p) 11725@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p)
11675 11726
11676 if (!boot_params.hdr.root_flags) 11727 if (!boot_params.hdr.root_flags)
11677 root_mountflags &= ~MS_RDONLY; 11728 root_mountflags &= ~MS_RDONLY;
@@ -11691,9 +11742,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/setup.c linux-2.6.32.7/arch/x86/kernel
11691 data_resource.end = virt_to_phys(_edata)-1; 11742 data_resource.end = virt_to_phys(_edata)-1;
11692 bss_resource.start = virt_to_phys(&__bss_start); 11743 bss_resource.start = virt_to_phys(&__bss_start);
11693 bss_resource.end = virt_to_phys(&__bss_stop)-1; 11744 bss_resource.end = virt_to_phys(&__bss_stop)-1;
11694diff -urNp linux-2.6.32.7/arch/x86/kernel/setup_percpu.c linux-2.6.32.7/arch/x86/kernel/setup_percpu.c 11745diff -urNp linux-2.6.32.8/arch/x86/kernel/setup_percpu.c linux-2.6.32.8/arch/x86/kernel/setup_percpu.c
11695--- linux-2.6.32.7/arch/x86/kernel/setup_percpu.c 2010-01-25 13:50:10.000000000 -0500 11746--- linux-2.6.32.8/arch/x86/kernel/setup_percpu.c 2010-02-09 07:57:19.000000000 -0500
11696+++ linux-2.6.32.7/arch/x86/kernel/setup_percpu.c 2010-01-25 17:39:40.316230553 -0500 11747+++ linux-2.6.32.8/arch/x86/kernel/setup_percpu.c 2010-02-10 15:06:23.969991579 -0500
11697@@ -25,19 +25,17 @@ 11748@@ -25,19 +25,17 @@
11698 # define DBG(x...) 11749 # define DBG(x...)
11699 #endif 11750 #endif
@@ -11764,9 +11815,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/setup_percpu.c linux-2.6.32.7/arch/x86
11764 /* 11815 /*
11765 * Up to this point, the boot CPU has been using .data.init 11816 * Up to this point, the boot CPU has been using .data.init
11766 * area. Reload any changed state for the boot CPU. 11817 * area. Reload any changed state for the boot CPU.
11767diff -urNp linux-2.6.32.7/arch/x86/kernel/signal.c linux-2.6.32.7/arch/x86/kernel/signal.c 11818diff -urNp linux-2.6.32.8/arch/x86/kernel/signal.c linux-2.6.32.8/arch/x86/kernel/signal.c
11768--- linux-2.6.32.7/arch/x86/kernel/signal.c 2010-01-25 13:50:10.000000000 -0500 11819--- linux-2.6.32.8/arch/x86/kernel/signal.c 2010-02-09 07:57:19.000000000 -0500
11769+++ linux-2.6.32.7/arch/x86/kernel/signal.c 2010-01-25 17:39:40.316230553 -0500 11820+++ linux-2.6.32.8/arch/x86/kernel/signal.c 2010-02-10 15:06:23.969991579 -0500
11770@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi 11821@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
11771 * Align the stack pointer according to the i386 ABI, 11822 * Align the stack pointer according to the i386 ABI,
11772 * i.e. so that on function entry ((sp + 4) & 15) == 0. 11823 * i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -11838,9 +11889,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/signal.c linux-2.6.32.7/arch/x86/kerne
11838 return; 11889 return;
11839 11890
11840 if (current_thread_info()->status & TS_RESTORE_SIGMASK) 11891 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
11841diff -urNp linux-2.6.32.7/arch/x86/kernel/smpboot.c linux-2.6.32.7/arch/x86/kernel/smpboot.c 11892diff -urNp linux-2.6.32.8/arch/x86/kernel/smpboot.c linux-2.6.32.8/arch/x86/kernel/smpboot.c
11842--- linux-2.6.32.7/arch/x86/kernel/smpboot.c 2010-01-25 13:50:10.000000000 -0500 11893--- linux-2.6.32.8/arch/x86/kernel/smpboot.c 2010-02-09 07:57:19.000000000 -0500
11843+++ linux-2.6.32.7/arch/x86/kernel/smpboot.c 2010-01-25 17:39:40.316230553 -0500 11894+++ linux-2.6.32.8/arch/x86/kernel/smpboot.c 2010-02-10 15:06:23.969991579 -0500
11844@@ -729,7 +729,11 @@ do_rest: 11895@@ -729,7 +729,11 @@ do_rest:
11845 (unsigned long)task_stack_page(c_idle.idle) - 11896 (unsigned long)task_stack_page(c_idle.idle) -
11846 KERNEL_STACK_OFFSET + THREAD_SIZE; 11897 KERNEL_STACK_OFFSET + THREAD_SIZE;
@@ -11853,9 +11904,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/smpboot.c linux-2.6.32.7/arch/x86/kern
11853 initial_code = (unsigned long)start_secondary; 11904 initial_code = (unsigned long)start_secondary;
11854 stack_start.sp = (void *) c_idle.idle->thread.sp; 11905 stack_start.sp = (void *) c_idle.idle->thread.sp;
11855 11906
11856diff -urNp linux-2.6.32.7/arch/x86/kernel/step.c linux-2.6.32.7/arch/x86/kernel/step.c 11907diff -urNp linux-2.6.32.8/arch/x86/kernel/step.c linux-2.6.32.8/arch/x86/kernel/step.c
11857--- linux-2.6.32.7/arch/x86/kernel/step.c 2010-01-25 13:50:10.000000000 -0500 11908--- linux-2.6.32.8/arch/x86/kernel/step.c 2010-02-09 07:57:19.000000000 -0500
11858+++ linux-2.6.32.7/arch/x86/kernel/step.c 2010-01-25 17:39:40.317128786 -0500 11909+++ linux-2.6.32.8/arch/x86/kernel/step.c 2010-02-10 15:06:23.969991579 -0500
11859@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc 11910@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
11860 struct desc_struct *desc; 11911 struct desc_struct *desc;
11861 unsigned long base; 11912 unsigned long base;
@@ -11888,17 +11939,17 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/step.c linux-2.6.32.7/arch/x86/kernel/
11888 /* 32-bit mode: register increment */ 11939 /* 32-bit mode: register increment */
11889 return 0; 11940 return 0;
11890 /* 64-bit mode: REX prefix */ 11941 /* 64-bit mode: REX prefix */
11891diff -urNp linux-2.6.32.7/arch/x86/kernel/syscall_table_32.S linux-2.6.32.7/arch/x86/kernel/syscall_table_32.S 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
11892--- linux-2.6.32.7/arch/x86/kernel/syscall_table_32.S 2010-01-25 13:50:10.000000000 -0500 11943--- linux-2.6.32.8/arch/x86/kernel/syscall_table_32.S 2010-02-09 07:57:19.000000000 -0500
11893+++ linux-2.6.32.7/arch/x86/kernel/syscall_table_32.S 2010-01-25 17:39:40.317128786 -0500 11944+++ linux-2.6.32.8/arch/x86/kernel/syscall_table_32.S 2010-02-10 15:06:23.969991579 -0500
11894@@ -1,3 +1,4 @@ 11945@@ -1,3 +1,4 @@
11895+.section .rodata,"a",@progbits 11946+.section .rodata,"a",@progbits
11896 ENTRY(sys_call_table) 11947 ENTRY(sys_call_table)
11897 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ 11948 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
11898 .long sys_exit 11949 .long sys_exit
11899diff -urNp linux-2.6.32.7/arch/x86/kernel/sys_i386_32.c linux-2.6.32.7/arch/x86/kernel/sys_i386_32.c 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
11900--- linux-2.6.32.7/arch/x86/kernel/sys_i386_32.c 2010-01-25 13:50:10.000000000 -0500 11951--- linux-2.6.32.8/arch/x86/kernel/sys_i386_32.c 2010-02-09 07:57:19.000000000 -0500
11901+++ linux-2.6.32.7/arch/x86/kernel/sys_i386_32.c 2010-01-25 17:55:33.503413891 -0500 11952+++ linux-2.6.32.8/arch/x86/kernel/sys_i386_32.c 2010-02-10 15:06:23.969991579 -0500
11902@@ -24,6 +24,21 @@ 11953@@ -24,6 +24,21 @@
11903 11954
11904 #include <asm/syscalls.h> 11955 #include <asm/syscalls.h>
@@ -12145,9 +12196,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/sys_i386_32.c linux-2.6.32.7/arch/x86/
12145 } 12196 }
12146 case 1: /* iBCS2 emulator entry point */ 12197 case 1: /* iBCS2 emulator entry point */
12147 if (!segment_eq(get_fs(), get_ds())) 12198 if (!segment_eq(get_fs(), get_ds()))
12148diff -urNp linux-2.6.32.7/arch/x86/kernel/sys_x86_64.c linux-2.6.32.7/arch/x86/kernel/sys_x86_64.c 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
12149--- linux-2.6.32.7/arch/x86/kernel/sys_x86_64.c 2010-01-25 13:50:10.000000000 -0500 12200--- linux-2.6.32.8/arch/x86/kernel/sys_x86_64.c 2010-02-09 07:57:19.000000000 -0500
12150+++ linux-2.6.32.7/arch/x86/kernel/sys_x86_64.c 2010-01-25 17:39:40.317128786 -0500 12201+++ linux-2.6.32.8/arch/x86/kernel/sys_x86_64.c 2010-02-10 15:06:23.969991579 -0500
12151@@ -32,8 +32,8 @@ out: 12202@@ -32,8 +32,8 @@ out:
12152 return error; 12203 return error;
12153 } 12204 }
@@ -12229,9 +12280,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/sys_x86_64.c linux-2.6.32.7/arch/x86/k
12229 mm->cached_hole_size = ~0UL; 12280 mm->cached_hole_size = ~0UL;
12230 12281
12231 return addr; 12282 return addr;
12232diff -urNp linux-2.6.32.7/arch/x86/kernel/time.c linux-2.6.32.7/arch/x86/kernel/time.c 12283diff -urNp linux-2.6.32.8/arch/x86/kernel/time.c linux-2.6.32.8/arch/x86/kernel/time.c
12233--- linux-2.6.32.7/arch/x86/kernel/time.c 2010-01-25 13:50:10.000000000 -0500 12284--- linux-2.6.32.8/arch/x86/kernel/time.c 2010-02-09 07:57:19.000000000 -0500
12234+++ linux-2.6.32.7/arch/x86/kernel/time.c 2010-01-25 17:39:40.318098268 -0500 12285+++ linux-2.6.32.8/arch/x86/kernel/time.c 2010-02-10 15:06:23.969991579 -0500
12235@@ -26,17 +26,13 @@ 12286@@ -26,17 +26,13 @@
12236 int timer_ack; 12287 int timer_ack;
12237 #endif 12288 #endif
@@ -12270,9 +12321,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/time.c linux-2.6.32.7/arch/x86/kernel/
12270 } 12321 }
12271 return pc; 12322 return pc;
12272 } 12323 }
12273diff -urNp linux-2.6.32.7/arch/x86/kernel/tls.c linux-2.6.32.7/arch/x86/kernel/tls.c 12324diff -urNp linux-2.6.32.8/arch/x86/kernel/tls.c linux-2.6.32.8/arch/x86/kernel/tls.c
12274--- linux-2.6.32.7/arch/x86/kernel/tls.c 2010-01-25 13:50:10.000000000 -0500 12325--- linux-2.6.32.8/arch/x86/kernel/tls.c 2010-02-09 07:57:19.000000000 -0500
12275+++ linux-2.6.32.7/arch/x86/kernel/tls.c 2010-01-25 17:39:40.318098268 -0500 12326+++ linux-2.6.32.8/arch/x86/kernel/tls.c 2010-02-10 15:06:23.969991579 -0500
12276@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc 12327@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
12277 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) 12328 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
12278 return -EINVAL; 12329 return -EINVAL;
@@ -12285,9 +12336,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/tls.c linux-2.6.32.7/arch/x86/kernel/t
12285 set_tls_desc(p, idx, &info, 1); 12336 set_tls_desc(p, idx, &info, 1);
12286 12337
12287 return 0; 12338 return 0;
12288diff -urNp linux-2.6.32.7/arch/x86/kernel/trampoline_32.S linux-2.6.32.7/arch/x86/kernel/trampoline_32.S 12339diff -urNp linux-2.6.32.8/arch/x86/kernel/trampoline_32.S linux-2.6.32.8/arch/x86/kernel/trampoline_32.S
12289--- linux-2.6.32.7/arch/x86/kernel/trampoline_32.S 2010-01-25 13:50:10.000000000 -0500 12340--- linux-2.6.32.8/arch/x86/kernel/trampoline_32.S 2010-02-09 07:57:19.000000000 -0500
12290+++ linux-2.6.32.7/arch/x86/kernel/trampoline_32.S 2010-01-25 17:39:40.318098268 -0500 12341+++ linux-2.6.32.8/arch/x86/kernel/trampoline_32.S 2010-02-10 15:06:23.969991579 -0500
12291@@ -32,6 +32,12 @@ 12342@@ -32,6 +32,12 @@
12292 #include <asm/segment.h> 12343 #include <asm/segment.h>
12293 #include <asm/page_types.h> 12344 #include <asm/page_types.h>
@@ -12310,9 +12361,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/trampoline_32.S linux-2.6.32.7/arch/x8
12310 12361
12311 # These need to be in the same 64K segment as the above; 12362 # These need to be in the same 64K segment as the above;
12312 # hence we don't use the boot_gdt_descr defined in head.S 12363 # hence we don't use the boot_gdt_descr defined in head.S
12313diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel/traps.c 12364diff -urNp linux-2.6.32.8/arch/x86/kernel/traps.c linux-2.6.32.8/arch/x86/kernel/traps.c
12314--- linux-2.6.32.7/arch/x86/kernel/traps.c 2010-01-25 13:50:10.000000000 -0500 12365--- linux-2.6.32.8/arch/x86/kernel/traps.c 2010-02-09 07:57:19.000000000 -0500
12315+++ linux-2.6.32.7/arch/x86/kernel/traps.c 2010-01-25 17:39:40.318098268 -0500 12366+++ linux-2.6.32.8/arch/x86/kernel/traps.c 2010-02-10 15:06:29.734312153 -0500
12316@@ -69,12 +69,6 @@ asmlinkage int system_call(void); 12367@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
12317 12368
12318 /* Do we ignore FPU interrupts ? */ 12369 /* Do we ignore FPU interrupts ? */
@@ -12326,7 +12377,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel
12326 #endif 12377 #endif
12327 12378
12328 DECLARE_BITMAP(used_vectors, NR_VECTORS); 12379 DECLARE_BITMAP(used_vectors, NR_VECTORS);
12329@@ -112,7 +106,7 @@ static inline void preempt_conditional_c 12380@@ -112,19 +106,19 @@ static inline void preempt_conditional_c
12330 static inline void 12381 static inline void
12331 die_if_kernel(const char *str, struct pt_regs *regs, long err) 12382 die_if_kernel(const char *str, struct pt_regs *regs, long err)
12332 { 12383 {
@@ -12335,7 +12386,12 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel
12335 die(str, regs, err); 12386 die(str, regs, err);
12336 } 12387 }
12337 #endif 12388 #endif
12338@@ -124,7 +118,7 @@ do_trap(int trapnr, int signr, char *str 12389
12390 static void __kprobes
12391-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
12392+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
12393 long error_code, siginfo_t *info)
12394 {
12339 struct task_struct *tsk = current; 12395 struct task_struct *tsk = current;
12340 12396
12341 #ifdef CONFIG_X86_32 12397 #ifdef CONFIG_X86_32
@@ -12362,8 +12418,16 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel
12362 regs->ip, regs->sp, error_code); 12418 regs->ip, regs->sp, error_code);
12363 print_vma_addr(" in ", regs->ip); 12419 print_vma_addr(" in ", regs->ip);
12364 printk("\n"); 12420 printk("\n");
12365@@ -177,6 +171,12 @@ kernel_trap: 12421@@ -175,8 +169,20 @@ kernel_trap:
12422 if (!fixup_exception(regs)) {
12423 tsk->thread.error_code = error_code;
12366 tsk->thread.trap_no = trapnr; 12424 tsk->thread.trap_no = trapnr;
12425+
12426+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12427+ if (trapnr == 12 && (regs->cs & 0xFFFF) == __KERNEL_CS)
12428+ str = "PAX: suspicious stack segment fault";
12429+#endif
12430+
12367 die(str, regs, error_code); 12431 die(str, regs, error_code);
12368 } 12432 }
12369+ 12433+
@@ -12375,7 +12439,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel
12375 return; 12439 return;
12376 12440
12377 #ifdef CONFIG_X86_32 12441 #ifdef CONFIG_X86_32
12378@@ -265,14 +265,30 @@ do_general_protection(struct pt_regs *re 12442@@ -265,14 +271,30 @@ do_general_protection(struct pt_regs *re
12379 conditional_sti(regs); 12443 conditional_sti(regs);
12380 12444
12381 #ifdef CONFIG_X86_32 12445 #ifdef CONFIG_X86_32
@@ -12408,7 +12472,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel
12408 tsk->thread.error_code = error_code; 12472 tsk->thread.error_code = error_code;
12409 tsk->thread.trap_no = 13; 12473 tsk->thread.trap_no = 13;
12410 12474
12411@@ -305,6 +321,13 @@ gp_in_kernel: 12475@@ -305,6 +327,13 @@ gp_in_kernel:
12412 if (notify_die(DIE_GPF, "general protection fault", regs, 12476 if (notify_die(DIE_GPF, "general protection fault", regs,
12413 error_code, 13, SIGSEGV) == NOTIFY_STOP) 12477 error_code, 13, SIGSEGV) == NOTIFY_STOP)
12414 return; 12478 return;
@@ -12422,7 +12486,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel
12422 die("general protection fault", regs, error_code); 12486 die("general protection fault", regs, error_code);
12423 } 12487 }
12424 12488
12425@@ -558,7 +581,7 @@ dotraplinkage void __kprobes do_debug(st 12489@@ -558,7 +587,7 @@ dotraplinkage void __kprobes do_debug(st
12426 } 12490 }
12427 12491
12428 #ifdef CONFIG_X86_32 12492 #ifdef CONFIG_X86_32
@@ -12431,7 +12495,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel
12431 goto debug_vm86; 12495 goto debug_vm86;
12432 #endif 12496 #endif
12433 12497
12434@@ -570,7 +593,7 @@ dotraplinkage void __kprobes do_debug(st 12498@@ -570,7 +599,7 @@ dotraplinkage void __kprobes do_debug(st
12435 * kernel space (but re-enable TF when returning to user mode). 12499 * kernel space (but re-enable TF when returning to user mode).
12436 */ 12500 */
12437 if (condition & DR_STEP) { 12501 if (condition & DR_STEP) {
@@ -12440,7 +12504,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel
12440 goto clear_TF_reenable; 12504 goto clear_TF_reenable;
12441 } 12505 }
12442 12506
12443@@ -757,7 +780,7 @@ do_simd_coprocessor_error(struct pt_regs 12507@@ -757,7 +786,7 @@ do_simd_coprocessor_error(struct pt_regs
12444 * Handle strange cache flush from user space exception 12508 * Handle strange cache flush from user space exception
12445 * in all other cases. This is undocumented behaviour. 12509 * in all other cases. This is undocumented behaviour.
12446 */ 12510 */
@@ -12449,9 +12513,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/traps.c linux-2.6.32.7/arch/x86/kernel
12449 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); 12513 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
12450 return; 12514 return;
12451 } 12515 }
12452diff -urNp linux-2.6.32.7/arch/x86/kernel/tsc.c linux-2.6.32.7/arch/x86/kernel/tsc.c 12516diff -urNp linux-2.6.32.8/arch/x86/kernel/tsc.c linux-2.6.32.8/arch/x86/kernel/tsc.c
12453--- linux-2.6.32.7/arch/x86/kernel/tsc.c 2010-01-25 20:04:14.629580263 -0500 12517--- linux-2.6.32.8/arch/x86/kernel/tsc.c 2010-02-09 07:57:19.000000000 -0500
12454+++ linux-2.6.32.7/arch/x86/kernel/tsc.c 2010-01-25 20:04:24.394132856 -0500 12518+++ linux-2.6.32.8/arch/x86/kernel/tsc.c 2010-02-10 15:06:23.969991579 -0500
12455@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b 12519@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b
12456 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), 12520 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
12457 }, 12521 },
@@ -12461,9 +12525,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/tsc.c linux-2.6.32.7/arch/x86/kernel/t
12461 }; 12525 };
12462 12526
12463 static void __init check_system_tsc_reliable(void) 12527 static void __init check_system_tsc_reliable(void)
12464diff -urNp linux-2.6.32.7/arch/x86/kernel/vm86_32.c linux-2.6.32.7/arch/x86/kernel/vm86_32.c 12528diff -urNp linux-2.6.32.8/arch/x86/kernel/vm86_32.c linux-2.6.32.8/arch/x86/kernel/vm86_32.c
12465--- linux-2.6.32.7/arch/x86/kernel/vm86_32.c 2010-01-25 13:50:10.000000000 -0500 12529--- linux-2.6.32.8/arch/x86/kernel/vm86_32.c 2010-02-09 07:57:19.000000000 -0500
12466+++ linux-2.6.32.7/arch/x86/kernel/vm86_32.c 2010-01-25 17:39:40.319407931 -0500 12530+++ linux-2.6.32.8/arch/x86/kernel/vm86_32.c 2010-02-10 15:06:23.969991579 -0500
12467@@ -41,6 +41,7 @@ 12531@@ -41,6 +41,7 @@
12468 #include <linux/ptrace.h> 12532 #include <linux/ptrace.h>
12469 #include <linux/audit.h> 12533 #include <linux/audit.h>
@@ -12528,9 +12592,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/vm86_32.c linux-2.6.32.7/arch/x86/kern
12528 if (get_user(segoffs, intr_ptr)) 12592 if (get_user(segoffs, intr_ptr))
12529 goto cannot_handle; 12593 goto cannot_handle;
12530 if ((segoffs >> 16) == BIOSSEG) 12594 if ((segoffs >> 16) == BIOSSEG)
12531diff -urNp linux-2.6.32.7/arch/x86/kernel/vmi_32.c linux-2.6.32.7/arch/x86/kernel/vmi_32.c 12595diff -urNp linux-2.6.32.8/arch/x86/kernel/vmi_32.c linux-2.6.32.8/arch/x86/kernel/vmi_32.c
12532--- linux-2.6.32.7/arch/x86/kernel/vmi_32.c 2010-01-25 13:50:10.000000000 -0500 12596--- linux-2.6.32.8/arch/x86/kernel/vmi_32.c 2010-02-09 07:57:19.000000000 -0500
12533+++ linux-2.6.32.7/arch/x86/kernel/vmi_32.c 2010-01-25 17:39:40.319407931 -0500 12597+++ linux-2.6.32.8/arch/x86/kernel/vmi_32.c 2010-02-10 15:06:23.969991579 -0500
12534@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) 12598@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
12535 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); 12599 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
12536 12600
@@ -12690,9 +12754,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/vmi_32.c linux-2.6.32.7/arch/x86/kerne
12690 return; 12754 return;
12691 12755
12692 local_irq_save(flags); 12756 local_irq_save(flags);
12693diff -urNp linux-2.6.32.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.7/arch/x86/kernel/vmlinux.lds.S 12757diff -urNp linux-2.6.32.8/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.8/arch/x86/kernel/vmlinux.lds.S
12694--- linux-2.6.32.7/arch/x86/kernel/vmlinux.lds.S 2010-01-25 13:50:10.000000000 -0500 12758--- linux-2.6.32.8/arch/x86/kernel/vmlinux.lds.S 2010-02-09 07:57:19.000000000 -0500
12695+++ linux-2.6.32.7/arch/x86/kernel/vmlinux.lds.S 2010-01-25 20:01:12.031334490 -0500 12759+++ linux-2.6.32.8/arch/x86/kernel/vmlinux.lds.S 2010-02-10 15:06:23.969991579 -0500
12696@@ -26,6 +26,22 @@ 12760@@ -26,6 +26,22 @@
12697 #include <asm/page_types.h> 12761 #include <asm/page_types.h>
12698 #include <asm/cache.h> 12762 #include <asm/cache.h>
@@ -12980,9 +13044,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.7/arch/x86/
12980 "kernel image bigger than KERNEL_IMAGE_SIZE"); 13044 "kernel image bigger than KERNEL_IMAGE_SIZE");
12981 13045
12982 #ifdef CONFIG_SMP 13046 #ifdef CONFIG_SMP
12983diff -urNp linux-2.6.32.7/arch/x86/kernel/vsyscall_64.c linux-2.6.32.7/arch/x86/kernel/vsyscall_64.c 13047diff -urNp linux-2.6.32.8/arch/x86/kernel/vsyscall_64.c linux-2.6.32.8/arch/x86/kernel/vsyscall_64.c
12984--- linux-2.6.32.7/arch/x86/kernel/vsyscall_64.c 2010-01-25 13:50:10.000000000 -0500 13048--- linux-2.6.32.8/arch/x86/kernel/vsyscall_64.c 2010-02-09 07:57:19.000000000 -0500
12985+++ linux-2.6.32.7/arch/x86/kernel/vsyscall_64.c 2010-01-25 17:39:40.319407931 -0500 13049+++ linux-2.6.32.8/arch/x86/kernel/vsyscall_64.c 2010-02-10 15:06:23.969991579 -0500
12986@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa 13050@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa
12987 13051
12988 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); 13052 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -13016,9 +13080,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/vsyscall_64.c linux-2.6.32.7/arch/x86/
13016 }; 13080 };
13017 #endif 13081 #endif
13018 13082
13019diff -urNp linux-2.6.32.7/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.7/arch/x86/kernel/x8664_ksyms_64.c 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
13020--- linux-2.6.32.7/arch/x86/kernel/x8664_ksyms_64.c 2010-01-25 13:50:10.000000000 -0500 13084--- linux-2.6.32.8/arch/x86/kernel/x8664_ksyms_64.c 2010-02-09 07:57:19.000000000 -0500
13021+++ linux-2.6.32.7/arch/x86/kernel/x8664_ksyms_64.c 2010-01-25 17:39:40.319407931 -0500 13085+++ linux-2.6.32.8/arch/x86/kernel/x8664_ksyms_64.c 2010-02-10 15:06:23.969991579 -0500
13022@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); 13086@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
13023 13087
13024 EXPORT_SYMBOL(copy_user_generic); 13088 EXPORT_SYMBOL(copy_user_generic);
@@ -13028,9 +13092,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.7/arch/x
13028 EXPORT_SYMBOL(__copy_from_user_inatomic); 13092 EXPORT_SYMBOL(__copy_from_user_inatomic);
13029 13093
13030 EXPORT_SYMBOL(copy_page); 13094 EXPORT_SYMBOL(copy_page);
13031diff -urNp linux-2.6.32.7/arch/x86/kernel/xsave.c linux-2.6.32.7/arch/x86/kernel/xsave.c 13095diff -urNp linux-2.6.32.8/arch/x86/kernel/xsave.c linux-2.6.32.8/arch/x86/kernel/xsave.c
13032--- linux-2.6.32.7/arch/x86/kernel/xsave.c 2010-01-25 13:50:10.000000000 -0500 13096--- linux-2.6.32.8/arch/x86/kernel/xsave.c 2010-02-09 07:57:19.000000000 -0500
13033+++ linux-2.6.32.7/arch/x86/kernel/xsave.c 2010-01-25 17:39:40.320404823 -0500 13097+++ linux-2.6.32.8/arch/x86/kernel/xsave.c 2010-02-10 15:06:23.969991579 -0500
13034@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ 13098@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
13035 fx_sw_user->xstate_size > fx_sw_user->extended_size) 13099 fx_sw_user->xstate_size > fx_sw_user->extended_size)
13036 return -1; 13100 return -1;
@@ -13058,9 +13122,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kernel/xsave.c linux-2.6.32.7/arch/x86/kernel
13058 buf); 13122 buf);
13059 if (unlikely(err)) { 13123 if (unlikely(err)) {
13060 /* 13124 /*
13061diff -urNp linux-2.6.32.7/arch/x86/kvm/emulate.c linux-2.6.32.7/arch/x86/kvm/emulate.c 13125diff -urNp linux-2.6.32.8/arch/x86/kvm/emulate.c linux-2.6.32.8/arch/x86/kvm/emulate.c
13062--- linux-2.6.32.7/arch/x86/kvm/emulate.c 2010-01-25 13:50:10.000000000 -0500 13126--- linux-2.6.32.8/arch/x86/kvm/emulate.c 2010-02-09 07:57:19.000000000 -0500
13063+++ linux-2.6.32.7/arch/x86/kvm/emulate.c 2010-01-25 17:39:40.320404823 -0500 13127+++ linux-2.6.32.8/arch/x86/kvm/emulate.c 2010-02-10 15:06:23.969991579 -0500
13064@@ -389,6 +389,7 @@ static u32 group2_table[] = { 13128@@ -389,6 +389,7 @@ static u32 group2_table[] = {
13065 13129
13066 #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \ 13130 #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \
@@ -13086,9 +13150,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kvm/emulate.c linux-2.6.32.7/arch/x86/kvm/emu
13086 switch ((_dst).bytes) { \ 13150 switch ((_dst).bytes) { \
13087 case 1: \ 13151 case 1: \
13088 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ 13152 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
13089diff -urNp linux-2.6.32.7/arch/x86/kvm/svm.c linux-2.6.32.7/arch/x86/kvm/svm.c 13153diff -urNp linux-2.6.32.8/arch/x86/kvm/svm.c linux-2.6.32.8/arch/x86/kvm/svm.c
13090--- linux-2.6.32.7/arch/x86/kvm/svm.c 2010-01-25 13:50:10.000000000 -0500 13154--- linux-2.6.32.8/arch/x86/kvm/svm.c 2010-02-09 07:57:19.000000000 -0500
13091+++ linux-2.6.32.7/arch/x86/kvm/svm.c 2010-01-25 17:39:40.321202861 -0500 13155+++ linux-2.6.32.8/arch/x86/kvm/svm.c 2010-02-10 15:06:23.969991579 -0500
13092@@ -2389,9 +2389,12 @@ static int handle_exit(struct kvm_run *k 13156@@ -2389,9 +2389,12 @@ static int handle_exit(struct kvm_run *k
13093 static void reload_tss(struct kvm_vcpu *vcpu) 13157 static void reload_tss(struct kvm_vcpu *vcpu)
13094 { 13158 {
@@ -13112,9 +13176,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kvm/svm.c linux-2.6.32.7/arch/x86/kvm/svm.c
13112 .cpu_has_kvm_support = has_svm, 13176 .cpu_has_kvm_support = has_svm,
13113 .disabled_by_bios = is_disabled, 13177 .disabled_by_bios = is_disabled,
13114 .hardware_setup = svm_hardware_setup, 13178 .hardware_setup = svm_hardware_setup,
13115diff -urNp linux-2.6.32.7/arch/x86/kvm/vmx.c linux-2.6.32.7/arch/x86/kvm/vmx.c 13179diff -urNp linux-2.6.32.8/arch/x86/kvm/vmx.c linux-2.6.32.8/arch/x86/kvm/vmx.c
13116--- linux-2.6.32.7/arch/x86/kvm/vmx.c 2010-01-25 13:50:10.000000000 -0500 13180--- linux-2.6.32.8/arch/x86/kvm/vmx.c 2010-02-09 07:57:19.000000000 -0500
13117+++ linux-2.6.32.7/arch/x86/kvm/vmx.c 2010-01-25 17:39:40.321202861 -0500 13181+++ linux-2.6.32.8/arch/x86/kvm/vmx.c 2010-02-10 15:06:23.969991579 -0500
13118@@ -566,7 +566,11 @@ static void reload_tss(void) 13182@@ -566,7 +566,11 @@ static void reload_tss(void)
13119 13183
13120 kvm_get_gdt(&gdt); 13184 kvm_get_gdt(&gdt);
@@ -13193,9 +13257,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kvm/vmx.c linux-2.6.32.7/arch/x86/kvm/vmx.c
13193 .cpu_has_kvm_support = cpu_has_kvm_support, 13257 .cpu_has_kvm_support = cpu_has_kvm_support,
13194 .disabled_by_bios = vmx_disabled_by_bios, 13258 .disabled_by_bios = vmx_disabled_by_bios,
13195 .hardware_setup = hardware_setup, 13259 .hardware_setup = hardware_setup,
13196diff -urNp linux-2.6.32.7/arch/x86/kvm/x86.c linux-2.6.32.7/arch/x86/kvm/x86.c 13260diff -urNp linux-2.6.32.8/arch/x86/kvm/x86.c linux-2.6.32.8/arch/x86/kvm/x86.c
13197--- linux-2.6.32.7/arch/x86/kvm/x86.c 2010-01-25 20:04:14.662248250 -0500 13261--- linux-2.6.32.8/arch/x86/kvm/x86.c 2010-02-09 07:57:19.000000000 -0500
13198+++ linux-2.6.32.7/arch/x86/kvm/x86.c 2010-01-25 20:04:24.398096271 -0500 13262+++ linux-2.6.32.8/arch/x86/kvm/x86.c 2010-02-10 15:06:23.975494352 -0500
13199@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct 13263@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct
13200 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, 13264 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
13201 struct kvm_cpuid_entry2 __user *entries); 13265 struct kvm_cpuid_entry2 __user *entries);
@@ -13275,7 +13339,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kvm/x86.c linux-2.6.32.7/arch/x86/kvm/x86.c
13275 { NULL } 13339 { NULL }
13276 }; 13340 };
13277 13341
13278@@ -1657,7 +1657,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru 13342@@ -1659,7 +1659,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
13279 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, 13343 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
13280 struct kvm_interrupt *irq) 13344 struct kvm_interrupt *irq)
13281 { 13345 {
@@ -13284,7 +13348,7 @@ diff -urNp linux-2.6.32.7/arch/x86/kvm/x86.c linux-2.6.32.7/arch/x86/kvm/x86.c
13284 return -EINVAL; 13348 return -EINVAL;
13285 if (irqchip_in_kernel(vcpu->kvm)) 13349 if (irqchip_in_kernel(vcpu->kvm))
13286 return -ENXIO; 13350 return -ENXIO;
13287@@ -3131,10 +3131,10 @@ static struct notifier_block kvmclock_cp 13351@@ -3171,10 +3171,10 @@ static struct notifier_block kvmclock_cp
13288 .notifier_call = kvmclock_cpufreq_notifier 13352 .notifier_call = kvmclock_cpufreq_notifier
13289 }; 13353 };
13290 13354
@@ -13297,9 +13361,9 @@ diff -urNp linux-2.6.32.7/arch/x86/kvm/x86.c linux-2.6.32.7/arch/x86/kvm/x86.c
13297 13361
13298 if (kvm_x86_ops) { 13362 if (kvm_x86_ops) {
13299 printk(KERN_ERR "kvm: already loaded the other module\n"); 13363 printk(KERN_ERR "kvm: already loaded the other module\n");
13300diff -urNp linux-2.6.32.7/arch/x86/lib/checksum_32.S linux-2.6.32.7/arch/x86/lib/checksum_32.S 13364diff -urNp linux-2.6.32.8/arch/x86/lib/checksum_32.S linux-2.6.32.8/arch/x86/lib/checksum_32.S
13301--- linux-2.6.32.7/arch/x86/lib/checksum_32.S 2010-01-25 13:50:10.000000000 -0500 13365--- linux-2.6.32.8/arch/x86/lib/checksum_32.S 2010-02-09 07:57:19.000000000 -0500
13302+++ linux-2.6.32.7/arch/x86/lib/checksum_32.S 2010-01-25 17:39:40.323113786 -0500 13366+++ linux-2.6.32.8/arch/x86/lib/checksum_32.S 2010-02-10 15:06:23.975494352 -0500
13303@@ -28,7 +28,8 @@ 13367@@ -28,7 +28,8 @@
13304 #include <linux/linkage.h> 13368 #include <linux/linkage.h>
13305 #include <asm/dwarf2.h> 13369 #include <asm/dwarf2.h>
@@ -13545,9 +13609,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/checksum_32.S linux-2.6.32.7/arch/x86/lib
13545 13609
13546 #undef ROUND 13610 #undef ROUND
13547 #undef ROUND1 13611 #undef ROUND1
13548diff -urNp linux-2.6.32.7/arch/x86/lib/clear_page_64.S linux-2.6.32.7/arch/x86/lib/clear_page_64.S 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
13549--- linux-2.6.32.7/arch/x86/lib/clear_page_64.S 2010-01-25 13:50:10.000000000 -0500 13613--- linux-2.6.32.8/arch/x86/lib/clear_page_64.S 2010-02-09 07:57:19.000000000 -0500
13550+++ linux-2.6.32.7/arch/x86/lib/clear_page_64.S 2010-01-25 17:39:40.323113786 -0500 13614+++ linux-2.6.32.8/arch/x86/lib/clear_page_64.S 2010-02-10 15:06:23.975494352 -0500
13551@@ -43,7 +43,7 @@ ENDPROC(clear_page) 13615@@ -43,7 +43,7 @@ ENDPROC(clear_page)
13552 13616
13553 #include <asm/cpufeature.h> 13617 #include <asm/cpufeature.h>
@@ -13557,9 +13621,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/clear_page_64.S linux-2.6.32.7/arch/x86/l
13557 1: .byte 0xeb /* jmp <disp8> */ 13621 1: .byte 0xeb /* jmp <disp8> */
13558 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 13622 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
13559 2: 13623 2:
13560diff -urNp linux-2.6.32.7/arch/x86/lib/copy_page_64.S linux-2.6.32.7/arch/x86/lib/copy_page_64.S 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
13561--- linux-2.6.32.7/arch/x86/lib/copy_page_64.S 2010-01-25 13:50:10.000000000 -0500 13625--- linux-2.6.32.8/arch/x86/lib/copy_page_64.S 2010-02-09 07:57:19.000000000 -0500
13562+++ linux-2.6.32.7/arch/x86/lib/copy_page_64.S 2010-01-25 17:39:40.323113786 -0500 13626+++ linux-2.6.32.8/arch/x86/lib/copy_page_64.S 2010-02-10 15:06:23.975494352 -0500
13563@@ -104,7 +104,7 @@ ENDPROC(copy_page) 13627@@ -104,7 +104,7 @@ ENDPROC(copy_page)
13564 13628
13565 #include <asm/cpufeature.h> 13629 #include <asm/cpufeature.h>
@@ -13569,9 +13633,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/copy_page_64.S linux-2.6.32.7/arch/x86/li
13569 1: .byte 0xeb /* jmp <disp8> */ 13633 1: .byte 0xeb /* jmp <disp8> */
13570 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 13634 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
13571 2: 13635 2:
13572diff -urNp linux-2.6.32.7/arch/x86/lib/copy_user_64.S linux-2.6.32.7/arch/x86/lib/copy_user_64.S 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
13573--- linux-2.6.32.7/arch/x86/lib/copy_user_64.S 2010-01-25 13:50:10.000000000 -0500 13637--- linux-2.6.32.8/arch/x86/lib/copy_user_64.S 2010-02-09 07:57:19.000000000 -0500
13574+++ linux-2.6.32.7/arch/x86/lib/copy_user_64.S 2010-01-25 17:39:40.323113786 -0500 13638+++ linux-2.6.32.8/arch/x86/lib/copy_user_64.S 2010-02-10 15:06:23.975494352 -0500
13575@@ -21,7 +21,7 @@ 13639@@ -21,7 +21,7 @@
13576 .byte 0xe9 /* 32bit jump */ 13640 .byte 0xe9 /* 32bit jump */
13577 .long \orig-1f /* by default jump to orig */ 13641 .long \orig-1f /* by default jump to orig */
@@ -13623,9 +13687,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/copy_user_64.S linux-2.6.32.7/arch/x86/li
13623 movl %edx,%ecx 13687 movl %edx,%ecx
13624 xorl %eax,%eax 13688 xorl %eax,%eax
13625 rep 13689 rep
13626diff -urNp linux-2.6.32.7/arch/x86/lib/getuser.S linux-2.6.32.7/arch/x86/lib/getuser.S 13690diff -urNp linux-2.6.32.8/arch/x86/lib/getuser.S linux-2.6.32.8/arch/x86/lib/getuser.S
13627--- linux-2.6.32.7/arch/x86/lib/getuser.S 2010-01-25 13:50:10.000000000 -0500 13691--- linux-2.6.32.8/arch/x86/lib/getuser.S 2010-02-09 07:57:19.000000000 -0500
13628+++ linux-2.6.32.7/arch/x86/lib/getuser.S 2010-01-25 20:04:47.636320675 -0500 13692+++ linux-2.6.32.8/arch/x86/lib/getuser.S 2010-02-10 15:06:23.975494352 -0500
13629@@ -33,14 +33,28 @@ 13693@@ -33,14 +33,28 @@
13630 #include <asm/asm-offsets.h> 13694 #include <asm/asm-offsets.h>
13631 #include <asm/thread_info.h> 13695 #include <asm/thread_info.h>
@@ -13718,9 +13782,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/getuser.S linux-2.6.32.7/arch/x86/lib/get
13718 xor %edx,%edx 13782 xor %edx,%edx
13719 mov $(-EFAULT),%_ASM_AX 13783 mov $(-EFAULT),%_ASM_AX
13720 ret 13784 ret
13721diff -urNp linux-2.6.32.7/arch/x86/lib/memcpy_64.S linux-2.6.32.7/arch/x86/lib/memcpy_64.S 13785diff -urNp linux-2.6.32.8/arch/x86/lib/memcpy_64.S linux-2.6.32.8/arch/x86/lib/memcpy_64.S
13722--- linux-2.6.32.7/arch/x86/lib/memcpy_64.S 2010-01-25 13:50:10.000000000 -0500 13786--- linux-2.6.32.8/arch/x86/lib/memcpy_64.S 2010-02-09 07:57:19.000000000 -0500
13723+++ linux-2.6.32.7/arch/x86/lib/memcpy_64.S 2010-01-25 17:39:40.324402082 -0500 13787+++ linux-2.6.32.8/arch/x86/lib/memcpy_64.S 2010-02-10 15:06:23.975494352 -0500
13724@@ -128,7 +128,7 @@ ENDPROC(__memcpy) 13788@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
13725 * It is also a lot simpler. Use this when possible: 13789 * It is also a lot simpler. Use this when possible:
13726 */ 13790 */
@@ -13730,9 +13794,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/memcpy_64.S linux-2.6.32.7/arch/x86/lib/m
13730 1: .byte 0xeb /* jmp <disp8> */ 13794 1: .byte 0xeb /* jmp <disp8> */
13731 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 13795 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
13732 2: 13796 2:
13733diff -urNp linux-2.6.32.7/arch/x86/lib/memset_64.S linux-2.6.32.7/arch/x86/lib/memset_64.S 13797diff -urNp linux-2.6.32.8/arch/x86/lib/memset_64.S linux-2.6.32.8/arch/x86/lib/memset_64.S
13734--- linux-2.6.32.7/arch/x86/lib/memset_64.S 2010-01-25 13:50:10.000000000 -0500 13798--- linux-2.6.32.8/arch/x86/lib/memset_64.S 2010-02-09 07:57:19.000000000 -0500
13735+++ linux-2.6.32.7/arch/x86/lib/memset_64.S 2010-01-25 17:39:40.324402082 -0500 13799+++ linux-2.6.32.8/arch/x86/lib/memset_64.S 2010-02-10 15:06:23.975494352 -0500
13736@@ -118,7 +118,7 @@ ENDPROC(__memset) 13800@@ -118,7 +118,7 @@ ENDPROC(__memset)
13737 13801
13738 #include <asm/cpufeature.h> 13802 #include <asm/cpufeature.h>
@@ -13742,9 +13806,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/memset_64.S linux-2.6.32.7/arch/x86/lib/m
13742 1: .byte 0xeb /* jmp <disp8> */ 13806 1: .byte 0xeb /* jmp <disp8> */
13743 .byte (memset_c - memset) - (2f - 1b) /* offset */ 13807 .byte (memset_c - memset) - (2f - 1b) /* offset */
13744 2: 13808 2:
13745diff -urNp linux-2.6.32.7/arch/x86/lib/mmx_32.c linux-2.6.32.7/arch/x86/lib/mmx_32.c 13809diff -urNp linux-2.6.32.8/arch/x86/lib/mmx_32.c linux-2.6.32.8/arch/x86/lib/mmx_32.c
13746--- linux-2.6.32.7/arch/x86/lib/mmx_32.c 2010-01-25 13:50:10.000000000 -0500 13810--- linux-2.6.32.8/arch/x86/lib/mmx_32.c 2010-02-09 07:57:19.000000000 -0500
13747+++ linux-2.6.32.7/arch/x86/lib/mmx_32.c 2010-01-25 17:39:40.324402082 -0500 13811+++ linux-2.6.32.8/arch/x86/lib/mmx_32.c 2010-02-10 15:06:23.975494352 -0500
13748@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * 13812@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
13749 { 13813 {
13750 void *p; 13814 void *p;
@@ -14060,9 +14124,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/mmx_32.c linux-2.6.32.7/arch/x86/lib/mmx_
14060 14124
14061 from += 64; 14125 from += 64;
14062 to += 64; 14126 to += 64;
14063diff -urNp linux-2.6.32.7/arch/x86/lib/putuser.S linux-2.6.32.7/arch/x86/lib/putuser.S 14127diff -urNp linux-2.6.32.8/arch/x86/lib/putuser.S linux-2.6.32.8/arch/x86/lib/putuser.S
14064--- linux-2.6.32.7/arch/x86/lib/putuser.S 2010-01-25 13:50:10.000000000 -0500 14128--- linux-2.6.32.8/arch/x86/lib/putuser.S 2010-02-09 07:57:19.000000000 -0500
14065+++ linux-2.6.32.7/arch/x86/lib/putuser.S 2010-01-25 17:39:40.324402082 -0500 14129+++ linux-2.6.32.8/arch/x86/lib/putuser.S 2010-02-10 15:06:23.975494352 -0500
14066@@ -15,6 +15,7 @@ 14130@@ -15,6 +15,7 @@
14067 #include <asm/thread_info.h> 14131 #include <asm/thread_info.h>
14068 #include <asm/errno.h> 14132 #include <asm/errno.h>
@@ -14166,9 +14230,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/putuser.S linux-2.6.32.7/arch/x86/lib/put
14166 movl $-EFAULT,%eax 14230 movl $-EFAULT,%eax
14167 EXIT 14231 EXIT
14168 END(bad_put_user) 14232 END(bad_put_user)
14169diff -urNp linux-2.6.32.7/arch/x86/lib/usercopy_32.c linux-2.6.32.7/arch/x86/lib/usercopy_32.c 14233diff -urNp linux-2.6.32.8/arch/x86/lib/usercopy_32.c linux-2.6.32.8/arch/x86/lib/usercopy_32.c
14170--- linux-2.6.32.7/arch/x86/lib/usercopy_32.c 2010-01-25 13:50:10.000000000 -0500 14234--- linux-2.6.32.8/arch/x86/lib/usercopy_32.c 2010-02-09 07:57:19.000000000 -0500
14171+++ linux-2.6.32.7/arch/x86/lib/usercopy_32.c 2010-01-25 17:39:40.325506692 -0500 14235+++ linux-2.6.32.8/arch/x86/lib/usercopy_32.c 2010-02-10 15:06:23.975494352 -0500
14172@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned 14236@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
14173 * Copy a null terminated string from userspace. 14237 * Copy a null terminated string from userspace.
14174 */ 14238 */
@@ -15137,9 +15201,9 @@ diff -urNp linux-2.6.32.7/arch/x86/lib/usercopy_32.c linux-2.6.32.7/arch/x86/lib
15137+#endif 15201+#endif
15138+ 15202+
15139+EXPORT_SYMBOL(set_fs); 15203+EXPORT_SYMBOL(set_fs);
15140diff -urNp linux-2.6.32.7/arch/x86/Makefile linux-2.6.32.7/arch/x86/Makefile 15204diff -urNp linux-2.6.32.8/arch/x86/Makefile linux-2.6.32.8/arch/x86/Makefile
15141--- linux-2.6.32.7/arch/x86/Makefile 2010-01-25 13:50:10.000000000 -0500 15205--- linux-2.6.32.8/arch/x86/Makefile 2010-02-09 07:57:19.000000000 -0500
15142+++ linux-2.6.32.7/arch/x86/Makefile 2010-01-25 17:39:40.325506692 -0500 15206+++ linux-2.6.32.8/arch/x86/Makefile 2010-02-10 15:06:23.975494352 -0500
15143@@ -189,3 +189,12 @@ define archhelp 15207@@ -189,3 +189,12 @@ define archhelp
15144 echo ' FDARGS="..." arguments for the booted kernel' 15208 echo ' FDARGS="..." arguments for the booted kernel'
15145 echo ' FDINITRD=file initrd for the booted kernel' 15209 echo ' FDINITRD=file initrd for the booted kernel'
@@ -15153,9 +15217,9 @@ diff -urNp linux-2.6.32.7/arch/x86/Makefile linux-2.6.32.7/arch/x86/Makefile
15153+ 15217+
15154+archprepare: 15218+archprepare:
15155+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) 15219+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
15156diff -urNp linux-2.6.32.7/arch/x86/mm/extable.c linux-2.6.32.7/arch/x86/mm/extable.c 15220diff -urNp linux-2.6.32.8/arch/x86/mm/extable.c linux-2.6.32.8/arch/x86/mm/extable.c
15157--- linux-2.6.32.7/arch/x86/mm/extable.c 2010-01-25 13:50:10.000000000 -0500 15221--- linux-2.6.32.8/arch/x86/mm/extable.c 2010-02-09 07:57:19.000000000 -0500
15158+++ linux-2.6.32.7/arch/x86/mm/extable.c 2010-01-25 17:39:40.325506692 -0500 15222+++ linux-2.6.32.8/arch/x86/mm/extable.c 2010-02-10 15:06:23.975494352 -0500
15159@@ -1,14 +1,71 @@ 15223@@ -1,14 +1,71 @@
15160 #include <linux/module.h> 15224 #include <linux/module.h>
15161 #include <linux/spinlock.h> 15225 #include <linux/spinlock.h>
@@ -15229,9 +15293,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/extable.c linux-2.6.32.7/arch/x86/mm/extab
15229 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; 15293 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
15230 extern u32 pnp_bios_is_utter_crap; 15294 extern u32 pnp_bios_is_utter_crap;
15231 pnp_bios_is_utter_crap = 1; 15295 pnp_bios_is_utter_crap = 1;
15232diff -urNp linux-2.6.32.7/arch/x86/mm/fault.c linux-2.6.32.7/arch/x86/mm/fault.c 15296diff -urNp linux-2.6.32.8/arch/x86/mm/fault.c linux-2.6.32.8/arch/x86/mm/fault.c
15233--- linux-2.6.32.7/arch/x86/mm/fault.c 2010-01-25 13:50:10.000000000 -0500 15297--- linux-2.6.32.8/arch/x86/mm/fault.c 2010-02-09 07:57:19.000000000 -0500
15234+++ linux-2.6.32.7/arch/x86/mm/fault.c 2010-01-25 17:39:40.326401486 -0500 15298+++ linux-2.6.32.8/arch/x86/mm/fault.c 2010-02-10 15:06:29.734312153 -0500
15235@@ -11,10 +11,14 @@ 15299@@ -11,10 +11,14 @@
15236 #include <linux/kprobes.h> /* __kprobes, ... */ 15300 #include <linux/kprobes.h> /* __kprobes, ... */
15237 #include <linux/mmiotrace.h> /* kmmio_handler, ... */ 15301 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
@@ -15759,7 +15823,7 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/fault.c linux-2.6.32.7/arch/x86/mm/fault.c
15759+ printk("\n"); 15823+ printk("\n");
15760+ 15824+
15761+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long)); 15825+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
15762+ for (i = -1; i < 80 / sizeof(long); i++) { 15826+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
15763+ unsigned long c; 15827+ unsigned long c;
15764+ if (get_user(c, (__force unsigned long __user *)sp+i)) 15828+ if (get_user(c, (__force unsigned long __user *)sp+i))
15765+#ifdef CONFIG_X86_32 15829+#ifdef CONFIG_X86_32
@@ -15798,9 +15862,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/fault.c linux-2.6.32.7/arch/x86/mm/fault.c
15798+ 15862+
15799+ return ret ? -EFAULT : 0; 15863+ return ret ? -EFAULT : 0;
15800+} 15864+}
15801diff -urNp linux-2.6.32.7/arch/x86/mm/gup.c linux-2.6.32.7/arch/x86/mm/gup.c 15865diff -urNp linux-2.6.32.8/arch/x86/mm/gup.c linux-2.6.32.8/arch/x86/mm/gup.c
15802--- linux-2.6.32.7/arch/x86/mm/gup.c 2010-01-25 13:50:10.000000000 -0500 15866--- linux-2.6.32.8/arch/x86/mm/gup.c 2010-02-09 07:57:19.000000000 -0500
15803+++ linux-2.6.32.7/arch/x86/mm/gup.c 2010-01-25 17:39:40.326401486 -0500 15867+++ linux-2.6.32.8/arch/x86/mm/gup.c 2010-02-10 15:06:23.975494352 -0500
15804@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long 15868@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
15805 addr = start; 15869 addr = start;
15806 len = (unsigned long) nr_pages << PAGE_SHIFT; 15870 len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -15810,9 +15874,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/gup.c linux-2.6.32.7/arch/x86/mm/gup.c
15810 (void __user *)start, len))) 15874 (void __user *)start, len)))
15811 return 0; 15875 return 0;
15812 15876
15813diff -urNp linux-2.6.32.7/arch/x86/mm/highmem_32.c linux-2.6.32.7/arch/x86/mm/highmem_32.c 15877diff -urNp linux-2.6.32.8/arch/x86/mm/highmem_32.c linux-2.6.32.8/arch/x86/mm/highmem_32.c
15814--- linux-2.6.32.7/arch/x86/mm/highmem_32.c 2010-01-25 13:50:10.000000000 -0500 15878--- linux-2.6.32.8/arch/x86/mm/highmem_32.c 2010-02-09 07:57:19.000000000 -0500
15815+++ linux-2.6.32.7/arch/x86/mm/highmem_32.c 2010-01-25 17:39:40.326401486 -0500 15879+++ linux-2.6.32.8/arch/x86/mm/highmem_32.c 2010-02-10 15:06:23.975494352 -0500
15816@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page 15880@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
15817 idx = type + KM_TYPE_NR*smp_processor_id(); 15881 idx = type + KM_TYPE_NR*smp_processor_id();
15818 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); 15882 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -15824,9 +15888,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/highmem_32.c linux-2.6.32.7/arch/x86/mm/hi
15824 15888
15825 return (void *)vaddr; 15889 return (void *)vaddr;
15826 } 15890 }
15827diff -urNp linux-2.6.32.7/arch/x86/mm/hugetlbpage.c linux-2.6.32.7/arch/x86/mm/hugetlbpage.c 15891diff -urNp linux-2.6.32.8/arch/x86/mm/hugetlbpage.c linux-2.6.32.8/arch/x86/mm/hugetlbpage.c
15828--- linux-2.6.32.7/arch/x86/mm/hugetlbpage.c 2010-01-25 13:50:10.000000000 -0500 15892--- linux-2.6.32.8/arch/x86/mm/hugetlbpage.c 2010-02-09 07:57:19.000000000 -0500
15829+++ linux-2.6.32.7/arch/x86/mm/hugetlbpage.c 2010-01-25 17:39:40.326401486 -0500 15893+++ linux-2.6.32.8/arch/x86/mm/hugetlbpage.c 2010-02-10 15:06:23.979506991 -0500
15830@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe 15894@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe
15831 struct hstate *h = hstate_file(file); 15895 struct hstate *h = hstate_file(file);
15832 struct mm_struct *mm = current->mm; 15896 struct mm_struct *mm = current->mm;
@@ -15961,9 +16025,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/hugetlbpage.c linux-2.6.32.7/arch/x86/mm/h
15961 (!vma || addr + len <= vma->vm_start)) 16025 (!vma || addr + len <= vma->vm_start))
15962 return addr; 16026 return addr;
15963 } 16027 }
15964diff -urNp linux-2.6.32.7/arch/x86/mm/init_32.c linux-2.6.32.7/arch/x86/mm/init_32.c 16028diff -urNp linux-2.6.32.8/arch/x86/mm/init_32.c linux-2.6.32.8/arch/x86/mm/init_32.c
15965--- linux-2.6.32.7/arch/x86/mm/init_32.c 2010-01-25 13:50:10.000000000 -0500 16029--- linux-2.6.32.8/arch/x86/mm/init_32.c 2010-02-09 07:57:19.000000000 -0500
15966+++ linux-2.6.32.7/arch/x86/mm/init_32.c 2010-01-25 17:39:40.327488230 -0500 16030+++ linux-2.6.32.8/arch/x86/mm/init_32.c 2010-02-10 15:06:23.979506991 -0500
15967@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) 16031@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
15968 } 16032 }
15969 16033
@@ -16245,9 +16309,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/init_32.c linux-2.6.32.7/arch/x86/mm/init_
16245 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); 16309 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
16246 printk(KERN_INFO "Write protecting the kernel text: %luk\n", 16310 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
16247 size >> 10); 16311 size >> 10);
16248diff -urNp linux-2.6.32.7/arch/x86/mm/init_64.c linux-2.6.32.7/arch/x86/mm/init_64.c 16312diff -urNp linux-2.6.32.8/arch/x86/mm/init_64.c linux-2.6.32.8/arch/x86/mm/init_64.c
16249--- linux-2.6.32.7/arch/x86/mm/init_64.c 2010-01-25 13:50:10.000000000 -0500 16313--- linux-2.6.32.8/arch/x86/mm/init_64.c 2010-02-09 07:57:19.000000000 -0500
16250+++ linux-2.6.32.7/arch/x86/mm/init_64.c 2010-01-25 17:39:40.327488230 -0500 16314+++ linux-2.6.32.8/arch/x86/mm/init_64.c 2010-02-10 15:06:23.979506991 -0500
16251@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 16315@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
16252 pmd = fill_pmd(pud, vaddr); 16316 pmd = fill_pmd(pud, vaddr);
16253 pte = fill_pte(pmd, vaddr); 16317 pte = fill_pte(pmd, vaddr);
@@ -16295,9 +16359,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/init_64.c linux-2.6.32.7/arch/x86/mm/init_
16295 return "[vdso]"; 16359 return "[vdso]";
16296 if (vma == &gate_vma) 16360 if (vma == &gate_vma)
16297 return "[vsyscall]"; 16361 return "[vsyscall]";
16298diff -urNp linux-2.6.32.7/arch/x86/mm/init.c linux-2.6.32.7/arch/x86/mm/init.c 16362diff -urNp linux-2.6.32.8/arch/x86/mm/init.c linux-2.6.32.8/arch/x86/mm/init.c
16299--- linux-2.6.32.7/arch/x86/mm/init.c 2010-01-25 13:50:10.000000000 -0500 16363--- linux-2.6.32.8/arch/x86/mm/init.c 2010-02-09 07:57:19.000000000 -0500
16300+++ linux-2.6.32.7/arch/x86/mm/init.c 2010-01-25 17:39:40.327488230 -0500 16364+++ linux-2.6.32.8/arch/x86/mm/init.c 2010-02-10 15:06:23.979506991 -0500
16301@@ -331,7 +331,13 @@ unsigned long __init_refok init_memory_m 16365@@ -331,7 +331,13 @@ unsigned long __init_refok init_memory_m
16302 */ 16366 */
16303 int devmem_is_allowed(unsigned long pagenr) 16367 int devmem_is_allowed(unsigned long pagenr)
@@ -16397,9 +16461,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/init.c linux-2.6.32.7/arch/x86/mm/init.c
16397 free_init_pages("unused kernel memory", 16461 free_init_pages("unused kernel memory",
16398 (unsigned long)(&__init_begin), 16462 (unsigned long)(&__init_begin),
16399 (unsigned long)(&__init_end)); 16463 (unsigned long)(&__init_end));
16400diff -urNp linux-2.6.32.7/arch/x86/mm/iomap_32.c linux-2.6.32.7/arch/x86/mm/iomap_32.c 16464diff -urNp linux-2.6.32.8/arch/x86/mm/iomap_32.c linux-2.6.32.8/arch/x86/mm/iomap_32.c
16401--- linux-2.6.32.7/arch/x86/mm/iomap_32.c 2010-01-25 13:50:10.000000000 -0500 16465--- linux-2.6.32.8/arch/x86/mm/iomap_32.c 2010-02-09 07:57:19.000000000 -0500
16402+++ linux-2.6.32.7/arch/x86/mm/iomap_32.c 2010-01-25 17:39:40.327488230 -0500 16466+++ linux-2.6.32.8/arch/x86/mm/iomap_32.c 2010-02-10 15:06:23.979506991 -0500
16403@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long 16467@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
16404 debug_kmap_atomic(type); 16468 debug_kmap_atomic(type);
16405 idx = type + KM_TYPE_NR * smp_processor_id(); 16469 idx = type + KM_TYPE_NR * smp_processor_id();
@@ -16412,9 +16476,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/iomap_32.c linux-2.6.32.7/arch/x86/mm/ioma
16412 arch_flush_lazy_mmu_mode(); 16476 arch_flush_lazy_mmu_mode();
16413 16477
16414 return (void *)vaddr; 16478 return (void *)vaddr;
16415diff -urNp linux-2.6.32.7/arch/x86/mm/ioremap.c linux-2.6.32.7/arch/x86/mm/ioremap.c 16479diff -urNp linux-2.6.32.8/arch/x86/mm/ioremap.c linux-2.6.32.8/arch/x86/mm/ioremap.c
16416--- linux-2.6.32.7/arch/x86/mm/ioremap.c 2010-01-25 13:50:10.000000000 -0500 16480--- linux-2.6.32.8/arch/x86/mm/ioremap.c 2010-02-09 07:57:19.000000000 -0500
16417+++ linux-2.6.32.7/arch/x86/mm/ioremap.c 2010-01-25 17:39:55.421135702 -0500 16481+++ linux-2.6.32.8/arch/x86/mm/ioremap.c 2010-02-10 15:06:23.979506991 -0500
16418@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) 16482@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
16419 * Second special case: Some BIOSen report the PC BIOS 16483 * Second special case: Some BIOSen report the PC BIOS
16420 * area (640->1Mb) as ram even though it is not. 16484 * area (640->1Mb) as ram even though it is not.
@@ -16457,9 +16521,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/ioremap.c linux-2.6.32.7/arch/x86/mm/iorem
16457 16521
16458 /* 16522 /*
16459 * The boot-ioremap range spans multiple pmds, for which 16523 * The boot-ioremap range spans multiple pmds, for which
16460diff -urNp linux-2.6.32.7/arch/x86/mm/mmap.c linux-2.6.32.7/arch/x86/mm/mmap.c 16524diff -urNp linux-2.6.32.8/arch/x86/mm/mmap.c linux-2.6.32.8/arch/x86/mm/mmap.c
16461--- linux-2.6.32.7/arch/x86/mm/mmap.c 2010-01-25 13:50:10.000000000 -0500 16525--- linux-2.6.32.8/arch/x86/mm/mmap.c 2010-02-09 07:57:19.000000000 -0500
16462+++ linux-2.6.32.7/arch/x86/mm/mmap.c 2010-01-25 17:39:40.328401736 -0500 16526+++ linux-2.6.32.8/arch/x86/mm/mmap.c 2010-02-10 15:06:23.979506991 -0500
16463@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size 16527@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
16464 * Leave an at least ~128 MB hole with possible stack randomization. 16528 * Leave an at least ~128 MB hole with possible stack randomization.
16465 */ 16529 */
@@ -16541,9 +16605,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/mmap.c linux-2.6.32.7/arch/x86/mm/mmap.c
16541 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 16605 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
16542 mm->unmap_area = arch_unmap_area_topdown; 16606 mm->unmap_area = arch_unmap_area_topdown;
16543 } 16607 }
16544diff -urNp linux-2.6.32.7/arch/x86/mm/numa_32.c linux-2.6.32.7/arch/x86/mm/numa_32.c 16608diff -urNp linux-2.6.32.8/arch/x86/mm/numa_32.c linux-2.6.32.8/arch/x86/mm/numa_32.c
16545--- linux-2.6.32.7/arch/x86/mm/numa_32.c 2010-01-25 13:50:10.000000000 -0500 16609--- linux-2.6.32.8/arch/x86/mm/numa_32.c 2010-02-09 07:57:19.000000000 -0500
16546+++ linux-2.6.32.7/arch/x86/mm/numa_32.c 2010-01-25 17:39:40.328401736 -0500 16610+++ linux-2.6.32.8/arch/x86/mm/numa_32.c 2010-02-10 15:06:23.979506991 -0500
16547@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int 16611@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
16548 } 16612 }
16549 #endif 16613 #endif
@@ -16552,9 +16616,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/numa_32.c linux-2.6.32.7/arch/x86/mm/numa_
16552 extern unsigned long highend_pfn, highstart_pfn; 16616 extern unsigned long highend_pfn, highstart_pfn;
16553 16617
16554 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) 16618 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
16555diff -urNp linux-2.6.32.7/arch/x86/mm/pageattr.c linux-2.6.32.7/arch/x86/mm/pageattr.c 16619diff -urNp linux-2.6.32.8/arch/x86/mm/pageattr.c linux-2.6.32.8/arch/x86/mm/pageattr.c
16556--- linux-2.6.32.7/arch/x86/mm/pageattr.c 2010-01-25 13:50:10.000000000 -0500 16620--- linux-2.6.32.8/arch/x86/mm/pageattr.c 2010-02-09 07:57:19.000000000 -0500
16557+++ linux-2.6.32.7/arch/x86/mm/pageattr.c 2010-01-25 17:39:40.328401736 -0500 16621+++ linux-2.6.32.8/arch/x86/mm/pageattr.c 2010-02-10 15:06:23.979506991 -0500
16558@@ -268,9 +268,10 @@ static inline pgprot_t static_protection 16622@@ -268,9 +268,10 @@ static inline pgprot_t static_protection
16559 * Does not cover __inittext since that is gone later on. On 16623 * Does not cover __inittext since that is gone later on. On
16560 * 64bit we do not enforce !NX on the low mapping 16624 * 64bit we do not enforce !NX on the low mapping
@@ -16586,9 +16650,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/pageattr.c linux-2.6.32.7/arch/x86/mm/page
16586 #ifdef CONFIG_X86_32 16650 #ifdef CONFIG_X86_32
16587 if (!SHARED_KERNEL_PMD) { 16651 if (!SHARED_KERNEL_PMD) {
16588 struct page *page; 16652 struct page *page;
16589diff -urNp linux-2.6.32.7/arch/x86/mm/pageattr-test.c linux-2.6.32.7/arch/x86/mm/pageattr-test.c 16653diff -urNp linux-2.6.32.8/arch/x86/mm/pageattr-test.c linux-2.6.32.8/arch/x86/mm/pageattr-test.c
16590--- linux-2.6.32.7/arch/x86/mm/pageattr-test.c 2010-01-25 13:50:10.000000000 -0500 16654--- linux-2.6.32.8/arch/x86/mm/pageattr-test.c 2010-02-09 07:57:19.000000000 -0500
16591+++ linux-2.6.32.7/arch/x86/mm/pageattr-test.c 2010-01-25 17:39:40.328401736 -0500 16655+++ linux-2.6.32.8/arch/x86/mm/pageattr-test.c 2010-02-10 15:06:23.979506991 -0500
16592@@ -36,7 +36,7 @@ enum { 16656@@ -36,7 +36,7 @@ enum {
16593 16657
16594 static int pte_testbit(pte_t pte) 16658 static int pte_testbit(pte_t pte)
@@ -16598,9 +16662,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/pageattr-test.c linux-2.6.32.7/arch/x86/mm
16598 } 16662 }
16599 16663
16600 struct split_state { 16664 struct split_state {
16601diff -urNp linux-2.6.32.7/arch/x86/mm/pat.c linux-2.6.32.7/arch/x86/mm/pat.c 16665diff -urNp linux-2.6.32.8/arch/x86/mm/pat.c linux-2.6.32.8/arch/x86/mm/pat.c
16602--- linux-2.6.32.7/arch/x86/mm/pat.c 2010-01-25 13:50:10.000000000 -0500 16666--- linux-2.6.32.8/arch/x86/mm/pat.c 2010-02-09 07:57:19.000000000 -0500
16603+++ linux-2.6.32.7/arch/x86/mm/pat.c 2010-01-25 17:39:40.329405548 -0500 16667+++ linux-2.6.32.8/arch/x86/mm/pat.c 2010-02-10 15:06:23.979506991 -0500
16604@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct 16668@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
16605 16669
16606 conflict: 16670 conflict:
@@ -16637,9 +16701,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/pat.c linux-2.6.32.7/arch/x86/mm/pat.c
16637 cattr_name(want_flags), 16701 cattr_name(want_flags),
16638 (unsigned long long)paddr, 16702 (unsigned long long)paddr,
16639 (unsigned long long)(paddr + size), 16703 (unsigned long long)(paddr + size),
16640diff -urNp linux-2.6.32.7/arch/x86/mm/pgtable_32.c linux-2.6.32.7/arch/x86/mm/pgtable_32.c 16704diff -urNp linux-2.6.32.8/arch/x86/mm/pgtable_32.c linux-2.6.32.8/arch/x86/mm/pgtable_32.c
16641--- linux-2.6.32.7/arch/x86/mm/pgtable_32.c 2010-01-25 13:50:10.000000000 -0500 16705--- linux-2.6.32.8/arch/x86/mm/pgtable_32.c 2010-02-09 07:57:19.000000000 -0500
16642+++ linux-2.6.32.7/arch/x86/mm/pgtable_32.c 2010-01-25 17:39:40.329405548 -0500 16706+++ linux-2.6.32.8/arch/x86/mm/pgtable_32.c 2010-02-10 15:06:23.979506991 -0500
16643@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 16707@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
16644 return; 16708 return;
16645 } 16709 }
@@ -16654,9 +16718,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/pgtable_32.c linux-2.6.32.7/arch/x86/mm/pg
16654 16718
16655 /* 16719 /*
16656 * It's enough to flush this one mapping. 16720 * It's enough to flush this one mapping.
16657diff -urNp linux-2.6.32.7/arch/x86/mm/setup_nx.c linux-2.6.32.7/arch/x86/mm/setup_nx.c 16721diff -urNp linux-2.6.32.8/arch/x86/mm/setup_nx.c linux-2.6.32.8/arch/x86/mm/setup_nx.c
16658--- linux-2.6.32.7/arch/x86/mm/setup_nx.c 2010-01-25 13:50:10.000000000 -0500 16722--- linux-2.6.32.8/arch/x86/mm/setup_nx.c 2010-02-09 07:57:19.000000000 -0500
16659+++ linux-2.6.32.7/arch/x86/mm/setup_nx.c 2010-01-25 17:39:40.329405548 -0500 16723+++ linux-2.6.32.8/arch/x86/mm/setup_nx.c 2010-02-10 15:06:23.979506991 -0500
16660@@ -4,11 +4,10 @@ 16724@@ -4,11 +4,10 @@
16661 16725
16662 #include <asm/pgtable.h> 16726 #include <asm/pgtable.h>
@@ -16722,9 +16786,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/setup_nx.c linux-2.6.32.7/arch/x86/mm/setu
16722 __supported_pte_mask &= ~_PAGE_NX; 16786 __supported_pte_mask &= ~_PAGE_NX;
16723 } 16787 }
16724 #endif 16788 #endif
16725diff -urNp linux-2.6.32.7/arch/x86/mm/tlb.c linux-2.6.32.7/arch/x86/mm/tlb.c 16789diff -urNp linux-2.6.32.8/arch/x86/mm/tlb.c linux-2.6.32.8/arch/x86/mm/tlb.c
16726--- linux-2.6.32.7/arch/x86/mm/tlb.c 2010-01-25 13:50:10.000000000 -0500 16790--- linux-2.6.32.8/arch/x86/mm/tlb.c 2010-02-09 07:57:19.000000000 -0500
16727+++ linux-2.6.32.7/arch/x86/mm/tlb.c 2010-01-25 17:39:40.329405548 -0500 16791+++ linux-2.6.32.8/arch/x86/mm/tlb.c 2010-02-10 15:06:23.979506991 -0500
16728@@ -12,7 +12,7 @@ 16792@@ -12,7 +12,7 @@
16729 #include <asm/uv/uv.h> 16793 #include <asm/uv/uv.h>
16730 16794
@@ -16734,9 +16798,9 @@ diff -urNp linux-2.6.32.7/arch/x86/mm/tlb.c linux-2.6.32.7/arch/x86/mm/tlb.c
16734 16798
16735 /* 16799 /*
16736 * Smarter SMP flushing macros. 16800 * Smarter SMP flushing macros.
16737diff -urNp linux-2.6.32.7/arch/x86/oprofile/backtrace.c linux-2.6.32.7/arch/x86/oprofile/backtrace.c 16801diff -urNp linux-2.6.32.8/arch/x86/oprofile/backtrace.c linux-2.6.32.8/arch/x86/oprofile/backtrace.c
16738--- linux-2.6.32.7/arch/x86/oprofile/backtrace.c 2010-01-25 13:50:10.000000000 -0500 16802--- linux-2.6.32.8/arch/x86/oprofile/backtrace.c 2010-02-09 07:57:19.000000000 -0500
16739+++ linux-2.6.32.7/arch/x86/oprofile/backtrace.c 2010-01-25 17:39:40.330164343 -0500 16803+++ linux-2.6.32.8/arch/x86/oprofile/backtrace.c 2010-02-10 15:06:23.979506991 -0500
16740@@ -37,7 +37,7 @@ static void backtrace_address(void *data 16804@@ -37,7 +37,7 @@ static void backtrace_address(void *data
16741 unsigned int *depth = data; 16805 unsigned int *depth = data;
16742 16806
@@ -16764,9 +16828,9 @@ diff -urNp linux-2.6.32.7/arch/x86/oprofile/backtrace.c linux-2.6.32.7/arch/x86/
16764 unsigned long stack = kernel_stack_pointer(regs); 16828 unsigned long stack = kernel_stack_pointer(regs);
16765 if (depth) 16829 if (depth)
16766 dump_trace(NULL, regs, (unsigned long *)stack, 0, 16830 dump_trace(NULL, regs, (unsigned long *)stack, 0,
16767diff -urNp linux-2.6.32.7/arch/x86/oprofile/op_model_p4.c linux-2.6.32.7/arch/x86/oprofile/op_model_p4.c 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
16768--- linux-2.6.32.7/arch/x86/oprofile/op_model_p4.c 2010-01-25 13:50:10.000000000 -0500 16832--- linux-2.6.32.8/arch/x86/oprofile/op_model_p4.c 2010-02-09 07:57:19.000000000 -0500
16769+++ linux-2.6.32.7/arch/x86/oprofile/op_model_p4.c 2010-01-25 17:39:40.330164343 -0500 16833+++ linux-2.6.32.8/arch/x86/oprofile/op_model_p4.c 2010-02-10 15:06:23.979506991 -0500
16770@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo 16834@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
16771 #endif 16835 #endif
16772 } 16836 }
@@ -16776,9 +16840,9 @@ diff -urNp linux-2.6.32.7/arch/x86/oprofile/op_model_p4.c linux-2.6.32.7/arch/x8
16776 { 16840 {
16777 #ifdef CONFIG_SMP 16841 #ifdef CONFIG_SMP
16778 return smp_num_siblings == 2 ? 2 : 1; 16842 return smp_num_siblings == 2 ? 2 : 1;
16779diff -urNp linux-2.6.32.7/arch/x86/pci/common.c linux-2.6.32.7/arch/x86/pci/common.c 16843diff -urNp linux-2.6.32.8/arch/x86/pci/common.c linux-2.6.32.8/arch/x86/pci/common.c
16780--- linux-2.6.32.7/arch/x86/pci/common.c 2010-01-25 13:50:10.000000000 -0500 16844--- linux-2.6.32.8/arch/x86/pci/common.c 2010-02-09 07:57:19.000000000 -0500
16781+++ linux-2.6.32.7/arch/x86/pci/common.c 2010-01-25 17:39:40.330164343 -0500 16845+++ linux-2.6.32.8/arch/x86/pci/common.c 2010-02-10 15:06:23.979506991 -0500
16782@@ -31,8 +31,8 @@ int noioapicreroute = 1; 16846@@ -31,8 +31,8 @@ int noioapicreroute = 1;
16783 int pcibios_last_bus = -1; 16847 int pcibios_last_bus = -1;
16784 unsigned long pirq_table_addr; 16848 unsigned long pirq_table_addr;
@@ -16799,9 +16863,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/common.c linux-2.6.32.7/arch/x86/pci/comm
16799 }; 16863 };
16800 16864
16801 void __init dmi_check_pciprobe(void) 16865 void __init dmi_check_pciprobe(void)
16802diff -urNp linux-2.6.32.7/arch/x86/pci/direct.c linux-2.6.32.7/arch/x86/pci/direct.c 16866diff -urNp linux-2.6.32.8/arch/x86/pci/direct.c linux-2.6.32.8/arch/x86/pci/direct.c
16803--- linux-2.6.32.7/arch/x86/pci/direct.c 2010-01-25 13:50:10.000000000 -0500 16867--- linux-2.6.32.8/arch/x86/pci/direct.c 2010-02-09 07:57:19.000000000 -0500
16804+++ linux-2.6.32.7/arch/x86/pci/direct.c 2010-01-25 17:39:40.330164343 -0500 16868+++ linux-2.6.32.8/arch/x86/pci/direct.c 2010-02-10 15:06:23.979506991 -0500
16805@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 16869@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
16806 16870
16807 #undef PCI_CONF1_ADDRESS 16871 #undef PCI_CONF1_ADDRESS
@@ -16829,9 +16893,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/direct.c linux-2.6.32.7/arch/x86/pci/dire
16829 { 16893 {
16830 u32 x = 0; 16894 u32 x = 0;
16831 int year, devfn; 16895 int year, devfn;
16832diff -urNp linux-2.6.32.7/arch/x86/pci/fixup.c linux-2.6.32.7/arch/x86/pci/fixup.c 16896diff -urNp linux-2.6.32.8/arch/x86/pci/fixup.c linux-2.6.32.8/arch/x86/pci/fixup.c
16833--- linux-2.6.32.7/arch/x86/pci/fixup.c 2010-01-25 13:50:10.000000000 -0500 16897--- linux-2.6.32.8/arch/x86/pci/fixup.c 2010-02-09 07:57:19.000000000 -0500
16834+++ linux-2.6.32.7/arch/x86/pci/fixup.c 2010-01-25 17:39:40.330164343 -0500 16898+++ linux-2.6.32.8/arch/x86/pci/fixup.c 2010-02-10 15:06:23.979506991 -0500
16835@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi 16899@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
16836 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), 16900 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
16837 }, 16901 },
@@ -16850,9 +16914,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/fixup.c linux-2.6.32.7/arch/x86/pci/fixup
16850 }; 16914 };
16851 16915
16852 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) 16916 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
16853diff -urNp linux-2.6.32.7/arch/x86/pci/irq.c linux-2.6.32.7/arch/x86/pci/irq.c 16917diff -urNp linux-2.6.32.8/arch/x86/pci/irq.c linux-2.6.32.8/arch/x86/pci/irq.c
16854--- linux-2.6.32.7/arch/x86/pci/irq.c 2010-01-25 13:50:10.000000000 -0500 16918--- linux-2.6.32.8/arch/x86/pci/irq.c 2010-02-09 07:57:19.000000000 -0500
16855+++ linux-2.6.32.7/arch/x86/pci/irq.c 2010-01-25 17:39:40.331177529 -0500 16919+++ linux-2.6.32.8/arch/x86/pci/irq.c 2010-02-10 15:06:23.979506991 -0500
16856@@ -543,7 +543,7 @@ static __init int intel_router_probe(str 16920@@ -543,7 +543,7 @@ static __init int intel_router_probe(str
16857 static struct pci_device_id __initdata pirq_440gx[] = { 16921 static struct pci_device_id __initdata pirq_440gx[] = {
16858 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, 16922 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
@@ -16871,9 +16935,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/irq.c linux-2.6.32.7/arch/x86/pci/irq.c
16871 }; 16935 };
16872 16936
16873 int __init pcibios_irq_init(void) 16937 int __init pcibios_irq_init(void)
16874diff -urNp linux-2.6.32.7/arch/x86/pci/mmconfig_32.c linux-2.6.32.7/arch/x86/pci/mmconfig_32.c 16938diff -urNp linux-2.6.32.8/arch/x86/pci/mmconfig_32.c linux-2.6.32.8/arch/x86/pci/mmconfig_32.c
16875--- linux-2.6.32.7/arch/x86/pci/mmconfig_32.c 2010-01-25 13:50:10.000000000 -0500 16939--- linux-2.6.32.8/arch/x86/pci/mmconfig_32.c 2010-02-09 07:57:19.000000000 -0500
16876+++ linux-2.6.32.7/arch/x86/pci/mmconfig_32.c 2010-01-25 17:39:40.331177529 -0500 16940+++ linux-2.6.32.8/arch/x86/pci/mmconfig_32.c 2010-02-10 15:06:23.979506991 -0500
16877@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int 16941@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
16878 return 0; 16942 return 0;
16879 } 16943 }
@@ -16883,9 +16947,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/mmconfig_32.c linux-2.6.32.7/arch/x86/pci
16883 .read = pci_mmcfg_read, 16947 .read = pci_mmcfg_read,
16884 .write = pci_mmcfg_write, 16948 .write = pci_mmcfg_write,
16885 }; 16949 };
16886diff -urNp linux-2.6.32.7/arch/x86/pci/mmconfig_64.c linux-2.6.32.7/arch/x86/pci/mmconfig_64.c 16950diff -urNp linux-2.6.32.8/arch/x86/pci/mmconfig_64.c linux-2.6.32.8/arch/x86/pci/mmconfig_64.c
16887--- linux-2.6.32.7/arch/x86/pci/mmconfig_64.c 2010-01-25 13:50:10.000000000 -0500 16951--- linux-2.6.32.8/arch/x86/pci/mmconfig_64.c 2010-02-09 07:57:19.000000000 -0500
16888+++ linux-2.6.32.7/arch/x86/pci/mmconfig_64.c 2010-01-25 17:39:40.331177529 -0500 16952+++ linux-2.6.32.8/arch/x86/pci/mmconfig_64.c 2010-02-10 15:06:23.983496257 -0500
16889@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int 16953@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
16890 return 0; 16954 return 0;
16891 } 16955 }
@@ -16895,9 +16959,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/mmconfig_64.c linux-2.6.32.7/arch/x86/pci
16895 .read = pci_mmcfg_read, 16959 .read = pci_mmcfg_read,
16896 .write = pci_mmcfg_write, 16960 .write = pci_mmcfg_write,
16897 }; 16961 };
16898diff -urNp linux-2.6.32.7/arch/x86/pci/numaq_32.c linux-2.6.32.7/arch/x86/pci/numaq_32.c 16962diff -urNp linux-2.6.32.8/arch/x86/pci/numaq_32.c linux-2.6.32.8/arch/x86/pci/numaq_32.c
16899--- linux-2.6.32.7/arch/x86/pci/numaq_32.c 2010-01-25 13:50:10.000000000 -0500 16963--- linux-2.6.32.8/arch/x86/pci/numaq_32.c 2010-02-09 07:57:19.000000000 -0500
16900+++ linux-2.6.32.7/arch/x86/pci/numaq_32.c 2010-01-25 17:39:40.331177529 -0500 16964+++ linux-2.6.32.8/arch/x86/pci/numaq_32.c 2010-02-10 15:06:23.983496257 -0500
16901@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i 16965@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
16902 16966
16903 #undef PCI_CONF1_MQ_ADDRESS 16967 #undef PCI_CONF1_MQ_ADDRESS
@@ -16907,9 +16971,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/numaq_32.c linux-2.6.32.7/arch/x86/pci/nu
16907 .read = pci_conf1_mq_read, 16971 .read = pci_conf1_mq_read,
16908 .write = pci_conf1_mq_write 16972 .write = pci_conf1_mq_write
16909 }; 16973 };
16910diff -urNp linux-2.6.32.7/arch/x86/pci/olpc.c linux-2.6.32.7/arch/x86/pci/olpc.c 16974diff -urNp linux-2.6.32.8/arch/x86/pci/olpc.c linux-2.6.32.8/arch/x86/pci/olpc.c
16911--- linux-2.6.32.7/arch/x86/pci/olpc.c 2010-01-25 13:50:10.000000000 -0500 16975--- linux-2.6.32.8/arch/x86/pci/olpc.c 2010-02-09 07:57:19.000000000 -0500
16912+++ linux-2.6.32.7/arch/x86/pci/olpc.c 2010-01-25 17:39:40.331177529 -0500 16976+++ linux-2.6.32.8/arch/x86/pci/olpc.c 2010-02-10 15:06:23.983496257 -0500
16913@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s 16977@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
16914 return 0; 16978 return 0;
16915 } 16979 }
@@ -16919,9 +16983,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/olpc.c linux-2.6.32.7/arch/x86/pci/olpc.c
16919 .read = pci_olpc_read, 16983 .read = pci_olpc_read,
16920 .write = pci_olpc_write, 16984 .write = pci_olpc_write,
16921 }; 16985 };
16922diff -urNp linux-2.6.32.7/arch/x86/pci/pcbios.c linux-2.6.32.7/arch/x86/pci/pcbios.c 16986diff -urNp linux-2.6.32.8/arch/x86/pci/pcbios.c linux-2.6.32.8/arch/x86/pci/pcbios.c
16923--- linux-2.6.32.7/arch/x86/pci/pcbios.c 2010-01-25 13:50:10.000000000 -0500 16987--- linux-2.6.32.8/arch/x86/pci/pcbios.c 2010-02-09 07:57:19.000000000 -0500
16924+++ linux-2.6.32.7/arch/x86/pci/pcbios.c 2010-01-25 17:39:40.331177529 -0500 16988+++ linux-2.6.32.8/arch/x86/pci/pcbios.c 2010-02-10 15:06:23.983496257 -0500
16925@@ -56,50 +56,93 @@ union bios32 { 16989@@ -56,50 +56,93 @@ union bios32 {
16926 static struct { 16990 static struct {
16927 unsigned long address; 16991 unsigned long address;
@@ -17244,9 +17308,9 @@ diff -urNp linux-2.6.32.7/arch/x86/pci/pcbios.c linux-2.6.32.7/arch/x86/pci/pcbi
17244 return !(ret & 0xff00); 17308 return !(ret & 0xff00);
17245 } 17309 }
17246 EXPORT_SYMBOL(pcibios_set_irq_routing); 17310 EXPORT_SYMBOL(pcibios_set_irq_routing);
17247diff -urNp linux-2.6.32.7/arch/x86/power/cpu.c linux-2.6.32.7/arch/x86/power/cpu.c 17311diff -urNp linux-2.6.32.8/arch/x86/power/cpu.c linux-2.6.32.8/arch/x86/power/cpu.c
17248--- linux-2.6.32.7/arch/x86/power/cpu.c 2010-01-25 13:50:10.000000000 -0500 17312--- linux-2.6.32.8/arch/x86/power/cpu.c 2010-02-09 07:57:19.000000000 -0500
17249+++ linux-2.6.32.7/arch/x86/power/cpu.c 2010-01-25 17:39:40.331177529 -0500 17313+++ linux-2.6.32.8/arch/x86/power/cpu.c 2010-02-10 15:06:23.983496257 -0500
17250@@ -126,7 +126,7 @@ static void do_fpu_end(void) 17314@@ -126,7 +126,7 @@ static void do_fpu_end(void)
17251 static void fix_processor_context(void) 17315 static void fix_processor_context(void)
17252 { 17316 {
@@ -17266,9 +17330,9 @@ diff -urNp linux-2.6.32.7/arch/x86/power/cpu.c linux-2.6.32.7/arch/x86/power/cpu
17266 17330
17267 syscall_init(); /* This sets MSR_*STAR and related */ 17331 syscall_init(); /* This sets MSR_*STAR and related */
17268 #endif 17332 #endif
17269diff -urNp linux-2.6.32.7/arch/x86/vdso/Makefile linux-2.6.32.7/arch/x86/vdso/Makefile 17333diff -urNp linux-2.6.32.8/arch/x86/vdso/Makefile linux-2.6.32.8/arch/x86/vdso/Makefile
17270--- linux-2.6.32.7/arch/x86/vdso/Makefile 2010-01-25 13:50:10.000000000 -0500 17334--- linux-2.6.32.8/arch/x86/vdso/Makefile 2010-02-09 07:57:19.000000000 -0500
17271+++ linux-2.6.32.7/arch/x86/vdso/Makefile 2010-01-25 17:39:40.331177529 -0500 17335+++ linux-2.6.32.8/arch/x86/vdso/Makefile 2010-02-10 15:06:23.983496257 -0500
17272@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ 17336@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
17273 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ 17337 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
17274 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) 17338 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -17278,9 +17342,9 @@ diff -urNp linux-2.6.32.7/arch/x86/vdso/Makefile linux-2.6.32.7/arch/x86/vdso/Ma
17278 GCOV_PROFILE := n 17342 GCOV_PROFILE := n
17279 17343
17280 # 17344 #
17281diff -urNp linux-2.6.32.7/arch/x86/vdso/vclock_gettime.c linux-2.6.32.7/arch/x86/vdso/vclock_gettime.c 17345diff -urNp linux-2.6.32.8/arch/x86/vdso/vclock_gettime.c linux-2.6.32.8/arch/x86/vdso/vclock_gettime.c
17282--- linux-2.6.32.7/arch/x86/vdso/vclock_gettime.c 2010-01-25 13:50:10.000000000 -0500 17346--- linux-2.6.32.8/arch/x86/vdso/vclock_gettime.c 2010-02-09 07:57:19.000000000 -0500
17283+++ linux-2.6.32.7/arch/x86/vdso/vclock_gettime.c 2010-01-25 17:39:40.332419696 -0500 17347+++ linux-2.6.32.8/arch/x86/vdso/vclock_gettime.c 2010-02-10 15:06:23.983496257 -0500
17284@@ -22,24 +22,48 @@ 17348@@ -22,24 +22,48 @@
17285 #include <asm/hpet.h> 17349 #include <asm/hpet.h>
17286 #include <asm/unistd.h> 17350 #include <asm/unistd.h>
@@ -17379,9 +17443,9 @@ diff -urNp linux-2.6.32.7/arch/x86/vdso/vclock_gettime.c linux-2.6.32.7/arch/x86
17379 } 17443 }
17380 int gettimeofday(struct timeval *, struct timezone *) 17444 int gettimeofday(struct timeval *, struct timezone *)
17381 __attribute__((weak, alias("__vdso_gettimeofday"))); 17445 __attribute__((weak, alias("__vdso_gettimeofday")));
17382diff -urNp linux-2.6.32.7/arch/x86/vdso/vdso32-setup.c linux-2.6.32.7/arch/x86/vdso/vdso32-setup.c 17446diff -urNp linux-2.6.32.8/arch/x86/vdso/vdso32-setup.c linux-2.6.32.8/arch/x86/vdso/vdso32-setup.c
17383--- linux-2.6.32.7/arch/x86/vdso/vdso32-setup.c 2010-01-25 13:50:10.000000000 -0500 17447--- linux-2.6.32.8/arch/x86/vdso/vdso32-setup.c 2010-02-09 07:57:19.000000000 -0500
17384+++ linux-2.6.32.7/arch/x86/vdso/vdso32-setup.c 2010-01-25 17:39:40.332419696 -0500 17448+++ linux-2.6.32.8/arch/x86/vdso/vdso32-setup.c 2010-02-10 15:06:23.983496257 -0500
17385@@ -25,6 +25,7 @@ 17449@@ -25,6 +25,7 @@
17386 #include <asm/tlbflush.h> 17450 #include <asm/tlbflush.h>
17387 #include <asm/vdso.h> 17451 #include <asm/vdso.h>
@@ -17482,9 +17546,9 @@ diff -urNp linux-2.6.32.7/arch/x86/vdso/vdso32-setup.c linux-2.6.32.7/arch/x86/v
17482 return &gate_vma; 17546 return &gate_vma;
17483 return NULL; 17547 return NULL;
17484 } 17548 }
17485diff -urNp linux-2.6.32.7/arch/x86/vdso/vdso.lds.S linux-2.6.32.7/arch/x86/vdso/vdso.lds.S 17549diff -urNp linux-2.6.32.8/arch/x86/vdso/vdso.lds.S linux-2.6.32.8/arch/x86/vdso/vdso.lds.S
17486--- linux-2.6.32.7/arch/x86/vdso/vdso.lds.S 2010-01-25 13:50:10.000000000 -0500 17550--- linux-2.6.32.8/arch/x86/vdso/vdso.lds.S 2010-02-09 07:57:19.000000000 -0500
17487+++ linux-2.6.32.7/arch/x86/vdso/vdso.lds.S 2010-01-25 17:39:40.332419696 -0500 17551+++ linux-2.6.32.8/arch/x86/vdso/vdso.lds.S 2010-02-10 15:06:23.983496257 -0500
17488@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; 17552@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
17489 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; 17553 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
17490 #include "vextern.h" 17554 #include "vextern.h"
@@ -17495,9 +17559,9 @@ diff -urNp linux-2.6.32.7/arch/x86/vdso/vdso.lds.S linux-2.6.32.7/arch/x86/vdso/
17495+VEXTERN(fallback_time) 17559+VEXTERN(fallback_time)
17496+VEXTERN(getcpu) 17560+VEXTERN(getcpu)
17497+#undef VEXTERN 17561+#undef VEXTERN
17498diff -urNp linux-2.6.32.7/arch/x86/vdso/vextern.h linux-2.6.32.7/arch/x86/vdso/vextern.h 17562diff -urNp linux-2.6.32.8/arch/x86/vdso/vextern.h linux-2.6.32.8/arch/x86/vdso/vextern.h
17499--- linux-2.6.32.7/arch/x86/vdso/vextern.h 2010-01-25 13:50:10.000000000 -0500 17563--- linux-2.6.32.8/arch/x86/vdso/vextern.h 2010-02-09 07:57:19.000000000 -0500
17500+++ linux-2.6.32.7/arch/x86/vdso/vextern.h 2010-01-25 17:39:40.332419696 -0500 17564+++ linux-2.6.32.8/arch/x86/vdso/vextern.h 2010-02-10 15:06:23.983496257 -0500
17501@@ -11,6 +11,5 @@ 17565@@ -11,6 +11,5 @@
17502 put into vextern.h and be referenced as a pointer with vdso prefix. 17566 put into vextern.h and be referenced as a pointer with vdso prefix.
17503 The main kernel later fills in the values. */ 17567 The main kernel later fills in the values. */
@@ -17505,9 +17569,9 @@ diff -urNp linux-2.6.32.7/arch/x86/vdso/vextern.h linux-2.6.32.7/arch/x86/vdso/v
17505-VEXTERN(jiffies) 17569-VEXTERN(jiffies)
17506 VEXTERN(vgetcpu_mode) 17570 VEXTERN(vgetcpu_mode)
17507 VEXTERN(vsyscall_gtod_data) 17571 VEXTERN(vsyscall_gtod_data)
17508diff -urNp linux-2.6.32.7/arch/x86/vdso/vma.c linux-2.6.32.7/arch/x86/vdso/vma.c 17572diff -urNp linux-2.6.32.8/arch/x86/vdso/vma.c linux-2.6.32.8/arch/x86/vdso/vma.c
17509--- linux-2.6.32.7/arch/x86/vdso/vma.c 2010-01-25 13:50:10.000000000 -0500 17573--- linux-2.6.32.8/arch/x86/vdso/vma.c 2010-02-09 07:57:19.000000000 -0500
17510+++ linux-2.6.32.7/arch/x86/vdso/vma.c 2010-01-25 17:39:40.332419696 -0500 17574+++ linux-2.6.32.8/arch/x86/vdso/vma.c 2010-02-10 15:06:23.983496257 -0500
17511@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) 17575@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
17512 if (!vbase) 17576 if (!vbase)
17513 goto oom; 17577 goto oom;
@@ -17554,9 +17618,9 @@ diff -urNp linux-2.6.32.7/arch/x86/vdso/vma.c linux-2.6.32.7/arch/x86/vdso/vma.c
17554- return 0; 17618- return 0;
17555-} 17619-}
17556-__setup("vdso=", vdso_setup); 17620-__setup("vdso=", vdso_setup);
17557diff -urNp linux-2.6.32.7/arch/x86/xen/enlighten.c linux-2.6.32.7/arch/x86/xen/enlighten.c 17621diff -urNp linux-2.6.32.8/arch/x86/xen/enlighten.c linux-2.6.32.8/arch/x86/xen/enlighten.c
17558--- linux-2.6.32.7/arch/x86/xen/enlighten.c 2010-01-25 13:50:10.000000000 -0500 17622--- linux-2.6.32.8/arch/x86/xen/enlighten.c 2010-02-09 07:57:19.000000000 -0500
17559+++ linux-2.6.32.7/arch/x86/xen/enlighten.c 2010-01-25 17:39:40.332419696 -0500 17623+++ linux-2.6.32.8/arch/x86/xen/enlighten.c 2010-02-10 15:06:23.983496257 -0500
17560@@ -70,8 +70,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); 17624@@ -70,8 +70,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
17561 17625
17562 struct shared_info xen_dummy_shared_info; 17626 struct shared_info xen_dummy_shared_info;
@@ -17589,9 +17653,9 @@ diff -urNp linux-2.6.32.7/arch/x86/xen/enlighten.c linux-2.6.32.7/arch/x86/xen/e
17589 xen_smp_init(); 17653 xen_smp_init();
17590 17654
17591 pgd = (pgd_t *)xen_start_info->pt_base; 17655 pgd = (pgd_t *)xen_start_info->pt_base;
17592diff -urNp linux-2.6.32.7/arch/x86/xen/mmu.c linux-2.6.32.7/arch/x86/xen/mmu.c 17656diff -urNp linux-2.6.32.8/arch/x86/xen/mmu.c linux-2.6.32.8/arch/x86/xen/mmu.c
17593--- linux-2.6.32.7/arch/x86/xen/mmu.c 2010-01-25 13:50:10.000000000 -0500 17657--- linux-2.6.32.8/arch/x86/xen/mmu.c 2010-02-09 07:57:19.000000000 -0500
17594+++ linux-2.6.32.7/arch/x86/xen/mmu.c 2010-01-25 17:39:40.333504249 -0500 17658+++ linux-2.6.32.8/arch/x86/xen/mmu.c 2010-02-10 15:06:23.983496257 -0500
17595@@ -1710,6 +1710,8 @@ __init pgd_t *xen_setup_kernel_pagetable 17659@@ -1710,6 +1710,8 @@ __init pgd_t *xen_setup_kernel_pagetable
17596 convert_pfn_mfn(init_level4_pgt); 17660 convert_pfn_mfn(init_level4_pgt);
17597 convert_pfn_mfn(level3_ident_pgt); 17661 convert_pfn_mfn(level3_ident_pgt);
@@ -17612,9 +17676,9 @@ diff -urNp linux-2.6.32.7/arch/x86/xen/mmu.c linux-2.6.32.7/arch/x86/xen/mmu.c
17612 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); 17676 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
17613 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); 17677 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
17614 17678
17615diff -urNp linux-2.6.32.7/arch/x86/xen/smp.c linux-2.6.32.7/arch/x86/xen/smp.c 17679diff -urNp linux-2.6.32.8/arch/x86/xen/smp.c linux-2.6.32.8/arch/x86/xen/smp.c
17616--- linux-2.6.32.7/arch/x86/xen/smp.c 2010-01-25 13:50:10.000000000 -0500 17680--- linux-2.6.32.8/arch/x86/xen/smp.c 2010-02-09 07:57:19.000000000 -0500
17617+++ linux-2.6.32.7/arch/x86/xen/smp.c 2010-01-25 17:39:40.333504249 -0500 17681+++ linux-2.6.32.8/arch/x86/xen/smp.c 2010-02-10 15:06:23.983496257 -0500
17618@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ 17682@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
17619 { 17683 {
17620 BUG_ON(smp_processor_id() != 0); 17684 BUG_ON(smp_processor_id() != 0);
@@ -17638,9 +17702,9 @@ diff -urNp linux-2.6.32.7/arch/x86/xen/smp.c linux-2.6.32.7/arch/x86/xen/smp.c
17638 ctxt->user_regs.ss = __KERNEL_DS; 17702 ctxt->user_regs.ss = __KERNEL_DS;
17639 #ifdef CONFIG_X86_32 17703 #ifdef CONFIG_X86_32
17640 ctxt->user_regs.fs = __KERNEL_PERCPU; 17704 ctxt->user_regs.fs = __KERNEL_PERCPU;
17641diff -urNp linux-2.6.32.7/arch/x86/xen/xen-ops.h linux-2.6.32.7/arch/x86/xen/xen-ops.h 17705diff -urNp linux-2.6.32.8/arch/x86/xen/xen-ops.h linux-2.6.32.8/arch/x86/xen/xen-ops.h
17642--- linux-2.6.32.7/arch/x86/xen/xen-ops.h 2010-01-25 13:50:10.000000000 -0500 17706--- linux-2.6.32.8/arch/x86/xen/xen-ops.h 2010-02-09 07:57:19.000000000 -0500
17643+++ linux-2.6.32.7/arch/x86/xen/xen-ops.h 2010-01-25 17:39:40.333504249 -0500 17707+++ linux-2.6.32.8/arch/x86/xen/xen-ops.h 2010-02-10 15:06:23.983496257 -0500
17644@@ -10,8 +10,6 @@ 17708@@ -10,8 +10,6 @@
17645 extern const char xen_hypervisor_callback[]; 17709 extern const char xen_hypervisor_callback[];
17646 extern const char xen_failsafe_callback[]; 17710 extern const char xen_failsafe_callback[];
@@ -17650,9 +17714,9 @@ diff -urNp linux-2.6.32.7/arch/x86/xen/xen-ops.h linux-2.6.32.7/arch/x86/xen/xen
17650 struct trap_info; 17714 struct trap_info;
17651 void xen_copy_trap_info(struct trap_info *traps); 17715 void xen_copy_trap_info(struct trap_info *traps);
17652 17716
17653diff -urNp linux-2.6.32.7/block/blk-integrity.c linux-2.6.32.7/block/blk-integrity.c 17717diff -urNp linux-2.6.32.8/block/blk-integrity.c linux-2.6.32.8/block/blk-integrity.c
17654--- linux-2.6.32.7/block/blk-integrity.c 2010-01-25 13:50:10.000000000 -0500 17718--- linux-2.6.32.8/block/blk-integrity.c 2010-02-09 07:57:19.000000000 -0500
17655+++ linux-2.6.32.7/block/blk-integrity.c 2010-01-25 17:39:40.334142180 -0500 17719+++ linux-2.6.32.8/block/blk-integrity.c 2010-02-10 15:06:23.983496257 -0500
17656@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs 17720@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
17657 NULL, 17721 NULL,
17658 }; 17722 };
@@ -17662,9 +17726,9 @@ diff -urNp linux-2.6.32.7/block/blk-integrity.c linux-2.6.32.7/block/blk-integri
17662 .show = &integrity_attr_show, 17726 .show = &integrity_attr_show,
17663 .store = &integrity_attr_store, 17727 .store = &integrity_attr_store,
17664 }; 17728 };
17665diff -urNp linux-2.6.32.7/block/blk-map.c linux-2.6.32.7/block/blk-map.c 17729diff -urNp linux-2.6.32.8/block/blk-map.c linux-2.6.32.8/block/blk-map.c
17666--- linux-2.6.32.7/block/blk-map.c 2010-01-25 13:50:10.000000000 -0500 17730--- linux-2.6.32.8/block/blk-map.c 2010-02-09 07:57:19.000000000 -0500
17667+++ linux-2.6.32.7/block/blk-map.c 2010-01-25 17:39:40.334142180 -0500 17731+++ linux-2.6.32.8/block/blk-map.c 2010-02-10 15:06:23.983496257 -0500
17668@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ 17732@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
17669 * direct dma. else, set up kernel bounce buffers 17733 * direct dma. else, set up kernel bounce buffers
17670 */ 17734 */
@@ -17683,9 +17747,9 @@ diff -urNp linux-2.6.32.7/block/blk-map.c linux-2.6.32.7/block/blk-map.c
17683 if (do_copy) 17747 if (do_copy)
17684 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); 17748 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
17685 else 17749 else
17686diff -urNp linux-2.6.32.7/block/blk-sysfs.c linux-2.6.32.7/block/blk-sysfs.c 17750diff -urNp linux-2.6.32.8/block/blk-sysfs.c linux-2.6.32.8/block/blk-sysfs.c
17687--- linux-2.6.32.7/block/blk-sysfs.c 2010-01-25 13:50:10.000000000 -0500 17751--- linux-2.6.32.8/block/blk-sysfs.c 2010-02-09 07:57:19.000000000 -0500
17688+++ linux-2.6.32.7/block/blk-sysfs.c 2010-01-25 17:39:40.334142180 -0500 17752+++ linux-2.6.32.8/block/blk-sysfs.c 2010-02-10 15:06:23.983496257 -0500
17689@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob 17753@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
17690 kmem_cache_free(blk_requestq_cachep, q); 17754 kmem_cache_free(blk_requestq_cachep, q);
17691 } 17755 }
@@ -17695,9 +17759,9 @@ diff -urNp linux-2.6.32.7/block/blk-sysfs.c linux-2.6.32.7/block/blk-sysfs.c
17695 .show = queue_attr_show, 17759 .show = queue_attr_show,
17696 .store = queue_attr_store, 17760 .store = queue_attr_store,
17697 }; 17761 };
17698diff -urNp linux-2.6.32.7/block/elevator.c linux-2.6.32.7/block/elevator.c 17762diff -urNp linux-2.6.32.8/block/elevator.c linux-2.6.32.8/block/elevator.c
17699--- linux-2.6.32.7/block/elevator.c 2010-01-25 13:50:10.000000000 -0500 17763--- linux-2.6.32.8/block/elevator.c 2010-02-09 07:57:19.000000000 -0500
17700+++ linux-2.6.32.7/block/elevator.c 2010-01-25 17:39:40.334142180 -0500 17764+++ linux-2.6.32.8/block/elevator.c 2010-02-10 15:06:23.983496257 -0500
17701@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str 17765@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
17702 return error; 17766 return error;
17703 } 17767 }
@@ -17707,9 +17771,9 @@ diff -urNp linux-2.6.32.7/block/elevator.c linux-2.6.32.7/block/elevator.c
17707 .show = elv_attr_show, 17771 .show = elv_attr_show,
17708 .store = elv_attr_store, 17772 .store = elv_attr_store,
17709 }; 17773 };
17710diff -urNp linux-2.6.32.7/crypto/lrw.c linux-2.6.32.7/crypto/lrw.c 17774diff -urNp linux-2.6.32.8/crypto/lrw.c linux-2.6.32.8/crypto/lrw.c
17711--- linux-2.6.32.7/crypto/lrw.c 2010-01-25 13:50:10.000000000 -0500 17775--- linux-2.6.32.8/crypto/lrw.c 2010-02-09 07:57:19.000000000 -0500
17712+++ linux-2.6.32.7/crypto/lrw.c 2010-01-25 17:39:40.334142180 -0500 17776+++ linux-2.6.32.8/crypto/lrw.c 2010-02-10 15:06:23.983496257 -0500
17713@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par 17777@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
17714 struct priv *ctx = crypto_tfm_ctx(parent); 17778 struct priv *ctx = crypto_tfm_ctx(parent);
17715 struct crypto_cipher *child = ctx->child; 17779 struct crypto_cipher *child = ctx->child;
@@ -17719,9 +17783,9 @@ diff -urNp linux-2.6.32.7/crypto/lrw.c linux-2.6.32.7/crypto/lrw.c
17719 int bsize = crypto_cipher_blocksize(child); 17783 int bsize = crypto_cipher_blocksize(child);
17720 17784
17721 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); 17785 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
17722diff -urNp linux-2.6.32.7/Documentation/dontdiff linux-2.6.32.7/Documentation/dontdiff 17786diff -urNp linux-2.6.32.8/Documentation/dontdiff linux-2.6.32.8/Documentation/dontdiff
17723--- linux-2.6.32.7/Documentation/dontdiff 2010-01-25 13:50:10.000000000 -0500 17787--- linux-2.6.32.8/Documentation/dontdiff 2010-02-09 07:57:19.000000000 -0500
17724+++ linux-2.6.32.7/Documentation/dontdiff 2010-01-25 17:39:40.334142180 -0500 17788+++ linux-2.6.32.8/Documentation/dontdiff 2010-02-10 15:06:23.983496257 -0500
17725@@ -3,6 +3,7 @@ 17789@@ -3,6 +3,7 @@
17726 *.bin 17790 *.bin
17727 *.cpio 17791 *.cpio
@@ -17828,9 +17892,9 @@ diff -urNp linux-2.6.32.7/Documentation/dontdiff linux-2.6.32.7/Documentation/do
17828 zImage* 17892 zImage*
17829 zconf.hash.c 17893 zconf.hash.c
17830+zoffset.h 17894+zoffset.h
17831diff -urNp linux-2.6.32.7/Documentation/kernel-parameters.txt linux-2.6.32.7/Documentation/kernel-parameters.txt 17895diff -urNp linux-2.6.32.8/Documentation/kernel-parameters.txt linux-2.6.32.8/Documentation/kernel-parameters.txt
17832--- linux-2.6.32.7/Documentation/kernel-parameters.txt 2010-01-25 13:50:10.000000000 -0500 17896--- linux-2.6.32.8/Documentation/kernel-parameters.txt 2010-02-09 07:57:19.000000000 -0500
17833+++ linux-2.6.32.7/Documentation/kernel-parameters.txt 2010-01-25 17:39:40.368608699 -0500 17897+++ linux-2.6.32.8/Documentation/kernel-parameters.txt 2010-02-10 15:06:23.987505826 -0500
17834@@ -1833,6 +1833,12 @@ and is between 256 and 4096 characters. 17898@@ -1833,6 +1833,12 @@ and is between 256 and 4096 characters.
17835 the specified number of seconds. This is to be used if 17899 the specified number of seconds. This is to be used if
17836 your oopses keep scrolling off the screen. 17900 your oopses keep scrolling off the screen.
@@ -17844,9 +17908,9 @@ diff -urNp linux-2.6.32.7/Documentation/kernel-parameters.txt linux-2.6.32.7/Doc
17844 pcbit= [HW,ISDN] 17908 pcbit= [HW,ISDN]
17845 17909
17846 pcd. [PARIDE] 17910 pcd. [PARIDE]
17847diff -urNp linux-2.6.32.7/drivers/acpi/battery.c linux-2.6.32.7/drivers/acpi/battery.c 17911diff -urNp linux-2.6.32.8/drivers/acpi/battery.c linux-2.6.32.8/drivers/acpi/battery.c
17848--- linux-2.6.32.7/drivers/acpi/battery.c 2010-01-25 13:50:10.000000000 -0500 17912--- linux-2.6.32.8/drivers/acpi/battery.c 2010-02-09 07:57:19.000000000 -0500
17849+++ linux-2.6.32.7/drivers/acpi/battery.c 2010-01-25 17:39:40.369403392 -0500 17913+++ linux-2.6.32.8/drivers/acpi/battery.c 2010-02-10 15:06:23.987505826 -0500
17850@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); 17914@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
17851 } 17915 }
17852 17916
@@ -17856,9 +17920,9 @@ diff -urNp linux-2.6.32.7/drivers/acpi/battery.c linux-2.6.32.7/drivers/acpi/bat
17856 mode_t mode; 17920 mode_t mode;
17857 const char *name; 17921 const char *name;
17858 } acpi_battery_file[] = { 17922 } acpi_battery_file[] = {
17859diff -urNp linux-2.6.32.7/drivers/acpi/blacklist.c linux-2.6.32.7/drivers/acpi/blacklist.c 17923diff -urNp linux-2.6.32.8/drivers/acpi/blacklist.c linux-2.6.32.8/drivers/acpi/blacklist.c
17860--- linux-2.6.32.7/drivers/acpi/blacklist.c 2010-01-25 13:50:10.000000000 -0500 17924--- linux-2.6.32.8/drivers/acpi/blacklist.c 2010-02-09 07:57:19.000000000 -0500
17861+++ linux-2.6.32.7/drivers/acpi/blacklist.c 2010-01-25 17:39:40.369403392 -0500 17925+++ linux-2.6.32.8/drivers/acpi/blacklist.c 2010-02-10 15:06:23.987505826 -0500
17862@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b 17926@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
17863 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, 17927 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
17864 "Incorrect _ADR", 1}, 17928 "Incorrect _ADR", 1},
@@ -17868,9 +17932,9 @@ diff -urNp linux-2.6.32.7/drivers/acpi/blacklist.c linux-2.6.32.7/drivers/acpi/b
17868 }; 17932 };
17869 17933
17870 #if CONFIG_ACPI_BLACKLIST_YEAR 17934 #if CONFIG_ACPI_BLACKLIST_YEAR
17871diff -urNp linux-2.6.32.7/drivers/acpi/dock.c linux-2.6.32.7/drivers/acpi/dock.c 17935diff -urNp linux-2.6.32.8/drivers/acpi/dock.c linux-2.6.32.8/drivers/acpi/dock.c
17872--- linux-2.6.32.7/drivers/acpi/dock.c 2010-01-25 13:50:10.000000000 -0500 17936--- linux-2.6.32.8/drivers/acpi/dock.c 2010-02-09 07:57:19.000000000 -0500
17873+++ linux-2.6.32.7/drivers/acpi/dock.c 2010-01-25 17:39:40.369403392 -0500 17937+++ linux-2.6.32.8/drivers/acpi/dock.c 2010-02-10 15:06:23.987505826 -0500
17874@@ -77,7 +77,7 @@ struct dock_dependent_device { 17938@@ -77,7 +77,7 @@ struct dock_dependent_device {
17875 struct list_head list; 17939 struct list_head list;
17876 struct list_head hotplug_list; 17940 struct list_head hotplug_list;
@@ -17889,9 +17953,9 @@ diff -urNp linux-2.6.32.7/drivers/acpi/dock.c linux-2.6.32.7/drivers/acpi/dock.c
17889 void *context) 17953 void *context)
17890 { 17954 {
17891 struct dock_dependent_device *dd; 17955 struct dock_dependent_device *dd;
17892diff -urNp linux-2.6.32.7/drivers/acpi/osl.c linux-2.6.32.7/drivers/acpi/osl.c 17956diff -urNp linux-2.6.32.8/drivers/acpi/osl.c linux-2.6.32.8/drivers/acpi/osl.c
17893--- linux-2.6.32.7/drivers/acpi/osl.c 2010-01-25 13:50:10.000000000 -0500 17957--- linux-2.6.32.8/drivers/acpi/osl.c 2010-02-09 07:57:19.000000000 -0500
17894+++ linux-2.6.32.7/drivers/acpi/osl.c 2010-01-25 17:39:40.369403392 -0500 17958+++ linux-2.6.32.8/drivers/acpi/osl.c 2010-02-10 15:06:23.987505826 -0500
17895@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres 17959@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
17896 void __iomem *virt_addr; 17960 void __iomem *virt_addr;
17897 17961
@@ -17910,9 +17974,9 @@ diff -urNp linux-2.6.32.7/drivers/acpi/osl.c linux-2.6.32.7/drivers/acpi/osl.c
17910 17974
17911 switch (width) { 17975 switch (width) {
17912 case 8: 17976 case 8:
17913diff -urNp linux-2.6.32.7/drivers/acpi/processor_core.c linux-2.6.32.7/drivers/acpi/processor_core.c 17977diff -urNp linux-2.6.32.8/drivers/acpi/processor_core.c linux-2.6.32.8/drivers/acpi/processor_core.c
17914--- linux-2.6.32.7/drivers/acpi/processor_core.c 2010-01-25 13:50:10.000000000 -0500 17978--- linux-2.6.32.8/drivers/acpi/processor_core.c 2010-02-09 07:57:19.000000000 -0500
17915+++ linux-2.6.32.7/drivers/acpi/processor_core.c 2010-01-25 17:39:40.370403762 -0500 17979+++ linux-2.6.32.8/drivers/acpi/processor_core.c 2010-02-10 15:06:23.987505826 -0500
17916@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( 17980@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add(
17917 return 0; 17981 return 0;
17918 } 17982 }
@@ -17922,9 +17986,9 @@ diff -urNp linux-2.6.32.7/drivers/acpi/processor_core.c linux-2.6.32.7/drivers/a
17922 17986
17923 /* 17987 /*
17924 * Buggy BIOS check 17988 * Buggy BIOS check
17925diff -urNp linux-2.6.32.7/drivers/acpi/processor_idle.c linux-2.6.32.7/drivers/acpi/processor_idle.c 17989diff -urNp linux-2.6.32.8/drivers/acpi/processor_idle.c linux-2.6.32.8/drivers/acpi/processor_idle.c
17926--- linux-2.6.32.7/drivers/acpi/processor_idle.c 2010-01-25 20:04:14.673608010 -0500 17990--- linux-2.6.32.8/drivers/acpi/processor_idle.c 2010-02-09 07:57:19.000000000 -0500
17927+++ linux-2.6.32.7/drivers/acpi/processor_idle.c 2010-01-25 20:04:24.410241670 -0500 17991+++ linux-2.6.32.8/drivers/acpi/processor_idle.c 2010-02-10 15:06:23.987505826 -0500
17928@@ -110,7 +110,7 @@ static struct dmi_system_id __cpuinitdat 17992@@ -110,7 +110,7 @@ static struct dmi_system_id __cpuinitdat
17929 DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), 17993 DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
17930 DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")}, 17994 DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")},
@@ -17934,9 +17998,9 @@ diff -urNp linux-2.6.32.7/drivers/acpi/processor_idle.c linux-2.6.32.7/drivers/a
17934 }; 17998 };
17935 17999
17936 18000
17937diff -urNp linux-2.6.32.7/drivers/acpi/sleep.c linux-2.6.32.7/drivers/acpi/sleep.c 18001diff -urNp linux-2.6.32.8/drivers/acpi/sleep.c linux-2.6.32.8/drivers/acpi/sleep.c
17938--- linux-2.6.32.7/drivers/acpi/sleep.c 2010-01-25 13:50:10.000000000 -0500 18002--- linux-2.6.32.8/drivers/acpi/sleep.c 2010-02-09 07:57:19.000000000 -0500
17939+++ linux-2.6.32.7/drivers/acpi/sleep.c 2010-01-25 17:39:40.370403762 -0500 18003+++ linux-2.6.32.8/drivers/acpi/sleep.c 2010-02-10 15:06:23.987505826 -0500
17940@@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp 18004@@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp
17941 } 18005 }
17942 } 18006 }
@@ -17973,9 +18037,9 @@ diff -urNp linux-2.6.32.7/drivers/acpi/sleep.c linux-2.6.32.7/drivers/acpi/sleep
17973 .begin = acpi_hibernation_begin_old, 18037 .begin = acpi_hibernation_begin_old,
17974 .end = acpi_pm_end, 18038 .end = acpi_pm_end,
17975 .pre_snapshot = acpi_hibernation_pre_snapshot_old, 18039 .pre_snapshot = acpi_hibernation_pre_snapshot_old,
17976diff -urNp linux-2.6.32.7/drivers/acpi/video.c linux-2.6.32.7/drivers/acpi/video.c 18040diff -urNp linux-2.6.32.8/drivers/acpi/video.c linux-2.6.32.8/drivers/acpi/video.c
17977--- linux-2.6.32.7/drivers/acpi/video.c 2010-01-25 13:50:10.000000000 -0500 18041--- linux-2.6.32.8/drivers/acpi/video.c 2010-02-09 07:57:19.000000000 -0500
17978+++ linux-2.6.32.7/drivers/acpi/video.c 2010-01-25 17:39:40.370403762 -0500 18042+++ linux-2.6.32.8/drivers/acpi/video.c 2010-02-10 15:06:23.987505826 -0500
17979@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str 18043@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
17980 vd->brightness->levels[request_level]); 18044 vd->brightness->levels[request_level]);
17981 } 18045 }
@@ -17985,9 +18049,9 @@ diff -urNp linux-2.6.32.7/drivers/acpi/video.c linux-2.6.32.7/drivers/acpi/video
17985 .get_brightness = acpi_video_get_brightness, 18049 .get_brightness = acpi_video_get_brightness,
17986 .update_status = acpi_video_set_brightness, 18050 .update_status = acpi_video_set_brightness,
17987 }; 18051 };
17988diff -urNp linux-2.6.32.7/drivers/ata/ahci.c linux-2.6.32.7/drivers/ata/ahci.c 18052diff -urNp linux-2.6.32.8/drivers/ata/ahci.c linux-2.6.32.8/drivers/ata/ahci.c
17989--- linux-2.6.32.7/drivers/ata/ahci.c 2010-01-25 20:04:14.695465465 -0500 18053--- linux-2.6.32.8/drivers/ata/ahci.c 2010-02-09 07:57:19.000000000 -0500
17990+++ linux-2.6.32.7/drivers/ata/ahci.c 2010-01-25 20:04:24.420267700 -0500 18054+++ linux-2.6.32.8/drivers/ata/ahci.c 2010-02-10 15:06:23.990319908 -0500
17991@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh 18055@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
17992 .sdev_attrs = ahci_sdev_attrs, 18056 .sdev_attrs = ahci_sdev_attrs,
17993 }; 18057 };
@@ -18027,9 +18091,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/ahci.c linux-2.6.32.7/drivers/ata/ahci.c
18027 }; 18091 };
18028 18092
18029 18093
18030diff -urNp linux-2.6.32.7/drivers/ata/ata_generic.c linux-2.6.32.7/drivers/ata/ata_generic.c 18094diff -urNp linux-2.6.32.8/drivers/ata/ata_generic.c linux-2.6.32.8/drivers/ata/ata_generic.c
18031--- linux-2.6.32.7/drivers/ata/ata_generic.c 2010-01-25 13:50:10.000000000 -0500 18095--- linux-2.6.32.8/drivers/ata/ata_generic.c 2010-02-09 07:57:19.000000000 -0500
18032+++ linux-2.6.32.7/drivers/ata/ata_generic.c 2010-01-25 17:39:40.401404478 -0500 18096+++ linux-2.6.32.8/drivers/ata/ata_generic.c 2010-02-10 15:06:23.990319908 -0500
18033@@ -95,7 +95,7 @@ static struct scsi_host_template generic 18097@@ -95,7 +95,7 @@ static struct scsi_host_template generic
18034 ATA_BMDMA_SHT(DRV_NAME), 18098 ATA_BMDMA_SHT(DRV_NAME),
18035 }; 18099 };
@@ -18039,9 +18103,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/ata_generic.c linux-2.6.32.7/drivers/ata/a
18039 .inherits = &ata_bmdma_port_ops, 18103 .inherits = &ata_bmdma_port_ops,
18040 .cable_detect = ata_cable_unknown, 18104 .cable_detect = ata_cable_unknown,
18041 .set_mode = generic_set_mode, 18105 .set_mode = generic_set_mode,
18042diff -urNp linux-2.6.32.7/drivers/ata/ata_piix.c linux-2.6.32.7/drivers/ata/ata_piix.c 18106diff -urNp linux-2.6.32.8/drivers/ata/ata_piix.c linux-2.6.32.8/drivers/ata/ata_piix.c
18043--- linux-2.6.32.7/drivers/ata/ata_piix.c 2010-01-25 20:04:14.711342317 -0500 18107--- linux-2.6.32.8/drivers/ata/ata_piix.c 2010-02-09 07:57:19.000000000 -0500
18044+++ linux-2.6.32.7/drivers/ata/ata_piix.c 2010-01-25 20:04:24.421172039 -0500 18108+++ linux-2.6.32.8/drivers/ata/ata_piix.c 2010-02-10 15:06:23.990319908 -0500
18045@@ -291,7 +291,7 @@ static const struct pci_device_id piix_p 18109@@ -291,7 +291,7 @@ static const struct pci_device_id piix_p
18046 { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, 18110 { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
18047 /* SATA Controller IDE (PCH) */ 18111 /* SATA Controller IDE (PCH) */
@@ -18105,9 +18169,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/ata_piix.c linux-2.6.32.7/drivers/ata/ata_
18105 }; 18169 };
18106 static const char *oemstrs[] = { 18170 static const char *oemstrs[] = {
18107 "Tecra M3,", 18171 "Tecra M3,",
18108diff -urNp linux-2.6.32.7/drivers/ata/libata-acpi.c linux-2.6.32.7/drivers/ata/libata-acpi.c 18172diff -urNp linux-2.6.32.8/drivers/ata/libata-acpi.c linux-2.6.32.8/drivers/ata/libata-acpi.c
18109--- linux-2.6.32.7/drivers/ata/libata-acpi.c 2010-01-25 13:50:10.000000000 -0500 18173--- linux-2.6.32.8/drivers/ata/libata-acpi.c 2010-02-09 07:57:19.000000000 -0500
18110+++ linux-2.6.32.7/drivers/ata/libata-acpi.c 2010-01-25 17:39:40.402416755 -0500 18174+++ linux-2.6.32.8/drivers/ata/libata-acpi.c 2010-02-10 15:06:23.990319908 -0500
18111@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han 18175@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
18112 ata_acpi_uevent(dev->link->ap, dev, event); 18176 ata_acpi_uevent(dev->link->ap, dev, event);
18113 } 18177 }
@@ -18123,9 +18187,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-acpi.c linux-2.6.32.7/drivers/ata/l
18123 .handler = ata_acpi_ap_notify_dock, 18187 .handler = ata_acpi_ap_notify_dock,
18124 .uevent = ata_acpi_ap_uevent, 18188 .uevent = ata_acpi_ap_uevent,
18125 }; 18189 };
18126diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/libata-core.c 18190diff -urNp linux-2.6.32.8/drivers/ata/libata-core.c linux-2.6.32.8/drivers/ata/libata-core.c
18127--- linux-2.6.32.7/drivers/ata/libata-core.c 2010-01-25 13:50:10.000000000 -0500 18191--- linux-2.6.32.8/drivers/ata/libata-core.c 2010-02-09 07:57:19.000000000 -0500
18128+++ linux-2.6.32.7/drivers/ata/libata-core.c 2010-01-25 17:39:40.404236169 -0500 18192+++ linux-2.6.32.8/drivers/ata/libata-core.c 2010-02-10 15:06:23.990319908 -0500
18129@@ -896,7 +896,7 @@ static const struct ata_xfer_ent { 18193@@ -896,7 +896,7 @@ static const struct ata_xfer_ent {
18130 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, 18194 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
18131 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, 18195 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
@@ -18144,7 +18208,7 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/l
18144 }; 18208 };
18145 18209
18146 #define ENOUGH(v, unit) (((v)-1)/(unit)+1) 18210 #define ENOUGH(v, unit) (((v)-1)/(unit)+1)
18147@@ -4361,7 +4361,7 @@ static const struct ata_blacklist_entry 18211@@ -4385,7 +4385,7 @@ static const struct ata_blacklist_entry
18148 { "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER }, 18212 { "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER },
18149 18213
18150 /* End Marker */ 18214 /* End Marker */
@@ -18153,7 +18217,7 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/l
18153 }; 18217 };
18154 18218
18155 static int strn_pattern_cmp(const char *patt, const char *name, int wildchar) 18219 static int strn_pattern_cmp(const char *patt, const char *name, int wildchar)
18156@@ -5937,7 +5937,7 @@ static void ata_host_stop(struct device 18220@@ -5961,7 +5961,7 @@ static void ata_host_stop(struct device
18157 * LOCKING: 18221 * LOCKING:
18158 * None. 18222 * None.
18159 */ 18223 */
@@ -18162,7 +18226,7 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/l
18162 { 18226 {
18163 static DEFINE_SPINLOCK(lock); 18227 static DEFINE_SPINLOCK(lock);
18164 const struct ata_port_operations *cur; 18228 const struct ata_port_operations *cur;
18165@@ -5949,6 +5949,7 @@ static void ata_finalize_port_ops(struct 18229@@ -5973,6 +5973,7 @@ static void ata_finalize_port_ops(struct
18166 return; 18230 return;
18167 18231
18168 spin_lock(&lock); 18232 spin_lock(&lock);
@@ -18170,7 +18234,7 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/l
18170 18234
18171 for (cur = ops->inherits; cur; cur = cur->inherits) { 18235 for (cur = ops->inherits; cur; cur = cur->inherits) {
18172 void **inherit = (void **)cur; 18236 void **inherit = (void **)cur;
18173@@ -5962,8 +5963,9 @@ static void ata_finalize_port_ops(struct 18237@@ -5986,8 +5987,9 @@ static void ata_finalize_port_ops(struct
18174 if (IS_ERR(*pp)) 18238 if (IS_ERR(*pp))
18175 *pp = NULL; 18239 *pp = NULL;
18176 18240
@@ -18181,7 +18245,7 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/l
18181 spin_unlock(&lock); 18245 spin_unlock(&lock);
18182 } 18246 }
18183 18247
18184@@ -6060,7 +6062,7 @@ int ata_host_start(struct ata_host *host 18248@@ -6084,7 +6086,7 @@ int ata_host_start(struct ata_host *host
18185 */ 18249 */
18186 /* KILLME - the only user left is ipr */ 18250 /* KILLME - the only user left is ipr */
18187 void ata_host_init(struct ata_host *host, struct device *dev, 18251 void ata_host_init(struct ata_host *host, struct device *dev,
@@ -18190,7 +18254,7 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/l
18190 { 18254 {
18191 spin_lock_init(&host->lock); 18255 spin_lock_init(&host->lock);
18192 host->dev = dev; 18256 host->dev = dev;
18193@@ -6723,7 +6725,7 @@ static void ata_dummy_error_handler(stru 18257@@ -6747,7 +6749,7 @@ static void ata_dummy_error_handler(stru
18194 /* truly dummy */ 18258 /* truly dummy */
18195 } 18259 }
18196 18260
@@ -18199,10 +18263,10 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-core.c linux-2.6.32.7/drivers/ata/l
18199 .qc_prep = ata_noop_qc_prep, 18263 .qc_prep = ata_noop_qc_prep,
18200 .qc_issue = ata_dummy_qc_issue, 18264 .qc_issue = ata_dummy_qc_issue,
18201 .error_handler = ata_dummy_error_handler, 18265 .error_handler = ata_dummy_error_handler,
18202diff -urNp linux-2.6.32.7/drivers/ata/libata-eh.c linux-2.6.32.7/drivers/ata/libata-eh.c 18266diff -urNp linux-2.6.32.8/drivers/ata/libata-eh.c linux-2.6.32.8/drivers/ata/libata-eh.c
18203--- linux-2.6.32.7/drivers/ata/libata-eh.c 2010-01-25 13:50:10.000000000 -0500 18267--- linux-2.6.32.8/drivers/ata/libata-eh.c 2010-02-09 07:57:19.000000000 -0500
18204+++ linux-2.6.32.7/drivers/ata/libata-eh.c 2010-01-25 17:39:40.405295177 -0500 18268+++ linux-2.6.32.8/drivers/ata/libata-eh.c 2010-02-10 15:06:23.990319908 -0500
18205@@ -3580,7 +3580,7 @@ void ata_do_eh(struct ata_port *ap, ata_ 18269@@ -3581,7 +3581,7 @@ void ata_do_eh(struct ata_port *ap, ata_
18206 */ 18270 */
18207 void ata_std_error_handler(struct ata_port *ap) 18271 void ata_std_error_handler(struct ata_port *ap)
18208 { 18272 {
@@ -18211,9 +18275,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-eh.c linux-2.6.32.7/drivers/ata/lib
18211 ata_reset_fn_t hardreset = ops->hardreset; 18275 ata_reset_fn_t hardreset = ops->hardreset;
18212 18276
18213 /* ignore built-in hardreset if SCR access is not available */ 18277 /* ignore built-in hardreset if SCR access is not available */
18214diff -urNp linux-2.6.32.7/drivers/ata/libata-pmp.c linux-2.6.32.7/drivers/ata/libata-pmp.c 18278diff -urNp linux-2.6.32.8/drivers/ata/libata-pmp.c linux-2.6.32.8/drivers/ata/libata-pmp.c
18215--- linux-2.6.32.7/drivers/ata/libata-pmp.c 2010-01-25 13:50:10.000000000 -0500 18279--- linux-2.6.32.8/drivers/ata/libata-pmp.c 2010-02-09 07:57:19.000000000 -0500
18216+++ linux-2.6.32.7/drivers/ata/libata-pmp.c 2010-01-25 17:39:40.405295177 -0500 18280+++ linux-2.6.32.8/drivers/ata/libata-pmp.c 2010-02-10 15:06:23.990319908 -0500
18217@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str 18281@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
18218 */ 18282 */
18219 static int sata_pmp_eh_recover(struct ata_port *ap) 18283 static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -18223,9 +18287,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/libata-pmp.c linux-2.6.32.7/drivers/ata/li
18223 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; 18287 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
18224 struct ata_link *pmp_link = &ap->link; 18288 struct ata_link *pmp_link = &ap->link;
18225 struct ata_device *pmp_dev = pmp_link->device; 18289 struct ata_device *pmp_dev = pmp_link->device;
18226diff -urNp linux-2.6.32.7/drivers/ata/pata_acpi.c linux-2.6.32.7/drivers/ata/pata_acpi.c 18290diff -urNp linux-2.6.32.8/drivers/ata/pata_acpi.c linux-2.6.32.8/drivers/ata/pata_acpi.c
18227--- linux-2.6.32.7/drivers/ata/pata_acpi.c 2010-01-25 13:50:10.000000000 -0500 18291--- linux-2.6.32.8/drivers/ata/pata_acpi.c 2010-02-09 07:57:19.000000000 -0500
18228+++ linux-2.6.32.7/drivers/ata/pata_acpi.c 2010-01-25 17:39:40.406413096 -0500 18292+++ linux-2.6.32.8/drivers/ata/pata_acpi.c 2010-02-10 15:06:23.990319908 -0500
18229@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s 18293@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
18230 ATA_BMDMA_SHT(DRV_NAME), 18294 ATA_BMDMA_SHT(DRV_NAME),
18231 }; 18295 };
@@ -18235,9 +18299,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_acpi.c linux-2.6.32.7/drivers/ata/pat
18235 .inherits = &ata_bmdma_port_ops, 18299 .inherits = &ata_bmdma_port_ops,
18236 .qc_issue = pacpi_qc_issue, 18300 .qc_issue = pacpi_qc_issue,
18237 .cable_detect = pacpi_cable_detect, 18301 .cable_detect = pacpi_cable_detect,
18238diff -urNp linux-2.6.32.7/drivers/ata/pata_ali.c linux-2.6.32.7/drivers/ata/pata_ali.c 18302diff -urNp linux-2.6.32.8/drivers/ata/pata_ali.c linux-2.6.32.8/drivers/ata/pata_ali.c
18239--- linux-2.6.32.7/drivers/ata/pata_ali.c 2010-01-25 13:50:10.000000000 -0500 18303--- linux-2.6.32.8/drivers/ata/pata_ali.c 2010-02-09 07:57:19.000000000 -0500
18240+++ linux-2.6.32.7/drivers/ata/pata_ali.c 2010-01-25 17:39:40.406413096 -0500 18304+++ linux-2.6.32.8/drivers/ata/pata_ali.c 2010-02-10 15:06:23.990319908 -0500
18241@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht 18305@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
18242 * Port operations for PIO only ALi 18306 * Port operations for PIO only ALi
18243 */ 18307 */
@@ -18283,9 +18347,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_ali.c linux-2.6.32.7/drivers/ata/pata
18283 .inherits = &ali_dma_base_ops, 18347 .inherits = &ali_dma_base_ops,
18284 .check_atapi_dma = ali_check_atapi_dma, 18348 .check_atapi_dma = ali_check_atapi_dma,
18285 .dev_config = ali_warn_atapi_dma, 18349 .dev_config = ali_warn_atapi_dma,
18286diff -urNp linux-2.6.32.7/drivers/ata/pata_amd.c linux-2.6.32.7/drivers/ata/pata_amd.c 18350diff -urNp linux-2.6.32.8/drivers/ata/pata_amd.c linux-2.6.32.8/drivers/ata/pata_amd.c
18287--- linux-2.6.32.7/drivers/ata/pata_amd.c 2010-01-25 13:50:10.000000000 -0500 18351--- linux-2.6.32.8/drivers/ata/pata_amd.c 2010-02-09 07:57:19.000000000 -0500
18288+++ linux-2.6.32.7/drivers/ata/pata_amd.c 2010-01-25 17:39:40.406413096 -0500 18352+++ linux-2.6.32.8/drivers/ata/pata_amd.c 2010-02-10 15:06:23.990319908 -0500
18289@@ -397,28 +397,28 @@ static const struct ata_port_operations 18353@@ -397,28 +397,28 @@ static const struct ata_port_operations
18290 .prereset = amd_pre_reset, 18354 .prereset = amd_pre_reset,
18291 }; 18355 };
@@ -18335,9 +18399,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_amd.c linux-2.6.32.7/drivers/ata/pata
18335 .inherits = &nv_base_port_ops, 18399 .inherits = &nv_base_port_ops,
18336 .set_piomode = nv133_set_piomode, 18400 .set_piomode = nv133_set_piomode,
18337 .set_dmamode = nv133_set_dmamode, 18401 .set_dmamode = nv133_set_dmamode,
18338diff -urNp linux-2.6.32.7/drivers/ata/pata_artop.c linux-2.6.32.7/drivers/ata/pata_artop.c 18402diff -urNp linux-2.6.32.8/drivers/ata/pata_artop.c linux-2.6.32.8/drivers/ata/pata_artop.c
18339--- linux-2.6.32.7/drivers/ata/pata_artop.c 2010-01-25 13:50:10.000000000 -0500 18403--- linux-2.6.32.8/drivers/ata/pata_artop.c 2010-02-09 07:57:19.000000000 -0500
18340+++ linux-2.6.32.7/drivers/ata/pata_artop.c 2010-01-25 17:39:40.407117574 -0500 18404+++ linux-2.6.32.8/drivers/ata/pata_artop.c 2010-02-10 15:06:23.990319908 -0500
18341@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s 18405@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
18342 ATA_BMDMA_SHT(DRV_NAME), 18406 ATA_BMDMA_SHT(DRV_NAME),
18343 }; 18407 };
@@ -18356,9 +18420,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_artop.c linux-2.6.32.7/drivers/ata/pa
18356 .inherits = &ata_bmdma_port_ops, 18420 .inherits = &ata_bmdma_port_ops,
18357 .cable_detect = artop6260_cable_detect, 18421 .cable_detect = artop6260_cable_detect,
18358 .set_piomode = artop6260_set_piomode, 18422 .set_piomode = artop6260_set_piomode,
18359diff -urNp linux-2.6.32.7/drivers/ata/pata_at32.c linux-2.6.32.7/drivers/ata/pata_at32.c 18423diff -urNp linux-2.6.32.8/drivers/ata/pata_at32.c linux-2.6.32.8/drivers/ata/pata_at32.c
18360--- linux-2.6.32.7/drivers/ata/pata_at32.c 2010-01-25 13:50:10.000000000 -0500 18424--- linux-2.6.32.8/drivers/ata/pata_at32.c 2010-02-09 07:57:19.000000000 -0500
18361+++ linux-2.6.32.7/drivers/ata/pata_at32.c 2010-01-25 17:39:40.407117574 -0500 18425+++ linux-2.6.32.8/drivers/ata/pata_at32.c 2010-02-10 15:06:23.990319908 -0500
18362@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh 18426@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
18363 ATA_PIO_SHT(DRV_NAME), 18427 ATA_PIO_SHT(DRV_NAME),
18364 }; 18428 };
@@ -18368,9 +18432,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_at32.c linux-2.6.32.7/drivers/ata/pat
18368 .inherits = &ata_sff_port_ops, 18432 .inherits = &ata_sff_port_ops,
18369 .cable_detect = ata_cable_40wire, 18433 .cable_detect = ata_cable_40wire,
18370 .set_piomode = pata_at32_set_piomode, 18434 .set_piomode = pata_at32_set_piomode,
18371diff -urNp linux-2.6.32.7/drivers/ata/pata_at91.c linux-2.6.32.7/drivers/ata/pata_at91.c 18435diff -urNp linux-2.6.32.8/drivers/ata/pata_at91.c linux-2.6.32.8/drivers/ata/pata_at91.c
18372--- linux-2.6.32.7/drivers/ata/pata_at91.c 2010-01-25 13:50:10.000000000 -0500 18436--- linux-2.6.32.8/drivers/ata/pata_at91.c 2010-02-09 07:57:19.000000000 -0500
18373+++ linux-2.6.32.7/drivers/ata/pata_at91.c 2010-01-25 17:39:40.407117574 -0500 18437+++ linux-2.6.32.8/drivers/ata/pata_at91.c 2010-02-10 15:06:23.990319908 -0500
18374@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at 18438@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
18375 ATA_PIO_SHT(DRV_NAME), 18439 ATA_PIO_SHT(DRV_NAME),
18376 }; 18440 };
@@ -18380,9 +18444,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_at91.c linux-2.6.32.7/drivers/ata/pat
18380 .inherits = &ata_sff_port_ops, 18444 .inherits = &ata_sff_port_ops,
18381 18445
18382 .sff_data_xfer = pata_at91_data_xfer_noirq, 18446 .sff_data_xfer = pata_at91_data_xfer_noirq,
18383diff -urNp linux-2.6.32.7/drivers/ata/pata_atiixp.c linux-2.6.32.7/drivers/ata/pata_atiixp.c 18447diff -urNp linux-2.6.32.8/drivers/ata/pata_atiixp.c linux-2.6.32.8/drivers/ata/pata_atiixp.c
18384--- linux-2.6.32.7/drivers/ata/pata_atiixp.c 2010-01-25 13:50:10.000000000 -0500 18448--- linux-2.6.32.8/drivers/ata/pata_atiixp.c 2010-02-09 07:57:19.000000000 -0500
18385+++ linux-2.6.32.7/drivers/ata/pata_atiixp.c 2010-01-25 17:39:40.407117574 -0500 18449+++ linux-2.6.32.8/drivers/ata/pata_atiixp.c 2010-02-10 15:06:23.990319908 -0500
18386@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ 18450@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
18387 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 18451 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
18388 }; 18452 };
@@ -18392,9 +18456,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_atiixp.c linux-2.6.32.7/drivers/ata/p
18392 .inherits = &ata_bmdma_port_ops, 18456 .inherits = &ata_bmdma_port_ops,
18393 18457
18394 .qc_prep = ata_sff_dumb_qc_prep, 18458 .qc_prep = ata_sff_dumb_qc_prep,
18395diff -urNp linux-2.6.32.7/drivers/ata/pata_atp867x.c linux-2.6.32.7/drivers/ata/pata_atp867x.c 18459diff -urNp linux-2.6.32.8/drivers/ata/pata_atp867x.c linux-2.6.32.8/drivers/ata/pata_atp867x.c
18396--- linux-2.6.32.7/drivers/ata/pata_atp867x.c 2010-01-25 13:50:10.000000000 -0500 18460--- linux-2.6.32.8/drivers/ata/pata_atp867x.c 2010-02-09 07:57:19.000000000 -0500
18397+++ linux-2.6.32.7/drivers/ata/pata_atp867x.c 2010-01-25 17:39:40.407117574 -0500 18461+++ linux-2.6.32.8/drivers/ata/pata_atp867x.c 2010-02-10 15:06:23.990319908 -0500
18398@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x 18462@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
18399 ATA_BMDMA_SHT(DRV_NAME), 18463 ATA_BMDMA_SHT(DRV_NAME),
18400 }; 18464 };
@@ -18404,9 +18468,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_atp867x.c linux-2.6.32.7/drivers/ata/
18404 .inherits = &ata_bmdma_port_ops, 18468 .inherits = &ata_bmdma_port_ops,
18405 .cable_detect = atp867x_cable_detect, 18469 .cable_detect = atp867x_cable_detect,
18406 .set_piomode = atp867x_set_piomode, 18470 .set_piomode = atp867x_set_piomode,
18407diff -urNp linux-2.6.32.7/drivers/ata/pata_bf54x.c linux-2.6.32.7/drivers/ata/pata_bf54x.c 18471diff -urNp linux-2.6.32.8/drivers/ata/pata_bf54x.c linux-2.6.32.8/drivers/ata/pata_bf54x.c
18408--- linux-2.6.32.7/drivers/ata/pata_bf54x.c 2010-01-25 13:50:10.000000000 -0500 18472--- linux-2.6.32.8/drivers/ata/pata_bf54x.c 2010-02-09 07:57:19.000000000 -0500
18409+++ linux-2.6.32.7/drivers/ata/pata_bf54x.c 2010-01-25 17:39:40.408115294 -0500 18473+++ linux-2.6.32.8/drivers/ata/pata_bf54x.c 2010-02-10 15:06:23.990319908 -0500
18410@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh 18474@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
18411 .dma_boundary = ATA_DMA_BOUNDARY, 18475 .dma_boundary = ATA_DMA_BOUNDARY,
18412 }; 18476 };
@@ -18416,9 +18480,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_bf54x.c linux-2.6.32.7/drivers/ata/pa
18416 .inherits = &ata_sff_port_ops, 18480 .inherits = &ata_sff_port_ops,
18417 18481
18418 .set_piomode = bfin_set_piomode, 18482 .set_piomode = bfin_set_piomode,
18419diff -urNp linux-2.6.32.7/drivers/ata/pata_cmd640.c linux-2.6.32.7/drivers/ata/pata_cmd640.c 18483diff -urNp linux-2.6.32.8/drivers/ata/pata_cmd640.c linux-2.6.32.8/drivers/ata/pata_cmd640.c
18420--- linux-2.6.32.7/drivers/ata/pata_cmd640.c 2010-01-25 13:50:10.000000000 -0500 18484--- linux-2.6.32.8/drivers/ata/pata_cmd640.c 2010-02-09 07:57:19.000000000 -0500
18421+++ linux-2.6.32.7/drivers/ata/pata_cmd640.c 2010-01-25 17:39:40.408115294 -0500 18485+++ linux-2.6.32.8/drivers/ata/pata_cmd640.c 2010-02-10 15:06:23.990319908 -0500
18422@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ 18486@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
18423 ATA_BMDMA_SHT(DRV_NAME), 18487 ATA_BMDMA_SHT(DRV_NAME),
18424 }; 18488 };
@@ -18428,9 +18492,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_cmd640.c linux-2.6.32.7/drivers/ata/p
18428 .inherits = &ata_bmdma_port_ops, 18492 .inherits = &ata_bmdma_port_ops,
18429 /* In theory xfer_noirq is not needed once we kill the prefetcher */ 18493 /* In theory xfer_noirq is not needed once we kill the prefetcher */
18430 .sff_data_xfer = ata_sff_data_xfer_noirq, 18494 .sff_data_xfer = ata_sff_data_xfer_noirq,
18431diff -urNp linux-2.6.32.7/drivers/ata/pata_cmd64x.c linux-2.6.32.7/drivers/ata/pata_cmd64x.c 18495diff -urNp linux-2.6.32.8/drivers/ata/pata_cmd64x.c linux-2.6.32.8/drivers/ata/pata_cmd64x.c
18432--- linux-2.6.32.7/drivers/ata/pata_cmd64x.c 2010-01-25 13:50:10.000000000 -0500 18496--- linux-2.6.32.8/drivers/ata/pata_cmd64x.c 2010-02-09 07:57:19.000000000 -0500
18433+++ linux-2.6.32.7/drivers/ata/pata_cmd64x.c 2010-01-25 17:39:40.408115294 -0500 18497+++ linux-2.6.32.8/drivers/ata/pata_cmd64x.c 2010-02-10 15:06:23.990319908 -0500
18434@@ -275,18 +275,18 @@ static const struct ata_port_operations 18498@@ -275,18 +275,18 @@ static const struct ata_port_operations
18435 .set_dmamode = cmd64x_set_dmamode, 18499 .set_dmamode = cmd64x_set_dmamode,
18436 }; 18500 };
@@ -18453,9 +18517,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_cmd64x.c linux-2.6.32.7/drivers/ata/p
18453 .inherits = &cmd64x_base_ops, 18517 .inherits = &cmd64x_base_ops,
18454 .bmdma_stop = cmd648_bmdma_stop, 18518 .bmdma_stop = cmd648_bmdma_stop,
18455 .cable_detect = cmd648_cable_detect, 18519 .cable_detect = cmd648_cable_detect,
18456diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5520.c linux-2.6.32.7/drivers/ata/pata_cs5520.c 18520diff -urNp linux-2.6.32.8/drivers/ata/pata_cs5520.c linux-2.6.32.8/drivers/ata/pata_cs5520.c
18457--- linux-2.6.32.7/drivers/ata/pata_cs5520.c 2010-01-25 13:50:10.000000000 -0500 18521--- linux-2.6.32.8/drivers/ata/pata_cs5520.c 2010-02-09 07:57:19.000000000 -0500
18458+++ linux-2.6.32.7/drivers/ata/pata_cs5520.c 2010-01-25 17:39:40.408115294 -0500 18522+++ linux-2.6.32.8/drivers/ata/pata_cs5520.c 2010-02-10 15:06:23.990319908 -0500
18459@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ 18523@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
18460 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 18524 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
18461 }; 18525 };
@@ -18465,9 +18529,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5520.c linux-2.6.32.7/drivers/ata/p
18465 .inherits = &ata_bmdma_port_ops, 18529 .inherits = &ata_bmdma_port_ops,
18466 .qc_prep = ata_sff_dumb_qc_prep, 18530 .qc_prep = ata_sff_dumb_qc_prep,
18467 .cable_detect = ata_cable_40wire, 18531 .cable_detect = ata_cable_40wire,
18468diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5530.c linux-2.6.32.7/drivers/ata/pata_cs5530.c 18532diff -urNp linux-2.6.32.8/drivers/ata/pata_cs5530.c linux-2.6.32.8/drivers/ata/pata_cs5530.c
18469--- linux-2.6.32.7/drivers/ata/pata_cs5530.c 2010-01-25 13:50:10.000000000 -0500 18533--- linux-2.6.32.8/drivers/ata/pata_cs5530.c 2010-02-09 07:57:19.000000000 -0500
18470+++ linux-2.6.32.7/drivers/ata/pata_cs5530.c 2010-01-25 17:39:40.408115294 -0500 18534+++ linux-2.6.32.8/drivers/ata/pata_cs5530.c 2010-02-10 15:06:23.990319908 -0500
18471@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ 18535@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
18472 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 18536 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
18473 }; 18537 };
@@ -18477,9 +18541,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5530.c linux-2.6.32.7/drivers/ata/p
18477 .inherits = &ata_bmdma_port_ops, 18541 .inherits = &ata_bmdma_port_ops,
18478 18542
18479 .qc_prep = ata_sff_dumb_qc_prep, 18543 .qc_prep = ata_sff_dumb_qc_prep,
18480diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5535.c linux-2.6.32.7/drivers/ata/pata_cs5535.c 18544diff -urNp linux-2.6.32.8/drivers/ata/pata_cs5535.c linux-2.6.32.8/drivers/ata/pata_cs5535.c
18481--- linux-2.6.32.7/drivers/ata/pata_cs5535.c 2010-01-25 13:50:10.000000000 -0500 18545--- linux-2.6.32.8/drivers/ata/pata_cs5535.c 2010-02-09 07:57:19.000000000 -0500
18482+++ linux-2.6.32.7/drivers/ata/pata_cs5535.c 2010-01-25 17:39:40.408115294 -0500 18546+++ linux-2.6.32.8/drivers/ata/pata_cs5535.c 2010-02-10 15:06:23.990319908 -0500
18483@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ 18547@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
18484 ATA_BMDMA_SHT(DRV_NAME), 18548 ATA_BMDMA_SHT(DRV_NAME),
18485 }; 18549 };
@@ -18489,9 +18553,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5535.c linux-2.6.32.7/drivers/ata/p
18489 .inherits = &ata_bmdma_port_ops, 18553 .inherits = &ata_bmdma_port_ops,
18490 .cable_detect = cs5535_cable_detect, 18554 .cable_detect = cs5535_cable_detect,
18491 .set_piomode = cs5535_set_piomode, 18555 .set_piomode = cs5535_set_piomode,
18492diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5536.c linux-2.6.32.7/drivers/ata/pata_cs5536.c 18556diff -urNp linux-2.6.32.8/drivers/ata/pata_cs5536.c linux-2.6.32.8/drivers/ata/pata_cs5536.c
18493--- linux-2.6.32.7/drivers/ata/pata_cs5536.c 2010-01-25 13:50:10.000000000 -0500 18557--- linux-2.6.32.8/drivers/ata/pata_cs5536.c 2010-02-09 07:57:19.000000000 -0500
18494+++ linux-2.6.32.7/drivers/ata/pata_cs5536.c 2010-01-25 17:39:40.418336500 -0500 18558+++ linux-2.6.32.8/drivers/ata/pata_cs5536.c 2010-02-10 15:06:23.995503045 -0500
18495@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ 18559@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
18496 ATA_BMDMA_SHT(DRV_NAME), 18560 ATA_BMDMA_SHT(DRV_NAME),
18497 }; 18561 };
@@ -18501,9 +18565,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_cs5536.c linux-2.6.32.7/drivers/ata/p
18501 .inherits = &ata_bmdma_port_ops, 18565 .inherits = &ata_bmdma_port_ops,
18502 .cable_detect = cs5536_cable_detect, 18566 .cable_detect = cs5536_cable_detect,
18503 .set_piomode = cs5536_set_piomode, 18567 .set_piomode = cs5536_set_piomode,
18504diff -urNp linux-2.6.32.7/drivers/ata/pata_cypress.c linux-2.6.32.7/drivers/ata/pata_cypress.c 18568diff -urNp linux-2.6.32.8/drivers/ata/pata_cypress.c linux-2.6.32.8/drivers/ata/pata_cypress.c
18505--- linux-2.6.32.7/drivers/ata/pata_cypress.c 2010-01-25 13:50:10.000000000 -0500 18569--- linux-2.6.32.8/drivers/ata/pata_cypress.c 2010-02-09 07:57:19.000000000 -0500
18506+++ linux-2.6.32.7/drivers/ata/pata_cypress.c 2010-01-25 17:39:40.418336500 -0500 18570+++ linux-2.6.32.8/drivers/ata/pata_cypress.c 2010-02-10 15:06:23.995503045 -0500
18507@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 18571@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
18508 ATA_BMDMA_SHT(DRV_NAME), 18572 ATA_BMDMA_SHT(DRV_NAME),
18509 }; 18573 };
@@ -18513,9 +18577,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_cypress.c linux-2.6.32.7/drivers/ata/
18513 .inherits = &ata_bmdma_port_ops, 18577 .inherits = &ata_bmdma_port_ops,
18514 .cable_detect = ata_cable_40wire, 18578 .cable_detect = ata_cable_40wire,
18515 .set_piomode = cy82c693_set_piomode, 18579 .set_piomode = cy82c693_set_piomode,
18516diff -urNp linux-2.6.32.7/drivers/ata/pata_efar.c linux-2.6.32.7/drivers/ata/pata_efar.c 18580diff -urNp linux-2.6.32.8/drivers/ata/pata_efar.c linux-2.6.32.8/drivers/ata/pata_efar.c
18517--- linux-2.6.32.7/drivers/ata/pata_efar.c 2010-01-25 13:50:10.000000000 -0500 18581--- linux-2.6.32.8/drivers/ata/pata_efar.c 2010-02-09 07:57:19.000000000 -0500
18518+++ linux-2.6.32.7/drivers/ata/pata_efar.c 2010-01-25 17:39:40.418336500 -0500 18582+++ linux-2.6.32.8/drivers/ata/pata_efar.c 2010-02-10 15:06:23.995503045 -0500
18519@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh 18583@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
18520 ATA_BMDMA_SHT(DRV_NAME), 18584 ATA_BMDMA_SHT(DRV_NAME),
18521 }; 18585 };
@@ -18525,9 +18589,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_efar.c linux-2.6.32.7/drivers/ata/pat
18525 .inherits = &ata_bmdma_port_ops, 18589 .inherits = &ata_bmdma_port_ops,
18526 .cable_detect = efar_cable_detect, 18590 .cable_detect = efar_cable_detect,
18527 .set_piomode = efar_set_piomode, 18591 .set_piomode = efar_set_piomode,
18528diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt366.c linux-2.6.32.7/drivers/ata/pata_hpt366.c 18592diff -urNp linux-2.6.32.8/drivers/ata/pata_hpt366.c linux-2.6.32.8/drivers/ata/pata_hpt366.c
18529--- linux-2.6.32.7/drivers/ata/pata_hpt366.c 2010-01-25 13:50:10.000000000 -0500 18593--- linux-2.6.32.8/drivers/ata/pata_hpt366.c 2010-02-09 07:57:19.000000000 -0500
18530+++ linux-2.6.32.7/drivers/ata/pata_hpt366.c 2010-01-25 17:39:40.418336500 -0500 18594+++ linux-2.6.32.8/drivers/ata/pata_hpt366.c 2010-02-10 15:06:23.995503045 -0500
18531@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ 18595@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
18532 * Configuration for HPT366/68 18596 * Configuration for HPT366/68
18533 */ 18597 */
@@ -18537,9 +18601,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt366.c linux-2.6.32.7/drivers/ata/p
18537 .inherits = &ata_bmdma_port_ops, 18601 .inherits = &ata_bmdma_port_ops,
18538 .cable_detect = hpt36x_cable_detect, 18602 .cable_detect = hpt36x_cable_detect,
18539 .mode_filter = hpt366_filter, 18603 .mode_filter = hpt366_filter,
18540diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt37x.c linux-2.6.32.7/drivers/ata/pata_hpt37x.c 18604diff -urNp linux-2.6.32.8/drivers/ata/pata_hpt37x.c linux-2.6.32.8/drivers/ata/pata_hpt37x.c
18541--- linux-2.6.32.7/drivers/ata/pata_hpt37x.c 2010-01-25 13:50:10.000000000 -0500 18605--- linux-2.6.32.8/drivers/ata/pata_hpt37x.c 2010-02-09 07:57:19.000000000 -0500
18542+++ linux-2.6.32.7/drivers/ata/pata_hpt37x.c 2010-01-25 17:39:40.419217923 -0500 18606+++ linux-2.6.32.8/drivers/ata/pata_hpt37x.c 2010-02-10 15:06:23.995503045 -0500
18543@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ 18607@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
18544 * Configuration for HPT370 18608 * Configuration for HPT370
18545 */ 18609 */
@@ -18576,9 +18640,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt37x.c linux-2.6.32.7/drivers/ata/p
18576 .inherits = &hpt372_port_ops, 18640 .inherits = &hpt372_port_ops,
18577 .prereset = hpt374_fn1_pre_reset, 18641 .prereset = hpt374_fn1_pre_reset,
18578 }; 18642 };
18579diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt3x2n.c linux-2.6.32.7/drivers/ata/pata_hpt3x2n.c 18643diff -urNp linux-2.6.32.8/drivers/ata/pata_hpt3x2n.c linux-2.6.32.8/drivers/ata/pata_hpt3x2n.c
18580--- linux-2.6.32.7/drivers/ata/pata_hpt3x2n.c 2010-01-25 13:50:10.000000000 -0500 18644--- linux-2.6.32.8/drivers/ata/pata_hpt3x2n.c 2010-02-09 07:57:19.000000000 -0500
18581+++ linux-2.6.32.7/drivers/ata/pata_hpt3x2n.c 2010-01-25 17:39:40.419217923 -0500 18645+++ linux-2.6.32.8/drivers/ata/pata_hpt3x2n.c 2010-02-10 15:06:23.995503045 -0500
18582@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n 18646@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
18583 * Configuration for HPT3x2n. 18647 * Configuration for HPT3x2n.
18584 */ 18648 */
@@ -18588,9 +18652,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt3x2n.c linux-2.6.32.7/drivers/ata/
18588 .inherits = &ata_bmdma_port_ops, 18652 .inherits = &ata_bmdma_port_ops,
18589 18653
18590 .bmdma_stop = hpt3x2n_bmdma_stop, 18654 .bmdma_stop = hpt3x2n_bmdma_stop,
18591diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt3x3.c linux-2.6.32.7/drivers/ata/pata_hpt3x3.c 18655diff -urNp linux-2.6.32.8/drivers/ata/pata_hpt3x3.c linux-2.6.32.8/drivers/ata/pata_hpt3x3.c
18592--- linux-2.6.32.7/drivers/ata/pata_hpt3x3.c 2010-01-25 13:50:10.000000000 -0500 18656--- linux-2.6.32.8/drivers/ata/pata_hpt3x3.c 2010-02-09 07:57:19.000000000 -0500
18593+++ linux-2.6.32.7/drivers/ata/pata_hpt3x3.c 2010-01-25 17:39:40.419217923 -0500 18657+++ linux-2.6.32.8/drivers/ata/pata_hpt3x3.c 2010-02-10 15:06:23.995503045 -0500
18594@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ 18658@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
18595 ATA_BMDMA_SHT(DRV_NAME), 18659 ATA_BMDMA_SHT(DRV_NAME),
18596 }; 18660 };
@@ -18600,9 +18664,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_hpt3x3.c linux-2.6.32.7/drivers/ata/p
18600 .inherits = &ata_bmdma_port_ops, 18664 .inherits = &ata_bmdma_port_ops,
18601 .cable_detect = ata_cable_40wire, 18665 .cable_detect = ata_cable_40wire,
18602 .set_piomode = hpt3x3_set_piomode, 18666 .set_piomode = hpt3x3_set_piomode,
18603diff -urNp linux-2.6.32.7/drivers/ata/pata_icside.c linux-2.6.32.7/drivers/ata/pata_icside.c 18667diff -urNp linux-2.6.32.8/drivers/ata/pata_icside.c linux-2.6.32.8/drivers/ata/pata_icside.c
18604--- linux-2.6.32.7/drivers/ata/pata_icside.c 2010-01-25 13:50:10.000000000 -0500 18668--- linux-2.6.32.8/drivers/ata/pata_icside.c 2010-02-09 07:57:19.000000000 -0500
18605+++ linux-2.6.32.7/drivers/ata/pata_icside.c 2010-01-25 17:39:40.419217923 -0500 18669+++ linux-2.6.32.8/drivers/ata/pata_icside.c 2010-02-10 15:06:23.995503045 -0500
18606@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct 18670@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
18607 } 18671 }
18608 } 18672 }
@@ -18612,9 +18676,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_icside.c linux-2.6.32.7/drivers/ata/p
18612 .inherits = &ata_sff_port_ops, 18676 .inherits = &ata_sff_port_ops,
18613 /* no need to build any PRD tables for DMA */ 18677 /* no need to build any PRD tables for DMA */
18614 .qc_prep = ata_noop_qc_prep, 18678 .qc_prep = ata_noop_qc_prep,
18615diff -urNp linux-2.6.32.7/drivers/ata/pata_isapnp.c linux-2.6.32.7/drivers/ata/pata_isapnp.c 18679diff -urNp linux-2.6.32.8/drivers/ata/pata_isapnp.c linux-2.6.32.8/drivers/ata/pata_isapnp.c
18616--- linux-2.6.32.7/drivers/ata/pata_isapnp.c 2010-01-25 13:50:10.000000000 -0500 18680--- linux-2.6.32.8/drivers/ata/pata_isapnp.c 2010-02-09 07:57:19.000000000 -0500
18617+++ linux-2.6.32.7/drivers/ata/pata_isapnp.c 2010-01-25 17:39:40.419217923 -0500 18681+++ linux-2.6.32.8/drivers/ata/pata_isapnp.c 2010-02-10 15:06:23.995503045 -0500
18618@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ 18682@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
18619 ATA_PIO_SHT(DRV_NAME), 18683 ATA_PIO_SHT(DRV_NAME),
18620 }; 18684 };
@@ -18630,9 +18694,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_isapnp.c linux-2.6.32.7/drivers/ata/p
18630 .inherits = &ata_sff_port_ops, 18694 .inherits = &ata_sff_port_ops,
18631 .cable_detect = ata_cable_40wire, 18695 .cable_detect = ata_cable_40wire,
18632 /* No altstatus so we don't want to use the lost interrupt poll */ 18696 /* No altstatus so we don't want to use the lost interrupt poll */
18633diff -urNp linux-2.6.32.7/drivers/ata/pata_it8213.c linux-2.6.32.7/drivers/ata/pata_it8213.c 18697diff -urNp linux-2.6.32.8/drivers/ata/pata_it8213.c linux-2.6.32.8/drivers/ata/pata_it8213.c
18634--- linux-2.6.32.7/drivers/ata/pata_it8213.c 2010-01-25 13:50:10.000000000 -0500 18698--- linux-2.6.32.8/drivers/ata/pata_it8213.c 2010-02-09 07:57:19.000000000 -0500
18635+++ linux-2.6.32.7/drivers/ata/pata_it8213.c 2010-01-25 17:39:40.419217923 -0500 18699+++ linux-2.6.32.8/drivers/ata/pata_it8213.c 2010-02-10 15:06:23.995503045 -0500
18636@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ 18700@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
18637 }; 18701 };
18638 18702
@@ -18642,9 +18706,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_it8213.c linux-2.6.32.7/drivers/ata/p
18642 .inherits = &ata_bmdma_port_ops, 18706 .inherits = &ata_bmdma_port_ops,
18643 .cable_detect = it8213_cable_detect, 18707 .cable_detect = it8213_cable_detect,
18644 .set_piomode = it8213_set_piomode, 18708 .set_piomode = it8213_set_piomode,
18645diff -urNp linux-2.6.32.7/drivers/ata/pata_it821x.c linux-2.6.32.7/drivers/ata/pata_it821x.c 18709diff -urNp linux-2.6.32.8/drivers/ata/pata_it821x.c linux-2.6.32.8/drivers/ata/pata_it821x.c
18646--- linux-2.6.32.7/drivers/ata/pata_it821x.c 2010-01-25 13:50:10.000000000 -0500 18710--- linux-2.6.32.8/drivers/ata/pata_it821x.c 2010-02-09 07:57:19.000000000 -0500
18647+++ linux-2.6.32.7/drivers/ata/pata_it821x.c 2010-01-25 17:39:40.420372432 -0500 18711+++ linux-2.6.32.8/drivers/ata/pata_it821x.c 2010-02-10 15:06:23.995503045 -0500
18648@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ 18712@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
18649 ATA_BMDMA_SHT(DRV_NAME), 18713 ATA_BMDMA_SHT(DRV_NAME),
18650 }; 18714 };
@@ -18672,9 +18736,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_it821x.c linux-2.6.32.7/drivers/ata/p
18672 .inherits = &ata_bmdma_port_ops, 18736 .inherits = &ata_bmdma_port_ops,
18673 18737
18674 .check_atapi_dma= it821x_check_atapi_dma, 18738 .check_atapi_dma= it821x_check_atapi_dma,
18675diff -urNp linux-2.6.32.7/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.7/drivers/ata/pata_ixp4xx_cf.c 18739diff -urNp linux-2.6.32.8/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.8/drivers/ata/pata_ixp4xx_cf.c
18676--- linux-2.6.32.7/drivers/ata/pata_ixp4xx_cf.c 2010-01-25 13:50:10.000000000 -0500 18740--- linux-2.6.32.8/drivers/ata/pata_ixp4xx_cf.c 2010-02-09 07:57:19.000000000 -0500
18677+++ linux-2.6.32.7/drivers/ata/pata_ixp4xx_cf.c 2010-01-25 17:39:40.420372432 -0500 18741+++ linux-2.6.32.8/drivers/ata/pata_ixp4xx_cf.c 2010-02-10 15:06:23.995503045 -0500
18678@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ 18742@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
18679 ATA_PIO_SHT(DRV_NAME), 18743 ATA_PIO_SHT(DRV_NAME),
18680 }; 18744 };
@@ -18684,9 +18748,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.7/drivers/at
18684 .inherits = &ata_sff_port_ops, 18748 .inherits = &ata_sff_port_ops,
18685 .sff_data_xfer = ixp4xx_mmio_data_xfer, 18749 .sff_data_xfer = ixp4xx_mmio_data_xfer,
18686 .cable_detect = ata_cable_40wire, 18750 .cable_detect = ata_cable_40wire,
18687diff -urNp linux-2.6.32.7/drivers/ata/pata_jmicron.c linux-2.6.32.7/drivers/ata/pata_jmicron.c 18751diff -urNp linux-2.6.32.8/drivers/ata/pata_jmicron.c linux-2.6.32.8/drivers/ata/pata_jmicron.c
18688--- linux-2.6.32.7/drivers/ata/pata_jmicron.c 2010-01-25 13:50:10.000000000 -0500 18752--- linux-2.6.32.8/drivers/ata/pata_jmicron.c 2010-02-09 07:57:19.000000000 -0500
18689+++ linux-2.6.32.7/drivers/ata/pata_jmicron.c 2010-01-25 17:39:40.420372432 -0500 18753+++ linux-2.6.32.8/drivers/ata/pata_jmicron.c 2010-02-10 15:06:23.995503045 -0500
18690@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron 18754@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
18691 ATA_BMDMA_SHT(DRV_NAME), 18755 ATA_BMDMA_SHT(DRV_NAME),
18692 }; 18756 };
@@ -18696,9 +18760,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_jmicron.c linux-2.6.32.7/drivers/ata/
18696 .inherits = &ata_bmdma_port_ops, 18760 .inherits = &ata_bmdma_port_ops,
18697 .prereset = jmicron_pre_reset, 18761 .prereset = jmicron_pre_reset,
18698 }; 18762 };
18699diff -urNp linux-2.6.32.7/drivers/ata/pata_legacy.c linux-2.6.32.7/drivers/ata/pata_legacy.c 18763diff -urNp linux-2.6.32.8/drivers/ata/pata_legacy.c linux-2.6.32.8/drivers/ata/pata_legacy.c
18700--- linux-2.6.32.7/drivers/ata/pata_legacy.c 2010-01-25 13:50:10.000000000 -0500 18764--- linux-2.6.32.8/drivers/ata/pata_legacy.c 2010-02-09 07:57:19.000000000 -0500
18701+++ linux-2.6.32.7/drivers/ata/pata_legacy.c 2010-01-25 17:39:40.420372432 -0500 18765+++ linux-2.6.32.8/drivers/ata/pata_legacy.c 2010-02-10 15:06:23.995503045 -0500
18702@@ -106,7 +106,7 @@ struct legacy_probe { 18766@@ -106,7 +106,7 @@ struct legacy_probe {
18703 18767
18704 struct legacy_controller { 18768 struct legacy_controller {
@@ -18810,9 +18874,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_legacy.c linux-2.6.32.7/drivers/ata/p
18810 struct legacy_data *ld = &legacy_data[probe->slot]; 18874 struct legacy_data *ld = &legacy_data[probe->slot];
18811 struct ata_host *host = NULL; 18875 struct ata_host *host = NULL;
18812 struct ata_port *ap; 18876 struct ata_port *ap;
18813diff -urNp linux-2.6.32.7/drivers/ata/pata_marvell.c linux-2.6.32.7/drivers/ata/pata_marvell.c 18877diff -urNp linux-2.6.32.8/drivers/ata/pata_marvell.c linux-2.6.32.8/drivers/ata/pata_marvell.c
18814--- linux-2.6.32.7/drivers/ata/pata_marvell.c 2010-01-25 13:50:10.000000000 -0500 18878--- linux-2.6.32.8/drivers/ata/pata_marvell.c 2010-02-09 07:57:19.000000000 -0500
18815+++ linux-2.6.32.7/drivers/ata/pata_marvell.c 2010-01-25 17:39:40.421405149 -0500 18879+++ linux-2.6.32.8/drivers/ata/pata_marvell.c 2010-02-10 15:06:23.995503045 -0500
18816@@ -100,7 +100,7 @@ static struct scsi_host_template marvell 18880@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
18817 ATA_BMDMA_SHT(DRV_NAME), 18881 ATA_BMDMA_SHT(DRV_NAME),
18818 }; 18882 };
@@ -18822,9 +18886,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_marvell.c linux-2.6.32.7/drivers/ata/
18822 .inherits = &ata_bmdma_port_ops, 18886 .inherits = &ata_bmdma_port_ops,
18823 .cable_detect = marvell_cable_detect, 18887 .cable_detect = marvell_cable_detect,
18824 .prereset = marvell_pre_reset, 18888 .prereset = marvell_pre_reset,
18825diff -urNp linux-2.6.32.7/drivers/ata/pata_mpc52xx.c linux-2.6.32.7/drivers/ata/pata_mpc52xx.c 18889diff -urNp linux-2.6.32.8/drivers/ata/pata_mpc52xx.c linux-2.6.32.8/drivers/ata/pata_mpc52xx.c
18826--- linux-2.6.32.7/drivers/ata/pata_mpc52xx.c 2010-01-25 13:50:10.000000000 -0500 18890--- linux-2.6.32.8/drivers/ata/pata_mpc52xx.c 2010-02-09 07:57:19.000000000 -0500
18827+++ linux-2.6.32.7/drivers/ata/pata_mpc52xx.c 2010-01-25 17:39:40.421405149 -0500 18891+++ linux-2.6.32.8/drivers/ata/pata_mpc52xx.c 2010-02-10 15:06:23.995503045 -0500
18828@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx 18892@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
18829 ATA_PIO_SHT(DRV_NAME), 18893 ATA_PIO_SHT(DRV_NAME),
18830 }; 18894 };
@@ -18834,9 +18898,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_mpc52xx.c linux-2.6.32.7/drivers/ata/
18834 .inherits = &ata_sff_port_ops, 18898 .inherits = &ata_sff_port_ops,
18835 .sff_dev_select = mpc52xx_ata_dev_select, 18899 .sff_dev_select = mpc52xx_ata_dev_select,
18836 .set_piomode = mpc52xx_ata_set_piomode, 18900 .set_piomode = mpc52xx_ata_set_piomode,
18837diff -urNp linux-2.6.32.7/drivers/ata/pata_mpiix.c linux-2.6.32.7/drivers/ata/pata_mpiix.c 18901diff -urNp linux-2.6.32.8/drivers/ata/pata_mpiix.c linux-2.6.32.8/drivers/ata/pata_mpiix.c
18838--- linux-2.6.32.7/drivers/ata/pata_mpiix.c 2010-01-25 13:50:10.000000000 -0500 18902--- linux-2.6.32.8/drivers/ata/pata_mpiix.c 2010-02-09 07:57:19.000000000 -0500
18839+++ linux-2.6.32.7/drivers/ata/pata_mpiix.c 2010-01-25 17:39:40.421405149 -0500 18903+++ linux-2.6.32.8/drivers/ata/pata_mpiix.c 2010-02-10 15:06:23.995503045 -0500
18840@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s 18904@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
18841 ATA_PIO_SHT(DRV_NAME), 18905 ATA_PIO_SHT(DRV_NAME),
18842 }; 18906 };
@@ -18846,9 +18910,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_mpiix.c linux-2.6.32.7/drivers/ata/pa
18846 .inherits = &ata_sff_port_ops, 18910 .inherits = &ata_sff_port_ops,
18847 .qc_issue = mpiix_qc_issue, 18911 .qc_issue = mpiix_qc_issue,
18848 .cable_detect = ata_cable_40wire, 18912 .cable_detect = ata_cable_40wire,
18849diff -urNp linux-2.6.32.7/drivers/ata/pata_netcell.c linux-2.6.32.7/drivers/ata/pata_netcell.c 18913diff -urNp linux-2.6.32.8/drivers/ata/pata_netcell.c linux-2.6.32.8/drivers/ata/pata_netcell.c
18850--- linux-2.6.32.7/drivers/ata/pata_netcell.c 2010-01-25 13:50:10.000000000 -0500 18914--- linux-2.6.32.8/drivers/ata/pata_netcell.c 2010-02-09 07:57:19.000000000 -0500
18851+++ linux-2.6.32.7/drivers/ata/pata_netcell.c 2010-01-25 17:39:40.421405149 -0500 18915+++ linux-2.6.32.8/drivers/ata/pata_netcell.c 2010-02-10 15:06:23.995503045 -0500
18852@@ -34,7 +34,7 @@ static struct scsi_host_template netcell 18916@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
18853 ATA_BMDMA_SHT(DRV_NAME), 18917 ATA_BMDMA_SHT(DRV_NAME),
18854 }; 18918 };
@@ -18858,9 +18922,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_netcell.c linux-2.6.32.7/drivers/ata/
18858 .inherits = &ata_bmdma_port_ops, 18922 .inherits = &ata_bmdma_port_ops,
18859 .cable_detect = ata_cable_80wire, 18923 .cable_detect = ata_cable_80wire,
18860 .read_id = netcell_read_id, 18924 .read_id = netcell_read_id,
18861diff -urNp linux-2.6.32.7/drivers/ata/pata_ninja32.c linux-2.6.32.7/drivers/ata/pata_ninja32.c 18925diff -urNp linux-2.6.32.8/drivers/ata/pata_ninja32.c linux-2.6.32.8/drivers/ata/pata_ninja32.c
18862--- linux-2.6.32.7/drivers/ata/pata_ninja32.c 2010-01-25 13:50:10.000000000 -0500 18926--- linux-2.6.32.8/drivers/ata/pata_ninja32.c 2010-02-09 07:57:19.000000000 -0500
18863+++ linux-2.6.32.7/drivers/ata/pata_ninja32.c 2010-01-25 17:39:40.421405149 -0500 18927+++ linux-2.6.32.8/drivers/ata/pata_ninja32.c 2010-02-10 15:06:23.995503045 -0500
18864@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 18928@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
18865 ATA_BMDMA_SHT(DRV_NAME), 18929 ATA_BMDMA_SHT(DRV_NAME),
18866 }; 18930 };
@@ -18870,9 +18934,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_ninja32.c linux-2.6.32.7/drivers/ata/
18870 .inherits = &ata_bmdma_port_ops, 18934 .inherits = &ata_bmdma_port_ops,
18871 .sff_dev_select = ninja32_dev_select, 18935 .sff_dev_select = ninja32_dev_select,
18872 .cable_detect = ata_cable_40wire, 18936 .cable_detect = ata_cable_40wire,
18873diff -urNp linux-2.6.32.7/drivers/ata/pata_ns87410.c linux-2.6.32.7/drivers/ata/pata_ns87410.c 18937diff -urNp linux-2.6.32.8/drivers/ata/pata_ns87410.c linux-2.6.32.8/drivers/ata/pata_ns87410.c
18874--- linux-2.6.32.7/drivers/ata/pata_ns87410.c 2010-01-25 13:50:10.000000000 -0500 18938--- linux-2.6.32.8/drivers/ata/pata_ns87410.c 2010-02-09 07:57:19.000000000 -0500
18875+++ linux-2.6.32.7/drivers/ata/pata_ns87410.c 2010-01-25 17:39:40.421405149 -0500 18939+++ linux-2.6.32.8/drivers/ata/pata_ns87410.c 2010-02-10 15:06:23.995503045 -0500
18876@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 18940@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
18877 ATA_PIO_SHT(DRV_NAME), 18941 ATA_PIO_SHT(DRV_NAME),
18878 }; 18942 };
@@ -18882,9 +18946,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_ns87410.c linux-2.6.32.7/drivers/ata/
18882 .inherits = &ata_sff_port_ops, 18946 .inherits = &ata_sff_port_ops,
18883 .qc_issue = ns87410_qc_issue, 18947 .qc_issue = ns87410_qc_issue,
18884 .cable_detect = ata_cable_40wire, 18948 .cable_detect = ata_cable_40wire,
18885diff -urNp linux-2.6.32.7/drivers/ata/pata_ns87415.c linux-2.6.32.7/drivers/ata/pata_ns87415.c 18949diff -urNp linux-2.6.32.8/drivers/ata/pata_ns87415.c linux-2.6.32.8/drivers/ata/pata_ns87415.c
18886--- linux-2.6.32.7/drivers/ata/pata_ns87415.c 2010-01-25 13:50:10.000000000 -0500 18950--- linux-2.6.32.8/drivers/ata/pata_ns87415.c 2010-02-09 07:57:19.000000000 -0500
18887+++ linux-2.6.32.7/drivers/ata/pata_ns87415.c 2010-01-25 17:39:40.421405149 -0500 18951+++ linux-2.6.32.8/drivers/ata/pata_ns87415.c 2010-02-10 15:06:23.995503045 -0500
18888@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at 18952@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
18889 } 18953 }
18890 #endif /* 87560 SuperIO Support */ 18954 #endif /* 87560 SuperIO Support */
@@ -18903,9 +18967,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_ns87415.c linux-2.6.32.7/drivers/ata/
18903 .inherits = &ns87415_pata_ops, 18967 .inherits = &ns87415_pata_ops,
18904 .sff_tf_read = ns87560_tf_read, 18968 .sff_tf_read = ns87560_tf_read,
18905 .sff_check_status = ns87560_check_status, 18969 .sff_check_status = ns87560_check_status,
18906diff -urNp linux-2.6.32.7/drivers/ata/pata_octeon_cf.c linux-2.6.32.7/drivers/ata/pata_octeon_cf.c 18970diff -urNp linux-2.6.32.8/drivers/ata/pata_octeon_cf.c linux-2.6.32.8/drivers/ata/pata_octeon_cf.c
18907--- linux-2.6.32.7/drivers/ata/pata_octeon_cf.c 2010-01-25 13:50:10.000000000 -0500 18971--- linux-2.6.32.8/drivers/ata/pata_octeon_cf.c 2010-02-09 07:57:19.000000000 -0500
18908+++ linux-2.6.32.7/drivers/ata/pata_octeon_cf.c 2010-01-25 17:39:40.428099593 -0500 18972+++ linux-2.6.32.8/drivers/ata/pata_octeon_cf.c 2010-02-10 15:06:23.995503045 -0500
18909@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s 18973@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
18910 return 0; 18974 return 0;
18911 } 18975 }
@@ -18914,9 +18978,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_octeon_cf.c linux-2.6.32.7/drivers/at
18914 static struct ata_port_operations octeon_cf_ops = { 18978 static struct ata_port_operations octeon_cf_ops = {
18915 .inherits = &ata_sff_port_ops, 18979 .inherits = &ata_sff_port_ops,
18916 .check_atapi_dma = octeon_cf_check_atapi_dma, 18980 .check_atapi_dma = octeon_cf_check_atapi_dma,
18917diff -urNp linux-2.6.32.7/drivers/ata/pata_oldpiix.c linux-2.6.32.7/drivers/ata/pata_oldpiix.c 18981diff -urNp linux-2.6.32.8/drivers/ata/pata_oldpiix.c linux-2.6.32.8/drivers/ata/pata_oldpiix.c
18918--- linux-2.6.32.7/drivers/ata/pata_oldpiix.c 2010-01-25 13:50:10.000000000 -0500 18982--- linux-2.6.32.8/drivers/ata/pata_oldpiix.c 2010-02-09 07:57:19.000000000 -0500
18919+++ linux-2.6.32.7/drivers/ata/pata_oldpiix.c 2010-01-25 17:39:40.428099593 -0500 18983+++ linux-2.6.32.8/drivers/ata/pata_oldpiix.c 2010-02-10 15:06:23.995503045 -0500
18920@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix 18984@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
18921 ATA_BMDMA_SHT(DRV_NAME), 18985 ATA_BMDMA_SHT(DRV_NAME),
18922 }; 18986 };
@@ -18926,9 +18990,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_oldpiix.c linux-2.6.32.7/drivers/ata/
18926 .inherits = &ata_bmdma_port_ops, 18990 .inherits = &ata_bmdma_port_ops,
18927 .qc_issue = oldpiix_qc_issue, 18991 .qc_issue = oldpiix_qc_issue,
18928 .cable_detect = ata_cable_40wire, 18992 .cable_detect = ata_cable_40wire,
18929diff -urNp linux-2.6.32.7/drivers/ata/pata_opti.c linux-2.6.32.7/drivers/ata/pata_opti.c 18993diff -urNp linux-2.6.32.8/drivers/ata/pata_opti.c linux-2.6.32.8/drivers/ata/pata_opti.c
18930--- linux-2.6.32.7/drivers/ata/pata_opti.c 2010-01-25 13:50:10.000000000 -0500 18994--- linux-2.6.32.8/drivers/ata/pata_opti.c 2010-02-09 07:57:19.000000000 -0500
18931+++ linux-2.6.32.7/drivers/ata/pata_opti.c 2010-01-25 17:39:40.428099593 -0500 18995+++ linux-2.6.32.8/drivers/ata/pata_opti.c 2010-02-10 15:06:23.995503045 -0500
18932@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh 18996@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
18933 ATA_PIO_SHT(DRV_NAME), 18997 ATA_PIO_SHT(DRV_NAME),
18934 }; 18998 };
@@ -18938,9 +19002,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_opti.c linux-2.6.32.7/drivers/ata/pat
18938 .inherits = &ata_sff_port_ops, 19002 .inherits = &ata_sff_port_ops,
18939 .cable_detect = ata_cable_40wire, 19003 .cable_detect = ata_cable_40wire,
18940 .set_piomode = opti_set_piomode, 19004 .set_piomode = opti_set_piomode,
18941diff -urNp linux-2.6.32.7/drivers/ata/pata_optidma.c linux-2.6.32.7/drivers/ata/pata_optidma.c 19005diff -urNp linux-2.6.32.8/drivers/ata/pata_optidma.c linux-2.6.32.8/drivers/ata/pata_optidma.c
18942--- linux-2.6.32.7/drivers/ata/pata_optidma.c 2010-01-25 13:50:10.000000000 -0500 19006--- linux-2.6.32.8/drivers/ata/pata_optidma.c 2010-02-09 07:57:19.000000000 -0500
18943+++ linux-2.6.32.7/drivers/ata/pata_optidma.c 2010-01-25 17:39:40.428099593 -0500 19007+++ linux-2.6.32.8/drivers/ata/pata_optidma.c 2010-02-10 15:06:23.995503045 -0500
18944@@ -337,7 +337,7 @@ static struct scsi_host_template optidma 19008@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
18945 ATA_BMDMA_SHT(DRV_NAME), 19009 ATA_BMDMA_SHT(DRV_NAME),
18946 }; 19010 };
@@ -18959,9 +19023,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_optidma.c linux-2.6.32.7/drivers/ata/
18959 .inherits = &optidma_port_ops, 19023 .inherits = &optidma_port_ops,
18960 .set_piomode = optiplus_set_pio_mode, 19024 .set_piomode = optiplus_set_pio_mode,
18961 .set_dmamode = optiplus_set_dma_mode, 19025 .set_dmamode = optiplus_set_dma_mode,
18962diff -urNp linux-2.6.32.7/drivers/ata/pata_palmld.c linux-2.6.32.7/drivers/ata/pata_palmld.c 19026diff -urNp linux-2.6.32.8/drivers/ata/pata_palmld.c linux-2.6.32.8/drivers/ata/pata_palmld.c
18963--- linux-2.6.32.7/drivers/ata/pata_palmld.c 2010-01-25 13:50:10.000000000 -0500 19027--- linux-2.6.32.8/drivers/ata/pata_palmld.c 2010-02-09 07:57:19.000000000 -0500
18964+++ linux-2.6.32.7/drivers/ata/pata_palmld.c 2010-01-25 17:39:40.429145377 -0500 19028+++ linux-2.6.32.8/drivers/ata/pata_palmld.c 2010-02-10 15:06:23.999499093 -0500
18965@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ 19029@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
18966 ATA_PIO_SHT(DRV_NAME), 19030 ATA_PIO_SHT(DRV_NAME),
18967 }; 19031 };
@@ -18971,9 +19035,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_palmld.c linux-2.6.32.7/drivers/ata/p
18971 .inherits = &ata_sff_port_ops, 19035 .inherits = &ata_sff_port_ops,
18972 .sff_data_xfer = ata_sff_data_xfer_noirq, 19036 .sff_data_xfer = ata_sff_data_xfer_noirq,
18973 .cable_detect = ata_cable_40wire, 19037 .cable_detect = ata_cable_40wire,
18974diff -urNp linux-2.6.32.7/drivers/ata/pata_pcmcia.c linux-2.6.32.7/drivers/ata/pata_pcmcia.c 19038diff -urNp linux-2.6.32.8/drivers/ata/pata_pcmcia.c linux-2.6.32.8/drivers/ata/pata_pcmcia.c
18975--- linux-2.6.32.7/drivers/ata/pata_pcmcia.c 2010-01-25 13:50:10.000000000 -0500 19039--- linux-2.6.32.8/drivers/ata/pata_pcmcia.c 2010-02-09 07:57:19.000000000 -0500
18976+++ linux-2.6.32.7/drivers/ata/pata_pcmcia.c 2010-01-25 17:39:40.429145377 -0500 19040+++ linux-2.6.32.8/drivers/ata/pata_pcmcia.c 2010-02-10 15:06:23.999499093 -0500
18977@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ 19041@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
18978 ATA_PIO_SHT(DRV_NAME), 19042 ATA_PIO_SHT(DRV_NAME),
18979 }; 19043 };
@@ -19000,9 +19064,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_pcmcia.c linux-2.6.32.7/drivers/ata/p
19000 19064
19001 info = kzalloc(sizeof(*info), GFP_KERNEL); 19065 info = kzalloc(sizeof(*info), GFP_KERNEL);
19002 if (info == NULL) 19066 if (info == NULL)
19003diff -urNp linux-2.6.32.7/drivers/ata/pata_pdc2027x.c linux-2.6.32.7/drivers/ata/pata_pdc2027x.c 19067diff -urNp linux-2.6.32.8/drivers/ata/pata_pdc2027x.c linux-2.6.32.8/drivers/ata/pata_pdc2027x.c
19004--- linux-2.6.32.7/drivers/ata/pata_pdc2027x.c 2010-01-25 13:50:10.000000000 -0500 19068--- linux-2.6.32.8/drivers/ata/pata_pdc2027x.c 2010-02-09 07:57:19.000000000 -0500
19005+++ linux-2.6.32.7/drivers/ata/pata_pdc2027x.c 2010-01-25 17:39:40.429145377 -0500 19069+++ linux-2.6.32.8/drivers/ata/pata_pdc2027x.c 2010-02-10 15:06:23.999499093 -0500
19006@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 19070@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
19007 ATA_BMDMA_SHT(DRV_NAME), 19071 ATA_BMDMA_SHT(DRV_NAME),
19008 }; 19072 };
@@ -19020,9 +19084,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_pdc2027x.c linux-2.6.32.7/drivers/ata
19020 .inherits = &pdc2027x_pata100_ops, 19084 .inherits = &pdc2027x_pata100_ops,
19021 .mode_filter = pdc2027x_mode_filter, 19085 .mode_filter = pdc2027x_mode_filter,
19022 .set_piomode = pdc2027x_set_piomode, 19086 .set_piomode = pdc2027x_set_piomode,
19023diff -urNp linux-2.6.32.7/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.7/drivers/ata/pata_pdc202xx_old.c 19087diff -urNp linux-2.6.32.8/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.8/drivers/ata/pata_pdc202xx_old.c
19024--- linux-2.6.32.7/drivers/ata/pata_pdc202xx_old.c 2010-01-25 13:50:10.000000000 -0500 19088--- linux-2.6.32.8/drivers/ata/pata_pdc202xx_old.c 2010-02-09 07:57:19.000000000 -0500
19025+++ linux-2.6.32.7/drivers/ata/pata_pdc202xx_old.c 2010-01-25 17:39:40.429145377 -0500 19089+++ linux-2.6.32.8/drivers/ata/pata_pdc202xx_old.c 2010-02-10 15:06:23.999499093 -0500
19026@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x 19090@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x
19027 ATA_BMDMA_SHT(DRV_NAME), 19091 ATA_BMDMA_SHT(DRV_NAME),
19028 }; 19092 };
@@ -19041,9 +19105,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.7/drivers
19041 .inherits = &pdc2024x_port_ops, 19105 .inherits = &pdc2024x_port_ops,
19042 19106
19043 .check_atapi_dma = pdc2026x_check_atapi_dma, 19107 .check_atapi_dma = pdc2026x_check_atapi_dma,
19044diff -urNp linux-2.6.32.7/drivers/ata/pata_platform.c linux-2.6.32.7/drivers/ata/pata_platform.c 19108diff -urNp linux-2.6.32.8/drivers/ata/pata_platform.c linux-2.6.32.8/drivers/ata/pata_platform.c
19045--- linux-2.6.32.7/drivers/ata/pata_platform.c 2010-01-25 13:50:10.000000000 -0500 19109--- linux-2.6.32.8/drivers/ata/pata_platform.c 2010-02-09 07:57:19.000000000 -0500
19046+++ linux-2.6.32.7/drivers/ata/pata_platform.c 2010-01-25 17:39:40.429145377 -0500 19110+++ linux-2.6.32.8/drivers/ata/pata_platform.c 2010-02-10 15:06:23.999499093 -0500
19047@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl 19111@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
19048 ATA_PIO_SHT(DRV_NAME), 19112 ATA_PIO_SHT(DRV_NAME),
19049 }; 19113 };
@@ -19053,9 +19117,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_platform.c linux-2.6.32.7/drivers/ata
19053 .inherits = &ata_sff_port_ops, 19117 .inherits = &ata_sff_port_ops,
19054 .sff_data_xfer = ata_sff_data_xfer_noirq, 19118 .sff_data_xfer = ata_sff_data_xfer_noirq,
19055 .cable_detect = ata_cable_unknown, 19119 .cable_detect = ata_cable_unknown,
19056diff -urNp linux-2.6.32.7/drivers/ata/pata_qdi.c linux-2.6.32.7/drivers/ata/pata_qdi.c 19120diff -urNp linux-2.6.32.8/drivers/ata/pata_qdi.c linux-2.6.32.8/drivers/ata/pata_qdi.c
19057--- linux-2.6.32.7/drivers/ata/pata_qdi.c 2010-01-25 13:50:10.000000000 -0500 19121--- linux-2.6.32.8/drivers/ata/pata_qdi.c 2010-02-09 07:57:19.000000000 -0500
19058+++ linux-2.6.32.7/drivers/ata/pata_qdi.c 2010-01-25 17:39:40.429145377 -0500 19122+++ linux-2.6.32.8/drivers/ata/pata_qdi.c 2010-02-10 15:06:23.999499093 -0500
19059@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht 19123@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
19060 ATA_PIO_SHT(DRV_NAME), 19124 ATA_PIO_SHT(DRV_NAME),
19061 }; 19125 };
@@ -19074,9 +19138,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_qdi.c linux-2.6.32.7/drivers/ata/pata
19074 .inherits = &qdi6500_port_ops, 19138 .inherits = &qdi6500_port_ops,
19075 .set_piomode = qdi6580_set_piomode, 19139 .set_piomode = qdi6580_set_piomode,
19076 }; 19140 };
19077diff -urNp linux-2.6.32.7/drivers/ata/pata_radisys.c linux-2.6.32.7/drivers/ata/pata_radisys.c 19141diff -urNp linux-2.6.32.8/drivers/ata/pata_radisys.c linux-2.6.32.8/drivers/ata/pata_radisys.c
19078--- linux-2.6.32.7/drivers/ata/pata_radisys.c 2010-01-25 13:50:10.000000000 -0500 19142--- linux-2.6.32.8/drivers/ata/pata_radisys.c 2010-02-09 07:57:19.000000000 -0500
19079+++ linux-2.6.32.7/drivers/ata/pata_radisys.c 2010-01-25 17:39:40.430286538 -0500 19143+++ linux-2.6.32.8/drivers/ata/pata_radisys.c 2010-02-10 15:06:23.999499093 -0500
19080@@ -187,7 +187,7 @@ static struct scsi_host_template radisys 19144@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
19081 ATA_BMDMA_SHT(DRV_NAME), 19145 ATA_BMDMA_SHT(DRV_NAME),
19082 }; 19146 };
@@ -19086,9 +19150,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_radisys.c linux-2.6.32.7/drivers/ata/
19086 .inherits = &ata_bmdma_port_ops, 19150 .inherits = &ata_bmdma_port_ops,
19087 .qc_issue = radisys_qc_issue, 19151 .qc_issue = radisys_qc_issue,
19088 .cable_detect = ata_cable_unknown, 19152 .cable_detect = ata_cable_unknown,
19089diff -urNp linux-2.6.32.7/drivers/ata/pata_rb532_cf.c linux-2.6.32.7/drivers/ata/pata_rb532_cf.c 19153diff -urNp linux-2.6.32.8/drivers/ata/pata_rb532_cf.c linux-2.6.32.8/drivers/ata/pata_rb532_cf.c
19090--- linux-2.6.32.7/drivers/ata/pata_rb532_cf.c 2010-01-25 13:50:10.000000000 -0500 19154--- linux-2.6.32.8/drivers/ata/pata_rb532_cf.c 2010-02-09 07:57:19.000000000 -0500
19091+++ linux-2.6.32.7/drivers/ata/pata_rb532_cf.c 2010-01-25 17:39:40.430286538 -0500 19155+++ linux-2.6.32.8/drivers/ata/pata_rb532_cf.c 2010-02-10 15:06:23.999499093 -0500
19092@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle 19156@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
19093 return IRQ_HANDLED; 19157 return IRQ_HANDLED;
19094 } 19158 }
@@ -19098,9 +19162,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_rb532_cf.c linux-2.6.32.7/drivers/ata
19098 .inherits = &ata_sff_port_ops, 19162 .inherits = &ata_sff_port_ops,
19099 .sff_data_xfer = ata_sff_data_xfer32, 19163 .sff_data_xfer = ata_sff_data_xfer32,
19100 }; 19164 };
19101diff -urNp linux-2.6.32.7/drivers/ata/pata_rdc.c linux-2.6.32.7/drivers/ata/pata_rdc.c 19165diff -urNp linux-2.6.32.8/drivers/ata/pata_rdc.c linux-2.6.32.8/drivers/ata/pata_rdc.c
19102--- linux-2.6.32.7/drivers/ata/pata_rdc.c 2010-01-25 13:50:10.000000000 -0500 19166--- linux-2.6.32.8/drivers/ata/pata_rdc.c 2010-02-09 07:57:19.000000000 -0500
19103+++ linux-2.6.32.7/drivers/ata/pata_rdc.c 2010-01-25 17:39:40.430286538 -0500 19167+++ linux-2.6.32.8/drivers/ata/pata_rdc.c 2010-02-10 15:06:23.999499093 -0500
19104@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p 19168@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
19105 pci_write_config_byte(dev, 0x48, udma_enable); 19169 pci_write_config_byte(dev, 0x48, udma_enable);
19106 } 19170 }
@@ -19110,9 +19174,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_rdc.c linux-2.6.32.7/drivers/ata/pata
19110 .inherits = &ata_bmdma32_port_ops, 19174 .inherits = &ata_bmdma32_port_ops,
19111 .cable_detect = rdc_pata_cable_detect, 19175 .cable_detect = rdc_pata_cable_detect,
19112 .set_piomode = rdc_set_piomode, 19176 .set_piomode = rdc_set_piomode,
19113diff -urNp linux-2.6.32.7/drivers/ata/pata_rz1000.c linux-2.6.32.7/drivers/ata/pata_rz1000.c 19177diff -urNp linux-2.6.32.8/drivers/ata/pata_rz1000.c linux-2.6.32.8/drivers/ata/pata_rz1000.c
19114--- linux-2.6.32.7/drivers/ata/pata_rz1000.c 2010-01-25 13:50:10.000000000 -0500 19178--- linux-2.6.32.8/drivers/ata/pata_rz1000.c 2010-02-09 07:57:19.000000000 -0500
19115+++ linux-2.6.32.7/drivers/ata/pata_rz1000.c 2010-01-25 17:39:40.430286538 -0500 19179+++ linux-2.6.32.8/drivers/ata/pata_rz1000.c 2010-02-10 15:06:23.999499093 -0500
19116@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ 19180@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
19117 ATA_PIO_SHT(DRV_NAME), 19181 ATA_PIO_SHT(DRV_NAME),
19118 }; 19182 };
@@ -19122,9 +19186,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_rz1000.c linux-2.6.32.7/drivers/ata/p
19122 .inherits = &ata_sff_port_ops, 19186 .inherits = &ata_sff_port_ops,
19123 .cable_detect = ata_cable_40wire, 19187 .cable_detect = ata_cable_40wire,
19124 .set_mode = rz1000_set_mode, 19188 .set_mode = rz1000_set_mode,
19125diff -urNp linux-2.6.32.7/drivers/ata/pata_sc1200.c linux-2.6.32.7/drivers/ata/pata_sc1200.c 19189diff -urNp linux-2.6.32.8/drivers/ata/pata_sc1200.c linux-2.6.32.8/drivers/ata/pata_sc1200.c
19126--- linux-2.6.32.7/drivers/ata/pata_sc1200.c 2010-01-25 13:50:10.000000000 -0500 19190--- linux-2.6.32.8/drivers/ata/pata_sc1200.c 2010-02-09 07:57:19.000000000 -0500
19127+++ linux-2.6.32.7/drivers/ata/pata_sc1200.c 2010-01-25 17:39:40.430286538 -0500 19191+++ linux-2.6.32.8/drivers/ata/pata_sc1200.c 2010-02-10 15:06:23.999499093 -0500
19128@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ 19192@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
19129 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 19193 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
19130 }; 19194 };
@@ -19134,9 +19198,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_sc1200.c linux-2.6.32.7/drivers/ata/p
19134 .inherits = &ata_bmdma_port_ops, 19198 .inherits = &ata_bmdma_port_ops,
19135 .qc_prep = ata_sff_dumb_qc_prep, 19199 .qc_prep = ata_sff_dumb_qc_prep,
19136 .qc_issue = sc1200_qc_issue, 19200 .qc_issue = sc1200_qc_issue,
19137diff -urNp linux-2.6.32.7/drivers/ata/pata_scc.c linux-2.6.32.7/drivers/ata/pata_scc.c 19201diff -urNp linux-2.6.32.8/drivers/ata/pata_scc.c linux-2.6.32.8/drivers/ata/pata_scc.c
19138--- linux-2.6.32.7/drivers/ata/pata_scc.c 2010-01-25 13:50:10.000000000 -0500 19202--- linux-2.6.32.8/drivers/ata/pata_scc.c 2010-02-09 07:57:19.000000000 -0500
19139+++ linux-2.6.32.7/drivers/ata/pata_scc.c 2010-01-25 17:39:40.430286538 -0500 19203+++ linux-2.6.32.8/drivers/ata/pata_scc.c 2010-02-10 15:06:23.999499093 -0500
19140@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht 19204@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
19141 ATA_BMDMA_SHT(DRV_NAME), 19205 ATA_BMDMA_SHT(DRV_NAME),
19142 }; 19206 };
@@ -19146,9 +19210,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_scc.c linux-2.6.32.7/drivers/ata/pata
19146 .inherits = &ata_bmdma_port_ops, 19210 .inherits = &ata_bmdma_port_ops,
19147 19211
19148 .set_piomode = scc_set_piomode, 19212 .set_piomode = scc_set_piomode,
19149diff -urNp linux-2.6.32.7/drivers/ata/pata_sch.c linux-2.6.32.7/drivers/ata/pata_sch.c 19213diff -urNp linux-2.6.32.8/drivers/ata/pata_sch.c linux-2.6.32.8/drivers/ata/pata_sch.c
19150--- linux-2.6.32.7/drivers/ata/pata_sch.c 2010-01-25 13:50:10.000000000 -0500 19214--- linux-2.6.32.8/drivers/ata/pata_sch.c 2010-02-09 07:57:19.000000000 -0500
19151+++ linux-2.6.32.7/drivers/ata/pata_sch.c 2010-01-25 17:39:40.431405680 -0500 19215+++ linux-2.6.32.8/drivers/ata/pata_sch.c 2010-02-10 15:06:23.999499093 -0500
19152@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht 19216@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
19153 ATA_BMDMA_SHT(DRV_NAME), 19217 ATA_BMDMA_SHT(DRV_NAME),
19154 }; 19218 };
@@ -19158,9 +19222,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_sch.c linux-2.6.32.7/drivers/ata/pata
19158 .inherits = &ata_bmdma_port_ops, 19222 .inherits = &ata_bmdma_port_ops,
19159 .cable_detect = ata_cable_unknown, 19223 .cable_detect = ata_cable_unknown,
19160 .set_piomode = sch_set_piomode, 19224 .set_piomode = sch_set_piomode,
19161diff -urNp linux-2.6.32.7/drivers/ata/pata_serverworks.c linux-2.6.32.7/drivers/ata/pata_serverworks.c 19225diff -urNp linux-2.6.32.8/drivers/ata/pata_serverworks.c linux-2.6.32.8/drivers/ata/pata_serverworks.c
19162--- linux-2.6.32.7/drivers/ata/pata_serverworks.c 2010-01-25 13:50:10.000000000 -0500 19226--- linux-2.6.32.8/drivers/ata/pata_serverworks.c 2010-02-09 07:57:19.000000000 -0500
19163+++ linux-2.6.32.7/drivers/ata/pata_serverworks.c 2010-01-25 17:39:40.431405680 -0500 19227+++ linux-2.6.32.8/drivers/ata/pata_serverworks.c 2010-02-10 15:06:23.999499093 -0500
19164@@ -299,7 +299,7 @@ static struct scsi_host_template serverw 19228@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
19165 ATA_BMDMA_SHT(DRV_NAME), 19229 ATA_BMDMA_SHT(DRV_NAME),
19166 }; 19230 };
@@ -19179,9 +19243,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_serverworks.c linux-2.6.32.7/drivers/
19179 .inherits = &serverworks_osb4_port_ops, 19243 .inherits = &serverworks_osb4_port_ops,
19180 .mode_filter = serverworks_csb_filter, 19244 .mode_filter = serverworks_csb_filter,
19181 }; 19245 };
19182diff -urNp linux-2.6.32.7/drivers/ata/pata_sil680.c linux-2.6.32.7/drivers/ata/pata_sil680.c 19246diff -urNp linux-2.6.32.8/drivers/ata/pata_sil680.c linux-2.6.32.8/drivers/ata/pata_sil680.c
19183--- linux-2.6.32.7/drivers/ata/pata_sil680.c 2010-01-25 13:50:10.000000000 -0500 19247--- linux-2.6.32.8/drivers/ata/pata_sil680.c 2010-02-09 07:57:19.000000000 -0500
19184+++ linux-2.6.32.7/drivers/ata/pata_sil680.c 2010-01-25 17:39:40.431405680 -0500 19248+++ linux-2.6.32.8/drivers/ata/pata_sil680.c 2010-02-10 15:06:23.999499093 -0500
19185@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ 19249@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
19186 ATA_BMDMA_SHT(DRV_NAME), 19250 ATA_BMDMA_SHT(DRV_NAME),
19187 }; 19251 };
@@ -19191,9 +19255,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_sil680.c linux-2.6.32.7/drivers/ata/p
19191 .inherits = &ata_bmdma32_port_ops, 19255 .inherits = &ata_bmdma32_port_ops,
19192 .cable_detect = sil680_cable_detect, 19256 .cable_detect = sil680_cable_detect,
19193 .set_piomode = sil680_set_piomode, 19257 .set_piomode = sil680_set_piomode,
19194diff -urNp linux-2.6.32.7/drivers/ata/pata_sis.c linux-2.6.32.7/drivers/ata/pata_sis.c 19258diff -urNp linux-2.6.32.8/drivers/ata/pata_sis.c linux-2.6.32.8/drivers/ata/pata_sis.c
19195--- linux-2.6.32.7/drivers/ata/pata_sis.c 2010-01-25 13:50:10.000000000 -0500 19259--- linux-2.6.32.8/drivers/ata/pata_sis.c 2010-02-09 07:57:19.000000000 -0500
19196+++ linux-2.6.32.7/drivers/ata/pata_sis.c 2010-01-25 17:39:40.431405680 -0500 19260+++ linux-2.6.32.8/drivers/ata/pata_sis.c 2010-02-10 15:06:23.999499093 -0500
19197@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht 19261@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
19198 ATA_BMDMA_SHT(DRV_NAME), 19262 ATA_BMDMA_SHT(DRV_NAME),
19199 }; 19263 };
@@ -19249,9 +19313,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_sis.c linux-2.6.32.7/drivers/ata/pata
19249 .inherits = &sis_base_ops, 19313 .inherits = &sis_base_ops,
19250 .set_piomode = sis_old_set_piomode, 19314 .set_piomode = sis_old_set_piomode,
19251 .set_dmamode = sis_old_set_dmamode, 19315 .set_dmamode = sis_old_set_dmamode,
19252diff -urNp linux-2.6.32.7/drivers/ata/pata_sl82c105.c linux-2.6.32.7/drivers/ata/pata_sl82c105.c 19316diff -urNp linux-2.6.32.8/drivers/ata/pata_sl82c105.c linux-2.6.32.8/drivers/ata/pata_sl82c105.c
19253--- linux-2.6.32.7/drivers/ata/pata_sl82c105.c 2010-01-25 13:50:10.000000000 -0500 19317--- linux-2.6.32.8/drivers/ata/pata_sl82c105.c 2010-02-09 07:57:19.000000000 -0500
19254+++ linux-2.6.32.7/drivers/ata/pata_sl82c105.c 2010-01-25 17:39:40.431405680 -0500 19318+++ linux-2.6.32.8/drivers/ata/pata_sl82c105.c 2010-02-10 15:06:23.999499093 -0500
19255@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 19319@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
19256 ATA_BMDMA_SHT(DRV_NAME), 19320 ATA_BMDMA_SHT(DRV_NAME),
19257 }; 19321 };
@@ -19261,9 +19325,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_sl82c105.c linux-2.6.32.7/drivers/ata
19261 .inherits = &ata_bmdma_port_ops, 19325 .inherits = &ata_bmdma_port_ops,
19262 .qc_defer = sl82c105_qc_defer, 19326 .qc_defer = sl82c105_qc_defer,
19263 .bmdma_start = sl82c105_bmdma_start, 19327 .bmdma_start = sl82c105_bmdma_start,
19264diff -urNp linux-2.6.32.7/drivers/ata/pata_triflex.c linux-2.6.32.7/drivers/ata/pata_triflex.c 19328diff -urNp linux-2.6.32.8/drivers/ata/pata_triflex.c linux-2.6.32.8/drivers/ata/pata_triflex.c
19265--- linux-2.6.32.7/drivers/ata/pata_triflex.c 2010-01-25 13:50:10.000000000 -0500 19329--- linux-2.6.32.8/drivers/ata/pata_triflex.c 2010-02-09 07:57:19.000000000 -0500
19266+++ linux-2.6.32.7/drivers/ata/pata_triflex.c 2010-01-25 17:39:40.431405680 -0500 19330+++ linux-2.6.32.8/drivers/ata/pata_triflex.c 2010-02-10 15:06:23.999499093 -0500
19267@@ -178,7 +178,7 @@ static struct scsi_host_template triflex 19331@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
19268 ATA_BMDMA_SHT(DRV_NAME), 19332 ATA_BMDMA_SHT(DRV_NAME),
19269 }; 19333 };
@@ -19273,9 +19337,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_triflex.c linux-2.6.32.7/drivers/ata/
19273 .inherits = &ata_bmdma_port_ops, 19337 .inherits = &ata_bmdma_port_ops,
19274 .bmdma_start = triflex_bmdma_start, 19338 .bmdma_start = triflex_bmdma_start,
19275 .bmdma_stop = triflex_bmdma_stop, 19339 .bmdma_stop = triflex_bmdma_stop,
19276diff -urNp linux-2.6.32.7/drivers/ata/pata_via.c linux-2.6.32.7/drivers/ata/pata_via.c 19340diff -urNp linux-2.6.32.8/drivers/ata/pata_via.c linux-2.6.32.8/drivers/ata/pata_via.c
19277--- linux-2.6.32.7/drivers/ata/pata_via.c 2010-01-25 13:50:10.000000000 -0500 19341--- linux-2.6.32.8/drivers/ata/pata_via.c 2010-02-09 07:57:19.000000000 -0500
19278+++ linux-2.6.32.7/drivers/ata/pata_via.c 2010-01-25 17:39:40.432411110 -0500 19342+++ linux-2.6.32.8/drivers/ata/pata_via.c 2010-02-10 15:06:23.999499093 -0500
19279@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht 19343@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
19280 ATA_BMDMA_SHT(DRV_NAME), 19344 ATA_BMDMA_SHT(DRV_NAME),
19281 }; 19345 };
@@ -19294,9 +19358,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_via.c linux-2.6.32.7/drivers/ata/pata
19294 .inherits = &via_port_ops, 19358 .inherits = &via_port_ops,
19295 .sff_data_xfer = ata_sff_data_xfer_noirq, 19359 .sff_data_xfer = ata_sff_data_xfer_noirq,
19296 }; 19360 };
19297diff -urNp linux-2.6.32.7/drivers/ata/pata_winbond.c linux-2.6.32.7/drivers/ata/pata_winbond.c 19361diff -urNp linux-2.6.32.8/drivers/ata/pata_winbond.c linux-2.6.32.8/drivers/ata/pata_winbond.c
19298--- linux-2.6.32.7/drivers/ata/pata_winbond.c 2010-01-25 13:50:10.000000000 -0500 19362--- linux-2.6.32.8/drivers/ata/pata_winbond.c 2010-02-09 07:57:19.000000000 -0500
19299+++ linux-2.6.32.7/drivers/ata/pata_winbond.c 2010-01-25 17:39:40.432411110 -0500 19363+++ linux-2.6.32.8/drivers/ata/pata_winbond.c 2010-02-10 15:06:23.999499093 -0500
19300@@ -125,7 +125,7 @@ static struct scsi_host_template winbond 19364@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
19301 ATA_PIO_SHT(DRV_NAME), 19365 ATA_PIO_SHT(DRV_NAME),
19302 }; 19366 };
@@ -19306,9 +19370,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pata_winbond.c linux-2.6.32.7/drivers/ata/
19306 .inherits = &ata_sff_port_ops, 19370 .inherits = &ata_sff_port_ops,
19307 .sff_data_xfer = winbond_data_xfer, 19371 .sff_data_xfer = winbond_data_xfer,
19308 .cable_detect = ata_cable_40wire, 19372 .cable_detect = ata_cable_40wire,
19309diff -urNp linux-2.6.32.7/drivers/ata/pdc_adma.c linux-2.6.32.7/drivers/ata/pdc_adma.c 19373diff -urNp linux-2.6.32.8/drivers/ata/pdc_adma.c linux-2.6.32.8/drivers/ata/pdc_adma.c
19310--- linux-2.6.32.7/drivers/ata/pdc_adma.c 2010-01-25 13:50:10.000000000 -0500 19374--- linux-2.6.32.8/drivers/ata/pdc_adma.c 2010-02-09 07:57:19.000000000 -0500
19311+++ linux-2.6.32.7/drivers/ata/pdc_adma.c 2010-01-25 17:39:40.432411110 -0500 19375+++ linux-2.6.32.8/drivers/ata/pdc_adma.c 2010-02-10 15:06:24.002498516 -0500
19312@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at 19376@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
19313 .dma_boundary = ADMA_DMA_BOUNDARY, 19377 .dma_boundary = ADMA_DMA_BOUNDARY,
19314 }; 19378 };
@@ -19318,9 +19382,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/pdc_adma.c linux-2.6.32.7/drivers/ata/pdc_
19318 .inherits = &ata_sff_port_ops, 19382 .inherits = &ata_sff_port_ops,
19319 19383
19320 .lost_interrupt = ATA_OP_NULL, 19384 .lost_interrupt = ATA_OP_NULL,
19321diff -urNp linux-2.6.32.7/drivers/ata/sata_fsl.c linux-2.6.32.7/drivers/ata/sata_fsl.c 19385diff -urNp linux-2.6.32.8/drivers/ata/sata_fsl.c linux-2.6.32.8/drivers/ata/sata_fsl.c
19322--- linux-2.6.32.7/drivers/ata/sata_fsl.c 2010-01-25 13:50:10.000000000 -0500 19386--- linux-2.6.32.8/drivers/ata/sata_fsl.c 2010-02-09 07:57:19.000000000 -0500
19323+++ linux-2.6.32.7/drivers/ata/sata_fsl.c 2010-01-25 17:39:40.433405395 -0500 19387+++ linux-2.6.32.8/drivers/ata/sata_fsl.c 2010-02-10 15:06:24.002498516 -0500
19324@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs 19388@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
19325 .dma_boundary = ATA_DMA_BOUNDARY, 19389 .dma_boundary = ATA_DMA_BOUNDARY,
19326 }; 19390 };
@@ -19330,9 +19394,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_fsl.c linux-2.6.32.7/drivers/ata/sata
19330 .inherits = &sata_pmp_port_ops, 19394 .inherits = &sata_pmp_port_ops,
19331 19395
19332 .qc_defer = ata_std_qc_defer, 19396 .qc_defer = ata_std_qc_defer,
19333diff -urNp linux-2.6.32.7/drivers/ata/sata_inic162x.c linux-2.6.32.7/drivers/ata/sata_inic162x.c 19397diff -urNp linux-2.6.32.8/drivers/ata/sata_inic162x.c linux-2.6.32.8/drivers/ata/sata_inic162x.c
19334--- linux-2.6.32.7/drivers/ata/sata_inic162x.c 2010-01-25 13:50:10.000000000 -0500 19398--- linux-2.6.32.8/drivers/ata/sata_inic162x.c 2010-02-09 07:57:19.000000000 -0500
19335+++ linux-2.6.32.7/drivers/ata/sata_inic162x.c 2010-01-25 17:39:40.433405395 -0500 19399+++ linux-2.6.32.8/drivers/ata/sata_inic162x.c 2010-02-10 15:06:24.002498516 -0500
19336@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po 19400@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
19337 return 0; 19401 return 0;
19338 } 19402 }
@@ -19342,9 +19406,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_inic162x.c linux-2.6.32.7/drivers/ata
19342 .inherits = &sata_port_ops, 19406 .inherits = &sata_port_ops,
19343 19407
19344 .check_atapi_dma = inic_check_atapi_dma, 19408 .check_atapi_dma = inic_check_atapi_dma,
19345diff -urNp linux-2.6.32.7/drivers/ata/sata_mv.c linux-2.6.32.7/drivers/ata/sata_mv.c 19409diff -urNp linux-2.6.32.8/drivers/ata/sata_mv.c linux-2.6.32.8/drivers/ata/sata_mv.c
19346--- linux-2.6.32.7/drivers/ata/sata_mv.c 2010-01-25 13:50:10.000000000 -0500 19410--- linux-2.6.32.8/drivers/ata/sata_mv.c 2010-02-09 07:57:19.000000000 -0500
19347+++ linux-2.6.32.7/drivers/ata/sata_mv.c 2010-01-25 17:39:40.435100268 -0500 19411+++ linux-2.6.32.8/drivers/ata/sata_mv.c 2010-02-10 15:06:24.002498516 -0500
19348@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht 19412@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
19349 .dma_boundary = MV_DMA_BOUNDARY, 19413 .dma_boundary = MV_DMA_BOUNDARY,
19350 }; 19414 };
@@ -19372,9 +19436,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_mv.c linux-2.6.32.7/drivers/ata/sata_
19372 .inherits = &mv6_ops, 19436 .inherits = &mv6_ops,
19373 .dev_config = ATA_OP_NULL, 19437 .dev_config = ATA_OP_NULL,
19374 .qc_prep = mv_qc_prep_iie, 19438 .qc_prep = mv_qc_prep_iie,
19375diff -urNp linux-2.6.32.7/drivers/ata/sata_nv.c linux-2.6.32.7/drivers/ata/sata_nv.c 19439diff -urNp linux-2.6.32.8/drivers/ata/sata_nv.c linux-2.6.32.8/drivers/ata/sata_nv.c
19376--- linux-2.6.32.7/drivers/ata/sata_nv.c 2010-01-25 13:50:10.000000000 -0500 19440--- linux-2.6.32.8/drivers/ata/sata_nv.c 2010-02-09 07:57:19.000000000 -0500
19377+++ linux-2.6.32.7/drivers/ata/sata_nv.c 2010-01-25 17:39:40.435100268 -0500 19441+++ linux-2.6.32.8/drivers/ata/sata_nv.c 2010-02-10 15:06:24.002498516 -0500
19378@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc 19442@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
19379 * cases. Define nv_hardreset() which only kicks in for post-boot 19443 * cases. Define nv_hardreset() which only kicks in for post-boot
19380 * probing and use it for all variants. 19444 * probing and use it for all variants.
@@ -19417,9 +19481,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_nv.c linux-2.6.32.7/drivers/ata/sata_
19417 .inherits = &nv_generic_ops, 19481 .inherits = &nv_generic_ops,
19418 19482
19419 .qc_defer = ata_std_qc_defer, 19483 .qc_defer = ata_std_qc_defer,
19420diff -urNp linux-2.6.32.7/drivers/ata/sata_promise.c linux-2.6.32.7/drivers/ata/sata_promise.c 19484diff -urNp linux-2.6.32.8/drivers/ata/sata_promise.c linux-2.6.32.8/drivers/ata/sata_promise.c
19421--- linux-2.6.32.7/drivers/ata/sata_promise.c 2010-01-25 13:50:10.000000000 -0500 19485--- linux-2.6.32.8/drivers/ata/sata_promise.c 2010-02-09 07:57:19.000000000 -0500
19422+++ linux-2.6.32.7/drivers/ata/sata_promise.c 2010-01-25 17:39:40.435100268 -0500 19486+++ linux-2.6.32.8/drivers/ata/sata_promise.c 2010-02-10 15:06:24.002498516 -0500
19423@@ -195,7 +195,7 @@ static const struct ata_port_operations 19487@@ -195,7 +195,7 @@ static const struct ata_port_operations
19424 .error_handler = pdc_error_handler, 19488 .error_handler = pdc_error_handler,
19425 }; 19489 };
@@ -19446,9 +19510,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_promise.c linux-2.6.32.7/drivers/ata/
19446 .inherits = &pdc_common_ops, 19510 .inherits = &pdc_common_ops,
19447 .cable_detect = pdc_pata_cable_detect, 19511 .cable_detect = pdc_pata_cable_detect,
19448 .freeze = pdc_freeze, 19512 .freeze = pdc_freeze,
19449diff -urNp linux-2.6.32.7/drivers/ata/sata_qstor.c linux-2.6.32.7/drivers/ata/sata_qstor.c 19513diff -urNp linux-2.6.32.8/drivers/ata/sata_qstor.c linux-2.6.32.8/drivers/ata/sata_qstor.c
19450--- linux-2.6.32.7/drivers/ata/sata_qstor.c 2010-01-25 13:50:10.000000000 -0500 19514--- linux-2.6.32.8/drivers/ata/sata_qstor.c 2010-02-09 07:57:19.000000000 -0500
19451+++ linux-2.6.32.7/drivers/ata/sata_qstor.c 2010-01-25 17:39:40.436104915 -0500 19515+++ linux-2.6.32.8/drivers/ata/sata_qstor.c 2010-02-10 15:06:24.002498516 -0500
19452@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ 19516@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
19453 .dma_boundary = QS_DMA_BOUNDARY, 19517 .dma_boundary = QS_DMA_BOUNDARY,
19454 }; 19518 };
@@ -19458,9 +19522,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_qstor.c linux-2.6.32.7/drivers/ata/sa
19458 .inherits = &ata_sff_port_ops, 19522 .inherits = &ata_sff_port_ops,
19459 19523
19460 .check_atapi_dma = qs_check_atapi_dma, 19524 .check_atapi_dma = qs_check_atapi_dma,
19461diff -urNp linux-2.6.32.7/drivers/ata/sata_sil24.c linux-2.6.32.7/drivers/ata/sata_sil24.c 19525diff -urNp linux-2.6.32.8/drivers/ata/sata_sil24.c linux-2.6.32.8/drivers/ata/sata_sil24.c
19462--- linux-2.6.32.7/drivers/ata/sata_sil24.c 2010-01-25 13:50:10.000000000 -0500 19526--- linux-2.6.32.8/drivers/ata/sata_sil24.c 2010-02-09 07:57:19.000000000 -0500
19463+++ linux-2.6.32.7/drivers/ata/sata_sil24.c 2010-01-25 17:39:40.436104915 -0500 19527+++ linux-2.6.32.8/drivers/ata/sata_sil24.c 2010-02-10 15:06:24.002498516 -0500
19464@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s 19528@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
19465 .dma_boundary = ATA_DMA_BOUNDARY, 19529 .dma_boundary = ATA_DMA_BOUNDARY,
19466 }; 19530 };
@@ -19470,9 +19534,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_sil24.c linux-2.6.32.7/drivers/ata/sa
19470 .inherits = &sata_pmp_port_ops, 19534 .inherits = &sata_pmp_port_ops,
19471 19535
19472 .qc_defer = sil24_qc_defer, 19536 .qc_defer = sil24_qc_defer,
19473diff -urNp linux-2.6.32.7/drivers/ata/sata_sil.c linux-2.6.32.7/drivers/ata/sata_sil.c 19537diff -urNp linux-2.6.32.8/drivers/ata/sata_sil.c linux-2.6.32.8/drivers/ata/sata_sil.c
19474--- linux-2.6.32.7/drivers/ata/sata_sil.c 2010-01-25 13:50:10.000000000 -0500 19538--- linux-2.6.32.8/drivers/ata/sata_sil.c 2010-02-09 07:57:19.000000000 -0500
19475+++ linux-2.6.32.7/drivers/ata/sata_sil.c 2010-01-25 17:39:40.436104915 -0500 19539+++ linux-2.6.32.8/drivers/ata/sata_sil.c 2010-02-10 15:06:24.002498516 -0500
19476@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht 19540@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
19477 .sg_tablesize = ATA_MAX_PRD 19541 .sg_tablesize = ATA_MAX_PRD
19478 }; 19542 };
@@ -19482,9 +19546,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_sil.c linux-2.6.32.7/drivers/ata/sata
19482 .inherits = &ata_bmdma32_port_ops, 19546 .inherits = &ata_bmdma32_port_ops,
19483 .dev_config = sil_dev_config, 19547 .dev_config = sil_dev_config,
19484 .set_mode = sil_set_mode, 19548 .set_mode = sil_set_mode,
19485diff -urNp linux-2.6.32.7/drivers/ata/sata_sis.c linux-2.6.32.7/drivers/ata/sata_sis.c 19549diff -urNp linux-2.6.32.8/drivers/ata/sata_sis.c linux-2.6.32.8/drivers/ata/sata_sis.c
19486--- linux-2.6.32.7/drivers/ata/sata_sis.c 2010-01-25 13:50:10.000000000 -0500 19550--- linux-2.6.32.8/drivers/ata/sata_sis.c 2010-02-09 07:57:19.000000000 -0500
19487+++ linux-2.6.32.7/drivers/ata/sata_sis.c 2010-01-25 17:39:40.437100238 -0500 19551+++ linux-2.6.32.8/drivers/ata/sata_sis.c 2010-02-10 15:06:24.002498516 -0500
19488@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht 19552@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
19489 ATA_BMDMA_SHT(DRV_NAME), 19553 ATA_BMDMA_SHT(DRV_NAME),
19490 }; 19554 };
@@ -19494,9 +19558,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_sis.c linux-2.6.32.7/drivers/ata/sata
19494 .inherits = &ata_bmdma_port_ops, 19558 .inherits = &ata_bmdma_port_ops,
19495 .scr_read = sis_scr_read, 19559 .scr_read = sis_scr_read,
19496 .scr_write = sis_scr_write, 19560 .scr_write = sis_scr_write,
19497diff -urNp linux-2.6.32.7/drivers/ata/sata_svw.c linux-2.6.32.7/drivers/ata/sata_svw.c 19561diff -urNp linux-2.6.32.8/drivers/ata/sata_svw.c linux-2.6.32.8/drivers/ata/sata_svw.c
19498--- linux-2.6.32.7/drivers/ata/sata_svw.c 2010-01-25 13:50:10.000000000 -0500 19562--- linux-2.6.32.8/drivers/ata/sata_svw.c 2010-02-09 07:57:19.000000000 -0500
19499+++ linux-2.6.32.7/drivers/ata/sata_svw.c 2010-01-25 17:39:40.447720538 -0500 19563+++ linux-2.6.32.8/drivers/ata/sata_svw.c 2010-02-10 15:06:24.002498516 -0500
19500@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata 19564@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
19501 }; 19565 };
19502 19566
@@ -19506,9 +19570,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_svw.c linux-2.6.32.7/drivers/ata/sata
19506 .inherits = &ata_bmdma_port_ops, 19570 .inherits = &ata_bmdma_port_ops,
19507 .sff_tf_load = k2_sata_tf_load, 19571 .sff_tf_load = k2_sata_tf_load,
19508 .sff_tf_read = k2_sata_tf_read, 19572 .sff_tf_read = k2_sata_tf_read,
19509diff -urNp linux-2.6.32.7/drivers/ata/sata_sx4.c linux-2.6.32.7/drivers/ata/sata_sx4.c 19573diff -urNp linux-2.6.32.8/drivers/ata/sata_sx4.c linux-2.6.32.8/drivers/ata/sata_sx4.c
19510--- linux-2.6.32.7/drivers/ata/sata_sx4.c 2010-01-25 13:50:10.000000000 -0500 19574--- linux-2.6.32.8/drivers/ata/sata_sx4.c 2010-02-09 07:57:19.000000000 -0500
19511+++ linux-2.6.32.7/drivers/ata/sata_sx4.c 2010-01-25 17:39:40.448144804 -0500 19575+++ linux-2.6.32.8/drivers/ata/sata_sx4.c 2010-02-10 15:06:24.002498516 -0500
19512@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat 19576@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
19513 }; 19577 };
19514 19578
@@ -19518,9 +19582,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_sx4.c linux-2.6.32.7/drivers/ata/sata
19518 .inherits = &ata_sff_port_ops, 19582 .inherits = &ata_sff_port_ops,
19519 19583
19520 .check_atapi_dma = pdc_check_atapi_dma, 19584 .check_atapi_dma = pdc_check_atapi_dma,
19521diff -urNp linux-2.6.32.7/drivers/ata/sata_uli.c linux-2.6.32.7/drivers/ata/sata_uli.c 19585diff -urNp linux-2.6.32.8/drivers/ata/sata_uli.c linux-2.6.32.8/drivers/ata/sata_uli.c
19522--- linux-2.6.32.7/drivers/ata/sata_uli.c 2010-01-25 13:50:10.000000000 -0500 19586--- linux-2.6.32.8/drivers/ata/sata_uli.c 2010-02-09 07:57:19.000000000 -0500
19523+++ linux-2.6.32.7/drivers/ata/sata_uli.c 2010-01-25 17:39:40.448144804 -0500 19587+++ linux-2.6.32.8/drivers/ata/sata_uli.c 2010-02-10 15:06:24.002498516 -0500
19524@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht 19588@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
19525 ATA_BMDMA_SHT(DRV_NAME), 19589 ATA_BMDMA_SHT(DRV_NAME),
19526 }; 19590 };
@@ -19530,9 +19594,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_uli.c linux-2.6.32.7/drivers/ata/sata
19530 .inherits = &ata_bmdma_port_ops, 19594 .inherits = &ata_bmdma_port_ops,
19531 .scr_read = uli_scr_read, 19595 .scr_read = uli_scr_read,
19532 .scr_write = uli_scr_write, 19596 .scr_write = uli_scr_write,
19533diff -urNp linux-2.6.32.7/drivers/ata/sata_via.c linux-2.6.32.7/drivers/ata/sata_via.c 19597diff -urNp linux-2.6.32.8/drivers/ata/sata_via.c linux-2.6.32.8/drivers/ata/sata_via.c
19534--- linux-2.6.32.7/drivers/ata/sata_via.c 2010-01-25 13:50:10.000000000 -0500 19598--- linux-2.6.32.8/drivers/ata/sata_via.c 2010-02-09 07:57:19.000000000 -0500
19535+++ linux-2.6.32.7/drivers/ata/sata_via.c 2010-01-25 17:39:40.448144804 -0500 19599+++ linux-2.6.32.8/drivers/ata/sata_via.c 2010-02-10 15:06:24.002498516 -0500
19536@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh 19600@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
19537 ATA_BMDMA_SHT(DRV_NAME), 19601 ATA_BMDMA_SHT(DRV_NAME),
19538 }; 19602 };
@@ -19570,9 +19634,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_via.c linux-2.6.32.7/drivers/ata/sata
19570 .inherits = &svia_base_ops, 19634 .inherits = &svia_base_ops,
19571 .hardreset = sata_std_hardreset, 19635 .hardreset = sata_std_hardreset,
19572 .scr_read = vt8251_scr_read, 19636 .scr_read = vt8251_scr_read,
19573diff -urNp linux-2.6.32.7/drivers/ata/sata_vsc.c linux-2.6.32.7/drivers/ata/sata_vsc.c 19637diff -urNp linux-2.6.32.8/drivers/ata/sata_vsc.c linux-2.6.32.8/drivers/ata/sata_vsc.c
19574--- linux-2.6.32.7/drivers/ata/sata_vsc.c 2010-01-25 13:50:10.000000000 -0500 19638--- linux-2.6.32.8/drivers/ata/sata_vsc.c 2010-02-09 07:57:19.000000000 -0500
19575+++ linux-2.6.32.7/drivers/ata/sata_vsc.c 2010-01-25 17:39:40.448144804 -0500 19639+++ linux-2.6.32.8/drivers/ata/sata_vsc.c 2010-02-10 15:06:24.002498516 -0500
19576@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat 19640@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
19577 }; 19641 };
19578 19642
@@ -19582,9 +19646,9 @@ diff -urNp linux-2.6.32.7/drivers/ata/sata_vsc.c linux-2.6.32.7/drivers/ata/sata
19582 .inherits = &ata_bmdma_port_ops, 19646 .inherits = &ata_bmdma_port_ops,
19583 /* The IRQ handling is not quite standard SFF behaviour so we 19647 /* The IRQ handling is not quite standard SFF behaviour so we
19584 cannot use the default lost interrupt handler */ 19648 cannot use the default lost interrupt handler */
19585diff -urNp linux-2.6.32.7/drivers/atm/adummy.c linux-2.6.32.7/drivers/atm/adummy.c 19649diff -urNp linux-2.6.32.8/drivers/atm/adummy.c linux-2.6.32.8/drivers/atm/adummy.c
19586--- linux-2.6.32.7/drivers/atm/adummy.c 2010-01-25 13:50:10.000000000 -0500 19650--- linux-2.6.32.8/drivers/atm/adummy.c 2010-02-09 07:57:19.000000000 -0500
19587+++ linux-2.6.32.7/drivers/atm/adummy.c 2010-01-25 17:39:40.448144804 -0500 19651+++ linux-2.6.32.8/drivers/atm/adummy.c 2010-02-10 15:06:24.002498516 -0500
19588@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct 19652@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
19589 vcc->pop(vcc, skb); 19653 vcc->pop(vcc, skb);
19590 else 19654 else
@@ -19594,9 +19658,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/adummy.c linux-2.6.32.7/drivers/atm/adummy
19594 19658
19595 return 0; 19659 return 0;
19596 } 19660 }
19597diff -urNp linux-2.6.32.7/drivers/atm/ambassador.c linux-2.6.32.7/drivers/atm/ambassador.c 19661diff -urNp linux-2.6.32.8/drivers/atm/ambassador.c linux-2.6.32.8/drivers/atm/ambassador.c
19598--- linux-2.6.32.7/drivers/atm/ambassador.c 2010-01-25 13:50:10.000000000 -0500 19662--- linux-2.6.32.8/drivers/atm/ambassador.c 2010-02-09 07:57:19.000000000 -0500
19599+++ linux-2.6.32.7/drivers/atm/ambassador.c 2010-01-25 17:39:40.448144804 -0500 19663+++ linux-2.6.32.8/drivers/atm/ambassador.c 2010-02-10 15:06:24.002498516 -0500
19600@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, 19664@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
19601 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); 19665 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
19602 19666
@@ -19633,9 +19697,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/ambassador.c linux-2.6.32.7/drivers/atm/am
19633 return -ENOMEM; // ? 19697 return -ENOMEM; // ?
19634 } 19698 }
19635 19699
19636diff -urNp linux-2.6.32.7/drivers/atm/atmtcp.c linux-2.6.32.7/drivers/atm/atmtcp.c 19700diff -urNp linux-2.6.32.8/drivers/atm/atmtcp.c linux-2.6.32.8/drivers/atm/atmtcp.c
19637--- linux-2.6.32.7/drivers/atm/atmtcp.c 2010-01-25 13:50:10.000000000 -0500 19701--- linux-2.6.32.8/drivers/atm/atmtcp.c 2010-02-09 07:57:19.000000000 -0500
19638+++ linux-2.6.32.7/drivers/atm/atmtcp.c 2010-01-25 17:39:40.449405902 -0500 19702+++ linux-2.6.32.8/drivers/atm/atmtcp.c 2010-02-10 15:06:24.002498516 -0500
19639@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc 19703@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc
19640 if (vcc->pop) vcc->pop(vcc,skb); 19704 if (vcc->pop) vcc->pop(vcc,skb);
19641 else dev_kfree_skb(skb); 19705 else dev_kfree_skb(skb);
@@ -19685,9 +19749,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/atmtcp.c linux-2.6.32.7/drivers/atm/atmtcp
19685 done: 19749 done:
19686 if (vcc->pop) vcc->pop(vcc,skb); 19750 if (vcc->pop) vcc->pop(vcc,skb);
19687 else dev_kfree_skb(skb); 19751 else dev_kfree_skb(skb);
19688diff -urNp linux-2.6.32.7/drivers/atm/eni.c linux-2.6.32.7/drivers/atm/eni.c 19752diff -urNp linux-2.6.32.8/drivers/atm/eni.c linux-2.6.32.8/drivers/atm/eni.c
19689--- linux-2.6.32.7/drivers/atm/eni.c 2010-01-25 13:50:10.000000000 -0500 19753--- linux-2.6.32.8/drivers/atm/eni.c 2010-02-09 07:57:19.000000000 -0500
19690+++ linux-2.6.32.7/drivers/atm/eni.c 2010-01-25 17:39:40.449405902 -0500 19754+++ linux-2.6.32.8/drivers/atm/eni.c 2010-02-10 15:06:24.007541622 -0500
19691@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) 19755@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
19692 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", 19756 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
19693 vcc->dev->number); 19757 vcc->dev->number);
@@ -19733,9 +19797,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/eni.c linux-2.6.32.7/drivers/atm/eni.c
19733 wake_up(&eni_dev->tx_wait); 19797 wake_up(&eni_dev->tx_wait);
19734 dma_complete++; 19798 dma_complete++;
19735 } 19799 }
19736diff -urNp linux-2.6.32.7/drivers/atm/firestream.c linux-2.6.32.7/drivers/atm/firestream.c 19800diff -urNp linux-2.6.32.8/drivers/atm/firestream.c linux-2.6.32.8/drivers/atm/firestream.c
19737--- linux-2.6.32.7/drivers/atm/firestream.c 2010-01-25 13:50:10.000000000 -0500 19801--- linux-2.6.32.8/drivers/atm/firestream.c 2010-02-09 07:57:19.000000000 -0500
19738+++ linux-2.6.32.7/drivers/atm/firestream.c 2010-01-25 17:39:40.450123608 -0500 19802+++ linux-2.6.32.8/drivers/atm/firestream.c 2010-02-10 15:06:24.007541622 -0500
19739@@ -748,7 +748,7 @@ static void process_txdone_queue (struct 19803@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
19740 } 19804 }
19741 } 19805 }
@@ -19769,9 +19833,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/firestream.c linux-2.6.32.7/drivers/atm/fi
19769 break; 19833 break;
19770 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ 19834 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
19771 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 19835 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
19772diff -urNp linux-2.6.32.7/drivers/atm/fore200e.c linux-2.6.32.7/drivers/atm/fore200e.c 19836diff -urNp linux-2.6.32.8/drivers/atm/fore200e.c linux-2.6.32.8/drivers/atm/fore200e.c
19773--- linux-2.6.32.7/drivers/atm/fore200e.c 2010-01-25 13:50:10.000000000 -0500 19837--- linux-2.6.32.8/drivers/atm/fore200e.c 2010-02-09 07:57:19.000000000 -0500
19774+++ linux-2.6.32.7/drivers/atm/fore200e.c 2010-01-25 17:39:40.450123608 -0500 19838+++ linux-2.6.32.8/drivers/atm/fore200e.c 2010-02-10 15:06:24.007541622 -0500
19775@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 19839@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
19776 #endif 19840 #endif
19777 /* check error condition */ 19841 /* check error condition */
@@ -19828,9 +19892,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/fore200e.c linux-2.6.32.7/drivers/atm/fore
19828 19892
19829 fore200e->tx_sat++; 19893 fore200e->tx_sat++;
19830 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", 19894 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
19831diff -urNp linux-2.6.32.7/drivers/atm/he.c linux-2.6.32.7/drivers/atm/he.c 19895diff -urNp linux-2.6.32.8/drivers/atm/he.c linux-2.6.32.8/drivers/atm/he.c
19832--- linux-2.6.32.7/drivers/atm/he.c 2010-01-25 13:50:10.000000000 -0500 19896--- linux-2.6.32.8/drivers/atm/he.c 2010-02-09 07:57:19.000000000 -0500
19833+++ linux-2.6.32.7/drivers/atm/he.c 2010-01-25 17:39:40.451121328 -0500 19897+++ linux-2.6.32.8/drivers/atm/he.c 2010-02-10 15:06:24.007541622 -0500
19834@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i 19898@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
19835 19899
19836 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { 19900 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -19912,9 +19976,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/he.c linux-2.6.32.7/drivers/atm/he.c
19912 19976
19913 return 0; 19977 return 0;
19914 } 19978 }
19915diff -urNp linux-2.6.32.7/drivers/atm/horizon.c linux-2.6.32.7/drivers/atm/horizon.c 19979diff -urNp linux-2.6.32.8/drivers/atm/horizon.c linux-2.6.32.8/drivers/atm/horizon.c
19916--- linux-2.6.32.7/drivers/atm/horizon.c 2010-01-25 13:50:10.000000000 -0500 19980--- linux-2.6.32.8/drivers/atm/horizon.c 2010-02-09 07:57:19.000000000 -0500
19917+++ linux-2.6.32.7/drivers/atm/horizon.c 2010-01-25 17:39:40.451121328 -0500 19981+++ linux-2.6.32.8/drivers/atm/horizon.c 2010-02-10 15:06:24.007541622 -0500
19918@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, 19982@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
19919 { 19983 {
19920 struct atm_vcc * vcc = ATM_SKB(skb)->vcc; 19984 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -19933,9 +19997,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/horizon.c linux-2.6.32.7/drivers/atm/horiz
19933 19997
19934 // free the skb 19998 // free the skb
19935 hrz_kfree_skb (skb); 19999 hrz_kfree_skb (skb);
19936diff -urNp linux-2.6.32.7/drivers/atm/idt77252.c linux-2.6.32.7/drivers/atm/idt77252.c 20000diff -urNp linux-2.6.32.8/drivers/atm/idt77252.c linux-2.6.32.8/drivers/atm/idt77252.c
19937--- linux-2.6.32.7/drivers/atm/idt77252.c 2010-01-25 13:50:10.000000000 -0500 20001--- linux-2.6.32.8/drivers/atm/idt77252.c 2010-02-09 07:57:19.000000000 -0500
19938+++ linux-2.6.32.7/drivers/atm/idt77252.c 2010-01-25 17:39:40.452307812 -0500 20002+++ linux-2.6.32.8/drivers/atm/idt77252.c 2010-02-10 15:06:24.007541622 -0500
19939@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str 20003@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
19940 else 20004 else
19941 dev_kfree_skb(skb); 20005 dev_kfree_skb(skb);
@@ -20090,9 +20154,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/idt77252.c linux-2.6.32.7/drivers/atm/idt7
20090 return -ENOMEM; 20154 return -ENOMEM;
20091 } 20155 }
20092 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); 20156 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
20093diff -urNp linux-2.6.32.7/drivers/atm/iphase.c linux-2.6.32.7/drivers/atm/iphase.c 20157diff -urNp linux-2.6.32.8/drivers/atm/iphase.c linux-2.6.32.8/drivers/atm/iphase.c
20094--- linux-2.6.32.7/drivers/atm/iphase.c 2010-01-25 13:50:10.000000000 -0500 20158--- linux-2.6.32.8/drivers/atm/iphase.c 2010-02-09 07:57:19.000000000 -0500
20095+++ linux-2.6.32.7/drivers/atm/iphase.c 2010-01-25 17:39:40.453161981 -0500 20159+++ linux-2.6.32.8/drivers/atm/iphase.c 2010-02-10 15:06:24.011479922 -0500
20096@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) 20160@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
20097 status = (u_short) (buf_desc_ptr->desc_mode); 20161 status = (u_short) (buf_desc_ptr->desc_mode);
20098 if (status & (RX_CER | RX_PTE | RX_OFL)) 20162 if (status & (RX_CER | RX_PTE | RX_OFL))
@@ -20189,9 +20253,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/iphase.c linux-2.6.32.7/drivers/atm/iphase
20189 if (iavcc->vc_desc_cnt > 10) { 20253 if (iavcc->vc_desc_cnt > 10) {
20190 vcc->tx_quota = vcc->tx_quota * 3 / 4; 20254 vcc->tx_quota = vcc->tx_quota * 3 / 4;
20191 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); 20255 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
20192diff -urNp linux-2.6.32.7/drivers/atm/lanai.c linux-2.6.32.7/drivers/atm/lanai.c 20256diff -urNp linux-2.6.32.8/drivers/atm/lanai.c linux-2.6.32.8/drivers/atm/lanai.c
20193--- linux-2.6.32.7/drivers/atm/lanai.c 2010-01-25 13:50:10.000000000 -0500 20257--- linux-2.6.32.8/drivers/atm/lanai.c 2010-02-09 07:57:19.000000000 -0500
20194+++ linux-2.6.32.7/drivers/atm/lanai.c 2010-01-25 17:39:40.453161981 -0500 20258+++ linux-2.6.32.8/drivers/atm/lanai.c 2010-02-10 15:06:24.011479922 -0500
20195@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l 20259@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
20196 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); 20260 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
20197 lanai_endtx(lanai, lvcc); 20261 lanai_endtx(lanai, lvcc);
@@ -20246,9 +20310,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/lanai.c linux-2.6.32.7/drivers/atm/lanai.c
20246 lvcc->stats.x.aal5.service_rxcrc++; 20310 lvcc->stats.x.aal5.service_rxcrc++;
20247 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; 20311 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
20248 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); 20312 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
20249diff -urNp linux-2.6.32.7/drivers/atm/nicstar.c linux-2.6.32.7/drivers/atm/nicstar.c 20313diff -urNp linux-2.6.32.8/drivers/atm/nicstar.c linux-2.6.32.8/drivers/atm/nicstar.c
20250--- linux-2.6.32.7/drivers/atm/nicstar.c 2010-01-25 13:50:10.000000000 -0500 20314--- linux-2.6.32.8/drivers/atm/nicstar.c 2010-02-09 07:57:19.000000000 -0500
20251+++ linux-2.6.32.7/drivers/atm/nicstar.c 2010-01-25 17:39:40.454409580 -0500 20315+++ linux-2.6.32.8/drivers/atm/nicstar.c 2010-02-10 15:06:24.011479922 -0500
20252@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, 20316@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
20253 if ((vc = (vc_map *) vcc->dev_data) == NULL) 20317 if ((vc = (vc_map *) vcc->dev_data) == NULL)
20254 { 20318 {
@@ -20451,9 +20515,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/nicstar.c linux-2.6.32.7/drivers/atm/nicst
20451 } 20515 }
20452 } 20516 }
20453 20517
20454diff -urNp linux-2.6.32.7/drivers/atm/solos-pci.c linux-2.6.32.7/drivers/atm/solos-pci.c 20518diff -urNp linux-2.6.32.8/drivers/atm/solos-pci.c linux-2.6.32.8/drivers/atm/solos-pci.c
20455--- linux-2.6.32.7/drivers/atm/solos-pci.c 2010-01-25 13:50:10.000000000 -0500 20519--- linux-2.6.32.8/drivers/atm/solos-pci.c 2010-02-09 07:57:19.000000000 -0500
20456+++ linux-2.6.32.7/drivers/atm/solos-pci.c 2010-01-25 17:39:40.454409580 -0500 20520+++ linux-2.6.32.8/drivers/atm/solos-pci.c 2010-02-10 15:06:24.011479922 -0500
20457@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) 20521@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
20458 } 20522 }
20459 atm_charge(vcc, skb->truesize); 20523 atm_charge(vcc, skb->truesize);
@@ -20472,9 +20536,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/solos-pci.c linux-2.6.32.7/drivers/atm/sol
20472 solos_pop(vcc, oldskb); 20536 solos_pop(vcc, oldskb);
20473 } else 20537 } else
20474 dev_kfree_skb_irq(oldskb); 20538 dev_kfree_skb_irq(oldskb);
20475diff -urNp linux-2.6.32.7/drivers/atm/suni.c linux-2.6.32.7/drivers/atm/suni.c 20539diff -urNp linux-2.6.32.8/drivers/atm/suni.c linux-2.6.32.8/drivers/atm/suni.c
20476--- linux-2.6.32.7/drivers/atm/suni.c 2010-01-25 13:50:10.000000000 -0500 20540--- linux-2.6.32.8/drivers/atm/suni.c 2010-02-09 07:57:19.000000000 -0500
20477+++ linux-2.6.32.7/drivers/atm/suni.c 2010-01-25 17:39:40.455327045 -0500 20541+++ linux-2.6.32.8/drivers/atm/suni.c 2010-02-10 15:06:24.011479922 -0500
20478@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); 20542@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
20479 20543
20480 20544
@@ -20486,9 +20550,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/suni.c linux-2.6.32.7/drivers/atm/suni.c
20486 20550
20487 20551
20488 static void suni_hz(unsigned long from_timer) 20552 static void suni_hz(unsigned long from_timer)
20489diff -urNp linux-2.6.32.7/drivers/atm/uPD98402.c linux-2.6.32.7/drivers/atm/uPD98402.c 20553diff -urNp linux-2.6.32.8/drivers/atm/uPD98402.c linux-2.6.32.8/drivers/atm/uPD98402.c
20490--- linux-2.6.32.7/drivers/atm/uPD98402.c 2010-01-25 13:50:10.000000000 -0500 20554--- linux-2.6.32.8/drivers/atm/uPD98402.c 2010-02-09 07:57:19.000000000 -0500
20491+++ linux-2.6.32.7/drivers/atm/uPD98402.c 2010-01-25 17:39:40.455327045 -0500 20555+++ linux-2.6.32.8/drivers/atm/uPD98402.c 2010-02-10 15:06:24.011479922 -0500
20492@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d 20556@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
20493 struct sonet_stats tmp; 20557 struct sonet_stats tmp;
20494 int error = 0; 20558 int error = 0;
@@ -20533,9 +20597,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/uPD98402.c linux-2.6.32.7/drivers/atm/uPD9
20533 return 0; 20597 return 0;
20534 } 20598 }
20535 20599
20536diff -urNp linux-2.6.32.7/drivers/atm/zatm.c linux-2.6.32.7/drivers/atm/zatm.c 20600diff -urNp linux-2.6.32.8/drivers/atm/zatm.c linux-2.6.32.8/drivers/atm/zatm.c
20537--- linux-2.6.32.7/drivers/atm/zatm.c 2010-01-25 13:50:10.000000000 -0500 20601--- linux-2.6.32.8/drivers/atm/zatm.c 2010-02-09 07:57:19.000000000 -0500
20538+++ linux-2.6.32.7/drivers/atm/zatm.c 2010-01-25 17:39:40.455327045 -0500 20602+++ linux-2.6.32.8/drivers/atm/zatm.c 2010-02-10 15:06:24.011479922 -0500
20539@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy 20603@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
20540 } 20604 }
20541 if (!size) { 20605 if (!size) {
@@ -20563,9 +20627,9 @@ diff -urNp linux-2.6.32.7/drivers/atm/zatm.c linux-2.6.32.7/drivers/atm/zatm.c
20563 wake_up(&zatm_vcc->tx_wait); 20627 wake_up(&zatm_vcc->tx_wait);
20564 } 20628 }
20565 20629
20566diff -urNp linux-2.6.32.7/drivers/base/bus.c linux-2.6.32.7/drivers/base/bus.c 20630diff -urNp linux-2.6.32.8/drivers/base/bus.c linux-2.6.32.8/drivers/base/bus.c
20567--- linux-2.6.32.7/drivers/base/bus.c 2010-01-25 13:50:10.000000000 -0500 20631--- linux-2.6.32.8/drivers/base/bus.c 2010-02-09 07:57:19.000000000 -0500
20568+++ linux-2.6.32.7/drivers/base/bus.c 2010-01-25 17:39:40.455327045 -0500 20632+++ linux-2.6.32.8/drivers/base/bus.c 2010-02-10 15:06:24.011479922 -0500
20569@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob 20633@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
20570 return ret; 20634 return ret;
20571 } 20635 }
@@ -20593,9 +20657,9 @@ diff -urNp linux-2.6.32.7/drivers/base/bus.c linux-2.6.32.7/drivers/base/bus.c
20593 .filter = bus_uevent_filter, 20657 .filter = bus_uevent_filter,
20594 }; 20658 };
20595 20659
20596diff -urNp linux-2.6.32.7/drivers/base/class.c linux-2.6.32.7/drivers/base/class.c 20660diff -urNp linux-2.6.32.8/drivers/base/class.c linux-2.6.32.8/drivers/base/class.c
20597--- linux-2.6.32.7/drivers/base/class.c 2010-01-25 13:50:10.000000000 -0500 20661--- linux-2.6.32.8/drivers/base/class.c 2010-02-09 07:57:19.000000000 -0500
20598+++ linux-2.6.32.7/drivers/base/class.c 2010-01-25 17:39:40.456410893 -0500 20662+++ linux-2.6.32.8/drivers/base/class.c 2010-02-10 15:06:24.011479922 -0500
20599@@ -61,7 +61,7 @@ static void class_release(struct kobject 20663@@ -61,7 +61,7 @@ static void class_release(struct kobject
20600 "be careful\n", class->name); 20664 "be careful\n", class->name);
20601 } 20665 }
@@ -20605,9 +20669,9 @@ diff -urNp linux-2.6.32.7/drivers/base/class.c linux-2.6.32.7/drivers/base/class
20605 .show = class_attr_show, 20669 .show = class_attr_show,
20606 .store = class_attr_store, 20670 .store = class_attr_store,
20607 }; 20671 };
20608diff -urNp linux-2.6.32.7/drivers/base/core.c linux-2.6.32.7/drivers/base/core.c 20672diff -urNp linux-2.6.32.8/drivers/base/core.c linux-2.6.32.8/drivers/base/core.c
20609--- linux-2.6.32.7/drivers/base/core.c 2010-01-25 13:50:10.000000000 -0500 20673--- linux-2.6.32.8/drivers/base/core.c 2010-02-09 07:57:19.000000000 -0500
20610+++ linux-2.6.32.7/drivers/base/core.c 2010-01-25 17:39:40.456410893 -0500 20674+++ linux-2.6.32.8/drivers/base/core.c 2010-02-10 15:06:24.011479922 -0500
20611@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob 20675@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
20612 return ret; 20676 return ret;
20613 } 20677 }
@@ -20626,9 +20690,9 @@ diff -urNp linux-2.6.32.7/drivers/base/core.c linux-2.6.32.7/drivers/base/core.c
20626 .filter = dev_uevent_filter, 20690 .filter = dev_uevent_filter,
20627 .name = dev_uevent_name, 20691 .name = dev_uevent_name,
20628 .uevent = dev_uevent, 20692 .uevent = dev_uevent,
20629diff -urNp linux-2.6.32.7/drivers/base/memory.c linux-2.6.32.7/drivers/base/memory.c 20693diff -urNp linux-2.6.32.8/drivers/base/memory.c linux-2.6.32.8/drivers/base/memory.c
20630--- linux-2.6.32.7/drivers/base/memory.c 2010-01-25 13:50:10.000000000 -0500 20694--- linux-2.6.32.8/drivers/base/memory.c 2010-02-09 07:57:19.000000000 -0500
20631+++ linux-2.6.32.7/drivers/base/memory.c 2010-01-25 17:39:40.456410893 -0500 20695+++ linux-2.6.32.8/drivers/base/memory.c 2010-02-10 15:06:24.011479922 -0500
20632@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks 20696@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
20633 return retval; 20697 return retval;
20634 } 20698 }
@@ -20638,9 +20702,9 @@ diff -urNp linux-2.6.32.7/drivers/base/memory.c linux-2.6.32.7/drivers/base/memo
20638 .name = memory_uevent_name, 20702 .name = memory_uevent_name,
20639 .uevent = memory_uevent, 20703 .uevent = memory_uevent,
20640 }; 20704 };
20641diff -urNp linux-2.6.32.7/drivers/base/sys.c linux-2.6.32.7/drivers/base/sys.c 20705diff -urNp linux-2.6.32.8/drivers/base/sys.c linux-2.6.32.8/drivers/base/sys.c
20642--- linux-2.6.32.7/drivers/base/sys.c 2010-01-25 13:50:10.000000000 -0500 20706--- linux-2.6.32.8/drivers/base/sys.c 2010-02-09 07:57:19.000000000 -0500
20643+++ linux-2.6.32.7/drivers/base/sys.c 2010-01-25 17:39:40.457295758 -0500 20707+++ linux-2.6.32.8/drivers/base/sys.c 2010-02-10 15:06:24.011479922 -0500
20644@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc 20708@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
20645 return -EIO; 20709 return -EIO;
20646 } 20710 }
@@ -20659,9 +20723,9 @@ diff -urNp linux-2.6.32.7/drivers/base/sys.c linux-2.6.32.7/drivers/base/sys.c
20659 .show = sysdev_class_show, 20723 .show = sysdev_class_show,
20660 .store = sysdev_class_store, 20724 .store = sysdev_class_store,
20661 }; 20725 };
20662diff -urNp linux-2.6.32.7/drivers/block/pktcdvd.c linux-2.6.32.7/drivers/block/pktcdvd.c 20726diff -urNp linux-2.6.32.8/drivers/block/pktcdvd.c linux-2.6.32.8/drivers/block/pktcdvd.c
20663--- linux-2.6.32.7/drivers/block/pktcdvd.c 2010-01-25 13:50:10.000000000 -0500 20727--- linux-2.6.32.8/drivers/block/pktcdvd.c 2010-02-09 07:57:19.000000000 -0500
20664+++ linux-2.6.32.7/drivers/block/pktcdvd.c 2010-01-25 17:39:40.457295758 -0500 20728+++ linux-2.6.32.8/drivers/block/pktcdvd.c 2010-02-10 15:06:24.015500808 -0500
20665@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob 20729@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
20666 return len; 20730 return len;
20667 } 20731 }
@@ -20671,9 +20735,9 @@ diff -urNp linux-2.6.32.7/drivers/block/pktcdvd.c linux-2.6.32.7/drivers/block/p
20671 .show = kobj_pkt_show, 20735 .show = kobj_pkt_show,
20672 .store = kobj_pkt_store 20736 .store = kobj_pkt_store
20673 }; 20737 };
20674diff -urNp linux-2.6.32.7/drivers/char/agp/frontend.c linux-2.6.32.7/drivers/char/agp/frontend.c 20738diff -urNp linux-2.6.32.8/drivers/char/agp/frontend.c linux-2.6.32.8/drivers/char/agp/frontend.c
20675--- linux-2.6.32.7/drivers/char/agp/frontend.c 2010-01-25 13:50:10.000000000 -0500 20739--- linux-2.6.32.8/drivers/char/agp/frontend.c 2010-02-09 07:57:19.000000000 -0500
20676+++ linux-2.6.32.7/drivers/char/agp/frontend.c 2010-01-25 17:39:40.457295758 -0500 20740+++ linux-2.6.32.8/drivers/char/agp/frontend.c 2010-02-10 15:06:24.015500808 -0500
20677@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag 20741@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
20678 if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) 20742 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
20679 return -EFAULT; 20743 return -EFAULT;
@@ -20683,9 +20747,9 @@ diff -urNp linux-2.6.32.7/drivers/char/agp/frontend.c linux-2.6.32.7/drivers/cha
20683 return -EFAULT; 20747 return -EFAULT;
20684 20748
20685 client = agp_find_client_by_pid(reserve.pid); 20749 client = agp_find_client_by_pid(reserve.pid);
20686diff -urNp linux-2.6.32.7/drivers/char/agp/intel-agp.c linux-2.6.32.7/drivers/char/agp/intel-agp.c 20750diff -urNp linux-2.6.32.8/drivers/char/agp/intel-agp.c linux-2.6.32.8/drivers/char/agp/intel-agp.c
20687--- linux-2.6.32.7/drivers/char/agp/intel-agp.c 2010-01-25 13:50:10.000000000 -0500 20751--- linux-2.6.32.8/drivers/char/agp/intel-agp.c 2010-02-09 07:57:19.000000000 -0500
20688+++ linux-2.6.32.7/drivers/char/agp/intel-agp.c 2010-01-25 17:39:40.458410929 -0500 20752+++ linux-2.6.32.8/drivers/char/agp/intel-agp.c 2010-02-10 15:06:24.015500808 -0500
20689@@ -2571,7 +2571,7 @@ static struct pci_device_id agp_intel_pc 20753@@ -2571,7 +2571,7 @@ static struct pci_device_id agp_intel_pc
20690 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), 20754 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
20691 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), 20755 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
@@ -20695,9 +20759,9 @@ diff -urNp linux-2.6.32.7/drivers/char/agp/intel-agp.c linux-2.6.32.7/drivers/ch
20695 }; 20759 };
20696 20760
20697 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); 20761 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
20698diff -urNp linux-2.6.32.7/drivers/char/hpet.c linux-2.6.32.7/drivers/char/hpet.c 20762diff -urNp linux-2.6.32.8/drivers/char/hpet.c linux-2.6.32.8/drivers/char/hpet.c
20699--- linux-2.6.32.7/drivers/char/hpet.c 2010-01-25 13:50:10.000000000 -0500 20763--- linux-2.6.32.8/drivers/char/hpet.c 2010-02-09 07:57:19.000000000 -0500
20700+++ linux-2.6.32.7/drivers/char/hpet.c 2010-01-25 17:39:40.458410929 -0500 20764+++ linux-2.6.32.8/drivers/char/hpet.c 2010-02-10 15:06:24.015500808 -0500
20701@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv 20765@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv
20702 }, 20766 },
20703 }; 20767 };
@@ -20707,9 +20771,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hpet.c linux-2.6.32.7/drivers/char/hpet.c
20707 20771
20708 static int __init hpet_init(void) 20772 static int __init hpet_init(void)
20709 { 20773 {
20710diff -urNp linux-2.6.32.7/drivers/char/hvc_beat.c linux-2.6.32.7/drivers/char/hvc_beat.c 20774diff -urNp linux-2.6.32.8/drivers/char/hvc_beat.c linux-2.6.32.8/drivers/char/hvc_beat.c
20711--- linux-2.6.32.7/drivers/char/hvc_beat.c 2010-01-25 13:50:10.000000000 -0500 20775--- linux-2.6.32.8/drivers/char/hvc_beat.c 2010-02-09 07:57:19.000000000 -0500
20712+++ linux-2.6.32.7/drivers/char/hvc_beat.c 2010-01-25 17:39:40.458410929 -0500 20776+++ linux-2.6.32.8/drivers/char/hvc_beat.c 2010-02-10 15:06:24.015500808 -0500
20713@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v 20777@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
20714 return cnt; 20778 return cnt;
20715 } 20779 }
@@ -20719,9 +20783,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_beat.c linux-2.6.32.7/drivers/char/hv
20719 .get_chars = hvc_beat_get_chars, 20783 .get_chars = hvc_beat_get_chars,
20720 .put_chars = hvc_beat_put_chars, 20784 .put_chars = hvc_beat_put_chars,
20721 }; 20785 };
20722diff -urNp linux-2.6.32.7/drivers/char/hvc_console.c linux-2.6.32.7/drivers/char/hvc_console.c 20786diff -urNp linux-2.6.32.8/drivers/char/hvc_console.c linux-2.6.32.8/drivers/char/hvc_console.c
20723--- linux-2.6.32.7/drivers/char/hvc_console.c 2010-01-25 13:50:10.000000000 -0500 20787--- linux-2.6.32.8/drivers/char/hvc_console.c 2010-02-09 07:57:19.000000000 -0500
20724+++ linux-2.6.32.7/drivers/char/hvc_console.c 2010-01-25 17:39:40.458410929 -0500 20788+++ linux-2.6.32.8/drivers/char/hvc_console.c 2010-02-10 15:06:24.015500808 -0500
20725@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind 20789@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
20726 * console interfaces but can still be used as a tty device. This has to be 20790 * console interfaces but can still be used as a tty device. This has to be
20727 * static because kmalloc will not work during early console init. 20791 * static because kmalloc will not work during early console init.
@@ -20749,9 +20813,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_console.c linux-2.6.32.7/drivers/char
20749 { 20813 {
20750 struct hvc_struct *hp; 20814 struct hvc_struct *hp;
20751 int i; 20815 int i;
20752diff -urNp linux-2.6.32.7/drivers/char/hvc_console.h linux-2.6.32.7/drivers/char/hvc_console.h 20816diff -urNp linux-2.6.32.8/drivers/char/hvc_console.h linux-2.6.32.8/drivers/char/hvc_console.h
20753--- linux-2.6.32.7/drivers/char/hvc_console.h 2010-01-25 13:50:10.000000000 -0500 20817--- linux-2.6.32.8/drivers/char/hvc_console.h 2010-02-09 07:57:19.000000000 -0500
20754+++ linux-2.6.32.7/drivers/char/hvc_console.h 2010-01-25 17:39:40.461409770 -0500 20818+++ linux-2.6.32.8/drivers/char/hvc_console.h 2010-02-10 15:06:24.015500808 -0500
20755@@ -55,7 +55,7 @@ struct hvc_struct { 20819@@ -55,7 +55,7 @@ struct hvc_struct {
20756 int outbuf_size; 20820 int outbuf_size;
20757 int n_outbuf; 20821 int n_outbuf;
@@ -20775,9 +20839,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_console.h linux-2.6.32.7/drivers/char
20775 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ 20839 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
20776 extern int hvc_remove(struct hvc_struct *hp); 20840 extern int hvc_remove(struct hvc_struct *hp);
20777 20841
20778diff -urNp linux-2.6.32.7/drivers/char/hvc_iseries.c linux-2.6.32.7/drivers/char/hvc_iseries.c 20842diff -urNp linux-2.6.32.8/drivers/char/hvc_iseries.c linux-2.6.32.8/drivers/char/hvc_iseries.c
20779--- linux-2.6.32.7/drivers/char/hvc_iseries.c 2010-01-25 13:50:10.000000000 -0500 20843--- linux-2.6.32.8/drivers/char/hvc_iseries.c 2010-02-09 07:57:19.000000000 -0500
20780+++ linux-2.6.32.7/drivers/char/hvc_iseries.c 2010-01-25 17:39:40.461409770 -0500 20844+++ linux-2.6.32.8/drivers/char/hvc_iseries.c 2010-02-10 15:06:24.015500808 -0500
20781@@ -197,7 +197,7 @@ done: 20845@@ -197,7 +197,7 @@ done:
20782 return sent; 20846 return sent;
20783 } 20847 }
@@ -20787,9 +20851,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_iseries.c linux-2.6.32.7/drivers/char
20787 .get_chars = get_chars, 20851 .get_chars = get_chars,
20788 .put_chars = put_chars, 20852 .put_chars = put_chars,
20789 .notifier_add = notifier_add_irq, 20853 .notifier_add = notifier_add_irq,
20790diff -urNp linux-2.6.32.7/drivers/char/hvc_iucv.c linux-2.6.32.7/drivers/char/hvc_iucv.c 20854diff -urNp linux-2.6.32.8/drivers/char/hvc_iucv.c linux-2.6.32.8/drivers/char/hvc_iucv.c
20791--- linux-2.6.32.7/drivers/char/hvc_iucv.c 2010-01-25 13:50:10.000000000 -0500 20855--- linux-2.6.32.8/drivers/char/hvc_iucv.c 2010-02-09 07:57:19.000000000 -0500
20792+++ linux-2.6.32.7/drivers/char/hvc_iucv.c 2010-01-25 17:39:40.461409770 -0500 20856+++ linux-2.6.32.8/drivers/char/hvc_iucv.c 2010-02-10 15:06:24.015500808 -0500
20793@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru 20857@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
20794 20858
20795 20859
@@ -20799,9 +20863,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_iucv.c linux-2.6.32.7/drivers/char/hv
20799 .get_chars = hvc_iucv_get_chars, 20863 .get_chars = hvc_iucv_get_chars,
20800 .put_chars = hvc_iucv_put_chars, 20864 .put_chars = hvc_iucv_put_chars,
20801 .notifier_add = hvc_iucv_notifier_add, 20865 .notifier_add = hvc_iucv_notifier_add,
20802diff -urNp linux-2.6.32.7/drivers/char/hvc_rtas.c linux-2.6.32.7/drivers/char/hvc_rtas.c 20866diff -urNp linux-2.6.32.8/drivers/char/hvc_rtas.c linux-2.6.32.8/drivers/char/hvc_rtas.c
20803--- linux-2.6.32.7/drivers/char/hvc_rtas.c 2010-01-25 13:50:10.000000000 -0500 20867--- linux-2.6.32.8/drivers/char/hvc_rtas.c 2010-02-09 07:57:19.000000000 -0500
20804+++ linux-2.6.32.7/drivers/char/hvc_rtas.c 2010-01-25 17:39:40.461409770 -0500 20868+++ linux-2.6.32.8/drivers/char/hvc_rtas.c 2010-02-10 15:06:24.015500808 -0500
20805@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ 20869@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
20806 return i; 20870 return i;
20807 } 20871 }
@@ -20811,9 +20875,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_rtas.c linux-2.6.32.7/drivers/char/hv
20811 .get_chars = hvc_rtas_read_console, 20875 .get_chars = hvc_rtas_read_console,
20812 .put_chars = hvc_rtas_write_console, 20876 .put_chars = hvc_rtas_write_console,
20813 }; 20877 };
20814diff -urNp linux-2.6.32.7/drivers/char/hvcs.c linux-2.6.32.7/drivers/char/hvcs.c 20878diff -urNp linux-2.6.32.8/drivers/char/hvcs.c linux-2.6.32.8/drivers/char/hvcs.c
20815--- linux-2.6.32.7/drivers/char/hvcs.c 2010-01-25 13:50:10.000000000 -0500 20879--- linux-2.6.32.8/drivers/char/hvcs.c 2010-02-09 07:57:19.000000000 -0500
20816+++ linux-2.6.32.7/drivers/char/hvcs.c 2010-01-25 17:39:40.462277205 -0500 20880+++ linux-2.6.32.8/drivers/char/hvcs.c 2010-02-10 15:06:24.015500808 -0500
20817@@ -269,7 +269,7 @@ struct hvcs_struct { 20881@@ -269,7 +269,7 @@ struct hvcs_struct {
20818 unsigned int index; 20882 unsigned int index;
20819 20883
@@ -20908,9 +20972,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvcs.c linux-2.6.32.7/drivers/char/hvcs.c
20908 return 0; 20972 return 0;
20909 20973
20910 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; 20974 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
20911diff -urNp linux-2.6.32.7/drivers/char/hvc_udbg.c linux-2.6.32.7/drivers/char/hvc_udbg.c 20975diff -urNp linux-2.6.32.8/drivers/char/hvc_udbg.c linux-2.6.32.8/drivers/char/hvc_udbg.c
20912--- linux-2.6.32.7/drivers/char/hvc_udbg.c 2010-01-25 13:50:10.000000000 -0500 20976--- linux-2.6.32.8/drivers/char/hvc_udbg.c 2010-02-09 07:57:19.000000000 -0500
20913+++ linux-2.6.32.7/drivers/char/hvc_udbg.c 2010-01-25 17:39:40.462277205 -0500 20977+++ linux-2.6.32.8/drivers/char/hvc_udbg.c 2010-02-10 15:06:24.015500808 -0500
20914@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno 20978@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
20915 return i; 20979 return i;
20916 } 20980 }
@@ -20920,9 +20984,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_udbg.c linux-2.6.32.7/drivers/char/hv
20920 .get_chars = hvc_udbg_get, 20984 .get_chars = hvc_udbg_get,
20921 .put_chars = hvc_udbg_put, 20985 .put_chars = hvc_udbg_put,
20922 }; 20986 };
20923diff -urNp linux-2.6.32.7/drivers/char/hvc_vio.c linux-2.6.32.7/drivers/char/hvc_vio.c 20987diff -urNp linux-2.6.32.8/drivers/char/hvc_vio.c linux-2.6.32.8/drivers/char/hvc_vio.c
20924--- linux-2.6.32.7/drivers/char/hvc_vio.c 2010-01-25 13:50:10.000000000 -0500 20988--- linux-2.6.32.8/drivers/char/hvc_vio.c 2010-02-09 07:57:19.000000000 -0500
20925+++ linux-2.6.32.7/drivers/char/hvc_vio.c 2010-01-25 17:39:40.462277205 -0500 20989+++ linux-2.6.32.8/drivers/char/hvc_vio.c 2010-02-10 15:06:24.015500808 -0500
20926@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v 20990@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
20927 return got; 20991 return got;
20928 } 20992 }
@@ -20932,9 +20996,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_vio.c linux-2.6.32.7/drivers/char/hvc
20932 .get_chars = filtered_get_chars, 20996 .get_chars = filtered_get_chars,
20933 .put_chars = hvc_put_chars, 20997 .put_chars = hvc_put_chars,
20934 .notifier_add = notifier_add_irq, 20998 .notifier_add = notifier_add_irq,
20935diff -urNp linux-2.6.32.7/drivers/char/hvc_xen.c linux-2.6.32.7/drivers/char/hvc_xen.c 20999diff -urNp linux-2.6.32.8/drivers/char/hvc_xen.c linux-2.6.32.8/drivers/char/hvc_xen.c
20936--- linux-2.6.32.7/drivers/char/hvc_xen.c 2010-01-25 13:50:10.000000000 -0500 21000--- linux-2.6.32.8/drivers/char/hvc_xen.c 2010-02-09 07:57:19.000000000 -0500
20937+++ linux-2.6.32.7/drivers/char/hvc_xen.c 2010-01-25 17:39:40.462277205 -0500 21001+++ linux-2.6.32.8/drivers/char/hvc_xen.c 2010-02-10 15:06:24.015500808 -0500
20938@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno 21002@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
20939 return recv; 21003 return recv;
20940 } 21004 }
@@ -20944,9 +21008,9 @@ diff -urNp linux-2.6.32.7/drivers/char/hvc_xen.c linux-2.6.32.7/drivers/char/hvc
20944 .get_chars = read_console, 21008 .get_chars = read_console,
20945 .put_chars = write_console, 21009 .put_chars = write_console,
20946 .notifier_add = notifier_add_irq, 21010 .notifier_add = notifier_add_irq,
20947diff -urNp linux-2.6.32.7/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.7/drivers/char/ipmi/ipmi_msghandler.c 21011diff -urNp linux-2.6.32.8/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.8/drivers/char/ipmi/ipmi_msghandler.c
20948--- linux-2.6.32.7/drivers/char/ipmi/ipmi_msghandler.c 2010-01-25 13:50:10.000000000 -0500 21012--- linux-2.6.32.8/drivers/char/ipmi/ipmi_msghandler.c 2010-02-09 07:57:19.000000000 -0500
20949+++ linux-2.6.32.7/drivers/char/ipmi/ipmi_msghandler.c 2010-01-25 17:39:40.463416503 -0500 21013+++ linux-2.6.32.8/drivers/char/ipmi/ipmi_msghandler.c 2010-02-10 15:06:24.015500808 -0500
20950@@ -414,7 +414,7 @@ struct ipmi_smi { 21014@@ -414,7 +414,7 @@ struct ipmi_smi {
20951 struct proc_dir_entry *proc_dir; 21015 struct proc_dir_entry *proc_dir;
20952 char proc_dir_name[10]; 21016 char proc_dir_name[10];
@@ -20977,9 +21041,9 @@ diff -urNp linux-2.6.32.7/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.7/dri
20977 21041
20978 intf->proc_dir = NULL; 21042 intf->proc_dir = NULL;
20979 21043
20980diff -urNp linux-2.6.32.7/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.7/drivers/char/ipmi/ipmi_si_intf.c 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
20981--- linux-2.6.32.7/drivers/char/ipmi/ipmi_si_intf.c 2010-01-25 13:50:10.000000000 -0500 21045--- linux-2.6.32.8/drivers/char/ipmi/ipmi_si_intf.c 2010-02-09 07:57:19.000000000 -0500
20982+++ linux-2.6.32.7/drivers/char/ipmi/ipmi_si_intf.c 2010-01-25 17:39:40.463416503 -0500 21046+++ linux-2.6.32.8/drivers/char/ipmi/ipmi_si_intf.c 2010-02-10 15:06:24.019496818 -0500
20983@@ -277,7 +277,7 @@ struct smi_info { 21047@@ -277,7 +277,7 @@ struct smi_info {
20984 unsigned char slave_addr; 21048 unsigned char slave_addr;
20985 21049
@@ -21010,9 +21074,9 @@ diff -urNp linux-2.6.32.7/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.7/driver
21010 21074
21011 new_smi->interrupt_disabled = 0; 21075 new_smi->interrupt_disabled = 0;
21012 atomic_set(&new_smi->stop_operation, 0); 21076 atomic_set(&new_smi->stop_operation, 0);
21013diff -urNp linux-2.6.32.7/drivers/char/keyboard.c linux-2.6.32.7/drivers/char/keyboard.c 21077diff -urNp linux-2.6.32.8/drivers/char/keyboard.c linux-2.6.32.8/drivers/char/keyboard.c
21014--- linux-2.6.32.7/drivers/char/keyboard.c 2010-01-25 13:50:10.000000000 -0500 21078--- linux-2.6.32.8/drivers/char/keyboard.c 2010-02-09 07:57:19.000000000 -0500
21015+++ linux-2.6.32.7/drivers/char/keyboard.c 2010-01-25 17:39:40.464368791 -0500 21079+++ linux-2.6.32.8/drivers/char/keyboard.c 2010-02-10 15:06:24.019496818 -0500
21016@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u 21080@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
21017 kbd->kbdmode == VC_MEDIUMRAW) && 21081 kbd->kbdmode == VC_MEDIUMRAW) &&
21018 value != KVAL(K_SAK)) 21082 value != KVAL(K_SAK))
@@ -21039,9 +21103,9 @@ diff -urNp linux-2.6.32.7/drivers/char/keyboard.c linux-2.6.32.7/drivers/char/ke
21039 }; 21103 };
21040 21104
21041 MODULE_DEVICE_TABLE(input, kbd_ids); 21105 MODULE_DEVICE_TABLE(input, kbd_ids);
21042diff -urNp linux-2.6.32.7/drivers/char/mem.c linux-2.6.32.7/drivers/char/mem.c 21106diff -urNp linux-2.6.32.8/drivers/char/mem.c linux-2.6.32.8/drivers/char/mem.c
21043--- linux-2.6.32.7/drivers/char/mem.c 2010-01-25 13:50:10.000000000 -0500 21107--- linux-2.6.32.8/drivers/char/mem.c 2010-02-09 07:57:19.000000000 -0500
21044+++ linux-2.6.32.7/drivers/char/mem.c 2010-01-25 17:39:40.464368791 -0500 21108+++ linux-2.6.32.8/drivers/char/mem.c 2010-02-10 15:06:24.019496818 -0500
21045@@ -18,6 +18,7 @@ 21109@@ -18,6 +18,7 @@
21046 #include <linux/raw.h> 21110 #include <linux/raw.h>
21047 #include <linux/tty.h> 21111 #include <linux/tty.h>
@@ -21132,9 +21196,9 @@ diff -urNp linux-2.6.32.7/drivers/char/mem.c linux-2.6.32.7/drivers/char/mem.c
21132 }; 21196 };
21133 21197
21134 static int memory_open(struct inode *inode, struct file *filp) 21198 static int memory_open(struct inode *inode, struct file *filp)
21135diff -urNp linux-2.6.32.7/drivers/char/nvram.c linux-2.6.32.7/drivers/char/nvram.c 21199diff -urNp linux-2.6.32.8/drivers/char/nvram.c linux-2.6.32.8/drivers/char/nvram.c
21136--- linux-2.6.32.7/drivers/char/nvram.c 2010-01-25 13:50:10.000000000 -0500 21200--- linux-2.6.32.8/drivers/char/nvram.c 2010-02-09 07:57:19.000000000 -0500
21137+++ linux-2.6.32.7/drivers/char/nvram.c 2010-01-25 17:39:40.464368791 -0500 21201+++ linux-2.6.32.8/drivers/char/nvram.c 2010-02-10 15:06:24.019496818 -0500
21138@@ -429,7 +429,10 @@ static const struct file_operations nvra 21202@@ -429,7 +429,10 @@ static const struct file_operations nvra
21139 static struct miscdevice nvram_dev = { 21203 static struct miscdevice nvram_dev = {
21140 NVRAM_MINOR, 21204 NVRAM_MINOR,
@@ -21147,9 +21211,9 @@ diff -urNp linux-2.6.32.7/drivers/char/nvram.c linux-2.6.32.7/drivers/char/nvram
21147 }; 21211 };
21148 21212
21149 static int __init nvram_init(void) 21213 static int __init nvram_init(void)
21150diff -urNp linux-2.6.32.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.7/drivers/char/pcmcia/ipwireless/tty.c 21214diff -urNp linux-2.6.32.8/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.8/drivers/char/pcmcia/ipwireless/tty.c
21151--- linux-2.6.32.7/drivers/char/pcmcia/ipwireless/tty.c 2010-01-25 13:50:10.000000000 -0500 21215--- linux-2.6.32.8/drivers/char/pcmcia/ipwireless/tty.c 2010-02-09 07:57:19.000000000 -0500
21152+++ linux-2.6.32.7/drivers/char/pcmcia/ipwireless/tty.c 2010-01-25 17:39:40.465137767 -0500 21216+++ linux-2.6.32.8/drivers/char/pcmcia/ipwireless/tty.c 2010-02-10 15:06:24.019496818 -0500
21153@@ -51,7 +51,7 @@ struct ipw_tty { 21217@@ -51,7 +51,7 @@ struct ipw_tty {
21154 int tty_type; 21218 int tty_type;
21155 struct ipw_network *network; 21219 struct ipw_network *network;
@@ -21264,9 +21328,9 @@ diff -urNp linux-2.6.32.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.7/dr
21264 do_ipw_close(ttyj); 21328 do_ipw_close(ttyj);
21265 ipwireless_disassociate_network_ttys(network, 21329 ipwireless_disassociate_network_ttys(network,
21266 ttyj->channel_idx); 21330 ttyj->channel_idx);
21267diff -urNp linux-2.6.32.7/drivers/char/pty.c linux-2.6.32.7/drivers/char/pty.c 21331diff -urNp linux-2.6.32.8/drivers/char/pty.c linux-2.6.32.8/drivers/char/pty.c
21268--- linux-2.6.32.7/drivers/char/pty.c 2010-01-25 13:50:10.000000000 -0500 21332--- linux-2.6.32.8/drivers/char/pty.c 2010-02-09 07:57:19.000000000 -0500
21269+++ linux-2.6.32.7/drivers/char/pty.c 2010-01-25 17:39:40.465137767 -0500 21333+++ linux-2.6.32.8/drivers/char/pty.c 2010-02-10 15:06:24.019496818 -0500
21270@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode 21334@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
21271 return ret; 21335 return ret;
21272 } 21336 }
@@ -21297,9 +21361,9 @@ diff -urNp linux-2.6.32.7/drivers/char/pty.c linux-2.6.32.7/drivers/char/pty.c
21297 cdev_init(&ptmx_cdev, &ptmx_fops); 21361 cdev_init(&ptmx_cdev, &ptmx_fops);
21298 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || 21362 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
21299 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) 21363 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
21300diff -urNp linux-2.6.32.7/drivers/char/random.c linux-2.6.32.7/drivers/char/random.c 21364diff -urNp linux-2.6.32.8/drivers/char/random.c linux-2.6.32.8/drivers/char/random.c
21301--- linux-2.6.32.7/drivers/char/random.c 2010-01-25 13:50:10.000000000 -0500 21365--- linux-2.6.32.8/drivers/char/random.c 2010-02-09 07:57:19.000000000 -0500
21302+++ linux-2.6.32.7/drivers/char/random.c 2010-01-25 17:39:40.465137767 -0500 21366+++ linux-2.6.32.8/drivers/char/random.c 2010-02-10 15:06:24.019496818 -0500
21303@@ -254,8 +254,13 @@ 21367@@ -254,8 +254,13 @@
21304 /* 21368 /*
21305 * Configuration information 21369 * Configuration information
@@ -21332,7 +21396,7 @@ diff -urNp linux-2.6.32.7/drivers/char/random.c linux-2.6.32.7/drivers/char/rand
21332 #if 0 21396 #if 0
21333 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */ 21397 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
21334 { 2048, 1638, 1231, 819, 411, 1 }, 21398 { 2048, 1638, 1231, 819, 411, 1 },
21335@@ -1218,7 +1230,7 @@ EXPORT_SYMBOL(generate_random_uuid); 21399@@ -1209,7 +1221,7 @@ EXPORT_SYMBOL(generate_random_uuid);
21336 #include <linux/sysctl.h> 21400 #include <linux/sysctl.h>
21337 21401
21338 static int min_read_thresh = 8, min_write_thresh; 21402 static int min_read_thresh = 8, min_write_thresh;
@@ -21341,9 +21405,9 @@ diff -urNp linux-2.6.32.7/drivers/char/random.c linux-2.6.32.7/drivers/char/rand
21341 static int max_write_thresh = INPUT_POOL_WORDS * 32; 21405 static int max_write_thresh = INPUT_POOL_WORDS * 32;
21342 static char sysctl_bootid[16]; 21406 static char sysctl_bootid[16];
21343 21407
21344diff -urNp linux-2.6.32.7/drivers/char/sonypi.c linux-2.6.32.7/drivers/char/sonypi.c 21408diff -urNp linux-2.6.32.8/drivers/char/sonypi.c linux-2.6.32.8/drivers/char/sonypi.c
21345--- linux-2.6.32.7/drivers/char/sonypi.c 2010-01-25 13:50:10.000000000 -0500 21409--- linux-2.6.32.8/drivers/char/sonypi.c 2010-02-09 07:57:19.000000000 -0500
21346+++ linux-2.6.32.7/drivers/char/sonypi.c 2010-01-25 17:39:40.466354578 -0500 21410+++ linux-2.6.32.8/drivers/char/sonypi.c 2010-02-10 15:06:24.019496818 -0500
21347@@ -491,7 +491,7 @@ static struct sonypi_device { 21411@@ -491,7 +491,7 @@ static struct sonypi_device {
21348 spinlock_t fifo_lock; 21412 spinlock_t fifo_lock;
21349 wait_queue_head_t fifo_proc_list; 21413 wait_queue_head_t fifo_proc_list;
@@ -21374,9 +21438,9 @@ diff -urNp linux-2.6.32.7/drivers/char/sonypi.c linux-2.6.32.7/drivers/char/sony
21374 mutex_unlock(&sonypi_device.lock); 21438 mutex_unlock(&sonypi_device.lock);
21375 unlock_kernel(); 21439 unlock_kernel();
21376 return 0; 21440 return 0;
21377diff -urNp linux-2.6.32.7/drivers/char/tpm/tpm_bios.c linux-2.6.32.7/drivers/char/tpm/tpm_bios.c 21441diff -urNp linux-2.6.32.8/drivers/char/tpm/tpm_bios.c linux-2.6.32.8/drivers/char/tpm/tpm_bios.c
21378--- linux-2.6.32.7/drivers/char/tpm/tpm_bios.c 2010-01-25 13:50:10.000000000 -0500 21442--- linux-2.6.32.8/drivers/char/tpm/tpm_bios.c 2010-02-09 07:57:19.000000000 -0500
21379+++ linux-2.6.32.7/drivers/char/tpm/tpm_bios.c 2010-01-25 17:39:40.466354578 -0500 21443+++ linux-2.6.32.8/drivers/char/tpm/tpm_bios.c 2010-02-10 15:06:24.019496818 -0500
21380@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start 21444@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
21381 event = addr; 21445 event = addr;
21382 21446
@@ -21417,9 +21481,9 @@ diff -urNp linux-2.6.32.7/drivers/char/tpm/tpm_bios.c linux-2.6.32.7/drivers/cha
21417 21481
21418 memcpy(log->bios_event_log, virt, len); 21482 memcpy(log->bios_event_log, virt, len);
21419 21483
21420diff -urNp linux-2.6.32.7/drivers/char/tty_io.c linux-2.6.32.7/drivers/char/tty_io.c 21484diff -urNp linux-2.6.32.8/drivers/char/tty_io.c linux-2.6.32.8/drivers/char/tty_io.c
21421--- linux-2.6.32.7/drivers/char/tty_io.c 2010-01-25 13:50:10.000000000 -0500 21485--- linux-2.6.32.8/drivers/char/tty_io.c 2010-02-09 07:57:19.000000000 -0500
21422+++ linux-2.6.32.7/drivers/char/tty_io.c 2010-01-25 17:39:40.466354578 -0500 21486+++ linux-2.6.32.8/drivers/char/tty_io.c 2010-02-10 15:06:24.019496818 -0500
21423@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list 21487@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
21424 DEFINE_MUTEX(tty_mutex); 21488 DEFINE_MUTEX(tty_mutex);
21425 EXPORT_SYMBOL(tty_mutex); 21489 EXPORT_SYMBOL(tty_mutex);
@@ -21558,9 +21622,9 @@ diff -urNp linux-2.6.32.7/drivers/char/tty_io.c linux-2.6.32.7/drivers/char/tty_
21558 /* 21622 /*
21559 * Initialize the console device. This is called *early*, so 21623 * Initialize the console device. This is called *early*, so
21560 * we can't necessarily depend on lots of kernel help here. 21624 * we can't necessarily depend on lots of kernel help here.
21561diff -urNp linux-2.6.32.7/drivers/char/tty_ldisc.c linux-2.6.32.7/drivers/char/tty_ldisc.c 21625diff -urNp linux-2.6.32.8/drivers/char/tty_ldisc.c linux-2.6.32.8/drivers/char/tty_ldisc.c
21562--- linux-2.6.32.7/drivers/char/tty_ldisc.c 2010-01-25 13:50:10.000000000 -0500 21626--- linux-2.6.32.8/drivers/char/tty_ldisc.c 2010-02-09 07:57:19.000000000 -0500
21563+++ linux-2.6.32.7/drivers/char/tty_ldisc.c 2010-01-25 17:39:40.467421675 -0500 21627+++ linux-2.6.32.8/drivers/char/tty_ldisc.c 2010-02-10 15:06:24.019496818 -0500
21564@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * 21628@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc *
21565 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { 21629 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
21566 struct tty_ldisc_ops *ldo = ld->ops; 21630 struct tty_ldisc_ops *ldo = ld->ops;
@@ -21606,9 +21670,9 @@ diff -urNp linux-2.6.32.7/drivers/char/tty_ldisc.c linux-2.6.32.7/drivers/char/t
21606 module_put(ldops->owner); 21670 module_put(ldops->owner);
21607 spin_unlock_irqrestore(&tty_ldisc_lock, flags); 21671 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
21608 } 21672 }
21609diff -urNp linux-2.6.32.7/drivers/char/virtio_console.c linux-2.6.32.7/drivers/char/virtio_console.c 21673diff -urNp linux-2.6.32.8/drivers/char/virtio_console.c linux-2.6.32.8/drivers/char/virtio_console.c
21610--- linux-2.6.32.7/drivers/char/virtio_console.c 2010-01-25 13:50:10.000000000 -0500 21674--- linux-2.6.32.8/drivers/char/virtio_console.c 2010-02-09 07:57:19.000000000 -0500
21611+++ linux-2.6.32.7/drivers/char/virtio_console.c 2010-01-25 17:39:40.467421675 -0500 21675+++ linux-2.6.32.8/drivers/char/virtio_console.c 2010-02-10 15:06:24.019496818 -0500
21612@@ -44,6 +44,7 @@ static unsigned int in_len; 21676@@ -44,6 +44,7 @@ static unsigned int in_len;
21613 static char *in, *inbuf; 21677 static char *in, *inbuf;
21614 21678
@@ -21617,9 +21681,9 @@ diff -urNp linux-2.6.32.7/drivers/char/virtio_console.c linux-2.6.32.7/drivers/c
21617 static struct hv_ops virtio_cons; 21681 static struct hv_ops virtio_cons;
21618 21682
21619 /* The hvc device */ 21683 /* The hvc device */
21620diff -urNp linux-2.6.32.7/drivers/char/vt_ioctl.c linux-2.6.32.7/drivers/char/vt_ioctl.c 21684diff -urNp linux-2.6.32.8/drivers/char/vt_ioctl.c linux-2.6.32.8/drivers/char/vt_ioctl.c
21621--- linux-2.6.32.7/drivers/char/vt_ioctl.c 2010-01-25 13:50:10.000000000 -0500 21685--- linux-2.6.32.8/drivers/char/vt_ioctl.c 2010-02-09 07:57:19.000000000 -0500
21622+++ linux-2.6.32.7/drivers/char/vt_ioctl.c 2010-01-25 17:39:40.468114881 -0500 21686+++ linux-2.6.32.8/drivers/char/vt_ioctl.c 2010-02-10 15:06:24.023495064 -0500
21623@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ 21687@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __
21624 case KDSKBENT: 21688 case KDSKBENT:
21625 if (!perm) 21689 if (!perm)
@@ -21647,9 +21711,9 @@ diff -urNp linux-2.6.32.7/drivers/char/vt_ioctl.c linux-2.6.32.7/drivers/char/vt
21647 q = func_table[i]; 21711 q = func_table[i];
21648 first_free = funcbufptr + (funcbufsize - funcbufleft); 21712 first_free = funcbufptr + (funcbufsize - funcbufleft);
21649 for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 21713 for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++)
21650diff -urNp linux-2.6.32.7/drivers/cpufreq/cpufreq.c linux-2.6.32.7/drivers/cpufreq/cpufreq.c 21714diff -urNp linux-2.6.32.8/drivers/cpufreq/cpufreq.c linux-2.6.32.8/drivers/cpufreq/cpufreq.c
21651--- linux-2.6.32.7/drivers/cpufreq/cpufreq.c 2010-01-25 13:50:10.000000000 -0500 21715--- linux-2.6.32.8/drivers/cpufreq/cpufreq.c 2010-02-09 07:57:19.000000000 -0500
21652+++ linux-2.6.32.7/drivers/cpufreq/cpufreq.c 2010-01-25 17:39:40.468114881 -0500 21716+++ linux-2.6.32.8/drivers/cpufreq/cpufreq.c 2010-02-10 15:06:24.023495064 -0500
21653@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct 21717@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
21654 complete(&policy->kobj_unregister); 21718 complete(&policy->kobj_unregister);
21655 } 21719 }
@@ -21659,9 +21723,9 @@ diff -urNp linux-2.6.32.7/drivers/cpufreq/cpufreq.c linux-2.6.32.7/drivers/cpufr
21659 .show = show, 21723 .show = show,
21660 .store = store, 21724 .store = store,
21661 }; 21725 };
21662diff -urNp linux-2.6.32.7/drivers/cpuidle/sysfs.c linux-2.6.32.7/drivers/cpuidle/sysfs.c 21726diff -urNp linux-2.6.32.8/drivers/cpuidle/sysfs.c linux-2.6.32.8/drivers/cpuidle/sysfs.c
21663--- linux-2.6.32.7/drivers/cpuidle/sysfs.c 2010-01-25 13:50:10.000000000 -0500 21727--- linux-2.6.32.8/drivers/cpuidle/sysfs.c 2010-02-09 07:57:19.000000000 -0500
21664+++ linux-2.6.32.7/drivers/cpuidle/sysfs.c 2010-01-25 17:39:40.468114881 -0500 21728+++ linux-2.6.32.8/drivers/cpuidle/sysfs.c 2010-02-10 15:06:24.023495064 -0500
21665@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj 21729@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
21666 return ret; 21730 return ret;
21667 } 21731 }
@@ -21680,9 +21744,9 @@ diff -urNp linux-2.6.32.7/drivers/cpuidle/sysfs.c linux-2.6.32.7/drivers/cpuidle
21680 .show = cpuidle_state_show, 21744 .show = cpuidle_state_show,
21681 }; 21745 };
21682 21746
21683diff -urNp linux-2.6.32.7/drivers/dma/ioat/dma.c linux-2.6.32.7/drivers/dma/ioat/dma.c 21747diff -urNp linux-2.6.32.8/drivers/dma/ioat/dma.c linux-2.6.32.8/drivers/dma/ioat/dma.c
21684--- linux-2.6.32.7/drivers/dma/ioat/dma.c 2010-01-25 13:50:10.000000000 -0500 21748--- linux-2.6.32.8/drivers/dma/ioat/dma.c 2010-02-09 07:57:19.000000000 -0500
21685+++ linux-2.6.32.7/drivers/dma/ioat/dma.c 2010-01-25 17:39:40.468114881 -0500 21749+++ linux-2.6.32.8/drivers/dma/ioat/dma.c 2010-02-10 15:06:24.023495064 -0500
21686@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str 21750@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
21687 return entry->show(&chan->common, page); 21751 return entry->show(&chan->common, page);
21688 } 21752 }
@@ -21692,9 +21756,9 @@ diff -urNp linux-2.6.32.7/drivers/dma/ioat/dma.c linux-2.6.32.7/drivers/dma/ioat
21692 .show = ioat_attr_show, 21756 .show = ioat_attr_show,
21693 }; 21757 };
21694 21758
21695diff -urNp linux-2.6.32.7/drivers/dma/ioat/dma.h linux-2.6.32.7/drivers/dma/ioat/dma.h 21759diff -urNp linux-2.6.32.8/drivers/dma/ioat/dma.h linux-2.6.32.8/drivers/dma/ioat/dma.h
21696--- linux-2.6.32.7/drivers/dma/ioat/dma.h 2010-01-25 13:50:10.000000000 -0500 21760--- linux-2.6.32.8/drivers/dma/ioat/dma.h 2010-02-09 07:57:19.000000000 -0500
21697+++ linux-2.6.32.7/drivers/dma/ioat/dma.h 2010-01-25 17:39:40.468114881 -0500 21761+++ linux-2.6.32.8/drivers/dma/ioat/dma.h 2010-02-10 15:06:24.023495064 -0500
21698@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c 21762@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
21699 unsigned long *phys_complete); 21763 unsigned long *phys_complete);
21700 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); 21764 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
@@ -21704,9 +21768,9 @@ diff -urNp linux-2.6.32.7/drivers/dma/ioat/dma.h linux-2.6.32.7/drivers/dma/ioat
21704 extern struct ioat_sysfs_entry ioat_version_attr; 21768 extern struct ioat_sysfs_entry ioat_version_attr;
21705 extern struct ioat_sysfs_entry ioat_cap_attr; 21769 extern struct ioat_sysfs_entry ioat_cap_attr;
21706 #endif /* IOATDMA_H */ 21770 #endif /* IOATDMA_H */
21707diff -urNp linux-2.6.32.7/drivers/edac/edac_core.h linux-2.6.32.7/drivers/edac/edac_core.h 21771diff -urNp linux-2.6.32.8/drivers/edac/edac_core.h linux-2.6.32.8/drivers/edac/edac_core.h
21708--- linux-2.6.32.7/drivers/edac/edac_core.h 2010-01-25 13:50:10.000000000 -0500 21772--- linux-2.6.32.8/drivers/edac/edac_core.h 2010-02-09 07:57:19.000000000 -0500
21709+++ linux-2.6.32.7/drivers/edac/edac_core.h 2010-01-25 17:39:40.469418840 -0500 21773+++ linux-2.6.32.8/drivers/edac/edac_core.h 2010-02-10 15:06:24.023495064 -0500
21710@@ -99,11 +99,11 @@ extern int edac_debug_level; 21774@@ -99,11 +99,11 @@ extern int edac_debug_level;
21711 21775
21712 #else /* !CONFIG_EDAC_DEBUG */ 21776 #else /* !CONFIG_EDAC_DEBUG */
@@ -21724,9 +21788,9 @@ diff -urNp linux-2.6.32.7/drivers/edac/edac_core.h linux-2.6.32.7/drivers/edac/e
21724 21788
21725 #endif /* !CONFIG_EDAC_DEBUG */ 21789 #endif /* !CONFIG_EDAC_DEBUG */
21726 21790
21727diff -urNp linux-2.6.32.7/drivers/edac/edac_device_sysfs.c linux-2.6.32.7/drivers/edac/edac_device_sysfs.c 21791diff -urNp linux-2.6.32.8/drivers/edac/edac_device_sysfs.c linux-2.6.32.8/drivers/edac/edac_device_sysfs.c
21728--- linux-2.6.32.7/drivers/edac/edac_device_sysfs.c 2010-01-25 13:50:10.000000000 -0500 21792--- linux-2.6.32.8/drivers/edac/edac_device_sysfs.c 2010-02-09 07:57:19.000000000 -0500
21729+++ linux-2.6.32.7/drivers/edac/edac_device_sysfs.c 2010-01-25 17:39:40.469418840 -0500 21793+++ linux-2.6.32.8/drivers/edac/edac_device_sysfs.c 2010-02-10 15:06:24.023495064 -0500
21730@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s 21794@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
21731 } 21795 }
21732 21796
@@ -21754,9 +21818,9 @@ diff -urNp linux-2.6.32.7/drivers/edac/edac_device_sysfs.c linux-2.6.32.7/driver
21754 .show = edac_dev_block_show, 21818 .show = edac_dev_block_show,
21755 .store = edac_dev_block_store 21819 .store = edac_dev_block_store
21756 }; 21820 };
21757diff -urNp linux-2.6.32.7/drivers/edac/edac_mc_sysfs.c linux-2.6.32.7/drivers/edac/edac_mc_sysfs.c 21821diff -urNp linux-2.6.32.8/drivers/edac/edac_mc_sysfs.c linux-2.6.32.8/drivers/edac/edac_mc_sysfs.c
21758--- linux-2.6.32.7/drivers/edac/edac_mc_sysfs.c 2010-01-25 13:50:10.000000000 -0500 21822--- linux-2.6.32.8/drivers/edac/edac_mc_sysfs.c 2010-02-09 07:57:19.000000000 -0500
21759+++ linux-2.6.32.7/drivers/edac/edac_mc_sysfs.c 2010-01-25 17:39:40.470118277 -0500 21823+++ linux-2.6.32.8/drivers/edac/edac_mc_sysfs.c 2010-02-10 15:06:24.023495064 -0500
21760@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob 21824@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
21761 return -EIO; 21825 return -EIO;
21762 } 21826 }
@@ -21775,9 +21839,9 @@ diff -urNp linux-2.6.32.7/drivers/edac/edac_mc_sysfs.c linux-2.6.32.7/drivers/ed
21775 .show = mcidev_show, 21839 .show = mcidev_show,
21776 .store = mcidev_store 21840 .store = mcidev_store
21777 }; 21841 };
21778diff -urNp linux-2.6.32.7/drivers/edac/edac_pci_sysfs.c linux-2.6.32.7/drivers/edac/edac_pci_sysfs.c 21842diff -urNp linux-2.6.32.8/drivers/edac/edac_pci_sysfs.c linux-2.6.32.8/drivers/edac/edac_pci_sysfs.c
21779--- linux-2.6.32.7/drivers/edac/edac_pci_sysfs.c 2010-01-25 13:50:10.000000000 -0500 21843--- linux-2.6.32.8/drivers/edac/edac_pci_sysfs.c 2010-02-09 07:57:19.000000000 -0500
21780+++ linux-2.6.32.7/drivers/edac/edac_pci_sysfs.c 2010-01-25 17:39:40.470118277 -0500 21844+++ linux-2.6.32.8/drivers/edac/edac_pci_sysfs.c 2010-02-10 15:06:24.023495064 -0500
21781@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s 21845@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
21782 } 21846 }
21783 21847
@@ -21796,9 +21860,9 @@ diff -urNp linux-2.6.32.7/drivers/edac/edac_pci_sysfs.c linux-2.6.32.7/drivers/e
21796 .show = edac_pci_dev_show, 21860 .show = edac_pci_dev_show,
21797 .store = edac_pci_dev_store 21861 .store = edac_pci_dev_store
21798 }; 21862 };
21799diff -urNp linux-2.6.32.7/drivers/firmware/dmi_scan.c linux-2.6.32.7/drivers/firmware/dmi_scan.c 21863diff -urNp linux-2.6.32.8/drivers/firmware/dmi_scan.c linux-2.6.32.8/drivers/firmware/dmi_scan.c
21800--- linux-2.6.32.7/drivers/firmware/dmi_scan.c 2010-01-25 20:04:14.730263785 -0500 21864--- linux-2.6.32.8/drivers/firmware/dmi_scan.c 2010-02-09 07:57:19.000000000 -0500
21801+++ linux-2.6.32.7/drivers/firmware/dmi_scan.c 2010-01-25 20:04:24.434442680 -0500 21865+++ linux-2.6.32.8/drivers/firmware/dmi_scan.c 2010-02-10 15:06:24.023495064 -0500
21802@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) 21866@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
21803 } 21867 }
21804 } 21868 }
@@ -21811,9 +21875,9 @@ diff -urNp linux-2.6.32.7/drivers/firmware/dmi_scan.c linux-2.6.32.7/drivers/fir
21811 p = dmi_ioremap(0xF0000, 0x10000); 21875 p = dmi_ioremap(0xF0000, 0x10000);
21812 if (p == NULL) 21876 if (p == NULL)
21813 goto error; 21877 goto error;
21814diff -urNp linux-2.6.32.7/drivers/firmware/edd.c linux-2.6.32.7/drivers/firmware/edd.c 21878diff -urNp linux-2.6.32.8/drivers/firmware/edd.c linux-2.6.32.8/drivers/firmware/edd.c
21815--- linux-2.6.32.7/drivers/firmware/edd.c 2010-01-25 13:50:10.000000000 -0500 21879--- linux-2.6.32.8/drivers/firmware/edd.c 2010-02-09 07:57:19.000000000 -0500
21816+++ linux-2.6.32.7/drivers/firmware/edd.c 2010-01-25 17:39:40.470118277 -0500 21880+++ linux-2.6.32.8/drivers/firmware/edd.c 2010-02-10 15:06:24.023495064 -0500
21817@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str 21881@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
21818 return ret; 21882 return ret;
21819 } 21883 }
@@ -21823,9 +21887,9 @@ diff -urNp linux-2.6.32.7/drivers/firmware/edd.c linux-2.6.32.7/drivers/firmware
21823 .show = edd_attr_show, 21887 .show = edd_attr_show,
21824 }; 21888 };
21825 21889
21826diff -urNp linux-2.6.32.7/drivers/firmware/efivars.c linux-2.6.32.7/drivers/firmware/efivars.c 21890diff -urNp linux-2.6.32.8/drivers/firmware/efivars.c linux-2.6.32.8/drivers/firmware/efivars.c
21827--- linux-2.6.32.7/drivers/firmware/efivars.c 2010-01-25 13:50:10.000000000 -0500 21891--- linux-2.6.32.8/drivers/firmware/efivars.c 2010-02-09 07:57:19.000000000 -0500
21828+++ linux-2.6.32.7/drivers/firmware/efivars.c 2010-01-25 17:39:40.470118277 -0500 21892+++ linux-2.6.32.8/drivers/firmware/efivars.c 2010-02-10 15:06:24.023495064 -0500
21829@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct 21893@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
21830 return ret; 21894 return ret;
21831 } 21895 }
@@ -21835,9 +21899,9 @@ diff -urNp linux-2.6.32.7/drivers/firmware/efivars.c linux-2.6.32.7/drivers/firm
21835 .show = efivar_attr_show, 21899 .show = efivar_attr_show,
21836 .store = efivar_attr_store, 21900 .store = efivar_attr_store,
21837 }; 21901 };
21838diff -urNp linux-2.6.32.7/drivers/firmware/iscsi_ibft.c linux-2.6.32.7/drivers/firmware/iscsi_ibft.c 21902diff -urNp linux-2.6.32.8/drivers/firmware/iscsi_ibft.c linux-2.6.32.8/drivers/firmware/iscsi_ibft.c
21839--- linux-2.6.32.7/drivers/firmware/iscsi_ibft.c 2010-01-25 13:50:10.000000000 -0500 21903--- linux-2.6.32.8/drivers/firmware/iscsi_ibft.c 2010-02-09 07:57:19.000000000 -0500
21840+++ linux-2.6.32.7/drivers/firmware/iscsi_ibft.c 2010-01-25 17:39:40.471175406 -0500 21904+++ linux-2.6.32.8/drivers/firmware/iscsi_ibft.c 2010-02-10 15:06:24.023495064 -0500
21841@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc 21905@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
21842 return ret; 21906 return ret;
21843 } 21907 }
@@ -21847,9 +21911,9 @@ diff -urNp linux-2.6.32.7/drivers/firmware/iscsi_ibft.c linux-2.6.32.7/drivers/f
21847 .show = ibft_show_attribute, 21911 .show = ibft_show_attribute,
21848 }; 21912 };
21849 21913
21850diff -urNp linux-2.6.32.7/drivers/firmware/memmap.c linux-2.6.32.7/drivers/firmware/memmap.c 21914diff -urNp linux-2.6.32.8/drivers/firmware/memmap.c linux-2.6.32.8/drivers/firmware/memmap.c
21851--- linux-2.6.32.7/drivers/firmware/memmap.c 2010-01-25 13:50:10.000000000 -0500 21915--- linux-2.6.32.8/drivers/firmware/memmap.c 2010-02-09 07:57:19.000000000 -0500
21852+++ linux-2.6.32.7/drivers/firmware/memmap.c 2010-01-25 17:39:40.471175406 -0500 21916+++ linux-2.6.32.8/drivers/firmware/memmap.c 2010-02-10 15:06:24.023495064 -0500
21853@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { 21917@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
21854 NULL 21918 NULL
21855 }; 21919 };
@@ -21859,9 +21923,9 @@ diff -urNp linux-2.6.32.7/drivers/firmware/memmap.c linux-2.6.32.7/drivers/firmw
21859 .show = memmap_attr_show, 21923 .show = memmap_attr_show,
21860 }; 21924 };
21861 21925
21862diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_drv.c linux-2.6.32.7/drivers/gpu/drm/drm_drv.c 21926diff -urNp linux-2.6.32.8/drivers/gpu/drm/drm_drv.c linux-2.6.32.8/drivers/gpu/drm/drm_drv.c
21863--- linux-2.6.32.7/drivers/gpu/drm/drm_drv.c 2010-01-25 13:50:10.000000000 -0500 21927--- linux-2.6.32.8/drivers/gpu/drm/drm_drv.c 2010-02-09 07:57:19.000000000 -0500
21864+++ linux-2.6.32.7/drivers/gpu/drm/drm_drv.c 2010-01-25 17:39:40.471175406 -0500 21928+++ linux-2.6.32.8/drivers/gpu/drm/drm_drv.c 2010-02-10 15:06:24.023495064 -0500
21865@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc 21929@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
21866 char *kdata = NULL; 21930 char *kdata = NULL;
21867 21931
@@ -21871,9 +21935,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_drv.c linux-2.6.32.7/drivers/gpu/d
21871 ++file_priv->ioctl_count; 21935 ++file_priv->ioctl_count;
21872 21936
21873 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", 21937 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
21874diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_fops.c linux-2.6.32.7/drivers/gpu/drm/drm_fops.c 21938diff -urNp linux-2.6.32.8/drivers/gpu/drm/drm_fops.c linux-2.6.32.8/drivers/gpu/drm/drm_fops.c
21875--- linux-2.6.32.7/drivers/gpu/drm/drm_fops.c 2010-01-25 13:50:10.000000000 -0500 21939--- linux-2.6.32.8/drivers/gpu/drm/drm_fops.c 2010-02-09 07:57:19.000000000 -0500
21876+++ linux-2.6.32.7/drivers/gpu/drm/drm_fops.c 2010-01-25 17:39:40.471175406 -0500 21940+++ linux-2.6.32.8/drivers/gpu/drm/drm_fops.c 2010-02-10 15:06:24.023495064 -0500
21877@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * 21941@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
21878 } 21942 }
21879 21943
@@ -21925,9 +21989,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_fops.c linux-2.6.32.7/drivers/gpu/
21925 if (atomic_read(&dev->ioctl_count)) { 21989 if (atomic_read(&dev->ioctl_count)) {
21926 DRM_ERROR("Device busy: %d\n", 21990 DRM_ERROR("Device busy: %d\n",
21927 atomic_read(&dev->ioctl_count)); 21991 atomic_read(&dev->ioctl_count));
21928diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.7/drivers/gpu/drm/drm_ioctl.c 21992diff -urNp linux-2.6.32.8/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.8/drivers/gpu/drm/drm_ioctl.c
21929--- linux-2.6.32.7/drivers/gpu/drm/drm_ioctl.c 2010-01-25 13:50:10.000000000 -0500 21993--- linux-2.6.32.8/drivers/gpu/drm/drm_ioctl.c 2010-02-09 07:57:19.000000000 -0500
21930+++ linux-2.6.32.7/drivers/gpu/drm/drm_ioctl.c 2010-01-25 17:39:40.471175406 -0500 21994+++ linux-2.6.32.8/drivers/gpu/drm/drm_ioctl.c 2010-02-10 15:06:24.023495064 -0500
21931@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, 21995@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
21932 stats->data[i].value = 21996 stats->data[i].value =
21933 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); 21997 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -21937,9 +22001,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.7/drivers/gpu
21937 stats->data[i].type = dev->types[i]; 22001 stats->data[i].type = dev->types[i];
21938 } 22002 }
21939 22003
21940diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_lock.c linux-2.6.32.7/drivers/gpu/drm/drm_lock.c 22004diff -urNp linux-2.6.32.8/drivers/gpu/drm/drm_lock.c linux-2.6.32.8/drivers/gpu/drm/drm_lock.c
21941--- linux-2.6.32.7/drivers/gpu/drm/drm_lock.c 2010-01-25 13:50:10.000000000 -0500 22005--- linux-2.6.32.8/drivers/gpu/drm/drm_lock.c 2010-02-09 07:57:19.000000000 -0500
21942+++ linux-2.6.32.7/drivers/gpu/drm/drm_lock.c 2010-01-25 17:39:40.471175406 -0500 22006+++ linux-2.6.32.8/drivers/gpu/drm/drm_lock.c 2010-02-10 15:06:24.023495064 -0500
21943@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi 22007@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
21944 if (drm_lock_take(&master->lock, lock->context)) { 22008 if (drm_lock_take(&master->lock, lock->context)) {
21945 master->lock.file_priv = file_priv; 22009 master->lock.file_priv = file_priv;
@@ -21958,9 +22022,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/drm_lock.c linux-2.6.32.7/drivers/gpu/
21958 22022
21959 /* kernel_context_switch isn't used by any of the x86 drm 22023 /* kernel_context_switch isn't used by any of the x86 drm
21960 * modules but is required by the Sparc driver. 22024 * modules but is required by the Sparc driver.
21961diff -urNp linux-2.6.32.7/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.7/drivers/gpu/drm/i810/i810_dma.c 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
21962--- linux-2.6.32.7/drivers/gpu/drm/i810/i810_dma.c 2010-01-25 13:50:10.000000000 -0500 22026--- linux-2.6.32.8/drivers/gpu/drm/i810/i810_dma.c 2010-02-09 07:57:19.000000000 -0500
21963+++ linux-2.6.32.7/drivers/gpu/drm/i810/i810_dma.c 2010-01-25 17:39:40.472422527 -0500 22027+++ linux-2.6.32.8/drivers/gpu/drm/i810/i810_dma.c 2010-02-10 15:06:24.027503759 -0500
21964@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de 22028@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
21965 dma->buflist[vertex->idx], 22029 dma->buflist[vertex->idx],
21966 vertex->discard, vertex->used); 22030 vertex->discard, vertex->used);
@@ -21983,9 +22047,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.7/drivers
21983 sarea_priv->last_enqueue = dev_priv->counter - 1; 22047 sarea_priv->last_enqueue = dev_priv->counter - 1;
21984 sarea_priv->last_dispatch = (int)hw_status[5]; 22048 sarea_priv->last_dispatch = (int)hw_status[5];
21985 22049
21986diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7017.c 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
21987--- linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7017.c 2010-01-25 13:50:10.000000000 -0500 22051--- linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ch7017.c 2010-02-09 07:57:19.000000000 -0500
21988+++ linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7017.c 2010-01-25 17:39:40.472422527 -0500 22052+++ linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ch7017.c 2010-02-10 15:06:24.027503759 -0500
21989@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ 22053@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
21990 } 22054 }
21991 } 22055 }
@@ -21995,9 +22059,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.7/drive
21995 .init = ch7017_init, 22059 .init = ch7017_init,
21996 .detect = ch7017_detect, 22060 .detect = ch7017_detect,
21997 .mode_valid = ch7017_mode_valid, 22061 .mode_valid = ch7017_mode_valid,
21998diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7xxx.c 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
21999--- linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-01-25 13:50:10.000000000 -0500 22063--- linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-02-09 07:57:19.000000000 -0500
22000+++ linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-01-25 17:39:40.472422527 -0500 22064+++ linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-02-10 15:06:24.027503759 -0500
22001@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ 22065@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
22002 } 22066 }
22003 } 22067 }
@@ -22007,9 +22071,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.7/drive
22007 .init = ch7xxx_init, 22071 .init = ch7xxx_init,
22008 .detect = ch7xxx_detect, 22072 .detect = ch7xxx_detect,
22009 .mode_valid = ch7xxx_mode_valid, 22073 .mode_valid = ch7xxx_mode_valid,
22010diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo.h linux-2.6.32.7/drivers/gpu/drm/i915/dvo.h 22074diff -urNp linux-2.6.32.8/drivers/gpu/drm/i915/dvo.h linux-2.6.32.8/drivers/gpu/drm/i915/dvo.h
22011--- linux-2.6.32.7/drivers/gpu/drm/i915/dvo.h 2010-01-25 13:50:10.000000000 -0500 22075--- linux-2.6.32.8/drivers/gpu/drm/i915/dvo.h 2010-02-09 07:57:19.000000000 -0500
22012+++ linux-2.6.32.7/drivers/gpu/drm/i915/dvo.h 2010-01-25 17:39:40.472422527 -0500 22076+++ linux-2.6.32.8/drivers/gpu/drm/i915/dvo.h 2010-02-10 15:06:24.027503759 -0500
22013@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { 22077@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
22014 * 22078 *
22015 * \return singly-linked list of modes or NULL if no modes found. 22079 * \return singly-linked list of modes or NULL if no modes found.
@@ -22042,9 +22106,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo.h linux-2.6.32.7/drivers/gpu/
22042+extern const struct intel_dvo_dev_ops ch7017_ops; 22106+extern const struct intel_dvo_dev_ops ch7017_ops;
22043 22107
22044 #endif /* _INTEL_DVO_H */ 22108 #endif /* _INTEL_DVO_H */
22045diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ivch.c 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
22046--- linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ivch.c 2010-01-25 13:50:10.000000000 -0500 22110--- linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ivch.c 2010-02-09 07:57:19.000000000 -0500
22047+++ linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ivch.c 2010-01-25 17:39:40.473202731 -0500 22111+++ linux-2.6.32.8/drivers/gpu/drm/i915/dvo_ivch.c 2010-02-10 15:06:24.027503759 -0500
22048@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv 22112@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
22049 } 22113 }
22050 } 22114 }
@@ -22054,9 +22118,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.7/drivers
22054 .init = ivch_init, 22118 .init = ivch_init,
22055 .dpms = ivch_dpms, 22119 .dpms = ivch_dpms,
22056 .save = ivch_save, 22120 .save = ivch_save,
22057diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.7/drivers/gpu/drm/i915/dvo_sil164.c 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
22058--- linux-2.6.32.7/drivers/gpu/drm/i915/dvo_sil164.c 2010-01-25 13:50:10.000000000 -0500 22122--- linux-2.6.32.8/drivers/gpu/drm/i915/dvo_sil164.c 2010-02-09 07:57:19.000000000 -0500
22059+++ linux-2.6.32.7/drivers/gpu/drm/i915/dvo_sil164.c 2010-01-25 17:39:40.473202731 -0500 22123+++ linux-2.6.32.8/drivers/gpu/drm/i915/dvo_sil164.c 2010-02-10 15:06:24.027503759 -0500
22060@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ 22124@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
22061 } 22125 }
22062 } 22126 }
@@ -22066,9 +22130,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.7/drive
22066 .init = sil164_init, 22130 .init = sil164_init,
22067 .detect = sil164_detect, 22131 .detect = sil164_detect,
22068 .mode_valid = sil164_mode_valid, 22132 .mode_valid = sil164_mode_valid,
22069diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.7/drivers/gpu/drm/i915/dvo_tfp410.c 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
22070--- linux-2.6.32.7/drivers/gpu/drm/i915/dvo_tfp410.c 2010-01-25 13:50:10.000000000 -0500 22134--- linux-2.6.32.8/drivers/gpu/drm/i915/dvo_tfp410.c 2010-02-09 07:57:19.000000000 -0500
22071+++ linux-2.6.32.7/drivers/gpu/drm/i915/dvo_tfp410.c 2010-01-25 17:39:40.473202731 -0500 22135+++ linux-2.6.32.8/drivers/gpu/drm/i915/dvo_tfp410.c 2010-02-10 15:06:24.027503759 -0500
22072@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ 22136@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
22073 } 22137 }
22074 } 22138 }
@@ -22078,9 +22142,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.7/drive
22078 .init = tfp410_init, 22142 .init = tfp410_init,
22079 .detect = tfp410_detect, 22143 .detect = tfp410_detect,
22080 .mode_valid = tfp410_mode_valid, 22144 .mode_valid = tfp410_mode_valid,
22081diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.7/drivers/gpu/drm/i915/i915_drv.c 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
22082--- linux-2.6.32.7/drivers/gpu/drm/i915/i915_drv.c 2010-01-25 13:50:10.000000000 -0500 22146--- linux-2.6.32.8/drivers/gpu/drm/i915/i915_drv.c 2010-02-09 07:57:19.000000000 -0500
22083+++ linux-2.6.32.7/drivers/gpu/drm/i915/i915_drv.c 2010-01-25 17:39:40.473202731 -0500 22147+++ linux-2.6.32.8/drivers/gpu/drm/i915/i915_drv.c 2010-02-10 15:06:24.027503759 -0500
22084@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) 22148@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev)
22085 return i915_resume(dev); 22149 return i915_resume(dev);
22086 } 22150 }
@@ -22090,9 +22154,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.7/drivers
22090 .fault = i915_gem_fault, 22154 .fault = i915_gem_fault,
22091 .open = drm_gem_vm_open, 22155 .open = drm_gem_vm_open,
22092 .close = drm_gem_vm_close, 22156 .close = drm_gem_vm_close,
22093diff -urNp linux-2.6.32.7/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.7/drivers/gpu/drm/radeon/mkregtable.c 22157diff -urNp linux-2.6.32.8/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.8/drivers/gpu/drm/radeon/mkregtable.c
22094--- linux-2.6.32.7/drivers/gpu/drm/radeon/mkregtable.c 2010-01-25 13:50:10.000000000 -0500 22158--- linux-2.6.32.8/drivers/gpu/drm/radeon/mkregtable.c 2010-02-09 07:57:19.000000000 -0500
22095+++ linux-2.6.32.7/drivers/gpu/drm/radeon/mkregtable.c 2010-01-25 17:39:40.473202731 -0500 22159+++ linux-2.6.32.8/drivers/gpu/drm/radeon/mkregtable.c 2010-02-10 15:06:24.027503759 -0500
22096@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 22160@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
22097 regex_t mask_rex; 22161 regex_t mask_rex;
22098 regmatch_t match[4]; 22162 regmatch_t match[4];
@@ -22110,9 +22174,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.7/dri
22110 22174
22111 if (regcomp 22175 if (regcomp
22112 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { 22176 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
22113diff -urNp linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_atombios.c 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
22114--- linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_atombios.c 2010-01-25 13:50:10.000000000 -0500 22178--- linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_atombios.c 2010-02-09 07:57:19.000000000 -0500
22115+++ linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_atombios.c 2010-01-25 17:39:40.473202731 -0500 22179+++ linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_atombios.c 2010-02-10 15:06:24.027503759 -0500
22116@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o 22180@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o
22117 } 22181 }
22118 } 22182 }
@@ -22137,9 +22201,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.
22137 22201
22138 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); 22202 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
22139 22203
22140diff -urNp linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_state.c 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
22141--- linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_state.c 2010-01-25 13:50:10.000000000 -0500 22205--- linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_state.c 2010-02-09 07:57:19.000000000 -0500
22142+++ linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_state.c 2010-01-25 17:39:40.474418764 -0500 22206+++ linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_state.c 2010-02-10 15:06:24.027503759 -0500
22143@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm 22207@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm
22144 { 22208 {
22145 drm_radeon_private_t *dev_priv = dev->dev_private; 22209 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -22149,9 +22213,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.7/d
22149 22213
22150 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); 22214 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
22151 22215
22152diff -urNp linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_ttm.c 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
22153--- linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_ttm.c 2010-01-25 13:50:10.000000000 -0500 22217--- linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_ttm.c 2010-02-09 07:57:19.000000000 -0500
22154+++ linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_ttm.c 2010-01-25 17:39:40.474418764 -0500 22218+++ linux-2.6.32.8/drivers/gpu/drm/radeon/radeon_ttm.c 2010-02-10 15:06:24.027503759 -0500
22155@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic 22219@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
22156 DRM_INFO("radeon: ttm finalized\n"); 22220 DRM_INFO("radeon: ttm finalized\n");
22157 } 22221 }
@@ -22203,9 +22267,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.7/dri
22203 } 22267 }
22204 22268
22205 22269
22206diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo.c 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
22207--- linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo.c 2010-01-25 13:50:10.000000000 -0500 22271--- linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_bo.c 2010-02-09 07:57:19.000000000 -0500
22208+++ linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo.c 2010-01-25 17:39:40.474418764 -0500 22272+++ linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_bo.c 2010-02-10 15:06:24.027503759 -0500
22209@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a 22273@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a
22210 NULL 22274 NULL
22211 }; 22275 };
@@ -22215,9 +22279,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.7/drivers/gp
22215 .show = &ttm_bo_global_show 22279 .show = &ttm_bo_global_show
22216 }; 22280 };
22217 22281
22218diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo_vm.c 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
22219--- linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-01-25 13:50:10.000000000 -0500 22283--- linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-02-09 07:57:19.000000000 -0500
22220+++ linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-01-25 17:39:40.475420819 -0500 22284+++ linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-02-10 15:06:24.027503759 -0500
22221@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are 22285@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
22222 { 22286 {
22223 struct ttm_buffer_object *bo = (struct ttm_buffer_object *) 22287 struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -22238,9 +22302,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.7/drivers
22238 /* 22302 /*
22239 * Work around locking order reversal in fault / nopfn 22303 * Work around locking order reversal in fault / nopfn
22240 * between mmap_sem and bo_reserve: Perform a trylock operation 22304 * between mmap_sem and bo_reserve: Perform a trylock operation
22241diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_global.c 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
22242--- linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_global.c 2010-01-25 13:50:10.000000000 -0500 22306--- linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_global.c 2010-02-09 07:57:19.000000000 -0500
22243+++ linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_global.c 2010-01-25 17:39:40.475420819 -0500 22307+++ linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_global.c 2010-02-10 15:06:24.027503759 -0500
22244@@ -36,7 +36,7 @@ 22308@@ -36,7 +36,7 @@
22245 struct ttm_global_item { 22309 struct ttm_global_item {
22246 struct mutex mutex; 22310 struct mutex mutex;
@@ -22298,9 +22362,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.7/driver
22298 ref->release(ref); 22362 ref->release(ref);
22299 item->object = NULL; 22363 item->object = NULL;
22300 } 22364 }
22301diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_memory.c 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
22302--- linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_memory.c 2010-01-25 13:50:10.000000000 -0500 22366--- linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_memory.c 2010-02-09 07:57:19.000000000 -0500
22303+++ linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_memory.c 2010-01-25 17:39:40.475420819 -0500 22367+++ linux-2.6.32.8/drivers/gpu/drm/ttm/ttm_memory.c 2010-02-10 15:06:24.027503759 -0500
22304@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at 22368@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
22305 NULL 22369 NULL
22306 }; 22370 };
@@ -22310,9 +22374,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.7/driver
22310 .show = &ttm_mem_zone_show, 22374 .show = &ttm_mem_zone_show,
22311 .store = &ttm_mem_zone_store 22375 .store = &ttm_mem_zone_store
22312 }; 22376 };
22313diff -urNp linux-2.6.32.7/drivers/gpu/vga/vgaarb.c linux-2.6.32.7/drivers/gpu/vga/vgaarb.c 22377diff -urNp linux-2.6.32.8/drivers/gpu/vga/vgaarb.c linux-2.6.32.8/drivers/gpu/vga/vgaarb.c
22314--- linux-2.6.32.7/drivers/gpu/vga/vgaarb.c 2010-01-25 13:50:10.000000000 -0500 22378--- linux-2.6.32.8/drivers/gpu/vga/vgaarb.c 2010-02-09 07:57:19.000000000 -0500
22315+++ linux-2.6.32.7/drivers/gpu/vga/vgaarb.c 2010-01-25 17:39:40.475420819 -0500 22379+++ linux-2.6.32.8/drivers/gpu/vga/vgaarb.c 2010-02-10 15:06:24.027503759 -0500
22316@@ -961,7 +961,7 @@ static ssize_t vga_arb_write(struct file 22380@@ -961,7 +961,7 @@ static ssize_t vga_arb_write(struct file
22317 remaining -= 7; 22381 remaining -= 7;
22318 pr_devel("client 0x%p called 'target'\n", priv); 22382 pr_devel("client 0x%p called 'target'\n", priv);
@@ -22322,9 +22386,9 @@ diff -urNp linux-2.6.32.7/drivers/gpu/vga/vgaarb.c linux-2.6.32.7/drivers/gpu/vg
22322 pdev = pci_dev_get(vga_default_device()); 22386 pdev = pci_dev_get(vga_default_device());
22323 else { 22387 else {
22324 if (!vga_pci_str_to_vars(curr_pos, remaining, 22388 if (!vga_pci_str_to_vars(curr_pos, remaining,
22325diff -urNp linux-2.6.32.7/drivers/hwmon/k8temp.c linux-2.6.32.7/drivers/hwmon/k8temp.c 22389diff -urNp linux-2.6.32.8/drivers/hwmon/k8temp.c linux-2.6.32.8/drivers/hwmon/k8temp.c
22326--- linux-2.6.32.7/drivers/hwmon/k8temp.c 2010-01-25 13:50:10.000000000 -0500 22390--- linux-2.6.32.8/drivers/hwmon/k8temp.c 2010-02-09 07:57:19.000000000 -0500
22327+++ linux-2.6.32.7/drivers/hwmon/k8temp.c 2010-01-25 17:39:40.476406478 -0500 22391+++ linux-2.6.32.8/drivers/hwmon/k8temp.c 2010-02-10 15:06:24.027503759 -0500
22328@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n 22392@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
22329 22393
22330 static struct pci_device_id k8temp_ids[] = { 22394 static struct pci_device_id k8temp_ids[] = {
@@ -22334,9 +22398,9 @@ diff -urNp linux-2.6.32.7/drivers/hwmon/k8temp.c linux-2.6.32.7/drivers/hwmon/k8
22334 }; 22398 };
22335 22399
22336 MODULE_DEVICE_TABLE(pci, k8temp_ids); 22400 MODULE_DEVICE_TABLE(pci, k8temp_ids);
22337diff -urNp linux-2.6.32.7/drivers/hwmon/sis5595.c linux-2.6.32.7/drivers/hwmon/sis5595.c 22401diff -urNp linux-2.6.32.8/drivers/hwmon/sis5595.c linux-2.6.32.8/drivers/hwmon/sis5595.c
22338--- linux-2.6.32.7/drivers/hwmon/sis5595.c 2010-01-25 13:50:10.000000000 -0500 22402--- linux-2.6.32.8/drivers/hwmon/sis5595.c 2010-02-09 07:57:19.000000000 -0500
22339+++ linux-2.6.32.7/drivers/hwmon/sis5595.c 2010-01-25 17:39:40.492760229 -0500 22403+++ linux-2.6.32.8/drivers/hwmon/sis5595.c 2010-02-10 15:06:24.027503759 -0500
22340@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda 22404@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
22341 22405
22342 static struct pci_device_id sis5595_pci_ids[] = { 22406 static struct pci_device_id sis5595_pci_ids[] = {
@@ -22346,9 +22410,9 @@ diff -urNp linux-2.6.32.7/drivers/hwmon/sis5595.c linux-2.6.32.7/drivers/hwmon/s
22346 }; 22410 };
22347 22411
22348 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); 22412 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
22349diff -urNp linux-2.6.32.7/drivers/hwmon/via686a.c linux-2.6.32.7/drivers/hwmon/via686a.c 22413diff -urNp linux-2.6.32.8/drivers/hwmon/via686a.c linux-2.6.32.8/drivers/hwmon/via686a.c
22350--- linux-2.6.32.7/drivers/hwmon/via686a.c 2010-01-25 13:50:10.000000000 -0500 22414--- linux-2.6.32.8/drivers/hwmon/via686a.c 2010-02-09 07:57:19.000000000 -0500
22351+++ linux-2.6.32.7/drivers/hwmon/via686a.c 2010-01-25 17:39:40.493306350 -0500 22415+++ linux-2.6.32.8/drivers/hwmon/via686a.c 2010-02-10 15:06:24.027503759 -0500
22352@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda 22416@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
22353 22417
22354 static struct pci_device_id via686a_pci_ids[] = { 22418 static struct pci_device_id via686a_pci_ids[] = {
@@ -22358,9 +22422,9 @@ diff -urNp linux-2.6.32.7/drivers/hwmon/via686a.c linux-2.6.32.7/drivers/hwmon/v
22358 }; 22422 };
22359 22423
22360 MODULE_DEVICE_TABLE(pci, via686a_pci_ids); 22424 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
22361diff -urNp linux-2.6.32.7/drivers/hwmon/vt8231.c linux-2.6.32.7/drivers/hwmon/vt8231.c 22425diff -urNp linux-2.6.32.8/drivers/hwmon/vt8231.c linux-2.6.32.8/drivers/hwmon/vt8231.c
22362--- linux-2.6.32.7/drivers/hwmon/vt8231.c 2010-01-25 13:50:10.000000000 -0500 22426--- linux-2.6.32.8/drivers/hwmon/vt8231.c 2010-02-09 07:57:19.000000000 -0500
22363+++ linux-2.6.32.7/drivers/hwmon/vt8231.c 2010-01-25 17:39:40.497301758 -0500 22427+++ linux-2.6.32.8/drivers/hwmon/vt8231.c 2010-02-10 15:06:24.031523380 -0500
22364@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri 22428@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
22365 22429
22366 static struct pci_device_id vt8231_pci_ids[] = { 22430 static struct pci_device_id vt8231_pci_ids[] = {
@@ -22370,9 +22434,9 @@ diff -urNp linux-2.6.32.7/drivers/hwmon/vt8231.c linux-2.6.32.7/drivers/hwmon/vt
22370 }; 22434 };
22371 22435
22372 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); 22436 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
22373diff -urNp linux-2.6.32.7/drivers/hwmon/w83791d.c linux-2.6.32.7/drivers/hwmon/w83791d.c 22437diff -urNp linux-2.6.32.8/drivers/hwmon/w83791d.c linux-2.6.32.8/drivers/hwmon/w83791d.c
22374--- linux-2.6.32.7/drivers/hwmon/w83791d.c 2010-01-25 13:50:10.000000000 -0500 22438--- linux-2.6.32.8/drivers/hwmon/w83791d.c 2010-02-09 07:57:19.000000000 -0500
22375+++ linux-2.6.32.7/drivers/hwmon/w83791d.c 2010-01-25 17:39:40.497301758 -0500 22439+++ linux-2.6.32.8/drivers/hwmon/w83791d.c 2010-02-10 15:06:24.031523380 -0500
22376@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli 22440@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
22377 struct i2c_board_info *info); 22441 struct i2c_board_info *info);
22378 static int w83791d_remove(struct i2c_client *client); 22442 static int w83791d_remove(struct i2c_client *client);
@@ -22384,9 +22448,9 @@ diff -urNp linux-2.6.32.7/drivers/hwmon/w83791d.c linux-2.6.32.7/drivers/hwmon/w
22384 static struct w83791d_data *w83791d_update_device(struct device *dev); 22448 static struct w83791d_data *w83791d_update_device(struct device *dev);
22385 22449
22386 #ifdef DEBUG 22450 #ifdef DEBUG
22387diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-i801.c linux-2.6.32.7/drivers/i2c/busses/i2c-i801.c 22451diff -urNp linux-2.6.32.8/drivers/i2c/busses/i2c-i801.c linux-2.6.32.8/drivers/i2c/busses/i2c-i801.c
22388--- linux-2.6.32.7/drivers/i2c/busses/i2c-i801.c 2010-01-25 13:50:10.000000000 -0500 22452--- linux-2.6.32.8/drivers/i2c/busses/i2c-i801.c 2010-02-09 07:57:19.000000000 -0500
22389+++ linux-2.6.32.7/drivers/i2c/busses/i2c-i801.c 2010-01-25 17:39:40.497301758 -0500 22453+++ linux-2.6.32.8/drivers/i2c/busses/i2c-i801.c 2010-02-10 15:06:24.031523380 -0500
22390@@ -578,7 +578,7 @@ static struct pci_device_id i801_ids[] = 22454@@ -578,7 +578,7 @@ static struct pci_device_id i801_ids[] =
22391 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) }, 22455 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
22392 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, 22456 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
@@ -22396,9 +22460,9 @@ diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-i801.c linux-2.6.32.7/drivers/i
22396 }; 22460 };
22397 22461
22398 MODULE_DEVICE_TABLE (pci, i801_ids); 22462 MODULE_DEVICE_TABLE (pci, i801_ids);
22399diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.7/drivers/i2c/busses/i2c-piix4.c 22463diff -urNp linux-2.6.32.8/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.8/drivers/i2c/busses/i2c-piix4.c
22400--- linux-2.6.32.7/drivers/i2c/busses/i2c-piix4.c 2010-01-25 13:50:10.000000000 -0500 22464--- linux-2.6.32.8/drivers/i2c/busses/i2c-piix4.c 2010-02-09 07:57:19.000000000 -0500
22401+++ linux-2.6.32.7/drivers/i2c/busses/i2c-piix4.c 2010-01-25 17:39:40.497301758 -0500 22465+++ linux-2.6.32.8/drivers/i2c/busses/i2c-piix4.c 2010-02-10 15:06:24.031523380 -0500
22402@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat 22466@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
22403 .ident = "IBM", 22467 .ident = "IBM",
22404 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, 22468 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -22417,9 +22481,9 @@ diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.7/drivers/
22417 }; 22481 };
22418 22482
22419 MODULE_DEVICE_TABLE (pci, piix4_ids); 22483 MODULE_DEVICE_TABLE (pci, piix4_ids);
22420diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.7/drivers/i2c/busses/i2c-sis630.c 22484diff -urNp linux-2.6.32.8/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.8/drivers/i2c/busses/i2c-sis630.c
22421--- linux-2.6.32.7/drivers/i2c/busses/i2c-sis630.c 2010-01-25 13:50:10.000000000 -0500 22485--- linux-2.6.32.8/drivers/i2c/busses/i2c-sis630.c 2010-02-09 07:57:19.000000000 -0500
22422+++ linux-2.6.32.7/drivers/i2c/busses/i2c-sis630.c 2010-01-25 17:39:40.498418547 -0500 22486+++ linux-2.6.32.8/drivers/i2c/busses/i2c-sis630.c 2010-02-10 15:06:24.031523380 -0500
22423@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter 22487@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
22424 static struct pci_device_id sis630_ids[] __devinitdata = { 22488 static struct pci_device_id sis630_ids[] __devinitdata = {
22425 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 22489 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
@@ -22429,9 +22493,9 @@ diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.7/drivers
22429 }; 22493 };
22430 22494
22431 MODULE_DEVICE_TABLE (pci, sis630_ids); 22495 MODULE_DEVICE_TABLE (pci, sis630_ids);
22432diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.7/drivers/i2c/busses/i2c-sis96x.c 22496diff -urNp linux-2.6.32.8/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.8/drivers/i2c/busses/i2c-sis96x.c
22433--- linux-2.6.32.7/drivers/i2c/busses/i2c-sis96x.c 2010-01-25 13:50:10.000000000 -0500 22497--- linux-2.6.32.8/drivers/i2c/busses/i2c-sis96x.c 2010-02-09 07:57:19.000000000 -0500
22434+++ linux-2.6.32.7/drivers/i2c/busses/i2c-sis96x.c 2010-01-25 17:39:40.498418547 -0500 22498+++ linux-2.6.32.8/drivers/i2c/busses/i2c-sis96x.c 2010-02-10 15:06:24.031523380 -0500
22435@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter 22499@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
22436 22500
22437 static struct pci_device_id sis96x_ids[] = { 22501 static struct pci_device_id sis96x_ids[] = {
@@ -22441,9 +22505,9 @@ diff -urNp linux-2.6.32.7/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.7/drivers
22441 }; 22505 };
22442 22506
22443 MODULE_DEVICE_TABLE (pci, sis96x_ids); 22507 MODULE_DEVICE_TABLE (pci, sis96x_ids);
22444diff -urNp linux-2.6.32.7/drivers/ide/ide-cd.c linux-2.6.32.7/drivers/ide/ide-cd.c 22508diff -urNp linux-2.6.32.8/drivers/ide/ide-cd.c linux-2.6.32.8/drivers/ide/ide-cd.c
22445--- linux-2.6.32.7/drivers/ide/ide-cd.c 2010-01-25 13:50:10.000000000 -0500 22509--- linux-2.6.32.8/drivers/ide/ide-cd.c 2010-02-09 07:57:19.000000000 -0500
22446+++ linux-2.6.32.7/drivers/ide/ide-cd.c 2010-01-25 17:39:40.499096688 -0500 22510+++ linux-2.6.32.8/drivers/ide/ide-cd.c 2010-02-10 15:06:24.031523380 -0500
22447@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ 22511@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_
22448 alignment = queue_dma_alignment(q) | q->dma_pad_mask; 22512 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
22449 if ((unsigned long)buf & alignment 22513 if ((unsigned long)buf & alignment
@@ -22453,9 +22517,9 @@ diff -urNp linux-2.6.32.7/drivers/ide/ide-cd.c linux-2.6.32.7/drivers/ide/ide-cd
22453 drive->dma = 0; 22517 drive->dma = 0;
22454 } 22518 }
22455 } 22519 }
22456diff -urNp linux-2.6.32.7/drivers/ieee1394/dv1394.c linux-2.6.32.7/drivers/ieee1394/dv1394.c 22520diff -urNp linux-2.6.32.8/drivers/ieee1394/dv1394.c linux-2.6.32.8/drivers/ieee1394/dv1394.c
22457--- linux-2.6.32.7/drivers/ieee1394/dv1394.c 2010-01-25 13:50:10.000000000 -0500 22521--- linux-2.6.32.8/drivers/ieee1394/dv1394.c 2010-02-09 07:57:19.000000000 -0500
22458+++ linux-2.6.32.7/drivers/ieee1394/dv1394.c 2010-01-25 17:39:40.499096688 -0500 22522+++ linux-2.6.32.8/drivers/ieee1394/dv1394.c 2010-02-10 15:06:24.031523380 -0500
22459@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c 22523@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
22460 based upon DIF section and sequence 22524 based upon DIF section and sequence
22461 */ 22525 */
@@ -22474,9 +22538,9 @@ diff -urNp linux-2.6.32.7/drivers/ieee1394/dv1394.c linux-2.6.32.7/drivers/ieee1
22474 }; 22538 };
22475 22539
22476 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); 22540 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
22477diff -urNp linux-2.6.32.7/drivers/ieee1394/eth1394.c linux-2.6.32.7/drivers/ieee1394/eth1394.c 22541diff -urNp linux-2.6.32.8/drivers/ieee1394/eth1394.c linux-2.6.32.8/drivers/ieee1394/eth1394.c
22478--- linux-2.6.32.7/drivers/ieee1394/eth1394.c 2010-01-25 13:50:10.000000000 -0500 22542--- linux-2.6.32.8/drivers/ieee1394/eth1394.c 2010-02-09 07:57:19.000000000 -0500
22479+++ linux-2.6.32.7/drivers/ieee1394/eth1394.c 2010-01-25 17:39:40.499096688 -0500 22543+++ linux-2.6.32.8/drivers/ieee1394/eth1394.c 2010-02-10 15:06:24.031523380 -0500
22480@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e 22544@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
22481 .specifier_id = ETHER1394_GASP_SPECIFIER_ID, 22545 .specifier_id = ETHER1394_GASP_SPECIFIER_ID,
22482 .version = ETHER1394_GASP_VERSION, 22546 .version = ETHER1394_GASP_VERSION,
@@ -22486,9 +22550,9 @@ diff -urNp linux-2.6.32.7/drivers/ieee1394/eth1394.c linux-2.6.32.7/drivers/ieee
22486 }; 22550 };
22487 22551
22488 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); 22552 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
22489diff -urNp linux-2.6.32.7/drivers/ieee1394/hosts.c linux-2.6.32.7/drivers/ieee1394/hosts.c 22553diff -urNp linux-2.6.32.8/drivers/ieee1394/hosts.c linux-2.6.32.8/drivers/ieee1394/hosts.c
22490--- linux-2.6.32.7/drivers/ieee1394/hosts.c 2010-01-25 13:50:10.000000000 -0500 22554--- linux-2.6.32.8/drivers/ieee1394/hosts.c 2010-02-09 07:57:19.000000000 -0500
22491+++ linux-2.6.32.7/drivers/ieee1394/hosts.c 2010-01-25 17:39:40.500173107 -0500 22555+++ linux-2.6.32.8/drivers/ieee1394/hosts.c 2010-02-10 15:06:24.031523380 -0500
22492@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso 22556@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
22493 } 22557 }
22494 22558
@@ -22497,9 +22561,9 @@ diff -urNp linux-2.6.32.7/drivers/ieee1394/hosts.c linux-2.6.32.7/drivers/ieee13
22497 .transmit_packet = dummy_transmit_packet, 22561 .transmit_packet = dummy_transmit_packet,
22498 .devctl = dummy_devctl, 22562 .devctl = dummy_devctl,
22499 .isoctl = dummy_isoctl 22563 .isoctl = dummy_isoctl
22500diff -urNp linux-2.6.32.7/drivers/ieee1394/ohci1394.c linux-2.6.32.7/drivers/ieee1394/ohci1394.c 22564diff -urNp linux-2.6.32.8/drivers/ieee1394/ohci1394.c linux-2.6.32.8/drivers/ieee1394/ohci1394.c
22501--- linux-2.6.32.7/drivers/ieee1394/ohci1394.c 2010-01-25 13:50:10.000000000 -0500 22565--- linux-2.6.32.8/drivers/ieee1394/ohci1394.c 2010-02-09 07:57:19.000000000 -0500
22502+++ linux-2.6.32.7/drivers/ieee1394/ohci1394.c 2010-01-25 17:39:40.500173107 -0500 22566+++ linux-2.6.32.8/drivers/ieee1394/ohci1394.c 2010-02-10 15:06:24.031523380 -0500
22503@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ 22567@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
22504 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) 22568 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
22505 22569
@@ -22521,9 +22585,9 @@ diff -urNp linux-2.6.32.7/drivers/ieee1394/ohci1394.c linux-2.6.32.7/drivers/iee
22521 }; 22585 };
22522 22586
22523 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); 22587 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
22524diff -urNp linux-2.6.32.7/drivers/ieee1394/raw1394.c linux-2.6.32.7/drivers/ieee1394/raw1394.c 22588diff -urNp linux-2.6.32.8/drivers/ieee1394/raw1394.c linux-2.6.32.8/drivers/ieee1394/raw1394.c
22525--- linux-2.6.32.7/drivers/ieee1394/raw1394.c 2010-01-25 13:50:10.000000000 -0500 22589--- linux-2.6.32.8/drivers/ieee1394/raw1394.c 2010-02-09 07:57:19.000000000 -0500
22526+++ linux-2.6.32.7/drivers/ieee1394/raw1394.c 2010-01-25 17:39:40.501412048 -0500 22590+++ linux-2.6.32.8/drivers/ieee1394/raw1394.c 2010-02-10 15:06:24.031523380 -0500
22527@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r 22591@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
22528 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 22592 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
22529 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 22593 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -22533,9 +22597,9 @@ diff -urNp linux-2.6.32.7/drivers/ieee1394/raw1394.c linux-2.6.32.7/drivers/ieee
22533 }; 22597 };
22534 22598
22535 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); 22599 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
22536diff -urNp linux-2.6.32.7/drivers/ieee1394/sbp2.c linux-2.6.32.7/drivers/ieee1394/sbp2.c 22600diff -urNp linux-2.6.32.8/drivers/ieee1394/sbp2.c linux-2.6.32.8/drivers/ieee1394/sbp2.c
22537--- linux-2.6.32.7/drivers/ieee1394/sbp2.c 2010-01-25 13:50:10.000000000 -0500 22601--- linux-2.6.32.8/drivers/ieee1394/sbp2.c 2010-02-09 07:57:19.000000000 -0500
22538+++ linux-2.6.32.7/drivers/ieee1394/sbp2.c 2010-01-25 17:39:40.501412048 -0500 22602+++ linux-2.6.32.8/drivers/ieee1394/sbp2.c 2010-02-10 15:06:24.031523380 -0500
22539@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s 22603@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
22540 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 22604 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
22541 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, 22605 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -22554,9 +22618,9 @@ diff -urNp linux-2.6.32.7/drivers/ieee1394/sbp2.c linux-2.6.32.7/drivers/ieee139
22554 { 22618 {
22555 int ret; 22619 int ret;
22556 22620
22557diff -urNp linux-2.6.32.7/drivers/ieee1394/video1394.c linux-2.6.32.7/drivers/ieee1394/video1394.c 22621diff -urNp linux-2.6.32.8/drivers/ieee1394/video1394.c linux-2.6.32.8/drivers/ieee1394/video1394.c
22558--- linux-2.6.32.7/drivers/ieee1394/video1394.c 2010-01-25 13:50:10.000000000 -0500 22622--- linux-2.6.32.8/drivers/ieee1394/video1394.c 2010-02-09 07:57:19.000000000 -0500
22559+++ linux-2.6.32.7/drivers/ieee1394/video1394.c 2010-01-25 17:39:40.502276017 -0500 22623+++ linux-2.6.32.8/drivers/ieee1394/video1394.c 2010-02-10 15:06:24.035501601 -0500
22560@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v 22624@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
22561 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 22625 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
22562 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff 22626 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
@@ -22566,9 +22630,9 @@ diff -urNp linux-2.6.32.7/drivers/ieee1394/video1394.c linux-2.6.32.7/drivers/ie
22566 }; 22630 };
22567 22631
22568 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); 22632 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
22569diff -urNp linux-2.6.32.7/drivers/infiniband/core/cm.c linux-2.6.32.7/drivers/infiniband/core/cm.c 22633diff -urNp linux-2.6.32.8/drivers/infiniband/core/cm.c linux-2.6.32.8/drivers/infiniband/core/cm.c
22570--- linux-2.6.32.7/drivers/infiniband/core/cm.c 2010-01-25 13:50:10.000000000 -0500 22634--- linux-2.6.32.8/drivers/infiniband/core/cm.c 2010-02-09 07:57:19.000000000 -0500
22571+++ linux-2.6.32.7/drivers/infiniband/core/cm.c 2010-01-25 17:39:40.502276017 -0500 22635+++ linux-2.6.32.8/drivers/infiniband/core/cm.c 2010-02-10 15:06:24.035501601 -0500
22572@@ -112,7 +112,7 @@ static char const counter_group_names[CM 22636@@ -112,7 +112,7 @@ static char const counter_group_names[CM
22573 22637
22574 struct cm_counter_group { 22638 struct cm_counter_group {
@@ -22712,9 +22776,9 @@ diff -urNp linux-2.6.32.7/drivers/infiniband/core/cm.c linux-2.6.32.7/drivers/in
22712 .show = cm_show_counter 22776 .show = cm_show_counter
22713 }; 22777 };
22714 22778
22715diff -urNp linux-2.6.32.7/drivers/infiniband/core/sysfs.c linux-2.6.32.7/drivers/infiniband/core/sysfs.c 22779diff -urNp linux-2.6.32.8/drivers/infiniband/core/sysfs.c linux-2.6.32.8/drivers/infiniband/core/sysfs.c
22716--- linux-2.6.32.7/drivers/infiniband/core/sysfs.c 2010-01-25 13:50:10.000000000 -0500 22780--- linux-2.6.32.8/drivers/infiniband/core/sysfs.c 2010-02-09 07:57:19.000000000 -0500
22717+++ linux-2.6.32.7/drivers/infiniband/core/sysfs.c 2010-01-25 17:39:40.503408043 -0500 22781+++ linux-2.6.32.8/drivers/infiniband/core/sysfs.c 2010-02-10 15:06:24.035501601 -0500
22718@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob 22782@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
22719 return port_attr->show(p, port_attr, buf); 22783 return port_attr->show(p, port_attr, buf);
22720 } 22784 }
@@ -22724,9 +22788,9 @@ diff -urNp linux-2.6.32.7/drivers/infiniband/core/sysfs.c linux-2.6.32.7/drivers
22724 .show = port_attr_show 22788 .show = port_attr_show
22725 }; 22789 };
22726 22790
22727diff -urNp linux-2.6.32.7/drivers/input/keyboard/atkbd.c linux-2.6.32.7/drivers/input/keyboard/atkbd.c 22791diff -urNp linux-2.6.32.8/drivers/input/keyboard/atkbd.c linux-2.6.32.8/drivers/input/keyboard/atkbd.c
22728--- linux-2.6.32.7/drivers/input/keyboard/atkbd.c 2010-01-25 13:50:10.000000000 -0500 22792--- linux-2.6.32.8/drivers/input/keyboard/atkbd.c 2010-02-09 07:57:19.000000000 -0500
22729+++ linux-2.6.32.7/drivers/input/keyboard/atkbd.c 2010-01-25 17:39:40.503408043 -0500 22793+++ linux-2.6.32.8/drivers/input/keyboard/atkbd.c 2010-02-10 15:06:24.035501601 -0500
22730@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri 22794@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
22731 .id = SERIO_ANY, 22795 .id = SERIO_ANY,
22732 .extra = SERIO_ANY, 22796 .extra = SERIO_ANY,
@@ -22736,9 +22800,9 @@ diff -urNp linux-2.6.32.7/drivers/input/keyboard/atkbd.c linux-2.6.32.7/drivers/
22736 }; 22800 };
22737 22801
22738 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); 22802 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
22739diff -urNp linux-2.6.32.7/drivers/input/mouse/lifebook.c linux-2.6.32.7/drivers/input/mouse/lifebook.c 22803diff -urNp linux-2.6.32.8/drivers/input/mouse/lifebook.c linux-2.6.32.8/drivers/input/mouse/lifebook.c
22740--- linux-2.6.32.7/drivers/input/mouse/lifebook.c 2010-01-25 13:50:10.000000000 -0500 22804--- linux-2.6.32.8/drivers/input/mouse/lifebook.c 2010-02-09 07:57:19.000000000 -0500
22741+++ linux-2.6.32.7/drivers/input/mouse/lifebook.c 2010-01-25 17:39:40.503408043 -0500 22805+++ linux-2.6.32.8/drivers/input/mouse/lifebook.c 2010-02-10 15:06:24.035501601 -0500
22742@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo 22806@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
22743 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), 22807 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
22744 }, 22808 },
@@ -22748,9 +22812,9 @@ diff -urNp linux-2.6.32.7/drivers/input/mouse/lifebook.c linux-2.6.32.7/drivers/
22748 }; 22812 };
22749 22813
22750 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) 22814 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
22751diff -urNp linux-2.6.32.7/drivers/input/mouse/psmouse-base.c linux-2.6.32.7/drivers/input/mouse/psmouse-base.c 22815diff -urNp linux-2.6.32.8/drivers/input/mouse/psmouse-base.c linux-2.6.32.8/drivers/input/mouse/psmouse-base.c
22752--- linux-2.6.32.7/drivers/input/mouse/psmouse-base.c 2010-01-25 13:50:10.000000000 -0500 22816--- linux-2.6.32.8/drivers/input/mouse/psmouse-base.c 2010-02-09 07:57:19.000000000 -0500
22753+++ linux-2.6.32.7/drivers/input/mouse/psmouse-base.c 2010-01-25 17:39:40.504268935 -0500 22817+++ linux-2.6.32.8/drivers/input/mouse/psmouse-base.c 2010-02-10 15:06:24.035501601 -0500
22754@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se 22818@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se
22755 .id = SERIO_ANY, 22819 .id = SERIO_ANY,
22756 .extra = SERIO_ANY, 22820 .extra = SERIO_ANY,
@@ -22760,9 +22824,9 @@ diff -urNp linux-2.6.32.7/drivers/input/mouse/psmouse-base.c linux-2.6.32.7/driv
22760 }; 22824 };
22761 22825
22762 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); 22826 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
22763diff -urNp linux-2.6.32.7/drivers/input/mouse/synaptics.c linux-2.6.32.7/drivers/input/mouse/synaptics.c 22827diff -urNp linux-2.6.32.8/drivers/input/mouse/synaptics.c linux-2.6.32.8/drivers/input/mouse/synaptics.c
22764--- linux-2.6.32.7/drivers/input/mouse/synaptics.c 2010-01-25 13:50:10.000000000 -0500 22828--- linux-2.6.32.8/drivers/input/mouse/synaptics.c 2010-02-09 07:57:19.000000000 -0500
22765+++ linux-2.6.32.7/drivers/input/mouse/synaptics.c 2010-01-25 17:39:40.504268935 -0500 22829+++ linux-2.6.32.8/drivers/input/mouse/synaptics.c 2010-02-10 15:06:24.035501601 -0500
22766@@ -437,7 +437,7 @@ static void synaptics_process_packet(str 22830@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
22767 break; 22831 break;
22768 case 2: 22832 case 2:
@@ -22791,9 +22855,9 @@ diff -urNp linux-2.6.32.7/drivers/input/mouse/synaptics.c linux-2.6.32.7/drivers
22791 }; 22855 };
22792 #endif 22856 #endif
22793 22857
22794diff -urNp linux-2.6.32.7/drivers/input/mousedev.c linux-2.6.32.7/drivers/input/mousedev.c 22858diff -urNp linux-2.6.32.8/drivers/input/mousedev.c linux-2.6.32.8/drivers/input/mousedev.c
22795--- linux-2.6.32.7/drivers/input/mousedev.c 2010-01-25 13:50:10.000000000 -0500 22859--- linux-2.6.32.8/drivers/input/mousedev.c 2010-02-09 07:57:19.000000000 -0500
22796+++ linux-2.6.32.7/drivers/input/mousedev.c 2010-01-25 17:39:40.504268935 -0500 22860+++ linux-2.6.32.8/drivers/input/mousedev.c 2010-02-10 15:06:24.035501601 -0500
22797@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han 22861@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
22798 22862
22799 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX 22863 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -22803,9 +22867,9 @@ diff -urNp linux-2.6.32.7/drivers/input/mousedev.c linux-2.6.32.7/drivers/input/
22803 }; 22867 };
22804 static int psaux_registered; 22868 static int psaux_registered;
22805 #endif 22869 #endif
22806diff -urNp linux-2.6.32.7/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.7/drivers/input/serio/i8042-x86ia64io.h 22870diff -urNp linux-2.6.32.8/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.8/drivers/input/serio/i8042-x86ia64io.h
22807--- linux-2.6.32.7/drivers/input/serio/i8042-x86ia64io.h 2010-01-25 20:04:14.787254997 -0500 22871--- linux-2.6.32.8/drivers/input/serio/i8042-x86ia64io.h 2010-02-09 07:57:19.000000000 -0500
22808+++ linux-2.6.32.7/drivers/input/serio/i8042-x86ia64io.h 2010-01-25 20:04:24.498472269 -0500 22872+++ linux-2.6.32.8/drivers/input/serio/i8042-x86ia64io.h 2010-02-10 15:06:24.035501601 -0500
22809@@ -172,7 +172,7 @@ static const struct dmi_system_id __init 22873@@ -172,7 +172,7 @@ static const struct dmi_system_id __init
22810 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), 22874 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
22811 }, 22875 },
@@ -22860,9 +22924,9 @@ diff -urNp linux-2.6.32.7/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.7/d
22860 }; 22924 };
22861 22925
22862 #endif /* CONFIG_X86 */ 22926 #endif /* CONFIG_X86 */
22863diff -urNp linux-2.6.32.7/drivers/input/serio/serio_raw.c linux-2.6.32.7/drivers/input/serio/serio_raw.c 22927diff -urNp linux-2.6.32.8/drivers/input/serio/serio_raw.c linux-2.6.32.8/drivers/input/serio/serio_raw.c
22864--- linux-2.6.32.7/drivers/input/serio/serio_raw.c 2010-01-25 13:50:10.000000000 -0500 22928--- linux-2.6.32.8/drivers/input/serio/serio_raw.c 2010-02-09 07:57:19.000000000 -0500
22865+++ linux-2.6.32.7/drivers/input/serio/serio_raw.c 2010-01-25 17:39:40.505425306 -0500 22929+++ linux-2.6.32.8/drivers/input/serio/serio_raw.c 2010-02-10 15:06:24.035501601 -0500
22866@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ 22930@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
22867 .id = SERIO_ANY, 22931 .id = SERIO_ANY,
22868 .extra = SERIO_ANY, 22932 .extra = SERIO_ANY,
@@ -22872,9 +22936,9 @@ diff -urNp linux-2.6.32.7/drivers/input/serio/serio_raw.c linux-2.6.32.7/drivers
22872 }; 22936 };
22873 22937
22874 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); 22938 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
22875diff -urNp linux-2.6.32.7/drivers/isdn/gigaset/common.c linux-2.6.32.7/drivers/isdn/gigaset/common.c 22939diff -urNp linux-2.6.32.8/drivers/isdn/gigaset/common.c linux-2.6.32.8/drivers/isdn/gigaset/common.c
22876--- linux-2.6.32.7/drivers/isdn/gigaset/common.c 2010-01-25 13:50:10.000000000 -0500 22940--- linux-2.6.32.8/drivers/isdn/gigaset/common.c 2010-02-09 07:57:19.000000000 -0500
22877+++ linux-2.6.32.7/drivers/isdn/gigaset/common.c 2010-01-25 17:39:40.530169845 -0500 22941+++ linux-2.6.32.8/drivers/isdn/gigaset/common.c 2010-02-10 15:06:24.035501601 -0500
22878@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct 22942@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
22879 cs->commands_pending = 0; 22943 cs->commands_pending = 0;
22880 cs->cur_at_seq = 0; 22944 cs->cur_at_seq = 0;
@@ -22884,9 +22948,9 @@ diff -urNp linux-2.6.32.7/drivers/isdn/gigaset/common.c linux-2.6.32.7/drivers/i
22884 cs->dev = NULL; 22948 cs->dev = NULL;
22885 cs->tty = NULL; 22949 cs->tty = NULL;
22886 cs->tty_dev = NULL; 22950 cs->tty_dev = NULL;
22887diff -urNp linux-2.6.32.7/drivers/isdn/gigaset/gigaset.h linux-2.6.32.7/drivers/isdn/gigaset/gigaset.h 22951diff -urNp linux-2.6.32.8/drivers/isdn/gigaset/gigaset.h linux-2.6.32.8/drivers/isdn/gigaset/gigaset.h
22888--- linux-2.6.32.7/drivers/isdn/gigaset/gigaset.h 2010-01-25 13:50:10.000000000 -0500 22952--- linux-2.6.32.8/drivers/isdn/gigaset/gigaset.h 2010-02-09 07:57:19.000000000 -0500
22889+++ linux-2.6.32.7/drivers/isdn/gigaset/gigaset.h 2010-01-25 17:39:40.531357689 -0500 22953+++ linux-2.6.32.8/drivers/isdn/gigaset/gigaset.h 2010-02-10 15:06:24.035501601 -0500
22890@@ -446,7 +446,7 @@ struct cardstate { 22954@@ -446,7 +446,7 @@ struct cardstate {
22891 spinlock_t cmdlock; 22955 spinlock_t cmdlock;
22892 unsigned curlen, cmdbytes; 22956 unsigned curlen, cmdbytes;
@@ -22896,9 +22960,9 @@ diff -urNp linux-2.6.32.7/drivers/isdn/gigaset/gigaset.h linux-2.6.32.7/drivers/
22896 struct tty_struct *tty; 22960 struct tty_struct *tty;
22897 struct tasklet_struct if_wake_tasklet; 22961 struct tasklet_struct if_wake_tasklet;
22898 unsigned control_state; 22962 unsigned control_state;
22899diff -urNp linux-2.6.32.7/drivers/isdn/gigaset/interface.c linux-2.6.32.7/drivers/isdn/gigaset/interface.c 22963diff -urNp linux-2.6.32.8/drivers/isdn/gigaset/interface.c linux-2.6.32.8/drivers/isdn/gigaset/interface.c
22900--- linux-2.6.32.7/drivers/isdn/gigaset/interface.c 2010-01-25 13:50:10.000000000 -0500 22964--- linux-2.6.32.8/drivers/isdn/gigaset/interface.c 2010-02-09 07:57:19.000000000 -0500
22901+++ linux-2.6.32.7/drivers/isdn/gigaset/interface.c 2010-01-25 17:39:40.535125613 -0500 22965+++ linux-2.6.32.8/drivers/isdn/gigaset/interface.c 2010-02-10 15:06:24.035501601 -0500
22902@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt 22966@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
22903 return -ERESTARTSYS; // FIXME -EINTR? 22967 return -ERESTARTSYS; // FIXME -EINTR?
22904 tty->driver_data = cs; 22968 tty->driver_data = cs;
@@ -22986,9 +23050,9 @@ diff -urNp linux-2.6.32.7/drivers/isdn/gigaset/interface.c linux-2.6.32.7/driver
22986 dev_warn(cs->dev, "%s: device not opened\n", __func__); 23050 dev_warn(cs->dev, "%s: device not opened\n", __func__);
22987 goto out; 23051 goto out;
22988 } 23052 }
22989diff -urNp linux-2.6.32.7/drivers/lguest/core.c linux-2.6.32.7/drivers/lguest/core.c 23053diff -urNp linux-2.6.32.8/drivers/lguest/core.c linux-2.6.32.8/drivers/lguest/core.c
22990--- linux-2.6.32.7/drivers/lguest/core.c 2010-01-25 13:50:10.000000000 -0500 23054--- linux-2.6.32.8/drivers/lguest/core.c 2010-02-09 07:57:19.000000000 -0500
22991+++ linux-2.6.32.7/drivers/lguest/core.c 2010-01-25 17:39:40.535125613 -0500 23055+++ linux-2.6.32.8/drivers/lguest/core.c 2010-02-10 15:06:24.035501601 -0500
22992@@ -91,9 +91,17 @@ static __init int map_switcher(void) 23056@@ -91,9 +91,17 @@ static __init int map_switcher(void)
22993 * it's worked so far. The end address needs +1 because __get_vm_area 23057 * it's worked so far. The end address needs +1 because __get_vm_area
22994 * allocates an extra guard page, so we need space for that. 23058 * allocates an extra guard page, so we need space for that.
@@ -23007,9 +23071,9 @@ diff -urNp linux-2.6.32.7/drivers/lguest/core.c linux-2.6.32.7/drivers/lguest/co
23007 if (!switcher_vma) { 23071 if (!switcher_vma) {
23008 err = -ENOMEM; 23072 err = -ENOMEM;
23009 printk("lguest: could not map switcher pages high\n"); 23073 printk("lguest: could not map switcher pages high\n");
23010diff -urNp linux-2.6.32.7/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.7/drivers/macintosh/via-pmu-backlight.c 23074diff -urNp linux-2.6.32.8/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.8/drivers/macintosh/via-pmu-backlight.c
23011--- linux-2.6.32.7/drivers/macintosh/via-pmu-backlight.c 2010-01-25 13:50:10.000000000 -0500 23075--- linux-2.6.32.8/drivers/macintosh/via-pmu-backlight.c 2010-02-09 07:57:19.000000000 -0500
23012+++ linux-2.6.32.7/drivers/macintosh/via-pmu-backlight.c 2010-01-25 17:39:40.536163946 -0500 23076+++ linux-2.6.32.8/drivers/macintosh/via-pmu-backlight.c 2010-02-10 15:06:24.035501601 -0500
23013@@ -15,7 +15,7 @@ 23077@@ -15,7 +15,7 @@
23014 23078
23015 #define MAX_PMU_LEVEL 0xFF 23079 #define MAX_PMU_LEVEL 0xFF
@@ -23028,9 +23092,9 @@ diff -urNp linux-2.6.32.7/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.7/d
23028 .get_brightness = pmu_backlight_get_brightness, 23092 .get_brightness = pmu_backlight_get_brightness,
23029 .update_status = pmu_backlight_update_status, 23093 .update_status = pmu_backlight_update_status,
23030 23094
23031diff -urNp linux-2.6.32.7/drivers/macintosh/via-pmu.c linux-2.6.32.7/drivers/macintosh/via-pmu.c 23095diff -urNp linux-2.6.32.8/drivers/macintosh/via-pmu.c linux-2.6.32.8/drivers/macintosh/via-pmu.c
23032--- linux-2.6.32.7/drivers/macintosh/via-pmu.c 2010-01-25 13:50:10.000000000 -0500 23096--- linux-2.6.32.8/drivers/macintosh/via-pmu.c 2010-02-09 07:57:19.000000000 -0500
23033+++ linux-2.6.32.7/drivers/macintosh/via-pmu.c 2010-01-25 17:39:40.536163946 -0500 23097+++ linux-2.6.32.8/drivers/macintosh/via-pmu.c 2010-02-10 15:06:24.039518236 -0500
23034@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state 23098@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
23035 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); 23099 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
23036 } 23100 }
@@ -23040,9 +23104,9 @@ diff -urNp linux-2.6.32.7/drivers/macintosh/via-pmu.c linux-2.6.32.7/drivers/mac
23040 .enter = powerbook_sleep, 23104 .enter = powerbook_sleep,
23041 .valid = pmu_sleep_valid, 23105 .valid = pmu_sleep_valid,
23042 }; 23106 };
23043diff -urNp linux-2.6.32.7/drivers/md/bitmap.c linux-2.6.32.7/drivers/md/bitmap.c 23107diff -urNp linux-2.6.32.8/drivers/md/bitmap.c linux-2.6.32.8/drivers/md/bitmap.c
23044--- linux-2.6.32.7/drivers/md/bitmap.c 2010-01-25 13:50:10.000000000 -0500 23108--- linux-2.6.32.8/drivers/md/bitmap.c 2010-02-09 07:57:19.000000000 -0500
23045+++ linux-2.6.32.7/drivers/md/bitmap.c 2010-01-25 17:39:40.536163946 -0500 23109+++ linux-2.6.32.8/drivers/md/bitmap.c 2010-02-10 15:06:24.039518236 -0500
23046@@ -58,7 +58,7 @@ 23110@@ -58,7 +58,7 @@
23047 # if DEBUG > 0 23111 # if DEBUG > 0
23048 # define PRINTK(x...) printk(KERN_DEBUG x) 23112 # define PRINTK(x...) printk(KERN_DEBUG x)
@@ -23052,9 +23116,9 @@ diff -urNp linux-2.6.32.7/drivers/md/bitmap.c linux-2.6.32.7/drivers/md/bitmap.c
23052 # endif 23116 # endif
23053 #endif 23117 #endif
23054 23118
23055diff -urNp linux-2.6.32.7/drivers/md/dm-sysfs.c linux-2.6.32.7/drivers/md/dm-sysfs.c 23119diff -urNp linux-2.6.32.8/drivers/md/dm-sysfs.c linux-2.6.32.8/drivers/md/dm-sysfs.c
23056--- linux-2.6.32.7/drivers/md/dm-sysfs.c 2010-01-25 13:50:10.000000000 -0500 23120--- linux-2.6.32.8/drivers/md/dm-sysfs.c 2010-02-09 07:57:19.000000000 -0500
23057+++ linux-2.6.32.7/drivers/md/dm-sysfs.c 2010-01-25 17:39:40.536163946 -0500 23121+++ linux-2.6.32.8/drivers/md/dm-sysfs.c 2010-02-10 15:06:24.039518236 -0500
23058@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { 23122@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
23059 NULL, 23123 NULL,
23060 }; 23124 };
@@ -23064,9 +23128,9 @@ diff -urNp linux-2.6.32.7/drivers/md/dm-sysfs.c linux-2.6.32.7/drivers/md/dm-sys
23064 .show = dm_attr_show, 23128 .show = dm_attr_show,
23065 }; 23129 };
23066 23130
23067diff -urNp linux-2.6.32.7/drivers/md/dm-table.c linux-2.6.32.7/drivers/md/dm-table.c 23131diff -urNp linux-2.6.32.8/drivers/md/dm-table.c linux-2.6.32.8/drivers/md/dm-table.c
23068--- linux-2.6.32.7/drivers/md/dm-table.c 2010-01-25 13:50:10.000000000 -0500 23132--- linux-2.6.32.8/drivers/md/dm-table.c 2010-02-09 07:57:19.000000000 -0500
23069+++ linux-2.6.32.7/drivers/md/dm-table.c 2010-01-25 17:39:40.537389005 -0500 23133+++ linux-2.6.32.8/drivers/md/dm-table.c 2010-02-10 15:06:24.039518236 -0500
23070@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct 23134@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
23071 if (!dev_size) 23135 if (!dev_size)
23072 return 0; 23136 return 0;
@@ -23076,9 +23140,9 @@ diff -urNp linux-2.6.32.7/drivers/md/dm-table.c linux-2.6.32.7/drivers/md/dm-tab
23076 DMWARN("%s: %s too small for target: " 23140 DMWARN("%s: %s too small for target: "
23077 "start=%llu, len=%llu, dev_size=%llu", 23141 "start=%llu, len=%llu, dev_size=%llu",
23078 dm_device_name(ti->table->md), bdevname(bdev, b), 23142 dm_device_name(ti->table->md), bdevname(bdev, b),
23079diff -urNp linux-2.6.32.7/drivers/md/md.c linux-2.6.32.7/drivers/md/md.c 23143diff -urNp linux-2.6.32.8/drivers/md/md.c linux-2.6.32.8/drivers/md/md.c
23080--- linux-2.6.32.7/drivers/md/md.c 2010-01-25 20:04:14.812259856 -0500 23144--- linux-2.6.32.8/drivers/md/md.c 2010-02-09 07:57:19.000000000 -0500
23081+++ linux-2.6.32.7/drivers/md/md.c 2010-01-25 20:04:24.515156738 -0500 23145+++ linux-2.6.32.8/drivers/md/md.c 2010-02-10 15:06:24.039518236 -0500
23082@@ -2508,7 +2508,7 @@ static void rdev_free(struct kobject *ko 23146@@ -2508,7 +2508,7 @@ static void rdev_free(struct kobject *ko
23083 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); 23147 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
23084 kfree(rdev); 23148 kfree(rdev);
@@ -23115,9 +23179,9 @@ diff -urNp linux-2.6.32.7/drivers/md/md.c linux-2.6.32.7/drivers/md/md.c
23115 /* sync IO will cause sync_io to increase before the disk_stats 23179 /* sync IO will cause sync_io to increase before the disk_stats
23116 * as sync_io is counted when a request starts, and 23180 * as sync_io is counted when a request starts, and
23117 * disk_stats is counted when it completes. 23181 * disk_stats is counted when it completes.
23118diff -urNp linux-2.6.32.7/drivers/md/md.h linux-2.6.32.7/drivers/md/md.h 23182diff -urNp linux-2.6.32.8/drivers/md/md.h linux-2.6.32.8/drivers/md/md.h
23119--- linux-2.6.32.7/drivers/md/md.h 2010-01-25 13:50:10.000000000 -0500 23183--- linux-2.6.32.8/drivers/md/md.h 2010-02-09 07:57:19.000000000 -0500
23120+++ linux-2.6.32.7/drivers/md/md.h 2010-01-25 17:39:40.538411271 -0500 23184+++ linux-2.6.32.8/drivers/md/md.h 2010-02-10 15:06:24.039518236 -0500
23121@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ 23185@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
23122 23186
23123 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) 23187 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
@@ -23127,9 +23191,9 @@ diff -urNp linux-2.6.32.7/drivers/md/md.h linux-2.6.32.7/drivers/md/md.h
23127 } 23191 }
23128 23192
23129 struct mdk_personality 23193 struct mdk_personality
23130diff -urNp linux-2.6.32.7/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.7/drivers/media/dvb/dvb-core/dvbdev.c 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
23131--- linux-2.6.32.7/drivers/media/dvb/dvb-core/dvbdev.c 2010-01-25 13:50:10.000000000 -0500 23195--- linux-2.6.32.8/drivers/media/dvb/dvb-core/dvbdev.c 2010-02-09 07:57:19.000000000 -0500
23132+++ linux-2.6.32.7/drivers/media/dvb/dvb-core/dvbdev.c 2010-01-25 17:39:40.539417594 -0500 23196+++ linux-2.6.32.8/drivers/media/dvb/dvb-core/dvbdev.c 2010-02-10 15:06:24.039518236 -0500
23133@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt 23197@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
23134 const struct dvb_device *template, void *priv, int type) 23198 const struct dvb_device *template, void *priv, int type)
23135 { 23199 {
@@ -23138,9 +23202,9 @@ diff -urNp linux-2.6.32.7/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.7/dri
23138 struct file_operations *dvbdevfops; 23202 struct file_operations *dvbdevfops;
23139 struct device *clsdev; 23203 struct device *clsdev;
23140 int minor; 23204 int minor;
23141diff -urNp linux-2.6.32.7/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.7/drivers/media/video/usbvideo/konicawc.c 23205diff -urNp linux-2.6.32.8/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.8/drivers/media/video/usbvideo/konicawc.c
23142--- linux-2.6.32.7/drivers/media/video/usbvideo/konicawc.c 2010-01-25 13:50:10.000000000 -0500 23206--- linux-2.6.32.8/drivers/media/video/usbvideo/konicawc.c 2010-02-09 07:57:19.000000000 -0500
23143+++ linux-2.6.32.7/drivers/media/video/usbvideo/konicawc.c 2010-01-25 17:39:40.539417594 -0500 23207+++ linux-2.6.32.8/drivers/media/video/usbvideo/konicawc.c 2010-02-10 15:06:24.039518236 -0500
23144@@ -225,7 +225,7 @@ static void konicawc_register_input(stru 23208@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
23145 int error; 23209 int error;
23146 23210
@@ -23150,9 +23214,9 @@ diff -urNp linux-2.6.32.7/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.7
23150 23214
23151 cam->input = input_dev = input_allocate_device(); 23215 cam->input = input_dev = input_allocate_device();
23152 if (!input_dev) { 23216 if (!input_dev) {
23153diff -urNp linux-2.6.32.7/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.7/drivers/media/video/usbvideo/quickcam_messenger.c 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
23154--- linux-2.6.32.7/drivers/media/video/usbvideo/quickcam_messenger.c 2010-01-25 13:50:10.000000000 -0500 23218--- linux-2.6.32.8/drivers/media/video/usbvideo/quickcam_messenger.c 2010-02-09 07:57:19.000000000 -0500
23155+++ linux-2.6.32.7/drivers/media/video/usbvideo/quickcam_messenger.c 2010-01-25 17:39:40.539417594 -0500 23219+++ linux-2.6.32.8/drivers/media/video/usbvideo/quickcam_messenger.c 2010-02-10 15:06:24.039518236 -0500
23156@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc 23220@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
23157 int error; 23221 int error;
23158 23222
@@ -23162,9 +23226,9 @@ diff -urNp linux-2.6.32.7/drivers/media/video/usbvideo/quickcam_messenger.c linu
23162 23226
23163 cam->input = input_dev = input_allocate_device(); 23227 cam->input = input_dev = input_allocate_device();
23164 if (!input_dev) { 23228 if (!input_dev) {
23165diff -urNp linux-2.6.32.7/drivers/message/i2o/i2o_proc.c linux-2.6.32.7/drivers/message/i2o/i2o_proc.c 23229diff -urNp linux-2.6.32.8/drivers/message/i2o/i2o_proc.c linux-2.6.32.8/drivers/message/i2o/i2o_proc.c
23166--- linux-2.6.32.7/drivers/message/i2o/i2o_proc.c 2010-01-25 13:50:10.000000000 -0500 23230--- linux-2.6.32.8/drivers/message/i2o/i2o_proc.c 2010-02-09 07:57:19.000000000 -0500
23167+++ linux-2.6.32.7/drivers/message/i2o/i2o_proc.c 2010-01-25 17:39:40.539417594 -0500 23231+++ linux-2.6.32.8/drivers/message/i2o/i2o_proc.c 2010-02-10 15:06:24.039518236 -0500
23168@@ -259,13 +259,6 @@ static char *scsi_devices[] = { 23232@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
23169 "Array Controller Device" 23233 "Array Controller Device"
23170 }; 23234 };
@@ -23251,9 +23315,9 @@ diff -urNp linux-2.6.32.7/drivers/message/i2o/i2o_proc.c linux-2.6.32.7/drivers/
23251 23315
23252 return 0; 23316 return 0;
23253 } 23317 }
23254diff -urNp linux-2.6.32.7/drivers/misc/kgdbts.c linux-2.6.32.7/drivers/misc/kgdbts.c 23318diff -urNp linux-2.6.32.8/drivers/misc/kgdbts.c linux-2.6.32.8/drivers/misc/kgdbts.c
23255--- linux-2.6.32.7/drivers/misc/kgdbts.c 2010-01-25 13:50:10.000000000 -0500 23319--- linux-2.6.32.8/drivers/misc/kgdbts.c 2010-02-09 07:57:19.000000000 -0500
23256+++ linux-2.6.32.7/drivers/misc/kgdbts.c 2010-01-25 17:39:40.540421639 -0500 23320+++ linux-2.6.32.8/drivers/misc/kgdbts.c 2010-02-10 15:06:24.039518236 -0500
23257@@ -118,7 +118,7 @@ 23321@@ -118,7 +118,7 @@
23258 } while (0) 23322 } while (0)
23259 #define MAX_CONFIG_LEN 40 23323 #define MAX_CONFIG_LEN 40
@@ -23272,9 +23336,9 @@ diff -urNp linux-2.6.32.7/drivers/misc/kgdbts.c linux-2.6.32.7/drivers/misc/kgdb
23272 .name = "kgdbts", 23336 .name = "kgdbts",
23273 .read_char = kgdbts_get_char, 23337 .read_char = kgdbts_get_char,
23274 .write_char = kgdbts_put_char, 23338 .write_char = kgdbts_put_char,
23275diff -urNp linux-2.6.32.7/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.7/drivers/misc/sgi-gru/gruhandles.c 23339diff -urNp linux-2.6.32.8/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.8/drivers/misc/sgi-gru/gruhandles.c
23276--- linux-2.6.32.7/drivers/misc/sgi-gru/gruhandles.c 2010-01-25 13:50:10.000000000 -0500 23340--- linux-2.6.32.8/drivers/misc/sgi-gru/gruhandles.c 2010-02-09 07:57:19.000000000 -0500
23277+++ linux-2.6.32.7/drivers/misc/sgi-gru/gruhandles.c 2010-01-25 17:39:40.540421639 -0500 23341+++ linux-2.6.32.8/drivers/misc/sgi-gru/gruhandles.c 2010-02-10 15:06:24.043503518 -0500
23278@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic 23342@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
23279 23343
23280 static void update_mcs_stats(enum mcs_op op, unsigned long clks) 23344 static void update_mcs_stats(enum mcs_op op, unsigned long clks)
@@ -23286,9 +23350,9 @@ diff -urNp linux-2.6.32.7/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.7/drive
23286 if (mcs_op_statistics[op].max < clks) 23350 if (mcs_op_statistics[op].max < clks)
23287 mcs_op_statistics[op].max = clks; 23351 mcs_op_statistics[op].max = clks;
23288 } 23352 }
23289diff -urNp linux-2.6.32.7/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.7/drivers/misc/sgi-gru/gruprocfs.c 23353diff -urNp linux-2.6.32.8/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.8/drivers/misc/sgi-gru/gruprocfs.c
23290--- linux-2.6.32.7/drivers/misc/sgi-gru/gruprocfs.c 2010-01-25 13:50:10.000000000 -0500 23354--- linux-2.6.32.8/drivers/misc/sgi-gru/gruprocfs.c 2010-02-09 07:57:19.000000000 -0500
23291+++ linux-2.6.32.7/drivers/misc/sgi-gru/gruprocfs.c 2010-01-25 17:39:40.540421639 -0500 23355+++ linux-2.6.32.8/drivers/misc/sgi-gru/gruprocfs.c 2010-02-10 15:06:24.043503518 -0500
23292@@ -32,9 +32,9 @@ 23356@@ -32,9 +32,9 @@
23293 23357
23294 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) 23358 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -23312,9 +23376,9 @@ diff -urNp linux-2.6.32.7/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.7/driver
23312 max = mcs_op_statistics[op].max; 23376 max = mcs_op_statistics[op].max;
23313 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, 23377 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
23314 count ? total / count : 0, max); 23378 count ? total / count : 0, max);
23315diff -urNp linux-2.6.32.7/drivers/misc/sgi-gru/grutables.h linux-2.6.32.7/drivers/misc/sgi-gru/grutables.h 23379diff -urNp linux-2.6.32.8/drivers/misc/sgi-gru/grutables.h linux-2.6.32.8/drivers/misc/sgi-gru/grutables.h
23316--- linux-2.6.32.7/drivers/misc/sgi-gru/grutables.h 2010-01-25 13:50:10.000000000 -0500 23380--- linux-2.6.32.8/drivers/misc/sgi-gru/grutables.h 2010-02-09 07:57:19.000000000 -0500
23317+++ linux-2.6.32.7/drivers/misc/sgi-gru/grutables.h 2010-01-25 17:39:40.541415895 -0500 23381+++ linux-2.6.32.8/drivers/misc/sgi-gru/grutables.h 2010-02-10 15:06:24.043503518 -0500
23318@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; 23382@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
23319 * GRU statistics. 23383 * GRU statistics.
23320 */ 23384 */
@@ -23498,9 +23562,9 @@ diff -urNp linux-2.6.32.7/drivers/misc/sgi-gru/grutables.h linux-2.6.32.7/driver
23498 } while (0) 23562 } while (0)
23499 23563
23500 #ifdef CONFIG_SGI_GRU_DEBUG 23564 #ifdef CONFIG_SGI_GRU_DEBUG
23501diff -urNp linux-2.6.32.7/drivers/mtd/devices/doc2000.c linux-2.6.32.7/drivers/mtd/devices/doc2000.c 23565diff -urNp linux-2.6.32.8/drivers/mtd/devices/doc2000.c linux-2.6.32.8/drivers/mtd/devices/doc2000.c
23502--- linux-2.6.32.7/drivers/mtd/devices/doc2000.c 2010-01-25 13:50:10.000000000 -0500 23566--- linux-2.6.32.8/drivers/mtd/devices/doc2000.c 2010-02-09 07:57:19.000000000 -0500
23503+++ linux-2.6.32.7/drivers/mtd/devices/doc2000.c 2010-01-25 17:39:40.541415895 -0500 23567+++ linux-2.6.32.8/drivers/mtd/devices/doc2000.c 2010-02-10 15:06:24.043503518 -0500
23504@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt 23568@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
23505 23569
23506 /* The ECC will not be calculated correctly if less than 512 is written */ 23570 /* The ECC will not be calculated correctly if less than 512 is written */
@@ -23510,9 +23574,9 @@ diff -urNp linux-2.6.32.7/drivers/mtd/devices/doc2000.c linux-2.6.32.7/drivers/m
23510 printk(KERN_WARNING 23574 printk(KERN_WARNING
23511 "ECC needs a full sector write (adr: %lx size %lx)\n", 23575 "ECC needs a full sector write (adr: %lx size %lx)\n",
23512 (long) to, (long) len); 23576 (long) to, (long) len);
23513diff -urNp linux-2.6.32.7/drivers/mtd/devices/doc2001.c linux-2.6.32.7/drivers/mtd/devices/doc2001.c 23577diff -urNp linux-2.6.32.8/drivers/mtd/devices/doc2001.c linux-2.6.32.8/drivers/mtd/devices/doc2001.c
23514--- linux-2.6.32.7/drivers/mtd/devices/doc2001.c 2010-01-25 13:50:10.000000000 -0500 23578--- linux-2.6.32.8/drivers/mtd/devices/doc2001.c 2010-02-09 07:57:19.000000000 -0500
23515+++ linux-2.6.32.7/drivers/mtd/devices/doc2001.c 2010-01-25 17:39:40.541415895 -0500 23579+++ linux-2.6.32.8/drivers/mtd/devices/doc2001.c 2010-02-10 15:06:24.043503518 -0500
23516@@ -395,6 +395,8 @@ static int doc_read (struct mtd_info *mt 23580@@ -395,6 +395,8 @@ static int doc_read (struct mtd_info *mt
23517 /* Don't allow read past end of device */ 23581 /* Don't allow read past end of device */
23518 if (from >= this->totlen) 23582 if (from >= this->totlen)
@@ -23522,9 +23586,9 @@ diff -urNp linux-2.6.32.7/drivers/mtd/devices/doc2001.c linux-2.6.32.7/drivers/m
23522 23586
23523 /* Don't allow a single read to cross a 512-byte block boundary */ 23587 /* Don't allow a single read to cross a 512-byte block boundary */
23524 if (from + len > ((from | 0x1ff) + 1)) 23588 if (from + len > ((from | 0x1ff) + 1))
23525diff -urNp linux-2.6.32.7/drivers/mtd/ubi/build.c linux-2.6.32.7/drivers/mtd/ubi/build.c 23589diff -urNp linux-2.6.32.8/drivers/mtd/ubi/build.c linux-2.6.32.8/drivers/mtd/ubi/build.c
23526--- linux-2.6.32.7/drivers/mtd/ubi/build.c 2010-01-25 13:50:10.000000000 -0500 23590--- linux-2.6.32.8/drivers/mtd/ubi/build.c 2010-02-09 07:57:19.000000000 -0500
23527+++ linux-2.6.32.7/drivers/mtd/ubi/build.c 2010-01-25 17:39:40.542180216 -0500 23591+++ linux-2.6.32.8/drivers/mtd/ubi/build.c 2010-02-10 15:06:24.043503518 -0500
23528@@ -1255,7 +1255,7 @@ module_exit(ubi_exit); 23592@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
23529 static int __init bytes_str_to_int(const char *str) 23593 static int __init bytes_str_to_int(const char *str)
23530 { 23594 {
@@ -23564,9 +23628,9 @@ diff -urNp linux-2.6.32.7/drivers/mtd/ubi/build.c linux-2.6.32.7/drivers/mtd/ubi
23564 } 23628 }
23565 23629
23566 /** 23630 /**
23567diff -urNp linux-2.6.32.7/drivers/net/e1000e/82571.c linux-2.6.32.7/drivers/net/e1000e/82571.c 23631diff -urNp linux-2.6.32.8/drivers/net/e1000e/82571.c linux-2.6.32.8/drivers/net/e1000e/82571.c
23568--- linux-2.6.32.7/drivers/net/e1000e/82571.c 2010-01-25 13:50:10.000000000 -0500 23632--- linux-2.6.32.8/drivers/net/e1000e/82571.c 2010-02-09 07:57:19.000000000 -0500
23569+++ linux-2.6.32.7/drivers/net/e1000e/82571.c 2010-01-25 17:39:40.542180216 -0500 23633+++ linux-2.6.32.8/drivers/net/e1000e/82571.c 2010-02-10 15:06:24.043503518 -0500
23570@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s 23634@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
23571 { 23635 {
23572 struct e1000_hw *hw = &adapter->hw; 23636 struct e1000_hw *hw = &adapter->hw;
@@ -23620,9 +23684,9 @@ diff -urNp linux-2.6.32.7/drivers/net/e1000e/82571.c linux-2.6.32.7/drivers/net/
23620 .acquire_nvm = e1000_acquire_nvm_82571, 23684 .acquire_nvm = e1000_acquire_nvm_82571,
23621 .read_nvm = e1000e_read_nvm_eerd, 23685 .read_nvm = e1000e_read_nvm_eerd,
23622 .release_nvm = e1000_release_nvm_82571, 23686 .release_nvm = e1000_release_nvm_82571,
23623diff -urNp linux-2.6.32.7/drivers/net/e1000e/e1000.h linux-2.6.32.7/drivers/net/e1000e/e1000.h 23687diff -urNp linux-2.6.32.8/drivers/net/e1000e/e1000.h linux-2.6.32.8/drivers/net/e1000e/e1000.h
23624--- linux-2.6.32.7/drivers/net/e1000e/e1000.h 2010-01-25 13:50:10.000000000 -0500 23688--- linux-2.6.32.8/drivers/net/e1000e/e1000.h 2010-02-09 07:57:19.000000000 -0500
23625+++ linux-2.6.32.7/drivers/net/e1000e/e1000.h 2010-01-25 17:39:40.542180216 -0500 23689+++ linux-2.6.32.8/drivers/net/e1000e/e1000.h 2010-02-10 15:06:24.043503518 -0500
23626@@ -375,9 +375,9 @@ struct e1000_info { 23690@@ -375,9 +375,9 @@ struct e1000_info {
23627 u32 pba; 23691 u32 pba;
23628 u32 max_hw_frame_size; 23692 u32 max_hw_frame_size;
@@ -23636,9 +23700,9 @@ diff -urNp linux-2.6.32.7/drivers/net/e1000e/e1000.h linux-2.6.32.7/drivers/net/
23636 }; 23700 };
23637 23701
23638 /* hardware capability, feature, and workaround flags */ 23702 /* hardware capability, feature, and workaround flags */
23639diff -urNp linux-2.6.32.7/drivers/net/e1000e/es2lan.c linux-2.6.32.7/drivers/net/e1000e/es2lan.c 23703diff -urNp linux-2.6.32.8/drivers/net/e1000e/es2lan.c linux-2.6.32.8/drivers/net/e1000e/es2lan.c
23640--- linux-2.6.32.7/drivers/net/e1000e/es2lan.c 2010-01-25 13:50:10.000000000 -0500 23704--- linux-2.6.32.8/drivers/net/e1000e/es2lan.c 2010-02-09 07:57:19.000000000 -0500
23641+++ linux-2.6.32.7/drivers/net/e1000e/es2lan.c 2010-01-25 17:39:40.543398122 -0500 23705+++ linux-2.6.32.8/drivers/net/e1000e/es2lan.c 2010-02-10 15:06:24.043503518 -0500
23642@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es 23706@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
23643 { 23707 {
23644 struct e1000_hw *hw = &adapter->hw; 23708 struct e1000_hw *hw = &adapter->hw;
@@ -23674,9 +23738,9 @@ diff -urNp linux-2.6.32.7/drivers/net/e1000e/es2lan.c linux-2.6.32.7/drivers/net
23674 .acquire_nvm = e1000_acquire_nvm_80003es2lan, 23738 .acquire_nvm = e1000_acquire_nvm_80003es2lan,
23675 .read_nvm = e1000e_read_nvm_eerd, 23739 .read_nvm = e1000e_read_nvm_eerd,
23676 .release_nvm = e1000_release_nvm_80003es2lan, 23740 .release_nvm = e1000_release_nvm_80003es2lan,
23677diff -urNp linux-2.6.32.7/drivers/net/e1000e/hw.h linux-2.6.32.7/drivers/net/e1000e/hw.h 23741diff -urNp linux-2.6.32.8/drivers/net/e1000e/hw.h linux-2.6.32.8/drivers/net/e1000e/hw.h
23678--- linux-2.6.32.7/drivers/net/e1000e/hw.h 2010-01-25 13:50:10.000000000 -0500 23742--- linux-2.6.32.8/drivers/net/e1000e/hw.h 2010-02-09 07:57:19.000000000 -0500
23679+++ linux-2.6.32.7/drivers/net/e1000e/hw.h 2010-01-25 17:39:40.543398122 -0500 23743+++ linux-2.6.32.8/drivers/net/e1000e/hw.h 2010-02-10 15:06:24.043503518 -0500
23680@@ -755,34 +755,34 @@ struct e1000_mac_operations { 23744@@ -755,34 +755,34 @@ struct e1000_mac_operations {
23681 23745
23682 /* Function pointers for the PHY. */ 23746 /* Function pointers for the PHY. */
@@ -23745,9 +23809,9 @@ diff -urNp linux-2.6.32.7/drivers/net/e1000e/hw.h linux-2.6.32.7/drivers/net/e10
23745 23809
23746 enum e1000_nvm_type type; 23810 enum e1000_nvm_type type;
23747 enum e1000_nvm_override override; 23811 enum e1000_nvm_override override;
23748diff -urNp linux-2.6.32.7/drivers/net/e1000e/ich8lan.c linux-2.6.32.7/drivers/net/e1000e/ich8lan.c 23812diff -urNp linux-2.6.32.8/drivers/net/e1000e/ich8lan.c linux-2.6.32.8/drivers/net/e1000e/ich8lan.c
23749--- linux-2.6.32.7/drivers/net/e1000e/ich8lan.c 2010-01-25 13:50:10.000000000 -0500 23813--- linux-2.6.32.8/drivers/net/e1000e/ich8lan.c 2010-02-09 07:57:19.000000000 -0500
23750+++ linux-2.6.32.7/drivers/net/e1000e/ich8lan.c 2010-01-25 17:39:40.552414935 -0500 23814+++ linux-2.6.32.8/drivers/net/e1000e/ich8lan.c 2010-02-10 15:06:24.043503518 -0500
23751@@ -3451,7 +3451,7 @@ static void e1000_clear_hw_cntrs_ich8lan 23815@@ -3451,7 +3451,7 @@ static void e1000_clear_hw_cntrs_ich8lan
23752 } 23816 }
23753 } 23817 }
@@ -23775,9 +23839,9 @@ diff -urNp linux-2.6.32.7/drivers/net/e1000e/ich8lan.c linux-2.6.32.7/drivers/ne
23775 .acquire_nvm = e1000_acquire_nvm_ich8lan, 23839 .acquire_nvm = e1000_acquire_nvm_ich8lan,
23776 .read_nvm = e1000_read_nvm_ich8lan, 23840 .read_nvm = e1000_read_nvm_ich8lan,
23777 .release_nvm = e1000_release_nvm_ich8lan, 23841 .release_nvm = e1000_release_nvm_ich8lan,
23778diff -urNp linux-2.6.32.7/drivers/net/ibmveth.c linux-2.6.32.7/drivers/net/ibmveth.c 23842diff -urNp linux-2.6.32.8/drivers/net/ibmveth.c linux-2.6.32.8/drivers/net/ibmveth.c
23779--- linux-2.6.32.7/drivers/net/ibmveth.c 2010-01-25 13:50:10.000000000 -0500 23843--- linux-2.6.32.8/drivers/net/ibmveth.c 2010-02-09 07:57:19.000000000 -0500
23780+++ linux-2.6.32.7/drivers/net/ibmveth.c 2010-01-25 17:39:40.552414935 -0500 23844+++ linux-2.6.32.8/drivers/net/ibmveth.c 2010-02-10 15:06:24.043503518 -0500
23781@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr 23845@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
23782 NULL, 23846 NULL,
23783 }; 23847 };
@@ -23787,9 +23851,9 @@ diff -urNp linux-2.6.32.7/drivers/net/ibmveth.c linux-2.6.32.7/drivers/net/ibmve
23787 .show = veth_pool_show, 23851 .show = veth_pool_show,
23788 .store = veth_pool_store, 23852 .store = veth_pool_store,
23789 }; 23853 };
23790diff -urNp linux-2.6.32.7/drivers/net/igb/e1000_82575.c linux-2.6.32.7/drivers/net/igb/e1000_82575.c 23854diff -urNp linux-2.6.32.8/drivers/net/igb/e1000_82575.c linux-2.6.32.8/drivers/net/igb/e1000_82575.c
23791--- linux-2.6.32.7/drivers/net/igb/e1000_82575.c 2010-01-25 13:50:10.000000000 -0500 23855--- linux-2.6.32.8/drivers/net/igb/e1000_82575.c 2010-02-09 07:57:19.000000000 -0500
23792+++ linux-2.6.32.7/drivers/net/igb/e1000_82575.c 2010-01-25 17:39:40.553416584 -0500 23856+++ linux-2.6.32.8/drivers/net/igb/e1000_82575.c 2010-02-10 15:06:24.043503518 -0500
23793@@ -1400,7 +1400,7 @@ void igb_vmdq_set_replication_pf(struct 23857@@ -1400,7 +1400,7 @@ void igb_vmdq_set_replication_pf(struct
23794 wr32(E1000_VT_CTL, vt_ctl); 23858 wr32(E1000_VT_CTL, vt_ctl);
23795 } 23859 }
@@ -23815,9 +23879,9 @@ diff -urNp linux-2.6.32.7/drivers/net/igb/e1000_82575.c linux-2.6.32.7/drivers/n
23815 .acquire = igb_acquire_nvm_82575, 23879 .acquire = igb_acquire_nvm_82575,
23816 .read = igb_read_nvm_eerd, 23880 .read = igb_read_nvm_eerd,
23817 .release = igb_release_nvm_82575, 23881 .release = igb_release_nvm_82575,
23818diff -urNp linux-2.6.32.7/drivers/net/igb/e1000_hw.h linux-2.6.32.7/drivers/net/igb/e1000_hw.h 23882diff -urNp linux-2.6.32.8/drivers/net/igb/e1000_hw.h linux-2.6.32.8/drivers/net/igb/e1000_hw.h
23819--- linux-2.6.32.7/drivers/net/igb/e1000_hw.h 2010-01-25 13:50:10.000000000 -0500 23883--- linux-2.6.32.8/drivers/net/igb/e1000_hw.h 2010-02-09 07:57:19.000000000 -0500
23820+++ linux-2.6.32.7/drivers/net/igb/e1000_hw.h 2010-01-25 17:39:40.553416584 -0500 23884+++ linux-2.6.32.8/drivers/net/igb/e1000_hw.h 2010-02-10 15:06:24.043503518 -0500
23821@@ -302,17 +302,17 @@ struct e1000_phy_operations { 23885@@ -302,17 +302,17 @@ struct e1000_phy_operations {
23822 }; 23886 };
23823 23887
@@ -23852,9 +23916,9 @@ diff -urNp linux-2.6.32.7/drivers/net/igb/e1000_hw.h linux-2.6.32.7/drivers/net/
23852 23916
23853 enum e1000_nvm_type type; 23917 enum e1000_nvm_type type;
23854 enum e1000_nvm_override override; 23918 enum e1000_nvm_override override;
23855diff -urNp linux-2.6.32.7/drivers/net/irda/vlsi_ir.c linux-2.6.32.7/drivers/net/irda/vlsi_ir.c 23919diff -urNp linux-2.6.32.8/drivers/net/irda/vlsi_ir.c linux-2.6.32.8/drivers/net/irda/vlsi_ir.c
23856--- linux-2.6.32.7/drivers/net/irda/vlsi_ir.c 2010-01-25 13:50:10.000000000 -0500 23920--- linux-2.6.32.8/drivers/net/irda/vlsi_ir.c 2010-02-09 07:57:19.000000000 -0500
23857+++ linux-2.6.32.7/drivers/net/irda/vlsi_ir.c 2010-01-25 17:39:40.554121095 -0500 23921+++ linux-2.6.32.8/drivers/net/irda/vlsi_ir.c 2010-02-10 15:06:24.047508055 -0500
23858@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( 23922@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
23859 /* no race - tx-ring already empty */ 23923 /* no race - tx-ring already empty */
23860 vlsi_set_baud(idev, iobase); 23924 vlsi_set_baud(idev, iobase);
@@ -23871,9 +23935,9 @@ diff -urNp linux-2.6.32.7/drivers/net/irda/vlsi_ir.c linux-2.6.32.7/drivers/net/
23871 spin_unlock_irqrestore(&idev->lock, flags); 23935 spin_unlock_irqrestore(&idev->lock, flags);
23872 dev_kfree_skb_any(skb); 23936 dev_kfree_skb_any(skb);
23873 return NETDEV_TX_OK; 23937 return NETDEV_TX_OK;
23874diff -urNp linux-2.6.32.7/drivers/net/iseries_veth.c linux-2.6.32.7/drivers/net/iseries_veth.c 23938diff -urNp linux-2.6.32.8/drivers/net/iseries_veth.c linux-2.6.32.8/drivers/net/iseries_veth.c
23875--- linux-2.6.32.7/drivers/net/iseries_veth.c 2010-01-25 13:50:10.000000000 -0500 23939--- linux-2.6.32.8/drivers/net/iseries_veth.c 2010-02-09 07:57:19.000000000 -0500
23876+++ linux-2.6.32.7/drivers/net/iseries_veth.c 2010-01-25 17:39:40.565344882 -0500 23940+++ linux-2.6.32.8/drivers/net/iseries_veth.c 2010-02-10 15:06:24.047508055 -0500
23877@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul 23941@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
23878 NULL 23942 NULL
23879 }; 23943 };
@@ -23892,9 +23956,9 @@ diff -urNp linux-2.6.32.7/drivers/net/iseries_veth.c linux-2.6.32.7/drivers/net/
23892 .show = veth_port_attribute_show 23956 .show = veth_port_attribute_show
23893 }; 23957 };
23894 23958
23895diff -urNp linux-2.6.32.7/drivers/net/pcnet32.c linux-2.6.32.7/drivers/net/pcnet32.c 23959diff -urNp linux-2.6.32.8/drivers/net/pcnet32.c linux-2.6.32.8/drivers/net/pcnet32.c
23896--- linux-2.6.32.7/drivers/net/pcnet32.c 2010-01-25 13:50:10.000000000 -0500 23960--- linux-2.6.32.8/drivers/net/pcnet32.c 2010-02-09 07:57:19.000000000 -0500
23897+++ linux-2.6.32.7/drivers/net/pcnet32.c 2010-01-25 17:39:40.565344882 -0500 23961+++ linux-2.6.32.8/drivers/net/pcnet32.c 2010-02-10 15:06:24.047508055 -0500
23898@@ -79,7 +79,7 @@ static int cards_found; 23962@@ -79,7 +79,7 @@ static int cards_found;
23899 /* 23963 /*
23900 * VLB I/O addresses 23964 * VLB I/O addresses
@@ -23904,9 +23968,9 @@ diff -urNp linux-2.6.32.7/drivers/net/pcnet32.c linux-2.6.32.7/drivers/net/pcnet
23904 { 0x300, 0x320, 0x340, 0x360, 0 }; 23968 { 0x300, 0x320, 0x340, 0x360, 0 };
23905 23969
23906 static int pcnet32_debug = 0; 23970 static int pcnet32_debug = 0;
23907diff -urNp linux-2.6.32.7/drivers/net/tg3.h linux-2.6.32.7/drivers/net/tg3.h 23971diff -urNp linux-2.6.32.8/drivers/net/tg3.h linux-2.6.32.8/drivers/net/tg3.h
23908--- linux-2.6.32.7/drivers/net/tg3.h 2010-01-25 13:50:10.000000000 -0500 23972--- linux-2.6.32.8/drivers/net/tg3.h 2010-02-09 07:57:19.000000000 -0500
23909+++ linux-2.6.32.7/drivers/net/tg3.h 2010-01-25 17:39:40.566412698 -0500 23973+++ linux-2.6.32.8/drivers/net/tg3.h 2010-02-10 15:06:24.047508055 -0500
23910@@ -95,6 +95,7 @@ 23974@@ -95,6 +95,7 @@
23911 #define CHIPREV_ID_5750_A0 0x4000 23975 #define CHIPREV_ID_5750_A0 0x4000
23912 #define CHIPREV_ID_5750_A1 0x4001 23976 #define CHIPREV_ID_5750_A1 0x4001
@@ -23915,9 +23979,9 @@ diff -urNp linux-2.6.32.7/drivers/net/tg3.h linux-2.6.32.7/drivers/net/tg3.h
23915 #define CHIPREV_ID_5750_C2 0x4202 23979 #define CHIPREV_ID_5750_C2 0x4202
23916 #define CHIPREV_ID_5752_A0_HW 0x5000 23980 #define CHIPREV_ID_5752_A0_HW 0x5000
23917 #define CHIPREV_ID_5752_A0 0x6000 23981 #define CHIPREV_ID_5752_A0 0x6000
23918diff -urNp linux-2.6.32.7/drivers/net/usb/hso.c linux-2.6.32.7/drivers/net/usb/hso.c 23982diff -urNp linux-2.6.32.8/drivers/net/usb/hso.c linux-2.6.32.8/drivers/net/usb/hso.c
23919--- linux-2.6.32.7/drivers/net/usb/hso.c 2010-01-25 13:50:10.000000000 -0500 23983--- linux-2.6.32.8/drivers/net/usb/hso.c 2010-02-09 07:57:19.000000000 -0500
23920+++ linux-2.6.32.7/drivers/net/usb/hso.c 2010-01-25 17:39:40.567425146 -0500 23984+++ linux-2.6.32.8/drivers/net/usb/hso.c 2010-02-10 15:06:24.083678713 -0500
23921@@ -258,7 +258,7 @@ struct hso_serial { 23985@@ -258,7 +258,7 @@ struct hso_serial {
23922 23986
23923 /* from usb_serial_port */ 23987 /* from usb_serial_port */
@@ -23996,9 +24060,9 @@ diff -urNp linux-2.6.32.7/drivers/net/usb/hso.c linux-2.6.32.7/drivers/net/usb/h
23996 result = 24060 result =
23997 hso_start_serial_device(serial_table[i], GFP_NOIO); 24061 hso_start_serial_device(serial_table[i], GFP_NOIO);
23998 hso_kick_transmit(dev2ser(serial_table[i])); 24062 hso_kick_transmit(dev2ser(serial_table[i]));
23999diff -urNp linux-2.6.32.7/drivers/net/wireless/b43/debugfs.c linux-2.6.32.7/drivers/net/wireless/b43/debugfs.c 24063diff -urNp linux-2.6.32.8/drivers/net/wireless/b43/debugfs.c linux-2.6.32.8/drivers/net/wireless/b43/debugfs.c
24000--- linux-2.6.32.7/drivers/net/wireless/b43/debugfs.c 2010-01-25 13:50:10.000000000 -0500 24064--- linux-2.6.32.8/drivers/net/wireless/b43/debugfs.c 2010-02-09 07:57:19.000000000 -0500
24001+++ linux-2.6.32.7/drivers/net/wireless/b43/debugfs.c 2010-01-25 17:39:40.567425146 -0500 24065+++ linux-2.6.32.8/drivers/net/wireless/b43/debugfs.c 2010-02-10 15:06:24.083678713 -0500
24002@@ -43,7 +43,7 @@ static struct dentry *rootdir; 24066@@ -43,7 +43,7 @@ static struct dentry *rootdir;
24003 struct b43_debugfs_fops { 24067 struct b43_debugfs_fops {
24004 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); 24068 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -24008,9 +24072,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/b43/debugfs.c linux-2.6.32.7/driv
24008 /* Offset of struct b43_dfs_file in struct b43_dfsentry */ 24072 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
24009 size_t file_struct_offset; 24073 size_t file_struct_offset;
24010 }; 24074 };
24011diff -urNp linux-2.6.32.7/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.7/drivers/net/wireless/b43legacy/debugfs.c 24075diff -urNp linux-2.6.32.8/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.8/drivers/net/wireless/b43legacy/debugfs.c
24012--- linux-2.6.32.7/drivers/net/wireless/b43legacy/debugfs.c 2010-01-25 13:50:10.000000000 -0500 24076--- linux-2.6.32.8/drivers/net/wireless/b43legacy/debugfs.c 2010-02-09 07:57:19.000000000 -0500
24013+++ linux-2.6.32.7/drivers/net/wireless/b43legacy/debugfs.c 2010-01-25 17:39:40.567425146 -0500 24077+++ linux-2.6.32.8/drivers/net/wireless/b43legacy/debugfs.c 2010-02-10 15:06:24.083678713 -0500
24014@@ -44,7 +44,7 @@ static struct dentry *rootdir; 24078@@ -44,7 +44,7 @@ static struct dentry *rootdir;
24015 struct b43legacy_debugfs_fops { 24079 struct b43legacy_debugfs_fops {
24016 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); 24080 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -24020,9 +24084,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.
24020 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ 24084 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
24021 size_t file_struct_offset; 24085 size_t file_struct_offset;
24022 /* Take wl->irq_lock before calling read/write? */ 24086 /* Take wl->irq_lock before calling read/write? */
24023diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-1000.c 24087diff -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
24024--- linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-01-25 13:50:10.000000000 -0500 24088--- linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-02-09 07:57:19.000000000 -0500
24025+++ linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-01-25 17:39:40.567425146 -0500 24089+++ linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-02-10 15:06:24.083678713 -0500
24026@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = 24090@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
24027 }, 24091 },
24028 }; 24092 };
@@ -24032,9 +24096,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.7
24032 .ucode = &iwl5000_ucode, 24096 .ucode = &iwl5000_ucode,
24033 .lib = &iwl1000_lib, 24097 .lib = &iwl1000_lib,
24034 .hcmd = &iwl5000_hcmd, 24098 .hcmd = &iwl5000_hcmd,
24035diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-3945.c 24099diff -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
24036--- linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-01-25 13:50:10.000000000 -0500 24100--- linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-02-09 07:57:19.000000000 -0500
24037+++ linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-01-25 17:39:40.568210179 -0500 24101+++ linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-02-10 15:06:24.083678713 -0500
24038@@ -2876,7 +2876,7 @@ static struct iwl_hcmd_utils_ops iwl3945 24102@@ -2876,7 +2876,7 @@ static struct iwl_hcmd_utils_ops iwl3945
24039 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, 24103 .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
24040 }; 24104 };
@@ -24044,9 +24108,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.7
24044 .ucode = &iwl3945_ucode, 24108 .ucode = &iwl3945_ucode,
24045 .lib = &iwl3945_lib, 24109 .lib = &iwl3945_lib,
24046 .hcmd = &iwl3945_hcmd, 24110 .hcmd = &iwl3945_hcmd,
24047diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-4965.c 24111diff -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
24048--- linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-01-25 13:50:10.000000000 -0500 24112--- linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-02-09 07:57:19.000000000 -0500
24049+++ linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-01-25 17:39:40.568210179 -0500 24113+++ linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-02-10 15:06:24.083678713 -0500
24050@@ -2335,7 +2335,7 @@ static struct iwl_lib_ops iwl4965_lib = 24114@@ -2335,7 +2335,7 @@ static struct iwl_lib_ops iwl4965_lib =
24051 }, 24115 },
24052 }; 24116 };
@@ -24056,9 +24120,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.7
24056 .ucode = &iwl4965_ucode, 24120 .ucode = &iwl4965_ucode,
24057 .lib = &iwl4965_lib, 24121 .lib = &iwl4965_lib,
24058 .hcmd = &iwl4965_hcmd, 24122 .hcmd = &iwl4965_hcmd,
24059diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-5000.c 24123diff -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
24060--- linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-01-25 20:04:15.064610348 -0500 24124--- linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-02-09 07:57:19.000000000 -0500
24061+++ linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-01-25 20:04:24.680179315 -0500 24125+++ linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-02-10 15:06:24.083678713 -0500
24062@@ -1628,14 +1628,14 @@ static struct iwl_lib_ops iwl5150_lib = 24126@@ -1628,14 +1628,14 @@ static struct iwl_lib_ops iwl5150_lib =
24063 }, 24127 },
24064 }; 24128 };
@@ -24076,9 +24140,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.7
24076 .ucode = &iwl5000_ucode, 24140 .ucode = &iwl5000_ucode,
24077 .lib = &iwl5150_lib, 24141 .lib = &iwl5150_lib,
24078 .hcmd = &iwl5000_hcmd, 24142 .hcmd = &iwl5000_hcmd,
24079diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-6000.c 24143diff -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
24080--- linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-01-25 13:50:10.000000000 -0500 24144--- linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-02-09 07:57:19.000000000 -0500
24081+++ linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-01-25 17:39:40.569316162 -0500 24145+++ linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-02-10 15:06:24.083678713 -0500
24082@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 24146@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
24083 .calc_rssi = iwl5000_calc_rssi, 24147 .calc_rssi = iwl5000_calc_rssi,
24084 }; 24148 };
@@ -24088,9 +24152,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.7
24088 .ucode = &iwl5000_ucode, 24152 .ucode = &iwl5000_ucode,
24089 .lib = &iwl6000_lib, 24153 .lib = &iwl6000_lib,
24090 .hcmd = &iwl5000_hcmd, 24154 .hcmd = &iwl5000_hcmd,
24091diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-dev.h 24155diff -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
24092--- linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-01-25 13:50:10.000000000 -0500 24156--- linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-02-09 07:57:19.000000000 -0500
24093+++ linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-01-25 17:39:40.569316162 -0500 24157+++ linux-2.6.32.8/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-02-10 15:06:24.083678713 -0500
24094@@ -67,7 +67,7 @@ struct iwl_tx_queue; 24158@@ -67,7 +67,7 @@ struct iwl_tx_queue;
24095 24159
24096 /* shared structures from iwl-5000.c */ 24160 /* shared structures from iwl-5000.c */
@@ -24100,9 +24164,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.7/
24100 extern struct iwl_ucode_ops iwl5000_ucode; 24164 extern struct iwl_ucode_ops iwl5000_ucode;
24101 extern struct iwl_lib_ops iwl5000_lib; 24165 extern struct iwl_lib_ops iwl5000_lib;
24102 extern struct iwl_hcmd_ops iwl5000_hcmd; 24166 extern struct iwl_hcmd_ops iwl5000_hcmd;
24103diff -urNp linux-2.6.32.7/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.7/drivers/net/wireless/libertas/debugfs.c 24167diff -urNp linux-2.6.32.8/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.8/drivers/net/wireless/libertas/debugfs.c
24104--- linux-2.6.32.7/drivers/net/wireless/libertas/debugfs.c 2010-01-25 13:50:10.000000000 -0500 24168--- linux-2.6.32.8/drivers/net/wireless/libertas/debugfs.c 2010-02-09 07:57:19.000000000 -0500
24105+++ linux-2.6.32.7/drivers/net/wireless/libertas/debugfs.c 2010-01-25 17:39:40.569316162 -0500 24169+++ linux-2.6.32.8/drivers/net/wireless/libertas/debugfs.c 2010-02-10 15:06:24.083678713 -0500
24106@@ -708,7 +708,7 @@ out_unlock: 24170@@ -708,7 +708,7 @@ out_unlock:
24107 struct lbs_debugfs_files { 24171 struct lbs_debugfs_files {
24108 const char *name; 24172 const char *name;
@@ -24112,9 +24176,9 @@ diff -urNp linux-2.6.32.7/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.7
24112 }; 24176 };
24113 24177
24114 static const struct lbs_debugfs_files debugfs_files[] = { 24178 static const struct lbs_debugfs_files debugfs_files[] = {
24115diff -urNp linux-2.6.32.7/drivers/oprofile/buffer_sync.c linux-2.6.32.7/drivers/oprofile/buffer_sync.c 24179diff -urNp linux-2.6.32.8/drivers/oprofile/buffer_sync.c linux-2.6.32.8/drivers/oprofile/buffer_sync.c
24116--- linux-2.6.32.7/drivers/oprofile/buffer_sync.c 2010-01-25 13:50:10.000000000 -0500 24180--- linux-2.6.32.8/drivers/oprofile/buffer_sync.c 2010-02-09 07:57:19.000000000 -0500
24117+++ linux-2.6.32.7/drivers/oprofile/buffer_sync.c 2010-01-25 17:39:40.569316162 -0500 24181+++ linux-2.6.32.8/drivers/oprofile/buffer_sync.c 2010-02-10 15:06:24.083678713 -0500
24118@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en 24182@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en
24119 if (cookie == NO_COOKIE) 24183 if (cookie == NO_COOKIE)
24120 offset = pc; 24184 offset = pc;
@@ -24150,9 +24214,9 @@ diff -urNp linux-2.6.32.7/drivers/oprofile/buffer_sync.c linux-2.6.32.7/drivers/
24150 } 24214 }
24151 } 24215 }
24152 release_mm(mm); 24216 release_mm(mm);
24153diff -urNp linux-2.6.32.7/drivers/oprofile/event_buffer.c linux-2.6.32.7/drivers/oprofile/event_buffer.c 24217diff -urNp linux-2.6.32.8/drivers/oprofile/event_buffer.c linux-2.6.32.8/drivers/oprofile/event_buffer.c
24154--- linux-2.6.32.7/drivers/oprofile/event_buffer.c 2010-01-25 13:50:10.000000000 -0500 24218--- linux-2.6.32.8/drivers/oprofile/event_buffer.c 2010-02-09 07:57:19.000000000 -0500
24155+++ linux-2.6.32.7/drivers/oprofile/event_buffer.c 2010-01-25 17:39:40.570409439 -0500 24219+++ linux-2.6.32.8/drivers/oprofile/event_buffer.c 2010-02-10 15:06:24.083678713 -0500
24156@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value 24220@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
24157 } 24221 }
24158 24222
@@ -24162,9 +24226,9 @@ diff -urNp linux-2.6.32.7/drivers/oprofile/event_buffer.c linux-2.6.32.7/drivers
24162 return; 24226 return;
24163 } 24227 }
24164 24228
24165diff -urNp linux-2.6.32.7/drivers/oprofile/oprof.c linux-2.6.32.7/drivers/oprofile/oprof.c 24229diff -urNp linux-2.6.32.8/drivers/oprofile/oprof.c linux-2.6.32.8/drivers/oprofile/oprof.c
24166--- linux-2.6.32.7/drivers/oprofile/oprof.c 2010-01-25 13:50:10.000000000 -0500 24230--- linux-2.6.32.8/drivers/oprofile/oprof.c 2010-02-09 07:57:19.000000000 -0500
24167+++ linux-2.6.32.7/drivers/oprofile/oprof.c 2010-01-25 17:39:40.570409439 -0500 24231+++ linux-2.6.32.8/drivers/oprofile/oprof.c 2010-02-10 15:06:24.083678713 -0500
24168@@ -110,7 +110,7 @@ static void switch_worker(struct work_st 24232@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
24169 if (oprofile_ops.switch_events()) 24233 if (oprofile_ops.switch_events())
24170 return; 24234 return;
@@ -24174,9 +24238,9 @@ diff -urNp linux-2.6.32.7/drivers/oprofile/oprof.c linux-2.6.32.7/drivers/oprofi
24174 start_switch_worker(); 24238 start_switch_worker();
24175 } 24239 }
24176 24240
24177diff -urNp linux-2.6.32.7/drivers/oprofile/oprofilefs.c linux-2.6.32.7/drivers/oprofile/oprofilefs.c 24241diff -urNp linux-2.6.32.8/drivers/oprofile/oprofilefs.c linux-2.6.32.8/drivers/oprofile/oprofilefs.c
24178--- linux-2.6.32.7/drivers/oprofile/oprofilefs.c 2010-01-25 13:50:10.000000000 -0500 24242--- linux-2.6.32.8/drivers/oprofile/oprofilefs.c 2010-02-09 07:57:19.000000000 -0500
24179+++ linux-2.6.32.7/drivers/oprofile/oprofilefs.c 2010-01-25 17:39:40.570409439 -0500 24243+++ linux-2.6.32.8/drivers/oprofile/oprofilefs.c 2010-02-10 15:06:24.083678713 -0500
24180@@ -187,7 +187,7 @@ static const struct file_operations atom 24244@@ -187,7 +187,7 @@ static const struct file_operations atom
24181 24245
24182 24246
@@ -24186,9 +24250,9 @@ diff -urNp linux-2.6.32.7/drivers/oprofile/oprofilefs.c linux-2.6.32.7/drivers/o
24186 { 24250 {
24187 struct dentry *d = __oprofilefs_create_file(sb, root, name, 24251 struct dentry *d = __oprofilefs_create_file(sb, root, name,
24188 &atomic_ro_fops, 0444); 24252 &atomic_ro_fops, 0444);
24189diff -urNp linux-2.6.32.7/drivers/oprofile/oprofile_stats.c linux-2.6.32.7/drivers/oprofile/oprofile_stats.c 24253diff -urNp linux-2.6.32.8/drivers/oprofile/oprofile_stats.c linux-2.6.32.8/drivers/oprofile/oprofile_stats.c
24190--- linux-2.6.32.7/drivers/oprofile/oprofile_stats.c 2010-01-25 13:50:10.000000000 -0500 24254--- linux-2.6.32.8/drivers/oprofile/oprofile_stats.c 2010-02-09 07:57:19.000000000 -0500
24191+++ linux-2.6.32.7/drivers/oprofile/oprofile_stats.c 2010-01-25 17:39:40.570409439 -0500 24255+++ linux-2.6.32.8/drivers/oprofile/oprofile_stats.c 2010-02-10 15:06:24.083678713 -0500
24192@@ -30,11 +30,11 @@ void oprofile_reset_stats(void) 24256@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
24193 cpu_buf->sample_invalid_eip = 0; 24257 cpu_buf->sample_invalid_eip = 0;
24194 } 24258 }
@@ -24206,9 +24270,9 @@ diff -urNp linux-2.6.32.7/drivers/oprofile/oprofile_stats.c linux-2.6.32.7/drive
24206 } 24270 }
24207 24271
24208 24272
24209diff -urNp linux-2.6.32.7/drivers/oprofile/oprofile_stats.h linux-2.6.32.7/drivers/oprofile/oprofile_stats.h 24273diff -urNp linux-2.6.32.8/drivers/oprofile/oprofile_stats.h linux-2.6.32.8/drivers/oprofile/oprofile_stats.h
24210--- linux-2.6.32.7/drivers/oprofile/oprofile_stats.h 2010-01-25 13:50:10.000000000 -0500 24274--- linux-2.6.32.8/drivers/oprofile/oprofile_stats.h 2010-02-09 07:57:19.000000000 -0500
24211+++ linux-2.6.32.7/drivers/oprofile/oprofile_stats.h 2010-01-25 17:39:40.570409439 -0500 24275+++ linux-2.6.32.8/drivers/oprofile/oprofile_stats.h 2010-02-10 15:06:24.087514816 -0500
24212@@ -13,11 +13,11 @@ 24276@@ -13,11 +13,11 @@
24213 #include <asm/atomic.h> 24277 #include <asm/atomic.h>
24214 24278
@@ -24226,9 +24290,9 @@ diff -urNp linux-2.6.32.7/drivers/oprofile/oprofile_stats.h linux-2.6.32.7/drive
24226 }; 24290 };
24227 24291
24228 extern struct oprofile_stat_struct oprofile_stats; 24292 extern struct oprofile_stat_struct oprofile_stats;
24229diff -urNp linux-2.6.32.7/drivers/parisc/pdc_stable.c linux-2.6.32.7/drivers/parisc/pdc_stable.c 24293diff -urNp linux-2.6.32.8/drivers/parisc/pdc_stable.c linux-2.6.32.8/drivers/parisc/pdc_stable.c
24230--- linux-2.6.32.7/drivers/parisc/pdc_stable.c 2010-01-25 13:50:10.000000000 -0500 24294--- linux-2.6.32.8/drivers/parisc/pdc_stable.c 2010-02-09 07:57:19.000000000 -0500
24231+++ linux-2.6.32.7/drivers/parisc/pdc_stable.c 2010-01-25 17:39:40.570409439 -0500 24295+++ linux-2.6.32.8/drivers/parisc/pdc_stable.c 2010-02-10 15:06:24.087514816 -0500
24232@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj 24296@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
24233 return ret; 24297 return ret;
24234 } 24298 }
@@ -24238,9 +24302,9 @@ diff -urNp linux-2.6.32.7/drivers/parisc/pdc_stable.c linux-2.6.32.7/drivers/par
24238 .show = pdcspath_attr_show, 24302 .show = pdcspath_attr_show,
24239 .store = pdcspath_attr_store, 24303 .store = pdcspath_attr_store,
24240 }; 24304 };
24241diff -urNp linux-2.6.32.7/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.7/drivers/pci/hotplug/acpiphp_glue.c 24305diff -urNp linux-2.6.32.8/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.8/drivers/pci/hotplug/acpiphp_glue.c
24242--- linux-2.6.32.7/drivers/pci/hotplug/acpiphp_glue.c 2010-01-25 13:50:10.000000000 -0500 24306--- linux-2.6.32.8/drivers/pci/hotplug/acpiphp_glue.c 2010-02-09 07:57:19.000000000 -0500
24243+++ linux-2.6.32.7/drivers/pci/hotplug/acpiphp_glue.c 2010-01-25 17:39:40.571411517 -0500 24307+++ linux-2.6.32.8/drivers/pci/hotplug/acpiphp_glue.c 2010-02-10 15:06:24.087514816 -0500
24244@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif 24308@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
24245 } 24309 }
24246 24310
@@ -24250,9 +24314,9 @@ diff -urNp linux-2.6.32.7/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.7/driv
24250 .handler = handle_hotplug_event_func, 24314 .handler = handle_hotplug_event_func,
24251 }; 24315 };
24252 24316
24253diff -urNp linux-2.6.32.7/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.7/drivers/pci/hotplug/cpqphp_nvram.c 24317diff -urNp linux-2.6.32.8/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.8/drivers/pci/hotplug/cpqphp_nvram.c
24254--- linux-2.6.32.7/drivers/pci/hotplug/cpqphp_nvram.c 2010-01-25 13:50:10.000000000 -0500 24318--- linux-2.6.32.8/drivers/pci/hotplug/cpqphp_nvram.c 2010-02-09 07:57:19.000000000 -0500
24255+++ linux-2.6.32.7/drivers/pci/hotplug/cpqphp_nvram.c 2010-01-25 17:39:40.571411517 -0500 24319+++ linux-2.6.32.8/drivers/pci/hotplug/cpqphp_nvram.c 2010-02-10 15:06:24.087514816 -0500
24256@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ 24320@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
24257 24321
24258 void compaq_nvram_init (void __iomem *rom_start) 24322 void compaq_nvram_init (void __iomem *rom_start)
@@ -24267,9 +24331,9 @@ diff -urNp linux-2.6.32.7/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.7/driv
24267 dbg("int15 entry = %p\n", compaq_int15_entry_point); 24331 dbg("int15 entry = %p\n", compaq_int15_entry_point);
24268 24332
24269 /* initialize our int15 lock */ 24333 /* initialize our int15 lock */
24270diff -urNp linux-2.6.32.7/drivers/pci/hotplug/fakephp.c linux-2.6.32.7/drivers/pci/hotplug/fakephp.c 24334diff -urNp linux-2.6.32.8/drivers/pci/hotplug/fakephp.c linux-2.6.32.8/drivers/pci/hotplug/fakephp.c
24271--- linux-2.6.32.7/drivers/pci/hotplug/fakephp.c 2010-01-25 13:50:10.000000000 -0500 24335--- linux-2.6.32.8/drivers/pci/hotplug/fakephp.c 2010-02-09 07:57:19.000000000 -0500
24272+++ linux-2.6.32.7/drivers/pci/hotplug/fakephp.c 2010-01-25 17:39:40.571411517 -0500 24336+++ linux-2.6.32.8/drivers/pci/hotplug/fakephp.c 2010-02-10 15:06:24.087514816 -0500
24273@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec 24337@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
24274 } 24338 }
24275 24339
@@ -24279,9 +24343,9 @@ diff -urNp linux-2.6.32.7/drivers/pci/hotplug/fakephp.c linux-2.6.32.7/drivers/p
24279 .store = legacy_store, .show = legacy_show 24343 .store = legacy_store, .show = legacy_show
24280 }, 24344 },
24281 .release = &legacy_release, 24345 .release = &legacy_release,
24282diff -urNp linux-2.6.32.7/drivers/pci/intel-iommu.c linux-2.6.32.7/drivers/pci/intel-iommu.c 24346diff -urNp linux-2.6.32.8/drivers/pci/intel-iommu.c linux-2.6.32.8/drivers/pci/intel-iommu.c
24283--- linux-2.6.32.7/drivers/pci/intel-iommu.c 2010-01-25 13:50:10.000000000 -0500 24347--- linux-2.6.32.8/drivers/pci/intel-iommu.c 2010-02-09 07:57:19.000000000 -0500
24284+++ linux-2.6.32.7/drivers/pci/intel-iommu.c 2010-01-25 17:39:40.572167277 -0500 24348+++ linux-2.6.32.8/drivers/pci/intel-iommu.c 2010-02-10 15:06:24.087514816 -0500
24285@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de 24349@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de
24286 return !dma_addr; 24350 return !dma_addr;
24287 } 24351 }
@@ -24291,9 +24355,9 @@ diff -urNp linux-2.6.32.7/drivers/pci/intel-iommu.c linux-2.6.32.7/drivers/pci/i
24291 .alloc_coherent = intel_alloc_coherent, 24355 .alloc_coherent = intel_alloc_coherent,
24292 .free_coherent = intel_free_coherent, 24356 .free_coherent = intel_free_coherent,
24293 .map_sg = intel_map_sg, 24357 .map_sg = intel_map_sg,
24294diff -urNp linux-2.6.32.7/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.7/drivers/pci/pcie/portdrv_pci.c 24358diff -urNp linux-2.6.32.8/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.8/drivers/pci/pcie/portdrv_pci.c
24295--- linux-2.6.32.7/drivers/pci/pcie/portdrv_pci.c 2010-01-25 13:50:10.000000000 -0500 24359--- linux-2.6.32.8/drivers/pci/pcie/portdrv_pci.c 2010-02-09 07:57:19.000000000 -0500
24296+++ linux-2.6.32.7/drivers/pci/pcie/portdrv_pci.c 2010-01-25 17:39:40.572167277 -0500 24360+++ linux-2.6.32.8/drivers/pci/pcie/portdrv_pci.c 2010-02-10 15:06:24.087514816 -0500
24297@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru 24361@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru
24298 static const struct pci_device_id port_pci_ids[] = { { 24362 static const struct pci_device_id port_pci_ids[] = { {
24299 /* handle any PCI-Express port */ 24363 /* handle any PCI-Express port */
@@ -24303,9 +24367,9 @@ diff -urNp linux-2.6.32.7/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.7/drivers/
24303 }; 24367 };
24304 MODULE_DEVICE_TABLE(pci, port_pci_ids); 24368 MODULE_DEVICE_TABLE(pci, port_pci_ids);
24305 24369
24306diff -urNp linux-2.6.32.7/drivers/pci/proc.c linux-2.6.32.7/drivers/pci/proc.c 24370diff -urNp linux-2.6.32.8/drivers/pci/proc.c linux-2.6.32.8/drivers/pci/proc.c
24307--- linux-2.6.32.7/drivers/pci/proc.c 2010-01-25 13:50:10.000000000 -0500 24371--- linux-2.6.32.8/drivers/pci/proc.c 2010-02-09 07:57:19.000000000 -0500
24308+++ linux-2.6.32.7/drivers/pci/proc.c 2010-01-25 17:39:40.572167277 -0500 24372+++ linux-2.6.32.8/drivers/pci/proc.c 2010-02-10 15:06:24.087514816 -0500
24309@@ -480,7 +480,16 @@ static const struct file_operations proc 24373@@ -480,7 +480,16 @@ static const struct file_operations proc
24310 static int __init pci_proc_init(void) 24374 static int __init pci_proc_init(void)
24311 { 24375 {
@@ -24323,9 +24387,9 @@ diff -urNp linux-2.6.32.7/drivers/pci/proc.c linux-2.6.32.7/drivers/pci/proc.c
24323 proc_create("devices", 0, proc_bus_pci_dir, 24387 proc_create("devices", 0, proc_bus_pci_dir,
24324 &proc_bus_pci_dev_operations); 24388 &proc_bus_pci_dev_operations);
24325 proc_initialized = 1; 24389 proc_initialized = 1;
24326diff -urNp linux-2.6.32.7/drivers/pci/slot.c linux-2.6.32.7/drivers/pci/slot.c 24390diff -urNp linux-2.6.32.8/drivers/pci/slot.c linux-2.6.32.8/drivers/pci/slot.c
24327--- linux-2.6.32.7/drivers/pci/slot.c 2010-01-25 13:50:10.000000000 -0500 24391--- linux-2.6.32.8/drivers/pci/slot.c 2010-02-09 07:57:19.000000000 -0500
24328+++ linux-2.6.32.7/drivers/pci/slot.c 2010-01-25 17:39:40.572167277 -0500 24392+++ linux-2.6.32.8/drivers/pci/slot.c 2010-02-10 15:06:24.087514816 -0500
24329@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc 24393@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
24330 return attribute->store ? attribute->store(slot, buf, len) : -EIO; 24394 return attribute->store ? attribute->store(slot, buf, len) : -EIO;
24331 } 24395 }
@@ -24335,9 +24399,9 @@ diff -urNp linux-2.6.32.7/drivers/pci/slot.c linux-2.6.32.7/drivers/pci/slot.c
24335 .show = pci_slot_attr_show, 24399 .show = pci_slot_attr_show,
24336 .store = pci_slot_attr_store, 24400 .store = pci_slot_attr_store,
24337 }; 24401 };
24338diff -urNp linux-2.6.32.7/drivers/pcmcia/ti113x.h linux-2.6.32.7/drivers/pcmcia/ti113x.h 24402diff -urNp linux-2.6.32.8/drivers/pcmcia/ti113x.h linux-2.6.32.8/drivers/pcmcia/ti113x.h
24339--- linux-2.6.32.7/drivers/pcmcia/ti113x.h 2010-01-25 13:50:10.000000000 -0500 24403--- linux-2.6.32.8/drivers/pcmcia/ti113x.h 2010-02-09 07:57:19.000000000 -0500
24340+++ linux-2.6.32.7/drivers/pcmcia/ti113x.h 2010-01-25 17:39:40.573121845 -0500 24404+++ linux-2.6.32.8/drivers/pcmcia/ti113x.h 2010-02-10 15:06:24.087514816 -0500
24341@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl 24405@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
24342 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, 24406 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
24343 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), 24407 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
@@ -24347,9 +24411,9 @@ diff -urNp linux-2.6.32.7/drivers/pcmcia/ti113x.h linux-2.6.32.7/drivers/pcmcia/
24347 }; 24411 };
24348 24412
24349 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) 24413 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
24350diff -urNp linux-2.6.32.7/drivers/pcmcia/yenta_socket.c linux-2.6.32.7/drivers/pcmcia/yenta_socket.c 24414diff -urNp linux-2.6.32.8/drivers/pcmcia/yenta_socket.c linux-2.6.32.8/drivers/pcmcia/yenta_socket.c
24351--- linux-2.6.32.7/drivers/pcmcia/yenta_socket.c 2010-01-25 13:50:10.000000000 -0500 24415--- linux-2.6.32.8/drivers/pcmcia/yenta_socket.c 2010-02-09 07:57:19.000000000 -0500
24352+++ linux-2.6.32.7/drivers/pcmcia/yenta_socket.c 2010-01-25 17:39:40.573121845 -0500 24416+++ linux-2.6.32.8/drivers/pcmcia/yenta_socket.c 2010-02-10 15:06:24.087514816 -0500
24353@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table 24417@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
24354 24418
24355 /* match any cardbus bridge */ 24419 /* match any cardbus bridge */
@@ -24359,9 +24423,9 @@ diff -urNp linux-2.6.32.7/drivers/pcmcia/yenta_socket.c linux-2.6.32.7/drivers/p
24359 }; 24423 };
24360 MODULE_DEVICE_TABLE(pci, yenta_table); 24424 MODULE_DEVICE_TABLE(pci, yenta_table);
24361 24425
24362diff -urNp linux-2.6.32.7/drivers/platform/x86/acer-wmi.c linux-2.6.32.7/drivers/platform/x86/acer-wmi.c 24426diff -urNp linux-2.6.32.8/drivers/platform/x86/acer-wmi.c linux-2.6.32.8/drivers/platform/x86/acer-wmi.c
24363--- linux-2.6.32.7/drivers/platform/x86/acer-wmi.c 2010-01-25 13:50:10.000000000 -0500 24427--- linux-2.6.32.8/drivers/platform/x86/acer-wmi.c 2010-02-09 07:57:19.000000000 -0500
24364+++ linux-2.6.32.7/drivers/platform/x86/acer-wmi.c 2010-01-25 17:39:40.573121845 -0500 24428+++ linux-2.6.32.8/drivers/platform/x86/acer-wmi.c 2010-02-10 15:06:24.087514816 -0500
24365@@ -918,7 +918,7 @@ static int update_bl_status(struct backl 24429@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
24366 return 0; 24430 return 0;
24367 } 24431 }
@@ -24371,9 +24435,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/acer-wmi.c linux-2.6.32.7/drivers
24371 .get_brightness = read_brightness, 24435 .get_brightness = read_brightness,
24372 .update_status = update_bl_status, 24436 .update_status = update_bl_status,
24373 }; 24437 };
24374diff -urNp linux-2.6.32.7/drivers/platform/x86/asus_acpi.c linux-2.6.32.7/drivers/platform/x86/asus_acpi.c 24438diff -urNp linux-2.6.32.8/drivers/platform/x86/asus_acpi.c linux-2.6.32.8/drivers/platform/x86/asus_acpi.c
24375--- linux-2.6.32.7/drivers/platform/x86/asus_acpi.c 2010-01-25 13:50:10.000000000 -0500 24439--- linux-2.6.32.8/drivers/platform/x86/asus_acpi.c 2010-02-09 07:57:19.000000000 -0500
24376+++ linux-2.6.32.7/drivers/platform/x86/asus_acpi.c 2010-01-25 17:39:40.573121845 -0500 24440+++ linux-2.6.32.8/drivers/platform/x86/asus_acpi.c 2010-02-10 15:06:24.087514816 -0500
24377@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ 24441@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
24378 return 0; 24442 return 0;
24379 } 24443 }
@@ -24383,9 +24447,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/asus_acpi.c linux-2.6.32.7/driver
24383 .get_brightness = read_brightness, 24447 .get_brightness = read_brightness,
24384 .update_status = set_brightness_status, 24448 .update_status = set_brightness_status,
24385 }; 24449 };
24386diff -urNp linux-2.6.32.7/drivers/platform/x86/asus-laptop.c linux-2.6.32.7/drivers/platform/x86/asus-laptop.c 24450diff -urNp linux-2.6.32.8/drivers/platform/x86/asus-laptop.c linux-2.6.32.8/drivers/platform/x86/asus-laptop.c
24387--- linux-2.6.32.7/drivers/platform/x86/asus-laptop.c 2010-01-25 13:50:10.000000000 -0500 24451--- linux-2.6.32.8/drivers/platform/x86/asus-laptop.c 2010-02-09 07:57:19.000000000 -0500
24388+++ linux-2.6.32.7/drivers/platform/x86/asus-laptop.c 2010-01-25 17:39:40.574409071 -0500 24452+++ linux-2.6.32.8/drivers/platform/x86/asus-laptop.c 2010-02-10 15:06:24.090643109 -0500
24389@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac 24453@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
24390 */ 24454 */
24391 static int read_brightness(struct backlight_device *bd); 24455 static int read_brightness(struct backlight_device *bd);
@@ -24395,9 +24459,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/asus-laptop.c linux-2.6.32.7/driv
24395 .get_brightness = read_brightness, 24459 .get_brightness = read_brightness,
24396 .update_status = update_bl_status, 24460 .update_status = update_bl_status,
24397 }; 24461 };
24398diff -urNp linux-2.6.32.7/drivers/platform/x86/compal-laptop.c linux-2.6.32.7/drivers/platform/x86/compal-laptop.c 24462diff -urNp linux-2.6.32.8/drivers/platform/x86/compal-laptop.c linux-2.6.32.8/drivers/platform/x86/compal-laptop.c
24399--- linux-2.6.32.7/drivers/platform/x86/compal-laptop.c 2010-01-25 13:50:10.000000000 -0500 24463--- linux-2.6.32.8/drivers/platform/x86/compal-laptop.c 2010-02-09 07:57:19.000000000 -0500
24400+++ linux-2.6.32.7/drivers/platform/x86/compal-laptop.c 2010-01-25 17:39:40.574409071 -0500 24464+++ linux-2.6.32.8/drivers/platform/x86/compal-laptop.c 2010-02-10 15:06:24.090643109 -0500
24401@@ -163,7 +163,7 @@ static int bl_update_status(struct backl 24465@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
24402 return set_lcd_level(b->props.brightness); 24466 return set_lcd_level(b->props.brightness);
24403 } 24467 }
@@ -24407,9 +24471,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/compal-laptop.c linux-2.6.32.7/dr
24407 .get_brightness = bl_get_brightness, 24471 .get_brightness = bl_get_brightness,
24408 .update_status = bl_update_status, 24472 .update_status = bl_update_status,
24409 }; 24473 };
24410diff -urNp linux-2.6.32.7/drivers/platform/x86/dell-laptop.c linux-2.6.32.7/drivers/platform/x86/dell-laptop.c 24474diff -urNp linux-2.6.32.8/drivers/platform/x86/dell-laptop.c linux-2.6.32.8/drivers/platform/x86/dell-laptop.c
24411--- linux-2.6.32.7/drivers/platform/x86/dell-laptop.c 2010-01-25 13:50:10.000000000 -0500 24475--- linux-2.6.32.8/drivers/platform/x86/dell-laptop.c 2010-02-09 07:57:19.000000000 -0500
24412+++ linux-2.6.32.7/drivers/platform/x86/dell-laptop.c 2010-01-25 17:39:40.574409071 -0500 24476+++ linux-2.6.32.8/drivers/platform/x86/dell-laptop.c 2010-02-10 15:06:24.090643109 -0500
24413@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac 24477@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
24414 return buffer.output[1]; 24478 return buffer.output[1];
24415 } 24479 }
@@ -24419,9 +24483,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/dell-laptop.c linux-2.6.32.7/driv
24419 .get_brightness = dell_get_intensity, 24483 .get_brightness = dell_get_intensity,
24420 .update_status = dell_send_intensity, 24484 .update_status = dell_send_intensity,
24421 }; 24485 };
24422diff -urNp linux-2.6.32.7/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.7/drivers/platform/x86/eeepc-laptop.c 24486diff -urNp linux-2.6.32.8/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.8/drivers/platform/x86/eeepc-laptop.c
24423--- linux-2.6.32.7/drivers/platform/x86/eeepc-laptop.c 2010-01-25 13:50:10.000000000 -0500 24487--- linux-2.6.32.8/drivers/platform/x86/eeepc-laptop.c 2010-02-09 07:57:19.000000000 -0500
24424+++ linux-2.6.32.7/drivers/platform/x86/eeepc-laptop.c 2010-01-25 17:39:40.574409071 -0500 24488+++ linux-2.6.32.8/drivers/platform/x86/eeepc-laptop.c 2010-02-10 15:06:24.090643109 -0500
24425@@ -242,7 +242,7 @@ static struct device *eeepc_hwmon_device 24489@@ -242,7 +242,7 @@ static struct device *eeepc_hwmon_device
24426 */ 24490 */
24427 static int read_brightness(struct backlight_device *bd); 24491 static int read_brightness(struct backlight_device *bd);
@@ -24431,9 +24495,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.7/dri
24431 .get_brightness = read_brightness, 24495 .get_brightness = read_brightness,
24432 .update_status = update_bl_status, 24496 .update_status = update_bl_status,
24433 }; 24497 };
24434diff -urNp linux-2.6.32.7/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.7/drivers/platform/x86/fujitsu-laptop.c 24498diff -urNp linux-2.6.32.8/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.8/drivers/platform/x86/fujitsu-laptop.c
24435--- linux-2.6.32.7/drivers/platform/x86/fujitsu-laptop.c 2010-01-25 13:50:10.000000000 -0500 24499--- linux-2.6.32.8/drivers/platform/x86/fujitsu-laptop.c 2010-02-09 07:57:19.000000000 -0500
24436+++ linux-2.6.32.7/drivers/platform/x86/fujitsu-laptop.c 2010-01-25 17:39:40.575240739 -0500 24500+++ linux-2.6.32.8/drivers/platform/x86/fujitsu-laptop.c 2010-02-10 15:06:24.090643109 -0500
24437@@ -436,7 +436,7 @@ static int bl_update_status(struct backl 24501@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
24438 return ret; 24502 return ret;
24439 } 24503 }
@@ -24443,9 +24507,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.7/d
24443 .get_brightness = bl_get_brightness, 24507 .get_brightness = bl_get_brightness,
24444 .update_status = bl_update_status, 24508 .update_status = bl_update_status,
24445 }; 24509 };
24446diff -urNp linux-2.6.32.7/drivers/platform/x86/msi-laptop.c linux-2.6.32.7/drivers/platform/x86/msi-laptop.c 24510diff -urNp linux-2.6.32.8/drivers/platform/x86/msi-laptop.c linux-2.6.32.8/drivers/platform/x86/msi-laptop.c
24447--- linux-2.6.32.7/drivers/platform/x86/msi-laptop.c 2010-01-25 13:50:10.000000000 -0500 24511--- linux-2.6.32.8/drivers/platform/x86/msi-laptop.c 2010-02-09 07:57:19.000000000 -0500
24448+++ linux-2.6.32.7/drivers/platform/x86/msi-laptop.c 2010-01-25 17:39:40.575240739 -0500 24512+++ linux-2.6.32.8/drivers/platform/x86/msi-laptop.c 2010-02-10 15:06:24.090643109 -0500
24449@@ -161,7 +161,7 @@ static int bl_update_status(struct backl 24513@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
24450 return set_lcd_level(b->props.brightness); 24514 return set_lcd_level(b->props.brightness);
24451 } 24515 }
@@ -24455,9 +24519,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/msi-laptop.c linux-2.6.32.7/drive
24455 .get_brightness = bl_get_brightness, 24519 .get_brightness = bl_get_brightness,
24456 .update_status = bl_update_status, 24520 .update_status = bl_update_status,
24457 }; 24521 };
24458diff -urNp linux-2.6.32.7/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.7/drivers/platform/x86/panasonic-laptop.c 24522diff -urNp linux-2.6.32.8/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.8/drivers/platform/x86/panasonic-laptop.c
24459--- linux-2.6.32.7/drivers/platform/x86/panasonic-laptop.c 2010-01-25 13:50:10.000000000 -0500 24523--- linux-2.6.32.8/drivers/platform/x86/panasonic-laptop.c 2010-02-09 07:57:19.000000000 -0500
24460+++ linux-2.6.32.7/drivers/platform/x86/panasonic-laptop.c 2010-01-25 17:39:40.575240739 -0500 24524+++ linux-2.6.32.8/drivers/platform/x86/panasonic-laptop.c 2010-02-10 15:06:24.090643109 -0500
24461@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh 24525@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
24462 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); 24526 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
24463 } 24527 }
@@ -24467,9 +24531,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.7
24467 .get_brightness = bl_get, 24531 .get_brightness = bl_get,
24468 .update_status = bl_set_status, 24532 .update_status = bl_set_status,
24469 }; 24533 };
24470diff -urNp linux-2.6.32.7/drivers/platform/x86/sony-laptop.c linux-2.6.32.7/drivers/platform/x86/sony-laptop.c 24534diff -urNp linux-2.6.32.8/drivers/platform/x86/sony-laptop.c linux-2.6.32.8/drivers/platform/x86/sony-laptop.c
24471--- linux-2.6.32.7/drivers/platform/x86/sony-laptop.c 2010-01-25 13:50:10.000000000 -0500 24535--- linux-2.6.32.8/drivers/platform/x86/sony-laptop.c 2010-02-09 07:57:19.000000000 -0500
24472+++ linux-2.6.32.7/drivers/platform/x86/sony-laptop.c 2010-01-25 17:39:40.576099323 -0500 24536+++ linux-2.6.32.8/drivers/platform/x86/sony-laptop.c 2010-02-10 15:06:24.090643109 -0500
24473@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness 24537@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
24474 } 24538 }
24475 24539
@@ -24479,9 +24543,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/sony-laptop.c linux-2.6.32.7/driv
24479 .update_status = sony_backlight_update_status, 24543 .update_status = sony_backlight_update_status,
24480 .get_brightness = sony_backlight_get_brightness, 24544 .get_brightness = sony_backlight_get_brightness,
24481 }; 24545 };
24482diff -urNp linux-2.6.32.7/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.7/drivers/platform/x86/thinkpad_acpi.c 24546diff -urNp linux-2.6.32.8/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.8/drivers/platform/x86/thinkpad_acpi.c
24483--- linux-2.6.32.7/drivers/platform/x86/thinkpad_acpi.c 2010-01-25 13:50:10.000000000 -0500 24547--- linux-2.6.32.8/drivers/platform/x86/thinkpad_acpi.c 2010-02-09 07:57:19.000000000 -0500
24484+++ linux-2.6.32.7/drivers/platform/x86/thinkpad_acpi.c 2010-01-25 17:39:40.577261614 -0500 24548+++ linux-2.6.32.8/drivers/platform/x86/thinkpad_acpi.c 2010-02-10 15:06:24.090643109 -0500
24485@@ -6073,7 +6073,7 @@ static int brightness_get(struct backlig 24549@@ -6073,7 +6073,7 @@ static int brightness_get(struct backlig
24486 return status & TP_EC_BACKLIGHT_LVLMSK; 24550 return status & TP_EC_BACKLIGHT_LVLMSK;
24487 } 24551 }
@@ -24491,9 +24555,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.7/dr
24491 .get_brightness = brightness_get, 24555 .get_brightness = brightness_get,
24492 .update_status = brightness_update_status, 24556 .update_status = brightness_update_status,
24493 }; 24557 };
24494diff -urNp linux-2.6.32.7/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.7/drivers/platform/x86/toshiba_acpi.c 24558diff -urNp linux-2.6.32.8/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.8/drivers/platform/x86/toshiba_acpi.c
24495--- linux-2.6.32.7/drivers/platform/x86/toshiba_acpi.c 2010-01-25 13:50:10.000000000 -0500 24559--- linux-2.6.32.8/drivers/platform/x86/toshiba_acpi.c 2010-02-09 07:57:19.000000000 -0500
24496+++ linux-2.6.32.7/drivers/platform/x86/toshiba_acpi.c 2010-01-25 17:39:40.577261614 -0500 24560+++ linux-2.6.32.8/drivers/platform/x86/toshiba_acpi.c 2010-02-10 15:06:24.093999287 -0500
24497@@ -671,7 +671,7 @@ static acpi_status remove_device(void) 24561@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
24498 return AE_OK; 24562 return AE_OK;
24499 } 24563 }
@@ -24503,9 +24567,9 @@ diff -urNp linux-2.6.32.7/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.7/dri
24503 .get_brightness = get_lcd, 24567 .get_brightness = get_lcd,
24504 .update_status = set_lcd_status, 24568 .update_status = set_lcd_status,
24505 }; 24569 };
24506diff -urNp linux-2.6.32.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.7/drivers/pnp/pnpbios/bioscalls.c 24570diff -urNp linux-2.6.32.8/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.8/drivers/pnp/pnpbios/bioscalls.c
24507--- linux-2.6.32.7/drivers/pnp/pnpbios/bioscalls.c 2010-01-25 13:50:10.000000000 -0500 24571--- linux-2.6.32.8/drivers/pnp/pnpbios/bioscalls.c 2010-02-09 07:57:19.000000000 -0500
24508+++ linux-2.6.32.7/drivers/pnp/pnpbios/bioscalls.c 2010-01-25 17:39:40.577261614 -0500 24572+++ linux-2.6.32.8/drivers/pnp/pnpbios/bioscalls.c 2010-02-10 15:06:24.093999287 -0500
24509@@ -60,7 +60,7 @@ do { \ 24573@@ -60,7 +60,7 @@ do { \
24510 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ 24574 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
24511 } while(0) 24575 } while(0)
@@ -24562,9 +24626,9 @@ diff -urNp linux-2.6.32.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.7/drivers
24562+ 24626+
24563+ pax_close_kernel(); 24627+ pax_close_kernel();
24564 } 24628 }
24565diff -urNp linux-2.6.32.7/drivers/pnp/quirks.c linux-2.6.32.7/drivers/pnp/quirks.c 24629diff -urNp linux-2.6.32.8/drivers/pnp/quirks.c linux-2.6.32.8/drivers/pnp/quirks.c
24566--- linux-2.6.32.7/drivers/pnp/quirks.c 2010-01-25 13:50:10.000000000 -0500 24630--- linux-2.6.32.8/drivers/pnp/quirks.c 2010-02-09 07:57:19.000000000 -0500
24567+++ linux-2.6.32.7/drivers/pnp/quirks.c 2010-01-25 17:39:40.578276325 -0500 24631+++ linux-2.6.32.8/drivers/pnp/quirks.c 2010-02-10 15:06:24.093999287 -0500
24568@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { 24632@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
24569 /* PnP resources that might overlap PCI BARs */ 24633 /* PnP resources that might overlap PCI BARs */
24570 {"PNP0c01", quirk_system_pci_resources}, 24634 {"PNP0c01", quirk_system_pci_resources},
@@ -24574,9 +24638,9 @@ diff -urNp linux-2.6.32.7/drivers/pnp/quirks.c linux-2.6.32.7/drivers/pnp/quirks
24574 }; 24638 };
24575 24639
24576 void pnp_fixup_device(struct pnp_dev *dev) 24640 void pnp_fixup_device(struct pnp_dev *dev)
24577diff -urNp linux-2.6.32.7/drivers/pnp/resource.c linux-2.6.32.7/drivers/pnp/resource.c 24641diff -urNp linux-2.6.32.8/drivers/pnp/resource.c linux-2.6.32.8/drivers/pnp/resource.c
24578--- linux-2.6.32.7/drivers/pnp/resource.c 2010-01-25 13:50:10.000000000 -0500 24642--- linux-2.6.32.8/drivers/pnp/resource.c 2010-02-09 07:57:19.000000000 -0500
24579+++ linux-2.6.32.7/drivers/pnp/resource.c 2010-01-25 17:39:40.578276325 -0500 24643+++ linux-2.6.32.8/drivers/pnp/resource.c 2010-02-10 15:06:24.093999287 -0500
24580@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s 24644@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
24581 return 1; 24645 return 1;
24582 24646
@@ -24595,9 +24659,9 @@ diff -urNp linux-2.6.32.7/drivers/pnp/resource.c linux-2.6.32.7/drivers/pnp/reso
24595 return 0; 24659 return 0;
24596 24660
24597 /* check if the resource is reserved */ 24661 /* check if the resource is reserved */
24598diff -urNp linux-2.6.32.7/drivers/s390/cio/qdio_perf.c linux-2.6.32.7/drivers/s390/cio/qdio_perf.c 24662diff -urNp linux-2.6.32.8/drivers/s390/cio/qdio_perf.c linux-2.6.32.8/drivers/s390/cio/qdio_perf.c
24599--- linux-2.6.32.7/drivers/s390/cio/qdio_perf.c 2010-01-25 13:50:10.000000000 -0500 24663--- linux-2.6.32.8/drivers/s390/cio/qdio_perf.c 2010-02-09 07:57:19.000000000 -0500
24600+++ linux-2.6.32.7/drivers/s390/cio/qdio_perf.c 2010-01-25 17:39:40.578276325 -0500 24664+++ linux-2.6.32.8/drivers/s390/cio/qdio_perf.c 2010-02-10 15:06:24.093999287 -0500
24601@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ 24665@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
24602 static int qdio_perf_proc_show(struct seq_file *m, void *v) 24666 static int qdio_perf_proc_show(struct seq_file *m, void *v)
24603 { 24667 {
@@ -24673,9 +24737,9 @@ diff -urNp linux-2.6.32.7/drivers/s390/cio/qdio_perf.c linux-2.6.32.7/drivers/s3
24673 seq_printf(m, "\n"); 24737 seq_printf(m, "\n");
24674 return 0; 24738 return 0;
24675 } 24739 }
24676diff -urNp linux-2.6.32.7/drivers/s390/cio/qdio_perf.h linux-2.6.32.7/drivers/s390/cio/qdio_perf.h 24740diff -urNp linux-2.6.32.8/drivers/s390/cio/qdio_perf.h linux-2.6.32.8/drivers/s390/cio/qdio_perf.h
24677--- linux-2.6.32.7/drivers/s390/cio/qdio_perf.h 2010-01-25 13:50:10.000000000 -0500 24741--- linux-2.6.32.8/drivers/s390/cio/qdio_perf.h 2010-02-09 07:57:19.000000000 -0500
24678+++ linux-2.6.32.7/drivers/s390/cio/qdio_perf.h 2010-01-25 17:39:40.578276325 -0500 24742+++ linux-2.6.32.8/drivers/s390/cio/qdio_perf.h 2010-02-10 15:06:24.093999287 -0500
24679@@ -13,46 +13,46 @@ 24743@@ -13,46 +13,46 @@
24680 24744
24681 struct qdio_perf_stats { 24745 struct qdio_perf_stats {
@@ -24748,9 +24812,9 @@ diff -urNp linux-2.6.32.7/drivers/s390/cio/qdio_perf.h linux-2.6.32.7/drivers/s3
24748 } 24812 }
24749 24813
24750 int qdio_setup_perf_stats(void); 24814 int qdio_setup_perf_stats(void);
24751diff -urNp linux-2.6.32.7/drivers/scsi/ipr.c linux-2.6.32.7/drivers/scsi/ipr.c 24815diff -urNp linux-2.6.32.8/drivers/scsi/ipr.c linux-2.6.32.8/drivers/scsi/ipr.c
24752--- linux-2.6.32.7/drivers/scsi/ipr.c 2010-01-25 13:50:10.000000000 -0500 24816--- linux-2.6.32.8/drivers/scsi/ipr.c 2010-02-09 07:57:19.000000000 -0500
24753+++ linux-2.6.32.7/drivers/scsi/ipr.c 2010-01-25 17:39:40.633265236 -0500 24817+++ linux-2.6.32.8/drivers/scsi/ipr.c 2010-02-10 15:06:24.093999287 -0500
24754@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q 24818@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
24755 return true; 24819 return true;
24756 } 24820 }
@@ -24760,9 +24824,9 @@ diff -urNp linux-2.6.32.7/drivers/scsi/ipr.c linux-2.6.32.7/drivers/scsi/ipr.c
24760 .phy_reset = ipr_ata_phy_reset, 24824 .phy_reset = ipr_ata_phy_reset,
24761 .hardreset = ipr_sata_reset, 24825 .hardreset = ipr_sata_reset,
24762 .post_internal_cmd = ipr_ata_post_internal, 24826 .post_internal_cmd = ipr_ata_post_internal,
24763diff -urNp linux-2.6.32.7/drivers/scsi/libfc/fc_exch.c linux-2.6.32.7/drivers/scsi/libfc/fc_exch.c 24827diff -urNp linux-2.6.32.8/drivers/scsi/libfc/fc_exch.c linux-2.6.32.8/drivers/scsi/libfc/fc_exch.c
24764--- linux-2.6.32.7/drivers/scsi/libfc/fc_exch.c 2010-01-25 13:50:10.000000000 -0500 24828--- linux-2.6.32.8/drivers/scsi/libfc/fc_exch.c 2010-02-09 07:57:19.000000000 -0500
24765+++ linux-2.6.32.7/drivers/scsi/libfc/fc_exch.c 2010-01-25 17:39:40.659100572 -0500 24829+++ linux-2.6.32.8/drivers/scsi/libfc/fc_exch.c 2010-02-10 15:06:24.093999287 -0500
24766@@ -86,12 +86,12 @@ struct fc_exch_mgr { 24830@@ -86,12 +86,12 @@ struct fc_exch_mgr {
24767 * all together if not used XXX 24831 * all together if not used XXX
24768 */ 24832 */
@@ -24884,9 +24948,9 @@ diff -urNp linux-2.6.32.7/drivers/scsi/libfc/fc_exch.c linux-2.6.32.7/drivers/sc
24884 24948
24885 fc_frame_free(fp); 24949 fc_frame_free(fp);
24886 } 24950 }
24887diff -urNp linux-2.6.32.7/drivers/scsi/libsas/sas_ata.c linux-2.6.32.7/drivers/scsi/libsas/sas_ata.c 24951diff -urNp linux-2.6.32.8/drivers/scsi/libsas/sas_ata.c linux-2.6.32.8/drivers/scsi/libsas/sas_ata.c
24888--- linux-2.6.32.7/drivers/scsi/libsas/sas_ata.c 2010-01-25 13:50:10.000000000 -0500 24952--- linux-2.6.32.8/drivers/scsi/libsas/sas_ata.c 2010-02-09 07:57:19.000000000 -0500
24889+++ linux-2.6.32.7/drivers/scsi/libsas/sas_ata.c 2010-01-25 17:39:40.660412281 -0500 24953+++ linux-2.6.32.8/drivers/scsi/libsas/sas_ata.c 2010-02-10 15:06:24.093999287 -0500
24890@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l 24954@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
24891 } 24955 }
24892 } 24956 }
@@ -24896,9 +24960,9 @@ diff -urNp linux-2.6.32.7/drivers/scsi/libsas/sas_ata.c linux-2.6.32.7/drivers/s
24896 .phy_reset = sas_ata_phy_reset, 24960 .phy_reset = sas_ata_phy_reset,
24897 .post_internal_cmd = sas_ata_post_internal, 24961 .post_internal_cmd = sas_ata_post_internal,
24898 .qc_prep = ata_noop_qc_prep, 24962 .qc_prep = ata_noop_qc_prep,
24899diff -urNp linux-2.6.32.7/drivers/scsi/scsi_logging.h linux-2.6.32.7/drivers/scsi/scsi_logging.h 24963diff -urNp linux-2.6.32.8/drivers/scsi/scsi_logging.h linux-2.6.32.8/drivers/scsi/scsi_logging.h
24900--- linux-2.6.32.7/drivers/scsi/scsi_logging.h 2010-01-25 13:50:10.000000000 -0500 24964--- linux-2.6.32.8/drivers/scsi/scsi_logging.h 2010-02-09 07:57:19.000000000 -0500
24901+++ linux-2.6.32.7/drivers/scsi/scsi_logging.h 2010-01-25 17:39:40.671315332 -0500 24965+++ linux-2.6.32.8/drivers/scsi/scsi_logging.h 2010-02-10 15:06:24.093999287 -0500
24902@@ -51,7 +51,7 @@ do { \ 24966@@ -51,7 +51,7 @@ do { \
24903 } while (0); \ 24967 } while (0); \
24904 } while (0) 24968 } while (0)
@@ -24908,9 +24972,9 @@ diff -urNp linux-2.6.32.7/drivers/scsi/scsi_logging.h linux-2.6.32.7/drivers/scs
24908 #endif /* CONFIG_SCSI_LOGGING */ 24972 #endif /* CONFIG_SCSI_LOGGING */
24909 24973
24910 /* 24974 /*
24911diff -urNp linux-2.6.32.7/drivers/scsi/sg.c linux-2.6.32.7/drivers/scsi/sg.c 24975diff -urNp linux-2.6.32.8/drivers/scsi/sg.c linux-2.6.32.8/drivers/scsi/sg.c
24912--- linux-2.6.32.7/drivers/scsi/sg.c 2010-01-25 13:50:10.000000000 -0500 24976--- linux-2.6.32.8/drivers/scsi/sg.c 2010-02-09 07:57:19.000000000 -0500
24913+++ linux-2.6.32.7/drivers/scsi/sg.c 2010-01-25 17:39:40.690253312 -0500 24977+++ linux-2.6.32.8/drivers/scsi/sg.c 2010-02-10 15:06:24.093999287 -0500
24914@@ -2292,7 +2292,7 @@ struct sg_proc_leaf { 24978@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
24915 const struct file_operations * fops; 24979 const struct file_operations * fops;
24916 }; 24980 };
@@ -24929,9 +24993,9 @@ diff -urNp linux-2.6.32.7/drivers/scsi/sg.c linux-2.6.32.7/drivers/scsi/sg.c
24929 24993
24930 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); 24994 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
24931 if (!sg_proc_sgp) 24995 if (!sg_proc_sgp)
24932diff -urNp linux-2.6.32.7/drivers/serial/8250_pci.c linux-2.6.32.7/drivers/serial/8250_pci.c 24996diff -urNp linux-2.6.32.8/drivers/serial/8250_pci.c linux-2.6.32.8/drivers/serial/8250_pci.c
24933--- linux-2.6.32.7/drivers/serial/8250_pci.c 2010-01-25 13:50:10.000000000 -0500 24997--- linux-2.6.32.8/drivers/serial/8250_pci.c 2010-02-09 07:57:19.000000000 -0500
24934+++ linux-2.6.32.7/drivers/serial/8250_pci.c 2010-01-25 17:39:40.691334412 -0500 24998+++ linux-2.6.32.8/drivers/serial/8250_pci.c 2010-02-10 15:06:24.093999287 -0500
24935@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t 24999@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
24936 PCI_ANY_ID, PCI_ANY_ID, 25000 PCI_ANY_ID, PCI_ANY_ID,
24937 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 25001 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
@@ -24941,9 +25005,9 @@ diff -urNp linux-2.6.32.7/drivers/serial/8250_pci.c linux-2.6.32.7/drivers/seria
24941 }; 25005 };
24942 25006
24943 static struct pci_driver serial_pci_driver = { 25007 static struct pci_driver serial_pci_driver = {
24944diff -urNp linux-2.6.32.7/drivers/serial/kgdboc.c linux-2.6.32.7/drivers/serial/kgdboc.c 25008diff -urNp linux-2.6.32.8/drivers/serial/kgdboc.c linux-2.6.32.8/drivers/serial/kgdboc.c
24945--- linux-2.6.32.7/drivers/serial/kgdboc.c 2010-01-25 13:50:10.000000000 -0500 25009--- linux-2.6.32.8/drivers/serial/kgdboc.c 2010-02-09 07:57:19.000000000 -0500
24946+++ linux-2.6.32.7/drivers/serial/kgdboc.c 2010-01-25 17:39:40.691334412 -0500 25010+++ linux-2.6.32.8/drivers/serial/kgdboc.c 2010-02-10 15:06:24.093999287 -0500
24947@@ -18,7 +18,7 @@ 25011@@ -18,7 +18,7 @@
24948 25012
24949 #define MAX_CONFIG_LEN 40 25013 #define MAX_CONFIG_LEN 40
@@ -24962,9 +25026,9 @@ diff -urNp linux-2.6.32.7/drivers/serial/kgdboc.c linux-2.6.32.7/drivers/serial/
24962 .name = "kgdboc", 25026 .name = "kgdboc",
24963 .read_char = kgdboc_get_char, 25027 .read_char = kgdboc_get_char,
24964 .write_char = kgdboc_put_char, 25028 .write_char = kgdboc_put_char,
24965diff -urNp linux-2.6.32.7/drivers/staging/android/binder.c linux-2.6.32.7/drivers/staging/android/binder.c 25029diff -urNp linux-2.6.32.8/drivers/staging/android/binder.c linux-2.6.32.8/drivers/staging/android/binder.c
24966--- linux-2.6.32.7/drivers/staging/android/binder.c 2010-01-25 13:50:10.000000000 -0500 25030--- linux-2.6.32.8/drivers/staging/android/binder.c 2010-02-09 07:57:19.000000000 -0500
24967+++ linux-2.6.32.7/drivers/staging/android/binder.c 2010-01-25 17:39:40.720250683 -0500 25031+++ linux-2.6.32.8/drivers/staging/android/binder.c 2010-02-10 15:06:24.098105539 -0500
24968@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a 25032@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
24969 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); 25033 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
24970 } 25034 }
@@ -24974,9 +25038,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/android/binder.c linux-2.6.32.7/driver
24974 .open = binder_vma_open, 25038 .open = binder_vma_open,
24975 .close = binder_vma_close, 25039 .close = binder_vma_close,
24976 }; 25040 };
24977diff -urNp linux-2.6.32.7/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.7/drivers/staging/b3dfg/b3dfg.c 25041diff -urNp linux-2.6.32.8/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.8/drivers/staging/b3dfg/b3dfg.c
24978--- linux-2.6.32.7/drivers/staging/b3dfg/b3dfg.c 2010-01-25 13:50:10.000000000 -0500 25042--- linux-2.6.32.8/drivers/staging/b3dfg/b3dfg.c 2010-02-09 07:57:19.000000000 -0500
24979+++ linux-2.6.32.7/drivers/staging/b3dfg/b3dfg.c 2010-01-25 17:39:40.721352667 -0500 25043+++ linux-2.6.32.8/drivers/staging/b3dfg/b3dfg.c 2010-02-10 15:06:24.098105539 -0500
24980@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are 25044@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
24981 return VM_FAULT_NOPAGE; 25045 return VM_FAULT_NOPAGE;
24982 } 25046 }
@@ -24995,9 +25059,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.7/drivers/s
24995 .owner = THIS_MODULE, 25059 .owner = THIS_MODULE,
24996 .open = b3dfg_open, 25060 .open = b3dfg_open,
24997 .release = b3dfg_release, 25061 .release = b3dfg_release,
24998diff -urNp linux-2.6.32.7/drivers/staging/comedi/comedi_fops.c linux-2.6.32.7/drivers/staging/comedi/comedi_fops.c 25062diff -urNp linux-2.6.32.8/drivers/staging/comedi/comedi_fops.c linux-2.6.32.8/drivers/staging/comedi/comedi_fops.c
24999--- linux-2.6.32.7/drivers/staging/comedi/comedi_fops.c 2010-01-25 13:50:10.000000000 -0500 25063--- linux-2.6.32.8/drivers/staging/comedi/comedi_fops.c 2010-02-09 07:57:19.000000000 -0500
25000+++ linux-2.6.32.7/drivers/staging/comedi/comedi_fops.c 2010-01-25 17:39:40.721352667 -0500 25064+++ linux-2.6.32.8/drivers/staging/comedi/comedi_fops.c 2010-02-10 15:06:24.098105539 -0500
25001@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct 25065@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
25002 mutex_unlock(&dev->mutex); 25066 mutex_unlock(&dev->mutex);
25003 } 25067 }
@@ -25007,9 +25071,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/comedi/comedi_fops.c linux-2.6.32.7/dr
25007 .close = comedi_unmap, 25071 .close = comedi_unmap,
25008 }; 25072 };
25009 25073
25010diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.7/drivers/staging/dream/qdsp5/adsp_driver.c 25074diff -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
25011--- linux-2.6.32.7/drivers/staging/dream/qdsp5/adsp_driver.c 2010-01-25 13:50:10.000000000 -0500 25075--- linux-2.6.32.8/drivers/staging/dream/qdsp5/adsp_driver.c 2010-02-09 07:57:19.000000000 -0500
25012+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/adsp_driver.c 2010-01-25 17:39:40.721352667 -0500 25076+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/adsp_driver.c 2010-02-10 15:06:24.098105539 -0500
25013@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi 25077@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
25014 static dev_t adsp_devno; 25078 static dev_t adsp_devno;
25015 static struct class *adsp_class; 25079 static struct class *adsp_class;
@@ -25019,9 +25083,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32
25019 .owner = THIS_MODULE, 25083 .owner = THIS_MODULE,
25020 .open = adsp_open, 25084 .open = adsp_open,
25021 .unlocked_ioctl = adsp_ioctl, 25085 .unlocked_ioctl = adsp_ioctl,
25022diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_aac.c 25086diff -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
25023--- linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_aac.c 2010-01-25 13:50:10.000000000 -0500 25087--- linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_aac.c 2010-02-09 07:57:19.000000000 -0500
25024+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_aac.c 2010-01-25 17:39:40.722422728 -0500 25088+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_aac.c 2010-02-10 15:06:24.098105539 -0500
25025@@ -1022,7 +1022,7 @@ done: 25089@@ -1022,7 +1022,7 @@ done:
25026 return rc; 25090 return rc;
25027 } 25091 }
@@ -25031,9 +25095,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.7
25031 .owner = THIS_MODULE, 25095 .owner = THIS_MODULE,
25032 .open = audio_open, 25096 .open = audio_open,
25033 .release = audio_release, 25097 .release = audio_release,
25034diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_amrnb.c 25098diff -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
25035--- linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-01-25 13:50:10.000000000 -0500 25099--- linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-02-09 07:57:19.000000000 -0500
25036+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-01-25 17:39:40.722422728 -0500 25100+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-02-10 15:06:24.098105539 -0500
25037@@ -833,7 +833,7 @@ done: 25101@@ -833,7 +833,7 @@ done:
25038 return rc; 25102 return rc;
25039 } 25103 }
@@ -25043,9 +25107,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32
25043 .owner = THIS_MODULE, 25107 .owner = THIS_MODULE,
25044 .open = audamrnb_open, 25108 .open = audamrnb_open,
25045 .release = audamrnb_release, 25109 .release = audamrnb_release,
25046diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_evrc.c 25110diff -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
25047--- linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_evrc.c 2010-01-25 13:50:10.000000000 -0500 25111--- linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_evrc.c 2010-02-09 07:57:19.000000000 -0500
25048+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_evrc.c 2010-01-25 17:39:40.723151138 -0500 25112+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_evrc.c 2010-02-10 15:06:24.098105539 -0500
25049@@ -805,7 +805,7 @@ dma_fail: 25113@@ -805,7 +805,7 @@ dma_fail:
25050 return rc; 25114 return rc;
25051 } 25115 }
@@ -25055,9 +25119,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.
25055 .owner = THIS_MODULE, 25119 .owner = THIS_MODULE,
25056 .open = audevrc_open, 25120 .open = audevrc_open,
25057 .release = audevrc_release, 25121 .release = audevrc_release,
25058diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_in.c 25122diff -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
25059--- linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_in.c 2010-01-25 13:50:10.000000000 -0500 25123--- linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_in.c 2010-02-09 07:57:19.000000000 -0500
25060+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_in.c 2010-01-25 17:39:40.723151138 -0500 25124+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_in.c 2010-02-10 15:06:24.098105539 -0500
25061@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino 25125@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
25062 return 0; 25126 return 0;
25063 } 25127 }
@@ -25076,9 +25140,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.7/
25076 .owner = THIS_MODULE, 25140 .owner = THIS_MODULE,
25077 .open = audpre_open, 25141 .open = audpre_open,
25078 .unlocked_ioctl = audpre_ioctl, 25142 .unlocked_ioctl = audpre_ioctl,
25079diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_mp3.c 25143diff -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
25080--- linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_mp3.c 2010-01-25 13:50:10.000000000 -0500 25144--- linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_mp3.c 2010-02-09 07:57:19.000000000 -0500
25081+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_mp3.c 2010-01-25 17:39:40.723151138 -0500 25145+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_mp3.c 2010-02-10 15:06:24.098105539 -0500
25082@@ -941,7 +941,7 @@ done: 25146@@ -941,7 +941,7 @@ done:
25083 return rc; 25147 return rc;
25084 } 25148 }
@@ -25088,9 +25152,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.7
25088 .owner = THIS_MODULE, 25152 .owner = THIS_MODULE,
25089 .open = audio_open, 25153 .open = audio_open,
25090 .release = audio_release, 25154 .release = audio_release,
25091diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_out.c 25155diff -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
25092--- linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_out.c 2010-01-25 13:50:10.000000000 -0500 25156--- linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_out.c 2010-02-09 07:57:19.000000000 -0500
25093+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_out.c 2010-01-25 17:39:40.723151138 -0500 25157+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_out.c 2010-02-10 15:06:24.098105539 -0500
25094@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod 25158@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
25095 return 0; 25159 return 0;
25096 } 25160 }
@@ -25109,9 +25173,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.7
25109 .owner = THIS_MODULE, 25173 .owner = THIS_MODULE,
25110 .open = audpp_open, 25174 .open = audpp_open,
25111 .unlocked_ioctl = audpp_ioctl, 25175 .unlocked_ioctl = audpp_ioctl,
25112diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_qcelp.c 25176diff -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
25113--- linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-01-25 13:50:10.000000000 -0500 25177--- linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-02-09 07:57:19.000000000 -0500
25114+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-01-25 17:39:40.723151138 -0500 25178+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-02-10 15:06:24.098105539 -0500
25115@@ -816,7 +816,7 @@ err: 25179@@ -816,7 +816,7 @@ err:
25116 return rc; 25180 return rc;
25117 } 25181 }
@@ -25121,9 +25185,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32
25121 .owner = THIS_MODULE, 25185 .owner = THIS_MODULE,
25122 .open = audqcelp_open, 25186 .open = audqcelp_open,
25123 .release = audqcelp_release, 25187 .release = audqcelp_release,
25124diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.7/drivers/staging/dream/qdsp5/snd.c 25188diff -urNp linux-2.6.32.8/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.8/drivers/staging/dream/qdsp5/snd.c
25125--- linux-2.6.32.7/drivers/staging/dream/qdsp5/snd.c 2010-01-25 13:50:10.000000000 -0500 25189--- linux-2.6.32.8/drivers/staging/dream/qdsp5/snd.c 2010-02-09 07:57:19.000000000 -0500
25126+++ linux-2.6.32.7/drivers/staging/dream/qdsp5/snd.c 2010-01-25 17:39:40.723151138 -0500 25190+++ linux-2.6.32.8/drivers/staging/dream/qdsp5/snd.c 2010-02-10 15:06:24.098105539 -0500
25127@@ -242,7 +242,7 @@ err: 25191@@ -242,7 +242,7 @@ err:
25128 return rc; 25192 return rc;
25129 } 25193 }
@@ -25133,9 +25197,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.7/drive
25133 .owner = THIS_MODULE, 25197 .owner = THIS_MODULE,
25134 .open = snd_open, 25198 .open = snd_open,
25135 .release = snd_release, 25199 .release = snd_release,
25136diff -urNp linux-2.6.32.7/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.7/drivers/staging/dream/smd/smd_qmi.c 25200diff -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
25137--- linux-2.6.32.7/drivers/staging/dream/smd/smd_qmi.c 2010-01-25 13:50:10.000000000 -0500 25201--- linux-2.6.32.8/drivers/staging/dream/smd/smd_qmi.c 2010-02-09 07:57:19.000000000 -0500
25138+++ linux-2.6.32.7/drivers/staging/dream/smd/smd_qmi.c 2010-01-25 17:39:40.724416092 -0500 25202+++ linux-2.6.32.8/drivers/staging/dream/smd/smd_qmi.c 2010-02-10 15:06:24.098105539 -0500
25139@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, 25203@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
25140 return 0; 25204 return 0;
25141 } 25205 }
@@ -25145,9 +25209,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.7/dri
25145 .owner = THIS_MODULE, 25209 .owner = THIS_MODULE,
25146 .read = qmi_read, 25210 .read = qmi_read,
25147 .write = qmi_write, 25211 .write = qmi_write,
25148diff -urNp linux-2.6.32.7/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.7/drivers/staging/dream/smd/smd_rpcrouter_device.c 25212diff -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
25149--- linux-2.6.32.7/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-01-25 13:50:10.000000000 -0500 25213--- linux-2.6.32.8/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-02-09 07:57:19.000000000 -0500
25150+++ linux-2.6.32.7/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-01-25 17:39:40.724416092 -0500 25214+++ linux-2.6.32.8/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-02-10 15:06:24.098105539 -0500
25151@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file 25215@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
25152 return rc; 25216 return rc;
25153 } 25217 }
@@ -25166,9 +25230,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dream/smd/smd_rpcrouter_device.c linux
25166 .owner = THIS_MODULE, 25230 .owner = THIS_MODULE,
25167 .open = rpcrouter_open, 25231 .open = rpcrouter_open,
25168 .release = rpcrouter_release, 25232 .release = rpcrouter_release,
25169diff -urNp linux-2.6.32.7/drivers/staging/dst/dcore.c linux-2.6.32.7/drivers/staging/dst/dcore.c 25233diff -urNp linux-2.6.32.8/drivers/staging/dst/dcore.c linux-2.6.32.8/drivers/staging/dst/dcore.c
25170--- linux-2.6.32.7/drivers/staging/dst/dcore.c 2010-01-25 13:50:10.000000000 -0500 25234--- linux-2.6.32.8/drivers/staging/dst/dcore.c 2010-02-09 07:57:19.000000000 -0500
25171+++ linux-2.6.32.7/drivers/staging/dst/dcore.c 2010-01-25 17:39:40.724416092 -0500 25235+++ linux-2.6.32.8/drivers/staging/dst/dcore.c 2010-02-10 15:06:24.098105539 -0500
25172@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi 25236@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
25173 return 0; 25237 return 0;
25174 } 25238 }
@@ -25187,9 +25251,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dst/dcore.c linux-2.6.32.7/drivers/sta
25187 snprintf(n->name, sizeof(n->name), "%s", ctl->name); 25251 snprintf(n->name, sizeof(n->name), "%s", ctl->name);
25188 25252
25189 err = dst_node_sysfs_init(n); 25253 err = dst_node_sysfs_init(n);
25190diff -urNp linux-2.6.32.7/drivers/staging/dst/trans.c linux-2.6.32.7/drivers/staging/dst/trans.c 25254diff -urNp linux-2.6.32.8/drivers/staging/dst/trans.c linux-2.6.32.8/drivers/staging/dst/trans.c
25191--- linux-2.6.32.7/drivers/staging/dst/trans.c 2010-01-25 13:50:10.000000000 -0500 25255--- linux-2.6.32.8/drivers/staging/dst/trans.c 2010-02-09 07:57:19.000000000 -0500
25192+++ linux-2.6.32.7/drivers/staging/dst/trans.c 2010-01-25 17:39:40.725262561 -0500 25256+++ linux-2.6.32.8/drivers/staging/dst/trans.c 2010-02-10 15:06:24.098105539 -0500
25193@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, 25257@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
25194 t->error = 0; 25258 t->error = 0;
25195 t->retries = 0; 25259 t->retries = 0;
@@ -25199,9 +25263,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/dst/trans.c linux-2.6.32.7/drivers/sta
25199 25263
25200 t->enc = bio_data_dir(bio); 25264 t->enc = bio_data_dir(bio);
25201 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); 25265 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
25202diff -urNp linux-2.6.32.7/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.7/drivers/staging/go7007/go7007-v4l2.c 25266diff -urNp linux-2.6.32.8/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.8/drivers/staging/go7007/go7007-v4l2.c
25203--- linux-2.6.32.7/drivers/staging/go7007/go7007-v4l2.c 2010-01-25 13:50:10.000000000 -0500 25267--- linux-2.6.32.8/drivers/staging/go7007/go7007-v4l2.c 2010-02-09 07:57:19.000000000 -0500
25204+++ linux-2.6.32.7/drivers/staging/go7007/go7007-v4l2.c 2010-01-25 17:39:40.725262561 -0500 25268+++ linux-2.6.32.8/drivers/staging/go7007/go7007-v4l2.c 2010-02-10 15:06:24.098105539 -0500
25205@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are 25269@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
25206 return 0; 25270 return 0;
25207 } 25271 }
@@ -25211,9 +25275,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.7/dr
25211 .open = go7007_vm_open, 25275 .open = go7007_vm_open,
25212 .close = go7007_vm_close, 25276 .close = go7007_vm_close,
25213 .fault = go7007_vm_fault, 25277 .fault = go7007_vm_fault,
25214diff -urNp linux-2.6.32.7/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.7/drivers/staging/hv/blkvsc_drv.c 25278diff -urNp linux-2.6.32.8/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.8/drivers/staging/hv/blkvsc_drv.c
25215--- linux-2.6.32.7/drivers/staging/hv/blkvsc_drv.c 2010-01-25 13:50:10.000000000 -0500 25279--- linux-2.6.32.8/drivers/staging/hv/blkvsc_drv.c 2010-02-09 07:57:19.000000000 -0500
25216+++ linux-2.6.32.7/drivers/staging/hv/blkvsc_drv.c 2010-01-25 17:39:40.725262561 -0500 25280+++ linux-2.6.32.8/drivers/staging/hv/blkvsc_drv.c 2010-02-10 15:06:24.098105539 -0500
25217@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV 25281@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
25218 /* The one and only one */ 25282 /* The one and only one */
25219 static struct blkvsc_driver_context g_blkvsc_drv; 25283 static struct blkvsc_driver_context g_blkvsc_drv;
@@ -25223,9 +25287,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.7/drivers
25223 .owner = THIS_MODULE, 25287 .owner = THIS_MODULE,
25224 .open = blkvsc_open, 25288 .open = blkvsc_open,
25225 .release = blkvsc_release, 25289 .release = blkvsc_release,
25226diff -urNp linux-2.6.32.7/drivers/staging/panel/panel.c linux-2.6.32.7/drivers/staging/panel/panel.c 25290diff -urNp linux-2.6.32.8/drivers/staging/panel/panel.c linux-2.6.32.8/drivers/staging/panel/panel.c
25227--- linux-2.6.32.7/drivers/staging/panel/panel.c 2010-01-25 13:50:10.000000000 -0500 25291--- linux-2.6.32.8/drivers/staging/panel/panel.c 2010-02-09 07:57:19.000000000 -0500
25228+++ linux-2.6.32.7/drivers/staging/panel/panel.c 2010-01-25 17:39:40.726187847 -0500 25292+++ linux-2.6.32.8/drivers/staging/panel/panel.c 2010-02-10 15:06:24.098105539 -0500
25229@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino 25293@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
25230 return 0; 25294 return 0;
25231 } 25295 }
@@ -25244,9 +25308,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/panel/panel.c linux-2.6.32.7/drivers/s
25244 .read = keypad_read, /* read */ 25308 .read = keypad_read, /* read */
25245 .open = keypad_open, /* open */ 25309 .open = keypad_open, /* open */
25246 .release = keypad_release, /* close */ 25310 .release = keypad_release, /* close */
25247diff -urNp linux-2.6.32.7/drivers/staging/phison/phison.c linux-2.6.32.7/drivers/staging/phison/phison.c 25311diff -urNp linux-2.6.32.8/drivers/staging/phison/phison.c linux-2.6.32.8/drivers/staging/phison/phison.c
25248--- linux-2.6.32.7/drivers/staging/phison/phison.c 2010-01-25 13:50:10.000000000 -0500 25312--- linux-2.6.32.8/drivers/staging/phison/phison.c 2010-02-09 07:57:19.000000000 -0500
25249+++ linux-2.6.32.7/drivers/staging/phison/phison.c 2010-01-25 17:39:40.726187847 -0500 25313+++ linux-2.6.32.8/drivers/staging/phison/phison.c 2010-02-10 15:06:24.103497854 -0500
25250@@ -43,7 +43,7 @@ static struct scsi_host_template phison_ 25314@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
25251 ATA_BMDMA_SHT(DRV_NAME), 25315 ATA_BMDMA_SHT(DRV_NAME),
25252 }; 25316 };
@@ -25256,9 +25320,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/phison/phison.c linux-2.6.32.7/drivers
25256 .inherits = &ata_bmdma_port_ops, 25320 .inherits = &ata_bmdma_port_ops,
25257 .prereset = phison_pre_reset, 25321 .prereset = phison_pre_reset,
25258 }; 25322 };
25259diff -urNp linux-2.6.32.7/drivers/staging/poch/poch.c linux-2.6.32.7/drivers/staging/poch/poch.c 25323diff -urNp linux-2.6.32.8/drivers/staging/poch/poch.c linux-2.6.32.8/drivers/staging/poch/poch.c
25260--- linux-2.6.32.7/drivers/staging/poch/poch.c 2010-01-25 13:50:10.000000000 -0500 25324--- linux-2.6.32.8/drivers/staging/poch/poch.c 2010-02-09 07:57:19.000000000 -0500
25261+++ linux-2.6.32.7/drivers/staging/poch/poch.c 2010-01-25 17:39:40.726187847 -0500 25325+++ linux-2.6.32.8/drivers/staging/poch/poch.c 2010-02-10 15:06:24.103497854 -0500
25262@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod 25326@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
25263 return 0; 25327 return 0;
25264 } 25328 }
@@ -25268,9 +25332,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/poch/poch.c linux-2.6.32.7/drivers/sta
25268 .owner = THIS_MODULE, 25332 .owner = THIS_MODULE,
25269 .open = poch_open, 25333 .open = poch_open,
25270 .release = poch_release, 25334 .release = poch_release,
25271diff -urNp linux-2.6.32.7/drivers/staging/pohmelfs/inode.c linux-2.6.32.7/drivers/staging/pohmelfs/inode.c 25335diff -urNp linux-2.6.32.8/drivers/staging/pohmelfs/inode.c linux-2.6.32.8/drivers/staging/pohmelfs/inode.c
25272--- linux-2.6.32.7/drivers/staging/pohmelfs/inode.c 2010-01-25 13:50:10.000000000 -0500 25336--- linux-2.6.32.8/drivers/staging/pohmelfs/inode.c 2010-02-09 07:57:19.000000000 -0500
25273+++ linux-2.6.32.7/drivers/staging/pohmelfs/inode.c 2010-01-25 17:39:40.728423487 -0500 25337+++ linux-2.6.32.8/drivers/staging/pohmelfs/inode.c 2010-02-10 15:06:24.103497854 -0500
25274@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su 25338@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
25275 mutex_init(&psb->mcache_lock); 25339 mutex_init(&psb->mcache_lock);
25276 psb->mcache_root = RB_ROOT; 25340 psb->mcache_root = RB_ROOT;
@@ -25280,9 +25344,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/pohmelfs/inode.c linux-2.6.32.7/driver
25280 25344
25281 psb->trans_max_pages = 100; 25345 psb->trans_max_pages = 100;
25282 25346
25283diff -urNp linux-2.6.32.7/drivers/staging/pohmelfs/mcache.c linux-2.6.32.7/drivers/staging/pohmelfs/mcache.c 25347diff -urNp linux-2.6.32.8/drivers/staging/pohmelfs/mcache.c linux-2.6.32.8/drivers/staging/pohmelfs/mcache.c
25284--- linux-2.6.32.7/drivers/staging/pohmelfs/mcache.c 2010-01-25 13:50:10.000000000 -0500 25348--- linux-2.6.32.8/drivers/staging/pohmelfs/mcache.c 2010-02-09 07:57:19.000000000 -0500
25285+++ linux-2.6.32.7/drivers/staging/pohmelfs/mcache.c 2010-01-25 17:39:40.728423487 -0500 25349+++ linux-2.6.32.8/drivers/staging/pohmelfs/mcache.c 2010-02-10 15:06:24.103497854 -0500
25286@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ 25350@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
25287 m->data = data; 25351 m->data = data;
25288 m->start = start; 25352 m->start = start;
@@ -25292,9 +25356,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/pohmelfs/mcache.c linux-2.6.32.7/drive
25292 25356
25293 mutex_lock(&psb->mcache_lock); 25357 mutex_lock(&psb->mcache_lock);
25294 err = pohmelfs_mcache_insert(psb, m); 25358 err = pohmelfs_mcache_insert(psb, m);
25295diff -urNp linux-2.6.32.7/drivers/staging/pohmelfs/netfs.h linux-2.6.32.7/drivers/staging/pohmelfs/netfs.h 25359diff -urNp linux-2.6.32.8/drivers/staging/pohmelfs/netfs.h linux-2.6.32.8/drivers/staging/pohmelfs/netfs.h
25296--- linux-2.6.32.7/drivers/staging/pohmelfs/netfs.h 2010-01-25 13:50:10.000000000 -0500 25360--- linux-2.6.32.8/drivers/staging/pohmelfs/netfs.h 2010-02-09 07:57:19.000000000 -0500
25297+++ linux-2.6.32.7/drivers/staging/pohmelfs/netfs.h 2010-01-25 17:39:40.729274682 -0500 25361+++ linux-2.6.32.8/drivers/staging/pohmelfs/netfs.h 2010-02-10 15:06:24.103497854 -0500
25298@@ -570,7 +570,7 @@ struct pohmelfs_config; 25362@@ -570,7 +570,7 @@ struct pohmelfs_config;
25299 struct pohmelfs_sb { 25363 struct pohmelfs_sb {
25300 struct rb_root mcache_root; 25364 struct rb_root mcache_root;
@@ -25304,9 +25368,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/pohmelfs/netfs.h linux-2.6.32.7/driver
25304 unsigned long mcache_timeout; 25368 unsigned long mcache_timeout;
25305 25369
25306 unsigned int idx; 25370 unsigned int idx;
25307diff -urNp linux-2.6.32.7/drivers/staging/sep/sep_driver.c linux-2.6.32.7/drivers/staging/sep/sep_driver.c 25371diff -urNp linux-2.6.32.8/drivers/staging/sep/sep_driver.c linux-2.6.32.8/drivers/staging/sep/sep_driver.c
25308--- linux-2.6.32.7/drivers/staging/sep/sep_driver.c 2010-01-25 13:50:10.000000000 -0500 25372--- linux-2.6.32.8/drivers/staging/sep/sep_driver.c 2010-02-09 07:57:19.000000000 -0500
25309+++ linux-2.6.32.7/drivers/staging/sep/sep_driver.c 2010-01-25 17:39:40.741285423 -0500 25373+++ linux-2.6.32.8/drivers/staging/sep/sep_driver.c 2010-02-10 15:06:24.103497854 -0500
25310@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver 25374@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
25311 static dev_t sep_devno; 25375 static dev_t sep_devno;
25312 25376
@@ -25316,9 +25380,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/sep/sep_driver.c linux-2.6.32.7/driver
25316 .owner = THIS_MODULE, 25380 .owner = THIS_MODULE,
25317 .ioctl = sep_ioctl, 25381 .ioctl = sep_ioctl,
25318 .poll = sep_poll, 25382 .poll = sep_poll,
25319diff -urNp linux-2.6.32.7/drivers/staging/vme/devices/vme_user.c linux-2.6.32.7/drivers/staging/vme/devices/vme_user.c 25383diff -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
25320--- linux-2.6.32.7/drivers/staging/vme/devices/vme_user.c 2010-01-25 13:50:10.000000000 -0500 25384--- linux-2.6.32.8/drivers/staging/vme/devices/vme_user.c 2010-02-09 07:57:19.000000000 -0500
25321+++ linux-2.6.32.7/drivers/staging/vme/devices/vme_user.c 2010-01-25 17:39:40.741285423 -0500 25385+++ linux-2.6.32.8/drivers/staging/vme/devices/vme_user.c 2010-02-10 15:06:24.103497854 -0500
25322@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * 25386@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
25323 static int __init vme_user_probe(struct device *, int, int); 25387 static int __init vme_user_probe(struct device *, int, int);
25324 static int __exit vme_user_remove(struct device *, int, int); 25388 static int __exit vme_user_remove(struct device *, int, int);
@@ -25328,9 +25392,9 @@ diff -urNp linux-2.6.32.7/drivers/staging/vme/devices/vme_user.c linux-2.6.32.7/
25328 .open = vme_user_open, 25392 .open = vme_user_open,
25329 .release = vme_user_release, 25393 .release = vme_user_release,
25330 .read = vme_user_read, 25394 .read = vme_user_read,
25331diff -urNp linux-2.6.32.7/drivers/uio/uio.c linux-2.6.32.7/drivers/uio/uio.c 25395diff -urNp linux-2.6.32.8/drivers/uio/uio.c linux-2.6.32.8/drivers/uio/uio.c
25332--- linux-2.6.32.7/drivers/uio/uio.c 2010-01-25 13:50:10.000000000 -0500 25396--- linux-2.6.32.8/drivers/uio/uio.c 2010-02-09 07:57:19.000000000 -0500
25333+++ linux-2.6.32.7/drivers/uio/uio.c 2010-01-25 17:39:40.741285423 -0500 25397+++ linux-2.6.32.8/drivers/uio/uio.c 2010-02-10 15:06:24.103497854 -0500
25334@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj 25398@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
25335 return entry->show(mem, buf); 25399 return entry->show(mem, buf);
25336 } 25400 }
@@ -25349,9 +25413,9 @@ diff -urNp linux-2.6.32.7/drivers/uio/uio.c linux-2.6.32.7/drivers/uio/uio.c
25349 .show = portio_type_show, 25413 .show = portio_type_show,
25350 }; 25414 };
25351 25415
25352diff -urNp linux-2.6.32.7/drivers/usb/atm/usbatm.c linux-2.6.32.7/drivers/usb/atm/usbatm.c 25416diff -urNp linux-2.6.32.8/drivers/usb/atm/usbatm.c linux-2.6.32.8/drivers/usb/atm/usbatm.c
25353--- linux-2.6.32.7/drivers/usb/atm/usbatm.c 2010-01-25 13:50:10.000000000 -0500 25417--- linux-2.6.32.8/drivers/usb/atm/usbatm.c 2010-02-09 07:57:19.000000000 -0500
25354+++ linux-2.6.32.7/drivers/usb/atm/usbatm.c 2010-01-25 17:39:40.762117232 -0500 25418+++ linux-2.6.32.8/drivers/usb/atm/usbatm.c 2010-02-10 15:06:24.103497854 -0500
25355@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru 25419@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
25356 if (printk_ratelimit()) 25420 if (printk_ratelimit())
25357 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", 25421 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -25431,9 +25495,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/atm/usbatm.c linux-2.6.32.7/drivers/usb/at
25431 25495
25432 if (!left--) { 25496 if (!left--) {
25433 if (instance->disconnected) 25497 if (instance->disconnected)
25434diff -urNp linux-2.6.32.7/drivers/usb/class/cdc-acm.c linux-2.6.32.7/drivers/usb/class/cdc-acm.c 25498diff -urNp linux-2.6.32.8/drivers/usb/class/cdc-acm.c linux-2.6.32.8/drivers/usb/class/cdc-acm.c
25435--- linux-2.6.32.7/drivers/usb/class/cdc-acm.c 2010-01-25 13:50:10.000000000 -0500 25499--- linux-2.6.32.8/drivers/usb/class/cdc-acm.c 2010-02-09 07:57:19.000000000 -0500
25436+++ linux-2.6.32.7/drivers/usb/class/cdc-acm.c 2010-01-25 17:39:40.768399993 -0500 25500+++ linux-2.6.32.8/drivers/usb/class/cdc-acm.c 2010-02-10 15:06:24.103497854 -0500
25437@@ -1534,7 +1534,7 @@ static struct usb_device_id acm_ids[] = 25501@@ -1534,7 +1534,7 @@ static struct usb_device_id acm_ids[] =
25438 USB_CDC_ACM_PROTO_AT_CDMA) }, 25502 USB_CDC_ACM_PROTO_AT_CDMA) },
25439 25503
@@ -25443,9 +25507,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/class/cdc-acm.c linux-2.6.32.7/drivers/usb
25443 }; 25507 };
25444 25508
25445 MODULE_DEVICE_TABLE(usb, acm_ids); 25509 MODULE_DEVICE_TABLE(usb, acm_ids);
25446diff -urNp linux-2.6.32.7/drivers/usb/class/usblp.c linux-2.6.32.7/drivers/usb/class/usblp.c 25510diff -urNp linux-2.6.32.8/drivers/usb/class/usblp.c linux-2.6.32.8/drivers/usb/class/usblp.c
25447--- linux-2.6.32.7/drivers/usb/class/usblp.c 2010-01-25 13:50:10.000000000 -0500 25511--- linux-2.6.32.8/drivers/usb/class/usblp.c 2010-02-09 07:57:19.000000000 -0500
25448+++ linux-2.6.32.7/drivers/usb/class/usblp.c 2010-01-25 17:39:40.770313910 -0500 25512+++ linux-2.6.32.8/drivers/usb/class/usblp.c 2010-02-10 15:06:24.103497854 -0500
25449@@ -228,7 +228,7 @@ static const struct quirk_printer_struct 25513@@ -228,7 +228,7 @@ static const struct quirk_printer_struct
25450 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ 25514 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
25451 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ 25515 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
@@ -25464,9 +25528,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/class/usblp.c linux-2.6.32.7/drivers/usb/c
25464 }; 25528 };
25465 25529
25466 MODULE_DEVICE_TABLE (usb, usblp_ids); 25530 MODULE_DEVICE_TABLE (usb, usblp_ids);
25467diff -urNp linux-2.6.32.7/drivers/usb/core/hcd.c linux-2.6.32.7/drivers/usb/core/hcd.c 25531diff -urNp linux-2.6.32.8/drivers/usb/core/hcd.c linux-2.6.32.8/drivers/usb/core/hcd.c
25468--- linux-2.6.32.7/drivers/usb/core/hcd.c 2010-01-25 13:50:10.000000000 -0500 25532--- linux-2.6.32.8/drivers/usb/core/hcd.c 2010-02-09 07:57:19.000000000 -0500
25469+++ linux-2.6.32.7/drivers/usb/core/hcd.c 2010-01-25 17:39:40.788423758 -0500 25533+++ linux-2.6.32.8/drivers/usb/core/hcd.c 2010-02-10 15:06:24.107083783 -0500
25470@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd 25534@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
25471 25535
25472 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 25536 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -25485,9 +25549,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/core/hcd.c linux-2.6.32.7/drivers/usb/core
25485 { 25549 {
25486 25550
25487 if (mon_ops) 25551 if (mon_ops)
25488diff -urNp linux-2.6.32.7/drivers/usb/core/hcd.h linux-2.6.32.7/drivers/usb/core/hcd.h 25552diff -urNp linux-2.6.32.8/drivers/usb/core/hcd.h linux-2.6.32.8/drivers/usb/core/hcd.h
25489--- linux-2.6.32.7/drivers/usb/core/hcd.h 2010-01-25 13:50:10.000000000 -0500 25553--- linux-2.6.32.8/drivers/usb/core/hcd.h 2010-02-09 07:57:19.000000000 -0500
25490+++ linux-2.6.32.7/drivers/usb/core/hcd.h 2010-01-25 17:39:40.789414516 -0500 25554+++ linux-2.6.32.8/drivers/usb/core/hcd.h 2010-02-10 15:06:24.107083783 -0500
25491@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { 25555@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
25492 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 25556 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
25493 25557
@@ -25515,9 +25579,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/core/hcd.h linux-2.6.32.7/drivers/usb/core
25515 void usb_mon_deregister(void); 25579 void usb_mon_deregister(void);
25516 25580
25517 #else 25581 #else
25518diff -urNp linux-2.6.32.7/drivers/usb/core/hub.c linux-2.6.32.7/drivers/usb/core/hub.c 25582diff -urNp linux-2.6.32.8/drivers/usb/core/hub.c linux-2.6.32.8/drivers/usb/core/hub.c
25519--- linux-2.6.32.7/drivers/usb/core/hub.c 2010-01-25 13:50:10.000000000 -0500 25583--- linux-2.6.32.8/drivers/usb/core/hub.c 2010-02-09 07:57:19.000000000 -0500
25520+++ linux-2.6.32.7/drivers/usb/core/hub.c 2010-01-25 17:39:40.793419392 -0500 25584+++ linux-2.6.32.8/drivers/usb/core/hub.c 2010-02-10 15:06:24.107083783 -0500
25521@@ -3385,7 +3385,7 @@ static struct usb_device_id hub_id_table 25585@@ -3385,7 +3385,7 @@ static struct usb_device_id hub_id_table
25522 .bDeviceClass = USB_CLASS_HUB}, 25586 .bDeviceClass = USB_CLASS_HUB},
25523 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, 25587 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
@@ -25527,9 +25591,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/core/hub.c linux-2.6.32.7/drivers/usb/core
25527 }; 25591 };
25528 25592
25529 MODULE_DEVICE_TABLE (usb, hub_id_table); 25593 MODULE_DEVICE_TABLE (usb, hub_id_table);
25530diff -urNp linux-2.6.32.7/drivers/usb/core/message.c linux-2.6.32.7/drivers/usb/core/message.c 25594diff -urNp linux-2.6.32.8/drivers/usb/core/message.c linux-2.6.32.8/drivers/usb/core/message.c
25531--- linux-2.6.32.7/drivers/usb/core/message.c 2010-01-25 13:50:10.000000000 -0500 25595--- linux-2.6.32.8/drivers/usb/core/message.c 2010-02-09 07:57:19.000000000 -0500
25532+++ linux-2.6.32.7/drivers/usb/core/message.c 2010-01-25 17:54:24.735173702 -0500 25596+++ linux-2.6.32.8/drivers/usb/core/message.c 2010-02-10 15:06:24.107083783 -0500
25533@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device 25597@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
25534 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); 25598 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
25535 if (buf) { 25599 if (buf) {
@@ -25541,9 +25605,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/core/message.c linux-2.6.32.7/drivers/usb/
25541 if (!smallbuf) 25605 if (!smallbuf)
25542 return buf; 25606 return buf;
25543 memcpy(smallbuf, buf, len); 25607 memcpy(smallbuf, buf, len);
25544diff -urNp linux-2.6.32.7/drivers/usb/host/ehci-pci.c linux-2.6.32.7/drivers/usb/host/ehci-pci.c 25608diff -urNp linux-2.6.32.8/drivers/usb/host/ehci-pci.c linux-2.6.32.8/drivers/usb/host/ehci-pci.c
25545--- linux-2.6.32.7/drivers/usb/host/ehci-pci.c 2010-01-25 13:50:10.000000000 -0500 25609--- linux-2.6.32.8/drivers/usb/host/ehci-pci.c 2010-02-09 07:57:19.000000000 -0500
25546+++ linux-2.6.32.7/drivers/usb/host/ehci-pci.c 2010-01-25 17:39:40.795294801 -0500 25610+++ linux-2.6.32.8/drivers/usb/host/ehci-pci.c 2010-02-10 15:06:24.107083783 -0500
25547@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id 25611@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
25548 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), 25612 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
25549 .driver_data = (unsigned long) &ehci_pci_hc_driver, 25613 .driver_data = (unsigned long) &ehci_pci_hc_driver,
@@ -25553,9 +25617,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/host/ehci-pci.c linux-2.6.32.7/drivers/usb
25553 }; 25617 };
25554 MODULE_DEVICE_TABLE(pci, pci_ids); 25618 MODULE_DEVICE_TABLE(pci, pci_ids);
25555 25619
25556diff -urNp linux-2.6.32.7/drivers/usb/host/uhci-hcd.c linux-2.6.32.7/drivers/usb/host/uhci-hcd.c 25620diff -urNp linux-2.6.32.8/drivers/usb/host/uhci-hcd.c linux-2.6.32.8/drivers/usb/host/uhci-hcd.c
25557--- linux-2.6.32.7/drivers/usb/host/uhci-hcd.c 2010-01-25 13:50:10.000000000 -0500 25621--- linux-2.6.32.8/drivers/usb/host/uhci-hcd.c 2010-02-09 07:57:19.000000000 -0500
25558+++ linux-2.6.32.7/drivers/usb/host/uhci-hcd.c 2010-01-25 17:39:40.806137594 -0500 25622+++ linux-2.6.32.8/drivers/usb/host/uhci-hcd.c 2010-02-10 15:06:24.107083783 -0500
25559@@ -940,7 +940,7 @@ static const struct pci_device_id uhci_p 25623@@ -940,7 +940,7 @@ static const struct pci_device_id uhci_p
25560 /* handle any USB UHCI controller */ 25624 /* handle any USB UHCI controller */
25561 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), 25625 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -25565,9 +25629,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/host/uhci-hcd.c linux-2.6.32.7/drivers/usb
25565 }; 25629 };
25566 25630
25567 MODULE_DEVICE_TABLE(pci, uhci_pci_ids); 25631 MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
25568diff -urNp linux-2.6.32.7/drivers/usb/misc/appledisplay.c linux-2.6.32.7/drivers/usb/misc/appledisplay.c 25632diff -urNp linux-2.6.32.8/drivers/usb/misc/appledisplay.c linux-2.6.32.8/drivers/usb/misc/appledisplay.c
25569--- linux-2.6.32.7/drivers/usb/misc/appledisplay.c 2010-01-25 13:50:10.000000000 -0500 25633--- linux-2.6.32.8/drivers/usb/misc/appledisplay.c 2010-02-09 07:57:19.000000000 -0500
25570+++ linux-2.6.32.7/drivers/usb/misc/appledisplay.c 2010-01-25 17:39:40.812417415 -0500 25634+++ linux-2.6.32.8/drivers/usb/misc/appledisplay.c 2010-02-10 15:06:24.107083783 -0500
25571@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes 25635@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
25572 return pdata->msgdata[1]; 25636 return pdata->msgdata[1];
25573 } 25637 }
@@ -25577,9 +25641,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/misc/appledisplay.c linux-2.6.32.7/drivers
25577 .get_brightness = appledisplay_bl_get_brightness, 25641 .get_brightness = appledisplay_bl_get_brightness,
25578 .update_status = appledisplay_bl_update_status, 25642 .update_status = appledisplay_bl_update_status,
25579 }; 25643 };
25580diff -urNp linux-2.6.32.7/drivers/usb/mon/mon_main.c linux-2.6.32.7/drivers/usb/mon/mon_main.c 25644diff -urNp linux-2.6.32.8/drivers/usb/mon/mon_main.c linux-2.6.32.8/drivers/usb/mon/mon_main.c
25581--- linux-2.6.32.7/drivers/usb/mon/mon_main.c 2010-01-25 13:50:10.000000000 -0500 25645--- linux-2.6.32.8/drivers/usb/mon/mon_main.c 2010-02-09 07:57:19.000000000 -0500
25582+++ linux-2.6.32.7/drivers/usb/mon/mon_main.c 2010-01-25 17:39:40.813096797 -0500 25646+++ linux-2.6.32.8/drivers/usb/mon/mon_main.c 2010-02-10 15:06:24.107083783 -0500
25583@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { 25647@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
25584 /* 25648 /*
25585 * Ops 25649 * Ops
@@ -25589,9 +25653,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/mon/mon_main.c linux-2.6.32.7/drivers/usb/
25589 .urb_submit = mon_submit, 25653 .urb_submit = mon_submit,
25590 .urb_submit_error = mon_submit_error, 25654 .urb_submit_error = mon_submit_error,
25591 .urb_complete = mon_complete, 25655 .urb_complete = mon_complete,
25592diff -urNp linux-2.6.32.7/drivers/usb/storage/debug.h linux-2.6.32.7/drivers/usb/storage/debug.h 25656diff -urNp linux-2.6.32.8/drivers/usb/storage/debug.h linux-2.6.32.8/drivers/usb/storage/debug.h
25593--- linux-2.6.32.7/drivers/usb/storage/debug.h 2010-01-25 13:50:10.000000000 -0500 25657--- linux-2.6.32.8/drivers/usb/storage/debug.h 2010-02-09 07:57:19.000000000 -0500
25594+++ linux-2.6.32.7/drivers/usb/storage/debug.h 2010-01-25 17:39:40.821350825 -0500 25658+++ linux-2.6.32.8/drivers/usb/storage/debug.h 2010-02-10 15:06:24.107083783 -0500
25595@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char 25659@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
25596 #define US_DEBUGPX(x...) printk( x ) 25660 #define US_DEBUGPX(x...) printk( x )
25597 #define US_DEBUG(x) x 25661 #define US_DEBUG(x) x
@@ -25605,9 +25669,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/storage/debug.h linux-2.6.32.7/drivers/usb
25605 #endif 25669 #endif
25606 25670
25607 #endif 25671 #endif
25608diff -urNp linux-2.6.32.7/drivers/usb/storage/usb.c linux-2.6.32.7/drivers/usb/storage/usb.c 25672diff -urNp linux-2.6.32.8/drivers/usb/storage/usb.c linux-2.6.32.8/drivers/usb/storage/usb.c
25609--- linux-2.6.32.7/drivers/usb/storage/usb.c 2010-01-25 13:50:10.000000000 -0500 25673--- linux-2.6.32.8/drivers/usb/storage/usb.c 2010-02-09 07:57:19.000000000 -0500
25610+++ linux-2.6.32.7/drivers/usb/storage/usb.c 2010-01-25 17:39:40.827952779 -0500 25674+++ linux-2.6.32.8/drivers/usb/storage/usb.c 2010-02-10 15:06:24.107083783 -0500
25611@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l 25675@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
25612 25676
25613 static struct us_unusual_dev us_unusual_dev_list[] = { 25677 static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -25617,9 +25681,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/storage/usb.c linux-2.6.32.7/drivers/usb/s
25617 }; 25681 };
25618 25682
25619 #undef UNUSUAL_DEV 25683 #undef UNUSUAL_DEV
25620diff -urNp linux-2.6.32.7/drivers/usb/storage/usual-tables.c linux-2.6.32.7/drivers/usb/storage/usual-tables.c 25684diff -urNp linux-2.6.32.8/drivers/usb/storage/usual-tables.c linux-2.6.32.8/drivers/usb/storage/usual-tables.c
25621--- linux-2.6.32.7/drivers/usb/storage/usual-tables.c 2010-01-25 13:50:10.000000000 -0500 25685--- linux-2.6.32.8/drivers/usb/storage/usual-tables.c 2010-02-09 07:57:19.000000000 -0500
25622+++ linux-2.6.32.7/drivers/usb/storage/usual-tables.c 2010-01-25 17:39:40.828430890 -0500 25686+++ linux-2.6.32.8/drivers/usb/storage/usual-tables.c 2010-02-10 15:06:24.107083783 -0500
25623@@ -48,7 +48,7 @@ 25687@@ -48,7 +48,7 @@
25624 25688
25625 struct usb_device_id usb_storage_usb_ids[] = { 25689 struct usb_device_id usb_storage_usb_ids[] = {
@@ -25629,9 +25693,9 @@ diff -urNp linux-2.6.32.7/drivers/usb/storage/usual-tables.c linux-2.6.32.7/driv
25629 }; 25693 };
25630 EXPORT_SYMBOL_GPL(usb_storage_usb_ids); 25694 EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
25631 25695
25632diff -urNp linux-2.6.32.7/drivers/uwb/wlp/messages.c linux-2.6.32.7/drivers/uwb/wlp/messages.c 25696diff -urNp linux-2.6.32.8/drivers/uwb/wlp/messages.c linux-2.6.32.8/drivers/uwb/wlp/messages.c
25633--- linux-2.6.32.7/drivers/uwb/wlp/messages.c 2010-01-25 13:50:10.000000000 -0500 25697--- linux-2.6.32.8/drivers/uwb/wlp/messages.c 2010-02-09 07:57:19.000000000 -0500
25634+++ linux-2.6.32.7/drivers/uwb/wlp/messages.c 2010-01-25 17:39:40.828430890 -0500 25698+++ linux-2.6.32.8/drivers/uwb/wlp/messages.c 2010-02-10 15:06:24.107083783 -0500
25635@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct 25699@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
25636 size_t len = skb->len; 25700 size_t len = skb->len;
25637 size_t used; 25701 size_t used;
@@ -25641,9 +25705,9 @@ diff -urNp linux-2.6.32.7/drivers/uwb/wlp/messages.c linux-2.6.32.7/drivers/uwb/
25641 enum wlp_assc_error assc_err; 25705 enum wlp_assc_error assc_err;
25642 char enonce_buf[WLP_WSS_NONCE_STRSIZE]; 25706 char enonce_buf[WLP_WSS_NONCE_STRSIZE];
25643 char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; 25707 char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
25644diff -urNp linux-2.6.32.7/drivers/uwb/wlp/sysfs.c linux-2.6.32.7/drivers/uwb/wlp/sysfs.c 25708diff -urNp linux-2.6.32.8/drivers/uwb/wlp/sysfs.c linux-2.6.32.8/drivers/uwb/wlp/sysfs.c
25645--- linux-2.6.32.7/drivers/uwb/wlp/sysfs.c 2010-01-25 13:50:10.000000000 -0500 25709--- linux-2.6.32.8/drivers/uwb/wlp/sysfs.c 2010-02-09 07:57:19.000000000 -0500
25646+++ linux-2.6.32.7/drivers/uwb/wlp/sysfs.c 2010-01-25 17:39:40.828430890 -0500 25710+++ linux-2.6.32.8/drivers/uwb/wlp/sysfs.c 2010-02-10 15:06:24.110001061 -0500
25647@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec 25711@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
25648 return ret; 25712 return ret;
25649 } 25713 }
@@ -25654,9 +25718,9 @@ diff -urNp linux-2.6.32.7/drivers/uwb/wlp/sysfs.c linux-2.6.32.7/drivers/uwb/wlp
25654 .show = wlp_wss_attr_show, 25718 .show = wlp_wss_attr_show,
25655 .store = wlp_wss_attr_store, 25719 .store = wlp_wss_attr_store,
25656 }; 25720 };
25657diff -urNp linux-2.6.32.7/drivers/video/atmel_lcdfb.c linux-2.6.32.7/drivers/video/atmel_lcdfb.c 25721diff -urNp linux-2.6.32.8/drivers/video/atmel_lcdfb.c linux-2.6.32.8/drivers/video/atmel_lcdfb.c
25658--- linux-2.6.32.7/drivers/video/atmel_lcdfb.c 2010-01-25 13:50:10.000000000 -0500 25722--- linux-2.6.32.8/drivers/video/atmel_lcdfb.c 2010-02-09 07:57:19.000000000 -0500
25659+++ linux-2.6.32.7/drivers/video/atmel_lcdfb.c 2010-01-25 17:39:40.829417445 -0500 25723+++ linux-2.6.32.8/drivers/video/atmel_lcdfb.c 2010-02-10 15:06:24.110001061 -0500
25660@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc 25724@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
25661 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); 25725 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
25662 } 25726 }
@@ -25666,9 +25730,9 @@ diff -urNp linux-2.6.32.7/drivers/video/atmel_lcdfb.c linux-2.6.32.7/drivers/vid
25666 .update_status = atmel_bl_update_status, 25730 .update_status = atmel_bl_update_status,
25667 .get_brightness = atmel_bl_get_brightness, 25731 .get_brightness = atmel_bl_get_brightness,
25668 }; 25732 };
25669diff -urNp linux-2.6.32.7/drivers/video/aty/aty128fb.c linux-2.6.32.7/drivers/video/aty/aty128fb.c 25733diff -urNp linux-2.6.32.8/drivers/video/aty/aty128fb.c linux-2.6.32.8/drivers/video/aty/aty128fb.c
25670--- linux-2.6.32.7/drivers/video/aty/aty128fb.c 2010-01-25 13:50:10.000000000 -0500 25734--- linux-2.6.32.8/drivers/video/aty/aty128fb.c 2010-02-09 07:57:19.000000000 -0500
25671+++ linux-2.6.32.7/drivers/video/aty/aty128fb.c 2010-01-25 17:39:40.829417445 -0500 25735+++ linux-2.6.32.8/drivers/video/aty/aty128fb.c 2010-02-10 15:06:24.110001061 -0500
25672@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru 25736@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
25673 return bd->props.brightness; 25737 return bd->props.brightness;
25674 } 25738 }
@@ -25678,9 +25742,9 @@ diff -urNp linux-2.6.32.7/drivers/video/aty/aty128fb.c linux-2.6.32.7/drivers/vi
25678 .get_brightness = aty128_bl_get_brightness, 25742 .get_brightness = aty128_bl_get_brightness,
25679 .update_status = aty128_bl_update_status, 25743 .update_status = aty128_bl_update_status,
25680 }; 25744 };
25681diff -urNp linux-2.6.32.7/drivers/video/aty/atyfb_base.c linux-2.6.32.7/drivers/video/aty/atyfb_base.c 25745diff -urNp linux-2.6.32.8/drivers/video/aty/atyfb_base.c linux-2.6.32.8/drivers/video/aty/atyfb_base.c
25682--- linux-2.6.32.7/drivers/video/aty/atyfb_base.c 2010-01-25 13:50:10.000000000 -0500 25746--- linux-2.6.32.8/drivers/video/aty/atyfb_base.c 2010-02-09 07:57:19.000000000 -0500
25683+++ linux-2.6.32.7/drivers/video/aty/atyfb_base.c 2010-01-25 17:39:40.830417520 -0500 25747+++ linux-2.6.32.8/drivers/video/aty/atyfb_base.c 2010-02-10 15:06:24.110001061 -0500
25684@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct 25748@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
25685 return bd->props.brightness; 25749 return bd->props.brightness;
25686 } 25750 }
@@ -25690,9 +25754,9 @@ diff -urNp linux-2.6.32.7/drivers/video/aty/atyfb_base.c linux-2.6.32.7/drivers/
25690 .get_brightness = aty_bl_get_brightness, 25754 .get_brightness = aty_bl_get_brightness,
25691 .update_status = aty_bl_update_status, 25755 .update_status = aty_bl_update_status,
25692 }; 25756 };
25693diff -urNp linux-2.6.32.7/drivers/video/aty/radeon_backlight.c linux-2.6.32.7/drivers/video/aty/radeon_backlight.c 25757diff -urNp linux-2.6.32.8/drivers/video/aty/radeon_backlight.c linux-2.6.32.8/drivers/video/aty/radeon_backlight.c
25694--- linux-2.6.32.7/drivers/video/aty/radeon_backlight.c 2010-01-25 13:50:10.000000000 -0500 25758--- linux-2.6.32.8/drivers/video/aty/radeon_backlight.c 2010-02-09 07:57:19.000000000 -0500
25695+++ linux-2.6.32.7/drivers/video/aty/radeon_backlight.c 2010-01-25 17:39:40.830417520 -0500 25759+++ linux-2.6.32.8/drivers/video/aty/radeon_backlight.c 2010-02-10 15:06:24.110001061 -0500
25696@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru 25760@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
25697 return bd->props.brightness; 25761 return bd->props.brightness;
25698 } 25762 }
@@ -25702,9 +25766,9 @@ diff -urNp linux-2.6.32.7/drivers/video/aty/radeon_backlight.c linux-2.6.32.7/dr
25702 .get_brightness = radeon_bl_get_brightness, 25766 .get_brightness = radeon_bl_get_brightness,
25703 .update_status = radeon_bl_update_status, 25767 .update_status = radeon_bl_update_status,
25704 }; 25768 };
25705diff -urNp linux-2.6.32.7/drivers/video/backlight/adp5520_bl.c linux-2.6.32.7/drivers/video/backlight/adp5520_bl.c 25769diff -urNp linux-2.6.32.8/drivers/video/backlight/adp5520_bl.c linux-2.6.32.8/drivers/video/backlight/adp5520_bl.c
25706--- linux-2.6.32.7/drivers/video/backlight/adp5520_bl.c 2010-01-25 13:50:10.000000000 -0500 25770--- linux-2.6.32.8/drivers/video/backlight/adp5520_bl.c 2010-02-09 07:57:19.000000000 -0500
25707+++ linux-2.6.32.7/drivers/video/backlight/adp5520_bl.c 2010-01-25 17:39:40.830417520 -0500 25771+++ linux-2.6.32.8/drivers/video/backlight/adp5520_bl.c 2010-02-10 15:06:24.110001061 -0500
25708@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str 25772@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
25709 return error ? data->current_brightness : reg_val; 25773 return error ? data->current_brightness : reg_val;
25710 } 25774 }
@@ -25714,9 +25778,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/adp5520_bl.c linux-2.6.32.7/dr
25714 .update_status = adp5520_bl_update_status, 25778 .update_status = adp5520_bl_update_status,
25715 .get_brightness = adp5520_bl_get_brightness, 25779 .get_brightness = adp5520_bl_get_brightness,
25716 }; 25780 };
25717diff -urNp linux-2.6.32.7/drivers/video/backlight/adx_bl.c linux-2.6.32.7/drivers/video/backlight/adx_bl.c 25781diff -urNp linux-2.6.32.8/drivers/video/backlight/adx_bl.c linux-2.6.32.8/drivers/video/backlight/adx_bl.c
25718--- linux-2.6.32.7/drivers/video/backlight/adx_bl.c 2010-01-25 13:50:10.000000000 -0500 25782--- linux-2.6.32.8/drivers/video/backlight/adx_bl.c 2010-02-09 07:57:19.000000000 -0500
25719+++ linux-2.6.32.7/drivers/video/backlight/adx_bl.c 2010-01-25 17:39:40.830417520 -0500 25783+++ linux-2.6.32.8/drivers/video/backlight/adx_bl.c 2010-02-10 15:06:24.110001061 -0500
25720@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct 25784@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
25721 return 1; 25785 return 1;
25722 } 25786 }
@@ -25726,9 +25790,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/adx_bl.c linux-2.6.32.7/driver
25726 .options = 0, 25790 .options = 0,
25727 .update_status = adx_backlight_update_status, 25791 .update_status = adx_backlight_update_status,
25728 .get_brightness = adx_backlight_get_brightness, 25792 .get_brightness = adx_backlight_get_brightness,
25729diff -urNp linux-2.6.32.7/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.7/drivers/video/backlight/atmel-pwm-bl.c 25793diff -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
25730--- linux-2.6.32.7/drivers/video/backlight/atmel-pwm-bl.c 2010-01-25 13:50:10.000000000 -0500 25794--- linux-2.6.32.8/drivers/video/backlight/atmel-pwm-bl.c 2010-02-09 07:57:19.000000000 -0500
25731+++ linux-2.6.32.7/drivers/video/backlight/atmel-pwm-bl.c 2010-01-25 17:39:40.830417520 -0500 25795+++ linux-2.6.32.8/drivers/video/backlight/atmel-pwm-bl.c 2010-02-10 15:06:24.110001061 -0500
25732@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct 25796@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
25733 return pwm_channel_enable(&pwmbl->pwmc); 25797 return pwm_channel_enable(&pwmbl->pwmc);
25734 } 25798 }
@@ -25738,9 +25802,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.7/
25738 .get_brightness = atmel_pwm_bl_get_intensity, 25802 .get_brightness = atmel_pwm_bl_get_intensity,
25739 .update_status = atmel_pwm_bl_set_intensity, 25803 .update_status = atmel_pwm_bl_set_intensity,
25740 }; 25804 };
25741diff -urNp linux-2.6.32.7/drivers/video/backlight/backlight.c linux-2.6.32.7/drivers/video/backlight/backlight.c 25805diff -urNp linux-2.6.32.8/drivers/video/backlight/backlight.c linux-2.6.32.8/drivers/video/backlight/backlight.c
25742--- linux-2.6.32.7/drivers/video/backlight/backlight.c 2010-01-25 13:50:10.000000000 -0500 25806--- linux-2.6.32.8/drivers/video/backlight/backlight.c 2010-02-09 07:57:19.000000000 -0500
25743+++ linux-2.6.32.7/drivers/video/backlight/backlight.c 2010-01-25 17:39:40.830417520 -0500 25807+++ linux-2.6.32.8/drivers/video/backlight/backlight.c 2010-02-10 15:06:24.110001061 -0500
25744@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); 25808@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
25745 * ERR_PTR() or a pointer to the newly allocated device. 25809 * ERR_PTR() or a pointer to the newly allocated device.
25746 */ 25810 */
@@ -25750,9 +25814,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/backlight.c linux-2.6.32.7/dri
25750 { 25814 {
25751 struct backlight_device *new_bd; 25815 struct backlight_device *new_bd;
25752 int rc; 25816 int rc;
25753diff -urNp linux-2.6.32.7/drivers/video/backlight/corgi_lcd.c linux-2.6.32.7/drivers/video/backlight/corgi_lcd.c 25817diff -urNp linux-2.6.32.8/drivers/video/backlight/corgi_lcd.c linux-2.6.32.8/drivers/video/backlight/corgi_lcd.c
25754--- linux-2.6.32.7/drivers/video/backlight/corgi_lcd.c 2010-01-25 13:50:10.000000000 -0500 25818--- linux-2.6.32.8/drivers/video/backlight/corgi_lcd.c 2010-02-09 07:57:19.000000000 -0500
25755+++ linux-2.6.32.7/drivers/video/backlight/corgi_lcd.c 2010-01-25 17:39:40.831420408 -0500 25819+++ linux-2.6.32.8/drivers/video/backlight/corgi_lcd.c 2010-02-10 15:06:24.110001061 -0500
25756@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit 25820@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
25757 } 25821 }
25758 EXPORT_SYMBOL(corgi_lcd_limit_intensity); 25822 EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -25762,9 +25826,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/corgi_lcd.c linux-2.6.32.7/dri
25762 .get_brightness = corgi_bl_get_intensity, 25826 .get_brightness = corgi_bl_get_intensity,
25763 .update_status = corgi_bl_update_status, 25827 .update_status = corgi_bl_update_status,
25764 }; 25828 };
25765diff -urNp linux-2.6.32.7/drivers/video/backlight/cr_bllcd.c linux-2.6.32.7/drivers/video/backlight/cr_bllcd.c 25829diff -urNp linux-2.6.32.8/drivers/video/backlight/cr_bllcd.c linux-2.6.32.8/drivers/video/backlight/cr_bllcd.c
25766--- linux-2.6.32.7/drivers/video/backlight/cr_bllcd.c 2010-01-25 13:50:10.000000000 -0500 25830--- linux-2.6.32.8/drivers/video/backlight/cr_bllcd.c 2010-02-09 07:57:19.000000000 -0500
25767+++ linux-2.6.32.7/drivers/video/backlight/cr_bllcd.c 2010-01-25 17:39:40.831420408 -0500 25831+++ linux-2.6.32.8/drivers/video/backlight/cr_bllcd.c 2010-02-10 15:06:24.110001061 -0500
25768@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st 25832@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
25769 return intensity; 25833 return intensity;
25770 } 25834 }
@@ -25774,9 +25838,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/cr_bllcd.c linux-2.6.32.7/driv
25774 .get_brightness = cr_backlight_get_intensity, 25838 .get_brightness = cr_backlight_get_intensity,
25775 .update_status = cr_backlight_set_intensity, 25839 .update_status = cr_backlight_set_intensity,
25776 }; 25840 };
25777diff -urNp linux-2.6.32.7/drivers/video/backlight/da903x_bl.c linux-2.6.32.7/drivers/video/backlight/da903x_bl.c 25841diff -urNp linux-2.6.32.8/drivers/video/backlight/da903x_bl.c linux-2.6.32.8/drivers/video/backlight/da903x_bl.c
25778--- linux-2.6.32.7/drivers/video/backlight/da903x_bl.c 2010-01-25 13:50:10.000000000 -0500 25842--- linux-2.6.32.8/drivers/video/backlight/da903x_bl.c 2010-02-09 07:57:19.000000000 -0500
25779+++ linux-2.6.32.7/drivers/video/backlight/da903x_bl.c 2010-01-25 17:39:40.831420408 -0500 25843+++ linux-2.6.32.8/drivers/video/backlight/da903x_bl.c 2010-02-10 15:06:24.110001061 -0500
25780@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne 25844@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
25781 return data->current_brightness; 25845 return data->current_brightness;
25782 } 25846 }
@@ -25786,9 +25850,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/da903x_bl.c linux-2.6.32.7/dri
25786 .update_status = da903x_backlight_update_status, 25850 .update_status = da903x_backlight_update_status,
25787 .get_brightness = da903x_backlight_get_brightness, 25851 .get_brightness = da903x_backlight_get_brightness,
25788 }; 25852 };
25789diff -urNp linux-2.6.32.7/drivers/video/backlight/generic_bl.c linux-2.6.32.7/drivers/video/backlight/generic_bl.c 25853diff -urNp linux-2.6.32.8/drivers/video/backlight/generic_bl.c linux-2.6.32.8/drivers/video/backlight/generic_bl.c
25790--- linux-2.6.32.7/drivers/video/backlight/generic_bl.c 2010-01-25 13:50:10.000000000 -0500 25854--- linux-2.6.32.8/drivers/video/backlight/generic_bl.c 2010-02-09 07:57:19.000000000 -0500
25791+++ linux-2.6.32.7/drivers/video/backlight/generic_bl.c 2010-01-25 17:39:40.831420408 -0500 25855+++ linux-2.6.32.8/drivers/video/backlight/generic_bl.c 2010-02-10 15:06:24.110001061 -0500
25792@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) 25856@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
25793 } 25857 }
25794 EXPORT_SYMBOL(corgibl_limit_intensity); 25858 EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -25798,9 +25862,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/generic_bl.c linux-2.6.32.7/dr
25798 .options = BL_CORE_SUSPENDRESUME, 25862 .options = BL_CORE_SUSPENDRESUME,
25799 .get_brightness = genericbl_get_intensity, 25863 .get_brightness = genericbl_get_intensity,
25800 .update_status = genericbl_send_intensity, 25864 .update_status = genericbl_send_intensity,
25801diff -urNp linux-2.6.32.7/drivers/video/backlight/hp680_bl.c linux-2.6.32.7/drivers/video/backlight/hp680_bl.c 25865diff -urNp linux-2.6.32.8/drivers/video/backlight/hp680_bl.c linux-2.6.32.8/drivers/video/backlight/hp680_bl.c
25802--- linux-2.6.32.7/drivers/video/backlight/hp680_bl.c 2010-01-25 13:50:10.000000000 -0500 25866--- linux-2.6.32.8/drivers/video/backlight/hp680_bl.c 2010-02-09 07:57:19.000000000 -0500
25803+++ linux-2.6.32.7/drivers/video/backlight/hp680_bl.c 2010-01-25 17:39:40.831420408 -0500 25867+++ linux-2.6.32.8/drivers/video/backlight/hp680_bl.c 2010-02-10 15:06:24.110001061 -0500
25804@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct 25868@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
25805 return current_intensity; 25869 return current_intensity;
25806 } 25870 }
@@ -25810,9 +25874,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/hp680_bl.c linux-2.6.32.7/driv
25810 .get_brightness = hp680bl_get_intensity, 25874 .get_brightness = hp680bl_get_intensity,
25811 .update_status = hp680bl_set_intensity, 25875 .update_status = hp680bl_set_intensity,
25812 }; 25876 };
25813diff -urNp linux-2.6.32.7/drivers/video/backlight/jornada720_bl.c linux-2.6.32.7/drivers/video/backlight/jornada720_bl.c 25877diff -urNp linux-2.6.32.8/drivers/video/backlight/jornada720_bl.c linux-2.6.32.8/drivers/video/backlight/jornada720_bl.c
25814--- linux-2.6.32.7/drivers/video/backlight/jornada720_bl.c 2010-01-25 13:50:10.000000000 -0500 25878--- linux-2.6.32.8/drivers/video/backlight/jornada720_bl.c 2010-02-09 07:57:19.000000000 -0500
25815+++ linux-2.6.32.7/drivers/video/backlight/jornada720_bl.c 2010-01-25 17:39:40.832311620 -0500 25879+++ linux-2.6.32.8/drivers/video/backlight/jornada720_bl.c 2010-02-10 15:06:24.110001061 -0500
25816@@ -93,7 +93,7 @@ out: 25880@@ -93,7 +93,7 @@ out:
25817 return ret; 25881 return ret;
25818 } 25882 }
@@ -25822,9 +25886,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/jornada720_bl.c linux-2.6.32.7
25822 .get_brightness = jornada_bl_get_brightness, 25886 .get_brightness = jornada_bl_get_brightness,
25823 .update_status = jornada_bl_update_status, 25887 .update_status = jornada_bl_update_status,
25824 .options = BL_CORE_SUSPENDRESUME, 25888 .options = BL_CORE_SUSPENDRESUME,
25825diff -urNp linux-2.6.32.7/drivers/video/backlight/kb3886_bl.c linux-2.6.32.7/drivers/video/backlight/kb3886_bl.c 25889diff -urNp linux-2.6.32.8/drivers/video/backlight/kb3886_bl.c linux-2.6.32.8/drivers/video/backlight/kb3886_bl.c
25826--- linux-2.6.32.7/drivers/video/backlight/kb3886_bl.c 2010-01-25 13:50:10.000000000 -0500 25890--- linux-2.6.32.8/drivers/video/backlight/kb3886_bl.c 2010-02-09 07:57:19.000000000 -0500
25827+++ linux-2.6.32.7/drivers/video/backlight/kb3886_bl.c 2010-01-25 17:39:40.832311620 -0500 25891+++ linux-2.6.32.8/drivers/video/backlight/kb3886_bl.c 2010-02-10 15:06:24.110001061 -0500
25828@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct 25892@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
25829 return kb3886bl_intensity; 25893 return kb3886bl_intensity;
25830 } 25894 }
@@ -25834,9 +25898,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/kb3886_bl.c linux-2.6.32.7/dri
25834 .get_brightness = kb3886bl_get_intensity, 25898 .get_brightness = kb3886bl_get_intensity,
25835 .update_status = kb3886bl_send_intensity, 25899 .update_status = kb3886bl_send_intensity,
25836 }; 25900 };
25837diff -urNp linux-2.6.32.7/drivers/video/backlight/locomolcd.c linux-2.6.32.7/drivers/video/backlight/locomolcd.c 25901diff -urNp linux-2.6.32.8/drivers/video/backlight/locomolcd.c linux-2.6.32.8/drivers/video/backlight/locomolcd.c
25838--- linux-2.6.32.7/drivers/video/backlight/locomolcd.c 2010-01-25 13:50:10.000000000 -0500 25902--- linux-2.6.32.8/drivers/video/backlight/locomolcd.c 2010-02-09 07:57:19.000000000 -0500
25839+++ linux-2.6.32.7/drivers/video/backlight/locomolcd.c 2010-01-25 17:39:40.832311620 -0500 25903+++ linux-2.6.32.8/drivers/video/backlight/locomolcd.c 2010-02-10 15:06:24.110001061 -0500
25840@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc 25904@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
25841 return current_intensity; 25905 return current_intensity;
25842 } 25906 }
@@ -25846,9 +25910,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/locomolcd.c linux-2.6.32.7/dri
25846 .get_brightness = locomolcd_get_intensity, 25910 .get_brightness = locomolcd_get_intensity,
25847 .update_status = locomolcd_set_intensity, 25911 .update_status = locomolcd_set_intensity,
25848 }; 25912 };
25849diff -urNp linux-2.6.32.7/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.7/drivers/video/backlight/mbp_nvidia_bl.c 25913diff -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
25850--- linux-2.6.32.7/drivers/video/backlight/mbp_nvidia_bl.c 2010-01-25 13:50:10.000000000 -0500 25914--- linux-2.6.32.8/drivers/video/backlight/mbp_nvidia_bl.c 2010-02-09 07:57:19.000000000 -0500
25851+++ linux-2.6.32.7/drivers/video/backlight/mbp_nvidia_bl.c 2010-01-25 17:39:40.832311620 -0500 25915+++ linux-2.6.32.8/drivers/video/backlight/mbp_nvidia_bl.c 2010-02-10 15:06:24.110001061 -0500
25852@@ -33,7 +33,7 @@ struct dmi_match_data { 25916@@ -33,7 +33,7 @@ struct dmi_match_data {
25853 unsigned long iostart; 25917 unsigned long iostart;
25854 unsigned long iolen; 25918 unsigned long iolen;
@@ -25858,9 +25922,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.7
25858 }; 25922 };
25859 25923
25860 /* Module parameters. */ 25924 /* Module parameters. */
25861diff -urNp linux-2.6.32.7/drivers/video/backlight/omap1_bl.c linux-2.6.32.7/drivers/video/backlight/omap1_bl.c 25925diff -urNp linux-2.6.32.8/drivers/video/backlight/omap1_bl.c linux-2.6.32.8/drivers/video/backlight/omap1_bl.c
25862--- linux-2.6.32.7/drivers/video/backlight/omap1_bl.c 2010-01-25 13:50:10.000000000 -0500 25926--- linux-2.6.32.8/drivers/video/backlight/omap1_bl.c 2010-02-09 07:57:19.000000000 -0500
25863+++ linux-2.6.32.7/drivers/video/backlight/omap1_bl.c 2010-01-25 17:39:40.832311620 -0500 25927+++ linux-2.6.32.8/drivers/video/backlight/omap1_bl.c 2010-02-10 15:06:24.110001061 -0500
25864@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b 25928@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
25865 return bl->current_intensity; 25929 return bl->current_intensity;
25866 } 25930 }
@@ -25870,9 +25934,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/omap1_bl.c linux-2.6.32.7/driv
25870 .get_brightness = omapbl_get_intensity, 25934 .get_brightness = omapbl_get_intensity,
25871 .update_status = omapbl_update_status, 25935 .update_status = omapbl_update_status,
25872 }; 25936 };
25873diff -urNp linux-2.6.32.7/drivers/video/backlight/progear_bl.c linux-2.6.32.7/drivers/video/backlight/progear_bl.c 25937diff -urNp linux-2.6.32.8/drivers/video/backlight/progear_bl.c linux-2.6.32.8/drivers/video/backlight/progear_bl.c
25874--- linux-2.6.32.7/drivers/video/backlight/progear_bl.c 2010-01-25 13:50:10.000000000 -0500 25938--- linux-2.6.32.8/drivers/video/backlight/progear_bl.c 2010-02-09 07:57:19.000000000 -0500
25875+++ linux-2.6.32.7/drivers/video/backlight/progear_bl.c 2010-01-25 17:39:40.832311620 -0500 25939+++ linux-2.6.32.8/drivers/video/backlight/progear_bl.c 2010-02-10 15:06:24.110001061 -0500
25876@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc 25940@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
25877 return intensity - HW_LEVEL_MIN; 25941 return intensity - HW_LEVEL_MIN;
25878 } 25942 }
@@ -25882,9 +25946,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/progear_bl.c linux-2.6.32.7/dr
25882 .get_brightness = progearbl_get_intensity, 25946 .get_brightness = progearbl_get_intensity,
25883 .update_status = progearbl_set_intensity, 25947 .update_status = progearbl_set_intensity,
25884 }; 25948 };
25885diff -urNp linux-2.6.32.7/drivers/video/backlight/pwm_bl.c linux-2.6.32.7/drivers/video/backlight/pwm_bl.c 25949diff -urNp linux-2.6.32.8/drivers/video/backlight/pwm_bl.c linux-2.6.32.8/drivers/video/backlight/pwm_bl.c
25886--- linux-2.6.32.7/drivers/video/backlight/pwm_bl.c 2010-01-25 13:50:10.000000000 -0500 25950--- linux-2.6.32.8/drivers/video/backlight/pwm_bl.c 2010-02-09 07:57:19.000000000 -0500
25887+++ linux-2.6.32.7/drivers/video/backlight/pwm_bl.c 2010-01-25 17:39:40.832311620 -0500 25951+++ linux-2.6.32.8/drivers/video/backlight/pwm_bl.c 2010-02-10 15:06:24.110001061 -0500
25888@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( 25952@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
25889 return bl->props.brightness; 25953 return bl->props.brightness;
25890 } 25954 }
@@ -25894,9 +25958,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/pwm_bl.c linux-2.6.32.7/driver
25894 .update_status = pwm_backlight_update_status, 25958 .update_status = pwm_backlight_update_status,
25895 .get_brightness = pwm_backlight_get_brightness, 25959 .get_brightness = pwm_backlight_get_brightness,
25896 }; 25960 };
25897diff -urNp linux-2.6.32.7/drivers/video/backlight/tosa_bl.c linux-2.6.32.7/drivers/video/backlight/tosa_bl.c 25961diff -urNp linux-2.6.32.8/drivers/video/backlight/tosa_bl.c linux-2.6.32.8/drivers/video/backlight/tosa_bl.c
25898--- linux-2.6.32.7/drivers/video/backlight/tosa_bl.c 2010-01-25 13:50:10.000000000 -0500 25962--- linux-2.6.32.8/drivers/video/backlight/tosa_bl.c 2010-02-09 07:57:19.000000000 -0500
25899+++ linux-2.6.32.7/drivers/video/backlight/tosa_bl.c 2010-01-25 17:39:40.833395500 -0500 25963+++ linux-2.6.32.8/drivers/video/backlight/tosa_bl.c 2010-02-10 15:06:24.110001061 -0500
25900@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct 25964@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
25901 return props->brightness; 25965 return props->brightness;
25902 } 25966 }
@@ -25906,9 +25970,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/tosa_bl.c linux-2.6.32.7/drive
25906 .get_brightness = tosa_bl_get_brightness, 25970 .get_brightness = tosa_bl_get_brightness,
25907 .update_status = tosa_bl_update_status, 25971 .update_status = tosa_bl_update_status,
25908 }; 25972 };
25909diff -urNp linux-2.6.32.7/drivers/video/backlight/wm831x_bl.c linux-2.6.32.7/drivers/video/backlight/wm831x_bl.c 25973diff -urNp linux-2.6.32.8/drivers/video/backlight/wm831x_bl.c linux-2.6.32.8/drivers/video/backlight/wm831x_bl.c
25910--- linux-2.6.32.7/drivers/video/backlight/wm831x_bl.c 2010-01-25 13:50:10.000000000 -0500 25974--- linux-2.6.32.8/drivers/video/backlight/wm831x_bl.c 2010-02-09 07:57:19.000000000 -0500
25911+++ linux-2.6.32.7/drivers/video/backlight/wm831x_bl.c 2010-01-25 17:39:40.833395500 -0500 25975+++ linux-2.6.32.8/drivers/video/backlight/wm831x_bl.c 2010-02-10 15:06:24.110001061 -0500
25912@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne 25976@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
25913 return data->current_brightness; 25977 return data->current_brightness;
25914 } 25978 }
@@ -25918,9 +25982,9 @@ diff -urNp linux-2.6.32.7/drivers/video/backlight/wm831x_bl.c linux-2.6.32.7/dri
25918 .options = BL_CORE_SUSPENDRESUME, 25982 .options = BL_CORE_SUSPENDRESUME,
25919 .update_status = wm831x_backlight_update_status, 25983 .update_status = wm831x_backlight_update_status,
25920 .get_brightness = wm831x_backlight_get_brightness, 25984 .get_brightness = wm831x_backlight_get_brightness,
25921diff -urNp linux-2.6.32.7/drivers/video/bf54x-lq043fb.c linux-2.6.32.7/drivers/video/bf54x-lq043fb.c 25985diff -urNp linux-2.6.32.8/drivers/video/bf54x-lq043fb.c linux-2.6.32.8/drivers/video/bf54x-lq043fb.c
25922--- linux-2.6.32.7/drivers/video/bf54x-lq043fb.c 2010-01-25 13:50:10.000000000 -0500 25986--- linux-2.6.32.8/drivers/video/bf54x-lq043fb.c 2010-02-09 07:57:19.000000000 -0500
25923+++ linux-2.6.32.7/drivers/video/bf54x-lq043fb.c 2010-01-25 17:39:40.833395500 -0500 25987+++ linux-2.6.32.8/drivers/video/bf54x-lq043fb.c 2010-02-10 15:06:24.110001061 -0500
25924@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back 25988@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
25925 return 0; 25989 return 0;
25926 } 25990 }
@@ -25930,9 +25994,9 @@ diff -urNp linux-2.6.32.7/drivers/video/bf54x-lq043fb.c linux-2.6.32.7/drivers/v
25930 .get_brightness = bl_get_brightness, 25994 .get_brightness = bl_get_brightness,
25931 }; 25995 };
25932 25996
25933diff -urNp linux-2.6.32.7/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.7/drivers/video/bfin-t350mcqb-fb.c 25997diff -urNp linux-2.6.32.8/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.8/drivers/video/bfin-t350mcqb-fb.c
25934--- linux-2.6.32.7/drivers/video/bfin-t350mcqb-fb.c 2010-01-25 13:50:10.000000000 -0500 25998--- linux-2.6.32.8/drivers/video/bfin-t350mcqb-fb.c 2010-02-09 07:57:19.000000000 -0500
25935+++ linux-2.6.32.7/drivers/video/bfin-t350mcqb-fb.c 2010-01-25 17:39:40.833395500 -0500 25999+++ linux-2.6.32.8/drivers/video/bfin-t350mcqb-fb.c 2010-02-10 15:06:24.110001061 -0500
25936@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back 26000@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
25937 return 0; 26001 return 0;
25938 } 26002 }
@@ -25942,9 +26006,9 @@ diff -urNp linux-2.6.32.7/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.7/driver
25942 .get_brightness = bl_get_brightness, 26006 .get_brightness = bl_get_brightness,
25943 }; 26007 };
25944 26008
25945diff -urNp linux-2.6.32.7/drivers/video/fbmem.c linux-2.6.32.7/drivers/video/fbmem.c 26009diff -urNp linux-2.6.32.8/drivers/video/fbmem.c linux-2.6.32.8/drivers/video/fbmem.c
25946--- linux-2.6.32.7/drivers/video/fbmem.c 2010-01-25 13:50:10.000000000 -0500 26010--- linux-2.6.32.8/drivers/video/fbmem.c 2010-02-09 07:57:19.000000000 -0500
25947+++ linux-2.6.32.7/drivers/video/fbmem.c 2010-01-25 17:39:40.834423162 -0500 26011+++ linux-2.6.32.8/drivers/video/fbmem.c 2010-02-10 15:06:24.110001061 -0500
25948@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in 26012@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
25949 image->dx += image->width + 8; 26013 image->dx += image->width + 8;
25950 } 26014 }
@@ -25972,9 +26036,9 @@ diff -urNp linux-2.6.32.7/drivers/video/fbmem.c linux-2.6.32.7/drivers/video/fbm
25972 return -EINVAL; 26036 return -EINVAL;
25973 if (!registered_fb[con2fb.framebuffer]) 26037 if (!registered_fb[con2fb.framebuffer])
25974 request_module("fb%d", con2fb.framebuffer); 26038 request_module("fb%d", con2fb.framebuffer);
25975diff -urNp linux-2.6.32.7/drivers/video/fbmon.c linux-2.6.32.7/drivers/video/fbmon.c 26039diff -urNp linux-2.6.32.8/drivers/video/fbmon.c linux-2.6.32.8/drivers/video/fbmon.c
25976--- linux-2.6.32.7/drivers/video/fbmon.c 2010-01-25 13:50:10.000000000 -0500 26040--- linux-2.6.32.8/drivers/video/fbmon.c 2010-02-09 07:57:19.000000000 -0500
25977+++ linux-2.6.32.7/drivers/video/fbmon.c 2010-01-25 17:39:40.834423162 -0500 26041+++ linux-2.6.32.8/drivers/video/fbmon.c 2010-02-10 15:06:24.110001061 -0500
25978@@ -45,7 +45,7 @@ 26042@@ -45,7 +45,7 @@
25979 #ifdef DEBUG 26043 #ifdef DEBUG
25980 #define DPRINTK(fmt, args...) printk(fmt,## args) 26044 #define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -25984,9 +26048,9 @@ diff -urNp linux-2.6.32.7/drivers/video/fbmon.c linux-2.6.32.7/drivers/video/fbm
25984 #endif 26048 #endif
25985 26049
25986 #define FBMON_FIX_HEADER 1 26050 #define FBMON_FIX_HEADER 1
25987diff -urNp linux-2.6.32.7/drivers/video/i810/i810_accel.c linux-2.6.32.7/drivers/video/i810/i810_accel.c 26051diff -urNp linux-2.6.32.8/drivers/video/i810/i810_accel.c linux-2.6.32.8/drivers/video/i810/i810_accel.c
25988--- linux-2.6.32.7/drivers/video/i810/i810_accel.c 2010-01-25 13:50:10.000000000 -0500 26052--- linux-2.6.32.8/drivers/video/i810/i810_accel.c 2010-02-09 07:57:19.000000000 -0500
25989+++ linux-2.6.32.7/drivers/video/i810/i810_accel.c 2010-01-25 17:39:40.835283316 -0500 26053+++ linux-2.6.32.8/drivers/video/i810/i810_accel.c 2010-02-10 15:06:24.115075551 -0500
25990@@ -73,6 +73,7 @@ static inline int wait_for_space(struct 26054@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
25991 } 26055 }
25992 } 26056 }
@@ -25995,9 +26059,9 @@ diff -urNp linux-2.6.32.7/drivers/video/i810/i810_accel.c linux-2.6.32.7/drivers
25995 i810_report_error(mmio); 26059 i810_report_error(mmio);
25996 par->dev_flags |= LOCKUP; 26060 par->dev_flags |= LOCKUP;
25997 info->pixmap.scan_align = 1; 26061 info->pixmap.scan_align = 1;
25998diff -urNp linux-2.6.32.7/drivers/video/i810/i810_main.c linux-2.6.32.7/drivers/video/i810/i810_main.c 26062diff -urNp linux-2.6.32.8/drivers/video/i810/i810_main.c linux-2.6.32.8/drivers/video/i810/i810_main.c
25999--- linux-2.6.32.7/drivers/video/i810/i810_main.c 2010-01-25 13:50:10.000000000 -0500 26063--- linux-2.6.32.8/drivers/video/i810/i810_main.c 2010-02-09 07:57:19.000000000 -0500
26000+++ linux-2.6.32.7/drivers/video/i810/i810_main.c 2010-01-25 17:39:40.835283316 -0500 26064+++ linux-2.6.32.8/drivers/video/i810/i810_main.c 2010-02-10 15:06:24.115075551 -0500
26001@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t 26065@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
26002 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, 26066 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
26003 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, 26067 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -26007,9 +26071,9 @@ diff -urNp linux-2.6.32.7/drivers/video/i810/i810_main.c linux-2.6.32.7/drivers/
26007 }; 26071 };
26008 26072
26009 static struct pci_driver i810fb_driver = { 26073 static struct pci_driver i810fb_driver = {
26010diff -urNp linux-2.6.32.7/drivers/video/modedb.c linux-2.6.32.7/drivers/video/modedb.c 26074diff -urNp linux-2.6.32.8/drivers/video/modedb.c linux-2.6.32.8/drivers/video/modedb.c
26011--- linux-2.6.32.7/drivers/video/modedb.c 2010-01-25 13:50:10.000000000 -0500 26075--- linux-2.6.32.8/drivers/video/modedb.c 2010-02-09 07:57:19.000000000 -0500
26012+++ linux-2.6.32.7/drivers/video/modedb.c 2010-01-25 17:39:40.836261121 -0500 26076+++ linux-2.6.32.8/drivers/video/modedb.c 2010-02-10 15:06:24.115075551 -0500
26013@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ 26077@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
26014 { 26078 {
26015 /* 640x400 @ 70 Hz, 31.5 kHz hsync */ 26079 /* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -26310,9 +26374,9 @@ diff -urNp linux-2.6.32.7/drivers/video/modedb.c linux-2.6.32.7/drivers/video/mo
26310 }, 26374 },
26311 }; 26375 };
26312 26376
26313diff -urNp linux-2.6.32.7/drivers/video/nvidia/nv_backlight.c linux-2.6.32.7/drivers/video/nvidia/nv_backlight.c 26377diff -urNp linux-2.6.32.8/drivers/video/nvidia/nv_backlight.c linux-2.6.32.8/drivers/video/nvidia/nv_backlight.c
26314--- linux-2.6.32.7/drivers/video/nvidia/nv_backlight.c 2010-01-25 13:50:10.000000000 -0500 26378--- linux-2.6.32.8/drivers/video/nvidia/nv_backlight.c 2010-02-09 07:57:19.000000000 -0500
26315+++ linux-2.6.32.7/drivers/video/nvidia/nv_backlight.c 2010-01-25 17:39:40.836261121 -0500 26379+++ linux-2.6.32.8/drivers/video/nvidia/nv_backlight.c 2010-02-10 15:06:24.115075551 -0500
26316@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru 26380@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
26317 return bd->props.brightness; 26381 return bd->props.brightness;
26318 } 26382 }
@@ -26322,9 +26386,9 @@ diff -urNp linux-2.6.32.7/drivers/video/nvidia/nv_backlight.c linux-2.6.32.7/dri
26322 .get_brightness = nvidia_bl_get_brightness, 26386 .get_brightness = nvidia_bl_get_brightness,
26323 .update_status = nvidia_bl_update_status, 26387 .update_status = nvidia_bl_update_status,
26324 }; 26388 };
26325diff -urNp linux-2.6.32.7/drivers/video/riva/fbdev.c linux-2.6.32.7/drivers/video/riva/fbdev.c 26389diff -urNp linux-2.6.32.8/drivers/video/riva/fbdev.c linux-2.6.32.8/drivers/video/riva/fbdev.c
26326--- linux-2.6.32.7/drivers/video/riva/fbdev.c 2010-01-25 13:50:10.000000000 -0500 26390--- linux-2.6.32.8/drivers/video/riva/fbdev.c 2010-02-09 07:57:19.000000000 -0500
26327+++ linux-2.6.32.7/drivers/video/riva/fbdev.c 2010-01-25 17:39:40.836261121 -0500 26391+++ linux-2.6.32.8/drivers/video/riva/fbdev.c 2010-02-10 15:06:24.115075551 -0500
26328@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct 26392@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
26329 return bd->props.brightness; 26393 return bd->props.brightness;
26330 } 26394 }
@@ -26334,9 +26398,9 @@ diff -urNp linux-2.6.32.7/drivers/video/riva/fbdev.c linux-2.6.32.7/drivers/vide
26334 .get_brightness = riva_bl_get_brightness, 26398 .get_brightness = riva_bl_get_brightness,
26335 .update_status = riva_bl_update_status, 26399 .update_status = riva_bl_update_status,
26336 }; 26400 };
26337diff -urNp linux-2.6.32.7/drivers/video/uvesafb.c linux-2.6.32.7/drivers/video/uvesafb.c 26401diff -urNp linux-2.6.32.8/drivers/video/uvesafb.c linux-2.6.32.8/drivers/video/uvesafb.c
26338--- linux-2.6.32.7/drivers/video/uvesafb.c 2010-01-25 13:50:10.000000000 -0500 26402--- linux-2.6.32.8/drivers/video/uvesafb.c 2010-02-09 07:57:19.000000000 -0500
26339+++ linux-2.6.32.7/drivers/video/uvesafb.c 2010-01-25 17:39:40.837424384 -0500 26403+++ linux-2.6.32.8/drivers/video/uvesafb.c 2010-02-10 15:06:24.115075551 -0500
26340@@ -18,6 +18,7 @@ 26404@@ -18,6 +18,7 @@
26341 #include <linux/fb.h> 26405 #include <linux/fb.h>
26342 #include <linux/io.h> 26406 #include <linux/io.h>
@@ -26412,9 +26476,9 @@ diff -urNp linux-2.6.32.7/drivers/video/uvesafb.c linux-2.6.32.7/drivers/video/u
26412 } 26476 }
26413 26477
26414 framebuffer_release(info); 26478 framebuffer_release(info);
26415diff -urNp linux-2.6.32.7/drivers/video/vesafb.c linux-2.6.32.7/drivers/video/vesafb.c 26479diff -urNp linux-2.6.32.8/drivers/video/vesafb.c linux-2.6.32.8/drivers/video/vesafb.c
26416--- linux-2.6.32.7/drivers/video/vesafb.c 2010-01-25 13:50:10.000000000 -0500 26480--- linux-2.6.32.8/drivers/video/vesafb.c 2010-02-09 07:57:19.000000000 -0500
26417+++ linux-2.6.32.7/drivers/video/vesafb.c 2010-01-25 17:39:40.837424384 -0500 26481+++ linux-2.6.32.8/drivers/video/vesafb.c 2010-02-10 15:06:24.115075551 -0500
26418@@ -9,6 +9,7 @@ 26482@@ -9,6 +9,7 @@
26419 */ 26483 */
26420 26484
@@ -26518,9 +26582,9 @@ diff -urNp linux-2.6.32.7/drivers/video/vesafb.c linux-2.6.32.7/drivers/video/ve
26518 if (info->screen_base) 26582 if (info->screen_base)
26519 iounmap(info->screen_base); 26583 iounmap(info->screen_base);
26520 framebuffer_release(info); 26584 framebuffer_release(info);
26521diff -urNp linux-2.6.32.7/drivers/xen/sys-hypervisor.c linux-2.6.32.7/drivers/xen/sys-hypervisor.c 26585diff -urNp linux-2.6.32.8/drivers/xen/sys-hypervisor.c linux-2.6.32.8/drivers/xen/sys-hypervisor.c
26522--- linux-2.6.32.7/drivers/xen/sys-hypervisor.c 2010-01-25 13:50:10.000000000 -0500 26586--- linux-2.6.32.8/drivers/xen/sys-hypervisor.c 2010-02-09 07:57:19.000000000 -0500
26523+++ linux-2.6.32.7/drivers/xen/sys-hypervisor.c 2010-01-25 17:39:40.837424384 -0500 26587+++ linux-2.6.32.8/drivers/xen/sys-hypervisor.c 2010-02-10 15:06:24.115075551 -0500
26524@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko 26588@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
26525 return 0; 26589 return 0;
26526 } 26590 }
@@ -26530,9 +26594,9 @@ diff -urNp linux-2.6.32.7/drivers/xen/sys-hypervisor.c linux-2.6.32.7/drivers/xe
26530 .show = hyp_sysfs_show, 26594 .show = hyp_sysfs_show,
26531 .store = hyp_sysfs_store, 26595 .store = hyp_sysfs_store,
26532 }; 26596 };
26533diff -urNp linux-2.6.32.7/fs/9p/vfs_inode.c linux-2.6.32.7/fs/9p/vfs_inode.c 26597diff -urNp linux-2.6.32.8/fs/9p/vfs_inode.c linux-2.6.32.8/fs/9p/vfs_inode.c
26534--- linux-2.6.32.7/fs/9p/vfs_inode.c 2010-01-25 13:50:10.000000000 -0500 26598--- linux-2.6.32.8/fs/9p/vfs_inode.c 2010-02-09 07:57:19.000000000 -0500
26535+++ linux-2.6.32.7/fs/9p/vfs_inode.c 2010-01-25 17:39:40.837424384 -0500 26599+++ linux-2.6.32.8/fs/9p/vfs_inode.c 2010-02-10 15:06:24.115075551 -0500
26536@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct 26600@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
26537 static void 26601 static void
26538 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 26602 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -26542,9 +26606,9 @@ diff -urNp linux-2.6.32.7/fs/9p/vfs_inode.c linux-2.6.32.7/fs/9p/vfs_inode.c
26542 26606
26543 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, 26607 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
26544 IS_ERR(s) ? "<error>" : s); 26608 IS_ERR(s) ? "<error>" : s);
26545diff -urNp linux-2.6.32.7/fs/aio.c linux-2.6.32.7/fs/aio.c 26609diff -urNp linux-2.6.32.8/fs/aio.c linux-2.6.32.8/fs/aio.c
26546--- linux-2.6.32.7/fs/aio.c 2010-01-25 13:50:10.000000000 -0500 26610--- linux-2.6.32.8/fs/aio.c 2010-02-09 07:57:19.000000000 -0500
26547+++ linux-2.6.32.7/fs/aio.c 2010-01-25 17:39:40.838419304 -0500 26611+++ linux-2.6.32.8/fs/aio.c 2010-02-10 15:06:24.115075551 -0500
26548@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx 26612@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
26549 size += sizeof(struct io_event) * nr_events; 26613 size += sizeof(struct io_event) * nr_events;
26550 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; 26614 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -26554,9 +26618,9 @@ diff -urNp linux-2.6.32.7/fs/aio.c linux-2.6.32.7/fs/aio.c
26554 return -EINVAL; 26618 return -EINVAL;
26555 26619
26556 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); 26620 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
26557diff -urNp linux-2.6.32.7/fs/attr.c linux-2.6.32.7/fs/attr.c 26621diff -urNp linux-2.6.32.8/fs/attr.c linux-2.6.32.8/fs/attr.c
26558--- linux-2.6.32.7/fs/attr.c 2010-01-25 13:50:10.000000000 -0500 26622--- linux-2.6.32.8/fs/attr.c 2010-02-09 07:57:19.000000000 -0500
26559+++ linux-2.6.32.7/fs/attr.c 2010-01-25 17:39:40.838419304 -0500 26623+++ linux-2.6.32.8/fs/attr.c 2010-02-10 15:06:24.164267766 -0500
26560@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode 26624@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
26561 unsigned long limit; 26625 unsigned long limit;
26562 26626
@@ -26565,9 +26629,9 @@ diff -urNp linux-2.6.32.7/fs/attr.c linux-2.6.32.7/fs/attr.c
26565 if (limit != RLIM_INFINITY && offset > limit) 26629 if (limit != RLIM_INFINITY && offset > limit)
26566 goto out_sig; 26630 goto out_sig;
26567 if (offset > inode->i_sb->s_maxbytes) 26631 if (offset > inode->i_sb->s_maxbytes)
26568diff -urNp linux-2.6.32.7/fs/autofs/root.c linux-2.6.32.7/fs/autofs/root.c 26632diff -urNp linux-2.6.32.8/fs/autofs/root.c linux-2.6.32.8/fs/autofs/root.c
26569--- linux-2.6.32.7/fs/autofs/root.c 2010-01-25 13:50:10.000000000 -0500 26633--- linux-2.6.32.8/fs/autofs/root.c 2010-02-09 07:57:19.000000000 -0500
26570+++ linux-2.6.32.7/fs/autofs/root.c 2010-01-25 17:39:40.838419304 -0500 26634+++ linux-2.6.32.8/fs/autofs/root.c 2010-02-10 15:06:24.164267766 -0500
26571@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in 26635@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
26572 set_bit(n,sbi->symlink_bitmap); 26636 set_bit(n,sbi->symlink_bitmap);
26573 sl = &sbi->symlink[n]; 26637 sl = &sbi->symlink[n];
@@ -26578,9 +26642,9 @@ diff -urNp linux-2.6.32.7/fs/autofs/root.c linux-2.6.32.7/fs/autofs/root.c
26578 if (!sl->data) { 26642 if (!sl->data) {
26579 clear_bit(n,sbi->symlink_bitmap); 26643 clear_bit(n,sbi->symlink_bitmap);
26580 unlock_kernel(); 26644 unlock_kernel();
26581diff -urNp linux-2.6.32.7/fs/autofs4/symlink.c linux-2.6.32.7/fs/autofs4/symlink.c 26645diff -urNp linux-2.6.32.8/fs/autofs4/symlink.c linux-2.6.32.8/fs/autofs4/symlink.c
26582--- linux-2.6.32.7/fs/autofs4/symlink.c 2010-01-25 13:50:10.000000000 -0500 26646--- linux-2.6.32.8/fs/autofs4/symlink.c 2010-02-09 07:57:19.000000000 -0500
26583+++ linux-2.6.32.7/fs/autofs4/symlink.c 2010-01-25 17:39:40.838419304 -0500 26647+++ linux-2.6.32.8/fs/autofs4/symlink.c 2010-02-10 15:06:24.182052998 -0500
26584@@ -15,7 +15,7 @@ 26648@@ -15,7 +15,7 @@
26585 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) 26649 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
26586 { 26650 {
@@ -26590,9 +26654,9 @@ diff -urNp linux-2.6.32.7/fs/autofs4/symlink.c linux-2.6.32.7/fs/autofs4/symlink
26590 return NULL; 26654 return NULL;
26591 } 26655 }
26592 26656
26593diff -urNp linux-2.6.32.7/fs/befs/linuxvfs.c linux-2.6.32.7/fs/befs/linuxvfs.c 26657diff -urNp linux-2.6.32.8/fs/befs/linuxvfs.c linux-2.6.32.8/fs/befs/linuxvfs.c
26594--- linux-2.6.32.7/fs/befs/linuxvfs.c 2010-01-25 13:50:10.000000000 -0500 26658--- linux-2.6.32.8/fs/befs/linuxvfs.c 2010-02-09 07:57:19.000000000 -0500
26595+++ linux-2.6.32.7/fs/befs/linuxvfs.c 2010-01-25 17:39:40.838419304 -0500 26659+++ linux-2.6.32.8/fs/befs/linuxvfs.c 2010-02-10 15:06:24.182052998 -0500
26596@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry 26660@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
26597 { 26661 {
26598 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); 26662 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -26602,9 +26666,9 @@ diff -urNp linux-2.6.32.7/fs/befs/linuxvfs.c linux-2.6.32.7/fs/befs/linuxvfs.c
26602 if (!IS_ERR(link)) 26666 if (!IS_ERR(link))
26603 kfree(link); 26667 kfree(link);
26604 } 26668 }
26605diff -urNp linux-2.6.32.7/fs/binfmt_aout.c linux-2.6.32.7/fs/binfmt_aout.c 26669diff -urNp linux-2.6.32.8/fs/binfmt_aout.c linux-2.6.32.8/fs/binfmt_aout.c
26606--- linux-2.6.32.7/fs/binfmt_aout.c 2010-01-25 13:50:10.000000000 -0500 26670--- linux-2.6.32.8/fs/binfmt_aout.c 2010-02-09 07:57:19.000000000 -0500
26607+++ linux-2.6.32.7/fs/binfmt_aout.c 2010-01-25 17:39:40.838419304 -0500 26671+++ linux-2.6.32.8/fs/binfmt_aout.c 2010-02-10 15:06:24.182052998 -0500
26608@@ -16,6 +16,7 @@ 26672@@ -16,6 +16,7 @@
26609 #include <linux/string.h> 26673 #include <linux/string.h>
26610 #include <linux/fs.h> 26674 #include <linux/fs.h>
@@ -26635,7 +26699,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_aout.c linux-2.6.32.7/fs/binfmt_aout.c
26635 if (ex.a_data + ex.a_bss > rlim) 26699 if (ex.a_data + ex.a_bss > rlim)
26636 return -ENOMEM; 26700 return -ENOMEM;
26637 26701
26638@@ -276,6 +281,27 @@ static int load_aout_binary(struct linux 26702@@ -277,6 +282,27 @@ static int load_aout_binary(struct linux
26639 install_exec_creds(bprm); 26703 install_exec_creds(bprm);
26640 current->flags &= ~PF_FORKNOEXEC; 26704 current->flags &= ~PF_FORKNOEXEC;
26641 26705
@@ -26663,7 +26727,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_aout.c linux-2.6.32.7/fs/binfmt_aout.c
26663 if (N_MAGIC(ex) == OMAGIC) { 26727 if (N_MAGIC(ex) == OMAGIC) {
26664 unsigned long text_addr, map_size; 26728 unsigned long text_addr, map_size;
26665 loff_t pos; 26729 loff_t pos;
26666@@ -348,7 +374,7 @@ static int load_aout_binary(struct linux 26730@@ -349,7 +375,7 @@ static int load_aout_binary(struct linux
26667 26731
26668 down_write(&current->mm->mmap_sem); 26732 down_write(&current->mm->mmap_sem);
26669 error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data, 26733 error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
@@ -26672,9 +26736,9 @@ diff -urNp linux-2.6.32.7/fs/binfmt_aout.c linux-2.6.32.7/fs/binfmt_aout.c
26672 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, 26736 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
26673 fd_offset + ex.a_text); 26737 fd_offset + ex.a_text);
26674 up_write(&current->mm->mmap_sem); 26738 up_write(&current->mm->mmap_sem);
26675diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c 26739diff -urNp linux-2.6.32.8/fs/binfmt_elf.c linux-2.6.32.8/fs/binfmt_elf.c
26676--- linux-2.6.32.7/fs/binfmt_elf.c 2010-01-25 13:50:10.000000000 -0500 26740--- linux-2.6.32.8/fs/binfmt_elf.c 2010-02-09 07:57:19.000000000 -0500
26677+++ linux-2.6.32.7/fs/binfmt_elf.c 2010-01-25 17:39:40.839418065 -0500 26741+++ linux-2.6.32.8/fs/binfmt_elf.c 2010-02-10 15:06:24.286215933 -0500
26678@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str 26742@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
26679 #define elf_core_dump NULL 26743 #define elf_core_dump NULL
26680 #endif 26744 #endif
@@ -26984,7 +27048,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
26984 27048
26985 loc = kmalloc(sizeof(*loc), GFP_KERNEL); 27049 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
26986 if (!loc) { 27050 if (!loc) {
26987@@ -742,11 +938,80 @@ static int load_elf_binary(struct linux_ 27051@@ -718,11 +914,80 @@ static int load_elf_binary(struct linux_
26988 27052
26989 /* OK, This is the point of no return */ 27053 /* OK, This is the point of no return */
26990 current->flags &= ~PF_FORKNOEXEC; 27054 current->flags &= ~PF_FORKNOEXEC;
@@ -27066,7 +27130,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
27066 if (elf_read_implies_exec(loc->elf_ex, executable_stack)) 27130 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
27067 current->personality |= READ_IMPLIES_EXEC; 27131 current->personality |= READ_IMPLIES_EXEC;
27068 27132
27069@@ -827,6 +1092,20 @@ static int load_elf_binary(struct linux_ 27133@@ -804,6 +1069,20 @@ static int load_elf_binary(struct linux_
27070 #else 27134 #else
27071 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); 27135 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
27072 #endif 27136 #endif
@@ -27087,7 +27151,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
27087 } 27151 }
27088 27152
27089 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, 27153 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
27090@@ -859,9 +1138,9 @@ static int load_elf_binary(struct linux_ 27154@@ -836,9 +1115,9 @@ static int load_elf_binary(struct linux_
27091 * allowed task size. Note that p_filesz must always be 27155 * allowed task size. Note that p_filesz must always be
27092 * <= p_memsz so it is only necessary to check p_memsz. 27156 * <= p_memsz so it is only necessary to check p_memsz.
27093 */ 27157 */
@@ -27100,7 +27164,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
27100 /* set_brk can never work. Avoid overflows. */ 27164 /* set_brk can never work. Avoid overflows. */
27101 send_sig(SIGKILL, current, 0); 27165 send_sig(SIGKILL, current, 0);
27102 retval = -EINVAL; 27166 retval = -EINVAL;
27103@@ -889,6 +1168,11 @@ static int load_elf_binary(struct linux_ 27167@@ -866,6 +1145,11 @@ static int load_elf_binary(struct linux_
27104 start_data += load_bias; 27168 start_data += load_bias;
27105 end_data += load_bias; 27169 end_data += load_bias;
27106 27170
@@ -27112,7 +27176,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
27112 /* Calling set_brk effectively mmaps the pages that we need 27176 /* Calling set_brk effectively mmaps the pages that we need
27113 * for the bss and break sections. We must do this before 27177 * for the bss and break sections. We must do this before
27114 * mapping in the interpreter, to make sure it doesn't wind 27178 * mapping in the interpreter, to make sure it doesn't wind
27115@@ -900,9 +1184,11 @@ static int load_elf_binary(struct linux_ 27179@@ -877,9 +1161,11 @@ static int load_elf_binary(struct linux_
27116 goto out_free_dentry; 27180 goto out_free_dentry;
27117 } 27181 }
27118 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) { 27182 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
@@ -27127,7 +27191,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
27127 } 27191 }
27128 27192
27129 if (elf_interpreter) { 27193 if (elf_interpreter) {
27130@@ -1135,8 +1421,10 @@ static int dump_seek(struct file *file, 27194@@ -1112,8 +1398,10 @@ static int dump_seek(struct file *file,
27131 unsigned long n = off; 27195 unsigned long n = off;
27132 if (n > PAGE_SIZE) 27196 if (n > PAGE_SIZE)
27133 n = PAGE_SIZE; 27197 n = PAGE_SIZE;
@@ -27139,7 +27203,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
27139 off -= n; 27203 off -= n;
27140 } 27204 }
27141 free_page((unsigned long)buf); 27205 free_page((unsigned long)buf);
27142@@ -1148,7 +1436,7 @@ static int dump_seek(struct file *file, 27206@@ -1125,7 +1413,7 @@ static int dump_seek(struct file *file,
27143 * Decide what to dump of a segment, part, all or none. 27207 * Decide what to dump of a segment, part, all or none.
27144 */ 27208 */
27145 static unsigned long vma_dump_size(struct vm_area_struct *vma, 27209 static unsigned long vma_dump_size(struct vm_area_struct *vma,
@@ -27148,7 +27212,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
27148 { 27212 {
27149 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type)) 27213 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
27150 27214
27151@@ -1182,7 +1470,7 @@ static unsigned long vma_dump_size(struc 27215@@ -1159,7 +1447,7 @@ static unsigned long vma_dump_size(struc
27152 if (vma->vm_file == NULL) 27216 if (vma->vm_file == NULL)
27153 return 0; 27217 return 0;
27154 27218
@@ -27157,7 +27221,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
27157 goto whole; 27221 goto whole;
27158 27222
27159 /* 27223 /*
27160@@ -1278,8 +1566,11 @@ static int writenote(struct memelfnote * 27224@@ -1255,8 +1543,11 @@ static int writenote(struct memelfnote *
27161 #undef DUMP_WRITE 27225 #undef DUMP_WRITE
27162 27226
27163 #define DUMP_WRITE(addr, nr) \ 27227 #define DUMP_WRITE(addr, nr) \
@@ -27170,7 +27234,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
27170 27234
27171 static void fill_elf_header(struct elfhdr *elf, int segs, 27235 static void fill_elf_header(struct elfhdr *elf, int segs,
27172 u16 machine, u32 flags, u8 osabi) 27236 u16 machine, u32 flags, u8 osabi)
27173@@ -1408,9 +1699,9 @@ static void fill_auxv_note(struct memelf 27237@@ -1385,9 +1676,9 @@ static void fill_auxv_note(struct memelf
27174 { 27238 {
27175 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv; 27239 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
27176 int i = 0; 27240 int i = 0;
@@ -27182,7 +27246,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
27182 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv); 27246 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
27183 } 27247 }
27184 27248
27185@@ -1996,7 +2287,7 @@ static int elf_core_dump(long signr, str 27249@@ -1973,7 +2264,7 @@ static int elf_core_dump(long signr, str
27186 phdr.p_offset = offset; 27250 phdr.p_offset = offset;
27187 phdr.p_vaddr = vma->vm_start; 27251 phdr.p_vaddr = vma->vm_start;
27188 phdr.p_paddr = 0; 27252 phdr.p_paddr = 0;
@@ -27191,7 +27255,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
27191 phdr.p_memsz = vma->vm_end - vma->vm_start; 27255 phdr.p_memsz = vma->vm_end - vma->vm_start;
27192 offset += phdr.p_filesz; 27256 offset += phdr.p_filesz;
27193 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0; 27257 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
27194@@ -2029,7 +2320,7 @@ static int elf_core_dump(long signr, str 27258@@ -2006,7 +2297,7 @@ static int elf_core_dump(long signr, str
27195 unsigned long addr; 27259 unsigned long addr;
27196 unsigned long end; 27260 unsigned long end;
27197 27261
@@ -27200,7 +27264,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
27200 27264
27201 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) { 27265 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
27202 struct page *page; 27266 struct page *page;
27203@@ -2038,6 +2329,7 @@ static int elf_core_dump(long signr, str 27267@@ -2015,6 +2306,7 @@ static int elf_core_dump(long signr, str
27204 page = get_dump_page(addr); 27268 page = get_dump_page(addr);
27205 if (page) { 27269 if (page) {
27206 void *kaddr = kmap(page); 27270 void *kaddr = kmap(page);
@@ -27208,7 +27272,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
27208 stop = ((size += PAGE_SIZE) > limit) || 27272 stop = ((size += PAGE_SIZE) > limit) ||
27209 !dump_write(file, kaddr, PAGE_SIZE); 27273 !dump_write(file, kaddr, PAGE_SIZE);
27210 kunmap(page); 27274 kunmap(page);
27211@@ -2065,6 +2357,97 @@ out: 27275@@ -2042,6 +2334,97 @@ out:
27212 27276
27213 #endif /* USE_ELF_CORE_DUMP */ 27277 #endif /* USE_ELF_CORE_DUMP */
27214 27278
@@ -27306,10 +27370,10 @@ diff -urNp linux-2.6.32.7/fs/binfmt_elf.c linux-2.6.32.7/fs/binfmt_elf.c
27306 static int __init init_elf_binfmt(void) 27370 static int __init init_elf_binfmt(void)
27307 { 27371 {
27308 return register_binfmt(&elf_format); 27372 return register_binfmt(&elf_format);
27309diff -urNp linux-2.6.32.7/fs/binfmt_flat.c linux-2.6.32.7/fs/binfmt_flat.c 27373diff -urNp linux-2.6.32.8/fs/binfmt_flat.c linux-2.6.32.8/fs/binfmt_flat.c
27310--- linux-2.6.32.7/fs/binfmt_flat.c 2010-01-25 13:50:10.000000000 -0500 27374--- linux-2.6.32.8/fs/binfmt_flat.c 2010-02-09 07:57:19.000000000 -0500
27311+++ linux-2.6.32.7/fs/binfmt_flat.c 2010-01-25 17:39:40.840303077 -0500 27375+++ linux-2.6.32.8/fs/binfmt_flat.c 2010-02-10 15:06:24.286215933 -0500
27312@@ -563,7 +563,9 @@ static int load_flat_file(struct linux_b 27376@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
27313 realdatastart = (unsigned long) -ENOMEM; 27377 realdatastart = (unsigned long) -ENOMEM;
27314 printk("Unable to allocate RAM for process data, errno %d\n", 27378 printk("Unable to allocate RAM for process data, errno %d\n",
27315 (int)-realdatastart); 27379 (int)-realdatastart);
@@ -27319,7 +27383,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_flat.c linux-2.6.32.7/fs/binfmt_flat.c
27319 ret = realdatastart; 27383 ret = realdatastart;
27320 goto err; 27384 goto err;
27321 } 27385 }
27322@@ -587,8 +589,10 @@ static int load_flat_file(struct linux_b 27386@@ -588,8 +590,10 @@ static int load_flat_file(struct linux_b
27323 } 27387 }
27324 if (IS_ERR_VALUE(result)) { 27388 if (IS_ERR_VALUE(result)) {
27325 printk("Unable to read data+bss, errno %d\n", (int)-result); 27389 printk("Unable to read data+bss, errno %d\n", (int)-result);
@@ -27330,7 +27394,7 @@ diff -urNp linux-2.6.32.7/fs/binfmt_flat.c linux-2.6.32.7/fs/binfmt_flat.c
27330 ret = result; 27394 ret = result;
27331 goto err; 27395 goto err;
27332 } 27396 }
27333@@ -657,8 +661,10 @@ static int load_flat_file(struct linux_b 27397@@ -658,8 +662,10 @@ static int load_flat_file(struct linux_b
27334 } 27398 }
27335 if (IS_ERR_VALUE(result)) { 27399 if (IS_ERR_VALUE(result)) {
27336 printk("Unable to read code+data+bss, errno %d\n",(int)-result); 27400 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
@@ -27341,9 +27405,9 @@ diff -urNp linux-2.6.32.7/fs/binfmt_flat.c linux-2.6.32.7/fs/binfmt_flat.c
27341 ret = result; 27405 ret = result;
27342 goto err; 27406 goto err;
27343 } 27407 }
27344diff -urNp linux-2.6.32.7/fs/binfmt_misc.c linux-2.6.32.7/fs/binfmt_misc.c 27408diff -urNp linux-2.6.32.8/fs/binfmt_misc.c linux-2.6.32.8/fs/binfmt_misc.c
27345--- linux-2.6.32.7/fs/binfmt_misc.c 2010-01-25 13:50:10.000000000 -0500 27409--- linux-2.6.32.8/fs/binfmt_misc.c 2010-02-09 07:57:19.000000000 -0500
27346+++ linux-2.6.32.7/fs/binfmt_misc.c 2010-01-25 17:39:40.840303077 -0500 27410+++ linux-2.6.32.8/fs/binfmt_misc.c 2010-02-10 15:06:24.286215933 -0500
27347@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl 27411@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
27348 static struct tree_descr bm_files[] = { 27412 static struct tree_descr bm_files[] = {
27349 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, 27413 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -27353,9 +27417,9 @@ diff -urNp linux-2.6.32.7/fs/binfmt_misc.c linux-2.6.32.7/fs/binfmt_misc.c
27353 }; 27417 };
27354 int err = simple_fill_super(sb, 0x42494e4d, bm_files); 27418 int err = simple_fill_super(sb, 0x42494e4d, bm_files);
27355 if (!err) 27419 if (!err)
27356diff -urNp linux-2.6.32.7/fs/bio.c linux-2.6.32.7/fs/bio.c 27420diff -urNp linux-2.6.32.8/fs/bio.c linux-2.6.32.8/fs/bio.c
27357--- linux-2.6.32.7/fs/bio.c 2010-01-25 13:50:10.000000000 -0500 27421--- linux-2.6.32.8/fs/bio.c 2010-02-09 07:57:19.000000000 -0500
27358+++ linux-2.6.32.7/fs/bio.c 2010-01-25 17:39:40.840303077 -0500 27422+++ linux-2.6.32.8/fs/bio.c 2010-02-10 15:06:24.286215933 -0500
27359@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr 27423@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
27360 27424
27361 i = 0; 27425 i = 0;
@@ -27365,7 +27429,7 @@ diff -urNp linux-2.6.32.7/fs/bio.c linux-2.6.32.7/fs/bio.c
27365 27429
27366 if (!bslab->slab && entry == -1) 27430 if (!bslab->slab && entry == -1)
27367 entry = i; 27431 entry = i;
27368@@ -1212,7 +1212,7 @@ static void bio_copy_kern_endio(struct b 27432@@ -1217,7 +1217,7 @@ static void bio_copy_kern_endio(struct b
27369 const int read = bio_data_dir(bio) == READ; 27433 const int read = bio_data_dir(bio) == READ;
27370 struct bio_map_data *bmd = bio->bi_private; 27434 struct bio_map_data *bmd = bio->bi_private;
27371 int i; 27435 int i;
@@ -27374,9 +27438,9 @@ diff -urNp linux-2.6.32.7/fs/bio.c linux-2.6.32.7/fs/bio.c
27374 27438
27375 __bio_for_each_segment(bvec, bio, i, 0) { 27439 __bio_for_each_segment(bvec, bio, i, 0) {
27376 char *addr = page_address(bvec->bv_page); 27440 char *addr = page_address(bvec->bv_page);
27377diff -urNp linux-2.6.32.7/fs/btrfs/ctree.c linux-2.6.32.7/fs/btrfs/ctree.c 27441diff -urNp linux-2.6.32.8/fs/btrfs/ctree.c linux-2.6.32.8/fs/btrfs/ctree.c
27378--- linux-2.6.32.7/fs/btrfs/ctree.c 2010-01-25 13:50:10.000000000 -0500 27442--- linux-2.6.32.8/fs/btrfs/ctree.c 2010-02-09 07:57:19.000000000 -0500
27379+++ linux-2.6.32.7/fs/btrfs/ctree.c 2010-01-25 17:39:40.841428527 -0500 27443+++ linux-2.6.32.8/fs/btrfs/ctree.c 2010-02-10 15:06:24.286215933 -0500
27380@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran 27444@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran
27381 27445
27382 ret = 0; 27446 ret = 0;
@@ -27385,9 +27449,9 @@ diff -urNp linux-2.6.32.7/fs/btrfs/ctree.c linux-2.6.32.7/fs/btrfs/ctree.c
27385 btrfs_cpu_key_to_disk(&disk_key, cpu_key); 27449 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
27386 ret = fixup_low_keys(trans, root, path, &disk_key, 1); 27450 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
27387 } 27451 }
27388diff -urNp linux-2.6.32.7/fs/btrfs/disk-io.c linux-2.6.32.7/fs/btrfs/disk-io.c 27452diff -urNp linux-2.6.32.8/fs/btrfs/disk-io.c linux-2.6.32.8/fs/btrfs/disk-io.c
27389--- linux-2.6.32.7/fs/btrfs/disk-io.c 2010-01-25 13:50:10.000000000 -0500 27453--- linux-2.6.32.8/fs/btrfs/disk-io.c 2010-02-09 07:57:19.000000000 -0500
27390+++ linux-2.6.32.7/fs/btrfs/disk-io.c 2010-01-25 17:39:40.842154796 -0500 27454+++ linux-2.6.32.8/fs/btrfs/disk-io.c 2010-02-10 15:06:24.286215933 -0500
27391@@ -39,7 +39,7 @@ 27455@@ -39,7 +39,7 @@
27392 #include "tree-log.h" 27456 #include "tree-log.h"
27393 #include "free-space-cache.h" 27457 #include "free-space-cache.h"
@@ -27406,9 +27470,9 @@ diff -urNp linux-2.6.32.7/fs/btrfs/disk-io.c linux-2.6.32.7/fs/btrfs/disk-io.c
27406 .write_cache_pages_lock_hook = btree_lock_page_hook, 27470 .write_cache_pages_lock_hook = btree_lock_page_hook,
27407 .readpage_end_io_hook = btree_readpage_end_io_hook, 27471 .readpage_end_io_hook = btree_readpage_end_io_hook,
27408 .submit_bio_hook = btree_submit_bio_hook, 27472 .submit_bio_hook = btree_submit_bio_hook,
27409diff -urNp linux-2.6.32.7/fs/btrfs/extent_io.h linux-2.6.32.7/fs/btrfs/extent_io.h 27473diff -urNp linux-2.6.32.8/fs/btrfs/extent_io.h linux-2.6.32.8/fs/btrfs/extent_io.h
27410--- linux-2.6.32.7/fs/btrfs/extent_io.h 2010-01-25 13:50:10.000000000 -0500 27474--- linux-2.6.32.8/fs/btrfs/extent_io.h 2010-02-09 07:57:19.000000000 -0500
27411+++ linux-2.6.32.7/fs/btrfs/extent_io.h 2010-01-25 17:39:40.842154796 -0500 27475+++ linux-2.6.32.8/fs/btrfs/extent_io.h 2010-02-10 15:06:24.286215933 -0500
27412@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s 27476@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
27413 struct bio *bio, int mirror_num, 27477 struct bio *bio, int mirror_num,
27414 unsigned long bio_flags); 27478 unsigned long bio_flags);
@@ -27469,9 +27533,9 @@ diff -urNp linux-2.6.32.7/fs/btrfs/extent_io.h linux-2.6.32.7/fs/btrfs/extent_io
27469 }; 27533 };
27470 27534
27471 struct extent_state { 27535 struct extent_state {
27472diff -urNp linux-2.6.32.7/fs/btrfs/free-space-cache.c linux-2.6.32.7/fs/btrfs/free-space-cache.c 27536diff -urNp linux-2.6.32.8/fs/btrfs/free-space-cache.c linux-2.6.32.8/fs/btrfs/free-space-cache.c
27473--- linux-2.6.32.7/fs/btrfs/free-space-cache.c 2010-01-25 13:50:10.000000000 -0500 27537--- linux-2.6.32.8/fs/btrfs/free-space-cache.c 2010-02-09 07:57:19.000000000 -0500
27474+++ linux-2.6.32.7/fs/btrfs/free-space-cache.c 2010-01-25 17:39:40.850151357 -0500 27538+++ linux-2.6.32.8/fs/btrfs/free-space-cache.c 2010-02-10 15:06:24.290012630 -0500
27475@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf 27539@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
27476 27540
27477 while(1) { 27541 while(1) {
@@ -27490,9 +27554,9 @@ diff -urNp linux-2.6.32.7/fs/btrfs/free-space-cache.c linux-2.6.32.7/fs/btrfs/fr
27490 27554
27491 if (entry->bitmap && entry->bytes > bytes + empty_size) { 27555 if (entry->bitmap && entry->bytes > bytes + empty_size) {
27492 ret = btrfs_bitmap_cluster(block_group, entry, cluster, 27556 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
27493diff -urNp linux-2.6.32.7/fs/btrfs/inode.c linux-2.6.32.7/fs/btrfs/inode.c 27557diff -urNp linux-2.6.32.8/fs/btrfs/inode.c linux-2.6.32.8/fs/btrfs/inode.c
27494--- linux-2.6.32.7/fs/btrfs/inode.c 2010-01-25 13:50:10.000000000 -0500 27558--- linux-2.6.32.8/fs/btrfs/inode.c 2010-02-09 07:57:19.000000000 -0500
27495+++ linux-2.6.32.7/fs/btrfs/inode.c 2010-01-25 17:39:40.851419030 -0500 27559+++ linux-2.6.32.8/fs/btrfs/inode.c 2010-02-10 15:06:24.290012630 -0500
27496@@ -63,7 +63,7 @@ static const struct inode_operations btr 27560@@ -63,7 +63,7 @@ static const struct inode_operations btr
27497 static const struct address_space_operations btrfs_aops; 27561 static const struct address_space_operations btrfs_aops;
27498 static const struct address_space_operations btrfs_symlink_aops; 27562 static const struct address_space_operations btrfs_symlink_aops;
@@ -27511,9 +27575,9 @@ diff -urNp linux-2.6.32.7/fs/btrfs/inode.c linux-2.6.32.7/fs/btrfs/inode.c
27511 .fill_delalloc = run_delalloc_range, 27575 .fill_delalloc = run_delalloc_range,
27512 .submit_bio_hook = btrfs_submit_bio_hook, 27576 .submit_bio_hook = btrfs_submit_bio_hook,
27513 .merge_bio_hook = btrfs_merge_bio_hook, 27577 .merge_bio_hook = btrfs_merge_bio_hook,
27514diff -urNp linux-2.6.32.7/fs/btrfs/sysfs.c linux-2.6.32.7/fs/btrfs/sysfs.c 27578diff -urNp linux-2.6.32.8/fs/btrfs/sysfs.c linux-2.6.32.8/fs/btrfs/sysfs.c
27515--- linux-2.6.32.7/fs/btrfs/sysfs.c 2010-01-25 13:50:10.000000000 -0500 27579--- linux-2.6.32.8/fs/btrfs/sysfs.c 2010-02-09 07:57:19.000000000 -0500
27516+++ linux-2.6.32.7/fs/btrfs/sysfs.c 2010-01-25 17:39:40.851419030 -0500 27580+++ linux-2.6.32.8/fs/btrfs/sysfs.c 2010-02-10 15:06:24.290012630 -0500
27517@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko 27581@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
27518 complete(&root->kobj_unregister); 27582 complete(&root->kobj_unregister);
27519 } 27583 }
@@ -27529,9 +27593,9 @@ diff -urNp linux-2.6.32.7/fs/btrfs/sysfs.c linux-2.6.32.7/fs/btrfs/sysfs.c
27529 .show = btrfs_root_attr_show, 27593 .show = btrfs_root_attr_show,
27530 .store = btrfs_root_attr_store, 27594 .store = btrfs_root_attr_store,
27531 }; 27595 };
27532diff -urNp linux-2.6.32.7/fs/buffer.c linux-2.6.32.7/fs/buffer.c 27596diff -urNp linux-2.6.32.8/fs/buffer.c linux-2.6.32.8/fs/buffer.c
27533--- linux-2.6.32.7/fs/buffer.c 2010-01-25 13:50:10.000000000 -0500 27597--- linux-2.6.32.8/fs/buffer.c 2010-02-09 07:57:19.000000000 -0500
27534+++ linux-2.6.32.7/fs/buffer.c 2010-01-25 17:39:40.852369217 -0500 27598+++ linux-2.6.32.8/fs/buffer.c 2010-02-10 15:06:24.290012630 -0500
27535@@ -25,6 +25,7 @@ 27599@@ -25,6 +25,7 @@
27536 #include <linux/percpu.h> 27600 #include <linux/percpu.h>
27537 #include <linux/slab.h> 27601 #include <linux/slab.h>
@@ -27540,9 +27604,9 @@ diff -urNp linux-2.6.32.7/fs/buffer.c linux-2.6.32.7/fs/buffer.c
27540 #include <linux/blkdev.h> 27604 #include <linux/blkdev.h>
27541 #include <linux/file.h> 27605 #include <linux/file.h>
27542 #include <linux/quotaops.h> 27606 #include <linux/quotaops.h>
27543diff -urNp linux-2.6.32.7/fs/cachefiles/rdwr.c linux-2.6.32.7/fs/cachefiles/rdwr.c 27607diff -urNp linux-2.6.32.8/fs/cachefiles/rdwr.c linux-2.6.32.8/fs/cachefiles/rdwr.c
27544--- linux-2.6.32.7/fs/cachefiles/rdwr.c 2010-01-25 13:50:10.000000000 -0500 27608--- linux-2.6.32.8/fs/cachefiles/rdwr.c 2010-02-09 07:57:19.000000000 -0500
27545+++ linux-2.6.32.7/fs/cachefiles/rdwr.c 2010-01-25 17:39:40.852369217 -0500 27609+++ linux-2.6.32.8/fs/cachefiles/rdwr.c 2010-02-10 15:06:24.290012630 -0500
27546@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache 27610@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
27547 old_fs = get_fs(); 27611 old_fs = get_fs();
27548 set_fs(KERNEL_DS); 27612 set_fs(KERNEL_DS);
@@ -27552,9 +27616,9 @@ diff -urNp linux-2.6.32.7/fs/cachefiles/rdwr.c linux-2.6.32.7/fs/cachefiles/rdwr
27552 set_fs(old_fs); 27616 set_fs(old_fs);
27553 kunmap(page); 27617 kunmap(page);
27554 if (ret != len) 27618 if (ret != len)
27555diff -urNp linux-2.6.32.7/fs/cifs/cifs_uniupr.h linux-2.6.32.7/fs/cifs/cifs_uniupr.h 27619diff -urNp linux-2.6.32.8/fs/cifs/cifs_uniupr.h linux-2.6.32.8/fs/cifs/cifs_uniupr.h
27556--- linux-2.6.32.7/fs/cifs/cifs_uniupr.h 2010-01-25 13:50:10.000000000 -0500 27620--- linux-2.6.32.8/fs/cifs/cifs_uniupr.h 2010-02-09 07:57:19.000000000 -0500
27557+++ linux-2.6.32.7/fs/cifs/cifs_uniupr.h 2010-01-25 17:39:40.852369217 -0500 27621+++ linux-2.6.32.8/fs/cifs/cifs_uniupr.h 2010-02-10 15:06:24.290012630 -0500
27558@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa 27622@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
27559 {0x0490, 0x04cc, UniCaseRangeU0490}, 27623 {0x0490, 0x04cc, UniCaseRangeU0490},
27560 {0x1e00, 0x1ffc, UniCaseRangeU1e00}, 27624 {0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -27564,9 +27628,9 @@ diff -urNp linux-2.6.32.7/fs/cifs/cifs_uniupr.h linux-2.6.32.7/fs/cifs/cifs_uniu
27564 }; 27628 };
27565 #endif 27629 #endif
27566 27630
27567diff -urNp linux-2.6.32.7/fs/cifs/link.c linux-2.6.32.7/fs/cifs/link.c 27631diff -urNp linux-2.6.32.8/fs/cifs/link.c linux-2.6.32.8/fs/cifs/link.c
27568--- linux-2.6.32.7/fs/cifs/link.c 2010-01-25 13:50:10.000000000 -0500 27632--- linux-2.6.32.8/fs/cifs/link.c 2010-02-09 07:57:19.000000000 -0500
27569+++ linux-2.6.32.7/fs/cifs/link.c 2010-01-25 17:39:40.852369217 -0500 27633+++ linux-2.6.32.8/fs/cifs/link.c 2010-02-10 15:06:24.290012630 -0500
27570@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct 27634@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
27571 27635
27572 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) 27636 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -27576,9 +27640,9 @@ diff -urNp linux-2.6.32.7/fs/cifs/link.c linux-2.6.32.7/fs/cifs/link.c
27576 if (!IS_ERR(p)) 27640 if (!IS_ERR(p))
27577 kfree(p); 27641 kfree(p);
27578 } 27642 }
27579diff -urNp linux-2.6.32.7/fs/compat_binfmt_elf.c linux-2.6.32.7/fs/compat_binfmt_elf.c 27643diff -urNp linux-2.6.32.8/fs/compat_binfmt_elf.c linux-2.6.32.8/fs/compat_binfmt_elf.c
27580--- linux-2.6.32.7/fs/compat_binfmt_elf.c 2010-01-25 13:50:10.000000000 -0500 27644--- linux-2.6.32.8/fs/compat_binfmt_elf.c 2010-02-09 07:57:19.000000000 -0500
27581+++ linux-2.6.32.7/fs/compat_binfmt_elf.c 2010-01-25 17:39:40.852369217 -0500 27645+++ linux-2.6.32.8/fs/compat_binfmt_elf.c 2010-02-10 15:06:24.290012630 -0500
27582@@ -29,10 +29,12 @@ 27646@@ -29,10 +29,12 @@
27583 #undef elfhdr 27647 #undef elfhdr
27584 #undef elf_phdr 27648 #undef elf_phdr
@@ -27592,9 +27656,9 @@ diff -urNp linux-2.6.32.7/fs/compat_binfmt_elf.c linux-2.6.32.7/fs/compat_binfmt
27592 #define elf_addr_t Elf32_Addr 27656 #define elf_addr_t Elf32_Addr
27593 27657
27594 /* 27658 /*
27595diff -urNp linux-2.6.32.7/fs/compat.c linux-2.6.32.7/fs/compat.c 27659diff -urNp linux-2.6.32.8/fs/compat.c linux-2.6.32.8/fs/compat.c
27596--- linux-2.6.32.7/fs/compat.c 2010-01-25 13:50:10.000000000 -0500 27660--- linux-2.6.32.8/fs/compat.c 2010-02-09 07:57:19.000000000 -0500
27597+++ linux-2.6.32.7/fs/compat.c 2010-01-25 17:39:40.853440941 -0500 27661+++ linux-2.6.32.8/fs/compat.c 2010-02-10 15:06:24.290012630 -0500
27598@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, 27662@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc,
27599 if (!kmapped_page || kpos != (pos & PAGE_MASK)) { 27663 if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
27600 struct page *page; 27664 struct page *page;
@@ -27694,9 +27758,9 @@ diff -urNp linux-2.6.32.7/fs/compat.c linux-2.6.32.7/fs/compat.c
27694 out: 27758 out:
27695 if (bprm->mm) 27759 if (bprm->mm)
27696 mmput(bprm->mm); 27760 mmput(bprm->mm);
27697diff -urNp linux-2.6.32.7/fs/compat_ioctl.c linux-2.6.32.7/fs/compat_ioctl.c 27761diff -urNp linux-2.6.32.8/fs/compat_ioctl.c linux-2.6.32.8/fs/compat_ioctl.c
27698--- linux-2.6.32.7/fs/compat_ioctl.c 2010-01-25 13:50:10.000000000 -0500 27762--- linux-2.6.32.8/fs/compat_ioctl.c 2010-02-09 07:57:19.000000000 -0500
27699+++ linux-2.6.32.7/fs/compat_ioctl.c 2010-01-25 17:39:40.854422632 -0500 27763+++ linux-2.6.32.8/fs/compat_ioctl.c 2010-02-10 15:06:24.290012630 -0500
27700@@ -1827,15 +1827,15 @@ struct ioctl_trans { 27764@@ -1827,15 +1827,15 @@ struct ioctl_trans {
27701 }; 27765 };
27702 27766
@@ -27716,9 +27780,9 @@ diff -urNp linux-2.6.32.7/fs/compat_ioctl.c linux-2.6.32.7/fs/compat_ioctl.c
27716 27780
27717 /* ioctl should not be warned about even if it's not implemented. 27781 /* ioctl should not be warned about even if it's not implemented.
27718 Valid reasons to use this: 27782 Valid reasons to use this:
27719diff -urNp linux-2.6.32.7/fs/debugfs/inode.c linux-2.6.32.7/fs/debugfs/inode.c 27783diff -urNp linux-2.6.32.8/fs/debugfs/inode.c linux-2.6.32.8/fs/debugfs/inode.c
27720--- linux-2.6.32.7/fs/debugfs/inode.c 2010-01-25 13:50:10.000000000 -0500 27784--- linux-2.6.32.8/fs/debugfs/inode.c 2010-02-09 07:57:19.000000000 -0500
27721+++ linux-2.6.32.7/fs/debugfs/inode.c 2010-01-25 17:39:40.854422632 -0500 27785+++ linux-2.6.32.8/fs/debugfs/inode.c 2010-02-10 15:06:24.317009197 -0500
27722@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc 27786@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
27723 27787
27724 static int debug_fill_super(struct super_block *sb, void *data, int silent) 27788 static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -27728,9 +27792,9 @@ diff -urNp linux-2.6.32.7/fs/debugfs/inode.c linux-2.6.32.7/fs/debugfs/inode.c
27728 27792
27729 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); 27793 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
27730 } 27794 }
27731diff -urNp linux-2.6.32.7/fs/dlm/lockspace.c linux-2.6.32.7/fs/dlm/lockspace.c 27795diff -urNp linux-2.6.32.8/fs/dlm/lockspace.c linux-2.6.32.8/fs/dlm/lockspace.c
27732--- linux-2.6.32.7/fs/dlm/lockspace.c 2010-01-25 13:50:10.000000000 -0500 27796--- linux-2.6.32.8/fs/dlm/lockspace.c 2010-02-09 07:57:19.000000000 -0500
27733+++ linux-2.6.32.7/fs/dlm/lockspace.c 2010-01-25 17:39:40.854422632 -0500 27797+++ linux-2.6.32.8/fs/dlm/lockspace.c 2010-02-10 15:06:24.317009197 -0500
27734@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc 27798@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
27735 kfree(ls); 27799 kfree(ls);
27736 } 27800 }
@@ -27740,9 +27804,9 @@ diff -urNp linux-2.6.32.7/fs/dlm/lockspace.c linux-2.6.32.7/fs/dlm/lockspace.c
27740 .show = dlm_attr_show, 27804 .show = dlm_attr_show,
27741 .store = dlm_attr_store, 27805 .store = dlm_attr_store,
27742 }; 27806 };
27743diff -urNp linux-2.6.32.7/fs/ecryptfs/inode.c linux-2.6.32.7/fs/ecryptfs/inode.c 27807diff -urNp linux-2.6.32.8/fs/ecryptfs/inode.c linux-2.6.32.8/fs/ecryptfs/inode.c
27744--- linux-2.6.32.7/fs/ecryptfs/inode.c 2010-01-25 13:50:10.000000000 -0500 27808--- linux-2.6.32.8/fs/ecryptfs/inode.c 2010-02-09 07:57:19.000000000 -0500
27745+++ linux-2.6.32.7/fs/ecryptfs/inode.c 2010-01-25 17:39:40.855424759 -0500 27809+++ linux-2.6.32.8/fs/ecryptfs/inode.c 2010-02-10 15:06:24.330020565 -0500
27746@@ -676,7 +676,7 @@ ecryptfs_readlink(struct dentry *dentry, 27810@@ -676,7 +676,7 @@ ecryptfs_readlink(struct dentry *dentry,
27747 old_fs = get_fs(); 27811 old_fs = get_fs();
27748 set_fs(get_ds()); 27812 set_fs(get_ds());
@@ -27761,9 +27825,9 @@ diff -urNp linux-2.6.32.7/fs/ecryptfs/inode.c linux-2.6.32.7/fs/ecryptfs/inode.c
27761 set_fs(old_fs); 27825 set_fs(old_fs);
27762 if (rc < 0) 27826 if (rc < 0)
27763 goto out_free; 27827 goto out_free;
27764diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c 27828diff -urNp linux-2.6.32.8/fs/exec.c linux-2.6.32.8/fs/exec.c
27765--- linux-2.6.32.7/fs/exec.c 2010-01-25 13:50:10.000000000 -0500 27829--- linux-2.6.32.8/fs/exec.c 2010-02-09 07:57:19.000000000 -0500
27766+++ linux-2.6.32.7/fs/exec.c 2010-01-25 17:39:40.855424759 -0500 27830+++ linux-2.6.32.8/fs/exec.c 2010-02-10 15:06:24.338020681 -0500
27767@@ -56,12 +56,24 @@ 27831@@ -56,12 +56,24 @@
27768 #include <linux/fsnotify.h> 27832 #include <linux/fsnotify.h>
27769 #include <linux/fs_struct.h> 27833 #include <linux/fs_struct.h>
@@ -27940,7 +28004,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c
27940 set_fs(old_fs); 28004 set_fs(old_fs);
27941 return result; 28005 return result;
27942 } 28006 }
27943@@ -1088,7 +1121,7 @@ int check_unsafe_exec(struct linux_binpr 28007@@ -1094,7 +1127,7 @@ int check_unsafe_exec(struct linux_binpr
27944 } 28008 }
27945 rcu_read_unlock(); 28009 rcu_read_unlock();
27946 28010
@@ -27949,7 +28013,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c
27949 bprm->unsafe |= LSM_UNSAFE_SHARE; 28013 bprm->unsafe |= LSM_UNSAFE_SHARE;
27950 } else { 28014 } else {
27951 res = -EAGAIN; 28015 res = -EAGAIN;
27952@@ -1287,6 +1320,11 @@ int do_execve(char * filename, 28016@@ -1293,6 +1326,11 @@ int do_execve(char * filename,
27953 char __user *__user *envp, 28017 char __user *__user *envp,
27954 struct pt_regs * regs) 28018 struct pt_regs * regs)
27955 { 28019 {
@@ -27961,7 +28025,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c
27961 struct linux_binprm *bprm; 28025 struct linux_binprm *bprm;
27962 struct file *file; 28026 struct file *file;
27963 struct files_struct *displaced; 28027 struct files_struct *displaced;
27964@@ -1323,6 +1361,18 @@ int do_execve(char * filename, 28028@@ -1329,6 +1367,18 @@ int do_execve(char * filename,
27965 bprm->filename = filename; 28029 bprm->filename = filename;
27966 bprm->interp = filename; 28030 bprm->interp = filename;
27967 28031
@@ -27980,7 +28044,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c
27980 retval = bprm_mm_init(bprm); 28044 retval = bprm_mm_init(bprm);
27981 if (retval) 28045 if (retval)
27982 goto out_file; 28046 goto out_file;
27983@@ -1352,10 +1402,41 @@ int do_execve(char * filename, 28047@@ -1358,10 +1408,41 @@ int do_execve(char * filename,
27984 if (retval < 0) 28048 if (retval < 0)
27985 goto out; 28049 goto out;
27986 28050
@@ -28023,7 +28087,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c
28023 28087
28024 current->stack_start = current->mm->start_stack; 28088 current->stack_start = current->mm->start_stack;
28025 28089
28026@@ -1368,6 +1449,14 @@ int do_execve(char * filename, 28090@@ -1374,6 +1455,14 @@ int do_execve(char * filename,
28027 put_files_struct(displaced); 28091 put_files_struct(displaced);
28028 return retval; 28092 return retval;
28029 28093
@@ -28038,7 +28102,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c
28038 out: 28102 out:
28039 if (bprm->mm) 28103 if (bprm->mm)
28040 mmput (bprm->mm); 28104 mmput (bprm->mm);
28041@@ -1531,6 +1620,169 @@ out: 28105@@ -1537,6 +1626,169 @@ out:
28042 return ispipe; 28106 return ispipe;
28043 } 28107 }
28044 28108
@@ -28208,7 +28272,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c
28208 static int zap_process(struct task_struct *start) 28272 static int zap_process(struct task_struct *start)
28209 { 28273 {
28210 struct task_struct *t; 28274 struct task_struct *t;
28211@@ -1733,17 +1985,17 @@ static void wait_for_dump_helpers(struct 28275@@ -1739,17 +1991,17 @@ static void wait_for_dump_helpers(struct
28212 pipe = file->f_path.dentry->d_inode->i_pipe; 28276 pipe = file->f_path.dentry->d_inode->i_pipe;
28213 28277
28214 pipe_lock(pipe); 28278 pipe_lock(pipe);
@@ -28231,7 +28295,7 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c
28231 pipe_unlock(pipe); 28295 pipe_unlock(pipe);
28232 28296
28233 } 28297 }
28234@@ -1814,6 +2066,10 @@ void do_coredump(long signr, int exit_co 28298@@ -1820,6 +2072,10 @@ void do_coredump(long signr, int exit_co
28235 */ 28299 */
28236 clear_thread_flag(TIF_SIGPENDING); 28300 clear_thread_flag(TIF_SIGPENDING);
28237 28301
@@ -28242,9 +28306,9 @@ diff -urNp linux-2.6.32.7/fs/exec.c linux-2.6.32.7/fs/exec.c
28242 /* 28306 /*
28243 * lock_kernel() because format_corename() is controlled by sysctl, which 28307 * lock_kernel() because format_corename() is controlled by sysctl, which
28244 * uses lock_kernel() 28308 * uses lock_kernel()
28245diff -urNp linux-2.6.32.7/fs/ext2/balloc.c linux-2.6.32.7/fs/ext2/balloc.c 28309diff -urNp linux-2.6.32.8/fs/ext2/balloc.c linux-2.6.32.8/fs/ext2/balloc.c
28246--- linux-2.6.32.7/fs/ext2/balloc.c 2010-01-25 13:50:10.000000000 -0500 28310--- linux-2.6.32.8/fs/ext2/balloc.c 2010-02-09 07:57:19.000000000 -0500
28247+++ linux-2.6.32.7/fs/ext2/balloc.c 2010-01-25 17:39:40.856418905 -0500 28311+++ linux-2.6.32.8/fs/ext2/balloc.c 2010-02-10 15:06:24.338020681 -0500
28248@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e 28312@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
28249 28313
28250 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 28314 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -28254,9 +28318,9 @@ diff -urNp linux-2.6.32.7/fs/ext2/balloc.c linux-2.6.32.7/fs/ext2/balloc.c
28254 sbi->s_resuid != current_fsuid() && 28318 sbi->s_resuid != current_fsuid() &&
28255 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 28319 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
28256 return 0; 28320 return 0;
28257diff -urNp linux-2.6.32.7/fs/ext3/balloc.c linux-2.6.32.7/fs/ext3/balloc.c 28321diff -urNp linux-2.6.32.8/fs/ext3/balloc.c linux-2.6.32.8/fs/ext3/balloc.c
28258--- linux-2.6.32.7/fs/ext3/balloc.c 2010-01-25 13:50:10.000000000 -0500 28322--- linux-2.6.32.8/fs/ext3/balloc.c 2010-02-09 07:57:19.000000000 -0500
28259+++ linux-2.6.32.7/fs/ext3/balloc.c 2010-01-25 17:39:40.856418905 -0500 28323+++ linux-2.6.32.8/fs/ext3/balloc.c 2010-02-10 15:06:24.370523394 -0500
28260@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e 28324@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
28261 28325
28262 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 28326 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -28266,9 +28330,9 @@ diff -urNp linux-2.6.32.7/fs/ext3/balloc.c linux-2.6.32.7/fs/ext3/balloc.c
28266 sbi->s_resuid != current_fsuid() && 28330 sbi->s_resuid != current_fsuid() &&
28267 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 28331 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
28268 return 0; 28332 return 0;
28269diff -urNp linux-2.6.32.7/fs/ext3/namei.c linux-2.6.32.7/fs/ext3/namei.c 28333diff -urNp linux-2.6.32.8/fs/ext3/namei.c linux-2.6.32.8/fs/ext3/namei.c
28270--- linux-2.6.32.7/fs/ext3/namei.c 2010-01-25 13:50:10.000000000 -0500 28334--- linux-2.6.32.8/fs/ext3/namei.c 2010-02-09 07:57:19.000000000 -0500
28271+++ linux-2.6.32.7/fs/ext3/namei.c 2010-01-25 17:39:40.856418905 -0500 28335+++ linux-2.6.32.8/fs/ext3/namei.c 2010-02-10 15:06:24.390016502 -0500
28272@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split 28336@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
28273 char *data1 = (*bh)->b_data, *data2; 28337 char *data1 = (*bh)->b_data, *data2;
28274 unsigned split, move, size; 28338 unsigned split, move, size;
@@ -28278,9 +28342,9 @@ diff -urNp linux-2.6.32.7/fs/ext3/namei.c linux-2.6.32.7/fs/ext3/namei.c
28278 28342
28279 bh2 = ext3_append (handle, dir, &newblock, &err); 28343 bh2 = ext3_append (handle, dir, &newblock, &err);
28280 if (!(bh2)) { 28344 if (!(bh2)) {
28281diff -urNp linux-2.6.32.7/fs/ext3/xattr.c linux-2.6.32.7/fs/ext3/xattr.c 28345diff -urNp linux-2.6.32.8/fs/ext3/xattr.c linux-2.6.32.8/fs/ext3/xattr.c
28282--- linux-2.6.32.7/fs/ext3/xattr.c 2010-01-25 13:50:10.000000000 -0500 28346--- linux-2.6.32.8/fs/ext3/xattr.c 2010-02-09 07:57:19.000000000 -0500
28283+++ linux-2.6.32.7/fs/ext3/xattr.c 2010-01-25 17:39:40.857371632 -0500 28347+++ linux-2.6.32.8/fs/ext3/xattr.c 2010-02-10 15:06:24.390016502 -0500
28284@@ -89,8 +89,8 @@ 28348@@ -89,8 +89,8 @@
28285 printk("\n"); \ 28349 printk("\n"); \
28286 } while (0) 28350 } while (0)
@@ -28292,9 +28356,9 @@ diff -urNp linux-2.6.32.7/fs/ext3/xattr.c linux-2.6.32.7/fs/ext3/xattr.c
28292 #endif 28356 #endif
28293 28357
28294 static void ext3_xattr_cache_insert(struct buffer_head *); 28358 static void ext3_xattr_cache_insert(struct buffer_head *);
28295diff -urNp linux-2.6.32.7/fs/ext4/balloc.c linux-2.6.32.7/fs/ext4/balloc.c 28359diff -urNp linux-2.6.32.8/fs/ext4/balloc.c linux-2.6.32.8/fs/ext4/balloc.c
28296--- linux-2.6.32.7/fs/ext4/balloc.c 2010-01-25 13:50:10.000000000 -0500 28360--- linux-2.6.32.8/fs/ext4/balloc.c 2010-02-09 07:57:19.000000000 -0500
28297+++ linux-2.6.32.7/fs/ext4/balloc.c 2010-01-25 17:39:40.857371632 -0500 28361+++ linux-2.6.32.8/fs/ext4/balloc.c 2010-02-10 15:06:24.390016502 -0500
28298@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ 28362@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_
28299 /* Hm, nope. Are (enough) root reserved blocks available? */ 28363 /* Hm, nope. Are (enough) root reserved blocks available? */
28300 if (sbi->s_resuid == current_fsuid() || 28364 if (sbi->s_resuid == current_fsuid() ||
@@ -28304,9 +28368,9 @@ diff -urNp linux-2.6.32.7/fs/ext4/balloc.c linux-2.6.32.7/fs/ext4/balloc.c
28304 if (free_blocks >= (nblocks + dirty_blocks)) 28368 if (free_blocks >= (nblocks + dirty_blocks))
28305 return 1; 28369 return 1;
28306 } 28370 }
28307diff -urNp linux-2.6.32.7/fs/ext4/ioctl.c linux-2.6.32.7/fs/ext4/ioctl.c 28371diff -urNp linux-2.6.32.8/fs/ext4/ioctl.c linux-2.6.32.8/fs/ext4/ioctl.c
28308--- linux-2.6.32.7/fs/ext4/ioctl.c 2010-01-25 13:50:10.000000000 -0500 28372--- linux-2.6.32.8/fs/ext4/ioctl.c 2010-02-09 07:57:19.000000000 -0500
28309+++ linux-2.6.32.7/fs/ext4/ioctl.c 2010-01-25 17:39:40.857371632 -0500 28373+++ linux-2.6.32.8/fs/ext4/ioctl.c 2010-02-10 15:06:24.390016502 -0500
28310@@ -221,6 +221,9 @@ setversion_out: 28374@@ -221,6 +221,9 @@ setversion_out:
28311 struct file *donor_filp; 28375 struct file *donor_filp;
28312 int err; 28376 int err;
@@ -28317,9 +28381,9 @@ diff -urNp linux-2.6.32.7/fs/ext4/ioctl.c linux-2.6.32.7/fs/ext4/ioctl.c
28317 if (!(filp->f_mode & FMODE_READ) || 28381 if (!(filp->f_mode & FMODE_READ) ||
28318 !(filp->f_mode & FMODE_WRITE)) 28382 !(filp->f_mode & FMODE_WRITE))
28319 return -EBADF; 28383 return -EBADF;
28320diff -urNp linux-2.6.32.7/fs/ext4/namei.c linux-2.6.32.7/fs/ext4/namei.c 28384diff -urNp linux-2.6.32.8/fs/ext4/namei.c linux-2.6.32.8/fs/ext4/namei.c
28321--- linux-2.6.32.7/fs/ext4/namei.c 2010-01-25 13:50:10.000000000 -0500 28385--- linux-2.6.32.8/fs/ext4/namei.c 2010-02-09 07:57:19.000000000 -0500
28322+++ linux-2.6.32.7/fs/ext4/namei.c 2010-01-25 17:39:40.858402028 -0500 28386+++ linux-2.6.32.8/fs/ext4/namei.c 2010-02-10 15:06:24.390016502 -0500
28323@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split 28387@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
28324 char *data1 = (*bh)->b_data, *data2; 28388 char *data1 = (*bh)->b_data, *data2;
28325 unsigned split, move, size; 28389 unsigned split, move, size;
@@ -28329,9 +28393,9 @@ diff -urNp linux-2.6.32.7/fs/ext4/namei.c linux-2.6.32.7/fs/ext4/namei.c
28329 28393
28330 bh2 = ext4_append (handle, dir, &newblock, &err); 28394 bh2 = ext4_append (handle, dir, &newblock, &err);
28331 if (!(bh2)) { 28395 if (!(bh2)) {
28332diff -urNp linux-2.6.32.7/fs/ext4/super.c linux-2.6.32.7/fs/ext4/super.c 28396diff -urNp linux-2.6.32.8/fs/ext4/super.c linux-2.6.32.8/fs/ext4/super.c
28333--- linux-2.6.32.7/fs/ext4/super.c 2010-01-25 13:50:10.000000000 -0500 28397--- linux-2.6.32.8/fs/ext4/super.c 2010-02-09 07:57:19.000000000 -0500
28334+++ linux-2.6.32.7/fs/ext4/super.c 2010-01-25 17:39:40.858402028 -0500 28398+++ linux-2.6.32.8/fs/ext4/super.c 2010-02-10 15:06:24.390016502 -0500
28335@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje 28399@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje
28336 } 28400 }
28337 28401
@@ -28341,9 +28405,9 @@ diff -urNp linux-2.6.32.7/fs/ext4/super.c linux-2.6.32.7/fs/ext4/super.c
28341 .show = ext4_attr_show, 28405 .show = ext4_attr_show,
28342 .store = ext4_attr_store, 28406 .store = ext4_attr_store,
28343 }; 28407 };
28344diff -urNp linux-2.6.32.7/fs/fcntl.c linux-2.6.32.7/fs/fcntl.c 28408diff -urNp linux-2.6.32.8/fs/fcntl.c linux-2.6.32.8/fs/fcntl.c
28345--- linux-2.6.32.7/fs/fcntl.c 2010-01-25 20:04:15.424090472 -0500 28409--- linux-2.6.32.8/fs/fcntl.c 2010-02-09 07:57:19.000000000 -0500
28346+++ linux-2.6.32.7/fs/fcntl.c 2010-01-25 20:04:24.955600005 -0500 28410+++ linux-2.6.32.8/fs/fcntl.c 2010-02-10 15:06:24.390016502 -0500
28347@@ -346,6 +346,7 @@ static long do_fcntl(int fd, unsigned in 28411@@ -346,6 +346,7 @@ static long do_fcntl(int fd, unsigned in
28348 switch (cmd) { 28412 switch (cmd) {
28349 case F_DUPFD: 28413 case F_DUPFD:
@@ -28362,9 +28426,9 @@ diff -urNp linux-2.6.32.7/fs/fcntl.c linux-2.6.32.7/fs/fcntl.c
28362 rcu_read_unlock(); 28426 rcu_read_unlock();
28363 return ret; 28427 return ret;
28364 } 28428 }
28365diff -urNp linux-2.6.32.7/fs/fifo.c linux-2.6.32.7/fs/fifo.c 28429diff -urNp linux-2.6.32.8/fs/fifo.c linux-2.6.32.8/fs/fifo.c
28366--- linux-2.6.32.7/fs/fifo.c 2010-01-25 13:50:10.000000000 -0500 28430--- linux-2.6.32.8/fs/fifo.c 2010-02-09 07:57:19.000000000 -0500
28367+++ linux-2.6.32.7/fs/fifo.c 2010-01-25 17:39:40.859418542 -0500 28431+++ linux-2.6.32.8/fs/fifo.c 2010-02-10 15:06:24.398028271 -0500
28368@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode 28432@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
28369 */ 28433 */
28370 filp->f_op = &read_pipefifo_fops; 28434 filp->f_op = &read_pipefifo_fops;
@@ -28435,9 +28499,9 @@ diff -urNp linux-2.6.32.7/fs/fifo.c linux-2.6.32.7/fs/fifo.c
28435 free_pipe_info(inode); 28499 free_pipe_info(inode);
28436 28500
28437 err_nocleanup: 28501 err_nocleanup:
28438diff -urNp linux-2.6.32.7/fs/file.c linux-2.6.32.7/fs/file.c 28502diff -urNp linux-2.6.32.8/fs/file.c linux-2.6.32.8/fs/file.c
28439--- linux-2.6.32.7/fs/file.c 2010-01-25 13:50:10.000000000 -0500 28503--- linux-2.6.32.8/fs/file.c 2010-02-09 07:57:19.000000000 -0500
28440+++ linux-2.6.32.7/fs/file.c 2010-01-25 17:39:40.866271752 -0500 28504+++ linux-2.6.32.8/fs/file.c 2010-02-10 15:06:24.402022433 -0500
28441@@ -14,6 +14,7 @@ 28505@@ -14,6 +14,7 @@
28442 #include <linux/slab.h> 28506 #include <linux/slab.h>
28443 #include <linux/vmalloc.h> 28507 #include <linux/vmalloc.h>
@@ -28455,9 +28519,9 @@ diff -urNp linux-2.6.32.7/fs/file.c linux-2.6.32.7/fs/file.c
28455 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 28519 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
28456 return -EMFILE; 28520 return -EMFILE;
28457 28521
28458diff -urNp linux-2.6.32.7/fs/fs_struct.c linux-2.6.32.7/fs/fs_struct.c 28522diff -urNp linux-2.6.32.8/fs/fs_struct.c linux-2.6.32.8/fs/fs_struct.c
28459--- linux-2.6.32.7/fs/fs_struct.c 2010-01-25 13:50:10.000000000 -0500 28523--- linux-2.6.32.8/fs/fs_struct.c 2010-02-09 07:57:19.000000000 -0500
28460+++ linux-2.6.32.7/fs/fs_struct.c 2010-01-25 17:39:40.866271752 -0500 28524+++ linux-2.6.32.8/fs/fs_struct.c 2010-02-10 15:06:24.402022433 -0500
28461@@ -89,7 +89,7 @@ void exit_fs(struct task_struct *tsk) 28525@@ -89,7 +89,7 @@ void exit_fs(struct task_struct *tsk)
28462 task_lock(tsk); 28526 task_lock(tsk);
28463 write_lock(&fs->lock); 28527 write_lock(&fs->lock);
@@ -28509,9 +28573,9 @@ diff -urNp linux-2.6.32.7/fs/fs_struct.c linux-2.6.32.7/fs/fs_struct.c
28509 write_unlock(&fs->lock); 28573 write_unlock(&fs->lock);
28510 28574
28511 task_unlock(current); 28575 task_unlock(current);
28512diff -urNp linux-2.6.32.7/fs/fuse/control.c linux-2.6.32.7/fs/fuse/control.c 28576diff -urNp linux-2.6.32.8/fs/fuse/control.c linux-2.6.32.8/fs/fuse/control.c
28513--- linux-2.6.32.7/fs/fuse/control.c 2010-01-25 13:50:10.000000000 -0500 28577--- linux-2.6.32.8/fs/fuse/control.c 2010-02-09 07:57:19.000000000 -0500
28514+++ linux-2.6.32.7/fs/fuse/control.c 2010-01-25 17:39:40.866271752 -0500 28578+++ linux-2.6.32.8/fs/fuse/control.c 2010-02-10 15:06:24.402022433 -0500
28515@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co 28579@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
28516 28580
28517 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) 28581 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -28521,9 +28585,9 @@ diff -urNp linux-2.6.32.7/fs/fuse/control.c linux-2.6.32.7/fs/fuse/control.c
28521 struct fuse_conn *fc; 28585 struct fuse_conn *fc;
28522 int err; 28586 int err;
28523 28587
28524diff -urNp linux-2.6.32.7/fs/fuse/cuse.c linux-2.6.32.7/fs/fuse/cuse.c 28588diff -urNp linux-2.6.32.8/fs/fuse/cuse.c linux-2.6.32.8/fs/fuse/cuse.c
28525--- linux-2.6.32.7/fs/fuse/cuse.c 2010-01-25 13:50:10.000000000 -0500 28589--- linux-2.6.32.8/fs/fuse/cuse.c 2010-02-09 07:57:19.000000000 -0500
28526+++ linux-2.6.32.7/fs/fuse/cuse.c 2010-01-25 17:39:40.866271752 -0500 28590+++ linux-2.6.32.8/fs/fuse/cuse.c 2010-02-10 15:06:24.402022433 -0500
28527@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i 28591@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
28528 return rc; 28592 return rc;
28529 } 28593 }
@@ -28558,9 +28622,9 @@ diff -urNp linux-2.6.32.7/fs/fuse/cuse.c linux-2.6.32.7/fs/fuse/cuse.c
28558 cuse_class = class_create(THIS_MODULE, "cuse"); 28622 cuse_class = class_create(THIS_MODULE, "cuse");
28559 if (IS_ERR(cuse_class)) 28623 if (IS_ERR(cuse_class))
28560 return PTR_ERR(cuse_class); 28624 return PTR_ERR(cuse_class);
28561diff -urNp linux-2.6.32.7/fs/fuse/dev.c linux-2.6.32.7/fs/fuse/dev.c 28625diff -urNp linux-2.6.32.8/fs/fuse/dev.c linux-2.6.32.8/fs/fuse/dev.c
28562--- linux-2.6.32.7/fs/fuse/dev.c 2010-01-25 13:50:10.000000000 -0500 28626--- linux-2.6.32.8/fs/fuse/dev.c 2010-02-09 07:57:19.000000000 -0500
28563+++ linux-2.6.32.7/fs/fuse/dev.c 2010-01-25 17:39:40.867441916 -0500 28627+++ linux-2.6.32.8/fs/fuse/dev.c 2010-02-10 15:06:24.402022433 -0500
28564@@ -745,7 +745,7 @@ __releases(&fc->lock) 28628@@ -745,7 +745,7 @@ __releases(&fc->lock)
28565 * request_end(). Otherwise add it to the processing list, and set 28629 * request_end(). Otherwise add it to the processing list, and set
28566 * the 'sent' flag. 28630 * the 'sent' flag.
@@ -28666,9 +28730,9 @@ diff -urNp linux-2.6.32.7/fs/fuse/dev.c linux-2.6.32.7/fs/fuse/dev.c
28666 28730
28667 const struct file_operations fuse_dev_operations = { 28731 const struct file_operations fuse_dev_operations = {
28668 .owner = THIS_MODULE, 28732 .owner = THIS_MODULE,
28669diff -urNp linux-2.6.32.7/fs/fuse/dir.c linux-2.6.32.7/fs/fuse/dir.c 28733diff -urNp linux-2.6.32.8/fs/fuse/dir.c linux-2.6.32.8/fs/fuse/dir.c
28670--- linux-2.6.32.7/fs/fuse/dir.c 2010-01-25 13:50:10.000000000 -0500 28734--- linux-2.6.32.8/fs/fuse/dir.c 2010-02-09 07:57:19.000000000 -0500
28671+++ linux-2.6.32.7/fs/fuse/dir.c 2010-01-25 17:39:40.867441916 -0500 28735+++ linux-2.6.32.8/fs/fuse/dir.c 2010-02-10 15:06:24.402022433 -0500
28672@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de 28736@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
28673 return link; 28737 return link;
28674 } 28738 }
@@ -28678,9 +28742,9 @@ diff -urNp linux-2.6.32.7/fs/fuse/dir.c linux-2.6.32.7/fs/fuse/dir.c
28678 { 28742 {
28679 if (!IS_ERR(link)) 28743 if (!IS_ERR(link))
28680 free_page((unsigned long) link); 28744 free_page((unsigned long) link);
28681diff -urNp linux-2.6.32.7/fs/fuse/fuse_i.h linux-2.6.32.7/fs/fuse/fuse_i.h 28745diff -urNp linux-2.6.32.8/fs/fuse/fuse_i.h linux-2.6.32.8/fs/fuse/fuse_i.h
28682--- linux-2.6.32.7/fs/fuse/fuse_i.h 2010-01-25 13:50:10.000000000 -0500 28746--- linux-2.6.32.8/fs/fuse/fuse_i.h 2010-02-09 07:57:19.000000000 -0500
28683+++ linux-2.6.32.7/fs/fuse/fuse_i.h 2010-01-25 17:39:40.867441916 -0500 28747+++ linux-2.6.32.8/fs/fuse/fuse_i.h 2010-02-10 15:06:24.402022433 -0500
28684@@ -521,6 +521,16 @@ extern const struct file_operations fuse 28748@@ -521,6 +521,16 @@ extern const struct file_operations fuse
28685 28749
28686 extern const struct dentry_operations fuse_dentry_operations; 28750 extern const struct dentry_operations fuse_dentry_operations;
@@ -28698,9 +28762,9 @@ diff -urNp linux-2.6.32.7/fs/fuse/fuse_i.h linux-2.6.32.7/fs/fuse/fuse_i.h
28698 /** 28762 /**
28699 * Inode to nodeid comparison. 28763 * Inode to nodeid comparison.
28700 */ 28764 */
28701diff -urNp linux-2.6.32.7/fs/gfs2/sys.c linux-2.6.32.7/fs/gfs2/sys.c 28765diff -urNp linux-2.6.32.8/fs/gfs2/sys.c linux-2.6.32.8/fs/gfs2/sys.c
28702--- linux-2.6.32.7/fs/gfs2/sys.c 2010-01-25 13:50:10.000000000 -0500 28766--- linux-2.6.32.8/fs/gfs2/sys.c 2010-02-09 07:57:19.000000000 -0500
28703+++ linux-2.6.32.7/fs/gfs2/sys.c 2010-01-25 17:39:40.868164104 -0500 28767+++ linux-2.6.32.8/fs/gfs2/sys.c 2010-02-10 15:06:24.422027218 -0500
28704@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko 28768@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
28705 return a->store ? a->store(sdp, buf, len) : len; 28769 return a->store ? a->store(sdp, buf, len) : len;
28706 } 28770 }
@@ -28719,9 +28783,9 @@ diff -urNp linux-2.6.32.7/fs/gfs2/sys.c linux-2.6.32.7/fs/gfs2/sys.c
28719 .uevent = gfs2_uevent, 28783 .uevent = gfs2_uevent,
28720 }; 28784 };
28721 28785
28722diff -urNp linux-2.6.32.7/fs/hfs/inode.c linux-2.6.32.7/fs/hfs/inode.c 28786diff -urNp linux-2.6.32.8/fs/hfs/inode.c linux-2.6.32.8/fs/hfs/inode.c
28723--- linux-2.6.32.7/fs/hfs/inode.c 2010-01-25 13:50:10.000000000 -0500 28787--- linux-2.6.32.8/fs/hfs/inode.c 2010-02-09 07:57:19.000000000 -0500
28724+++ linux-2.6.32.7/fs/hfs/inode.c 2010-01-25 17:39:40.868164104 -0500 28788+++ linux-2.6.32.8/fs/hfs/inode.c 2010-02-10 15:06:24.422027218 -0500
28725@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, 28789@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
28726 28790
28727 if (S_ISDIR(main_inode->i_mode)) { 28791 if (S_ISDIR(main_inode->i_mode)) {
@@ -28740,9 +28804,9 @@ diff -urNp linux-2.6.32.7/fs/hfs/inode.c linux-2.6.32.7/fs/hfs/inode.c
28740 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, 28804 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
28741 sizeof(struct hfs_cat_file)); 28805 sizeof(struct hfs_cat_file));
28742 if (rec.type != HFS_CDR_FIL || 28806 if (rec.type != HFS_CDR_FIL ||
28743diff -urNp linux-2.6.32.7/fs/hfsplus/inode.c linux-2.6.32.7/fs/hfsplus/inode.c 28807diff -urNp linux-2.6.32.8/fs/hfsplus/inode.c linux-2.6.32.8/fs/hfsplus/inode.c
28744--- linux-2.6.32.7/fs/hfsplus/inode.c 2010-01-25 13:50:10.000000000 -0500 28808--- linux-2.6.32.8/fs/hfsplus/inode.c 2010-02-09 07:57:19.000000000 -0500
28745+++ linux-2.6.32.7/fs/hfsplus/inode.c 2010-01-25 17:39:40.868164104 -0500 28809+++ linux-2.6.32.8/fs/hfsplus/inode.c 2010-02-10 15:06:24.422027218 -0500
28746@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode 28810@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
28747 struct hfsplus_cat_folder *folder = &entry.folder; 28811 struct hfsplus_cat_folder *folder = &entry.folder;
28748 28812
@@ -28779,9 +28843,9 @@ diff -urNp linux-2.6.32.7/fs/hfsplus/inode.c linux-2.6.32.7/fs/hfsplus/inode.c
28779 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, 28843 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
28780 sizeof(struct hfsplus_cat_file)); 28844 sizeof(struct hfsplus_cat_file));
28781 hfsplus_inode_write_fork(inode, &file->data_fork); 28845 hfsplus_inode_write_fork(inode, &file->data_fork);
28782diff -urNp linux-2.6.32.7/fs/ioctl.c linux-2.6.32.7/fs/ioctl.c 28846diff -urNp linux-2.6.32.8/fs/ioctl.c linux-2.6.32.8/fs/ioctl.c
28783--- linux-2.6.32.7/fs/ioctl.c 2010-01-25 13:50:10.000000000 -0500 28847--- linux-2.6.32.8/fs/ioctl.c 2010-02-09 07:57:19.000000000 -0500
28784+++ linux-2.6.32.7/fs/ioctl.c 2010-01-25 17:39:40.868164104 -0500 28848+++ linux-2.6.32.8/fs/ioctl.c 2010-02-10 15:06:24.422027218 -0500
28785@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema 28849@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
28786 u64 phys, u64 len, u32 flags) 28850 u64 phys, u64 len, u32 flags)
28787 { 28851 {
@@ -28809,9 +28873,9 @@ diff -urNp linux-2.6.32.7/fs/ioctl.c linux-2.6.32.7/fs/ioctl.c
28809 error = -EFAULT; 28873 error = -EFAULT;
28810 28874
28811 return error; 28875 return error;
28812diff -urNp linux-2.6.32.7/fs/jffs2/debug.h linux-2.6.32.7/fs/jffs2/debug.h 28876diff -urNp linux-2.6.32.8/fs/jffs2/debug.h linux-2.6.32.8/fs/jffs2/debug.h
28813--- linux-2.6.32.7/fs/jffs2/debug.h 2010-01-25 13:50:10.000000000 -0500 28877--- linux-2.6.32.8/fs/jffs2/debug.h 2010-02-09 07:57:19.000000000 -0500
28814+++ linux-2.6.32.7/fs/jffs2/debug.h 2010-01-25 17:39:40.868164104 -0500 28878+++ linux-2.6.32.8/fs/jffs2/debug.h 2010-02-10 15:06:24.422027218 -0500
28815@@ -52,13 +52,13 @@ 28879@@ -52,13 +52,13 @@
28816 #if CONFIG_JFFS2_FS_DEBUG > 0 28880 #if CONFIG_JFFS2_FS_DEBUG > 0
28817 #define D1(x) x 28881 #define D1(x) x
@@ -28913,9 +28977,9 @@ diff -urNp linux-2.6.32.7/fs/jffs2/debug.h linux-2.6.32.7/fs/jffs2/debug.h
28913 #endif 28977 #endif
28914 28978
28915 /* "Sanity" checks */ 28979 /* "Sanity" checks */
28916diff -urNp linux-2.6.32.7/fs/jffs2/erase.c linux-2.6.32.7/fs/jffs2/erase.c 28980diff -urNp linux-2.6.32.8/fs/jffs2/erase.c linux-2.6.32.8/fs/jffs2/erase.c
28917--- linux-2.6.32.7/fs/jffs2/erase.c 2010-01-25 13:50:10.000000000 -0500 28981--- linux-2.6.32.8/fs/jffs2/erase.c 2010-02-09 07:57:19.000000000 -0500
28918+++ linux-2.6.32.7/fs/jffs2/erase.c 2010-01-25 17:39:40.869292519 -0500 28982+++ linux-2.6.32.8/fs/jffs2/erase.c 2010-02-10 15:06:24.422027218 -0500
28919@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru 28983@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
28920 struct jffs2_unknown_node marker = { 28984 struct jffs2_unknown_node marker = {
28921 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), 28985 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -28926,9 +28990,9 @@ diff -urNp linux-2.6.32.7/fs/jffs2/erase.c linux-2.6.32.7/fs/jffs2/erase.c
28926 }; 28990 };
28927 28991
28928 jffs2_prealloc_raw_node_refs(c, jeb, 1); 28992 jffs2_prealloc_raw_node_refs(c, jeb, 1);
28929diff -urNp linux-2.6.32.7/fs/jffs2/summary.h linux-2.6.32.7/fs/jffs2/summary.h 28993diff -urNp linux-2.6.32.8/fs/jffs2/summary.h linux-2.6.32.8/fs/jffs2/summary.h
28930--- linux-2.6.32.7/fs/jffs2/summary.h 2010-01-25 13:50:10.000000000 -0500 28994--- linux-2.6.32.8/fs/jffs2/summary.h 2010-02-09 07:57:19.000000000 -0500
28931+++ linux-2.6.32.7/fs/jffs2/summary.h 2010-01-25 17:39:40.869292519 -0500 28995+++ linux-2.6.32.8/fs/jffs2/summary.h 2010-02-10 15:06:24.422027218 -0500
28932@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ 28996@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
28933 28997
28934 #define jffs2_sum_active() (0) 28998 #define jffs2_sum_active() (0)
@@ -28957,9 +29021,9 @@ diff -urNp linux-2.6.32.7/fs/jffs2/summary.h linux-2.6.32.7/fs/jffs2/summary.h
28957 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) 29021 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
28958 29022
28959 #endif /* CONFIG_JFFS2_SUMMARY */ 29023 #endif /* CONFIG_JFFS2_SUMMARY */
28960diff -urNp linux-2.6.32.7/fs/jffs2/wbuf.c linux-2.6.32.7/fs/jffs2/wbuf.c 29024diff -urNp linux-2.6.32.8/fs/jffs2/wbuf.c linux-2.6.32.8/fs/jffs2/wbuf.c
28961--- linux-2.6.32.7/fs/jffs2/wbuf.c 2010-01-25 13:50:10.000000000 -0500 29025--- linux-2.6.32.8/fs/jffs2/wbuf.c 2010-02-09 07:57:19.000000000 -0500
28962+++ linux-2.6.32.7/fs/jffs2/wbuf.c 2010-01-25 17:39:40.869292519 -0500 29026+++ linux-2.6.32.8/fs/jffs2/wbuf.c 2010-02-10 15:06:24.422027218 -0500
28963@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o 29027@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
28964 { 29028 {
28965 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), 29029 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -28970,9 +29034,9 @@ diff -urNp linux-2.6.32.7/fs/jffs2/wbuf.c linux-2.6.32.7/fs/jffs2/wbuf.c
28970 }; 29034 };
28971 29035
28972 /* 29036 /*
28973diff -urNp linux-2.6.32.7/fs/lockd/svc.c linux-2.6.32.7/fs/lockd/svc.c 29037diff -urNp linux-2.6.32.8/fs/lockd/svc.c linux-2.6.32.8/fs/lockd/svc.c
28974--- linux-2.6.32.7/fs/lockd/svc.c 2010-01-25 13:50:10.000000000 -0500 29038--- linux-2.6.32.8/fs/lockd/svc.c 2010-02-09 07:57:19.000000000 -0500
28975+++ linux-2.6.32.7/fs/lockd/svc.c 2010-01-25 17:39:40.870353983 -0500 29039+++ linux-2.6.32.8/fs/lockd/svc.c 2010-02-10 15:06:24.426029843 -0500
28976@@ -43,7 +43,7 @@ 29040@@ -43,7 +43,7 @@
28977 29041
28978 static struct svc_program nlmsvc_program; 29042 static struct svc_program nlmsvc_program;
@@ -28982,9 +29046,9 @@ diff -urNp linux-2.6.32.7/fs/lockd/svc.c linux-2.6.32.7/fs/lockd/svc.c
28982 EXPORT_SYMBOL_GPL(nlmsvc_ops); 29046 EXPORT_SYMBOL_GPL(nlmsvc_ops);
28983 29047
28984 static DEFINE_MUTEX(nlmsvc_mutex); 29048 static DEFINE_MUTEX(nlmsvc_mutex);
28985diff -urNp linux-2.6.32.7/fs/locks.c linux-2.6.32.7/fs/locks.c 29049diff -urNp linux-2.6.32.8/fs/locks.c linux-2.6.32.8/fs/locks.c
28986--- linux-2.6.32.7/fs/locks.c 2010-01-25 13:50:10.000000000 -0500 29050--- linux-2.6.32.8/fs/locks.c 2010-02-09 07:57:19.000000000 -0500
28987+++ linux-2.6.32.7/fs/locks.c 2010-01-25 17:39:40.870353983 -0500 29051+++ linux-2.6.32.8/fs/locks.c 2010-02-10 15:06:24.426029843 -0500
28988@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil 29052@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
28989 return; 29053 return;
28990 29054
@@ -29006,9 +29070,9 @@ diff -urNp linux-2.6.32.7/fs/locks.c linux-2.6.32.7/fs/locks.c
29006 } 29070 }
29007 29071
29008 lock_kernel(); 29072 lock_kernel();
29009diff -urNp linux-2.6.32.7/fs/namei.c linux-2.6.32.7/fs/namei.c 29073diff -urNp linux-2.6.32.8/fs/namei.c linux-2.6.32.8/fs/namei.c
29010--- linux-2.6.32.7/fs/namei.c 2010-01-25 13:50:10.000000000 -0500 29074--- linux-2.6.32.8/fs/namei.c 2010-02-09 07:57:19.000000000 -0500
29011+++ linux-2.6.32.7/fs/namei.c 2010-01-25 17:39:40.871468102 -0500 29075+++ linux-2.6.32.8/fs/namei.c 2010-02-10 15:06:24.426029843 -0500
29012@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l 29076@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l
29013 cookie = dentry->d_inode->i_op->follow_link(dentry, nd); 29077 cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
29014 error = PTR_ERR(cookie); 29078 error = PTR_ERR(cookie);
@@ -29335,9 +29399,9 @@ diff -urNp linux-2.6.32.7/fs/namei.c linux-2.6.32.7/fs/namei.c
29335 exit6: 29399 exit6:
29336 mnt_drop_write(oldnd.path.mnt); 29400 mnt_drop_write(oldnd.path.mnt);
29337 exit5: 29401 exit5:
29338diff -urNp linux-2.6.32.7/fs/namespace.c linux-2.6.32.7/fs/namespace.c 29402diff -urNp linux-2.6.32.8/fs/namespace.c linux-2.6.32.8/fs/namespace.c
29339--- linux-2.6.32.7/fs/namespace.c 2010-01-25 13:50:10.000000000 -0500 29403--- linux-2.6.32.8/fs/namespace.c 2010-02-09 07:57:19.000000000 -0500
29340+++ linux-2.6.32.7/fs/namespace.c 2010-01-25 17:39:40.872212215 -0500 29404+++ linux-2.6.32.8/fs/namespace.c 2010-02-10 15:06:24.456217096 -0500
29341@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn 29405@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
29342 if (!(sb->s_flags & MS_RDONLY)) 29406 if (!(sb->s_flags & MS_RDONLY))
29343 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); 29407 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -29398,9 +29462,9 @@ diff -urNp linux-2.6.32.7/fs/namespace.c linux-2.6.32.7/fs/namespace.c
29398 read_lock(&current->fs->lock); 29462 read_lock(&current->fs->lock);
29399 root = current->fs->root; 29463 root = current->fs->root;
29400 path_get(&current->fs->root); 29464 path_get(&current->fs->root);
29401diff -urNp linux-2.6.32.7/fs/nfs/inode.c linux-2.6.32.7/fs/nfs/inode.c 29465diff -urNp linux-2.6.32.8/fs/nfs/inode.c linux-2.6.32.8/fs/nfs/inode.c
29402--- linux-2.6.32.7/fs/nfs/inode.c 2010-01-25 13:50:10.000000000 -0500 29466--- linux-2.6.32.8/fs/nfs/inode.c 2010-02-09 07:57:19.000000000 -0500
29403+++ linux-2.6.32.7/fs/nfs/inode.c 2010-01-25 17:39:40.872212215 -0500 29467+++ linux-2.6.32.8/fs/nfs/inode.c 2010-02-10 15:06:24.456217096 -0500
29404@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st 29468@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
29405 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); 29469 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
29406 } 29470 }
@@ -29421,9 +29485,9 @@ diff -urNp linux-2.6.32.7/fs/nfs/inode.c linux-2.6.32.7/fs/nfs/inode.c
29421 } 29485 }
29422 29486
29423 void nfs_fattr_init(struct nfs_fattr *fattr) 29487 void nfs_fattr_init(struct nfs_fattr *fattr)
29424diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c 29488diff -urNp linux-2.6.32.8/fs/nfs/nfs4proc.c linux-2.6.32.8/fs/nfs/nfs4proc.c
29425--- linux-2.6.32.7/fs/nfs/nfs4proc.c 2010-01-25 13:50:10.000000000 -0500 29489--- linux-2.6.32.8/fs/nfs/nfs4proc.c 2010-02-09 07:57:19.000000000 -0500
29426+++ linux-2.6.32.7/fs/nfs/nfs4proc.c 2010-01-25 17:39:40.873419288 -0500 29490+++ linux-2.6.32.8/fs/nfs/nfs4proc.c 2010-02-10 15:06:24.458018746 -0500
29427@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct 29491@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct
29428 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) 29492 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
29429 { 29493 {
@@ -29694,9 +29758,9 @@ diff -urNp linux-2.6.32.7/fs/nfs/nfs4proc.c linux-2.6.32.7/fs/nfs/nfs4proc.c
29694 int err; 29758 int err;
29695 29759
29696 err = nfs4_set_lock_state(state, fl); 29760 err = nfs4_set_lock_state(state, fl);
29697diff -urNp linux-2.6.32.7/fs/nfsd/lockd.c linux-2.6.32.7/fs/nfsd/lockd.c 29761diff -urNp linux-2.6.32.8/fs/nfsd/lockd.c linux-2.6.32.8/fs/nfsd/lockd.c
29698--- linux-2.6.32.7/fs/nfsd/lockd.c 2010-01-25 13:50:10.000000000 -0500 29762--- linux-2.6.32.8/fs/nfsd/lockd.c 2010-02-09 07:57:19.000000000 -0500
29699+++ linux-2.6.32.7/fs/nfsd/lockd.c 2010-01-25 17:39:40.873419288 -0500 29763+++ linux-2.6.32.8/fs/nfsd/lockd.c 2010-02-10 15:06:24.458018746 -0500
29700@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) 29764@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
29701 fput(filp); 29765 fput(filp);
29702 } 29766 }
@@ -29706,9 +29770,9 @@ diff -urNp linux-2.6.32.7/fs/nfsd/lockd.c linux-2.6.32.7/fs/nfsd/lockd.c
29706 .fopen = nlm_fopen, /* open file for locking */ 29770 .fopen = nlm_fopen, /* open file for locking */
29707 .fclose = nlm_fclose, /* close file */ 29771 .fclose = nlm_fclose, /* close file */
29708 }; 29772 };
29709diff -urNp linux-2.6.32.7/fs/nfsd/vfs.c linux-2.6.32.7/fs/nfsd/vfs.c 29773diff -urNp linux-2.6.32.8/fs/nfsd/vfs.c linux-2.6.32.8/fs/nfsd/vfs.c
29710--- linux-2.6.32.7/fs/nfsd/vfs.c 2010-01-25 13:50:10.000000000 -0500 29774--- linux-2.6.32.8/fs/nfsd/vfs.c 2010-02-09 07:57:19.000000000 -0500
29711+++ linux-2.6.32.7/fs/nfsd/vfs.c 2010-01-25 17:39:40.874437436 -0500 29775+++ linux-2.6.32.8/fs/nfsd/vfs.c 2010-02-10 15:06:24.458018746 -0500
29712@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st 29776@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
29713 } else { 29777 } else {
29714 oldfs = get_fs(); 29778 oldfs = get_fs();
@@ -29736,9 +29800,9 @@ diff -urNp linux-2.6.32.7/fs/nfsd/vfs.c linux-2.6.32.7/fs/nfsd/vfs.c
29736 set_fs(oldfs); 29800 set_fs(oldfs);
29737 29801
29738 if (host_err < 0) 29802 if (host_err < 0)
29739diff -urNp linux-2.6.32.7/fs/nls/nls_base.c linux-2.6.32.7/fs/nls/nls_base.c 29803diff -urNp linux-2.6.32.8/fs/nls/nls_base.c linux-2.6.32.8/fs/nls/nls_base.c
29740--- linux-2.6.32.7/fs/nls/nls_base.c 2010-01-25 13:50:10.000000000 -0500 29804--- linux-2.6.32.8/fs/nls/nls_base.c 2010-02-09 07:57:19.000000000 -0500
29741+++ linux-2.6.32.7/fs/nls/nls_base.c 2010-01-25 17:39:40.883152088 -0500 29805+++ linux-2.6.32.8/fs/nls/nls_base.c 2010-02-10 15:06:24.458018746 -0500
29742@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl 29806@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
29743 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, 29807 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
29744 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, 29808 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
@@ -29748,9 +29812,9 @@ diff -urNp linux-2.6.32.7/fs/nls/nls_base.c linux-2.6.32.7/fs/nls/nls_base.c
29748 }; 29812 };
29749 29813
29750 #define UNICODE_MAX 0x0010ffff 29814 #define UNICODE_MAX 0x0010ffff
29751diff -urNp linux-2.6.32.7/fs/ntfs/file.c linux-2.6.32.7/fs/ntfs/file.c 29815diff -urNp linux-2.6.32.8/fs/ntfs/file.c linux-2.6.32.8/fs/ntfs/file.c
29752--- linux-2.6.32.7/fs/ntfs/file.c 2010-01-25 13:50:10.000000000 -0500 29816--- linux-2.6.32.8/fs/ntfs/file.c 2010-02-09 07:57:19.000000000 -0500
29753+++ linux-2.6.32.7/fs/ntfs/file.c 2010-01-25 17:39:40.902188088 -0500 29817+++ linux-2.6.32.8/fs/ntfs/file.c 2010-02-10 15:06:24.478035083 -0500
29754@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ 29818@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
29755 #endif /* NTFS_RW */ 29819 #endif /* NTFS_RW */
29756 }; 29820 };
@@ -29760,9 +29824,9 @@ diff -urNp linux-2.6.32.7/fs/ntfs/file.c linux-2.6.32.7/fs/ntfs/file.c
29760 29824
29761-const struct inode_operations ntfs_empty_inode_ops = {}; 29825-const struct inode_operations ntfs_empty_inode_ops = {};
29762+const struct inode_operations ntfs_empty_inode_ops __read_only; 29826+const struct inode_operations ntfs_empty_inode_ops __read_only;
29763diff -urNp linux-2.6.32.7/fs/ocfs2/cluster/masklog.c linux-2.6.32.7/fs/ocfs2/cluster/masklog.c 29827diff -urNp linux-2.6.32.8/fs/ocfs2/cluster/masklog.c linux-2.6.32.8/fs/ocfs2/cluster/masklog.c
29764--- linux-2.6.32.7/fs/ocfs2/cluster/masklog.c 2010-01-25 13:50:10.000000000 -0500 29828--- linux-2.6.32.8/fs/ocfs2/cluster/masklog.c 2010-02-09 07:57:19.000000000 -0500
29765+++ linux-2.6.32.7/fs/ocfs2/cluster/masklog.c 2010-01-25 17:39:40.902188088 -0500 29829+++ linux-2.6.32.8/fs/ocfs2/cluster/masklog.c 2010-02-10 15:06:24.478035083 -0500
29766@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject 29830@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
29767 return mlog_mask_store(mlog_attr->mask, buf, count); 29831 return mlog_mask_store(mlog_attr->mask, buf, count);
29768 } 29832 }
@@ -29772,9 +29836,9 @@ diff -urNp linux-2.6.32.7/fs/ocfs2/cluster/masklog.c linux-2.6.32.7/fs/ocfs2/clu
29772 .show = mlog_show, 29836 .show = mlog_show,
29773 .store = mlog_store, 29837 .store = mlog_store,
29774 }; 29838 };
29775diff -urNp linux-2.6.32.7/fs/ocfs2/localalloc.c linux-2.6.32.7/fs/ocfs2/localalloc.c 29839diff -urNp linux-2.6.32.8/fs/ocfs2/localalloc.c linux-2.6.32.8/fs/ocfs2/localalloc.c
29776--- linux-2.6.32.7/fs/ocfs2/localalloc.c 2010-01-25 13:50:10.000000000 -0500 29840--- linux-2.6.32.8/fs/ocfs2/localalloc.c 2010-02-09 07:57:19.000000000 -0500
29777+++ linux-2.6.32.7/fs/ocfs2/localalloc.c 2010-01-25 17:39:40.902188088 -0500 29841+++ linux-2.6.32.8/fs/ocfs2/localalloc.c 2010-02-10 15:06:24.478035083 -0500
29778@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo 29842@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
29779 goto bail; 29843 goto bail;
29780 } 29844 }
@@ -29784,9 +29848,9 @@ diff -urNp linux-2.6.32.7/fs/ocfs2/localalloc.c linux-2.6.32.7/fs/ocfs2/localall
29784 29848
29785 status = 0; 29849 status = 0;
29786 bail: 29850 bail:
29787diff -urNp linux-2.6.32.7/fs/ocfs2/ocfs2.h linux-2.6.32.7/fs/ocfs2/ocfs2.h 29851diff -urNp linux-2.6.32.8/fs/ocfs2/ocfs2.h linux-2.6.32.8/fs/ocfs2/ocfs2.h
29788--- linux-2.6.32.7/fs/ocfs2/ocfs2.h 2010-01-25 13:50:10.000000000 -0500 29852--- linux-2.6.32.8/fs/ocfs2/ocfs2.h 2010-02-09 07:57:19.000000000 -0500
29789+++ linux-2.6.32.7/fs/ocfs2/ocfs2.h 2010-01-25 17:39:40.913256012 -0500 29853+++ linux-2.6.32.8/fs/ocfs2/ocfs2.h 2010-02-10 15:06:24.478035083 -0500
29790@@ -217,11 +217,11 @@ enum ocfs2_vol_state 29854@@ -217,11 +217,11 @@ enum ocfs2_vol_state
29791 29855
29792 struct ocfs2_alloc_stats 29856 struct ocfs2_alloc_stats
@@ -29804,9 +29868,9 @@ diff -urNp linux-2.6.32.7/fs/ocfs2/ocfs2.h linux-2.6.32.7/fs/ocfs2/ocfs2.h
29804 }; 29868 };
29805 29869
29806 enum ocfs2_local_alloc_state 29870 enum ocfs2_local_alloc_state
29807diff -urNp linux-2.6.32.7/fs/ocfs2/suballoc.c linux-2.6.32.7/fs/ocfs2/suballoc.c 29871diff -urNp linux-2.6.32.8/fs/ocfs2/suballoc.c linux-2.6.32.8/fs/ocfs2/suballoc.c
29808--- linux-2.6.32.7/fs/ocfs2/suballoc.c 2010-01-25 13:50:10.000000000 -0500 29872--- linux-2.6.32.8/fs/ocfs2/suballoc.c 2010-02-09 07:57:19.000000000 -0500
29809+++ linux-2.6.32.7/fs/ocfs2/suballoc.c 2010-01-25 17:39:40.913256012 -0500 29873+++ linux-2.6.32.8/fs/ocfs2/suballoc.c 2010-02-10 15:06:24.478035083 -0500
29810@@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s 29874@@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s
29811 mlog_errno(status); 29875 mlog_errno(status);
29812 goto bail; 29876 goto bail;
@@ -29852,9 +29916,9 @@ diff -urNp linux-2.6.32.7/fs/ocfs2/suballoc.c linux-2.6.32.7/fs/ocfs2/suballoc.c
29852 } 29916 }
29853 } 29917 }
29854 if (status < 0) { 29918 if (status < 0) {
29855diff -urNp linux-2.6.32.7/fs/ocfs2/super.c linux-2.6.32.7/fs/ocfs2/super.c 29919diff -urNp linux-2.6.32.8/fs/ocfs2/super.c linux-2.6.32.8/fs/ocfs2/super.c
29856--- linux-2.6.32.7/fs/ocfs2/super.c 2010-01-25 13:50:10.000000000 -0500 29920--- linux-2.6.32.8/fs/ocfs2/super.c 2010-02-09 07:57:19.000000000 -0500
29857+++ linux-2.6.32.7/fs/ocfs2/super.c 2010-01-25 17:39:40.914424986 -0500 29921+++ linux-2.6.32.8/fs/ocfs2/super.c 2010-02-10 15:06:24.478035083 -0500
29858@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s 29922@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
29859 "%10s => GlobalAllocs: %d LocalAllocs: %d " 29923 "%10s => GlobalAllocs: %d LocalAllocs: %d "
29860 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", 29924 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
@@ -29889,9 +29953,9 @@ diff -urNp linux-2.6.32.7/fs/ocfs2/super.c linux-2.6.32.7/fs/ocfs2/super.c
29889 29953
29890 /* Copy the blockcheck stats from the superblock probe */ 29954 /* Copy the blockcheck stats from the superblock probe */
29891 osb->osb_ecc_stats = *stats; 29955 osb->osb_ecc_stats = *stats;
29892diff -urNp linux-2.6.32.7/fs/open.c linux-2.6.32.7/fs/open.c 29956diff -urNp linux-2.6.32.8/fs/open.c linux-2.6.32.8/fs/open.c
29893--- linux-2.6.32.7/fs/open.c 2010-01-25 13:50:10.000000000 -0500 29957--- linux-2.6.32.8/fs/open.c 2010-02-09 07:57:19.000000000 -0500
29894+++ linux-2.6.32.7/fs/open.c 2010-01-25 17:39:40.914424986 -0500 29958+++ linux-2.6.32.8/fs/open.c 2010-02-10 15:06:24.482024554 -0500
29895@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l 29959@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l
29896 if (length < 0) 29960 if (length < 0)
29897 return -EINVAL; 29961 return -EINVAL;
@@ -30065,9 +30129,9 @@ diff -urNp linux-2.6.32.7/fs/open.c linux-2.6.32.7/fs/open.c
30065 mnt_drop_write(file->f_path.mnt); 30129 mnt_drop_write(file->f_path.mnt);
30066 out_fput: 30130 out_fput:
30067 fput(file); 30131 fput(file);
30068diff -urNp linux-2.6.32.7/fs/pipe.c linux-2.6.32.7/fs/pipe.c 30132diff -urNp linux-2.6.32.8/fs/pipe.c linux-2.6.32.8/fs/pipe.c
30069--- linux-2.6.32.7/fs/pipe.c 2010-01-25 13:50:10.000000000 -0500 30133--- linux-2.6.32.8/fs/pipe.c 2010-02-09 07:57:19.000000000 -0500
30070+++ linux-2.6.32.7/fs/pipe.c 2010-01-25 17:39:40.915197662 -0500 30134+++ linux-2.6.32.8/fs/pipe.c 2010-02-10 15:06:24.482024554 -0500
30071@@ -401,9 +401,9 @@ redo: 30135@@ -401,9 +401,9 @@ redo:
30072 } 30136 }
30073 if (bufs) /* More to do? */ 30137 if (bufs) /* More to do? */
@@ -30191,9 +30255,9 @@ diff -urNp linux-2.6.32.7/fs/pipe.c linux-2.6.32.7/fs/pipe.c
30191 inode->i_fop = &rdwr_pipefifo_fops; 30255 inode->i_fop = &rdwr_pipefifo_fops;
30192 30256
30193 /* 30257 /*
30194diff -urNp linux-2.6.32.7/fs/proc/array.c linux-2.6.32.7/fs/proc/array.c 30258diff -urNp linux-2.6.32.8/fs/proc/array.c linux-2.6.32.8/fs/proc/array.c
30195--- linux-2.6.32.7/fs/proc/array.c 2010-01-25 13:50:10.000000000 -0500 30259--- linux-2.6.32.8/fs/proc/array.c 2010-02-09 07:57:19.000000000 -0500
30196+++ linux-2.6.32.7/fs/proc/array.c 2010-01-25 17:39:40.915197662 -0500 30260+++ linux-2.6.32.8/fs/proc/array.c 2010-02-10 15:06:24.502026732 -0500
30197@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct 30261@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct
30198 } 30262 }
30199 #endif /* CONFIG_MMU */ 30263 #endif /* CONFIG_MMU */
@@ -30284,9 +30348,9 @@ diff -urNp linux-2.6.32.7/fs/proc/array.c linux-2.6.32.7/fs/proc/array.c
30284+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); 30348+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
30285+} 30349+}
30286+#endif 30350+#endif
30287diff -urNp linux-2.6.32.7/fs/proc/base.c linux-2.6.32.7/fs/proc/base.c 30351diff -urNp linux-2.6.32.8/fs/proc/base.c linux-2.6.32.8/fs/proc/base.c
30288--- linux-2.6.32.7/fs/proc/base.c 2010-01-25 13:50:10.000000000 -0500 30352--- linux-2.6.32.8/fs/proc/base.c 2010-02-09 07:57:19.000000000 -0500
30289+++ linux-2.6.32.7/fs/proc/base.c 2010-01-25 17:40:16.448319801 -0500 30353+++ linux-2.6.32.8/fs/proc/base.c 2010-02-10 15:06:24.522032701 -0500
30290@@ -102,6 +102,22 @@ struct pid_entry { 30354@@ -102,6 +102,22 @@ struct pid_entry {
30291 union proc_op op; 30355 union proc_op op;
30292 }; 30356 };
@@ -30650,9 +30714,9 @@ diff -urNp linux-2.6.32.7/fs/proc/base.c linux-2.6.32.7/fs/proc/base.c
30650 ONE("stack", S_IRUSR, proc_pid_stack), 30714 ONE("stack", S_IRUSR, proc_pid_stack),
30651 #endif 30715 #endif
30652 #ifdef CONFIG_SCHEDSTATS 30716 #ifdef CONFIG_SCHEDSTATS
30653diff -urNp linux-2.6.32.7/fs/proc/cmdline.c linux-2.6.32.7/fs/proc/cmdline.c 30717diff -urNp linux-2.6.32.8/fs/proc/cmdline.c linux-2.6.32.8/fs/proc/cmdline.c
30654--- linux-2.6.32.7/fs/proc/cmdline.c 2010-01-25 13:50:10.000000000 -0500 30718--- linux-2.6.32.8/fs/proc/cmdline.c 2010-02-09 07:57:19.000000000 -0500
30655+++ linux-2.6.32.7/fs/proc/cmdline.c 2010-01-25 17:39:40.916430448 -0500 30719+++ linux-2.6.32.8/fs/proc/cmdline.c 2010-02-10 15:06:24.531024155 -0500
30656@@ -23,7 +23,11 @@ static const struct file_operations cmdl 30720@@ -23,7 +23,11 @@ static const struct file_operations cmdl
30657 30721
30658 static int __init proc_cmdline_init(void) 30722 static int __init proc_cmdline_init(void)
@@ -30665,9 +30729,9 @@ diff -urNp linux-2.6.32.7/fs/proc/cmdline.c linux-2.6.32.7/fs/proc/cmdline.c
30665 return 0; 30729 return 0;
30666 } 30730 }
30667 module_init(proc_cmdline_init); 30731 module_init(proc_cmdline_init);
30668diff -urNp linux-2.6.32.7/fs/proc/devices.c linux-2.6.32.7/fs/proc/devices.c 30732diff -urNp linux-2.6.32.8/fs/proc/devices.c linux-2.6.32.8/fs/proc/devices.c
30669--- linux-2.6.32.7/fs/proc/devices.c 2010-01-25 13:50:10.000000000 -0500 30733--- linux-2.6.32.8/fs/proc/devices.c 2010-02-09 07:57:19.000000000 -0500
30670+++ linux-2.6.32.7/fs/proc/devices.c 2010-01-25 17:39:40.916430448 -0500 30734+++ linux-2.6.32.8/fs/proc/devices.c 2010-02-10 15:06:24.531024155 -0500
30671@@ -64,7 +64,11 @@ static const struct file_operations proc 30735@@ -64,7 +64,11 @@ static const struct file_operations proc
30672 30736
30673 static int __init proc_devices_init(void) 30737 static int __init proc_devices_init(void)
@@ -30680,9 +30744,9 @@ diff -urNp linux-2.6.32.7/fs/proc/devices.c linux-2.6.32.7/fs/proc/devices.c
30680 return 0; 30744 return 0;
30681 } 30745 }
30682 module_init(proc_devices_init); 30746 module_init(proc_devices_init);
30683diff -urNp linux-2.6.32.7/fs/proc/inode.c linux-2.6.32.7/fs/proc/inode.c 30747diff -urNp linux-2.6.32.8/fs/proc/inode.c linux-2.6.32.8/fs/proc/inode.c
30684--- linux-2.6.32.7/fs/proc/inode.c 2010-01-25 13:50:10.000000000 -0500 30748--- linux-2.6.32.8/fs/proc/inode.c 2010-02-09 07:57:19.000000000 -0500
30685+++ linux-2.6.32.7/fs/proc/inode.c 2010-01-25 17:39:40.916430448 -0500 30749+++ linux-2.6.32.8/fs/proc/inode.c 2010-02-10 15:06:24.538036429 -0500
30686@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe 30750@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
30687 if (de->mode) { 30751 if (de->mode) {
30688 inode->i_mode = de->mode; 30752 inode->i_mode = de->mode;
@@ -30695,9 +30759,9 @@ diff -urNp linux-2.6.32.7/fs/proc/inode.c linux-2.6.32.7/fs/proc/inode.c
30695 } 30759 }
30696 if (de->size) 30760 if (de->size)
30697 inode->i_size = de->size; 30761 inode->i_size = de->size;
30698diff -urNp linux-2.6.32.7/fs/proc/internal.h linux-2.6.32.7/fs/proc/internal.h 30762diff -urNp linux-2.6.32.8/fs/proc/internal.h linux-2.6.32.8/fs/proc/internal.h
30699--- linux-2.6.32.7/fs/proc/internal.h 2010-01-25 13:50:10.000000000 -0500 30763--- linux-2.6.32.8/fs/proc/internal.h 2010-02-09 07:57:19.000000000 -0500
30700+++ linux-2.6.32.7/fs/proc/internal.h 2010-01-25 17:39:40.916430448 -0500 30764+++ linux-2.6.32.8/fs/proc/internal.h 2010-02-10 15:06:24.546037945 -0500
30701@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi 30765@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
30702 struct pid *pid, struct task_struct *task); 30766 struct pid *pid, struct task_struct *task);
30703 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, 30767 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -30708,9 +30772,9 @@ diff -urNp linux-2.6.32.7/fs/proc/internal.h linux-2.6.32.7/fs/proc/internal.h
30708 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); 30772 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
30709 30773
30710 extern const struct file_operations proc_maps_operations; 30774 extern const struct file_operations proc_maps_operations;
30711diff -urNp linux-2.6.32.7/fs/proc/Kconfig linux-2.6.32.7/fs/proc/Kconfig 30775diff -urNp linux-2.6.32.8/fs/proc/Kconfig linux-2.6.32.8/fs/proc/Kconfig
30712--- linux-2.6.32.7/fs/proc/Kconfig 2010-01-25 13:50:10.000000000 -0500 30776--- linux-2.6.32.8/fs/proc/Kconfig 2010-02-09 07:57:19.000000000 -0500
30713+++ linux-2.6.32.7/fs/proc/Kconfig 2010-01-25 17:39:40.916430448 -0500 30777+++ linux-2.6.32.8/fs/proc/Kconfig 2010-02-10 15:06:24.546037945 -0500
30714@@ -30,12 +30,12 @@ config PROC_FS 30778@@ -30,12 +30,12 @@ config PROC_FS
30715 30779
30716 config PROC_KCORE 30780 config PROC_KCORE
@@ -30738,9 +30802,9 @@ diff -urNp linux-2.6.32.7/fs/proc/Kconfig linux-2.6.32.7/fs/proc/Kconfig
30738 bool "Enable /proc page monitoring" if EMBEDDED 30802 bool "Enable /proc page monitoring" if EMBEDDED
30739 help 30803 help
30740 Various /proc files exist to monitor process memory utilization: 30804 Various /proc files exist to monitor process memory utilization:
30741diff -urNp linux-2.6.32.7/fs/proc/kcore.c linux-2.6.32.7/fs/proc/kcore.c 30805diff -urNp linux-2.6.32.8/fs/proc/kcore.c linux-2.6.32.8/fs/proc/kcore.c
30742--- linux-2.6.32.7/fs/proc/kcore.c 2010-01-25 13:50:10.000000000 -0500 30806--- linux-2.6.32.8/fs/proc/kcore.c 2010-02-09 07:57:19.000000000 -0500
30743+++ linux-2.6.32.7/fs/proc/kcore.c 2010-01-25 17:39:40.916430448 -0500 30807+++ linux-2.6.32.8/fs/proc/kcore.c 2010-02-10 15:06:24.546037945 -0500
30744@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use 30808@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use
30745 30809
30746 static int open_kcore(struct inode *inode, struct file *filp) 30810 static int open_kcore(struct inode *inode, struct file *filp)
@@ -30751,9 +30815,9 @@ diff -urNp linux-2.6.32.7/fs/proc/kcore.c linux-2.6.32.7/fs/proc/kcore.c
30751 if (!capable(CAP_SYS_RAWIO)) 30815 if (!capable(CAP_SYS_RAWIO))
30752 return -EPERM; 30816 return -EPERM;
30753 if (kcore_need_update) 30817 if (kcore_need_update)
30754diff -urNp linux-2.6.32.7/fs/proc/meminfo.c linux-2.6.32.7/fs/proc/meminfo.c 30818diff -urNp linux-2.6.32.8/fs/proc/meminfo.c linux-2.6.32.8/fs/proc/meminfo.c
30755--- linux-2.6.32.7/fs/proc/meminfo.c 2010-01-25 13:50:10.000000000 -0500 30819--- linux-2.6.32.8/fs/proc/meminfo.c 2010-02-09 07:57:19.000000000 -0500
30756+++ linux-2.6.32.7/fs/proc/meminfo.c 2010-01-25 17:39:40.917435777 -0500 30820+++ linux-2.6.32.8/fs/proc/meminfo.c 2010-02-10 15:06:24.549988220 -0500
30757@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ 30821@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
30758 vmi.used >> 10, 30822 vmi.used >> 10,
30759 vmi.largest_chunk >> 10 30823 vmi.largest_chunk >> 10
@@ -30763,9 +30827,9 @@ diff -urNp linux-2.6.32.7/fs/proc/meminfo.c linux-2.6.32.7/fs/proc/meminfo.c
30763 #endif 30827 #endif
30764 ); 30828 );
30765 30829
30766diff -urNp linux-2.6.32.7/fs/proc/nommu.c linux-2.6.32.7/fs/proc/nommu.c 30830diff -urNp linux-2.6.32.8/fs/proc/nommu.c linux-2.6.32.8/fs/proc/nommu.c
30767--- linux-2.6.32.7/fs/proc/nommu.c 2010-01-25 13:50:10.000000000 -0500 30831--- linux-2.6.32.8/fs/proc/nommu.c 2010-02-09 07:57:19.000000000 -0500
30768+++ linux-2.6.32.7/fs/proc/nommu.c 2010-01-25 17:39:40.917435777 -0500 30832+++ linux-2.6.32.8/fs/proc/nommu.c 2010-02-10 15:06:24.549988220 -0500
30769@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ 30833@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
30770 if (len < 1) 30834 if (len < 1)
30771 len = 1; 30835 len = 1;
@@ -30775,9 +30839,9 @@ diff -urNp linux-2.6.32.7/fs/proc/nommu.c linux-2.6.32.7/fs/proc/nommu.c
30775 } 30839 }
30776 30840
30777 seq_putc(m, '\n'); 30841 seq_putc(m, '\n');
30778diff -urNp linux-2.6.32.7/fs/proc/proc_net.c linux-2.6.32.7/fs/proc/proc_net.c 30842diff -urNp linux-2.6.32.8/fs/proc/proc_net.c linux-2.6.32.8/fs/proc/proc_net.c
30779--- linux-2.6.32.7/fs/proc/proc_net.c 2010-01-25 13:50:10.000000000 -0500 30843--- linux-2.6.32.8/fs/proc/proc_net.c 2010-02-09 07:57:19.000000000 -0500
30780+++ linux-2.6.32.7/fs/proc/proc_net.c 2010-01-25 17:39:40.917435777 -0500 30844+++ linux-2.6.32.8/fs/proc/proc_net.c 2010-02-10 15:06:24.549988220 -0500
30781@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str 30845@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
30782 struct task_struct *task; 30846 struct task_struct *task;
30783 struct nsproxy *ns; 30847 struct nsproxy *ns;
@@ -30796,9 +30860,9 @@ diff -urNp linux-2.6.32.7/fs/proc/proc_net.c linux-2.6.32.7/fs/proc/proc_net.c
30796 30860
30797 rcu_read_lock(); 30861 rcu_read_lock();
30798 task = pid_task(proc_pid(dir), PIDTYPE_PID); 30862 task = pid_task(proc_pid(dir), PIDTYPE_PID);
30799diff -urNp linux-2.6.32.7/fs/proc/proc_sysctl.c linux-2.6.32.7/fs/proc/proc_sysctl.c 30863diff -urNp linux-2.6.32.8/fs/proc/proc_sysctl.c linux-2.6.32.8/fs/proc/proc_sysctl.c
30800--- linux-2.6.32.7/fs/proc/proc_sysctl.c 2010-01-25 13:50:10.000000000 -0500 30864--- linux-2.6.32.8/fs/proc/proc_sysctl.c 2010-02-09 07:57:19.000000000 -0500
30801+++ linux-2.6.32.7/fs/proc/proc_sysctl.c 2010-01-25 17:39:40.917435777 -0500 30865+++ linux-2.6.32.8/fs/proc/proc_sysctl.c 2010-02-10 15:06:24.549988220 -0500
30802@@ -7,6 +7,8 @@ 30866@@ -7,6 +7,8 @@
30803 #include <linux/security.h> 30867 #include <linux/security.h>
30804 #include "internal.h" 30868 #include "internal.h"
@@ -30838,9 +30902,9 @@ diff -urNp linux-2.6.32.7/fs/proc/proc_sysctl.c linux-2.6.32.7/fs/proc/proc_sysc
30838 generic_fillattr(inode, stat); 30902 generic_fillattr(inode, stat);
30839 if (table) 30903 if (table)
30840 stat->mode = (stat->mode & S_IFMT) | table->mode; 30904 stat->mode = (stat->mode & S_IFMT) | table->mode;
30841diff -urNp linux-2.6.32.7/fs/proc/root.c linux-2.6.32.7/fs/proc/root.c 30905diff -urNp linux-2.6.32.8/fs/proc/root.c linux-2.6.32.8/fs/proc/root.c
30842--- linux-2.6.32.7/fs/proc/root.c 2010-01-25 13:50:10.000000000 -0500 30906--- linux-2.6.32.8/fs/proc/root.c 2010-02-09 07:57:19.000000000 -0500
30843+++ linux-2.6.32.7/fs/proc/root.c 2010-01-25 17:39:40.917435777 -0500 30907+++ linux-2.6.32.8/fs/proc/root.c 2010-02-10 15:06:24.549988220 -0500
30844@@ -134,7 +134,15 @@ void __init proc_root_init(void) 30908@@ -134,7 +134,15 @@ void __init proc_root_init(void)
30845 #ifdef CONFIG_PROC_DEVICETREE 30909 #ifdef CONFIG_PROC_DEVICETREE
30846 proc_device_tree_init(); 30910 proc_device_tree_init();
@@ -30857,9 +30921,9 @@ diff -urNp linux-2.6.32.7/fs/proc/root.c linux-2.6.32.7/fs/proc/root.c
30857 proc_sys_init(); 30921 proc_sys_init();
30858 } 30922 }
30859 30923
30860diff -urNp linux-2.6.32.7/fs/proc/task_mmu.c linux-2.6.32.7/fs/proc/task_mmu.c 30924diff -urNp linux-2.6.32.8/fs/proc/task_mmu.c linux-2.6.32.8/fs/proc/task_mmu.c
30861--- linux-2.6.32.7/fs/proc/task_mmu.c 2010-01-25 13:50:10.000000000 -0500 30925--- linux-2.6.32.8/fs/proc/task_mmu.c 2010-02-09 07:57:19.000000000 -0500
30862+++ linux-2.6.32.7/fs/proc/task_mmu.c 2010-01-25 17:39:40.917435777 -0500 30926+++ linux-2.6.32.8/fs/proc/task_mmu.c 2010-02-10 15:06:24.549988220 -0500
30863@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct 30927@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
30864 "VmStk:\t%8lu kB\n" 30928 "VmStk:\t%8lu kB\n"
30865 "VmExe:\t%8lu kB\n" 30929 "VmExe:\t%8lu kB\n"
@@ -30980,9 +31044,9 @@ diff -urNp linux-2.6.32.7/fs/proc/task_mmu.c linux-2.6.32.7/fs/proc/task_mmu.c
30980 mss.resident >> 10, 31044 mss.resident >> 10,
30981 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), 31045 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
30982 mss.shared_clean >> 10, 31046 mss.shared_clean >> 10,
30983diff -urNp linux-2.6.32.7/fs/proc/task_nommu.c linux-2.6.32.7/fs/proc/task_nommu.c 31047diff -urNp linux-2.6.32.8/fs/proc/task_nommu.c linux-2.6.32.8/fs/proc/task_nommu.c
30984--- linux-2.6.32.7/fs/proc/task_nommu.c 2010-01-25 13:50:10.000000000 -0500 31048--- linux-2.6.32.8/fs/proc/task_nommu.c 2010-02-09 07:57:19.000000000 -0500
30985+++ linux-2.6.32.7/fs/proc/task_nommu.c 2010-01-25 17:39:40.918432923 -0500 31049+++ linux-2.6.32.8/fs/proc/task_nommu.c 2010-02-10 15:06:24.549988220 -0500
30986@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct 31050@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
30987 else 31051 else
30988 bytes += kobjsize(mm); 31052 bytes += kobjsize(mm);
@@ -31001,9 +31065,9 @@ diff -urNp linux-2.6.32.7/fs/proc/task_nommu.c linux-2.6.32.7/fs/proc/task_nommu
31001 } 31065 }
31002 31066
31003 seq_putc(m, '\n'); 31067 seq_putc(m, '\n');
31004diff -urNp linux-2.6.32.7/fs/readdir.c linux-2.6.32.7/fs/readdir.c 31068diff -urNp linux-2.6.32.8/fs/readdir.c linux-2.6.32.8/fs/readdir.c
31005--- linux-2.6.32.7/fs/readdir.c 2010-01-25 13:50:10.000000000 -0500 31069--- linux-2.6.32.8/fs/readdir.c 2010-02-09 07:57:19.000000000 -0500
31006+++ linux-2.6.32.7/fs/readdir.c 2010-01-25 17:39:40.918432923 -0500 31070+++ linux-2.6.32.8/fs/readdir.c 2010-02-10 15:06:24.549988220 -0500
31007@@ -16,6 +16,7 @@ 31071@@ -16,6 +16,7 @@
31008 #include <linux/security.h> 31072 #include <linux/security.h>
31009 #include <linux/syscalls.h> 31073 #include <linux/syscalls.h>
@@ -31093,9 +31157,9 @@ diff -urNp linux-2.6.32.7/fs/readdir.c linux-2.6.32.7/fs/readdir.c
31093 buf.count = count; 31157 buf.count = count;
31094 buf.error = 0; 31158 buf.error = 0;
31095 31159
31096diff -urNp linux-2.6.32.7/fs/reiserfs/do_balan.c linux-2.6.32.7/fs/reiserfs/do_balan.c 31160diff -urNp linux-2.6.32.8/fs/reiserfs/do_balan.c linux-2.6.32.8/fs/reiserfs/do_balan.c
31097--- linux-2.6.32.7/fs/reiserfs/do_balan.c 2010-01-25 13:50:10.000000000 -0500 31161--- linux-2.6.32.8/fs/reiserfs/do_balan.c 2010-02-09 07:57:19.000000000 -0500
31098+++ linux-2.6.32.7/fs/reiserfs/do_balan.c 2010-01-25 17:39:40.959563277 -0500 31162+++ linux-2.6.32.8/fs/reiserfs/do_balan.c 2010-02-10 15:06:24.573163716 -0500
31099@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, 31163@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
31100 return; 31164 return;
31101 } 31165 }
@@ -31105,9 +31169,9 @@ diff -urNp linux-2.6.32.7/fs/reiserfs/do_balan.c linux-2.6.32.7/fs/reiserfs/do_b
31105 do_balance_starts(tb); 31169 do_balance_starts(tb);
31106 31170
31107 /* balance leaf returns 0 except if combining L R and S into 31171 /* balance leaf returns 0 except if combining L R and S into
31108diff -urNp linux-2.6.32.7/fs/reiserfs/item_ops.c linux-2.6.32.7/fs/reiserfs/item_ops.c 31172diff -urNp linux-2.6.32.8/fs/reiserfs/item_ops.c linux-2.6.32.8/fs/reiserfs/item_ops.c
31109--- linux-2.6.32.7/fs/reiserfs/item_ops.c 2010-01-25 13:50:10.000000000 -0500 31173--- linux-2.6.32.8/fs/reiserfs/item_ops.c 2010-02-09 07:57:19.000000000 -0500
31110+++ linux-2.6.32.7/fs/reiserfs/item_ops.c 2010-01-25 17:39:40.960151903 -0500 31174+++ linux-2.6.32.8/fs/reiserfs/item_ops.c 2010-02-10 15:06:24.574031002 -0500
31111@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i 31175@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
31112 vi->vi_index, vi->vi_type, vi->vi_ih); 31176 vi->vi_index, vi->vi_type, vi->vi_ih);
31113 } 31177 }
@@ -31162,9 +31226,9 @@ diff -urNp linux-2.6.32.7/fs/reiserfs/item_ops.c linux-2.6.32.7/fs/reiserfs/item
31162 &stat_data_ops, 31226 &stat_data_ops,
31163 &indirect_ops, 31227 &indirect_ops,
31164 &direct_ops, 31228 &direct_ops,
31165diff -urNp linux-2.6.32.7/fs/reiserfs/procfs.c linux-2.6.32.7/fs/reiserfs/procfs.c 31229diff -urNp linux-2.6.32.8/fs/reiserfs/procfs.c linux-2.6.32.8/fs/reiserfs/procfs.c
31166--- linux-2.6.32.7/fs/reiserfs/procfs.c 2010-01-25 13:50:10.000000000 -0500 31230--- linux-2.6.32.8/fs/reiserfs/procfs.c 2010-02-09 07:57:19.000000000 -0500
31167+++ linux-2.6.32.7/fs/reiserfs/procfs.c 2010-01-25 17:39:40.960151903 -0500 31231+++ linux-2.6.32.8/fs/reiserfs/procfs.c 2010-02-10 15:06:24.578033396 -0500
31168@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m 31232@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
31169 "SMALL_TAILS " : "NO_TAILS ", 31233 "SMALL_TAILS " : "NO_TAILS ",
31170 replay_only(sb) ? "REPLAY_ONLY " : "", 31234 replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -31174,9 +31238,9 @@ diff -urNp linux-2.6.32.7/fs/reiserfs/procfs.c linux-2.6.32.7/fs/reiserfs/procfs
31174 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), 31238 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
31175 SF(s_do_balance), SF(s_unneeded_left_neighbor), 31239 SF(s_do_balance), SF(s_unneeded_left_neighbor),
31176 SF(s_good_search_by_key_reada), SF(s_bmaps), 31240 SF(s_good_search_by_key_reada), SF(s_bmaps),
31177diff -urNp linux-2.6.32.7/fs/select.c linux-2.6.32.7/fs/select.c 31241diff -urNp linux-2.6.32.8/fs/select.c linux-2.6.32.8/fs/select.c
31178--- linux-2.6.32.7/fs/select.c 2010-01-25 13:50:10.000000000 -0500 31242--- linux-2.6.32.8/fs/select.c 2010-02-09 07:57:19.000000000 -0500
31179+++ linux-2.6.32.7/fs/select.c 2010-01-25 17:39:40.960151903 -0500 31243+++ linux-2.6.32.8/fs/select.c 2010-02-10 15:06:24.578033396 -0500
31180@@ -20,6 +20,7 @@ 31244@@ -20,6 +20,7 @@
31181 #include <linux/module.h> 31245 #include <linux/module.h>
31182 #include <linux/slab.h> 31246 #include <linux/slab.h>
@@ -31193,9 +31257,9 @@ diff -urNp linux-2.6.32.7/fs/select.c linux-2.6.32.7/fs/select.c
31193 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 31257 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
31194 return -EINVAL; 31258 return -EINVAL;
31195 31259
31196diff -urNp linux-2.6.32.7/fs/seq_file.c linux-2.6.32.7/fs/seq_file.c 31260diff -urNp linux-2.6.32.8/fs/seq_file.c linux-2.6.32.8/fs/seq_file.c
31197--- linux-2.6.32.7/fs/seq_file.c 2010-01-25 13:50:10.000000000 -0500 31261--- linux-2.6.32.8/fs/seq_file.c 2010-02-09 07:57:19.000000000 -0500
31198+++ linux-2.6.32.7/fs/seq_file.c 2010-01-25 17:39:40.960151903 -0500 31262+++ linux-2.6.32.8/fs/seq_file.c 2010-02-10 15:06:24.578033396 -0500
31199@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 31263@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
31200 return 0; 31264 return 0;
31201 } 31265 }
@@ -31236,9 +31300,9 @@ diff -urNp linux-2.6.32.7/fs/seq_file.c linux-2.6.32.7/fs/seq_file.c
31236 if (!m->buf) 31300 if (!m->buf)
31237 goto Enomem; 31301 goto Enomem;
31238 m->count = 0; 31302 m->count = 0;
31239diff -urNp linux-2.6.32.7/fs/smbfs/symlink.c linux-2.6.32.7/fs/smbfs/symlink.c 31303diff -urNp linux-2.6.32.8/fs/smbfs/symlink.c linux-2.6.32.8/fs/smbfs/symlink.c
31240--- linux-2.6.32.7/fs/smbfs/symlink.c 2010-01-25 13:50:10.000000000 -0500 31304--- linux-2.6.32.8/fs/smbfs/symlink.c 2010-02-09 07:57:19.000000000 -0500
31241+++ linux-2.6.32.7/fs/smbfs/symlink.c 2010-01-25 17:39:40.964437549 -0500 31305+++ linux-2.6.32.8/fs/smbfs/symlink.c 2010-02-10 15:06:24.578033396 -0500
31242@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent 31306@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
31243 31307
31244 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 31308 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -31248,9 +31312,9 @@ diff -urNp linux-2.6.32.7/fs/smbfs/symlink.c linux-2.6.32.7/fs/smbfs/symlink.c
31248 if (!IS_ERR(s)) 31312 if (!IS_ERR(s))
31249 __putname(s); 31313 __putname(s);
31250 } 31314 }
31251diff -urNp linux-2.6.32.7/fs/splice.c linux-2.6.32.7/fs/splice.c 31315diff -urNp linux-2.6.32.8/fs/splice.c linux-2.6.32.8/fs/splice.c
31252--- linux-2.6.32.7/fs/splice.c 2010-01-25 13:50:10.000000000 -0500 31316--- linux-2.6.32.8/fs/splice.c 2010-02-09 07:57:19.000000000 -0500
31253+++ linux-2.6.32.7/fs/splice.c 2010-01-25 17:39:40.965404168 -0500 31317+++ linux-2.6.32.8/fs/splice.c 2010-02-10 15:06:24.590028231 -0500
31254@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode 31318@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
31255 pipe_lock(pipe); 31319 pipe_lock(pipe);
31256 31320
@@ -31389,9 +31453,9 @@ diff -urNp linux-2.6.32.7/fs/splice.c linux-2.6.32.7/fs/splice.c
31389 ret = -EAGAIN; 31453 ret = -EAGAIN;
31390 31454
31391 pipe_unlock(ipipe); 31455 pipe_unlock(ipipe);
31392diff -urNp linux-2.6.32.7/fs/sysfs/file.c linux-2.6.32.7/fs/sysfs/file.c 31456diff -urNp linux-2.6.32.8/fs/sysfs/file.c linux-2.6.32.8/fs/sysfs/file.c
31393--- linux-2.6.32.7/fs/sysfs/file.c 2010-01-25 13:50:10.000000000 -0500 31457--- linux-2.6.32.8/fs/sysfs/file.c 2010-02-09 07:57:19.000000000 -0500
31394+++ linux-2.6.32.7/fs/sysfs/file.c 2010-01-25 17:39:40.965404168 -0500 31458+++ linux-2.6.32.8/fs/sysfs/file.c 2010-02-10 15:06:24.590028231 -0500
31395@@ -53,7 +53,7 @@ struct sysfs_buffer { 31459@@ -53,7 +53,7 @@ struct sysfs_buffer {
31396 size_t count; 31460 size_t count;
31397 loff_t pos; 31461 loff_t pos;
@@ -31428,9 +31492,9 @@ diff -urNp linux-2.6.32.7/fs/sysfs/file.c linux-2.6.32.7/fs/sysfs/file.c
31428 int error = -EACCES; 31492 int error = -EACCES;
31429 char *p; 31493 char *p;
31430 31494
31431diff -urNp linux-2.6.32.7/fs/sysfs/symlink.c linux-2.6.32.7/fs/sysfs/symlink.c 31495diff -urNp linux-2.6.32.8/fs/sysfs/symlink.c linux-2.6.32.8/fs/sysfs/symlink.c
31432--- linux-2.6.32.7/fs/sysfs/symlink.c 2010-01-25 13:50:10.000000000 -0500 31496--- linux-2.6.32.8/fs/sysfs/symlink.c 2010-02-09 07:57:19.000000000 -0500
31433+++ linux-2.6.32.7/fs/sysfs/symlink.c 2010-01-25 17:39:40.975519594 -0500 31497+++ linux-2.6.32.8/fs/sysfs/symlink.c 2010-02-10 15:06:24.590028231 -0500
31434@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de 31498@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
31435 31499
31436 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) 31500 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -31440,9 +31504,9 @@ diff -urNp linux-2.6.32.7/fs/sysfs/symlink.c linux-2.6.32.7/fs/sysfs/symlink.c
31440 if (!IS_ERR(page)) 31504 if (!IS_ERR(page))
31441 free_page((unsigned long)page); 31505 free_page((unsigned long)page);
31442 } 31506 }
31443diff -urNp linux-2.6.32.7/fs/udf/balloc.c linux-2.6.32.7/fs/udf/balloc.c 31507diff -urNp linux-2.6.32.8/fs/udf/balloc.c linux-2.6.32.8/fs/udf/balloc.c
31444--- linux-2.6.32.7/fs/udf/balloc.c 2010-01-25 13:50:10.000000000 -0500 31508--- linux-2.6.32.8/fs/udf/balloc.c 2010-02-09 07:57:19.000000000 -0500
31445+++ linux-2.6.32.7/fs/udf/balloc.c 2010-01-25 17:39:40.975519594 -0500 31509+++ linux-2.6.32.8/fs/udf/balloc.c 2010-02-10 15:06:24.590028231 -0500
31446@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc 31510@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
31447 31511
31448 mutex_lock(&sbi->s_alloc_mutex); 31512 mutex_lock(&sbi->s_alloc_mutex);
@@ -31465,9 +31529,9 @@ diff -urNp linux-2.6.32.7/fs/udf/balloc.c linux-2.6.32.7/fs/udf/balloc.c
31465 udf_debug("%d < %d || %d + %d > %d\n", 31529 udf_debug("%d < %d || %d + %d > %d\n",
31466 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, 31530 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
31467 partmap->s_partition_len); 31531 partmap->s_partition_len);
31468diff -urNp linux-2.6.32.7/fs/utimes.c linux-2.6.32.7/fs/utimes.c 31532diff -urNp linux-2.6.32.8/fs/utimes.c linux-2.6.32.8/fs/utimes.c
31469--- linux-2.6.32.7/fs/utimes.c 2010-01-25 13:50:10.000000000 -0500 31533--- linux-2.6.32.8/fs/utimes.c 2010-02-09 07:57:19.000000000 -0500
31470+++ linux-2.6.32.7/fs/utimes.c 2010-01-25 17:39:40.975519594 -0500 31534+++ linux-2.6.32.8/fs/utimes.c 2010-02-10 15:06:24.590028231 -0500
31471@@ -1,6 +1,7 @@ 31535@@ -1,6 +1,7 @@
31472 #include <linux/compiler.h> 31536 #include <linux/compiler.h>
31473 #include <linux/file.h> 31537 #include <linux/file.h>
@@ -31489,9 +31553,9 @@ diff -urNp linux-2.6.32.7/fs/utimes.c linux-2.6.32.7/fs/utimes.c
31489 mutex_lock(&inode->i_mutex); 31553 mutex_lock(&inode->i_mutex);
31490 error = notify_change(path->dentry, &newattrs); 31554 error = notify_change(path->dentry, &newattrs);
31491 mutex_unlock(&inode->i_mutex); 31555 mutex_unlock(&inode->i_mutex);
31492diff -urNp linux-2.6.32.7/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.7/fs/xfs/linux-2.6/xfs_iops.c 31556diff -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
31493--- linux-2.6.32.7/fs/xfs/linux-2.6/xfs_iops.c 2010-01-25 13:50:10.000000000 -0500 31557--- linux-2.6.32.8/fs/xfs/linux-2.6/xfs_iops.c 2010-02-09 07:57:19.000000000 -0500
31494+++ linux-2.6.32.7/fs/xfs/linux-2.6/xfs_iops.c 2010-01-25 17:39:40.975519594 -0500 31558+++ linux-2.6.32.8/fs/xfs/linux-2.6/xfs_iops.c 2010-02-10 15:06:24.594033191 -0500
31495@@ -468,7 +468,7 @@ xfs_vn_put_link( 31559@@ -468,7 +468,7 @@ xfs_vn_put_link(
31496 struct nameidata *nd, 31560 struct nameidata *nd,
31497 void *p) 31561 void *p)
@@ -31501,9 +31565,9 @@ diff -urNp linux-2.6.32.7/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.7/fs/xfs/linu
31501 31565
31502 if (!IS_ERR(s)) 31566 if (!IS_ERR(s))
31503 kfree(s); 31567 kfree(s);
31504diff -urNp linux-2.6.32.7/fs/xfs/xfs_bmap.c linux-2.6.32.7/fs/xfs/xfs_bmap.c 31568diff -urNp linux-2.6.32.8/fs/xfs/xfs_bmap.c linux-2.6.32.8/fs/xfs/xfs_bmap.c
31505--- linux-2.6.32.7/fs/xfs/xfs_bmap.c 2010-01-25 13:50:10.000000000 -0500 31569--- linux-2.6.32.8/fs/xfs/xfs_bmap.c 2010-02-09 07:57:19.000000000 -0500
31506+++ linux-2.6.32.7/fs/xfs/xfs_bmap.c 2010-01-25 17:39:40.976427457 -0500 31570+++ linux-2.6.32.8/fs/xfs/xfs_bmap.c 2010-02-10 15:06:24.594033191 -0500
31507@@ -360,7 +360,7 @@ xfs_bmap_validate_ret( 31571@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
31508 int nmap, 31572 int nmap,
31509 int ret_nmap); 31573 int ret_nmap);
@@ -31513,9 +31577,9 @@ diff -urNp linux-2.6.32.7/fs/xfs/xfs_bmap.c linux-2.6.32.7/fs/xfs/xfs_bmap.c
31513 #endif /* DEBUG */ 31577 #endif /* DEBUG */
31514 31578
31515 #if defined(XFS_RW_TRACE) 31579 #if defined(XFS_RW_TRACE)
31516diff -urNp linux-2.6.32.7/grsecurity/gracl_alloc.c linux-2.6.32.7/grsecurity/gracl_alloc.c 31580diff -urNp linux-2.6.32.8/grsecurity/gracl_alloc.c linux-2.6.32.8/grsecurity/gracl_alloc.c
31517--- linux-2.6.32.7/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 31581--- linux-2.6.32.8/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
31518+++ linux-2.6.32.7/grsecurity/gracl_alloc.c 2010-01-25 17:39:40.977439695 -0500 31582+++ linux-2.6.32.8/grsecurity/gracl_alloc.c 2010-02-10 15:06:24.594033191 -0500
31519@@ -0,0 +1,105 @@ 31583@@ -0,0 +1,105 @@
31520+#include <linux/kernel.h> 31584+#include <linux/kernel.h>
31521+#include <linux/mm.h> 31585+#include <linux/mm.h>
@@ -31622,9 +31686,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_alloc.c linux-2.6.32.7/grsecurity/gra
31622+ else 31686+ else
31623+ return 1; 31687+ return 1;
31624+} 31688+}
31625diff -urNp linux-2.6.32.7/grsecurity/gracl.c linux-2.6.32.7/grsecurity/gracl.c 31689diff -urNp linux-2.6.32.8/grsecurity/gracl.c linux-2.6.32.8/grsecurity/gracl.c
31626--- linux-2.6.32.7/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 31690--- linux-2.6.32.8/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
31627+++ linux-2.6.32.7/grsecurity/gracl.c 2010-01-25 17:39:40.978422732 -0500 31691+++ linux-2.6.32.8/grsecurity/gracl.c 2010-02-10 15:06:24.594033191 -0500
31628@@ -0,0 +1,3918 @@ 31692@@ -0,0 +1,3918 @@
31629+#include <linux/kernel.h> 31693+#include <linux/kernel.h>
31630+#include <linux/module.h> 31694+#include <linux/module.h>
@@ -35544,9 +35608,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl.c linux-2.6.32.7/grsecurity/gracl.c
35544+EXPORT_SYMBOL(gr_check_group_change); 35608+EXPORT_SYMBOL(gr_check_group_change);
35545+#endif 35609+#endif
35546+ 35610+
35547diff -urNp linux-2.6.32.7/grsecurity/gracl_cap.c linux-2.6.32.7/grsecurity/gracl_cap.c 35611diff -urNp linux-2.6.32.8/grsecurity/gracl_cap.c linux-2.6.32.8/grsecurity/gracl_cap.c
35548--- linux-2.6.32.7/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 35612--- linux-2.6.32.8/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
35549+++ linux-2.6.32.7/grsecurity/gracl_cap.c 2010-01-25 17:39:40.978422732 -0500 35613+++ linux-2.6.32.8/grsecurity/gracl_cap.c 2010-02-10 15:06:24.594033191 -0500
35550@@ -0,0 +1,131 @@ 35614@@ -0,0 +1,131 @@
35551+#include <linux/kernel.h> 35615+#include <linux/kernel.h>
35552+#include <linux/module.h> 35616+#include <linux/module.h>
@@ -35679,9 +35743,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_cap.c linux-2.6.32.7/grsecurity/gracl
35679+ return 0; 35743+ return 0;
35680+} 35744+}
35681+ 35745+
35682diff -urNp linux-2.6.32.7/grsecurity/gracl_fs.c linux-2.6.32.7/grsecurity/gracl_fs.c 35746diff -urNp linux-2.6.32.8/grsecurity/gracl_fs.c linux-2.6.32.8/grsecurity/gracl_fs.c
35683--- linux-2.6.32.7/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 35747--- linux-2.6.32.8/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
35684+++ linux-2.6.32.7/grsecurity/gracl_fs.c 2010-01-25 17:39:40.979435589 -0500 35748+++ linux-2.6.32.8/grsecurity/gracl_fs.c 2010-02-10 15:06:24.594033191 -0500
35685@@ -0,0 +1,424 @@ 35749@@ -0,0 +1,424 @@
35686+#include <linux/kernel.h> 35750+#include <linux/kernel.h>
35687+#include <linux/sched.h> 35751+#include <linux/sched.h>
@@ -36107,9 +36171,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_fs.c linux-2.6.32.7/grsecurity/gracl_
36107+ 36171+
36108+ return 0; 36172+ return 0;
36109+} 36173+}
36110diff -urNp linux-2.6.32.7/grsecurity/gracl_ip.c linux-2.6.32.7/grsecurity/gracl_ip.c 36174diff -urNp linux-2.6.32.8/grsecurity/gracl_ip.c linux-2.6.32.8/grsecurity/gracl_ip.c
36111--- linux-2.6.32.7/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 36175--- linux-2.6.32.8/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
36112+++ linux-2.6.32.7/grsecurity/gracl_ip.c 2010-01-25 17:39:40.979435589 -0500 36176+++ linux-2.6.32.8/grsecurity/gracl_ip.c 2010-02-10 15:06:24.594033191 -0500
36113@@ -0,0 +1,339 @@ 36177@@ -0,0 +1,339 @@
36114+#include <linux/kernel.h> 36178+#include <linux/kernel.h>
36115+#include <asm/uaccess.h> 36179+#include <asm/uaccess.h>
@@ -36450,9 +36514,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_ip.c linux-2.6.32.7/grsecurity/gracl_
36450+ 36514+
36451+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); 36515+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
36452+} 36516+}
36453diff -urNp linux-2.6.32.7/grsecurity/gracl_learn.c linux-2.6.32.7/grsecurity/gracl_learn.c 36517diff -urNp linux-2.6.32.8/grsecurity/gracl_learn.c linux-2.6.32.8/grsecurity/gracl_learn.c
36454--- linux-2.6.32.7/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 36518--- linux-2.6.32.8/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
36455+++ linux-2.6.32.7/grsecurity/gracl_learn.c 2010-01-25 17:39:40.979435589 -0500 36519+++ linux-2.6.32.8/grsecurity/gracl_learn.c 2010-02-10 15:06:24.598032715 -0500
36456@@ -0,0 +1,211 @@ 36520@@ -0,0 +1,211 @@
36457+#include <linux/kernel.h> 36521+#include <linux/kernel.h>
36458+#include <linux/mm.h> 36522+#include <linux/mm.h>
@@ -36665,9 +36729,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_learn.c linux-2.6.32.7/grsecurity/gra
36665+ .release = close_learn, 36729+ .release = close_learn,
36666+ .poll = poll_learn, 36730+ .poll = poll_learn,
36667+}; 36731+};
36668diff -urNp linux-2.6.32.7/grsecurity/gracl_res.c linux-2.6.32.7/grsecurity/gracl_res.c 36732diff -urNp linux-2.6.32.8/grsecurity/gracl_res.c linux-2.6.32.8/grsecurity/gracl_res.c
36669--- linux-2.6.32.7/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 36733--- linux-2.6.32.8/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
36670+++ linux-2.6.32.7/grsecurity/gracl_res.c 2010-01-25 17:39:40.979435589 -0500 36734+++ linux-2.6.32.8/grsecurity/gracl_res.c 2010-02-10 15:06:24.598032715 -0500
36671@@ -0,0 +1,65 @@ 36735@@ -0,0 +1,65 @@
36672+#include <linux/kernel.h> 36736+#include <linux/kernel.h>
36673+#include <linux/sched.h> 36737+#include <linux/sched.h>
@@ -36734,9 +36798,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_res.c linux-2.6.32.7/grsecurity/gracl
36734+ rcu_read_unlock(); 36798+ rcu_read_unlock();
36735+ return; 36799+ return;
36736+} 36800+}
36737diff -urNp linux-2.6.32.7/grsecurity/gracl_segv.c linux-2.6.32.7/grsecurity/gracl_segv.c 36801diff -urNp linux-2.6.32.8/grsecurity/gracl_segv.c linux-2.6.32.8/grsecurity/gracl_segv.c
36738--- linux-2.6.32.7/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 36802--- linux-2.6.32.8/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
36739+++ linux-2.6.32.7/grsecurity/gracl_segv.c 2010-01-25 17:39:40.979435589 -0500 36803+++ linux-2.6.32.8/grsecurity/gracl_segv.c 2010-02-10 15:06:24.598032715 -0500
36740@@ -0,0 +1,310 @@ 36804@@ -0,0 +1,310 @@
36741+#include <linux/kernel.h> 36805+#include <linux/kernel.h>
36742+#include <linux/mm.h> 36806+#include <linux/mm.h>
@@ -37048,9 +37112,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_segv.c linux-2.6.32.7/grsecurity/grac
37048+ 37112+
37049+ return; 37113+ return;
37050+} 37114+}
37051diff -urNp linux-2.6.32.7/grsecurity/gracl_shm.c linux-2.6.32.7/grsecurity/gracl_shm.c 37115diff -urNp linux-2.6.32.8/grsecurity/gracl_shm.c linux-2.6.32.8/grsecurity/gracl_shm.c
37052--- linux-2.6.32.7/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 37116--- linux-2.6.32.8/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
37053+++ linux-2.6.32.7/grsecurity/gracl_shm.c 2010-01-25 17:39:40.980422600 -0500 37117+++ linux-2.6.32.8/grsecurity/gracl_shm.c 2010-02-10 15:06:24.598032715 -0500
37054@@ -0,0 +1,37 @@ 37118@@ -0,0 +1,37 @@
37055+#include <linux/kernel.h> 37119+#include <linux/kernel.h>
37056+#include <linux/mm.h> 37120+#include <linux/mm.h>
@@ -37089,9 +37153,9 @@ diff -urNp linux-2.6.32.7/grsecurity/gracl_shm.c linux-2.6.32.7/grsecurity/gracl
37089+ 37153+
37090+ return 1; 37154+ return 1;
37091+} 37155+}
37092diff -urNp linux-2.6.32.7/grsecurity/grsec_chdir.c linux-2.6.32.7/grsecurity/grsec_chdir.c 37156diff -urNp linux-2.6.32.8/grsecurity/grsec_chdir.c linux-2.6.32.8/grsecurity/grsec_chdir.c
37093--- linux-2.6.32.7/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 37157--- linux-2.6.32.8/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
37094+++ linux-2.6.32.7/grsecurity/grsec_chdir.c 2010-01-25 17:39:40.980422600 -0500 37158+++ linux-2.6.32.8/grsecurity/grsec_chdir.c 2010-02-10 15:06:24.598032715 -0500
37095@@ -0,0 +1,19 @@ 37159@@ -0,0 +1,19 @@
37096+#include <linux/kernel.h> 37160+#include <linux/kernel.h>
37097+#include <linux/sched.h> 37161+#include <linux/sched.h>
@@ -37112,9 +37176,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_chdir.c linux-2.6.32.7/grsecurity/grs
37112+#endif 37176+#endif
37113+ return; 37177+ return;
37114+} 37178+}
37115diff -urNp linux-2.6.32.7/grsecurity/grsec_chroot.c linux-2.6.32.7/grsecurity/grsec_chroot.c 37179diff -urNp linux-2.6.32.8/grsecurity/grsec_chroot.c linux-2.6.32.8/grsecurity/grsec_chroot.c
37116--- linux-2.6.32.7/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 37180--- linux-2.6.32.8/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
37117+++ linux-2.6.32.7/grsecurity/grsec_chroot.c 2010-01-25 17:39:40.980422600 -0500 37181+++ linux-2.6.32.8/grsecurity/grsec_chroot.c 2010-02-10 15:06:24.598032715 -0500
37118@@ -0,0 +1,348 @@ 37182@@ -0,0 +1,348 @@
37119+#include <linux/kernel.h> 37183+#include <linux/kernel.h>
37120+#include <linux/module.h> 37184+#include <linux/module.h>
@@ -37464,9 +37528,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_chroot.c linux-2.6.32.7/grsecurity/gr
37464+#ifdef CONFIG_SECURITY 37528+#ifdef CONFIG_SECURITY
37465+EXPORT_SYMBOL(gr_handle_chroot_caps); 37529+EXPORT_SYMBOL(gr_handle_chroot_caps);
37466+#endif 37530+#endif
37467diff -urNp linux-2.6.32.7/grsecurity/grsec_disabled.c linux-2.6.32.7/grsecurity/grsec_disabled.c 37531diff -urNp linux-2.6.32.8/grsecurity/grsec_disabled.c linux-2.6.32.8/grsecurity/grsec_disabled.c
37468--- linux-2.6.32.7/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 37532--- linux-2.6.32.8/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
37469+++ linux-2.6.32.7/grsecurity/grsec_disabled.c 2010-01-25 17:39:40.980422600 -0500 37533+++ linux-2.6.32.8/grsecurity/grsec_disabled.c 2010-02-10 15:06:24.598032715 -0500
37470@@ -0,0 +1,426 @@ 37534@@ -0,0 +1,426 @@
37471+#include <linux/kernel.h> 37535+#include <linux/kernel.h>
37472+#include <linux/module.h> 37536+#include <linux/module.h>
@@ -37894,9 +37958,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_disabled.c linux-2.6.32.7/grsecurity/
37894+EXPORT_SYMBOL(gr_check_user_change); 37958+EXPORT_SYMBOL(gr_check_user_change);
37895+EXPORT_SYMBOL(gr_check_group_change); 37959+EXPORT_SYMBOL(gr_check_group_change);
37896+#endif 37960+#endif
37897diff -urNp linux-2.6.32.7/grsecurity/grsec_exec.c linux-2.6.32.7/grsecurity/grsec_exec.c 37961diff -urNp linux-2.6.32.8/grsecurity/grsec_exec.c linux-2.6.32.8/grsecurity/grsec_exec.c
37898--- linux-2.6.32.7/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 37962--- linux-2.6.32.8/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
37899+++ linux-2.6.32.7/grsecurity/grsec_exec.c 2010-01-25 17:39:40.980422600 -0500 37963+++ linux-2.6.32.8/grsecurity/grsec_exec.c 2010-02-10 15:06:24.598032715 -0500
37900@@ -0,0 +1,89 @@ 37964@@ -0,0 +1,89 @@
37901+#include <linux/kernel.h> 37965+#include <linux/kernel.h>
37902+#include <linux/sched.h> 37966+#include <linux/sched.h>
@@ -37987,9 +38051,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_exec.c linux-2.6.32.7/grsecurity/grse
37987+#endif 38051+#endif
37988+ return; 38052+ return;
37989+} 38053+}
37990diff -urNp linux-2.6.32.7/grsecurity/grsec_fifo.c linux-2.6.32.7/grsecurity/grsec_fifo.c 38054diff -urNp linux-2.6.32.8/grsecurity/grsec_fifo.c linux-2.6.32.8/grsecurity/grsec_fifo.c
37991--- linux-2.6.32.7/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 38055--- linux-2.6.32.8/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
37992+++ linux-2.6.32.7/grsecurity/grsec_fifo.c 2010-01-25 17:39:40.980422600 -0500 38056+++ linux-2.6.32.8/grsecurity/grsec_fifo.c 2010-02-10 15:06:24.598032715 -0500
37993@@ -0,0 +1,24 @@ 38057@@ -0,0 +1,24 @@
37994+#include <linux/kernel.h> 38058+#include <linux/kernel.h>
37995+#include <linux/sched.h> 38059+#include <linux/sched.h>
@@ -38015,9 +38079,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_fifo.c linux-2.6.32.7/grsecurity/grse
38015+#endif 38079+#endif
38016+ return 0; 38080+ return 0;
38017+} 38081+}
38018diff -urNp linux-2.6.32.7/grsecurity/grsec_fork.c linux-2.6.32.7/grsecurity/grsec_fork.c 38082diff -urNp linux-2.6.32.8/grsecurity/grsec_fork.c linux-2.6.32.8/grsecurity/grsec_fork.c
38019--- linux-2.6.32.7/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 38083--- linux-2.6.32.8/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
38020+++ linux-2.6.32.7/grsecurity/grsec_fork.c 2010-01-25 17:39:40.980422600 -0500 38084+++ linux-2.6.32.8/grsecurity/grsec_fork.c 2010-02-10 15:06:24.598032715 -0500
38021@@ -0,0 +1,15 @@ 38085@@ -0,0 +1,15 @@
38022+#include <linux/kernel.h> 38086+#include <linux/kernel.h>
38023+#include <linux/sched.h> 38087+#include <linux/sched.h>
@@ -38034,9 +38098,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_fork.c linux-2.6.32.7/grsecurity/grse
38034+#endif 38098+#endif
38035+ return; 38099+ return;
38036+} 38100+}
38037diff -urNp linux-2.6.32.7/grsecurity/grsec_init.c linux-2.6.32.7/grsecurity/grsec_init.c 38101diff -urNp linux-2.6.32.8/grsecurity/grsec_init.c linux-2.6.32.8/grsecurity/grsec_init.c
38038--- linux-2.6.32.7/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 38102--- linux-2.6.32.8/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
38039+++ linux-2.6.32.7/grsecurity/grsec_init.c 2010-01-25 17:39:40.980422600 -0500 38103+++ linux-2.6.32.8/grsecurity/grsec_init.c 2010-02-10 15:06:24.598032715 -0500
38040@@ -0,0 +1,231 @@ 38104@@ -0,0 +1,231 @@
38041+#include <linux/kernel.h> 38105+#include <linux/kernel.h>
38042+#include <linux/sched.h> 38106+#include <linux/sched.h>
@@ -38269,9 +38333,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_init.c linux-2.6.32.7/grsecurity/grse
38269+ 38333+
38270+ return; 38334+ return;
38271+} 38335+}
38272diff -urNp linux-2.6.32.7/grsecurity/grsec_link.c linux-2.6.32.7/grsecurity/grsec_link.c 38336diff -urNp linux-2.6.32.8/grsecurity/grsec_link.c linux-2.6.32.8/grsecurity/grsec_link.c
38273--- linux-2.6.32.7/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 38337--- linux-2.6.32.8/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
38274+++ linux-2.6.32.7/grsecurity/grsec_link.c 2010-01-25 17:39:40.980422600 -0500 38338+++ linux-2.6.32.8/grsecurity/grsec_link.c 2010-02-10 15:06:24.598032715 -0500
38275@@ -0,0 +1,43 @@ 38339@@ -0,0 +1,43 @@
38276+#include <linux/kernel.h> 38340+#include <linux/kernel.h>
38277+#include <linux/sched.h> 38341+#include <linux/sched.h>
@@ -38316,9 +38380,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_link.c linux-2.6.32.7/grsecurity/grse
38316+#endif 38380+#endif
38317+ return 0; 38381+ return 0;
38318+} 38382+}
38319diff -urNp linux-2.6.32.7/grsecurity/grsec_log.c linux-2.6.32.7/grsecurity/grsec_log.c 38383diff -urNp linux-2.6.32.8/grsecurity/grsec_log.c linux-2.6.32.8/grsecurity/grsec_log.c
38320--- linux-2.6.32.7/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 38384--- linux-2.6.32.8/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
38321+++ linux-2.6.32.7/grsecurity/grsec_log.c 2010-01-25 17:39:40.981426611 -0500 38385+++ linux-2.6.32.8/grsecurity/grsec_log.c 2010-02-10 15:06:24.598032715 -0500
38322@@ -0,0 +1,296 @@ 38386@@ -0,0 +1,296 @@
38323+#include <linux/kernel.h> 38387+#include <linux/kernel.h>
38324+#include <linux/sched.h> 38388+#include <linux/sched.h>
@@ -38616,9 +38680,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_log.c linux-2.6.32.7/grsecurity/grsec
38616+ gr_log_end(audit); 38680+ gr_log_end(audit);
38617+ END_LOCKS(audit); 38681+ END_LOCKS(audit);
38618+} 38682+}
38619diff -urNp linux-2.6.32.7/grsecurity/grsec_mem.c linux-2.6.32.7/grsecurity/grsec_mem.c 38683diff -urNp linux-2.6.32.8/grsecurity/grsec_mem.c linux-2.6.32.8/grsecurity/grsec_mem.c
38620--- linux-2.6.32.7/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 38684--- linux-2.6.32.8/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
38621+++ linux-2.6.32.7/grsecurity/grsec_mem.c 2010-01-25 17:39:40.981426611 -0500 38685+++ linux-2.6.32.8/grsecurity/grsec_mem.c 2010-02-10 15:06:24.598032715 -0500
38622@@ -0,0 +1,85 @@ 38686@@ -0,0 +1,85 @@
38623+#include <linux/kernel.h> 38687+#include <linux/kernel.h>
38624+#include <linux/sched.h> 38688+#include <linux/sched.h>
@@ -38705,9 +38769,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_mem.c linux-2.6.32.7/grsecurity/grsec
38705+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); 38769+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
38706+ return; 38770+ return;
38707+} 38771+}
38708diff -urNp linux-2.6.32.7/grsecurity/grsec_mount.c linux-2.6.32.7/grsecurity/grsec_mount.c 38772diff -urNp linux-2.6.32.8/grsecurity/grsec_mount.c linux-2.6.32.8/grsecurity/grsec_mount.c
38709--- linux-2.6.32.7/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 38773--- linux-2.6.32.8/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
38710+++ linux-2.6.32.7/grsecurity/grsec_mount.c 2010-01-25 17:39:40.981426611 -0500 38774+++ linux-2.6.32.8/grsecurity/grsec_mount.c 2010-02-10 15:06:24.598032715 -0500
38711@@ -0,0 +1,62 @@ 38775@@ -0,0 +1,62 @@
38712+#include <linux/kernel.h> 38776+#include <linux/kernel.h>
38713+#include <linux/sched.h> 38777+#include <linux/sched.h>
@@ -38771,9 +38835,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_mount.c linux-2.6.32.7/grsecurity/grs
38771+#endif 38835+#endif
38772+ return 0; 38836+ return 0;
38773+} 38837+}
38774diff -urNp linux-2.6.32.7/grsecurity/grsec_sig.c linux-2.6.32.7/grsecurity/grsec_sig.c 38838diff -urNp linux-2.6.32.8/grsecurity/grsec_sig.c linux-2.6.32.8/grsecurity/grsec_sig.c
38775--- linux-2.6.32.7/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 38839--- linux-2.6.32.8/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
38776+++ linux-2.6.32.7/grsecurity/grsec_sig.c 2010-01-25 17:39:40.981426611 -0500 38840+++ linux-2.6.32.8/grsecurity/grsec_sig.c 2010-02-10 15:06:24.598032715 -0500
38777@@ -0,0 +1,65 @@ 38841@@ -0,0 +1,65 @@
38778+#include <linux/kernel.h> 38842+#include <linux/kernel.h>
38779+#include <linux/sched.h> 38843+#include <linux/sched.h>
@@ -38840,9 +38904,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_sig.c linux-2.6.32.7/grsecurity/grsec
38840+ return; 38904+ return;
38841+} 38905+}
38842+ 38906+
38843diff -urNp linux-2.6.32.7/grsecurity/grsec_sock.c linux-2.6.32.7/grsecurity/grsec_sock.c 38907diff -urNp linux-2.6.32.8/grsecurity/grsec_sock.c linux-2.6.32.8/grsecurity/grsec_sock.c
38844--- linux-2.6.32.7/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 38908--- linux-2.6.32.8/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
38845+++ linux-2.6.32.7/grsecurity/grsec_sock.c 2010-01-25 19:59:21.258136279 -0500 38909+++ linux-2.6.32.8/grsecurity/grsec_sock.c 2010-02-10 15:06:24.598032715 -0500
38846@@ -0,0 +1,271 @@ 38910@@ -0,0 +1,271 @@
38847+#include <linux/kernel.h> 38911+#include <linux/kernel.h>
38848+#include <linux/module.h> 38912+#include <linux/module.h>
@@ -39115,9 +39179,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_sock.c linux-2.6.32.7/grsecurity/grse
39115+ return current_cap(); 39179+ return current_cap();
39116+#endif 39180+#endif
39117+} 39181+}
39118diff -urNp linux-2.6.32.7/grsecurity/grsec_sysctl.c linux-2.6.32.7/grsecurity/grsec_sysctl.c 39182diff -urNp linux-2.6.32.8/grsecurity/grsec_sysctl.c linux-2.6.32.8/grsecurity/grsec_sysctl.c
39119--- linux-2.6.32.7/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 39183--- linux-2.6.32.8/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
39120+++ linux-2.6.32.7/grsecurity/grsec_sysctl.c 2010-01-25 17:39:40.981426611 -0500 39184+++ linux-2.6.32.8/grsecurity/grsec_sysctl.c 2010-02-10 15:06:24.598032715 -0500
39121@@ -0,0 +1,419 @@ 39185@@ -0,0 +1,419 @@
39122+#include <linux/kernel.h> 39186+#include <linux/kernel.h>
39123+#include <linux/sched.h> 39187+#include <linux/sched.h>
@@ -39538,9 +39602,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_sysctl.c linux-2.6.32.7/grsecurity/gr
39538+ { .ctl_name = 0 } 39602+ { .ctl_name = 0 }
39539+}; 39603+};
39540+#endif 39604+#endif
39541diff -urNp linux-2.6.32.7/grsecurity/grsec_textrel.c linux-2.6.32.7/grsecurity/grsec_textrel.c 39605diff -urNp linux-2.6.32.8/grsecurity/grsec_textrel.c linux-2.6.32.8/grsecurity/grsec_textrel.c
39542--- linux-2.6.32.7/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 39606--- linux-2.6.32.8/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
39543+++ linux-2.6.32.7/grsecurity/grsec_textrel.c 2010-01-25 17:39:40.981426611 -0500 39607+++ linux-2.6.32.8/grsecurity/grsec_textrel.c 2010-02-10 15:06:24.598032715 -0500
39544@@ -0,0 +1,16 @@ 39608@@ -0,0 +1,16 @@
39545+#include <linux/kernel.h> 39609+#include <linux/kernel.h>
39546+#include <linux/sched.h> 39610+#include <linux/sched.h>
@@ -39558,9 +39622,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_textrel.c linux-2.6.32.7/grsecurity/g
39558+#endif 39622+#endif
39559+ return; 39623+ return;
39560+} 39624+}
39561diff -urNp linux-2.6.32.7/grsecurity/grsec_time.c linux-2.6.32.7/grsecurity/grsec_time.c 39625diff -urNp linux-2.6.32.8/grsecurity/grsec_time.c linux-2.6.32.8/grsecurity/grsec_time.c
39562--- linux-2.6.32.7/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 39626--- linux-2.6.32.8/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
39563+++ linux-2.6.32.7/grsecurity/grsec_time.c 2010-01-25 17:39:40.981426611 -0500 39627+++ linux-2.6.32.8/grsecurity/grsec_time.c 2010-02-10 15:06:24.598032715 -0500
39564@@ -0,0 +1,13 @@ 39628@@ -0,0 +1,13 @@
39565+#include <linux/kernel.h> 39629+#include <linux/kernel.h>
39566+#include <linux/sched.h> 39630+#include <linux/sched.h>
@@ -39575,9 +39639,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_time.c linux-2.6.32.7/grsecurity/grse
39575+#endif 39639+#endif
39576+ return; 39640+ return;
39577+} 39641+}
39578diff -urNp linux-2.6.32.7/grsecurity/grsec_tpe.c linux-2.6.32.7/grsecurity/grsec_tpe.c 39642diff -urNp linux-2.6.32.8/grsecurity/grsec_tpe.c linux-2.6.32.8/grsecurity/grsec_tpe.c
39579--- linux-2.6.32.7/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 39643--- linux-2.6.32.8/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
39580+++ linux-2.6.32.7/grsecurity/grsec_tpe.c 2010-01-25 17:39:40.982430149 -0500 39644+++ linux-2.6.32.8/grsecurity/grsec_tpe.c 2010-02-10 15:06:24.598032715 -0500
39581@@ -0,0 +1,38 @@ 39645@@ -0,0 +1,38 @@
39582+#include <linux/kernel.h> 39646+#include <linux/kernel.h>
39583+#include <linux/sched.h> 39647+#include <linux/sched.h>
@@ -39617,9 +39681,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsec_tpe.c linux-2.6.32.7/grsecurity/grsec
39617+#endif 39681+#endif
39618+ return 1; 39682+ return 1;
39619+} 39683+}
39620diff -urNp linux-2.6.32.7/grsecurity/grsum.c linux-2.6.32.7/grsecurity/grsum.c 39684diff -urNp linux-2.6.32.8/grsecurity/grsum.c linux-2.6.32.8/grsecurity/grsum.c
39621--- linux-2.6.32.7/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 39685--- linux-2.6.32.8/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
39622+++ linux-2.6.32.7/grsecurity/grsum.c 2010-01-25 17:39:40.982430149 -0500 39686+++ linux-2.6.32.8/grsecurity/grsum.c 2010-02-10 15:06:24.598032715 -0500
39623@@ -0,0 +1,59 @@ 39687@@ -0,0 +1,59 @@
39624+#include <linux/err.h> 39688+#include <linux/err.h>
39625+#include <linux/kernel.h> 39689+#include <linux/kernel.h>
@@ -39680,9 +39744,9 @@ diff -urNp linux-2.6.32.7/grsecurity/grsum.c linux-2.6.32.7/grsecurity/grsum.c
39680+ 39744+
39681+ return retval; 39745+ return retval;
39682+} 39746+}
39683diff -urNp linux-2.6.32.7/grsecurity/Kconfig linux-2.6.32.7/grsecurity/Kconfig 39747diff -urNp linux-2.6.32.8/grsecurity/Kconfig linux-2.6.32.8/grsecurity/Kconfig
39684--- linux-2.6.32.7/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 39748--- linux-2.6.32.8/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
39685+++ linux-2.6.32.7/grsecurity/Kconfig 2010-01-25 17:39:40.988423918 -0500 39749+++ linux-2.6.32.8/grsecurity/Kconfig 2010-02-10 15:06:24.598032715 -0500
39686@@ -0,0 +1,937 @@ 39750@@ -0,0 +1,937 @@
39687+# 39751+#
39688+# grecurity configuration 39752+# grecurity configuration
@@ -40621,9 +40685,9 @@ diff -urNp linux-2.6.32.7/grsecurity/Kconfig linux-2.6.32.7/grsecurity/Kconfig
40621+endmenu 40685+endmenu
40622+ 40686+
40623+endmenu 40687+endmenu
40624diff -urNp linux-2.6.32.7/grsecurity/Makefile linux-2.6.32.7/grsecurity/Makefile 40688diff -urNp linux-2.6.32.8/grsecurity/Makefile linux-2.6.32.8/grsecurity/Makefile
40625--- linux-2.6.32.7/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 40689--- linux-2.6.32.8/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
40626+++ linux-2.6.32.7/grsecurity/Makefile 2010-01-25 17:39:40.988423918 -0500 40690+++ linux-2.6.32.8/grsecurity/Makefile 2010-02-10 15:06:24.598032715 -0500
40627@@ -0,0 +1,29 @@ 40691@@ -0,0 +1,29 @@
40628+# grsecurity's ACL system was originally written in 2001 by Michael Dalton 40692+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
40629+# during 2001-2009 it has been completely redesigned by Brad Spengler 40693+# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -40654,9 +40718,9 @@ diff -urNp linux-2.6.32.7/grsecurity/Makefile linux-2.6.32.7/grsecurity/Makefile
40654+ @-chmod -f 700 . 40718+ @-chmod -f 700 .
40655+ @echo ' grsec: protected kernel image paths' 40719+ @echo ' grsec: protected kernel image paths'
40656+endif 40720+endif
40657diff -urNp linux-2.6.32.7/include/acpi/acpi_drivers.h linux-2.6.32.7/include/acpi/acpi_drivers.h 40721diff -urNp linux-2.6.32.8/include/acpi/acpi_drivers.h linux-2.6.32.8/include/acpi/acpi_drivers.h
40658--- linux-2.6.32.7/include/acpi/acpi_drivers.h 2010-01-25 13:50:10.000000000 -0500 40722--- linux-2.6.32.8/include/acpi/acpi_drivers.h 2010-02-09 07:57:19.000000000 -0500
40659+++ linux-2.6.32.7/include/acpi/acpi_drivers.h 2010-01-25 17:39:40.988423918 -0500 40723+++ linux-2.6.32.8/include/acpi/acpi_drivers.h 2010-02-10 15:06:24.598032715 -0500
40660@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp 40724@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
40661 Dock Station 40725 Dock Station
40662 -------------------------------------------------------------------------- */ 40726 -------------------------------------------------------------------------- */
@@ -40686,9 +40750,9 @@ diff -urNp linux-2.6.32.7/include/acpi/acpi_drivers.h linux-2.6.32.7/include/acp
40686 void *context) 40750 void *context)
40687 { 40751 {
40688 return -ENODEV; 40752 return -ENODEV;
40689diff -urNp linux-2.6.32.7/include/asm-generic/atomic-long.h linux-2.6.32.7/include/asm-generic/atomic-long.h 40753diff -urNp linux-2.6.32.8/include/asm-generic/atomic-long.h linux-2.6.32.8/include/asm-generic/atomic-long.h
40690--- linux-2.6.32.7/include/asm-generic/atomic-long.h 2010-01-25 13:50:10.000000000 -0500 40754--- linux-2.6.32.8/include/asm-generic/atomic-long.h 2010-02-09 07:57:19.000000000 -0500
40691+++ linux-2.6.32.7/include/asm-generic/atomic-long.h 2010-01-25 17:39:40.988423918 -0500 40755+++ linux-2.6.32.8/include/asm-generic/atomic-long.h 2010-02-10 15:06:24.598032715 -0500
40692@@ -22,6 +22,12 @@ 40756@@ -22,6 +22,12 @@
40693 40757
40694 typedef atomic64_t atomic_long_t; 40758 typedef atomic64_t atomic_long_t;
@@ -40909,9 +40973,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/atomic-long.h linux-2.6.32.7/inclu
40909+#endif 40973+#endif
40910+ 40974+
40911 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ 40975 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
40912diff -urNp linux-2.6.32.7/include/asm-generic/dma-mapping-common.h linux-2.6.32.7/include/asm-generic/dma-mapping-common.h 40976diff -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
40913--- linux-2.6.32.7/include/asm-generic/dma-mapping-common.h 2010-01-25 13:50:10.000000000 -0500 40977--- linux-2.6.32.8/include/asm-generic/dma-mapping-common.h 2010-02-09 07:57:19.000000000 -0500
40914+++ linux-2.6.32.7/include/asm-generic/dma-mapping-common.h 2010-01-25 17:39:40.988423918 -0500 40978+++ linux-2.6.32.8/include/asm-generic/dma-mapping-common.h 2010-02-10 15:06:24.602031914 -0500
40915@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ 40979@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
40916 enum dma_data_direction dir, 40980 enum dma_data_direction dir,
40917 struct dma_attrs *attrs) 40981 struct dma_attrs *attrs)
@@ -41020,9 +41084,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/dma-mapping-common.h linux-2.6.32.
41020 41084
41021 BUG_ON(!valid_dma_direction(dir)); 41085 BUG_ON(!valid_dma_direction(dir));
41022 if (ops->sync_sg_for_device) 41086 if (ops->sync_sg_for_device)
41023diff -urNp linux-2.6.32.7/include/asm-generic/futex.h linux-2.6.32.7/include/asm-generic/futex.h 41087diff -urNp linux-2.6.32.8/include/asm-generic/futex.h linux-2.6.32.8/include/asm-generic/futex.h
41024--- linux-2.6.32.7/include/asm-generic/futex.h 2010-01-25 13:50:10.000000000 -0500 41088--- linux-2.6.32.8/include/asm-generic/futex.h 2010-02-09 07:57:19.000000000 -0500
41025+++ linux-2.6.32.7/include/asm-generic/futex.h 2010-01-25 17:39:40.988423918 -0500 41089+++ linux-2.6.32.8/include/asm-generic/futex.h 2010-02-10 15:06:24.602031914 -0500
41026@@ -6,7 +6,7 @@ 41090@@ -6,7 +6,7 @@
41027 #include <asm/errno.h> 41091 #include <asm/errno.h>
41028 41092
@@ -41041,9 +41105,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/futex.h linux-2.6.32.7/include/asm
41041 { 41105 {
41042 return -ENOSYS; 41106 return -ENOSYS;
41043 } 41107 }
41044diff -urNp linux-2.6.32.7/include/asm-generic/int-l64.h linux-2.6.32.7/include/asm-generic/int-l64.h 41108diff -urNp linux-2.6.32.8/include/asm-generic/int-l64.h linux-2.6.32.8/include/asm-generic/int-l64.h
41045--- linux-2.6.32.7/include/asm-generic/int-l64.h 2010-01-25 13:50:10.000000000 -0500 41109--- linux-2.6.32.8/include/asm-generic/int-l64.h 2010-02-09 07:57:19.000000000 -0500
41046+++ linux-2.6.32.7/include/asm-generic/int-l64.h 2010-01-25 17:39:40.989425437 -0500 41110+++ linux-2.6.32.8/include/asm-generic/int-l64.h 2010-02-10 15:06:24.602031914 -0500
41047@@ -46,6 +46,8 @@ typedef unsigned int u32; 41111@@ -46,6 +46,8 @@ typedef unsigned int u32;
41048 typedef signed long s64; 41112 typedef signed long s64;
41049 typedef unsigned long u64; 41113 typedef unsigned long u64;
@@ -41053,9 +41117,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/int-l64.h linux-2.6.32.7/include/a
41053 #define S8_C(x) x 41117 #define S8_C(x) x
41054 #define U8_C(x) x ## U 41118 #define U8_C(x) x ## U
41055 #define S16_C(x) x 41119 #define S16_C(x) x
41056diff -urNp linux-2.6.32.7/include/asm-generic/int-ll64.h linux-2.6.32.7/include/asm-generic/int-ll64.h 41120diff -urNp linux-2.6.32.8/include/asm-generic/int-ll64.h linux-2.6.32.8/include/asm-generic/int-ll64.h
41057--- linux-2.6.32.7/include/asm-generic/int-ll64.h 2010-01-25 13:50:10.000000000 -0500 41121--- linux-2.6.32.8/include/asm-generic/int-ll64.h 2010-02-09 07:57:19.000000000 -0500
41058+++ linux-2.6.32.7/include/asm-generic/int-ll64.h 2010-01-25 17:39:40.989425437 -0500 41122+++ linux-2.6.32.8/include/asm-generic/int-ll64.h 2010-02-10 15:06:24.602031914 -0500
41059@@ -51,6 +51,8 @@ typedef unsigned int u32; 41123@@ -51,6 +51,8 @@ typedef unsigned int u32;
41060 typedef signed long long s64; 41124 typedef signed long long s64;
41061 typedef unsigned long long u64; 41125 typedef unsigned long long u64;
@@ -41065,9 +41129,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/int-ll64.h linux-2.6.32.7/include/
41065 #define S8_C(x) x 41129 #define S8_C(x) x
41066 #define U8_C(x) x ## U 41130 #define U8_C(x) x ## U
41067 #define S16_C(x) x 41131 #define S16_C(x) x
41068diff -urNp linux-2.6.32.7/include/asm-generic/kmap_types.h linux-2.6.32.7/include/asm-generic/kmap_types.h 41132diff -urNp linux-2.6.32.8/include/asm-generic/kmap_types.h linux-2.6.32.8/include/asm-generic/kmap_types.h
41069--- linux-2.6.32.7/include/asm-generic/kmap_types.h 2010-01-25 13:50:10.000000000 -0500 41133--- linux-2.6.32.8/include/asm-generic/kmap_types.h 2010-02-09 07:57:19.000000000 -0500
41070+++ linux-2.6.32.7/include/asm-generic/kmap_types.h 2010-01-25 17:39:40.989425437 -0500 41134+++ linux-2.6.32.8/include/asm-generic/kmap_types.h 2010-02-10 15:06:24.602031914 -0500
41071@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, 41135@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
41072 KMAP_D(16) KM_IRQ_PTE, 41136 KMAP_D(16) KM_IRQ_PTE,
41073 KMAP_D(17) KM_NMI, 41137 KMAP_D(17) KM_NMI,
@@ -41078,9 +41142,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/kmap_types.h linux-2.6.32.7/includ
41078 }; 41142 };
41079 41143
41080 #undef KMAP_D 41144 #undef KMAP_D
41081diff -urNp linux-2.6.32.7/include/asm-generic/pgtable.h linux-2.6.32.7/include/asm-generic/pgtable.h 41145diff -urNp linux-2.6.32.8/include/asm-generic/pgtable.h linux-2.6.32.8/include/asm-generic/pgtable.h
41082--- linux-2.6.32.7/include/asm-generic/pgtable.h 2010-01-25 13:50:10.000000000 -0500 41146--- linux-2.6.32.8/include/asm-generic/pgtable.h 2010-02-09 07:57:19.000000000 -0500
41083+++ linux-2.6.32.7/include/asm-generic/pgtable.h 2010-01-25 17:39:40.989425437 -0500 41147+++ linux-2.6.32.8/include/asm-generic/pgtable.h 2010-02-10 15:06:24.602031914 -0500
41084@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar 41148@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
41085 unsigned long size); 41149 unsigned long size);
41086 #endif 41150 #endif
@@ -41096,9 +41160,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/pgtable.h linux-2.6.32.7/include/a
41096 #endif /* !__ASSEMBLY__ */ 41160 #endif /* !__ASSEMBLY__ */
41097 41161
41098 #endif /* _ASM_GENERIC_PGTABLE_H */ 41162 #endif /* _ASM_GENERIC_PGTABLE_H */
41099diff -urNp linux-2.6.32.7/include/asm-generic/vmlinux.lds.h linux-2.6.32.7/include/asm-generic/vmlinux.lds.h 41163diff -urNp linux-2.6.32.8/include/asm-generic/vmlinux.lds.h linux-2.6.32.8/include/asm-generic/vmlinux.lds.h
41100--- linux-2.6.32.7/include/asm-generic/vmlinux.lds.h 2010-01-25 13:50:10.000000000 -0500 41164--- linux-2.6.32.8/include/asm-generic/vmlinux.lds.h 2010-02-09 07:57:19.000000000 -0500
41101+++ linux-2.6.32.7/include/asm-generic/vmlinux.lds.h 2010-01-25 17:39:40.989425437 -0500 41165+++ linux-2.6.32.8/include/asm-generic/vmlinux.lds.h 2010-02-10 15:06:24.602031914 -0500
41102@@ -199,6 +199,7 @@ 41166@@ -199,6 +199,7 @@
41103 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ 41167 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
41104 VMLINUX_SYMBOL(__start_rodata) = .; \ 41168 VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -41137,9 +41201,9 @@ diff -urNp linux-2.6.32.7/include/asm-generic/vmlinux.lds.h linux-2.6.32.7/inclu
41137 41201
41138 /** 41202 /**
41139 * PERCPU - define output section for percpu area, simple version 41203 * PERCPU - define output section for percpu area, simple version
41140diff -urNp linux-2.6.32.7/include/drm/drm_pciids.h linux-2.6.32.7/include/drm/drm_pciids.h 41204diff -urNp linux-2.6.32.8/include/drm/drm_pciids.h linux-2.6.32.8/include/drm/drm_pciids.h
41141--- linux-2.6.32.7/include/drm/drm_pciids.h 2010-01-25 13:50:10.000000000 -0500 41205--- linux-2.6.32.8/include/drm/drm_pciids.h 2010-02-09 07:57:19.000000000 -0500
41142+++ linux-2.6.32.7/include/drm/drm_pciids.h 2010-01-25 17:39:40.989425437 -0500 41206+++ linux-2.6.32.8/include/drm/drm_pciids.h 2010-02-10 15:06:24.602031914 -0500
41143@@ -375,7 +375,7 @@ 41207@@ -375,7 +375,7 @@
41144 {0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 41208 {0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
41145 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 41209 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -41243,9 +41307,9 @@ diff -urNp linux-2.6.32.7/include/drm/drm_pciids.h linux-2.6.32.7/include/drm/dr
41243 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 41307 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
41244- {0, 0, 0} 41308- {0, 0, 0}
41245+ {0, 0, 0, 0, 0, 0} 41309+ {0, 0, 0, 0, 0, 0}
41246diff -urNp linux-2.6.32.7/include/drm/drmP.h linux-2.6.32.7/include/drm/drmP.h 41310diff -urNp linux-2.6.32.8/include/drm/drmP.h linux-2.6.32.8/include/drm/drmP.h
41247--- linux-2.6.32.7/include/drm/drmP.h 2010-01-25 13:50:10.000000000 -0500 41311--- linux-2.6.32.8/include/drm/drmP.h 2010-02-09 07:57:19.000000000 -0500
41248+++ linux-2.6.32.7/include/drm/drmP.h 2010-01-25 17:39:40.990424527 -0500 41312+++ linux-2.6.32.8/include/drm/drmP.h 2010-02-10 15:06:24.602031914 -0500
41249@@ -814,7 +814,7 @@ struct drm_driver { 41313@@ -814,7 +814,7 @@ struct drm_driver {
41250 void (*vgaarb_irq)(struct drm_device *dev, bool state); 41314 void (*vgaarb_irq)(struct drm_device *dev, bool state);
41251 41315
@@ -41273,9 +41337,9 @@ diff -urNp linux-2.6.32.7/include/drm/drmP.h linux-2.6.32.7/include/drm/drmP.h
41273 /*@} */ 41337 /*@} */
41274 41338
41275 struct list_head filelist; 41339 struct list_head filelist;
41276diff -urNp linux-2.6.32.7/include/linux/a.out.h linux-2.6.32.7/include/linux/a.out.h 41340diff -urNp linux-2.6.32.8/include/linux/a.out.h linux-2.6.32.8/include/linux/a.out.h
41277--- linux-2.6.32.7/include/linux/a.out.h 2010-01-25 13:50:10.000000000 -0500 41341--- linux-2.6.32.8/include/linux/a.out.h 2010-02-09 07:57:19.000000000 -0500
41278+++ linux-2.6.32.7/include/linux/a.out.h 2010-01-25 17:39:40.991299866 -0500 41342+++ linux-2.6.32.8/include/linux/a.out.h 2010-02-10 15:06:24.602031914 -0500
41279@@ -39,6 +39,14 @@ enum machine_type { 41343@@ -39,6 +39,14 @@ enum machine_type {
41280 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ 41344 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
41281 }; 41345 };
@@ -41291,9 +41355,9 @@ diff -urNp linux-2.6.32.7/include/linux/a.out.h linux-2.6.32.7/include/linux/a.o
41291 #if !defined (N_MAGIC) 41355 #if !defined (N_MAGIC)
41292 #define N_MAGIC(exec) ((exec).a_info & 0xffff) 41356 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
41293 #endif 41357 #endif
41294diff -urNp linux-2.6.32.7/include/linux/atmdev.h linux-2.6.32.7/include/linux/atmdev.h 41358diff -urNp linux-2.6.32.8/include/linux/atmdev.h linux-2.6.32.8/include/linux/atmdev.h
41295--- linux-2.6.32.7/include/linux/atmdev.h 2010-01-25 13:50:10.000000000 -0500 41359--- linux-2.6.32.8/include/linux/atmdev.h 2010-02-09 07:57:19.000000000 -0500
41296+++ linux-2.6.32.7/include/linux/atmdev.h 2010-01-25 17:39:40.991299866 -0500 41360+++ linux-2.6.32.8/include/linux/atmdev.h 2010-02-10 15:06:24.602031914 -0500
41297@@ -237,7 +237,7 @@ struct compat_atm_iobuf { 41361@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
41298 #endif 41362 #endif
41299 41363
@@ -41303,9 +41367,9 @@ diff -urNp linux-2.6.32.7/include/linux/atmdev.h linux-2.6.32.7/include/linux/at
41303 __AAL_STAT_ITEMS 41367 __AAL_STAT_ITEMS
41304 #undef __HANDLE_ITEM 41368 #undef __HANDLE_ITEM
41305 }; 41369 };
41306diff -urNp linux-2.6.32.7/include/linux/backlight.h linux-2.6.32.7/include/linux/backlight.h 41370diff -urNp linux-2.6.32.8/include/linux/backlight.h linux-2.6.32.8/include/linux/backlight.h
41307--- linux-2.6.32.7/include/linux/backlight.h 2010-01-25 13:50:10.000000000 -0500 41371--- linux-2.6.32.8/include/linux/backlight.h 2010-02-09 07:57:19.000000000 -0500
41308+++ linux-2.6.32.7/include/linux/backlight.h 2010-01-25 17:39:40.991299866 -0500 41372+++ linux-2.6.32.8/include/linux/backlight.h 2010-02-10 15:06:24.602031914 -0500
41309@@ -36,18 +36,18 @@ struct backlight_device; 41373@@ -36,18 +36,18 @@ struct backlight_device;
41310 struct fb_info; 41374 struct fb_info;
41311 41375
@@ -41347,9 +41411,9 @@ diff -urNp linux-2.6.32.7/include/linux/backlight.h linux-2.6.32.7/include/linux
41347 extern void backlight_device_unregister(struct backlight_device *bd); 41411 extern void backlight_device_unregister(struct backlight_device *bd);
41348 extern void backlight_force_update(struct backlight_device *bd, 41412 extern void backlight_force_update(struct backlight_device *bd,
41349 enum backlight_update_reason reason); 41413 enum backlight_update_reason reason);
41350diff -urNp linux-2.6.32.7/include/linux/binfmts.h linux-2.6.32.7/include/linux/binfmts.h 41414diff -urNp linux-2.6.32.8/include/linux/binfmts.h linux-2.6.32.8/include/linux/binfmts.h
41351--- linux-2.6.32.7/include/linux/binfmts.h 2010-01-25 13:50:10.000000000 -0500 41415--- linux-2.6.32.8/include/linux/binfmts.h 2010-02-09 07:57:19.000000000 -0500
41352+++ linux-2.6.32.7/include/linux/binfmts.h 2010-01-25 17:39:40.991299866 -0500 41416+++ linux-2.6.32.8/include/linux/binfmts.h 2010-02-10 15:06:24.602031914 -0500
41353@@ -78,6 +78,7 @@ struct linux_binfmt { 41417@@ -78,6 +78,7 @@ struct linux_binfmt {
41354 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); 41418 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
41355 int (*load_shlib)(struct file *); 41419 int (*load_shlib)(struct file *);
@@ -41358,9 +41422,9 @@ diff -urNp linux-2.6.32.7/include/linux/binfmts.h linux-2.6.32.7/include/linux/b
41358 unsigned long min_coredump; /* minimal dump size */ 41422 unsigned long min_coredump; /* minimal dump size */
41359 int hasvdso; 41423 int hasvdso;
41360 }; 41424 };
41361diff -urNp linux-2.6.32.7/include/linux/blkdev.h linux-2.6.32.7/include/linux/blkdev.h 41425diff -urNp linux-2.6.32.8/include/linux/blkdev.h linux-2.6.32.8/include/linux/blkdev.h
41362--- linux-2.6.32.7/include/linux/blkdev.h 2010-01-25 13:50:10.000000000 -0500 41426--- linux-2.6.32.8/include/linux/blkdev.h 2010-02-09 07:57:19.000000000 -0500
41363+++ linux-2.6.32.7/include/linux/blkdev.h 2010-01-25 17:39:40.991299866 -0500 41427+++ linux-2.6.32.8/include/linux/blkdev.h 2010-02-10 15:06:24.602031914 -0500
41364@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc 41428@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc
41365 #endif /* CONFIG_BLK_DEV_INTEGRITY */ 41429 #endif /* CONFIG_BLK_DEV_INTEGRITY */
41366 41430
@@ -41392,9 +41456,9 @@ diff -urNp linux-2.6.32.7/include/linux/blkdev.h linux-2.6.32.7/include/linux/bl
41392 }; 41456 };
41393 41457
41394 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, 41458 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
41395diff -urNp linux-2.6.32.7/include/linux/cache.h linux-2.6.32.7/include/linux/cache.h 41459diff -urNp linux-2.6.32.8/include/linux/cache.h linux-2.6.32.8/include/linux/cache.h
41396--- linux-2.6.32.7/include/linux/cache.h 2010-01-25 13:50:10.000000000 -0500 41460--- linux-2.6.32.8/include/linux/cache.h 2010-02-09 07:57:19.000000000 -0500
41397+++ linux-2.6.32.7/include/linux/cache.h 2010-01-25 17:39:40.992433501 -0500 41461+++ linux-2.6.32.8/include/linux/cache.h 2010-02-10 15:06:24.602031914 -0500
41398@@ -16,6 +16,10 @@ 41462@@ -16,6 +16,10 @@
41399 #define __read_mostly 41463 #define __read_mostly
41400 #endif 41464 #endif
@@ -41406,9 +41470,9 @@ diff -urNp linux-2.6.32.7/include/linux/cache.h linux-2.6.32.7/include/linux/cac
41406 #ifndef ____cacheline_aligned 41470 #ifndef ____cacheline_aligned
41407 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) 41471 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
41408 #endif 41472 #endif
41409diff -urNp linux-2.6.32.7/include/linux/capability.h linux-2.6.32.7/include/linux/capability.h 41473diff -urNp linux-2.6.32.8/include/linux/capability.h linux-2.6.32.8/include/linux/capability.h
41410--- linux-2.6.32.7/include/linux/capability.h 2010-01-25 13:50:10.000000000 -0500 41474--- linux-2.6.32.8/include/linux/capability.h 2010-02-09 07:57:19.000000000 -0500
41411+++ linux-2.6.32.7/include/linux/capability.h 2010-01-25 17:39:40.992433501 -0500 41475+++ linux-2.6.32.8/include/linux/capability.h 2010-02-10 15:06:24.602031914 -0500
41412@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff 41476@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
41413 (security_real_capable_noaudit((t), (cap)) == 0) 41477 (security_real_capable_noaudit((t), (cap)) == 0)
41414 41478
@@ -41417,9 +41481,9 @@ diff -urNp linux-2.6.32.7/include/linux/capability.h linux-2.6.32.7/include/linu
41417 41481
41418 /* audit system wants to get cap info from files as well */ 41482 /* audit system wants to get cap info from files as well */
41419 struct dentry; 41483 struct dentry;
41420diff -urNp linux-2.6.32.7/include/linux/compiler-gcc4.h linux-2.6.32.7/include/linux/compiler-gcc4.h 41484diff -urNp linux-2.6.32.8/include/linux/compiler-gcc4.h linux-2.6.32.8/include/linux/compiler-gcc4.h
41421--- linux-2.6.32.7/include/linux/compiler-gcc4.h 2010-01-25 13:50:10.000000000 -0500 41485--- linux-2.6.32.8/include/linux/compiler-gcc4.h 2010-02-09 07:57:19.000000000 -0500
41422+++ linux-2.6.32.7/include/linux/compiler-gcc4.h 2010-01-25 17:39:40.992433501 -0500 41486+++ linux-2.6.32.8/include/linux/compiler-gcc4.h 2010-02-10 15:06:24.602031914 -0500
41423@@ -36,4 +36,8 @@ 41487@@ -36,4 +36,8 @@
41424 the kernel context */ 41488 the kernel context */
41425 #define __cold __attribute__((__cold__)) 41489 #define __cold __attribute__((__cold__))
@@ -41429,9 +41493,9 @@ diff -urNp linux-2.6.32.7/include/linux/compiler-gcc4.h linux-2.6.32.7/include/l
41429+#define __bos0(ptr) __bos((ptr), 0) 41493+#define __bos0(ptr) __bos((ptr), 0)
41430+#define __bos1(ptr) __bos((ptr), 1) 41494+#define __bos1(ptr) __bos((ptr), 1)
41431 #endif 41495 #endif
41432diff -urNp linux-2.6.32.7/include/linux/compiler.h linux-2.6.32.7/include/linux/compiler.h 41496diff -urNp linux-2.6.32.8/include/linux/compiler.h linux-2.6.32.8/include/linux/compiler.h
41433--- linux-2.6.32.7/include/linux/compiler.h 2010-01-25 13:50:10.000000000 -0500 41497--- linux-2.6.32.8/include/linux/compiler.h 2010-02-09 07:57:19.000000000 -0500
41434+++ linux-2.6.32.7/include/linux/compiler.h 2010-01-25 17:39:40.992433501 -0500 41498+++ linux-2.6.32.8/include/linux/compiler.h 2010-02-10 15:06:24.602031914 -0500
41435@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ 41499@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
41436 #define __cold 41500 #define __cold
41437 #endif 41501 #endif
@@ -41455,9 +41519,9 @@ diff -urNp linux-2.6.32.7/include/linux/compiler.h linux-2.6.32.7/include/linux/
41455 /* Simple shorthand for a section definition */ 41519 /* Simple shorthand for a section definition */
41456 #ifndef __section 41520 #ifndef __section
41457 # define __section(S) __attribute__ ((__section__(#S))) 41521 # define __section(S) __attribute__ ((__section__(#S)))
41458diff -urNp linux-2.6.32.7/include/linux/decompress/mm.h linux-2.6.32.7/include/linux/decompress/mm.h 41522diff -urNp linux-2.6.32.8/include/linux/decompress/mm.h linux-2.6.32.8/include/linux/decompress/mm.h
41459--- linux-2.6.32.7/include/linux/decompress/mm.h 2010-01-25 13:50:10.000000000 -0500 41523--- linux-2.6.32.8/include/linux/decompress/mm.h 2010-02-09 07:57:19.000000000 -0500
41460+++ linux-2.6.32.7/include/linux/decompress/mm.h 2010-01-25 17:39:40.992433501 -0500 41524+++ linux-2.6.32.8/include/linux/decompress/mm.h 2010-02-10 15:06:24.602031914 -0500
41461@@ -68,7 +68,7 @@ static void free(void *where) 41525@@ -68,7 +68,7 @@ static void free(void *where)
41462 * warnings when not needed (indeed large_malloc / large_free are not 41526 * warnings when not needed (indeed large_malloc / large_free are not
41463 * needed by inflate */ 41527 * needed by inflate */
@@ -41467,9 +41531,9 @@ diff -urNp linux-2.6.32.7/include/linux/decompress/mm.h linux-2.6.32.7/include/l
41467 #define free(a) kfree(a) 41531 #define free(a) kfree(a)
41468 41532
41469 #define large_malloc(a) vmalloc(a) 41533 #define large_malloc(a) vmalloc(a)
41470diff -urNp linux-2.6.32.7/include/linux/dma-mapping.h linux-2.6.32.7/include/linux/dma-mapping.h 41534diff -urNp linux-2.6.32.8/include/linux/dma-mapping.h linux-2.6.32.8/include/linux/dma-mapping.h
41471--- linux-2.6.32.7/include/linux/dma-mapping.h 2010-01-25 13:50:10.000000000 -0500 41535--- linux-2.6.32.8/include/linux/dma-mapping.h 2010-02-09 07:57:19.000000000 -0500
41472+++ linux-2.6.32.7/include/linux/dma-mapping.h 2010-01-25 17:39:40.992433501 -0500 41536+++ linux-2.6.32.8/include/linux/dma-mapping.h 2010-02-10 15:06:24.602031914 -0500
41473@@ -16,50 +16,50 @@ enum dma_data_direction { 41537@@ -16,50 +16,50 @@ enum dma_data_direction {
41474 }; 41538 };
41475 41539
@@ -41537,9 +41601,9 @@ diff -urNp linux-2.6.32.7/include/linux/dma-mapping.h linux-2.6.32.7/include/lin
41537 }; 41601 };
41538 41602
41539 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) 41603 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
41540diff -urNp linux-2.6.32.7/include/linux/dst.h linux-2.6.32.7/include/linux/dst.h 41604diff -urNp linux-2.6.32.8/include/linux/dst.h linux-2.6.32.8/include/linux/dst.h
41541--- linux-2.6.32.7/include/linux/dst.h 2010-01-25 13:50:10.000000000 -0500 41605--- linux-2.6.32.8/include/linux/dst.h 2010-02-09 07:57:19.000000000 -0500
41542+++ linux-2.6.32.7/include/linux/dst.h 2010-01-25 17:39:40.993423351 -0500 41606+++ linux-2.6.32.8/include/linux/dst.h 2010-02-10 15:06:24.602031914 -0500
41543@@ -380,7 +380,7 @@ struct dst_node 41607@@ -380,7 +380,7 @@ struct dst_node
41544 struct thread_pool *pool; 41608 struct thread_pool *pool;
41545 41609
@@ -41549,9 +41613,9 @@ diff -urNp linux-2.6.32.7/include/linux/dst.h linux-2.6.32.7/include/linux/dst.h
41549 41613
41550 /* 41614 /*
41551 * How frequently and how many times transaction 41615 * How frequently and how many times transaction
41552diff -urNp linux-2.6.32.7/include/linux/elf.h linux-2.6.32.7/include/linux/elf.h 41616diff -urNp linux-2.6.32.8/include/linux/elf.h linux-2.6.32.8/include/linux/elf.h
41553--- linux-2.6.32.7/include/linux/elf.h 2010-01-25 13:50:10.000000000 -0500 41617--- linux-2.6.32.8/include/linux/elf.h 2010-02-09 07:57:19.000000000 -0500
41554+++ linux-2.6.32.7/include/linux/elf.h 2010-01-25 17:39:40.993423351 -0500 41618+++ linux-2.6.32.8/include/linux/elf.h 2010-02-10 15:06:24.602031914 -0500
41555@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; 41619@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
41556 #define PT_GNU_EH_FRAME 0x6474e550 41620 #define PT_GNU_EH_FRAME 0x6474e550
41557 41621
@@ -41624,9 +41688,9 @@ diff -urNp linux-2.6.32.7/include/linux/elf.h linux-2.6.32.7/include/linux/elf.h
41624 41688
41625 #endif 41689 #endif
41626 41690
41627diff -urNp linux-2.6.32.7/include/linux/fs.h linux-2.6.32.7/include/linux/fs.h 41691diff -urNp linux-2.6.32.8/include/linux/fs.h linux-2.6.32.8/include/linux/fs.h
41628--- linux-2.6.32.7/include/linux/fs.h 2010-01-25 13:50:10.000000000 -0500 41692--- linux-2.6.32.8/include/linux/fs.h 2010-02-09 07:57:19.000000000 -0500
41629+++ linux-2.6.32.7/include/linux/fs.h 2010-01-25 17:39:40.994432214 -0500 41693+++ linux-2.6.32.8/include/linux/fs.h 2010-02-10 15:06:24.606031427 -0500
41630@@ -87,6 +87,10 @@ struct inodes_stat_t { 41694@@ -87,6 +87,10 @@ struct inodes_stat_t {
41631 */ 41695 */
41632 #define FMODE_NOCMTIME ((__force fmode_t)2048) 41696 #define FMODE_NOCMTIME ((__force fmode_t)2048)
@@ -41787,9 +41851,9 @@ diff -urNp linux-2.6.32.7/include/linux/fs.h linux-2.6.32.7/include/linux/fs.h
41787 }; 41851 };
41788 41852
41789 /* 41853 /*
41790diff -urNp linux-2.6.32.7/include/linux/fs_struct.h linux-2.6.32.7/include/linux/fs_struct.h 41854diff -urNp linux-2.6.32.8/include/linux/fs_struct.h linux-2.6.32.8/include/linux/fs_struct.h
41791--- linux-2.6.32.7/include/linux/fs_struct.h 2010-01-25 13:50:10.000000000 -0500 41855--- linux-2.6.32.8/include/linux/fs_struct.h 2010-02-09 07:57:19.000000000 -0500
41792+++ linux-2.6.32.7/include/linux/fs_struct.h 2010-01-25 17:39:40.994432214 -0500 41856+++ linux-2.6.32.8/include/linux/fs_struct.h 2010-02-10 15:06:24.606031427 -0500
41793@@ -4,7 +4,7 @@ 41857@@ -4,7 +4,7 @@
41794 #include <linux/path.h> 41858 #include <linux/path.h>
41795 41859
@@ -41799,9 +41863,9 @@ diff -urNp linux-2.6.32.7/include/linux/fs_struct.h linux-2.6.32.7/include/linux
41799 rwlock_t lock; 41863 rwlock_t lock;
41800 int umask; 41864 int umask;
41801 int in_exec; 41865 int in_exec;
41802diff -urNp linux-2.6.32.7/include/linux/genhd.h linux-2.6.32.7/include/linux/genhd.h 41866diff -urNp linux-2.6.32.8/include/linux/genhd.h linux-2.6.32.8/include/linux/genhd.h
41803--- linux-2.6.32.7/include/linux/genhd.h 2010-01-25 13:50:10.000000000 -0500 41867--- linux-2.6.32.8/include/linux/genhd.h 2010-02-09 07:57:19.000000000 -0500
41804+++ linux-2.6.32.7/include/linux/genhd.h 2010-01-25 17:39:40.994432214 -0500 41868+++ linux-2.6.32.8/include/linux/genhd.h 2010-02-10 15:06:24.606031427 -0500
41805@@ -161,7 +161,7 @@ struct gendisk { 41869@@ -161,7 +161,7 @@ struct gendisk {
41806 41870
41807 struct timer_rand_state *random; 41871 struct timer_rand_state *random;
@@ -41811,9 +41875,9 @@ diff -urNp linux-2.6.32.7/include/linux/genhd.h linux-2.6.32.7/include/linux/gen
41811 struct work_struct async_notify; 41875 struct work_struct async_notify;
41812 #ifdef CONFIG_BLK_DEV_INTEGRITY 41876 #ifdef CONFIG_BLK_DEV_INTEGRITY
41813 struct blk_integrity *integrity; 41877 struct blk_integrity *integrity;
41814diff -urNp linux-2.6.32.7/include/linux/gracl.h linux-2.6.32.7/include/linux/gracl.h 41878diff -urNp linux-2.6.32.8/include/linux/gracl.h linux-2.6.32.8/include/linux/gracl.h
41815--- linux-2.6.32.7/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 41879--- linux-2.6.32.8/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
41816+++ linux-2.6.32.7/include/linux/gracl.h 2010-01-25 17:39:40.994432214 -0500 41880+++ linux-2.6.32.8/include/linux/gracl.h 2010-02-10 15:06:24.606031427 -0500
41817@@ -0,0 +1,309 @@ 41881@@ -0,0 +1,309 @@
41818+#ifndef GR_ACL_H 41882+#ifndef GR_ACL_H
41819+#define GR_ACL_H 41883+#define GR_ACL_H
@@ -42124,9 +42188,9 @@ diff -urNp linux-2.6.32.7/include/linux/gracl.h linux-2.6.32.7/include/linux/gra
42124+ 42188+
42125+#endif 42189+#endif
42126+ 42190+
42127diff -urNp linux-2.6.32.7/include/linux/gralloc.h linux-2.6.32.7/include/linux/gralloc.h 42191diff -urNp linux-2.6.32.8/include/linux/gralloc.h linux-2.6.32.8/include/linux/gralloc.h
42128--- linux-2.6.32.7/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 42192--- linux-2.6.32.8/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
42129+++ linux-2.6.32.7/include/linux/gralloc.h 2010-01-25 17:39:40.994432214 -0500 42193+++ linux-2.6.32.8/include/linux/gralloc.h 2010-02-10 15:06:24.606031427 -0500
42130@@ -0,0 +1,9 @@ 42194@@ -0,0 +1,9 @@
42131+#ifndef __GRALLOC_H 42195+#ifndef __GRALLOC_H
42132+#define __GRALLOC_H 42196+#define __GRALLOC_H
@@ -42137,9 +42201,9 @@ diff -urNp linux-2.6.32.7/include/linux/gralloc.h linux-2.6.32.7/include/linux/g
42137+void *acl_alloc_num(unsigned long num, unsigned long len); 42201+void *acl_alloc_num(unsigned long num, unsigned long len);
42138+ 42202+
42139+#endif 42203+#endif
42140diff -urNp linux-2.6.32.7/include/linux/grdefs.h linux-2.6.32.7/include/linux/grdefs.h 42204diff -urNp linux-2.6.32.8/include/linux/grdefs.h linux-2.6.32.8/include/linux/grdefs.h
42141--- linux-2.6.32.7/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 42205--- linux-2.6.32.8/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
42142+++ linux-2.6.32.7/include/linux/grdefs.h 2010-01-25 17:39:40.994432214 -0500 42206+++ linux-2.6.32.8/include/linux/grdefs.h 2010-02-10 15:06:24.606031427 -0500
42143@@ -0,0 +1,136 @@ 42207@@ -0,0 +1,136 @@
42144+#ifndef GRDEFS_H 42208+#ifndef GRDEFS_H
42145+#define GRDEFS_H 42209+#define GRDEFS_H
@@ -42277,9 +42341,9 @@ diff -urNp linux-2.6.32.7/include/linux/grdefs.h linux-2.6.32.7/include/linux/gr
42277+}; 42341+};
42278+ 42342+
42279+#endif 42343+#endif
42280diff -urNp linux-2.6.32.7/include/linux/grinternal.h linux-2.6.32.7/include/linux/grinternal.h 42344diff -urNp linux-2.6.32.8/include/linux/grinternal.h linux-2.6.32.8/include/linux/grinternal.h
42281--- linux-2.6.32.7/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 42345--- linux-2.6.32.8/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
42282+++ linux-2.6.32.7/include/linux/grinternal.h 2010-01-25 17:39:40.995431593 -0500 42346+++ linux-2.6.32.8/include/linux/grinternal.h 2010-02-10 15:06:24.606031427 -0500
42283@@ -0,0 +1,212 @@ 42347@@ -0,0 +1,212 @@
42284+#ifndef __GRINTERNAL_H 42348+#ifndef __GRINTERNAL_H
42285+#define __GRINTERNAL_H 42349+#define __GRINTERNAL_H
@@ -42493,9 +42557,9 @@ diff -urNp linux-2.6.32.7/include/linux/grinternal.h linux-2.6.32.7/include/linu
42493+#endif 42557+#endif
42494+ 42558+
42495+#endif 42559+#endif
42496diff -urNp linux-2.6.32.7/include/linux/grmsg.h linux-2.6.32.7/include/linux/grmsg.h 42560diff -urNp linux-2.6.32.8/include/linux/grmsg.h linux-2.6.32.8/include/linux/grmsg.h
42497--- linux-2.6.32.7/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 42561--- linux-2.6.32.8/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
42498+++ linux-2.6.32.7/include/linux/grmsg.h 2010-01-25 17:39:40.995431593 -0500 42562+++ linux-2.6.32.8/include/linux/grmsg.h 2010-02-10 15:06:24.606031427 -0500
42499@@ -0,0 +1,107 @@ 42563@@ -0,0 +1,107 @@
42500+#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" 42564+#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"
42501+#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" 42565+#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"
@@ -42604,9 +42668,9 @@ diff -urNp linux-2.6.32.7/include/linux/grmsg.h linux-2.6.32.7/include/linux/grm
42604+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by " 42668+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
42605+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " 42669+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
42606+#define GR_VM86_MSG "denied use of vm86 by " 42670+#define GR_VM86_MSG "denied use of vm86 by "
42607diff -urNp linux-2.6.32.7/include/linux/grsecurity.h linux-2.6.32.7/include/linux/grsecurity.h 42671diff -urNp linux-2.6.32.8/include/linux/grsecurity.h linux-2.6.32.8/include/linux/grsecurity.h
42608--- linux-2.6.32.7/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 42672--- linux-2.6.32.8/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
42609+++ linux-2.6.32.7/include/linux/grsecurity.h 2010-01-25 17:39:40.995431593 -0500 42673+++ linux-2.6.32.8/include/linux/grsecurity.h 2010-02-10 15:06:24.606031427 -0500
42610@@ -0,0 +1,200 @@ 42674@@ -0,0 +1,200 @@
42611+#ifndef GR_SECURITY_H 42675+#ifndef GR_SECURITY_H
42612+#define GR_SECURITY_H 42676+#define GR_SECURITY_H
@@ -42808,9 +42872,9 @@ diff -urNp linux-2.6.32.7/include/linux/grsecurity.h linux-2.6.32.7/include/linu
42808+#endif 42872+#endif
42809+ 42873+
42810+#endif 42874+#endif
42811diff -urNp linux-2.6.32.7/include/linux/hdpu_features.h linux-2.6.32.7/include/linux/hdpu_features.h 42875diff -urNp linux-2.6.32.8/include/linux/hdpu_features.h linux-2.6.32.8/include/linux/hdpu_features.h
42812--- linux-2.6.32.7/include/linux/hdpu_features.h 2010-01-25 13:50:10.000000000 -0500 42876--- linux-2.6.32.8/include/linux/hdpu_features.h 2010-02-09 07:57:19.000000000 -0500
42813+++ linux-2.6.32.7/include/linux/hdpu_features.h 2010-01-25 17:39:40.995431593 -0500 42877+++ linux-2.6.32.8/include/linux/hdpu_features.h 2010-02-10 15:06:24.606031427 -0500
42814@@ -3,7 +3,7 @@ 42878@@ -3,7 +3,7 @@
42815 struct cpustate_t { 42879 struct cpustate_t {
42816 spinlock_t lock; 42880 spinlock_t lock;
@@ -42820,9 +42884,9 @@ diff -urNp linux-2.6.32.7/include/linux/hdpu_features.h linux-2.6.32.7/include/l
42820 unsigned char cached_val; 42884 unsigned char cached_val;
42821 int inited; 42885 int inited;
42822 unsigned long *set_addr; 42886 unsigned long *set_addr;
42823diff -urNp linux-2.6.32.7/include/linux/highmem.h linux-2.6.32.7/include/linux/highmem.h 42887diff -urNp linux-2.6.32.8/include/linux/highmem.h linux-2.6.32.8/include/linux/highmem.h
42824--- linux-2.6.32.7/include/linux/highmem.h 2010-01-25 13:50:10.000000000 -0500 42888--- linux-2.6.32.8/include/linux/highmem.h 2010-02-09 07:57:19.000000000 -0500
42825+++ linux-2.6.32.7/include/linux/highmem.h 2010-01-25 17:39:40.995431593 -0500 42889+++ linux-2.6.32.8/include/linux/highmem.h 2010-02-10 15:06:24.606031427 -0500
42826@@ -137,6 +137,18 @@ static inline void clear_highpage(struct 42890@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
42827 kunmap_atomic(kaddr, KM_USER0); 42891 kunmap_atomic(kaddr, KM_USER0);
42828 } 42892 }
@@ -42842,9 +42906,9 @@ diff -urNp linux-2.6.32.7/include/linux/highmem.h linux-2.6.32.7/include/linux/h
42842 static inline void zero_user_segments(struct page *page, 42906 static inline void zero_user_segments(struct page *page,
42843 unsigned start1, unsigned end1, 42907 unsigned start1, unsigned end1,
42844 unsigned start2, unsigned end2) 42908 unsigned start2, unsigned end2)
42845diff -urNp linux-2.6.32.7/include/linux/interrupt.h linux-2.6.32.7/include/linux/interrupt.h 42909diff -urNp linux-2.6.32.8/include/linux/interrupt.h linux-2.6.32.8/include/linux/interrupt.h
42846--- linux-2.6.32.7/include/linux/interrupt.h 2010-01-25 13:50:10.000000000 -0500 42910--- linux-2.6.32.8/include/linux/interrupt.h 2010-02-09 07:57:19.000000000 -0500
42847+++ linux-2.6.32.7/include/linux/interrupt.h 2010-01-25 17:39:40.995431593 -0500 42911+++ linux-2.6.32.8/include/linux/interrupt.h 2010-02-10 15:06:24.606031427 -0500
42848@@ -357,7 +357,7 @@ enum 42912@@ -357,7 +357,7 @@ enum
42849 /* map softirq index to softirq name. update 'softirq_to_name' in 42913 /* map softirq index to softirq name. update 'softirq_to_name' in
42850 * kernel/softirq.c when adding a new softirq. 42914 * kernel/softirq.c when adding a new softirq.
@@ -42854,9 +42918,9 @@ diff -urNp linux-2.6.32.7/include/linux/interrupt.h linux-2.6.32.7/include/linux
42854 42918
42855 /* softirq mask and active fields moved to irq_cpustat_t in 42919 /* softirq mask and active fields moved to irq_cpustat_t in
42856 * asm/hardirq.h to get better cache usage. KAO 42920 * asm/hardirq.h to get better cache usage. KAO
42857diff -urNp linux-2.6.32.7/include/linux/jbd2.h linux-2.6.32.7/include/linux/jbd2.h 42921diff -urNp linux-2.6.32.8/include/linux/jbd2.h linux-2.6.32.8/include/linux/jbd2.h
42858--- linux-2.6.32.7/include/linux/jbd2.h 2010-01-25 13:50:10.000000000 -0500 42922--- linux-2.6.32.8/include/linux/jbd2.h 2010-02-09 07:57:19.000000000 -0500
42859+++ linux-2.6.32.7/include/linux/jbd2.h 2010-01-25 17:39:40.996429608 -0500 42923+++ linux-2.6.32.8/include/linux/jbd2.h 2010-02-10 15:06:24.606031427 -0500
42860@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; 42924@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
42861 } \ 42925 } \
42862 } while (0) 42926 } while (0)
@@ -42866,9 +42930,9 @@ diff -urNp linux-2.6.32.7/include/linux/jbd2.h linux-2.6.32.7/include/linux/jbd2
42866 #endif 42930 #endif
42867 42931
42868 static inline void *jbd2_alloc(size_t size, gfp_t flags) 42932 static inline void *jbd2_alloc(size_t size, gfp_t flags)
42869diff -urNp linux-2.6.32.7/include/linux/jbd.h linux-2.6.32.7/include/linux/jbd.h 42933diff -urNp linux-2.6.32.8/include/linux/jbd.h linux-2.6.32.8/include/linux/jbd.h
42870--- linux-2.6.32.7/include/linux/jbd.h 2010-01-25 13:50:10.000000000 -0500 42934--- linux-2.6.32.8/include/linux/jbd.h 2010-02-09 07:57:19.000000000 -0500
42871+++ linux-2.6.32.7/include/linux/jbd.h 2010-01-25 17:39:40.996429608 -0500 42935+++ linux-2.6.32.8/include/linux/jbd.h 2010-02-10 15:06:24.606031427 -0500
42872@@ -66,7 +66,7 @@ extern u8 journal_enable_debug; 42936@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
42873 } \ 42937 } \
42874 } while (0) 42938 } while (0)
@@ -42878,9 +42942,9 @@ diff -urNp linux-2.6.32.7/include/linux/jbd.h linux-2.6.32.7/include/linux/jbd.h
42878 #endif 42942 #endif
42879 42943
42880 static inline void *jbd_alloc(size_t size, gfp_t flags) 42944 static inline void *jbd_alloc(size_t size, gfp_t flags)
42881diff -urNp linux-2.6.32.7/include/linux/kallsyms.h linux-2.6.32.7/include/linux/kallsyms.h 42945diff -urNp linux-2.6.32.8/include/linux/kallsyms.h linux-2.6.32.8/include/linux/kallsyms.h
42882--- linux-2.6.32.7/include/linux/kallsyms.h 2010-01-25 13:50:10.000000000 -0500 42946--- linux-2.6.32.8/include/linux/kallsyms.h 2010-02-09 07:57:19.000000000 -0500
42883+++ linux-2.6.32.7/include/linux/kallsyms.h 2010-01-25 17:39:40.996429608 -0500 42947+++ linux-2.6.32.8/include/linux/kallsyms.h 2010-02-10 15:06:24.606031427 -0500
42884@@ -15,7 +15,8 @@ 42948@@ -15,7 +15,8 @@
42885 42949
42886 struct module; 42950 struct module;
@@ -42901,9 +42965,9 @@ diff -urNp linux-2.6.32.7/include/linux/kallsyms.h linux-2.6.32.7/include/linux/
42901 42965
42902 /* This macro allows us to keep printk typechecking */ 42966 /* This macro allows us to keep printk typechecking */
42903 static void __check_printsym_format(const char *fmt, ...) 42967 static void __check_printsym_format(const char *fmt, ...)
42904diff -urNp linux-2.6.32.7/include/linux/kgdb.h linux-2.6.32.7/include/linux/kgdb.h 42968diff -urNp linux-2.6.32.8/include/linux/kgdb.h linux-2.6.32.8/include/linux/kgdb.h
42905--- linux-2.6.32.7/include/linux/kgdb.h 2010-01-25 13:50:10.000000000 -0500 42969--- linux-2.6.32.8/include/linux/kgdb.h 2010-02-09 07:57:19.000000000 -0500
42906+++ linux-2.6.32.7/include/linux/kgdb.h 2010-01-25 17:39:40.996429608 -0500 42970+++ linux-2.6.32.8/include/linux/kgdb.h 2010-02-10 15:06:24.606031427 -0500
42907@@ -251,20 +251,20 @@ struct kgdb_arch { 42971@@ -251,20 +251,20 @@ struct kgdb_arch {
42908 */ 42972 */
42909 struct kgdb_io { 42973 struct kgdb_io {
@@ -42934,9 +42998,9 @@ diff -urNp linux-2.6.32.7/include/linux/kgdb.h linux-2.6.32.7/include/linux/kgdb
42934 42998
42935 extern int kgdb_hex2long(char **ptr, unsigned long *long_val); 42999 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
42936 extern int kgdb_mem2hex(char *mem, char *buf, int count); 43000 extern int kgdb_mem2hex(char *mem, char *buf, int count);
42937diff -urNp linux-2.6.32.7/include/linux/kobject.h linux-2.6.32.7/include/linux/kobject.h 43001diff -urNp linux-2.6.32.8/include/linux/kobject.h linux-2.6.32.8/include/linux/kobject.h
42938--- linux-2.6.32.7/include/linux/kobject.h 2010-01-25 13:50:10.000000000 -0500 43002--- linux-2.6.32.8/include/linux/kobject.h 2010-02-09 07:57:19.000000000 -0500
42939+++ linux-2.6.32.7/include/linux/kobject.h 2010-01-25 17:39:40.998424129 -0500 43003+++ linux-2.6.32.8/include/linux/kobject.h 2010-02-10 15:06:24.606031427 -0500
42940@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob 43004@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
42941 43005
42942 struct kobj_type { 43006 struct kobj_type {
@@ -42985,9 +43049,9 @@ diff -urNp linux-2.6.32.7/include/linux/kobject.h linux-2.6.32.7/include/linux/k
42985 struct kobject *parent_kobj); 43049 struct kobject *parent_kobj);
42986 43050
42987 static inline struct kset *to_kset(struct kobject *kobj) 43051 static inline struct kset *to_kset(struct kobject *kobj)
42988diff -urNp linux-2.6.32.7/include/linux/kvm_host.h linux-2.6.32.7/include/linux/kvm_host.h 43052diff -urNp linux-2.6.32.8/include/linux/kvm_host.h linux-2.6.32.8/include/linux/kvm_host.h
42989--- linux-2.6.32.7/include/linux/kvm_host.h 2010-01-25 13:50:10.000000000 -0500 43053--- linux-2.6.32.8/include/linux/kvm_host.h 2010-02-09 07:57:19.000000000 -0500
42990+++ linux-2.6.32.7/include/linux/kvm_host.h 2010-01-25 17:39:40.998424129 -0500 43054+++ linux-2.6.32.8/include/linux/kvm_host.h 2010-02-10 15:06:24.606031427 -0500
42991@@ -205,7 +205,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc 43055@@ -205,7 +205,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
42992 void vcpu_load(struct kvm_vcpu *vcpu); 43056 void vcpu_load(struct kvm_vcpu *vcpu);
42993 void vcpu_put(struct kvm_vcpu *vcpu); 43057 void vcpu_put(struct kvm_vcpu *vcpu);
@@ -43006,9 +43070,9 @@ diff -urNp linux-2.6.32.7/include/linux/kvm_host.h linux-2.6.32.7/include/linux/
43006 void kvm_arch_exit(void); 43070 void kvm_arch_exit(void);
43007 43071
43008 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); 43072 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
43009diff -urNp linux-2.6.32.7/include/linux/libata.h linux-2.6.32.7/include/linux/libata.h 43073diff -urNp linux-2.6.32.8/include/linux/libata.h linux-2.6.32.8/include/linux/libata.h
43010--- linux-2.6.32.7/include/linux/libata.h 2010-01-25 13:50:10.000000000 -0500 43074--- linux-2.6.32.8/include/linux/libata.h 2010-02-09 07:57:19.000000000 -0500
43011+++ linux-2.6.32.7/include/linux/libata.h 2010-01-25 17:39:40.999427893 -0500 43075+++ linux-2.6.32.8/include/linux/libata.h 2010-02-10 15:06:24.606031427 -0500
43012@@ -64,11 +64,11 @@ 43076@@ -64,11 +64,11 @@
43013 #ifdef ATA_VERBOSE_DEBUG 43077 #ifdef ATA_VERBOSE_DEBUG
43014 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) 43078 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -43024,7 +43088,7 @@ diff -urNp linux-2.6.32.7/include/linux/libata.h linux-2.6.32.7/include/linux/li
43024 #endif /* ATA_DEBUG */ 43088 #endif /* ATA_DEBUG */
43025 43089
43026 #define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk(KERN_ERR "%s: " fmt, __func__, ## args) 43090 #define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk(KERN_ERR "%s: " fmt, __func__, ## args)
43027@@ -521,11 +521,11 @@ struct ata_ioports { 43091@@ -524,11 +524,11 @@ struct ata_ioports {
43028 43092
43029 struct ata_host { 43093 struct ata_host {
43030 spinlock_t lock; 43094 spinlock_t lock;
@@ -43038,7 +43102,7 @@ diff -urNp linux-2.6.32.7/include/linux/libata.h linux-2.6.32.7/include/linux/li
43038 unsigned long flags; 43102 unsigned long flags;
43039 #ifdef CONFIG_ATA_ACPI 43103 #ifdef CONFIG_ATA_ACPI
43040 acpi_handle acpi_handle; 43104 acpi_handle acpi_handle;
43041@@ -706,7 +706,7 @@ struct ata_link { 43105@@ -709,7 +709,7 @@ struct ata_link {
43042 43106
43043 struct ata_port { 43107 struct ata_port {
43044 struct Scsi_Host *scsi_host; /* our co-allocated scsi host */ 43108 struct Scsi_Host *scsi_host; /* our co-allocated scsi host */
@@ -43047,7 +43111,7 @@ diff -urNp linux-2.6.32.7/include/linux/libata.h linux-2.6.32.7/include/linux/li
43047 spinlock_t *lock; 43111 spinlock_t *lock;
43048 /* Flags owned by the EH context. Only EH should touch these once the 43112 /* Flags owned by the EH context. Only EH should touch these once the
43049 port is active */ 43113 port is active */
43050@@ -888,7 +888,7 @@ struct ata_port_info { 43114@@ -891,7 +891,7 @@ struct ata_port_info {
43051 unsigned long pio_mask; 43115 unsigned long pio_mask;
43052 unsigned long mwdma_mask; 43116 unsigned long mwdma_mask;
43053 unsigned long udma_mask; 43117 unsigned long udma_mask;
@@ -43056,7 +43120,7 @@ diff -urNp linux-2.6.32.7/include/linux/libata.h linux-2.6.32.7/include/linux/li
43056 void *private_data; 43120 void *private_data;
43057 }; 43121 };
43058 43122
43059@@ -912,7 +912,7 @@ extern const unsigned long sata_deb_timi 43123@@ -915,7 +915,7 @@ extern const unsigned long sata_deb_timi
43060 extern const unsigned long sata_deb_timing_hotplug[]; 43124 extern const unsigned long sata_deb_timing_hotplug[];
43061 extern const unsigned long sata_deb_timing_long[]; 43125 extern const unsigned long sata_deb_timing_long[];
43062 43126
@@ -43065,7 +43129,7 @@ diff -urNp linux-2.6.32.7/include/linux/libata.h linux-2.6.32.7/include/linux/li
43065 extern const struct ata_port_info ata_dummy_port_info; 43129 extern const struct ata_port_info ata_dummy_port_info;
43066 43130
43067 static inline const unsigned long * 43131 static inline const unsigned long *
43068@@ -958,7 +958,7 @@ extern int ata_host_activate(struct ata_ 43132@@ -961,7 +961,7 @@ extern int ata_host_activate(struct ata_
43069 struct scsi_host_template *sht); 43133 struct scsi_host_template *sht);
43070 extern void ata_host_detach(struct ata_host *host); 43134 extern void ata_host_detach(struct ata_host *host);
43071 extern void ata_host_init(struct ata_host *, struct device *, 43135 extern void ata_host_init(struct ata_host *, struct device *,
@@ -43074,9 +43138,9 @@ diff -urNp linux-2.6.32.7/include/linux/libata.h linux-2.6.32.7/include/linux/li
43074 extern int ata_scsi_detect(struct scsi_host_template *sht); 43138 extern int ata_scsi_detect(struct scsi_host_template *sht);
43075 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); 43139 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
43076 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); 43140 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
43077diff -urNp linux-2.6.32.7/include/linux/lockd/bind.h linux-2.6.32.7/include/linux/lockd/bind.h 43141diff -urNp linux-2.6.32.8/include/linux/lockd/bind.h linux-2.6.32.8/include/linux/lockd/bind.h
43078--- linux-2.6.32.7/include/linux/lockd/bind.h 2010-01-25 13:50:10.000000000 -0500 43142--- linux-2.6.32.8/include/linux/lockd/bind.h 2010-02-09 07:57:19.000000000 -0500
43079+++ linux-2.6.32.7/include/linux/lockd/bind.h 2010-01-25 17:39:40.999427893 -0500 43143+++ linux-2.6.32.8/include/linux/lockd/bind.h 2010-02-10 15:06:24.606031427 -0500
43080@@ -23,13 +23,13 @@ struct svc_rqst; 43144@@ -23,13 +23,13 @@ struct svc_rqst;
43081 * This is the set of functions for lockd->nfsd communication 43145 * This is the set of functions for lockd->nfsd communication
43082 */ 43146 */
@@ -43094,9 +43158,9 @@ diff -urNp linux-2.6.32.7/include/linux/lockd/bind.h linux-2.6.32.7/include/linu
43094 43158
43095 /* 43159 /*
43096 * Similar to nfs_client_initdata, but without the NFS-specific 43160 * Similar to nfs_client_initdata, but without the NFS-specific
43097diff -urNp linux-2.6.32.7/include/linux/mm.h linux-2.6.32.7/include/linux/mm.h 43161diff -urNp linux-2.6.32.8/include/linux/mm.h linux-2.6.32.8/include/linux/mm.h
43098--- linux-2.6.32.7/include/linux/mm.h 2010-01-25 13:50:10.000000000 -0500 43162--- linux-2.6.32.8/include/linux/mm.h 2010-02-09 07:57:19.000000000 -0500
43099+++ linux-2.6.32.7/include/linux/mm.h 2010-01-25 17:39:40.999427893 -0500 43163+++ linux-2.6.32.8/include/linux/mm.h 2010-02-10 15:06:24.610032210 -0500
43100@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void 43164@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void
43101 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ 43165 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
43102 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ 43166 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
@@ -43159,9 +43223,9 @@ diff -urNp linux-2.6.32.7/include/linux/mm.h linux-2.6.32.7/include/linux/mm.h
43159 43223
43160 #endif /* __KERNEL__ */ 43224 #endif /* __KERNEL__ */
43161 #endif /* _LINUX_MM_H */ 43225 #endif /* _LINUX_MM_H */
43162diff -urNp linux-2.6.32.7/include/linux/mm_types.h linux-2.6.32.7/include/linux/mm_types.h 43226diff -urNp linux-2.6.32.8/include/linux/mm_types.h linux-2.6.32.8/include/linux/mm_types.h
43163--- linux-2.6.32.7/include/linux/mm_types.h 2010-01-25 13:50:10.000000000 -0500 43227--- linux-2.6.32.8/include/linux/mm_types.h 2010-02-09 07:57:19.000000000 -0500
43164+++ linux-2.6.32.7/include/linux/mm_types.h 2010-01-25 17:39:40.999427893 -0500 43228+++ linux-2.6.32.8/include/linux/mm_types.h 2010-02-10 15:06:24.610032210 -0500
43165@@ -186,6 +186,8 @@ struct vm_area_struct { 43229@@ -186,6 +186,8 @@ struct vm_area_struct {
43166 #ifdef CONFIG_NUMA 43230 #ifdef CONFIG_NUMA
43167 struct mempolicy *vm_policy; /* NUMA policy for the VMA */ 43231 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -43196,9 +43260,9 @@ diff -urNp linux-2.6.32.7/include/linux/mm_types.h linux-2.6.32.7/include/linux/
43196 }; 43260 };
43197 43261
43198 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ 43262 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
43199diff -urNp linux-2.6.32.7/include/linux/mmu_notifier.h linux-2.6.32.7/include/linux/mmu_notifier.h 43263diff -urNp linux-2.6.32.8/include/linux/mmu_notifier.h linux-2.6.32.8/include/linux/mmu_notifier.h
43200--- linux-2.6.32.7/include/linux/mmu_notifier.h 2010-01-25 13:50:10.000000000 -0500 43264--- linux-2.6.32.8/include/linux/mmu_notifier.h 2010-02-09 07:57:19.000000000 -0500
43201+++ linux-2.6.32.7/include/linux/mmu_notifier.h 2010-01-25 17:39:40.999427893 -0500 43265+++ linux-2.6.32.8/include/linux/mmu_notifier.h 2010-02-10 15:06:24.610032210 -0500
43202@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr 43266@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
43203 */ 43267 */
43204 #define ptep_clear_flush_notify(__vma, __address, __ptep) \ 43268 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -43215,9 +43279,9 @@ diff -urNp linux-2.6.32.7/include/linux/mmu_notifier.h linux-2.6.32.7/include/li
43215 }) 43279 })
43216 43280
43217 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ 43281 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
43218diff -urNp linux-2.6.32.7/include/linux/mod_devicetable.h linux-2.6.32.7/include/linux/mod_devicetable.h 43282diff -urNp linux-2.6.32.8/include/linux/mod_devicetable.h linux-2.6.32.8/include/linux/mod_devicetable.h
43219--- linux-2.6.32.7/include/linux/mod_devicetable.h 2010-01-25 13:50:10.000000000 -0500 43283--- linux-2.6.32.8/include/linux/mod_devicetable.h 2010-02-09 07:57:19.000000000 -0500
43220+++ linux-2.6.32.7/include/linux/mod_devicetable.h 2010-01-25 17:39:41.000424921 -0500 43284+++ linux-2.6.32.8/include/linux/mod_devicetable.h 2010-02-10 15:06:24.610032210 -0500
43221@@ -12,7 +12,7 @@ 43285@@ -12,7 +12,7 @@
43222 typedef unsigned long kernel_ulong_t; 43286 typedef unsigned long kernel_ulong_t;
43223 #endif 43287 #endif
@@ -43236,9 +43300,9 @@ diff -urNp linux-2.6.32.7/include/linux/mod_devicetable.h linux-2.6.32.7/include
43236 43300
43237 struct hid_device_id { 43301 struct hid_device_id {
43238 __u16 bus; 43302 __u16 bus;
43239diff -urNp linux-2.6.32.7/include/linux/module.h linux-2.6.32.7/include/linux/module.h 43303diff -urNp linux-2.6.32.8/include/linux/module.h linux-2.6.32.8/include/linux/module.h
43240--- linux-2.6.32.7/include/linux/module.h 2010-01-25 13:50:10.000000000 -0500 43304--- linux-2.6.32.8/include/linux/module.h 2010-02-09 07:57:19.000000000 -0500
43241+++ linux-2.6.32.7/include/linux/module.h 2010-01-25 17:39:41.000424921 -0500 43305+++ linux-2.6.32.8/include/linux/module.h 2010-02-10 15:06:24.610032210 -0500
43242@@ -287,16 +287,16 @@ struct module 43306@@ -287,16 +287,16 @@ struct module
43243 int (*init)(void); 43307 int (*init)(void);
43244 43308
@@ -43311,9 +43375,9 @@ diff -urNp linux-2.6.32.7/include/linux/module.h linux-2.6.32.7/include/linux/mo
43311 } 43375 }
43312 43376
43313 /* Search for module by name: must hold module_mutex. */ 43377 /* Search for module by name: must hold module_mutex. */
43314diff -urNp linux-2.6.32.7/include/linux/moduleloader.h linux-2.6.32.7/include/linux/moduleloader.h 43378diff -urNp linux-2.6.32.8/include/linux/moduleloader.h linux-2.6.32.8/include/linux/moduleloader.h
43315--- linux-2.6.32.7/include/linux/moduleloader.h 2010-01-25 13:50:10.000000000 -0500 43379--- linux-2.6.32.8/include/linux/moduleloader.h 2010-02-09 07:57:19.000000000 -0500
43316+++ linux-2.6.32.7/include/linux/moduleloader.h 2010-01-25 17:39:41.001276086 -0500 43380+++ linux-2.6.32.8/include/linux/moduleloader.h 2010-02-10 15:06:24.610032210 -0500
43317@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st 43381@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
43318 sections. Returns NULL on failure. */ 43382 sections. Returns NULL on failure. */
43319 void *module_alloc(unsigned long size); 43383 void *module_alloc(unsigned long size);
@@ -43336,9 +43400,9 @@ diff -urNp linux-2.6.32.7/include/linux/moduleloader.h linux-2.6.32.7/include/li
43336 /* Apply the given relocation to the (simplified) ELF. Return -error 43400 /* Apply the given relocation to the (simplified) ELF. Return -error
43337 or 0. */ 43401 or 0. */
43338 int apply_relocate(Elf_Shdr *sechdrs, 43402 int apply_relocate(Elf_Shdr *sechdrs,
43339diff -urNp linux-2.6.32.7/include/linux/namei.h linux-2.6.32.7/include/linux/namei.h 43403diff -urNp linux-2.6.32.8/include/linux/namei.h linux-2.6.32.8/include/linux/namei.h
43340--- linux-2.6.32.7/include/linux/namei.h 2010-01-25 13:50:10.000000000 -0500 43404--- linux-2.6.32.8/include/linux/namei.h 2010-02-09 07:57:19.000000000 -0500
43341+++ linux-2.6.32.7/include/linux/namei.h 2010-01-25 17:39:41.001276086 -0500 43405+++ linux-2.6.32.8/include/linux/namei.h 2010-02-10 15:06:24.610032210 -0500
43342@@ -22,7 +22,7 @@ struct nameidata { 43406@@ -22,7 +22,7 @@ struct nameidata {
43343 unsigned int flags; 43407 unsigned int flags;
43344 int last_type; 43408 int last_type;
@@ -43363,9 +43427,9 @@ diff -urNp linux-2.6.32.7/include/linux/namei.h linux-2.6.32.7/include/linux/nam
43363 { 43427 {
43364 return nd->saved_names[nd->depth]; 43428 return nd->saved_names[nd->depth];
43365 } 43429 }
43366diff -urNp linux-2.6.32.7/include/linux/nodemask.h linux-2.6.32.7/include/linux/nodemask.h 43430diff -urNp linux-2.6.32.8/include/linux/nodemask.h linux-2.6.32.8/include/linux/nodemask.h
43367--- linux-2.6.32.7/include/linux/nodemask.h 2010-01-25 13:50:10.000000000 -0500 43431--- linux-2.6.32.8/include/linux/nodemask.h 2010-02-09 07:57:19.000000000 -0500
43368+++ linux-2.6.32.7/include/linux/nodemask.h 2010-01-25 17:39:41.001276086 -0500 43432+++ linux-2.6.32.8/include/linux/nodemask.h 2010-02-10 15:06:24.610032210 -0500
43369@@ -464,11 +464,11 @@ static inline int num_node_state(enum no 43433@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
43370 43434
43371 #define any_online_node(mask) \ 43435 #define any_online_node(mask) \
@@ -43382,9 +43446,9 @@ diff -urNp linux-2.6.32.7/include/linux/nodemask.h linux-2.6.32.7/include/linux/
43382 }) 43446 })
43383 43447
43384 #define num_online_nodes() num_node_state(N_ONLINE) 43448 #define num_online_nodes() num_node_state(N_ONLINE)
43385diff -urNp linux-2.6.32.7/include/linux/oprofile.h linux-2.6.32.7/include/linux/oprofile.h 43449diff -urNp linux-2.6.32.8/include/linux/oprofile.h linux-2.6.32.8/include/linux/oprofile.h
43386--- linux-2.6.32.7/include/linux/oprofile.h 2010-01-25 13:50:10.000000000 -0500 43450--- linux-2.6.32.8/include/linux/oprofile.h 2010-02-09 07:57:19.000000000 -0500
43387+++ linux-2.6.32.7/include/linux/oprofile.h 2010-01-25 17:39:41.001276086 -0500 43451+++ linux-2.6.32.8/include/linux/oprofile.h 2010-02-10 15:06:24.610032210 -0500
43388@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super 43452@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
43389 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, 43453 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
43390 char const * name, ulong * val); 43454 char const * name, ulong * val);
@@ -43397,9 +43461,9 @@ diff -urNp linux-2.6.32.7/include/linux/oprofile.h linux-2.6.32.7/include/linux/
43397 43461
43398 /** create a directory */ 43462 /** create a directory */
43399 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, 43463 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
43400diff -urNp linux-2.6.32.7/include/linux/pipe_fs_i.h linux-2.6.32.7/include/linux/pipe_fs_i.h 43464diff -urNp linux-2.6.32.8/include/linux/pipe_fs_i.h linux-2.6.32.8/include/linux/pipe_fs_i.h
43401--- linux-2.6.32.7/include/linux/pipe_fs_i.h 2010-01-25 13:50:10.000000000 -0500 43465--- linux-2.6.32.8/include/linux/pipe_fs_i.h 2010-02-09 07:57:19.000000000 -0500
43402+++ linux-2.6.32.7/include/linux/pipe_fs_i.h 2010-01-25 17:39:41.001276086 -0500 43466+++ linux-2.6.32.8/include/linux/pipe_fs_i.h 2010-02-10 15:06:24.610032210 -0500
43403@@ -46,9 +46,9 @@ struct pipe_inode_info { 43467@@ -46,9 +46,9 @@ struct pipe_inode_info {
43404 wait_queue_head_t wait; 43468 wait_queue_head_t wait;
43405 unsigned int nrbufs, curbuf; 43469 unsigned int nrbufs, curbuf;
@@ -43413,9 +43477,9 @@ diff -urNp linux-2.6.32.7/include/linux/pipe_fs_i.h linux-2.6.32.7/include/linux
43413 unsigned int r_counter; 43477 unsigned int r_counter;
43414 unsigned int w_counter; 43478 unsigned int w_counter;
43415 struct fasync_struct *fasync_readers; 43479 struct fasync_struct *fasync_readers;
43416diff -urNp linux-2.6.32.7/include/linux/poison.h linux-2.6.32.7/include/linux/poison.h 43480diff -urNp linux-2.6.32.8/include/linux/poison.h linux-2.6.32.8/include/linux/poison.h
43417--- linux-2.6.32.7/include/linux/poison.h 2010-01-25 13:50:10.000000000 -0500 43481--- linux-2.6.32.8/include/linux/poison.h 2010-02-09 07:57:19.000000000 -0500
43418+++ linux-2.6.32.7/include/linux/poison.h 2010-01-25 17:39:41.001276086 -0500 43482+++ linux-2.6.32.8/include/linux/poison.h 2010-02-10 15:06:24.610032210 -0500
43419@@ -7,8 +7,8 @@ 43483@@ -7,8 +7,8 @@
43420 * under normal circumstances, used to verify that nobody uses 43484 * under normal circumstances, used to verify that nobody uses
43421 * non-initialized list entries. 43485 * non-initialized list entries.
@@ -43427,9 +43491,9 @@ diff -urNp linux-2.6.32.7/include/linux/poison.h linux-2.6.32.7/include/linux/po
43427 43491
43428 /********** include/linux/timer.h **********/ 43492 /********** include/linux/timer.h **********/
43429 /* 43493 /*
43430diff -urNp linux-2.6.32.7/include/linux/proc_fs.h linux-2.6.32.7/include/linux/proc_fs.h 43494diff -urNp linux-2.6.32.8/include/linux/proc_fs.h linux-2.6.32.8/include/linux/proc_fs.h
43431--- linux-2.6.32.7/include/linux/proc_fs.h 2010-01-25 13:50:10.000000000 -0500 43495--- linux-2.6.32.8/include/linux/proc_fs.h 2010-02-09 07:57:19.000000000 -0500
43432+++ linux-2.6.32.7/include/linux/proc_fs.h 2010-01-25 17:39:41.001276086 -0500 43496+++ linux-2.6.32.8/include/linux/proc_fs.h 2010-02-10 15:06:24.610032210 -0500
43433@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro 43497@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
43434 return proc_create_data(name, mode, parent, proc_fops, NULL); 43498 return proc_create_data(name, mode, parent, proc_fops, NULL);
43435 } 43499 }
@@ -43450,9 +43514,9 @@ diff -urNp linux-2.6.32.7/include/linux/proc_fs.h linux-2.6.32.7/include/linux/p
43450 static inline struct proc_dir_entry *create_proc_read_entry(const char *name, 43514 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
43451 mode_t mode, struct proc_dir_entry *base, 43515 mode_t mode, struct proc_dir_entry *base,
43452 read_proc_t *read_proc, void * data) 43516 read_proc_t *read_proc, void * data)
43453diff -urNp linux-2.6.32.7/include/linux/random.h linux-2.6.32.7/include/linux/random.h 43517diff -urNp linux-2.6.32.8/include/linux/random.h linux-2.6.32.8/include/linux/random.h
43454--- linux-2.6.32.7/include/linux/random.h 2010-01-25 13:50:10.000000000 -0500 43518--- linux-2.6.32.8/include/linux/random.h 2010-02-09 07:57:19.000000000 -0500
43455+++ linux-2.6.32.7/include/linux/random.h 2010-01-25 17:39:41.032837080 -0500 43519+++ linux-2.6.32.8/include/linux/random.h 2010-02-10 15:06:24.610032210 -0500
43456@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l 43520@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
43457 u32 random32(void); 43521 u32 random32(void);
43458 void srandom32(u32 seed); 43522 void srandom32(u32 seed);
@@ -43465,9 +43529,9 @@ diff -urNp linux-2.6.32.7/include/linux/random.h linux-2.6.32.7/include/linux/ra
43465 #endif /* __KERNEL___ */ 43529 #endif /* __KERNEL___ */
43466 43530
43467 #endif /* _LINUX_RANDOM_H */ 43531 #endif /* _LINUX_RANDOM_H */
43468diff -urNp linux-2.6.32.7/include/linux/reiserfs_fs.h linux-2.6.32.7/include/linux/reiserfs_fs.h 43532diff -urNp linux-2.6.32.8/include/linux/reiserfs_fs.h linux-2.6.32.8/include/linux/reiserfs_fs.h
43469--- linux-2.6.32.7/include/linux/reiserfs_fs.h 2010-01-25 13:50:10.000000000 -0500 43533--- linux-2.6.32.8/include/linux/reiserfs_fs.h 2010-02-09 07:57:19.000000000 -0500
43470+++ linux-2.6.32.7/include/linux/reiserfs_fs.h 2010-01-25 17:39:41.033186102 -0500 43534+++ linux-2.6.32.8/include/linux/reiserfs_fs.h 2010-02-10 15:06:24.610032210 -0500
43471@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset 43535@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
43472 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ 43536 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
43473 43537
@@ -43514,9 +43578,9 @@ diff -urNp linux-2.6.32.7/include/linux/reiserfs_fs.h linux-2.6.32.7/include/lin
43514 43578
43515 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) 43579 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
43516 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) 43580 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
43517diff -urNp linux-2.6.32.7/include/linux/reiserfs_fs_sb.h linux-2.6.32.7/include/linux/reiserfs_fs_sb.h 43581diff -urNp linux-2.6.32.8/include/linux/reiserfs_fs_sb.h linux-2.6.32.8/include/linux/reiserfs_fs_sb.h
43518--- linux-2.6.32.7/include/linux/reiserfs_fs_sb.h 2010-01-25 13:50:10.000000000 -0500 43582--- linux-2.6.32.8/include/linux/reiserfs_fs_sb.h 2010-02-09 07:57:19.000000000 -0500
43519+++ linux-2.6.32.7/include/linux/reiserfs_fs_sb.h 2010-01-25 17:39:41.033186102 -0500 43583+++ linux-2.6.32.8/include/linux/reiserfs_fs_sb.h 2010-02-10 15:06:24.610032210 -0500
43520@@ -377,7 +377,7 @@ struct reiserfs_sb_info { 43584@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
43521 /* Comment? -Hans */ 43585 /* Comment? -Hans */
43522 wait_queue_head_t s_wait; 43586 wait_queue_head_t s_wait;
@@ -43526,9 +43590,9 @@ diff -urNp linux-2.6.32.7/include/linux/reiserfs_fs_sb.h linux-2.6.32.7/include/
43526 // tree gets re-balanced 43590 // tree gets re-balanced
43527 unsigned long s_properties; /* File system properties. Currently holds 43591 unsigned long s_properties; /* File system properties. Currently holds
43528 on-disk FS format */ 43592 on-disk FS format */
43529diff -urNp linux-2.6.32.7/include/linux/sched.h linux-2.6.32.7/include/linux/sched.h 43593diff -urNp linux-2.6.32.8/include/linux/sched.h linux-2.6.32.8/include/linux/sched.h
43530--- linux-2.6.32.7/include/linux/sched.h 2010-01-25 13:50:10.000000000 -0500 43594--- linux-2.6.32.8/include/linux/sched.h 2010-02-09 07:57:19.000000000 -0500
43531+++ linux-2.6.32.7/include/linux/sched.h 2010-01-25 17:39:41.034385602 -0500 43595+++ linux-2.6.32.8/include/linux/sched.h 2010-02-10 15:06:24.610032210 -0500
43532@@ -101,6 +101,7 @@ struct bio; 43596@@ -101,6 +101,7 @@ struct bio;
43533 struct fs_struct; 43597 struct fs_struct;
43534 struct bts_context; 43598 struct bts_context;
@@ -43742,9 +43806,9 @@ diff -urNp linux-2.6.32.7/include/linux/sched.h linux-2.6.32.7/include/linux/sch
43742 extern void thread_info_cache_init(void); 43806 extern void thread_info_cache_init(void);
43743 43807
43744 #ifdef CONFIG_DEBUG_STACK_USAGE 43808 #ifdef CONFIG_DEBUG_STACK_USAGE
43745diff -urNp linux-2.6.32.7/include/linux/screen_info.h linux-2.6.32.7/include/linux/screen_info.h 43809diff -urNp linux-2.6.32.8/include/linux/screen_info.h linux-2.6.32.8/include/linux/screen_info.h
43746--- linux-2.6.32.7/include/linux/screen_info.h 2010-01-25 13:50:10.000000000 -0500 43810--- linux-2.6.32.8/include/linux/screen_info.h 2010-02-09 07:57:19.000000000 -0500
43747+++ linux-2.6.32.7/include/linux/screen_info.h 2010-01-25 17:39:41.034385602 -0500 43811+++ linux-2.6.32.8/include/linux/screen_info.h 2010-02-10 15:06:24.610032210 -0500
43748@@ -42,7 +42,8 @@ struct screen_info { 43812@@ -42,7 +42,8 @@ struct screen_info {
43749 __u16 pages; /* 0x32 */ 43813 __u16 pages; /* 0x32 */
43750 __u16 vesa_attributes; /* 0x34 */ 43814 __u16 vesa_attributes; /* 0x34 */
@@ -43755,9 +43819,9 @@ diff -urNp linux-2.6.32.7/include/linux/screen_info.h linux-2.6.32.7/include/lin
43755 } __attribute__((packed)); 43819 } __attribute__((packed));
43756 43820
43757 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ 43821 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
43758diff -urNp linux-2.6.32.7/include/linux/security.h linux-2.6.32.7/include/linux/security.h 43822diff -urNp linux-2.6.32.8/include/linux/security.h linux-2.6.32.8/include/linux/security.h
43759--- linux-2.6.32.7/include/linux/security.h 2010-01-25 13:50:10.000000000 -0500 43823--- linux-2.6.32.8/include/linux/security.h 2010-02-09 07:57:19.000000000 -0500
43760+++ linux-2.6.32.7/include/linux/security.h 2010-01-25 17:39:41.035109382 -0500 43824+++ linux-2.6.32.8/include/linux/security.h 2010-02-10 15:06:24.614029789 -0500
43761@@ -34,6 +34,7 @@ 43825@@ -34,6 +34,7 @@
43762 #include <linux/key.h> 43826 #include <linux/key.h>
43763 #include <linux/xfrm.h> 43827 #include <linux/xfrm.h>
@@ -43766,9 +43830,9 @@ diff -urNp linux-2.6.32.7/include/linux/security.h linux-2.6.32.7/include/linux/
43766 #include <net/flow.h> 43830 #include <net/flow.h>
43767 43831
43768 /* Maximum number of letters for an LSM name string */ 43832 /* Maximum number of letters for an LSM name string */
43769diff -urNp linux-2.6.32.7/include/linux/shm.h linux-2.6.32.7/include/linux/shm.h 43833diff -urNp linux-2.6.32.8/include/linux/shm.h linux-2.6.32.8/include/linux/shm.h
43770--- linux-2.6.32.7/include/linux/shm.h 2010-01-25 13:50:10.000000000 -0500 43834--- linux-2.6.32.8/include/linux/shm.h 2010-02-09 07:57:19.000000000 -0500
43771+++ linux-2.6.32.7/include/linux/shm.h 2010-01-25 17:39:41.035109382 -0500 43835+++ linux-2.6.32.8/include/linux/shm.h 2010-02-10 15:06:24.614029789 -0500
43772@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke 43836@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
43773 pid_t shm_cprid; 43837 pid_t shm_cprid;
43774 pid_t shm_lprid; 43838 pid_t shm_lprid;
@@ -43780,9 +43844,9 @@ diff -urNp linux-2.6.32.7/include/linux/shm.h linux-2.6.32.7/include/linux/shm.h
43780 }; 43844 };
43781 43845
43782 /* shm_mode upper byte flags */ 43846 /* shm_mode upper byte flags */
43783diff -urNp linux-2.6.32.7/include/linux/slab.h linux-2.6.32.7/include/linux/slab.h 43847diff -urNp linux-2.6.32.8/include/linux/slab.h linux-2.6.32.8/include/linux/slab.h
43784--- linux-2.6.32.7/include/linux/slab.h 2010-01-25 13:50:10.000000000 -0500 43848--- linux-2.6.32.8/include/linux/slab.h 2010-02-09 07:57:19.000000000 -0500
43785+++ linux-2.6.32.7/include/linux/slab.h 2010-01-25 17:39:41.035109382 -0500 43849+++ linux-2.6.32.8/include/linux/slab.h 2010-02-10 15:06:24.614029789 -0500
43786@@ -11,6 +11,7 @@ 43850@@ -11,6 +11,7 @@
43787 43851
43788 #include <linux/gfp.h> 43852 #include <linux/gfp.h>
@@ -43854,9 +43918,9 @@ diff -urNp linux-2.6.32.7/include/linux/slab.h linux-2.6.32.7/include/linux/slab
43854+}) 43918+})
43855+ 43919+
43856 #endif /* _LINUX_SLAB_H */ 43920 #endif /* _LINUX_SLAB_H */
43857diff -urNp linux-2.6.32.7/include/linux/slub_def.h linux-2.6.32.7/include/linux/slub_def.h 43921diff -urNp linux-2.6.32.8/include/linux/slub_def.h linux-2.6.32.8/include/linux/slub_def.h
43858--- linux-2.6.32.7/include/linux/slub_def.h 2010-01-25 13:50:10.000000000 -0500 43922--- linux-2.6.32.8/include/linux/slub_def.h 2010-02-09 07:57:19.000000000 -0500
43859+++ linux-2.6.32.7/include/linux/slub_def.h 2010-01-25 17:39:41.035109382 -0500 43923+++ linux-2.6.32.8/include/linux/slub_def.h 2010-02-10 15:06:24.614029789 -0500
43860@@ -86,7 +86,7 @@ struct kmem_cache { 43924@@ -86,7 +86,7 @@ struct kmem_cache {
43861 struct kmem_cache_order_objects max; 43925 struct kmem_cache_order_objects max;
43862 struct kmem_cache_order_objects min; 43926 struct kmem_cache_order_objects min;
@@ -43866,9 +43930,9 @@ diff -urNp linux-2.6.32.7/include/linux/slub_def.h linux-2.6.32.7/include/linux/
43866 void (*ctor)(void *); 43930 void (*ctor)(void *);
43867 int inuse; /* Offset to metadata */ 43931 int inuse; /* Offset to metadata */
43868 int align; /* Alignment */ 43932 int align; /* Alignment */
43869diff -urNp linux-2.6.32.7/include/linux/sonet.h linux-2.6.32.7/include/linux/sonet.h 43933diff -urNp linux-2.6.32.8/include/linux/sonet.h linux-2.6.32.8/include/linux/sonet.h
43870--- linux-2.6.32.7/include/linux/sonet.h 2010-01-25 13:50:10.000000000 -0500 43934--- linux-2.6.32.8/include/linux/sonet.h 2010-02-09 07:57:19.000000000 -0500
43871+++ linux-2.6.32.7/include/linux/sonet.h 2010-01-25 17:39:41.035109382 -0500 43935+++ linux-2.6.32.8/include/linux/sonet.h 2010-02-10 15:06:24.614029789 -0500
43872@@ -61,7 +61,7 @@ struct sonet_stats { 43936@@ -61,7 +61,7 @@ struct sonet_stats {
43873 #include <asm/atomic.h> 43937 #include <asm/atomic.h>
43874 43938
@@ -43878,9 +43942,9 @@ diff -urNp linux-2.6.32.7/include/linux/sonet.h linux-2.6.32.7/include/linux/son
43878 __SONET_ITEMS 43942 __SONET_ITEMS
43879 #undef __HANDLE_ITEM 43943 #undef __HANDLE_ITEM
43880 }; 43944 };
43881diff -urNp linux-2.6.32.7/include/linux/suspend.h linux-2.6.32.7/include/linux/suspend.h 43945diff -urNp linux-2.6.32.8/include/linux/suspend.h linux-2.6.32.8/include/linux/suspend.h
43882--- linux-2.6.32.7/include/linux/suspend.h 2010-01-25 13:50:10.000000000 -0500 43946--- linux-2.6.32.8/include/linux/suspend.h 2010-02-09 07:57:19.000000000 -0500
43883+++ linux-2.6.32.7/include/linux/suspend.h 2010-01-25 17:39:41.036213895 -0500 43947+++ linux-2.6.32.8/include/linux/suspend.h 2010-02-10 15:06:24.614029789 -0500
43884@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; 43948@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
43885 * which require special recovery actions in that situation. 43949 * which require special recovery actions in that situation.
43886 */ 43950 */
@@ -43969,9 +44033,9 @@ diff -urNp linux-2.6.32.7/include/linux/suspend.h linux-2.6.32.7/include/linux/s
43969 static inline int hibernate(void) { return -ENOSYS; } 44033 static inline int hibernate(void) { return -ENOSYS; }
43970 static inline bool system_entering_hibernation(void) { return false; } 44034 static inline bool system_entering_hibernation(void) { return false; }
43971 #endif /* CONFIG_HIBERNATION */ 44035 #endif /* CONFIG_HIBERNATION */
43972diff -urNp linux-2.6.32.7/include/linux/sysctl.h linux-2.6.32.7/include/linux/sysctl.h 44036diff -urNp linux-2.6.32.8/include/linux/sysctl.h linux-2.6.32.8/include/linux/sysctl.h
43973--- linux-2.6.32.7/include/linux/sysctl.h 2010-01-25 13:50:10.000000000 -0500 44037--- linux-2.6.32.8/include/linux/sysctl.h 2010-02-09 07:57:19.000000000 -0500
43974+++ linux-2.6.32.7/include/linux/sysctl.h 2010-01-25 17:39:41.036213895 -0500 44038+++ linux-2.6.32.8/include/linux/sysctl.h 2010-02-10 15:06:24.614029789 -0500
43975@@ -164,7 +164,11 @@ enum 44039@@ -164,7 +164,11 @@ enum
43976 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ 44040 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
43977 }; 44041 };
@@ -43985,9 +44049,9 @@ diff -urNp linux-2.6.32.7/include/linux/sysctl.h linux-2.6.32.7/include/linux/sy
43985 44049
43986 /* CTL_VM names: */ 44050 /* CTL_VM names: */
43987 enum 44051 enum
43988diff -urNp linux-2.6.32.7/include/linux/sysfs.h linux-2.6.32.7/include/linux/sysfs.h 44052diff -urNp linux-2.6.32.8/include/linux/sysfs.h linux-2.6.32.8/include/linux/sysfs.h
43989--- linux-2.6.32.7/include/linux/sysfs.h 2010-01-25 13:50:10.000000000 -0500 44053--- linux-2.6.32.8/include/linux/sysfs.h 2010-02-09 07:57:19.000000000 -0500
43990+++ linux-2.6.32.7/include/linux/sysfs.h 2010-01-25 17:39:41.036213895 -0500 44054+++ linux-2.6.32.8/include/linux/sysfs.h 2010-02-10 15:06:24.614029789 -0500
43991@@ -75,8 +75,8 @@ struct bin_attribute { 44055@@ -75,8 +75,8 @@ struct bin_attribute {
43992 }; 44056 };
43993 44057
@@ -43999,9 +44063,9 @@ diff -urNp linux-2.6.32.7/include/linux/sysfs.h linux-2.6.32.7/include/linux/sys
43999 }; 44063 };
44000 44064
44001 struct sysfs_dirent; 44065 struct sysfs_dirent;
44002diff -urNp linux-2.6.32.7/include/linux/thread_info.h linux-2.6.32.7/include/linux/thread_info.h 44066diff -urNp linux-2.6.32.8/include/linux/thread_info.h linux-2.6.32.8/include/linux/thread_info.h
44003--- linux-2.6.32.7/include/linux/thread_info.h 2010-01-25 13:50:10.000000000 -0500 44067--- linux-2.6.32.8/include/linux/thread_info.h 2010-02-09 07:57:19.000000000 -0500
44004+++ linux-2.6.32.7/include/linux/thread_info.h 2010-01-25 17:39:41.036213895 -0500 44068+++ linux-2.6.32.8/include/linux/thread_info.h 2010-02-10 15:06:24.614029789 -0500
44005@@ -23,7 +23,7 @@ struct restart_block { 44069@@ -23,7 +23,7 @@ struct restart_block {
44006 }; 44070 };
44007 /* For futex_wait and futex_wait_requeue_pi */ 44071 /* For futex_wait and futex_wait_requeue_pi */
@@ -44011,9 +44075,9 @@ diff -urNp linux-2.6.32.7/include/linux/thread_info.h linux-2.6.32.7/include/lin
44011 u32 val; 44075 u32 val;
44012 u32 flags; 44076 u32 flags;
44013 u32 bitset; 44077 u32 bitset;
44014diff -urNp linux-2.6.32.7/include/linux/tty.h linux-2.6.32.7/include/linux/tty.h 44078diff -urNp linux-2.6.32.8/include/linux/tty.h linux-2.6.32.8/include/linux/tty.h
44015--- linux-2.6.32.7/include/linux/tty.h 2010-01-25 13:50:10.000000000 -0500 44079--- linux-2.6.32.8/include/linux/tty.h 2010-02-09 07:57:19.000000000 -0500
44016+++ linux-2.6.32.7/include/linux/tty.h 2010-01-25 17:39:41.036213895 -0500 44080+++ linux-2.6.32.8/include/linux/tty.h 2010-02-10 15:06:24.614029789 -0500
44017@@ -13,6 +13,7 @@ 44081@@ -13,6 +13,7 @@
44018 #include <linux/tty_driver.h> 44082 #include <linux/tty_driver.h>
44019 #include <linux/tty_ldisc.h> 44083 #include <linux/tty_ldisc.h>
@@ -44049,9 +44113,9 @@ diff -urNp linux-2.6.32.7/include/linux/tty.h linux-2.6.32.7/include/linux/tty.h
44049 44113
44050 /* n_tty.c */ 44114 /* n_tty.c */
44051 extern struct tty_ldisc_ops tty_ldisc_N_TTY; 44115 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
44052diff -urNp linux-2.6.32.7/include/linux/tty_ldisc.h linux-2.6.32.7/include/linux/tty_ldisc.h 44116diff -urNp linux-2.6.32.8/include/linux/tty_ldisc.h linux-2.6.32.8/include/linux/tty_ldisc.h
44053--- linux-2.6.32.7/include/linux/tty_ldisc.h 2010-01-25 13:50:10.000000000 -0500 44117--- linux-2.6.32.8/include/linux/tty_ldisc.h 2010-02-09 07:57:19.000000000 -0500
44054+++ linux-2.6.32.7/include/linux/tty_ldisc.h 2010-01-25 17:39:41.037233192 -0500 44118+++ linux-2.6.32.8/include/linux/tty_ldisc.h 2010-02-10 15:06:24.614029789 -0500
44055@@ -139,7 +139,7 @@ struct tty_ldisc_ops { 44119@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
44056 44120
44057 struct module *owner; 44121 struct module *owner;
@@ -44061,9 +44125,9 @@ diff -urNp linux-2.6.32.7/include/linux/tty_ldisc.h linux-2.6.32.7/include/linux
44061 }; 44125 };
44062 44126
44063 struct tty_ldisc { 44127 struct tty_ldisc {
44064diff -urNp linux-2.6.32.7/include/linux/types.h linux-2.6.32.7/include/linux/types.h 44128diff -urNp linux-2.6.32.8/include/linux/types.h linux-2.6.32.8/include/linux/types.h
44065--- linux-2.6.32.7/include/linux/types.h 2010-01-25 13:50:10.000000000 -0500 44129--- linux-2.6.32.8/include/linux/types.h 2010-02-09 07:57:19.000000000 -0500
44066+++ linux-2.6.32.7/include/linux/types.h 2010-01-25 17:39:41.037233192 -0500 44130+++ linux-2.6.32.8/include/linux/types.h 2010-02-10 15:06:24.614029789 -0500
44067@@ -191,10 +191,26 @@ typedef struct { 44131@@ -191,10 +191,26 @@ typedef struct {
44068 volatile int counter; 44132 volatile int counter;
44069 } atomic_t; 44133 } atomic_t;
@@ -44091,9 +44155,9 @@ diff -urNp linux-2.6.32.7/include/linux/types.h linux-2.6.32.7/include/linux/typ
44091 #endif 44155 #endif
44092 44156
44093 struct ustat { 44157 struct ustat {
44094diff -urNp linux-2.6.32.7/include/linux/uaccess.h linux-2.6.32.7/include/linux/uaccess.h 44158diff -urNp linux-2.6.32.8/include/linux/uaccess.h linux-2.6.32.8/include/linux/uaccess.h
44095--- linux-2.6.32.7/include/linux/uaccess.h 2010-01-25 13:50:10.000000000 -0500 44159--- linux-2.6.32.8/include/linux/uaccess.h 2010-02-09 07:57:19.000000000 -0500
44096+++ linux-2.6.32.7/include/linux/uaccess.h 2010-01-25 17:39:41.037233192 -0500 44160+++ linux-2.6.32.8/include/linux/uaccess.h 2010-02-10 15:06:24.614029789 -0500
44097@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ 44161@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
44098 long ret; \ 44162 long ret; \
44099 mm_segment_t old_fs = get_fs(); \ 44163 mm_segment_t old_fs = get_fs(); \
@@ -44125,9 +44189,9 @@ diff -urNp linux-2.6.32.7/include/linux/uaccess.h linux-2.6.32.7/include/linux/u
44125+extern long probe_kernel_write(void *dst, const void *src, size_t size); 44189+extern long probe_kernel_write(void *dst, const void *src, size_t size);
44126 44190
44127 #endif /* __LINUX_UACCESS_H__ */ 44191 #endif /* __LINUX_UACCESS_H__ */
44128diff -urNp linux-2.6.32.7/include/linux/vmalloc.h linux-2.6.32.7/include/linux/vmalloc.h 44192diff -urNp linux-2.6.32.8/include/linux/vmalloc.h linux-2.6.32.8/include/linux/vmalloc.h
44129--- linux-2.6.32.7/include/linux/vmalloc.h 2010-01-25 13:50:10.000000000 -0500 44193--- linux-2.6.32.8/include/linux/vmalloc.h 2010-02-09 07:57:19.000000000 -0500
44130+++ linux-2.6.32.7/include/linux/vmalloc.h 2010-01-25 17:39:41.037233192 -0500 44194+++ linux-2.6.32.8/include/linux/vmalloc.h 2010-02-10 15:06:24.614029789 -0500
44131@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining 44195@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
44132 #define VM_MAP 0x00000004 /* vmap()ed pages */ 44196 #define VM_MAP 0x00000004 /* vmap()ed pages */
44133 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ 44197 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
@@ -44222,9 +44286,9 @@ diff -urNp linux-2.6.32.7/include/linux/vmalloc.h linux-2.6.32.7/include/linux/v
44222+}) 44286+})
44223+ 44287+
44224 #endif /* _LINUX_VMALLOC_H */ 44288 #endif /* _LINUX_VMALLOC_H */
44225diff -urNp linux-2.6.32.7/include/net/irda/ircomm_tty.h linux-2.6.32.7/include/net/irda/ircomm_tty.h 44289diff -urNp linux-2.6.32.8/include/net/irda/ircomm_tty.h linux-2.6.32.8/include/net/irda/ircomm_tty.h
44226--- linux-2.6.32.7/include/net/irda/ircomm_tty.h 2010-01-25 13:50:10.000000000 -0500 44290--- linux-2.6.32.8/include/net/irda/ircomm_tty.h 2010-02-09 07:57:19.000000000 -0500
44227+++ linux-2.6.32.7/include/net/irda/ircomm_tty.h 2010-01-25 17:39:41.037233192 -0500 44291+++ linux-2.6.32.8/include/net/irda/ircomm_tty.h 2010-02-10 15:06:24.614029789 -0500
44228@@ -105,8 +105,8 @@ struct ircomm_tty_cb { 44292@@ -105,8 +105,8 @@ struct ircomm_tty_cb {
44229 unsigned short close_delay; 44293 unsigned short close_delay;
44230 unsigned short closing_wait; /* time to wait before closing */ 44294 unsigned short closing_wait; /* time to wait before closing */
@@ -44236,9 +44300,9 @@ diff -urNp linux-2.6.32.7/include/net/irda/ircomm_tty.h linux-2.6.32.7/include/n
44236 44300
44237 /* Protect concurent access to : 44301 /* Protect concurent access to :
44238 * o self->open_count 44302 * o self->open_count
44239diff -urNp linux-2.6.32.7/include/net/neighbour.h linux-2.6.32.7/include/net/neighbour.h 44303diff -urNp linux-2.6.32.8/include/net/neighbour.h linux-2.6.32.8/include/net/neighbour.h
44240--- linux-2.6.32.7/include/net/neighbour.h 2010-01-25 13:50:10.000000000 -0500 44304--- linux-2.6.32.8/include/net/neighbour.h 2010-02-09 07:57:19.000000000 -0500
44241+++ linux-2.6.32.7/include/net/neighbour.h 2010-01-25 17:39:41.037233192 -0500 44305+++ linux-2.6.32.8/include/net/neighbour.h 2010-02-10 15:06:24.614029789 -0500
44242@@ -125,12 +125,12 @@ struct neighbour 44306@@ -125,12 +125,12 @@ struct neighbour
44243 struct neigh_ops 44307 struct neigh_ops
44244 { 44308 {
@@ -44258,9 +44322,9 @@ diff -urNp linux-2.6.32.7/include/net/neighbour.h linux-2.6.32.7/include/net/nei
44258 }; 44322 };
44259 44323
44260 struct pneigh_entry 44324 struct pneigh_entry
44261diff -urNp linux-2.6.32.7/include/net/sctp/sctp.h linux-2.6.32.7/include/net/sctp/sctp.h 44325diff -urNp linux-2.6.32.8/include/net/sctp/sctp.h linux-2.6.32.8/include/net/sctp/sctp.h
44262--- linux-2.6.32.7/include/net/sctp/sctp.h 2010-01-25 13:50:10.000000000 -0500 44326--- linux-2.6.32.8/include/net/sctp/sctp.h 2010-02-09 07:57:19.000000000 -0500
44263+++ linux-2.6.32.7/include/net/sctp/sctp.h 2010-01-25 17:39:41.037233192 -0500 44327+++ linux-2.6.32.8/include/net/sctp/sctp.h 2010-02-10 15:06:24.614029789 -0500
44264@@ -305,8 +305,8 @@ extern int sctp_debug_flag; 44328@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
44265 44329
44266 #else /* SCTP_DEBUG */ 44330 #else /* SCTP_DEBUG */
@@ -44272,9 +44336,9 @@ diff -urNp linux-2.6.32.7/include/net/sctp/sctp.h linux-2.6.32.7/include/net/sct
44272 #define SCTP_ENABLE_DEBUG 44336 #define SCTP_ENABLE_DEBUG
44273 #define SCTP_DISABLE_DEBUG 44337 #define SCTP_DISABLE_DEBUG
44274 #define SCTP_ASSERT(expr, str, func) 44338 #define SCTP_ASSERT(expr, str, func)
44275diff -urNp linux-2.6.32.7/include/net/tcp.h linux-2.6.32.7/include/net/tcp.h 44339diff -urNp linux-2.6.32.8/include/net/tcp.h linux-2.6.32.8/include/net/tcp.h
44276--- linux-2.6.32.7/include/net/tcp.h 2010-01-25 13:50:10.000000000 -0500 44340--- linux-2.6.32.8/include/net/tcp.h 2010-02-09 07:57:19.000000000 -0500
44277+++ linux-2.6.32.7/include/net/tcp.h 2010-01-25 17:39:41.038425649 -0500 44341+++ linux-2.6.32.8/include/net/tcp.h 2010-02-10 15:06:24.614029789 -0500
44278@@ -1420,6 +1420,7 @@ enum tcp_seq_states { 44342@@ -1420,6 +1420,7 @@ enum tcp_seq_states {
44279 struct tcp_seq_afinfo { 44343 struct tcp_seq_afinfo {
44280 char *name; 44344 char *name;
@@ -44283,9 +44347,9 @@ diff -urNp linux-2.6.32.7/include/net/tcp.h linux-2.6.32.7/include/net/tcp.h
44283 struct file_operations seq_fops; 44347 struct file_operations seq_fops;
44284 struct seq_operations seq_ops; 44348 struct seq_operations seq_ops;
44285 }; 44349 };
44286diff -urNp linux-2.6.32.7/include/net/udp.h linux-2.6.32.7/include/net/udp.h 44350diff -urNp linux-2.6.32.8/include/net/udp.h linux-2.6.32.8/include/net/udp.h
44287--- linux-2.6.32.7/include/net/udp.h 2010-01-25 13:50:10.000000000 -0500 44351--- linux-2.6.32.8/include/net/udp.h 2010-02-09 07:57:19.000000000 -0500
44288+++ linux-2.6.32.7/include/net/udp.h 2010-01-25 17:39:41.038425649 -0500 44352+++ linux-2.6.32.8/include/net/udp.h 2010-02-10 15:06:24.614029789 -0500
44289@@ -187,6 +187,7 @@ struct udp_seq_afinfo { 44353@@ -187,6 +187,7 @@ struct udp_seq_afinfo {
44290 char *name; 44354 char *name;
44291 sa_family_t family; 44355 sa_family_t family;
@@ -44294,9 +44358,9 @@ diff -urNp linux-2.6.32.7/include/net/udp.h linux-2.6.32.7/include/net/udp.h
44294 struct file_operations seq_fops; 44358 struct file_operations seq_fops;
44295 struct seq_operations seq_ops; 44359 struct seq_operations seq_ops;
44296 }; 44360 };
44297diff -urNp linux-2.6.32.7/include/sound/ac97_codec.h linux-2.6.32.7/include/sound/ac97_codec.h 44361diff -urNp linux-2.6.32.8/include/sound/ac97_codec.h linux-2.6.32.8/include/sound/ac97_codec.h
44298--- linux-2.6.32.7/include/sound/ac97_codec.h 2010-01-25 13:50:10.000000000 -0500 44362--- linux-2.6.32.8/include/sound/ac97_codec.h 2010-02-09 07:57:19.000000000 -0500
44299+++ linux-2.6.32.7/include/sound/ac97_codec.h 2010-01-25 17:39:41.038425649 -0500 44363+++ linux-2.6.32.8/include/sound/ac97_codec.h 2010-02-10 15:06:24.614029789 -0500
44300@@ -419,15 +419,15 @@ 44364@@ -419,15 +419,15 @@
44301 struct snd_ac97; 44365 struct snd_ac97;
44302 44366
@@ -44329,9 +44393,9 @@ diff -urNp linux-2.6.32.7/include/sound/ac97_codec.h linux-2.6.32.7/include/soun
44329 void *private_data; 44393 void *private_data;
44330 void (*private_free) (struct snd_ac97 *ac97); 44394 void (*private_free) (struct snd_ac97 *ac97);
44331 /* --- */ 44395 /* --- */
44332diff -urNp linux-2.6.32.7/include/video/uvesafb.h linux-2.6.32.7/include/video/uvesafb.h 44396diff -urNp linux-2.6.32.8/include/video/uvesafb.h linux-2.6.32.8/include/video/uvesafb.h
44333--- linux-2.6.32.7/include/video/uvesafb.h 2010-01-25 13:50:10.000000000 -0500 44397--- linux-2.6.32.8/include/video/uvesafb.h 2010-02-09 07:57:19.000000000 -0500
44334+++ linux-2.6.32.7/include/video/uvesafb.h 2010-01-25 17:39:41.039171660 -0500 44398+++ linux-2.6.32.8/include/video/uvesafb.h 2010-02-10 15:06:24.614029789 -0500
44335@@ -177,6 +177,7 @@ struct uvesafb_par { 44399@@ -177,6 +177,7 @@ struct uvesafb_par {
44336 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ 44400 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
44337 u8 pmi_setpal; /* PMI for palette changes */ 44401 u8 pmi_setpal; /* PMI for palette changes */
@@ -44340,9 +44404,9 @@ diff -urNp linux-2.6.32.7/include/video/uvesafb.h linux-2.6.32.7/include/video/u
44340 void *pmi_start; 44404 void *pmi_start;
44341 void *pmi_pal; 44405 void *pmi_pal;
44342 u8 *vbe_state_orig; /* 44406 u8 *vbe_state_orig; /*
44343diff -urNp linux-2.6.32.7/init/do_mounts.c linux-2.6.32.7/init/do_mounts.c 44407diff -urNp linux-2.6.32.8/init/do_mounts.c linux-2.6.32.8/init/do_mounts.c
44344--- linux-2.6.32.7/init/do_mounts.c 2010-01-25 13:50:10.000000000 -0500 44408--- linux-2.6.32.8/init/do_mounts.c 2010-02-09 07:57:19.000000000 -0500
44345+++ linux-2.6.32.7/init/do_mounts.c 2010-01-25 17:39:41.050935989 -0500 44409+++ linux-2.6.32.8/init/do_mounts.c 2010-02-10 15:06:24.614029789 -0500
44346@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa 44410@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
44347 44411
44348 static int __init do_mount_root(char *name, char *fs, int flags, void *data) 44412 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -44388,9 +44452,9 @@ diff -urNp linux-2.6.32.7/init/do_mounts.c linux-2.6.32.7/init/do_mounts.c
44388+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); 44452+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
44389+ sys_chroot((__force char __user *)"."); 44453+ sys_chroot((__force char __user *)".");
44390 } 44454 }
44391diff -urNp linux-2.6.32.7/init/do_mounts.h linux-2.6.32.7/init/do_mounts.h 44455diff -urNp linux-2.6.32.8/init/do_mounts.h linux-2.6.32.8/init/do_mounts.h
44392--- linux-2.6.32.7/init/do_mounts.h 2010-01-25 13:50:10.000000000 -0500 44456--- linux-2.6.32.8/init/do_mounts.h 2010-02-09 07:57:19.000000000 -0500
44393+++ linux-2.6.32.7/init/do_mounts.h 2010-01-25 17:39:41.053149708 -0500 44457+++ linux-2.6.32.8/init/do_mounts.h 2010-02-10 15:06:24.614029789 -0500
44394@@ -15,15 +15,15 @@ extern int root_mountflags; 44458@@ -15,15 +15,15 @@ extern int root_mountflags;
44395 44459
44396 static inline int create_dev(char *name, dev_t dev) 44460 static inline int create_dev(char *name, dev_t dev)
@@ -44410,9 +44474,9 @@ diff -urNp linux-2.6.32.7/init/do_mounts.h linux-2.6.32.7/init/do_mounts.h
44410 return 0; 44474 return 0;
44411 if (!S_ISBLK(stat.st_mode)) 44475 if (!S_ISBLK(stat.st_mode))
44412 return 0; 44476 return 0;
44413diff -urNp linux-2.6.32.7/init/do_mounts_initrd.c linux-2.6.32.7/init/do_mounts_initrd.c 44477diff -urNp linux-2.6.32.8/init/do_mounts_initrd.c linux-2.6.32.8/init/do_mounts_initrd.c
44414--- linux-2.6.32.7/init/do_mounts_initrd.c 2010-01-25 13:50:10.000000000 -0500 44478--- linux-2.6.32.8/init/do_mounts_initrd.c 2010-02-09 07:57:19.000000000 -0500
44415+++ linux-2.6.32.7/init/do_mounts_initrd.c 2010-01-25 17:39:41.055426418 -0500 44479+++ linux-2.6.32.8/init/do_mounts_initrd.c 2010-02-10 15:06:24.618033572 -0500
44416@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel 44480@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
44417 sys_close(old_fd);sys_close(root_fd); 44481 sys_close(old_fd);sys_close(root_fd);
44418 sys_close(0);sys_close(1);sys_close(2); 44482 sys_close(0);sys_close(1);sys_close(2);
@@ -44496,9 +44560,9 @@ diff -urNp linux-2.6.32.7/init/do_mounts_initrd.c linux-2.6.32.7/init/do_mounts_
44496+ sys_unlink((__force const char __user *)"/initrd.image"); 44560+ sys_unlink((__force const char __user *)"/initrd.image");
44497 return 0; 44561 return 0;
44498 } 44562 }
44499diff -urNp linux-2.6.32.7/init/do_mounts_md.c linux-2.6.32.7/init/do_mounts_md.c 44563diff -urNp linux-2.6.32.8/init/do_mounts_md.c linux-2.6.32.8/init/do_mounts_md.c
44500--- linux-2.6.32.7/init/do_mounts_md.c 2010-01-25 13:50:10.000000000 -0500 44564--- linux-2.6.32.8/init/do_mounts_md.c 2010-02-09 07:57:19.000000000 -0500
44501+++ linux-2.6.32.7/init/do_mounts_md.c 2010-01-25 17:39:41.067292994 -0500 44565+++ linux-2.6.32.8/init/do_mounts_md.c 2010-02-10 15:06:24.618033572 -0500
44502@@ -170,7 +170,7 @@ static void __init md_setup_drive(void) 44566@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
44503 partitioned ? "_d" : "", minor, 44567 partitioned ? "_d" : "", minor,
44504 md_setup_args[ent].device_names); 44568 md_setup_args[ent].device_names);
@@ -44526,9 +44590,9 @@ diff -urNp linux-2.6.32.7/init/do_mounts_md.c linux-2.6.32.7/init/do_mounts_md.c
44526 if (fd >= 0) { 44590 if (fd >= 0) {
44527 sys_ioctl(fd, RAID_AUTORUN, raid_autopart); 44591 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
44528 sys_close(fd); 44592 sys_close(fd);
44529diff -urNp linux-2.6.32.7/init/initramfs.c linux-2.6.32.7/init/initramfs.c 44593diff -urNp linux-2.6.32.8/init/initramfs.c linux-2.6.32.8/init/initramfs.c
44530--- linux-2.6.32.7/init/initramfs.c 2010-01-25 13:50:10.000000000 -0500 44594--- linux-2.6.32.8/init/initramfs.c 2010-02-09 07:57:19.000000000 -0500
44531+++ linux-2.6.32.7/init/initramfs.c 2010-01-25 17:39:41.069300088 -0500 44595+++ linux-2.6.32.8/init/initramfs.c 2010-02-10 15:06:24.618033572 -0500
44532@@ -74,7 +74,7 @@ static void __init free_hash(void) 44596@@ -74,7 +74,7 @@ static void __init free_hash(void)
44533 } 44597 }
44534 } 44598 }
@@ -44637,9 +44701,9 @@ diff -urNp linux-2.6.32.7/init/initramfs.c linux-2.6.32.7/init/initramfs.c
44637 state = SkipIt; 44701 state = SkipIt;
44638 next_state = Reset; 44702 next_state = Reset;
44639 return 0; 44703 return 0;
44640diff -urNp linux-2.6.32.7/init/Kconfig linux-2.6.32.7/init/Kconfig 44704diff -urNp linux-2.6.32.8/init/Kconfig linux-2.6.32.8/init/Kconfig
44641--- linux-2.6.32.7/init/Kconfig 2010-01-25 13:50:10.000000000 -0500 44705--- linux-2.6.32.8/init/Kconfig 2010-02-09 07:57:19.000000000 -0500
44642+++ linux-2.6.32.7/init/Kconfig 2010-01-25 17:39:41.074459565 -0500 44706+++ linux-2.6.32.8/init/Kconfig 2010-02-10 15:06:24.618033572 -0500
44643@@ -1026,7 +1026,7 @@ config SLUB_DEBUG 44707@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
44644 44708
44645 config COMPAT_BRK 44709 config COMPAT_BRK
@@ -44661,9 +44725,9 @@ diff -urNp linux-2.6.32.7/init/Kconfig linux-2.6.32.7/init/Kconfig
44661 44725
44662 config RT_MUTEXES 44726 config RT_MUTEXES
44663 boolean 44727 boolean
44664diff -urNp linux-2.6.32.7/init/main.c linux-2.6.32.7/init/main.c 44728diff -urNp linux-2.6.32.8/init/main.c linux-2.6.32.8/init/main.c
44665--- linux-2.6.32.7/init/main.c 2010-01-25 13:50:10.000000000 -0500 44729--- linux-2.6.32.8/init/main.c 2010-02-09 07:57:19.000000000 -0500
44666+++ linux-2.6.32.7/init/main.c 2010-01-25 17:39:41.075431418 -0500 44730+++ linux-2.6.32.8/init/main.c 2010-02-10 15:06:24.618033572 -0500
44667@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) 44731@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
44668 #ifdef CONFIG_TC 44732 #ifdef CONFIG_TC
44669 extern void tc_init(void); 44733 extern void tc_init(void);
@@ -44793,9 +44857,9 @@ diff -urNp linux-2.6.32.7/init/main.c linux-2.6.32.7/init/main.c
44793 /* 44857 /*
44794 * Ok, we have completed the initial bootup, and 44858 * Ok, we have completed the initial bootup, and
44795 * we're essentially up and running. Get rid of the 44859 * we're essentially up and running. Get rid of the
44796diff -urNp linux-2.6.32.7/init/noinitramfs.c linux-2.6.32.7/init/noinitramfs.c 44860diff -urNp linux-2.6.32.8/init/noinitramfs.c linux-2.6.32.8/init/noinitramfs.c
44797--- linux-2.6.32.7/init/noinitramfs.c 2010-01-25 13:50:10.000000000 -0500 44861--- linux-2.6.32.8/init/noinitramfs.c 2010-02-09 07:57:19.000000000 -0500
44798+++ linux-2.6.32.7/init/noinitramfs.c 2010-01-25 17:39:41.076314755 -0500 44862+++ linux-2.6.32.8/init/noinitramfs.c 2010-02-10 15:06:24.618033572 -0500
44799@@ -29,7 +29,7 @@ static int __init default_rootfs(void) 44863@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
44800 { 44864 {
44801 int err; 44865 int err;
@@ -44814,9 +44878,9 @@ diff -urNp linux-2.6.32.7/init/noinitramfs.c linux-2.6.32.7/init/noinitramfs.c
44814 if (err < 0) 44878 if (err < 0)
44815 goto out; 44879 goto out;
44816 44880
44817diff -urNp linux-2.6.32.7/ipc/ipc_sysctl.c linux-2.6.32.7/ipc/ipc_sysctl.c 44881diff -urNp linux-2.6.32.8/ipc/ipc_sysctl.c linux-2.6.32.8/ipc/ipc_sysctl.c
44818--- linux-2.6.32.7/ipc/ipc_sysctl.c 2010-01-25 13:50:10.000000000 -0500 44882--- linux-2.6.32.8/ipc/ipc_sysctl.c 2010-02-09 07:57:19.000000000 -0500
44819+++ linux-2.6.32.7/ipc/ipc_sysctl.c 2010-01-25 17:39:41.076314755 -0500 44883+++ linux-2.6.32.8/ipc/ipc_sysctl.c 2010-02-10 15:06:24.618033572 -0500
44820@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] 44884@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
44821 .extra1 = &zero, 44885 .extra1 = &zero,
44822 .extra2 = &one, 44886 .extra2 = &one,
@@ -44835,9 +44899,9 @@ diff -urNp linux-2.6.32.7/ipc/ipc_sysctl.c linux-2.6.32.7/ipc/ipc_sysctl.c
44835 }; 44899 };
44836 44900
44837 static int __init ipc_sysctl_init(void) 44901 static int __init ipc_sysctl_init(void)
44838diff -urNp linux-2.6.32.7/ipc/mqueue.c linux-2.6.32.7/ipc/mqueue.c 44902diff -urNp linux-2.6.32.8/ipc/mqueue.c linux-2.6.32.8/ipc/mqueue.c
44839--- linux-2.6.32.7/ipc/mqueue.c 2010-01-25 13:50:10.000000000 -0500 44903--- linux-2.6.32.8/ipc/mqueue.c 2010-02-09 07:57:19.000000000 -0500
44840+++ linux-2.6.32.7/ipc/mqueue.c 2010-01-25 17:39:41.076314755 -0500 44904+++ linux-2.6.32.8/ipc/mqueue.c 2010-02-10 15:06:24.618033572 -0500
44841@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st 44905@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
44842 mq_bytes = (mq_msg_tblsz + 44906 mq_bytes = (mq_msg_tblsz +
44843 (info->attr.mq_maxmsg * info->attr.mq_msgsize)); 44907 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -44846,9 +44910,9 @@ diff -urNp linux-2.6.32.7/ipc/mqueue.c linux-2.6.32.7/ipc/mqueue.c
44846 spin_lock(&mq_lock); 44910 spin_lock(&mq_lock);
44847 if (u->mq_bytes + mq_bytes < u->mq_bytes || 44911 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
44848 u->mq_bytes + mq_bytes > 44912 u->mq_bytes + mq_bytes >
44849diff -urNp linux-2.6.32.7/ipc/shm.c linux-2.6.32.7/ipc/shm.c 44913diff -urNp linux-2.6.32.8/ipc/shm.c linux-2.6.32.8/ipc/shm.c
44850--- linux-2.6.32.7/ipc/shm.c 2010-01-25 20:04:15.549151745 -0500 44914--- linux-2.6.32.8/ipc/shm.c 2010-02-09 07:57:19.000000000 -0500
44851+++ linux-2.6.32.7/ipc/shm.c 2010-01-25 20:04:25.168099298 -0500 44915+++ linux-2.6.32.8/ipc/shm.c 2010-02-10 15:06:24.618033572 -0500
44852@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name 44916@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
44853 static int sysvipc_shm_proc_show(struct seq_file *s, void *it); 44917 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
44854 #endif 44918 #endif
@@ -44901,9 +44965,9 @@ diff -urNp linux-2.6.32.7/ipc/shm.c linux-2.6.32.7/ipc/shm.c
44901 size = i_size_read(path.dentry->d_inode); 44965 size = i_size_read(path.dentry->d_inode);
44902 shm_unlock(shp); 44966 shm_unlock(shp);
44903 44967
44904diff -urNp linux-2.6.32.7/kernel/acct.c linux-2.6.32.7/kernel/acct.c 44968diff -urNp linux-2.6.32.8/kernel/acct.c linux-2.6.32.8/kernel/acct.c
44905--- linux-2.6.32.7/kernel/acct.c 2010-01-25 13:50:10.000000000 -0500 44969--- linux-2.6.32.8/kernel/acct.c 2010-02-09 07:57:19.000000000 -0500
44906+++ linux-2.6.32.7/kernel/acct.c 2010-01-25 17:39:41.077441091 -0500 44970+++ linux-2.6.32.8/kernel/acct.c 2010-02-10 15:06:24.618033572 -0500
44907@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a 44971@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
44908 */ 44972 */
44909 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; 44973 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -44913,9 +44977,9 @@ diff -urNp linux-2.6.32.7/kernel/acct.c linux-2.6.32.7/kernel/acct.c
44913 sizeof(acct_t), &file->f_pos); 44977 sizeof(acct_t), &file->f_pos);
44914 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; 44978 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
44915 set_fs(fs); 44979 set_fs(fs);
44916diff -urNp linux-2.6.32.7/kernel/capability.c linux-2.6.32.7/kernel/capability.c 44980diff -urNp linux-2.6.32.8/kernel/capability.c linux-2.6.32.8/kernel/capability.c
44917--- linux-2.6.32.7/kernel/capability.c 2010-01-25 13:50:10.000000000 -0500 44981--- linux-2.6.32.8/kernel/capability.c 2010-02-09 07:57:19.000000000 -0500
44918+++ linux-2.6.32.7/kernel/capability.c 2010-01-25 17:39:41.077441091 -0500 44982+++ linux-2.6.32.8/kernel/capability.c 2010-02-10 15:06:24.618033572 -0500
44919@@ -306,10 +306,21 @@ int capable(int cap) 44983@@ -306,10 +306,21 @@ int capable(int cap)
44920 BUG(); 44984 BUG();
44921 } 44985 }
@@ -44939,9 +45003,9 @@ diff -urNp linux-2.6.32.7/kernel/capability.c linux-2.6.32.7/kernel/capability.c
44939+ 45003+
44940 EXPORT_SYMBOL(capable); 45004 EXPORT_SYMBOL(capable);
44941+EXPORT_SYMBOL(capable_nolog); 45005+EXPORT_SYMBOL(capable_nolog);
44942diff -urNp linux-2.6.32.7/kernel/configs.c linux-2.6.32.7/kernel/configs.c 45006diff -urNp linux-2.6.32.8/kernel/configs.c linux-2.6.32.8/kernel/configs.c
44943--- linux-2.6.32.7/kernel/configs.c 2010-01-25 13:50:10.000000000 -0500 45007--- linux-2.6.32.8/kernel/configs.c 2010-02-09 07:57:19.000000000 -0500
44944+++ linux-2.6.32.7/kernel/configs.c 2010-01-25 17:39:41.077441091 -0500 45008+++ linux-2.6.32.8/kernel/configs.c 2010-02-10 15:06:24.618033572 -0500
44945@@ -73,8 +73,19 @@ static int __init ikconfig_init(void) 45009@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
44946 struct proc_dir_entry *entry; 45010 struct proc_dir_entry *entry;
44947 45011
@@ -44962,9 +45026,9 @@ diff -urNp linux-2.6.32.7/kernel/configs.c linux-2.6.32.7/kernel/configs.c
44962 if (!entry) 45026 if (!entry)
44963 return -ENOMEM; 45027 return -ENOMEM;
44964 45028
44965diff -urNp linux-2.6.32.7/kernel/cpu.c linux-2.6.32.7/kernel/cpu.c 45029diff -urNp linux-2.6.32.8/kernel/cpu.c linux-2.6.32.8/kernel/cpu.c
44966--- linux-2.6.32.7/kernel/cpu.c 2010-01-25 20:04:15.562557635 -0500 45030--- linux-2.6.32.8/kernel/cpu.c 2010-02-09 07:57:19.000000000 -0500
44967+++ linux-2.6.32.7/kernel/cpu.c 2010-01-25 20:04:25.175451082 -0500 45031+++ linux-2.6.32.8/kernel/cpu.c 2010-02-10 15:06:24.618033572 -0500
44968@@ -19,7 +19,7 @@ 45032@@ -19,7 +19,7 @@
44969 /* Serializes the updates to cpu_online_mask, cpu_present_mask */ 45033 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
44970 static DEFINE_MUTEX(cpu_add_remove_lock); 45034 static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -44974,9 +45038,9 @@ diff -urNp linux-2.6.32.7/kernel/cpu.c linux-2.6.32.7/kernel/cpu.c
44974 45038
44975 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. 45039 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
44976 * Should always be manipulated under cpu_add_remove_lock 45040 * Should always be manipulated under cpu_add_remove_lock
44977diff -urNp linux-2.6.32.7/kernel/cred.c linux-2.6.32.7/kernel/cred.c 45041diff -urNp linux-2.6.32.8/kernel/cred.c linux-2.6.32.8/kernel/cred.c
44978--- linux-2.6.32.7/kernel/cred.c 2010-01-25 13:50:10.000000000 -0500 45042--- linux-2.6.32.8/kernel/cred.c 2010-02-09 07:57:19.000000000 -0500
44979+++ linux-2.6.32.7/kernel/cred.c 2010-01-25 17:39:41.077441091 -0500 45043+++ linux-2.6.32.8/kernel/cred.c 2010-02-10 15:06:24.618033572 -0500
44980@@ -520,6 +520,8 @@ int commit_creds(struct cred *new) 45044@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
44981 45045
44982 get_cred(new); /* we will require a ref for the subj creds too */ 45046 get_cred(new); /* we will require a ref for the subj creds too */
@@ -44986,9 +45050,9 @@ diff -urNp linux-2.6.32.7/kernel/cred.c linux-2.6.32.7/kernel/cred.c
44986 /* dumpability changes */ 45050 /* dumpability changes */
44987 if (old->euid != new->euid || 45051 if (old->euid != new->euid ||
44988 old->egid != new->egid || 45052 old->egid != new->egid ||
44989diff -urNp linux-2.6.32.7/kernel/exit.c linux-2.6.32.7/kernel/exit.c 45053diff -urNp linux-2.6.32.8/kernel/exit.c linux-2.6.32.8/kernel/exit.c
44990--- linux-2.6.32.7/kernel/exit.c 2010-01-25 13:50:10.000000000 -0500 45054--- linux-2.6.32.8/kernel/exit.c 2010-02-09 07:57:19.000000000 -0500
44991+++ linux-2.6.32.7/kernel/exit.c 2010-01-25 17:39:41.078429700 -0500 45055+++ linux-2.6.32.8/kernel/exit.c 2010-02-10 15:06:24.618033572 -0500
44992@@ -56,6 +56,10 @@ 45056@@ -56,6 +56,10 @@
44993 #include <asm/mmu_context.h> 45057 #include <asm/mmu_context.h>
44994 #include "cred-internals.h" 45058 #include "cred-internals.h"
@@ -45078,9 +45142,9 @@ diff -urNp linux-2.6.32.7/kernel/exit.c linux-2.6.32.7/kernel/exit.c
45078 45142
45079 get_task_struct(p); 45143 get_task_struct(p);
45080 read_unlock(&tasklist_lock); 45144 read_unlock(&tasklist_lock);
45081diff -urNp linux-2.6.32.7/kernel/fork.c linux-2.6.32.7/kernel/fork.c 45145diff -urNp linux-2.6.32.8/kernel/fork.c linux-2.6.32.8/kernel/fork.c
45082--- linux-2.6.32.7/kernel/fork.c 2010-01-25 13:50:10.000000000 -0500 45146--- linux-2.6.32.8/kernel/fork.c 2010-02-09 07:57:19.000000000 -0500
45083+++ linux-2.6.32.7/kernel/fork.c 2010-01-25 17:39:41.078429700 -0500 45147+++ linux-2.6.32.8/kernel/fork.c 2010-02-10 15:06:24.618033572 -0500
45084@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru 45148@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
45085 *stackend = STACK_END_MAGIC; /* for overflow detection */ 45149 *stackend = STACK_END_MAGIC; /* for overflow detection */
45086 45150
@@ -45150,7 +45214,7 @@ diff -urNp linux-2.6.32.7/kernel/fork.c linux-2.6.32.7/kernel/fork.c
45150 write_unlock(&fs->lock); 45214 write_unlock(&fs->lock);
45151 return 0; 45215 return 0;
45152 } 45216 }
45153@@ -1027,6 +1053,9 @@ static struct task_struct *copy_process( 45217@@ -1027,10 +1053,13 @@ static struct task_struct *copy_process(
45154 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); 45218 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
45155 #endif 45219 #endif
45156 retval = -EAGAIN; 45220 retval = -EAGAIN;
@@ -45159,7 +45223,13 @@ diff -urNp linux-2.6.32.7/kernel/fork.c linux-2.6.32.7/kernel/fork.c
45159+ 45223+
45160 if (atomic_read(&p->real_cred->user->processes) >= 45224 if (atomic_read(&p->real_cred->user->processes) >=
45161 p->signal->rlim[RLIMIT_NPROC].rlim_cur) { 45225 p->signal->rlim[RLIMIT_NPROC].rlim_cur) {
45162 if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) && 45226- if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
45227- p->real_cred->user != INIT_USER)
45228+ if (p->real_cred->user != INIT_USER &&
45229+ !capable(CAP_SYS_RESOURCE) && !capable(CAP_SYS_ADMIN))
45230 goto bad_fork_free;
45231 }
45232
45163@@ -1179,6 +1208,8 @@ static struct task_struct *copy_process( 45233@@ -1179,6 +1208,8 @@ static struct task_struct *copy_process(
45164 goto bad_fork_free_pid; 45234 goto bad_fork_free_pid;
45165 } 45235 }
@@ -45205,9 +45275,9 @@ diff -urNp linux-2.6.32.7/kernel/fork.c linux-2.6.32.7/kernel/fork.c
45205 new_fs = NULL; 45275 new_fs = NULL;
45206 else 45276 else
45207 new_fs = fs; 45277 new_fs = fs;
45208diff -urNp linux-2.6.32.7/kernel/futex.c linux-2.6.32.7/kernel/futex.c 45278diff -urNp linux-2.6.32.8/kernel/futex.c linux-2.6.32.8/kernel/futex.c
45209--- linux-2.6.32.7/kernel/futex.c 2010-01-25 13:50:10.000000000 -0500 45279--- linux-2.6.32.8/kernel/futex.c 2010-02-09 07:57:19.000000000 -0500
45210+++ linux-2.6.32.7/kernel/futex.c 2010-01-25 17:39:41.078429700 -0500 45280+++ linux-2.6.32.8/kernel/futex.c 2010-02-10 15:06:24.621989074 -0500
45211@@ -54,6 +54,7 @@ 45281@@ -54,6 +54,7 @@
45212 #include <linux/mount.h> 45282 #include <linux/mount.h>
45213 #include <linux/pagemap.h> 45283 #include <linux/pagemap.h>
@@ -45275,9 +45345,9 @@ diff -urNp linux-2.6.32.7/kernel/futex.c linux-2.6.32.7/kernel/futex.c
45275 { 45345 {
45276 unsigned long uentry; 45346 unsigned long uentry;
45277 45347
45278diff -urNp linux-2.6.32.7/kernel/futex_compat.c linux-2.6.32.7/kernel/futex_compat.c 45348diff -urNp linux-2.6.32.8/kernel/futex_compat.c linux-2.6.32.8/kernel/futex_compat.c
45279--- linux-2.6.32.7/kernel/futex_compat.c 2010-01-25 13:50:10.000000000 -0500 45349--- linux-2.6.32.8/kernel/futex_compat.c 2010-02-09 07:57:19.000000000 -0500
45280+++ linux-2.6.32.7/kernel/futex_compat.c 2010-01-25 17:39:41.079430227 -0500 45350+++ linux-2.6.32.8/kernel/futex_compat.c 2010-02-10 15:06:24.621989074 -0500
45281@@ -10,6 +10,7 @@ 45351@@ -10,6 +10,7 @@
45282 #include <linux/compat.h> 45352 #include <linux/compat.h>
45283 #include <linux/nsproxy.h> 45353 #include <linux/nsproxy.h>
@@ -45315,9 +45385,9 @@ diff -urNp linux-2.6.32.7/kernel/futex_compat.c linux-2.6.32.7/kernel/futex_comp
45315 head = p->compat_robust_list; 45385 head = p->compat_robust_list;
45316 read_unlock(&tasklist_lock); 45386 read_unlock(&tasklist_lock);
45317 } 45387 }
45318diff -urNp linux-2.6.32.7/kernel/gcov/base.c linux-2.6.32.7/kernel/gcov/base.c 45388diff -urNp linux-2.6.32.8/kernel/gcov/base.c linux-2.6.32.8/kernel/gcov/base.c
45319--- linux-2.6.32.7/kernel/gcov/base.c 2010-01-25 13:50:10.000000000 -0500 45389--- linux-2.6.32.8/kernel/gcov/base.c 2010-02-09 07:57:19.000000000 -0500
45320+++ linux-2.6.32.7/kernel/gcov/base.c 2010-01-25 17:39:41.079430227 -0500 45390+++ linux-2.6.32.8/kernel/gcov/base.c 2010-02-10 15:06:24.621989074 -0500
45321@@ -102,11 +102,6 @@ void gcov_enable_events(void) 45391@@ -102,11 +102,6 @@ void gcov_enable_events(void)
45322 } 45392 }
45323 45393
@@ -45339,9 +45409,9 @@ diff -urNp linux-2.6.32.7/kernel/gcov/base.c linux-2.6.32.7/kernel/gcov/base.c
45339 if (prev) 45409 if (prev)
45340 prev->next = info->next; 45410 prev->next = info->next;
45341 else 45411 else
45342diff -urNp linux-2.6.32.7/kernel/kallsyms.c linux-2.6.32.7/kernel/kallsyms.c 45412diff -urNp linux-2.6.32.8/kernel/kallsyms.c linux-2.6.32.8/kernel/kallsyms.c
45343--- linux-2.6.32.7/kernel/kallsyms.c 2010-01-25 13:50:10.000000000 -0500 45413--- linux-2.6.32.8/kernel/kallsyms.c 2010-02-09 07:57:19.000000000 -0500
45344+++ linux-2.6.32.7/kernel/kallsyms.c 2010-01-25 17:39:41.079430227 -0500 45414+++ linux-2.6.32.8/kernel/kallsyms.c 2010-02-10 15:06:24.621989074 -0500
45345@@ -11,6 +11,9 @@ 45415@@ -11,6 +11,9 @@
45346 * Changed the compression method from stem compression to "table lookup" 45416 * Changed the compression method from stem compression to "table lookup"
45347 * compression (see scripts/kallsyms.c for a more complete description) 45417 * compression (see scripts/kallsyms.c for a more complete description)
@@ -45416,9 +45486,9 @@ diff -urNp linux-2.6.32.7/kernel/kallsyms.c linux-2.6.32.7/kernel/kallsyms.c
45416 if (!iter) 45486 if (!iter)
45417 return -ENOMEM; 45487 return -ENOMEM;
45418 reset_iter(iter, 0); 45488 reset_iter(iter, 0);
45419diff -urNp linux-2.6.32.7/kernel/kgdb.c linux-2.6.32.7/kernel/kgdb.c 45489diff -urNp linux-2.6.32.8/kernel/kgdb.c linux-2.6.32.8/kernel/kgdb.c
45420--- linux-2.6.32.7/kernel/kgdb.c 2010-01-25 13:50:10.000000000 -0500 45490--- linux-2.6.32.8/kernel/kgdb.c 2010-02-09 07:57:19.000000000 -0500
45421+++ linux-2.6.32.7/kernel/kgdb.c 2010-01-25 17:39:41.079430227 -0500 45491+++ linux-2.6.32.8/kernel/kgdb.c 2010-02-10 15:06:24.621989074 -0500
45422@@ -86,7 +86,7 @@ static int kgdb_io_module_registered; 45492@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
45423 /* Guard for recursive entry */ 45493 /* Guard for recursive entry */
45424 static int exception_level; 45494 static int exception_level;
@@ -45446,9 +45516,9 @@ diff -urNp linux-2.6.32.7/kernel/kgdb.c linux-2.6.32.7/kernel/kgdb.c
45446 { 45516 {
45447 BUG_ON(kgdb_connected); 45517 BUG_ON(kgdb_connected);
45448 45518
45449diff -urNp linux-2.6.32.7/kernel/kmod.c linux-2.6.32.7/kernel/kmod.c 45519diff -urNp linux-2.6.32.8/kernel/kmod.c linux-2.6.32.8/kernel/kmod.c
45450--- linux-2.6.32.7/kernel/kmod.c 2010-01-25 13:50:10.000000000 -0500 45520--- linux-2.6.32.8/kernel/kmod.c 2010-02-09 07:57:19.000000000 -0500
45451+++ linux-2.6.32.7/kernel/kmod.c 2010-01-25 17:39:41.079430227 -0500 45521+++ linux-2.6.32.8/kernel/kmod.c 2010-02-10 15:06:24.621989074 -0500
45452@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch 45522@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
45453 if (ret >= MODULE_NAME_LEN) 45523 if (ret >= MODULE_NAME_LEN)
45454 return -ENAMETOOLONG; 45524 return -ENAMETOOLONG;
@@ -45468,9 +45538,9 @@ diff -urNp linux-2.6.32.7/kernel/kmod.c linux-2.6.32.7/kernel/kmod.c
45468 /* If modprobe needs a service that is in a module, we get a recursive 45538 /* If modprobe needs a service that is in a module, we get a recursive
45469 * loop. Limit the number of running kmod threads to max_threads/2 or 45539 * loop. Limit the number of running kmod threads to max_threads/2 or
45470 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method 45540 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
45471diff -urNp linux-2.6.32.7/kernel/kprobes.c linux-2.6.32.7/kernel/kprobes.c 45541diff -urNp linux-2.6.32.8/kernel/kprobes.c linux-2.6.32.8/kernel/kprobes.c
45472--- linux-2.6.32.7/kernel/kprobes.c 2010-01-25 13:50:10.000000000 -0500 45542--- linux-2.6.32.8/kernel/kprobes.c 2010-02-09 07:57:19.000000000 -0500
45473+++ linux-2.6.32.7/kernel/kprobes.c 2010-01-25 17:39:41.080425476 -0500 45543+++ linux-2.6.32.8/kernel/kprobes.c 2010-02-10 15:06:24.621989074 -0500
45474@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ 45544@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
45475 * kernel image and loaded module images reside. This is required 45545 * kernel image and loaded module images reside. This is required
45476 * so x86_64 can correctly handle the %rip-relative fixups. 45546 * so x86_64 can correctly handle the %rip-relative fixups.
@@ -45489,9 +45559,9 @@ diff -urNp linux-2.6.32.7/kernel/kprobes.c linux-2.6.32.7/kernel/kprobes.c
45489 kfree(kip); 45559 kfree(kip);
45490 } 45560 }
45491 return 1; 45561 return 1;
45492diff -urNp linux-2.6.32.7/kernel/lockdep.c linux-2.6.32.7/kernel/lockdep.c 45562diff -urNp linux-2.6.32.8/kernel/lockdep.c linux-2.6.32.8/kernel/lockdep.c
45493--- linux-2.6.32.7/kernel/lockdep.c 2010-01-25 13:50:10.000000000 -0500 45563--- linux-2.6.32.8/kernel/lockdep.c 2010-02-09 07:57:19.000000000 -0500
45494+++ linux-2.6.32.7/kernel/lockdep.c 2010-01-25 17:39:41.080425476 -0500 45564+++ linux-2.6.32.8/kernel/lockdep.c 2010-02-10 15:06:24.621989074 -0500
45495@@ -577,6 +577,10 @@ static int static_obj(void *obj) 45565@@ -577,6 +577,10 @@ static int static_obj(void *obj)
45496 int i; 45566 int i;
45497 #endif 45567 #endif
@@ -45521,9 +45591,9 @@ diff -urNp linux-2.6.32.7/kernel/lockdep.c linux-2.6.32.7/kernel/lockdep.c
45521 printk("the code is fine but needs lockdep annotation.\n"); 45591 printk("the code is fine but needs lockdep annotation.\n");
45522 printk("turning off the locking correctness validator.\n"); 45592 printk("turning off the locking correctness validator.\n");
45523 dump_stack(); 45593 dump_stack();
45524diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c 45594diff -urNp linux-2.6.32.8/kernel/module.c linux-2.6.32.8/kernel/module.c
45525--- linux-2.6.32.7/kernel/module.c 2010-01-25 13:50:10.000000000 -0500 45595--- linux-2.6.32.8/kernel/module.c 2010-02-09 07:57:19.000000000 -0500
45526+++ linux-2.6.32.7/kernel/module.c 2010-01-25 17:39:41.081427324 -0500 45596+++ linux-2.6.32.8/kernel/module.c 2010-02-10 15:06:24.626028377 -0500
45527@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq 45597@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
45528 static BLOCKING_NOTIFIER_HEAD(module_notify_list); 45598 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
45529 45599
@@ -46075,9 +46145,9 @@ diff -urNp linux-2.6.32.7/kernel/module.c linux-2.6.32.7/kernel/module.c
46075 mod = NULL; 46145 mod = NULL;
46076 } 46146 }
46077 return mod; 46147 return mod;
46078diff -urNp linux-2.6.32.7/kernel/panic.c linux-2.6.32.7/kernel/panic.c 46148diff -urNp linux-2.6.32.8/kernel/panic.c linux-2.6.32.8/kernel/panic.c
46079--- linux-2.6.32.7/kernel/panic.c 2010-01-25 13:50:10.000000000 -0500 46149--- linux-2.6.32.8/kernel/panic.c 2010-02-09 07:57:19.000000000 -0500
46080+++ linux-2.6.32.7/kernel/panic.c 2010-01-25 17:39:41.082412843 -0500 46150+++ linux-2.6.32.8/kernel/panic.c 2010-02-10 15:06:24.626028377 -0500
46081@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); 46151@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
46082 */ 46152 */
46083 void __stack_chk_fail(void) 46153 void __stack_chk_fail(void)
@@ -46088,9 +46158,9 @@ diff -urNp linux-2.6.32.7/kernel/panic.c linux-2.6.32.7/kernel/panic.c
46088 __builtin_return_address(0)); 46158 __builtin_return_address(0));
46089 } 46159 }
46090 EXPORT_SYMBOL(__stack_chk_fail); 46160 EXPORT_SYMBOL(__stack_chk_fail);
46091diff -urNp linux-2.6.32.7/kernel/params.c linux-2.6.32.7/kernel/params.c 46161diff -urNp linux-2.6.32.8/kernel/params.c linux-2.6.32.8/kernel/params.c
46092--- linux-2.6.32.7/kernel/params.c 2010-01-25 13:50:10.000000000 -0500 46162--- linux-2.6.32.8/kernel/params.c 2010-02-09 07:57:19.000000000 -0500
46093+++ linux-2.6.32.7/kernel/params.c 2010-01-25 17:39:41.082412843 -0500 46163+++ linux-2.6.32.8/kernel/params.c 2010-02-10 15:06:24.626028377 -0500
46094@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct 46164@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
46095 return ret; 46165 return ret;
46096 } 46166 }
@@ -46109,9 +46179,9 @@ diff -urNp linux-2.6.32.7/kernel/params.c linux-2.6.32.7/kernel/params.c
46109 .filter = uevent_filter, 46179 .filter = uevent_filter,
46110 }; 46180 };
46111 46181
46112diff -urNp linux-2.6.32.7/kernel/pid.c linux-2.6.32.7/kernel/pid.c 46182diff -urNp linux-2.6.32.8/kernel/pid.c linux-2.6.32.8/kernel/pid.c
46113--- linux-2.6.32.7/kernel/pid.c 2010-01-25 13:50:10.000000000 -0500 46183--- linux-2.6.32.8/kernel/pid.c 2010-02-09 07:57:19.000000000 -0500
46114+++ linux-2.6.32.7/kernel/pid.c 2010-01-25 17:39:41.082412843 -0500 46184+++ linux-2.6.32.8/kernel/pid.c 2010-02-10 15:06:24.626028377 -0500
46115@@ -33,6 +33,7 @@ 46185@@ -33,6 +33,7 @@
46116 #include <linux/rculist.h> 46186 #include <linux/rculist.h>
46117 #include <linux/bootmem.h> 46187 #include <linux/bootmem.h>
@@ -46145,9 +46215,9 @@ diff -urNp linux-2.6.32.7/kernel/pid.c linux-2.6.32.7/kernel/pid.c
46145 } 46215 }
46146 46216
46147 struct task_struct *find_task_by_vpid(pid_t vnr) 46217 struct task_struct *find_task_by_vpid(pid_t vnr)
46148diff -urNp linux-2.6.32.7/kernel/posix-cpu-timers.c linux-2.6.32.7/kernel/posix-cpu-timers.c 46218diff -urNp linux-2.6.32.8/kernel/posix-cpu-timers.c linux-2.6.32.8/kernel/posix-cpu-timers.c
46149--- linux-2.6.32.7/kernel/posix-cpu-timers.c 2010-01-25 13:50:10.000000000 -0500 46219--- linux-2.6.32.8/kernel/posix-cpu-timers.c 2010-02-09 07:57:19.000000000 -0500
46150+++ linux-2.6.32.7/kernel/posix-cpu-timers.c 2010-01-25 17:39:41.082412843 -0500 46220+++ linux-2.6.32.8/kernel/posix-cpu-timers.c 2010-02-10 15:06:24.626028377 -0500
46151@@ -6,6 +6,7 @@ 46221@@ -6,6 +6,7 @@
46152 #include <linux/posix-timers.h> 46222 #include <linux/posix-timers.h>
46153 #include <linux/errno.h> 46223 #include <linux/errno.h>
@@ -46172,9 +46242,9 @@ diff -urNp linux-2.6.32.7/kernel/posix-cpu-timers.c linux-2.6.32.7/kernel/posix-
46172 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { 46242 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) {
46173 /* 46243 /*
46174 * At the soft limit, send a SIGXCPU every second. 46244 * At the soft limit, send a SIGXCPU every second.
46175diff -urNp linux-2.6.32.7/kernel/power/hibernate.c linux-2.6.32.7/kernel/power/hibernate.c 46245diff -urNp linux-2.6.32.8/kernel/power/hibernate.c linux-2.6.32.8/kernel/power/hibernate.c
46176--- linux-2.6.32.7/kernel/power/hibernate.c 2010-01-25 13:50:10.000000000 -0500 46246--- linux-2.6.32.8/kernel/power/hibernate.c 2010-02-09 07:57:19.000000000 -0500
46177+++ linux-2.6.32.7/kernel/power/hibernate.c 2010-01-25 17:39:41.083426302 -0500 46247+++ linux-2.6.32.8/kernel/power/hibernate.c 2010-02-10 15:06:24.626028377 -0500
46178@@ -48,14 +48,14 @@ enum { 46248@@ -48,14 +48,14 @@ enum {
46179 46249
46180 static int hibernation_mode = HIBERNATION_SHUTDOWN; 46250 static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -46192,9 +46262,9 @@ diff -urNp linux-2.6.32.7/kernel/power/hibernate.c linux-2.6.32.7/kernel/power/h
46192 { 46262 {
46193 if (ops && !(ops->begin && ops->end && ops->pre_snapshot 46263 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
46194 && ops->prepare && ops->finish && ops->enter && ops->pre_restore 46264 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
46195diff -urNp linux-2.6.32.7/kernel/power/poweroff.c linux-2.6.32.7/kernel/power/poweroff.c 46265diff -urNp linux-2.6.32.8/kernel/power/poweroff.c linux-2.6.32.8/kernel/power/poweroff.c
46196--- linux-2.6.32.7/kernel/power/poweroff.c 2010-01-25 13:50:10.000000000 -0500 46266--- linux-2.6.32.8/kernel/power/poweroff.c 2010-02-09 07:57:19.000000000 -0500
46197+++ linux-2.6.32.7/kernel/power/poweroff.c 2010-01-25 17:39:41.083426302 -0500 46267+++ linux-2.6.32.8/kernel/power/poweroff.c 2010-02-10 15:06:24.626028377 -0500
46198@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof 46268@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
46199 .enable_mask = SYSRQ_ENABLE_BOOT, 46269 .enable_mask = SYSRQ_ENABLE_BOOT,
46200 }; 46270 };
@@ -46204,9 +46274,9 @@ diff -urNp linux-2.6.32.7/kernel/power/poweroff.c linux-2.6.32.7/kernel/power/po
46204 { 46274 {
46205 register_sysrq_key('o', &sysrq_poweroff_op); 46275 register_sysrq_key('o', &sysrq_poweroff_op);
46206 return 0; 46276 return 0;
46207diff -urNp linux-2.6.32.7/kernel/power/process.c linux-2.6.32.7/kernel/power/process.c 46277diff -urNp linux-2.6.32.8/kernel/power/process.c linux-2.6.32.8/kernel/power/process.c
46208--- linux-2.6.32.7/kernel/power/process.c 2010-01-25 13:50:10.000000000 -0500 46278--- linux-2.6.32.8/kernel/power/process.c 2010-02-09 07:57:19.000000000 -0500
46209+++ linux-2.6.32.7/kernel/power/process.c 2010-01-25 17:39:41.083426302 -0500 46279+++ linux-2.6.32.8/kernel/power/process.c 2010-02-10 15:06:24.626028377 -0500
46210@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ 46280@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
46211 struct timeval start, end; 46281 struct timeval start, end;
46212 u64 elapsed_csecs64; 46282 u64 elapsed_csecs64;
@@ -46246,9 +46316,9 @@ diff -urNp linux-2.6.32.7/kernel/power/process.c linux-2.6.32.7/kernel/power/pro
46246 46316
46247 do_gettimeofday(&end); 46317 do_gettimeofday(&end);
46248 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); 46318 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
46249diff -urNp linux-2.6.32.7/kernel/power/suspend.c linux-2.6.32.7/kernel/power/suspend.c 46319diff -urNp linux-2.6.32.8/kernel/power/suspend.c linux-2.6.32.8/kernel/power/suspend.c
46250--- linux-2.6.32.7/kernel/power/suspend.c 2010-01-25 13:50:10.000000000 -0500 46320--- linux-2.6.32.8/kernel/power/suspend.c 2010-02-09 07:57:19.000000000 -0500
46251+++ linux-2.6.32.7/kernel/power/suspend.c 2010-01-25 17:39:41.083426302 -0500 46321+++ linux-2.6.32.8/kernel/power/suspend.c 2010-02-10 15:06:24.626028377 -0500
46252@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M 46322@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
46253 [PM_SUSPEND_MEM] = "mem", 46323 [PM_SUSPEND_MEM] = "mem",
46254 }; 46324 };
@@ -46265,9 +46335,9 @@ diff -urNp linux-2.6.32.7/kernel/power/suspend.c linux-2.6.32.7/kernel/power/sus
46265 { 46335 {
46266 mutex_lock(&pm_mutex); 46336 mutex_lock(&pm_mutex);
46267 suspend_ops = ops; 46337 suspend_ops = ops;
46268diff -urNp linux-2.6.32.7/kernel/printk.c linux-2.6.32.7/kernel/printk.c 46338diff -urNp linux-2.6.32.8/kernel/printk.c linux-2.6.32.8/kernel/printk.c
46269--- linux-2.6.32.7/kernel/printk.c 2010-01-25 13:50:10.000000000 -0500 46339--- linux-2.6.32.8/kernel/printk.c 2010-02-09 07:57:19.000000000 -0500
46270+++ linux-2.6.32.7/kernel/printk.c 2010-01-25 17:39:41.083426302 -0500 46340+++ linux-2.6.32.8/kernel/printk.c 2010-02-10 15:06:24.626028377 -0500
46271@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf 46341@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
46272 char c; 46342 char c;
46273 int error = 0; 46343 int error = 0;
@@ -46280,9 +46350,9 @@ diff -urNp linux-2.6.32.7/kernel/printk.c linux-2.6.32.7/kernel/printk.c
46280 error = security_syslog(type); 46350 error = security_syslog(type);
46281 if (error) 46351 if (error)
46282 return error; 46352 return error;
46283diff -urNp linux-2.6.32.7/kernel/ptrace.c linux-2.6.32.7/kernel/ptrace.c 46353diff -urNp linux-2.6.32.8/kernel/ptrace.c linux-2.6.32.8/kernel/ptrace.c
46284--- linux-2.6.32.7/kernel/ptrace.c 2010-01-25 13:50:10.000000000 -0500 46354--- linux-2.6.32.8/kernel/ptrace.c 2010-02-09 07:57:19.000000000 -0500
46285+++ linux-2.6.32.7/kernel/ptrace.c 2010-01-25 17:39:41.084483897 -0500 46355+++ linux-2.6.32.8/kernel/ptrace.c 2010-02-10 15:06:24.626028377 -0500
46286@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru 46356@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
46287 cred->gid != tcred->egid || 46357 cred->gid != tcred->egid ||
46288 cred->gid != tcred->sgid || 46358 cred->gid != tcred->sgid ||
@@ -46353,9 +46423,9 @@ diff -urNp linux-2.6.32.7/kernel/ptrace.c linux-2.6.32.7/kernel/ptrace.c
46353 } 46423 }
46354 46424
46355 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) 46425 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
46356diff -urNp linux-2.6.32.7/kernel/relay.c linux-2.6.32.7/kernel/relay.c 46426diff -urNp linux-2.6.32.8/kernel/relay.c linux-2.6.32.8/kernel/relay.c
46357--- linux-2.6.32.7/kernel/relay.c 2010-01-25 13:50:10.000000000 -0500 46427--- linux-2.6.32.8/kernel/relay.c 2010-02-09 07:57:19.000000000 -0500
46358+++ linux-2.6.32.7/kernel/relay.c 2010-01-25 17:39:41.085160978 -0500 46428+++ linux-2.6.32.8/kernel/relay.c 2010-02-10 15:06:24.626028377 -0500
46359@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi 46429@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi
46360 return 0; 46430 return 0;
46361 46431
@@ -46365,9 +46435,9 @@ diff -urNp linux-2.6.32.7/kernel/relay.c linux-2.6.32.7/kernel/relay.c
46365 return ret; 46435 return ret;
46366 46436
46367 if (read_start + ret == nonpad_end) 46437 if (read_start + ret == nonpad_end)
46368diff -urNp linux-2.6.32.7/kernel/resource.c linux-2.6.32.7/kernel/resource.c 46438diff -urNp linux-2.6.32.8/kernel/resource.c linux-2.6.32.8/kernel/resource.c
46369--- linux-2.6.32.7/kernel/resource.c 2010-01-25 13:50:10.000000000 -0500 46439--- linux-2.6.32.8/kernel/resource.c 2010-02-09 07:57:19.000000000 -0500
46370+++ linux-2.6.32.7/kernel/resource.c 2010-01-25 17:39:41.085160978 -0500 46440+++ linux-2.6.32.8/kernel/resource.c 2010-02-10 15:06:24.626028377 -0500
46371@@ -132,8 +132,18 @@ static const struct file_operations proc 46441@@ -132,8 +132,18 @@ static const struct file_operations proc
46372 46442
46373 static int __init ioresources_init(void) 46443 static int __init ioresources_init(void)
@@ -46387,9 +46457,9 @@ diff -urNp linux-2.6.32.7/kernel/resource.c linux-2.6.32.7/kernel/resource.c
46387 return 0; 46457 return 0;
46388 } 46458 }
46389 __initcall(ioresources_init); 46459 __initcall(ioresources_init);
46390diff -urNp linux-2.6.32.7/kernel/sched.c linux-2.6.32.7/kernel/sched.c 46460diff -urNp linux-2.6.32.8/kernel/sched.c linux-2.6.32.8/kernel/sched.c
46391--- linux-2.6.32.7/kernel/sched.c 2010-01-25 20:04:15.598098059 -0500 46461--- linux-2.6.32.8/kernel/sched.c 2010-02-09 07:57:19.000000000 -0500
46392+++ linux-2.6.32.7/kernel/sched.c 2010-01-25 20:04:25.191109426 -0500 46462+++ linux-2.6.32.8/kernel/sched.c 2010-02-10 15:06:24.630031964 -0500
46393@@ -6090,6 +6090,8 @@ int can_nice(const struct task_struct *p 46463@@ -6090,6 +6090,8 @@ int can_nice(const struct task_struct *p
46394 /* convert nice value [19,-20] to rlimit style value [1,40] */ 46464 /* convert nice value [19,-20] to rlimit style value [1,40] */
46395 int nice_rlim = 20 - nice; 46465 int nice_rlim = 20 - nice;
@@ -46436,9 +46506,9 @@ diff -urNp linux-2.6.32.7/kernel/sched.c linux-2.6.32.7/kernel/sched.c
46436 }; 46506 };
46437 46507
46438 static struct ctl_table *sd_alloc_ctl_entry(int n) 46508 static struct ctl_table *sd_alloc_ctl_entry(int n)
46439diff -urNp linux-2.6.32.7/kernel/signal.c linux-2.6.32.7/kernel/signal.c 46509diff -urNp linux-2.6.32.8/kernel/signal.c linux-2.6.32.8/kernel/signal.c
46440--- linux-2.6.32.7/kernel/signal.c 2010-01-25 13:50:10.000000000 -0500 46510--- linux-2.6.32.8/kernel/signal.c 2010-02-09 07:57:19.000000000 -0500
46441+++ linux-2.6.32.7/kernel/signal.c 2010-01-25 17:39:41.089430610 -0500 46511+++ linux-2.6.32.8/kernel/signal.c 2010-02-10 15:06:24.630031964 -0500
46442@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc 46512@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc
46443 */ 46513 */
46444 user = get_uid(__task_cred(t)->user); 46514 user = get_uid(__task_cred(t)->user);
@@ -46491,9 +46561,9 @@ diff -urNp linux-2.6.32.7/kernel/signal.c linux-2.6.32.7/kernel/signal.c
46491 46561
46492 return ret; 46562 return ret;
46493 } 46563 }
46494diff -urNp linux-2.6.32.7/kernel/smp.c linux-2.6.32.7/kernel/smp.c 46564diff -urNp linux-2.6.32.8/kernel/smp.c linux-2.6.32.8/kernel/smp.c
46495--- linux-2.6.32.7/kernel/smp.c 2010-01-25 13:50:10.000000000 -0500 46565--- linux-2.6.32.8/kernel/smp.c 2010-02-09 07:57:19.000000000 -0500
46496+++ linux-2.6.32.7/kernel/smp.c 2010-01-25 17:39:41.089430610 -0500 46566+++ linux-2.6.32.8/kernel/smp.c 2010-02-10 15:06:24.630031964 -0500
46497@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void 46567@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void
46498 } 46568 }
46499 EXPORT_SYMBOL(smp_call_function); 46569 EXPORT_SYMBOL(smp_call_function);
@@ -46521,9 +46591,9 @@ diff -urNp linux-2.6.32.7/kernel/smp.c linux-2.6.32.7/kernel/smp.c
46521 { 46591 {
46522 spin_unlock_irq(&call_function.lock); 46592 spin_unlock_irq(&call_function.lock);
46523 } 46593 }
46524diff -urNp linux-2.6.32.7/kernel/softirq.c linux-2.6.32.7/kernel/softirq.c 46594diff -urNp linux-2.6.32.8/kernel/softirq.c linux-2.6.32.8/kernel/softirq.c
46525--- linux-2.6.32.7/kernel/softirq.c 2010-01-25 13:50:10.000000000 -0500 46595--- linux-2.6.32.8/kernel/softirq.c 2010-02-09 07:57:19.000000000 -0500
46526+++ linux-2.6.32.7/kernel/softirq.c 2010-01-25 17:39:41.089430610 -0500 46596+++ linux-2.6.32.8/kernel/softirq.c 2010-02-10 15:06:24.630031964 -0500
46527@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec 46597@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
46528 46598
46529 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); 46599 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -46533,9 +46603,9 @@ diff -urNp linux-2.6.32.7/kernel/softirq.c linux-2.6.32.7/kernel/softirq.c
46533 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL", 46603 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
46534 "TASKLET", "SCHED", "HRTIMER", "RCU" 46604 "TASKLET", "SCHED", "HRTIMER", "RCU"
46535 }; 46605 };
46536diff -urNp linux-2.6.32.7/kernel/sys.c linux-2.6.32.7/kernel/sys.c 46606diff -urNp linux-2.6.32.8/kernel/sys.c linux-2.6.32.8/kernel/sys.c
46537--- linux-2.6.32.7/kernel/sys.c 2010-01-25 13:50:10.000000000 -0500 46607--- linux-2.6.32.8/kernel/sys.c 2010-02-09 07:57:19.000000000 -0500
46538+++ linux-2.6.32.7/kernel/sys.c 2010-01-25 17:39:41.090393345 -0500 46608+++ linux-2.6.32.8/kernel/sys.c 2010-02-10 15:06:24.630031964 -0500
46539@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru 46609@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
46540 error = -EACCES; 46610 error = -EACCES;
46541 goto out; 46611 goto out;
@@ -46671,9 +46741,9 @@ diff -urNp linux-2.6.32.7/kernel/sys.c linux-2.6.32.7/kernel/sys.c
46671 error = -EINVAL; 46741 error = -EINVAL;
46672 break; 46742 break;
46673 } 46743 }
46674diff -urNp linux-2.6.32.7/kernel/sysctl.c linux-2.6.32.7/kernel/sysctl.c 46744diff -urNp linux-2.6.32.8/kernel/sysctl.c linux-2.6.32.8/kernel/sysctl.c
46675--- linux-2.6.32.7/kernel/sysctl.c 2010-01-25 13:50:10.000000000 -0500 46745--- linux-2.6.32.8/kernel/sysctl.c 2010-02-09 07:57:19.000000000 -0500
46676+++ linux-2.6.32.7/kernel/sysctl.c 2010-01-25 17:39:41.090393345 -0500 46746+++ linux-2.6.32.8/kernel/sysctl.c 2010-02-10 15:06:24.630031964 -0500
46677@@ -63,6 +63,13 @@ 46747@@ -63,6 +63,13 @@
46678 static int deprecated_sysctl_warning(struct __sysctl_args *args); 46748 static int deprecated_sysctl_warning(struct __sysctl_args *args);
46679 46749
@@ -46795,9 +46865,9 @@ diff -urNp linux-2.6.32.7/kernel/sysctl.c linux-2.6.32.7/kernel/sysctl.c
46795 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); 46865 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
46796 if (error) 46866 if (error)
46797 return error; 46867 return error;
46798diff -urNp linux-2.6.32.7/kernel/taskstats.c linux-2.6.32.7/kernel/taskstats.c 46868diff -urNp linux-2.6.32.8/kernel/taskstats.c linux-2.6.32.8/kernel/taskstats.c
46799--- linux-2.6.32.7/kernel/taskstats.c 2010-01-25 13:50:10.000000000 -0500 46869--- linux-2.6.32.8/kernel/taskstats.c 2010-02-09 07:57:19.000000000 -0500
46800+++ linux-2.6.32.7/kernel/taskstats.c 2010-01-25 17:39:41.091355913 -0500 46870+++ linux-2.6.32.8/kernel/taskstats.c 2010-02-10 15:06:24.630031964 -0500
46801@@ -26,9 +26,12 @@ 46871@@ -26,9 +26,12 @@
46802 #include <linux/cgroup.h> 46872 #include <linux/cgroup.h>
46803 #include <linux/fs.h> 46873 #include <linux/fs.h>
@@ -46821,9 +46891,9 @@ diff -urNp linux-2.6.32.7/kernel/taskstats.c linux-2.6.32.7/kernel/taskstats.c
46821 if (!alloc_cpumask_var(&mask, GFP_KERNEL)) 46891 if (!alloc_cpumask_var(&mask, GFP_KERNEL))
46822 return -ENOMEM; 46892 return -ENOMEM;
46823 46893
46824diff -urNp linux-2.6.32.7/kernel/time/tick-broadcast.c linux-2.6.32.7/kernel/time/tick-broadcast.c 46894diff -urNp linux-2.6.32.8/kernel/time/tick-broadcast.c linux-2.6.32.8/kernel/time/tick-broadcast.c
46825--- linux-2.6.32.7/kernel/time/tick-broadcast.c 2010-01-25 13:50:10.000000000 -0500 46895--- linux-2.6.32.8/kernel/time/tick-broadcast.c 2010-02-09 07:57:19.000000000 -0500
46826+++ linux-2.6.32.7/kernel/time/tick-broadcast.c 2010-01-25 17:39:41.091355913 -0500 46896+++ linux-2.6.32.8/kernel/time/tick-broadcast.c 2010-02-10 15:06:24.633978892 -0500
46827@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl 46897@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
46828 * then clear the broadcast bit. 46898 * then clear the broadcast bit.
46829 */ 46899 */
@@ -46833,9 +46903,9 @@ diff -urNp linux-2.6.32.7/kernel/time/tick-broadcast.c linux-2.6.32.7/kernel/tim
46833 46903
46834 cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); 46904 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
46835 tick_broadcast_clear_oneshot(cpu); 46905 tick_broadcast_clear_oneshot(cpu);
46836diff -urNp linux-2.6.32.7/kernel/time.c linux-2.6.32.7/kernel/time.c 46906diff -urNp linux-2.6.32.8/kernel/time.c linux-2.6.32.8/kernel/time.c
46837--- linux-2.6.32.7/kernel/time.c 2010-01-25 13:50:10.000000000 -0500 46907--- linux-2.6.32.8/kernel/time.c 2010-02-09 07:57:19.000000000 -0500
46838+++ linux-2.6.32.7/kernel/time.c 2010-01-25 17:39:41.091355913 -0500 46908+++ linux-2.6.32.8/kernel/time.c 2010-02-10 15:06:24.633978892 -0500
46839@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, 46909@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *,
46840 return err; 46910 return err;
46841 46911
@@ -46873,9 +46943,9 @@ diff -urNp linux-2.6.32.7/kernel/time.c linux-2.6.32.7/kernel/time.c
46873 { 46943 {
46874 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) 46944 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
46875 return (USEC_PER_SEC / HZ) * j; 46945 return (USEC_PER_SEC / HZ) * j;
46876diff -urNp linux-2.6.32.7/kernel/trace/ftrace.c linux-2.6.32.7/kernel/trace/ftrace.c 46946diff -urNp linux-2.6.32.8/kernel/trace/ftrace.c linux-2.6.32.8/kernel/trace/ftrace.c
46877--- linux-2.6.32.7/kernel/trace/ftrace.c 2010-01-25 13:50:10.000000000 -0500 46947--- linux-2.6.32.8/kernel/trace/ftrace.c 2010-02-09 07:57:19.000000000 -0500
46878+++ linux-2.6.32.7/kernel/trace/ftrace.c 2010-01-25 17:39:41.092433407 -0500 46948+++ linux-2.6.32.8/kernel/trace/ftrace.c 2010-02-10 15:06:24.633978892 -0500
46879@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, 46949@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod,
46880 46950
46881 ip = rec->ip; 46951 ip = rec->ip;
@@ -46897,9 +46967,9 @@ diff -urNp linux-2.6.32.7/kernel/trace/ftrace.c linux-2.6.32.7/kernel/trace/ftra
46897 } 46967 }
46898 46968
46899 /* 46969 /*
46900diff -urNp linux-2.6.32.7/kernel/trace/Kconfig linux-2.6.32.7/kernel/trace/Kconfig 46970diff -urNp linux-2.6.32.8/kernel/trace/Kconfig linux-2.6.32.8/kernel/trace/Kconfig
46901--- linux-2.6.32.7/kernel/trace/Kconfig 2010-01-25 13:50:10.000000000 -0500 46971--- linux-2.6.32.8/kernel/trace/Kconfig 2010-02-09 07:57:19.000000000 -0500
46902+++ linux-2.6.32.7/kernel/trace/Kconfig 2010-01-25 17:39:41.092433407 -0500 46972+++ linux-2.6.32.8/kernel/trace/Kconfig 2010-02-10 15:06:24.633978892 -0500
46903@@ -126,6 +126,7 @@ if FTRACE 46973@@ -126,6 +126,7 @@ if FTRACE
46904 config FUNCTION_TRACER 46974 config FUNCTION_TRACER
46905 bool "Kernel Function Tracer" 46975 bool "Kernel Function Tracer"
@@ -46916,9 +46986,9 @@ diff -urNp linux-2.6.32.7/kernel/trace/Kconfig linux-2.6.32.7/kernel/trace/Kconf
46916 select FUNCTION_TRACER 46986 select FUNCTION_TRACER
46917 select STACKTRACE 46987 select STACKTRACE
46918 select KALLSYMS 46988 select KALLSYMS
46919diff -urNp linux-2.6.32.7/kernel/trace/trace.c linux-2.6.32.7/kernel/trace/trace.c 46989diff -urNp linux-2.6.32.8/kernel/trace/trace.c linux-2.6.32.8/kernel/trace/trace.c
46920--- linux-2.6.32.7/kernel/trace/trace.c 2010-01-25 13:50:10.000000000 -0500 46990--- linux-2.6.32.8/kernel/trace/trace.c 2010-02-09 07:57:19.000000000 -0500
46921+++ linux-2.6.32.7/kernel/trace/trace.c 2010-01-25 17:39:41.093259491 -0500 46991+++ linux-2.6.32.8/kernel/trace/trace.c 2010-02-10 15:06:24.633978892 -0500
46922@@ -3792,10 +3792,9 @@ static const struct file_operations trac 46992@@ -3792,10 +3792,9 @@ static const struct file_operations trac
46923 }; 46993 };
46924 #endif 46994 #endif
@@ -46943,9 +47013,9 @@ diff -urNp linux-2.6.32.7/kernel/trace/trace.c linux-2.6.32.7/kernel/trace/trace
46943 static int once; 47013 static int once;
46944 struct dentry *d_tracer; 47014 struct dentry *d_tracer;
46945 47015
46946diff -urNp linux-2.6.32.7/kernel/trace/trace_events.c linux-2.6.32.7/kernel/trace/trace_events.c 47016diff -urNp linux-2.6.32.8/kernel/trace/trace_events.c linux-2.6.32.8/kernel/trace/trace_events.c
46947--- linux-2.6.32.7/kernel/trace/trace_events.c 2010-01-25 13:50:10.000000000 -0500 47017--- linux-2.6.32.8/kernel/trace/trace_events.c 2010-02-09 07:57:19.000000000 -0500
46948+++ linux-2.6.32.7/kernel/trace/trace_events.c 2010-01-25 17:39:41.093259491 -0500 47018+++ linux-2.6.32.8/kernel/trace/trace_events.c 2010-02-10 15:06:24.633978892 -0500
46949@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list 47019@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
46950 * Modules must own their file_operations to keep up with 47020 * Modules must own their file_operations to keep up with
46951 * reference counting. 47021 * reference counting.
@@ -46955,9 +47025,9 @@ diff -urNp linux-2.6.32.7/kernel/trace/trace_events.c linux-2.6.32.7/kernel/trac
46955 struct ftrace_module_file_ops { 47025 struct ftrace_module_file_ops {
46956 struct list_head list; 47026 struct list_head list;
46957 struct module *mod; 47027 struct module *mod;
46958diff -urNp linux-2.6.32.7/kernel/trace/trace_output.c linux-2.6.32.7/kernel/trace/trace_output.c 47028diff -urNp linux-2.6.32.8/kernel/trace/trace_output.c linux-2.6.32.8/kernel/trace/trace_output.c
46959--- linux-2.6.32.7/kernel/trace/trace_output.c 2010-01-25 13:50:10.000000000 -0500 47029--- linux-2.6.32.8/kernel/trace/trace_output.c 2010-02-09 07:57:19.000000000 -0500
46960+++ linux-2.6.32.7/kernel/trace/trace_output.c 2010-01-25 17:39:41.094167076 -0500 47030+++ linux-2.6.32.8/kernel/trace/trace_output.c 2010-02-10 15:06:24.633978892 -0500
46961@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, 47031@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
46962 return 0; 47032 return 0;
46963 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); 47033 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -46967,9 +47037,9 @@ diff -urNp linux-2.6.32.7/kernel/trace/trace_output.c linux-2.6.32.7/kernel/trac
46967 if (p) { 47037 if (p) {
46968 s->len = p - s->buffer; 47038 s->len = p - s->buffer;
46969 return 1; 47039 return 1;
46970diff -urNp linux-2.6.32.7/kernel/trace/trace_stack.c linux-2.6.32.7/kernel/trace/trace_stack.c 47040diff -urNp linux-2.6.32.8/kernel/trace/trace_stack.c linux-2.6.32.8/kernel/trace/trace_stack.c
46971--- linux-2.6.32.7/kernel/trace/trace_stack.c 2010-01-25 13:50:10.000000000 -0500 47041--- linux-2.6.32.8/kernel/trace/trace_stack.c 2010-02-09 07:57:19.000000000 -0500
46972+++ linux-2.6.32.7/kernel/trace/trace_stack.c 2010-01-25 17:39:41.094167076 -0500 47042+++ linux-2.6.32.8/kernel/trace/trace_stack.c 2010-02-10 15:06:24.633978892 -0500
46973@@ -50,7 +50,7 @@ static inline void check_stack(void) 47043@@ -50,7 +50,7 @@ static inline void check_stack(void)
46974 return; 47044 return;
46975 47045
@@ -46979,9 +47049,9 @@ diff -urNp linux-2.6.32.7/kernel/trace/trace_stack.c linux-2.6.32.7/kernel/trace
46979 return; 47049 return;
46980 47050
46981 local_irq_save(flags); 47051 local_irq_save(flags);
46982diff -urNp linux-2.6.32.7/kernel/utsname_sysctl.c linux-2.6.32.7/kernel/utsname_sysctl.c 47052diff -urNp linux-2.6.32.8/kernel/utsname_sysctl.c linux-2.6.32.8/kernel/utsname_sysctl.c
46983--- linux-2.6.32.7/kernel/utsname_sysctl.c 2010-01-25 13:50:10.000000000 -0500 47053--- linux-2.6.32.8/kernel/utsname_sysctl.c 2010-02-09 07:57:19.000000000 -0500
46984+++ linux-2.6.32.7/kernel/utsname_sysctl.c 2010-01-25 17:39:41.094167076 -0500 47054+++ linux-2.6.32.8/kernel/utsname_sysctl.c 2010-02-10 15:06:24.633978892 -0500
46985@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] 47055@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
46986 .proc_handler = proc_do_uts_string, 47056 .proc_handler = proc_do_uts_string,
46987 .strategy = sysctl_uts_string, 47057 .strategy = sysctl_uts_string,
@@ -47000,9 +47070,9 @@ diff -urNp linux-2.6.32.7/kernel/utsname_sysctl.c linux-2.6.32.7/kernel/utsname_
47000 }; 47070 };
47001 47071
47002 static int __init utsname_sysctl_init(void) 47072 static int __init utsname_sysctl_init(void)
47003diff -urNp linux-2.6.32.7/lib/bug.c linux-2.6.32.7/lib/bug.c 47073diff -urNp linux-2.6.32.8/lib/bug.c linux-2.6.32.8/lib/bug.c
47004--- linux-2.6.32.7/lib/bug.c 2010-01-25 13:50:10.000000000 -0500 47074--- linux-2.6.32.8/lib/bug.c 2010-02-09 07:57:19.000000000 -0500
47005+++ linux-2.6.32.7/lib/bug.c 2010-01-25 17:39:41.094167076 -0500 47075+++ linux-2.6.32.8/lib/bug.c 2010-02-10 15:06:24.633978892 -0500
47006@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l 47076@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
47007 return BUG_TRAP_TYPE_NONE; 47077 return BUG_TRAP_TYPE_NONE;
47008 47078
@@ -47012,9 +47082,9 @@ diff -urNp linux-2.6.32.7/lib/bug.c linux-2.6.32.7/lib/bug.c
47012 47082
47013 printk(KERN_EMERG "------------[ cut here ]------------\n"); 47083 printk(KERN_EMERG "------------[ cut here ]------------\n");
47014 47084
47015diff -urNp linux-2.6.32.7/lib/debugobjects.c linux-2.6.32.7/lib/debugobjects.c 47085diff -urNp linux-2.6.32.8/lib/debugobjects.c linux-2.6.32.8/lib/debugobjects.c
47016--- linux-2.6.32.7/lib/debugobjects.c 2010-01-25 13:50:10.000000000 -0500 47086--- linux-2.6.32.8/lib/debugobjects.c 2010-02-09 07:57:19.000000000 -0500
47017+++ linux-2.6.32.7/lib/debugobjects.c 2010-01-25 17:39:41.094167076 -0500 47087+++ linux-2.6.32.8/lib/debugobjects.c 2010-02-10 15:06:24.633978892 -0500
47018@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi 47088@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
47019 if (limit > 4) 47089 if (limit > 4)
47020 return; 47090 return;
@@ -47024,9 +47094,9 @@ diff -urNp linux-2.6.32.7/lib/debugobjects.c linux-2.6.32.7/lib/debugobjects.c
47024 if (is_on_stack == onstack) 47094 if (is_on_stack == onstack)
47025 return; 47095 return;
47026 47096
47027diff -urNp linux-2.6.32.7/lib/dma-debug.c linux-2.6.32.7/lib/dma-debug.c 47097diff -urNp linux-2.6.32.8/lib/dma-debug.c linux-2.6.32.8/lib/dma-debug.c
47028--- linux-2.6.32.7/lib/dma-debug.c 2010-01-25 13:50:10.000000000 -0500 47098--- linux-2.6.32.8/lib/dma-debug.c 2010-02-09 07:57:19.000000000 -0500
47029+++ linux-2.6.32.7/lib/dma-debug.c 2010-01-25 17:39:41.094167076 -0500 47099+++ linux-2.6.32.8/lib/dma-debug.c 2010-02-10 15:06:24.633978892 -0500
47030@@ -861,7 +861,7 @@ out: 47100@@ -861,7 +861,7 @@ out:
47031 47101
47032 static void check_for_stack(struct device *dev, void *addr) 47102 static void check_for_stack(struct device *dev, void *addr)
@@ -47036,9 +47106,9 @@ diff -urNp linux-2.6.32.7/lib/dma-debug.c linux-2.6.32.7/lib/dma-debug.c
47036 err_printk(dev, NULL, "DMA-API: device driver maps memory from" 47106 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
47037 "stack [addr=%p]\n", addr); 47107 "stack [addr=%p]\n", addr);
47038 } 47108 }
47039diff -urNp linux-2.6.32.7/lib/inflate.c linux-2.6.32.7/lib/inflate.c 47109diff -urNp linux-2.6.32.8/lib/inflate.c linux-2.6.32.8/lib/inflate.c
47040--- linux-2.6.32.7/lib/inflate.c 2010-01-25 13:50:10.000000000 -0500 47110--- linux-2.6.32.8/lib/inflate.c 2010-02-09 07:57:19.000000000 -0500
47041+++ linux-2.6.32.7/lib/inflate.c 2010-01-25 17:39:41.095431188 -0500 47111+++ linux-2.6.32.8/lib/inflate.c 2010-02-10 15:06:24.633978892 -0500
47042@@ -266,7 +266,7 @@ static void free(void *where) 47112@@ -266,7 +266,7 @@ static void free(void *where)
47043 malloc_ptr = free_mem_ptr; 47113 malloc_ptr = free_mem_ptr;
47044 } 47114 }
@@ -47048,9 +47118,9 @@ diff -urNp linux-2.6.32.7/lib/inflate.c linux-2.6.32.7/lib/inflate.c
47048 #define free(a) kfree(a) 47118 #define free(a) kfree(a)
47049 #endif 47119 #endif
47050 47120
47051diff -urNp linux-2.6.32.7/lib/Kconfig.debug linux-2.6.32.7/lib/Kconfig.debug 47121diff -urNp linux-2.6.32.8/lib/Kconfig.debug linux-2.6.32.8/lib/Kconfig.debug
47052--- linux-2.6.32.7/lib/Kconfig.debug 2010-01-25 13:50:10.000000000 -0500 47122--- linux-2.6.32.8/lib/Kconfig.debug 2010-02-09 07:57:19.000000000 -0500
47053+++ linux-2.6.32.7/lib/Kconfig.debug 2010-01-25 17:39:41.095431188 -0500 47123+++ linux-2.6.32.8/lib/Kconfig.debug 2010-02-10 15:06:24.633978892 -0500
47054@@ -905,7 +905,7 @@ config LATENCYTOP 47124@@ -905,7 +905,7 @@ config LATENCYTOP
47055 select STACKTRACE 47125 select STACKTRACE
47056 select SCHEDSTATS 47126 select SCHEDSTATS
@@ -47060,9 +47130,9 @@ diff -urNp linux-2.6.32.7/lib/Kconfig.debug linux-2.6.32.7/lib/Kconfig.debug
47060 help 47130 help
47061 Enable this option if you want to use the LatencyTOP tool 47131 Enable this option if you want to use the LatencyTOP tool
47062 to find out which userspace is blocking on what kernel operations. 47132 to find out which userspace is blocking on what kernel operations.
47063diff -urNp linux-2.6.32.7/lib/kobject.c linux-2.6.32.7/lib/kobject.c 47133diff -urNp linux-2.6.32.8/lib/kobject.c linux-2.6.32.8/lib/kobject.c
47064--- linux-2.6.32.7/lib/kobject.c 2010-01-25 13:50:10.000000000 -0500 47134--- linux-2.6.32.8/lib/kobject.c 2010-02-09 07:57:19.000000000 -0500
47065+++ linux-2.6.32.7/lib/kobject.c 2010-01-25 17:39:41.096167640 -0500 47135+++ linux-2.6.32.8/lib/kobject.c 2010-02-10 15:06:24.638045355 -0500
47066@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko 47136@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
47067 return ret; 47137 return ret;
47068 } 47138 }
@@ -47090,9 +47160,9 @@ diff -urNp linux-2.6.32.7/lib/kobject.c linux-2.6.32.7/lib/kobject.c
47090 struct kobject *parent_kobj) 47160 struct kobject *parent_kobj)
47091 { 47161 {
47092 struct kset *kset; 47162 struct kset *kset;
47093diff -urNp linux-2.6.32.7/lib/kobject_uevent.c linux-2.6.32.7/lib/kobject_uevent.c 47163diff -urNp linux-2.6.32.8/lib/kobject_uevent.c linux-2.6.32.8/lib/kobject_uevent.c
47094--- linux-2.6.32.7/lib/kobject_uevent.c 2010-01-25 13:50:10.000000000 -0500 47164--- linux-2.6.32.8/lib/kobject_uevent.c 2010-02-09 07:57:19.000000000 -0500
47095+++ linux-2.6.32.7/lib/kobject_uevent.c 2010-01-25 17:39:41.096167640 -0500 47165+++ linux-2.6.32.8/lib/kobject_uevent.c 2010-02-10 15:06:24.638045355 -0500
47096@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k 47166@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
47097 const char *subsystem; 47167 const char *subsystem;
47098 struct kobject *top_kobj; 47168 struct kobject *top_kobj;
@@ -47102,9 +47172,9 @@ diff -urNp linux-2.6.32.7/lib/kobject_uevent.c linux-2.6.32.7/lib/kobject_uevent
47102 u64 seq; 47172 u64 seq;
47103 int i = 0; 47173 int i = 0;
47104 int retval = 0; 47174 int retval = 0;
47105diff -urNp linux-2.6.32.7/lib/parser.c linux-2.6.32.7/lib/parser.c 47175diff -urNp linux-2.6.32.8/lib/parser.c linux-2.6.32.8/lib/parser.c
47106--- linux-2.6.32.7/lib/parser.c 2010-01-25 13:50:10.000000000 -0500 47176--- linux-2.6.32.8/lib/parser.c 2010-02-09 07:57:19.000000000 -0500
47107+++ linux-2.6.32.7/lib/parser.c 2010-01-25 17:39:41.096167640 -0500 47177+++ linux-2.6.32.8/lib/parser.c 2010-02-10 15:06:24.638045355 -0500
47108@@ -126,7 +126,7 @@ static int match_number(substring_t *s, 47178@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
47109 char *buf; 47179 char *buf;
47110 int ret; 47180 int ret;
@@ -47114,9 +47184,9 @@ diff -urNp linux-2.6.32.7/lib/parser.c linux-2.6.32.7/lib/parser.c
47114 if (!buf) 47184 if (!buf)
47115 return -ENOMEM; 47185 return -ENOMEM;
47116 memcpy(buf, s->from, s->to - s->from); 47186 memcpy(buf, s->from, s->to - s->from);
47117diff -urNp linux-2.6.32.7/lib/radix-tree.c linux-2.6.32.7/lib/radix-tree.c 47187diff -urNp linux-2.6.32.8/lib/radix-tree.c linux-2.6.32.8/lib/radix-tree.c
47118--- linux-2.6.32.7/lib/radix-tree.c 2010-01-25 13:50:10.000000000 -0500 47188--- linux-2.6.32.8/lib/radix-tree.c 2010-02-09 07:57:19.000000000 -0500
47119+++ linux-2.6.32.7/lib/radix-tree.c 2010-01-25 17:39:41.096167640 -0500 47189+++ linux-2.6.32.8/lib/radix-tree.c 2010-02-10 15:06:24.638045355 -0500
47120@@ -81,7 +81,7 @@ struct radix_tree_preload { 47190@@ -81,7 +81,7 @@ struct radix_tree_preload {
47121 int nr; 47191 int nr;
47122 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; 47192 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -47126,9 +47196,9 @@ diff -urNp linux-2.6.32.7/lib/radix-tree.c linux-2.6.32.7/lib/radix-tree.c
47126 47196
47127 static inline gfp_t root_gfp_mask(struct radix_tree_root *root) 47197 static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
47128 { 47198 {
47129diff -urNp linux-2.6.32.7/lib/random32.c linux-2.6.32.7/lib/random32.c 47199diff -urNp linux-2.6.32.8/lib/random32.c linux-2.6.32.8/lib/random32.c
47130--- linux-2.6.32.7/lib/random32.c 2010-01-25 13:50:10.000000000 -0500 47200--- linux-2.6.32.8/lib/random32.c 2010-02-09 07:57:19.000000000 -0500
47131+++ linux-2.6.32.7/lib/random32.c 2010-01-25 17:39:41.096167640 -0500 47201+++ linux-2.6.32.8/lib/random32.c 2010-02-10 15:06:24.638045355 -0500
47132@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * 47202@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
47133 */ 47203 */
47134 static inline u32 __seed(u32 x, u32 m) 47204 static inline u32 __seed(u32 x, u32 m)
@@ -47138,14 +47208,14 @@ diff -urNp linux-2.6.32.7/lib/random32.c linux-2.6.32.7/lib/random32.c
47138 } 47208 }
47139 47209
47140 /** 47210 /**
47141diff -urNp linux-2.6.32.7/localversion-grsec linux-2.6.32.7/localversion-grsec 47211diff -urNp linux-2.6.32.8/localversion-grsec linux-2.6.32.8/localversion-grsec
47142--- linux-2.6.32.7/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 47212--- linux-2.6.32.8/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
47143+++ linux-2.6.32.7/localversion-grsec 2010-01-25 17:39:41.097296689 -0500 47213+++ linux-2.6.32.8/localversion-grsec 2010-02-10 15:06:24.638045355 -0500
47144@@ -0,0 +1 @@ 47214@@ -0,0 +1 @@
47145+-grsec 47215+-grsec
47146diff -urNp linux-2.6.32.7/Makefile linux-2.6.32.7/Makefile 47216diff -urNp linux-2.6.32.8/Makefile linux-2.6.32.8/Makefile
47147--- linux-2.6.32.7/Makefile 2010-01-25 20:04:14.527344760 -0500 47217--- linux-2.6.32.8/Makefile 2010-02-09 07:57:19.000000000 -0500
47148+++ linux-2.6.32.7/Makefile 2010-01-25 20:04:24.352555064 -0500 47218+++ linux-2.6.32.8/Makefile 2010-02-10 15:06:24.638045355 -0500
47149@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" 47219@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
47150 47220
47151 HOSTCC = gcc 47221 HOSTCC = gcc
@@ -47166,9 +47236,9 @@ diff -urNp linux-2.6.32.7/Makefile linux-2.6.32.7/Makefile
47166 47236
47167 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ 47237 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
47168 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ 47238 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
47169diff -urNp linux-2.6.32.7/mm/filemap.c linux-2.6.32.7/mm/filemap.c 47239diff -urNp linux-2.6.32.8/mm/filemap.c linux-2.6.32.8/mm/filemap.c
47170--- linux-2.6.32.7/mm/filemap.c 2010-01-25 13:50:10.000000000 -0500 47240--- linux-2.6.32.8/mm/filemap.c 2010-02-09 07:57:19.000000000 -0500
47171+++ linux-2.6.32.7/mm/filemap.c 2010-01-25 17:39:41.097296689 -0500 47241+++ linux-2.6.32.8/mm/filemap.c 2010-02-10 15:06:24.638045355 -0500
47172@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file 47242@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file
47173 struct address_space *mapping = file->f_mapping; 47243 struct address_space *mapping = file->f_mapping;
47174 47244
@@ -47178,7 +47248,7 @@ diff -urNp linux-2.6.32.7/mm/filemap.c linux-2.6.32.7/mm/filemap.c
47178 file_accessed(file); 47248 file_accessed(file);
47179 vma->vm_ops = &generic_file_vm_ops; 47249 vma->vm_ops = &generic_file_vm_ops;
47180 vma->vm_flags |= VM_CAN_NONLINEAR; 47250 vma->vm_flags |= VM_CAN_NONLINEAR;
47181@@ -1982,6 +1982,7 @@ inline int generic_write_checks(struct f 47251@@ -2018,6 +2018,7 @@ inline int generic_write_checks(struct f
47182 *pos = i_size_read(inode); 47252 *pos = i_size_read(inode);
47183 47253
47184 if (limit != RLIM_INFINITY) { 47254 if (limit != RLIM_INFINITY) {
@@ -47186,9 +47256,9 @@ diff -urNp linux-2.6.32.7/mm/filemap.c linux-2.6.32.7/mm/filemap.c
47186 if (*pos >= limit) { 47256 if (*pos >= limit) {
47187 send_sig(SIGXFSZ, current, 0); 47257 send_sig(SIGXFSZ, current, 0);
47188 return -EFBIG; 47258 return -EFBIG;
47189diff -urNp linux-2.6.32.7/mm/fremap.c linux-2.6.32.7/mm/fremap.c 47259diff -urNp linux-2.6.32.8/mm/fremap.c linux-2.6.32.8/mm/fremap.c
47190--- linux-2.6.32.7/mm/fremap.c 2010-01-25 13:50:10.000000000 -0500 47260--- linux-2.6.32.8/mm/fremap.c 2010-02-09 07:57:19.000000000 -0500
47191+++ linux-2.6.32.7/mm/fremap.c 2010-01-25 17:39:41.098425899 -0500 47261+++ linux-2.6.32.8/mm/fremap.c 2010-02-10 15:06:24.638045355 -0500
47192@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign 47262@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
47193 retry: 47263 retry:
47194 vma = find_vma(mm, start); 47264 vma = find_vma(mm, start);
@@ -47201,9 +47271,9 @@ diff -urNp linux-2.6.32.7/mm/fremap.c linux-2.6.32.7/mm/fremap.c
47201 /* 47271 /*
47202 * Make sure the vma is shared, that it supports prefaulting, 47272 * Make sure the vma is shared, that it supports prefaulting,
47203 * and that the remapped range is valid and fully within 47273 * and that the remapped range is valid and fully within
47204diff -urNp linux-2.6.32.7/mm/highmem.c linux-2.6.32.7/mm/highmem.c 47274diff -urNp linux-2.6.32.8/mm/highmem.c linux-2.6.32.8/mm/highmem.c
47205--- linux-2.6.32.7/mm/highmem.c 2010-01-25 13:50:10.000000000 -0500 47275--- linux-2.6.32.8/mm/highmem.c 2010-02-09 07:57:19.000000000 -0500
47206+++ linux-2.6.32.7/mm/highmem.c 2010-01-25 17:39:41.098425899 -0500 47276+++ linux-2.6.32.8/mm/highmem.c 2010-02-10 15:06:24.638045355 -0500
47207@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) 47277@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
47208 * So no dangers, even with speculative execution. 47278 * So no dangers, even with speculative execution.
47209 */ 47279 */
@@ -47229,9 +47299,9 @@ diff -urNp linux-2.6.32.7/mm/highmem.c linux-2.6.32.7/mm/highmem.c
47229 pkmap_count[last_pkmap_nr] = 1; 47299 pkmap_count[last_pkmap_nr] = 1;
47230 set_page_address(page, (void *)vaddr); 47300 set_page_address(page, (void *)vaddr);
47231 47301
47232diff -urNp linux-2.6.32.7/mm/hugetlb.c linux-2.6.32.7/mm/hugetlb.c 47302diff -urNp linux-2.6.32.8/mm/hugetlb.c linux-2.6.32.8/mm/hugetlb.c
47233--- linux-2.6.32.7/mm/hugetlb.c 2010-01-25 13:50:10.000000000 -0500 47303--- linux-2.6.32.8/mm/hugetlb.c 2010-02-09 07:57:19.000000000 -0500
47234+++ linux-2.6.32.7/mm/hugetlb.c 2010-01-25 17:39:41.098425899 -0500 47304+++ linux-2.6.32.8/mm/hugetlb.c 2010-02-10 15:06:24.638045355 -0500
47235@@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s 47305@@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s
47236 return 1; 47306 return 1;
47237 } 47307 }
@@ -47311,9 +47381,9 @@ diff -urNp linux-2.6.32.7/mm/hugetlb.c linux-2.6.32.7/mm/hugetlb.c
47311 ptep = huge_pte_alloc(mm, address, huge_page_size(h)); 47381 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
47312 if (!ptep) 47382 if (!ptep)
47313 return VM_FAULT_OOM; 47383 return VM_FAULT_OOM;
47314diff -urNp linux-2.6.32.7/mm/Kconfig linux-2.6.32.7/mm/Kconfig 47384diff -urNp linux-2.6.32.8/mm/Kconfig linux-2.6.32.8/mm/Kconfig
47315--- linux-2.6.32.7/mm/Kconfig 2010-01-25 13:50:10.000000000 -0500 47385--- linux-2.6.32.8/mm/Kconfig 2010-02-09 07:57:19.000000000 -0500
47316+++ linux-2.6.32.7/mm/Kconfig 2010-01-25 17:39:41.099202007 -0500 47386+++ linux-2.6.32.8/mm/Kconfig 2010-02-10 15:06:24.638045355 -0500
47317@@ -228,7 +228,7 @@ config KSM 47387@@ -228,7 +228,7 @@ config KSM
47318 config DEFAULT_MMAP_MIN_ADDR 47388 config DEFAULT_MMAP_MIN_ADDR
47319 int "Low address space to protect from user allocation" 47389 int "Low address space to protect from user allocation"
@@ -47323,9 +47393,9 @@ diff -urNp linux-2.6.32.7/mm/Kconfig linux-2.6.32.7/mm/Kconfig
47323 help 47393 help
47324 This is the portion of low virtual memory which should be protected 47394 This is the portion of low virtual memory which should be protected
47325 from userspace allocation. Keeping a user from writing to low pages 47395 from userspace allocation. Keeping a user from writing to low pages
47326diff -urNp linux-2.6.32.7/mm/maccess.c linux-2.6.32.7/mm/maccess.c 47396diff -urNp linux-2.6.32.8/mm/maccess.c linux-2.6.32.8/mm/maccess.c
47327--- linux-2.6.32.7/mm/maccess.c 2010-01-25 13:50:10.000000000 -0500 47397--- linux-2.6.32.8/mm/maccess.c 2010-02-09 07:57:19.000000000 -0500
47328+++ linux-2.6.32.7/mm/maccess.c 2010-01-25 17:39:41.099202007 -0500 47398+++ linux-2.6.32.8/mm/maccess.c 2010-02-10 15:06:24.638045355 -0500
47329@@ -14,7 +14,7 @@ 47399@@ -14,7 +14,7 @@
47330 * Safely read from address @src to the buffer at @dst. If a kernel fault 47400 * Safely read from address @src to the buffer at @dst. If a kernel fault
47331 * happens, handle that and return -EFAULT. 47401 * happens, handle that and return -EFAULT.
@@ -47344,9 +47414,9 @@ diff -urNp linux-2.6.32.7/mm/maccess.c linux-2.6.32.7/mm/maccess.c
47344 { 47414 {
47345 long ret; 47415 long ret;
47346 mm_segment_t old_fs = get_fs(); 47416 mm_segment_t old_fs = get_fs();
47347diff -urNp linux-2.6.32.7/mm/madvise.c linux-2.6.32.7/mm/madvise.c 47417diff -urNp linux-2.6.32.8/mm/madvise.c linux-2.6.32.8/mm/madvise.c
47348--- linux-2.6.32.7/mm/madvise.c 2010-01-25 13:50:10.000000000 -0500 47418--- linux-2.6.32.8/mm/madvise.c 2010-02-09 07:57:19.000000000 -0500
47349+++ linux-2.6.32.7/mm/madvise.c 2010-01-25 17:39:41.099202007 -0500 47419+++ linux-2.6.32.8/mm/madvise.c 2010-02-10 15:06:24.638045355 -0500
47350@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a 47420@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
47351 pgoff_t pgoff; 47421 pgoff_t pgoff;
47352 unsigned long new_flags = vma->vm_flags; 47422 unsigned long new_flags = vma->vm_flags;
@@ -47423,9 +47493,9 @@ diff -urNp linux-2.6.32.7/mm/madvise.c linux-2.6.32.7/mm/madvise.c
47423 error = 0; 47493 error = 0;
47424 if (end == start) 47494 if (end == start)
47425 goto out; 47495 goto out;
47426diff -urNp linux-2.6.32.7/mm/memory.c linux-2.6.32.7/mm/memory.c 47496diff -urNp linux-2.6.32.8/mm/memory.c linux-2.6.32.8/mm/memory.c
47427--- linux-2.6.32.7/mm/memory.c 2010-01-25 13:50:10.000000000 -0500 47497--- linux-2.6.32.8/mm/memory.c 2010-02-09 07:57:19.000000000 -0500
47428+++ linux-2.6.32.7/mm/memory.c 2010-01-25 17:39:41.099202007 -0500 47498+++ linux-2.6.32.8/mm/memory.c 2010-02-10 15:06:24.638045355 -0500
47429@@ -48,6 +48,7 @@ 47499@@ -48,6 +48,7 @@
47430 #include <linux/ksm.h> 47500 #include <linux/ksm.h>
47431 #include <linux/rmap.h> 47501 #include <linux/rmap.h>
@@ -47830,9 +47900,9 @@ diff -urNp linux-2.6.32.7/mm/memory.c linux-2.6.32.7/mm/memory.c
47830 /* 47900 /*
47831 * Make sure the vDSO gets into every core dump. 47901 * Make sure the vDSO gets into every core dump.
47832 * Dumping its contents makes post-mortem fully interpretable later 47902 * Dumping its contents makes post-mortem fully interpretable later
47833diff -urNp linux-2.6.32.7/mm/memory-failure.c linux-2.6.32.7/mm/memory-failure.c 47903diff -urNp linux-2.6.32.8/mm/memory-failure.c linux-2.6.32.8/mm/memory-failure.c
47834--- linux-2.6.32.7/mm/memory-failure.c 2010-01-25 13:50:10.000000000 -0500 47904--- linux-2.6.32.8/mm/memory-failure.c 2010-02-09 07:57:19.000000000 -0500
47835+++ linux-2.6.32.7/mm/memory-failure.c 2010-01-25 17:39:41.100425102 -0500 47905+++ linux-2.6.32.8/mm/memory-failure.c 2010-02-10 15:06:24.641981580 -0500
47836@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r 47906@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
47837 47907
47838 int sysctl_memory_failure_recovery __read_mostly = 1; 47908 int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -47851,9 +47921,9 @@ diff -urNp linux-2.6.32.7/mm/memory-failure.c linux-2.6.32.7/mm/memory-failure.c
47851 47921
47852 /* 47922 /*
47853 * We need/can do nothing about count=0 pages. 47923 * We need/can do nothing about count=0 pages.
47854diff -urNp linux-2.6.32.7/mm/mempolicy.c linux-2.6.32.7/mm/mempolicy.c 47924diff -urNp linux-2.6.32.8/mm/mempolicy.c linux-2.6.32.8/mm/mempolicy.c
47855--- linux-2.6.32.7/mm/mempolicy.c 2010-01-25 13:50:10.000000000 -0500 47925--- linux-2.6.32.8/mm/mempolicy.c 2010-02-09 07:57:19.000000000 -0500
47856+++ linux-2.6.32.7/mm/mempolicy.c 2010-01-25 17:39:41.101196760 -0500 47926+++ linux-2.6.32.8/mm/mempolicy.c 2010-02-10 15:06:24.641981580 -0500
47857@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st 47927@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
47858 struct vm_area_struct *next; 47928 struct vm_area_struct *next;
47859 int err; 47929 int err;
@@ -47934,10 +48004,20 @@ diff -urNp linux-2.6.32.7/mm/mempolicy.c linux-2.6.32.7/mm/mempolicy.c
47934 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { 48004 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
47935 seq_printf(m, " heap"); 48005 seq_printf(m, " heap");
47936 } else if (vma->vm_start <= mm->start_stack && 48006 } else if (vma->vm_start <= mm->start_stack &&
47937diff -urNp linux-2.6.32.7/mm/migrate.c linux-2.6.32.7/mm/migrate.c 48007diff -urNp linux-2.6.32.8/mm/migrate.c linux-2.6.32.8/mm/migrate.c
47938--- linux-2.6.32.7/mm/migrate.c 2010-01-25 13:50:10.000000000 -0500 48008--- linux-2.6.32.8/mm/migrate.c 2010-02-09 07:57:19.000000000 -0500
47939+++ linux-2.6.32.7/mm/migrate.c 2010-01-25 17:39:41.101196760 -0500 48009+++ linux-2.6.32.8/mm/migrate.c 2010-02-10 15:06:24.641981580 -0500
47940@@ -1103,6 +1103,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 48010@@ -953,6 +953,9 @@ static int do_pages_move(struct mm_struc
48011 goto out_pm;
48012
48013 err = -ENODEV;
48014+ if (node < 0 || node >= MAX_NUMNODES)
48015+ goto out_pm;
48016+
48017 if (!node_state(node, N_HIGH_MEMORY))
48018 goto out_pm;
48019
48020@@ -1103,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
47941 if (!mm) 48021 if (!mm)
47942 return -EINVAL; 48022 return -EINVAL;
47943 48023
@@ -47952,7 +48032,7 @@ diff -urNp linux-2.6.32.7/mm/migrate.c linux-2.6.32.7/mm/migrate.c
47952 /* 48032 /*
47953 * Check if this process has the right to modify the specified 48033 * Check if this process has the right to modify the specified
47954 * process. The right exists if the process has administrative 48034 * process. The right exists if the process has administrative
47955@@ -1112,8 +1120,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 48035@@ -1112,8 +1123,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
47956 rcu_read_lock(); 48036 rcu_read_lock();
47957 tcred = __task_cred(task); 48037 tcred = __task_cred(task);
47958 if (cred->euid != tcred->suid && cred->euid != tcred->uid && 48038 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
@@ -47962,9 +48042,9 @@ diff -urNp linux-2.6.32.7/mm/migrate.c linux-2.6.32.7/mm/migrate.c
47962 rcu_read_unlock(); 48042 rcu_read_unlock();
47963 err = -EPERM; 48043 err = -EPERM;
47964 goto out; 48044 goto out;
47965diff -urNp linux-2.6.32.7/mm/mlock.c linux-2.6.32.7/mm/mlock.c 48045diff -urNp linux-2.6.32.8/mm/mlock.c linux-2.6.32.8/mm/mlock.c
47966--- linux-2.6.32.7/mm/mlock.c 2010-01-25 13:50:10.000000000 -0500 48046--- linux-2.6.32.8/mm/mlock.c 2010-02-09 07:57:19.000000000 -0500
47967+++ linux-2.6.32.7/mm/mlock.c 2010-01-25 17:39:41.101196760 -0500 48047+++ linux-2.6.32.8/mm/mlock.c 2010-02-10 15:06:24.641981580 -0500
47968@@ -13,6 +13,7 @@ 48048@@ -13,6 +13,7 @@
47969 #include <linux/pagemap.h> 48049 #include <linux/pagemap.h>
47970 #include <linux/mempolicy.h> 48050 #include <linux/mempolicy.h>
@@ -48033,9 +48113,9 @@ diff -urNp linux-2.6.32.7/mm/mlock.c linux-2.6.32.7/mm/mlock.c
48033 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || 48113 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
48034 capable(CAP_IPC_LOCK)) 48114 capable(CAP_IPC_LOCK))
48035 ret = do_mlockall(flags); 48115 ret = do_mlockall(flags);
48036diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c 48116diff -urNp linux-2.6.32.8/mm/mmap.c linux-2.6.32.8/mm/mmap.c
48037--- linux-2.6.32.7/mm/mmap.c 2010-01-25 13:50:10.000000000 -0500 48117--- linux-2.6.32.8/mm/mmap.c 2010-02-09 07:57:19.000000000 -0500
48038+++ linux-2.6.32.7/mm/mmap.c 2010-01-25 17:49:13.109168923 -0500 48118+++ linux-2.6.32.8/mm/mmap.c 2010-02-10 15:06:24.641981580 -0500
48039@@ -45,6 +45,16 @@ 48119@@ -45,6 +45,16 @@
48040 #define arch_rebalance_pgtables(addr, len) (addr) 48120 #define arch_rebalance_pgtables(addr, len) (addr)
48041 #endif 48121 #endif
@@ -48728,34 +48808,37 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
48728 rb_erase(&vma->vm_rb, &mm->mm_rb); 48808 rb_erase(&vma->vm_rb, &mm->mm_rb);
48729 mm->map_count--; 48809 mm->map_count--;
48730 tail_vma = vma; 48810 tail_vma = vma;
48731@@ -1818,6 +2066,108 @@ detach_vmas_to_be_unmapped(struct mm_str 48811@@ -1824,10 +2072,25 @@ int split_vma(struct mm_struct * mm, str
48732 * Split a vma into two pieces at address 'addr', a new vma is allocated 48812 struct mempolicy *pol;
48733 * either for the first part or the tail. 48813 struct vm_area_struct *new;
48734 */ 48814
48735+
48736+#ifdef CONFIG_PAX_SEGMEXEC 48815+#ifdef CONFIG_PAX_SEGMEXEC
48737+int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, 48816+ struct vm_area_struct *vma_m, *new_m = NULL;
48738+ unsigned long addr, int new_below)
48739+{
48740+ struct mempolicy *pol;
48741+ struct vm_area_struct *new, *vma_m, *new_m = NULL;
48742+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE; 48817+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
48818+#endif
48743+ 48819+
48744+ if (is_vm_hugetlb_page(vma) && (addr & ~HPAGE_MASK)) 48820 if (is_vm_hugetlb_page(vma) && (addr &
48745+ return -EINVAL; 48821 ~(huge_page_mask(hstate_vma(vma)))))
48746+ 48822 return -EINVAL;
48823
48824+#ifdef CONFIG_PAX_SEGMEXEC
48747+ vma_m = pax_find_mirror_vma(vma); 48825+ vma_m = pax_find_mirror_vma(vma);
48748+ if (vma_m) { 48826+
48827+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
48749+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE); 48828+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
48750+ if (mm->map_count >= sysctl_max_map_count-1) 48829+ if (mm->map_count >= sysctl_max_map_count-1)
48751+ return -ENOMEM; 48830+ return -ENOMEM;
48752+ } else if (mm->map_count >= sysctl_max_map_count) 48831+ } else
48753+ return -ENOMEM; 48832+#endif
48754+
48755+ new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
48756+ if (!new)
48757+ return -ENOMEM;
48758+ 48833+
48834 if (mm->map_count >= sysctl_max_map_count)
48835 return -ENOMEM;
48836
48837@@ -1835,6 +2098,16 @@ int split_vma(struct mm_struct * mm, str
48838 if (!new)
48839 return -ENOMEM;
48840
48841+#ifdef CONFIG_PAX_SEGMEXEC
48759+ if (vma_m) { 48842+ if (vma_m) {
48760+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); 48843+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
48761+ if (!new_m) { 48844+ if (!new_m) {
@@ -48763,17 +48846,16 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
48763+ return -ENOMEM; 48846+ return -ENOMEM;
48764+ } 48847+ }
48765+ } 48848+ }
48849+#endif
48766+ 48850+
48767+ /* most fields are the same, copy all, and then fixup */ 48851 /* most fields are the same, copy all, and then fixup */
48768+ *new = *vma; 48852 *new = *vma;
48769+ 48853
48770+ if (new_below) 48854@@ -1845,8 +2118,29 @@ int split_vma(struct mm_struct * mm, str
48771+ new->vm_end = addr; 48855 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
48772+ else { 48856 }
48773+ new->vm_start = addr; 48857
48774+ new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT); 48858+#ifdef CONFIG_PAX_SEGMEXEC
48775+ }
48776+
48777+ if (vma_m) { 48859+ if (vma_m) {
48778+ *new_m = *vma_m; 48860+ *new_m = *vma_m;
48779+ new_m->vm_mirror = new; 48861+ new_m->vm_mirror = new;
@@ -48786,31 +48868,24 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
48786+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT); 48868+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
48787+ } 48869+ }
48788+ } 48870+ }
48871+#endif
48872+
48873 pol = mpol_dup(vma_policy(vma));
48874 if (IS_ERR(pol)) {
48789+ 48875+
48790+ pol = mpol_dup(vma_policy(vma)); 48876+#ifdef CONFIG_PAX_SEGMEXEC
48791+ if (IS_ERR(pol)) {
48792+ if (new_m) 48877+ if (new_m)
48793+ kmem_cache_free(vm_area_cachep, new_m); 48878+ kmem_cache_free(vm_area_cachep, new_m);
48794+ kmem_cache_free(vm_area_cachep, new); 48879+#endif
48795+ return PTR_ERR(pol);
48796+ }
48797+ vma_set_policy(new, pol);
48798+
48799+ if (new->vm_file) {
48800+ get_file(new->vm_file);
48801+ if (vma->vm_flags & VM_EXECUTABLE)
48802+ added_exe_file_vma(mm);
48803+ }
48804+
48805+ if (new->vm_ops && new->vm_ops->open)
48806+ new->vm_ops->open(new);
48807+
48808+ if (new_below)
48809+ vma_adjust(vma, addr, vma->vm_end, vma->vm_pgoff +
48810+ ((addr - new->vm_start) >> PAGE_SHIFT), new);
48811+ else
48812+ vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
48813+ 48880+
48881 kmem_cache_free(vm_area_cachep, new);
48882 return PTR_ERR(pol);
48883 }
48884@@ -1867,6 +2161,28 @@ int split_vma(struct mm_struct * mm, str
48885 else
48886 vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
48887
48888+#ifdef CONFIG_PAX_SEGMEXEC
48814+ if (vma_m) { 48889+ if (vma_m) {
48815+ mpol_get(pol); 48890+ mpol_get(pol);
48816+ vma_set_policy(new_m, pol); 48891+ vma_set_policy(new_m, pol);
@@ -48830,27 +48905,18 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
48830+ else 48905+ else
48831+ vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m); 48906+ vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
48832+ } 48907+ }
48908+#endif
48833+ 48909+
48834+ return 0;
48835+}
48836+#else
48837 int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
48838 unsigned long addr, int new_below)
48839 {
48840@@ -1869,17 +2219,37 @@ int split_vma(struct mm_struct * mm, str
48841
48842 return 0; 48910 return 0;
48843 } 48911 }
48844+#endif
48845 48912
48846 /* Munmap is split into 2 main parts -- this part which finds 48913@@ -1875,11 +2191,30 @@ int split_vma(struct mm_struct * mm, str
48847 * what needs doing, and the areas themselves, which do the
48848 * work. This now handles partial unmappings. 48914 * work. This now handles partial unmappings.
48849 * Jeremy Fitzhardinge <jeremy@goop.org> 48915 * Jeremy Fitzhardinge <jeremy@goop.org>
48850 */ 48916 */
48851+#ifdef CONFIG_PAX_SEGMEXEC 48917+#ifdef CONFIG_PAX_SEGMEXEC
48852+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) 48918 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
48853+{ 48919 {
48854+ int ret = __do_munmap(mm, start, len); 48920+ int ret = __do_munmap(mm, start, len);
48855+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC)) 48921+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
48856+ return ret; 48922+ return ret;
@@ -48860,9 +48926,9 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
48860+ 48926+
48861+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len) 48927+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
48862+#else 48928+#else
48863 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) 48929+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
48864+#endif 48930+#endif
48865 { 48931+{
48866 unsigned long end; 48932 unsigned long end;
48867 struct vm_area_struct *vma, *prev, *last; 48933 struct vm_area_struct *vma, *prev, *last;
48868 48934
@@ -48875,7 +48941,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
48875 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start) 48941 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
48876 return -EINVAL; 48942 return -EINVAL;
48877 48943
48878@@ -1943,6 +2313,8 @@ int do_munmap(struct mm_struct *mm, unsi 48944@@ -1943,6 +2278,8 @@ int do_munmap(struct mm_struct *mm, unsi
48879 /* Fix up all other VM information */ 48945 /* Fix up all other VM information */
48880 remove_vma_list(mm, vma); 48946 remove_vma_list(mm, vma);
48881 48947
@@ -48884,7 +48950,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
48884 return 0; 48950 return 0;
48885 } 48951 }
48886 48952
48887@@ -1955,22 +2327,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a 48953@@ -1955,22 +2292,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
48888 48954
48889 profile_munmap(addr); 48955 profile_munmap(addr);
48890 48956
@@ -48913,7 +48979,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
48913 /* 48979 /*
48914 * this is really a simplified "do_mmap". it only handles 48980 * this is really a simplified "do_mmap". it only handles
48915 * anonymous maps. eventually we may be able to do some 48981 * anonymous maps. eventually we may be able to do some
48916@@ -1984,6 +2352,11 @@ unsigned long do_brk(unsigned long addr, 48982@@ -1984,6 +2317,11 @@ unsigned long do_brk(unsigned long addr,
48917 struct rb_node ** rb_link, * rb_parent; 48983 struct rb_node ** rb_link, * rb_parent;
48918 pgoff_t pgoff = addr >> PAGE_SHIFT; 48984 pgoff_t pgoff = addr >> PAGE_SHIFT;
48919 int error; 48985 int error;
@@ -48925,7 +48991,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
48925 48991
48926 len = PAGE_ALIGN(len); 48992 len = PAGE_ALIGN(len);
48927 if (!len) 48993 if (!len)
48928@@ -1995,16 +2368,30 @@ unsigned long do_brk(unsigned long addr, 48994@@ -1995,16 +2333,30 @@ unsigned long do_brk(unsigned long addr,
48929 48995
48930 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; 48996 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
48931 48997
@@ -48957,7 +49023,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
48957 locked += mm->locked_vm; 49023 locked += mm->locked_vm;
48958 lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur; 49024 lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
48959 lock_limit >>= PAGE_SHIFT; 49025 lock_limit >>= PAGE_SHIFT;
48960@@ -2021,22 +2408,22 @@ unsigned long do_brk(unsigned long addr, 49026@@ -2021,22 +2373,22 @@ unsigned long do_brk(unsigned long addr,
48961 /* 49027 /*
48962 * Clear old maps. this also does some error checking for us 49028 * Clear old maps. this also does some error checking for us
48963 */ 49029 */
@@ -48984,7 +49050,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
48984 return -ENOMEM; 49050 return -ENOMEM;
48985 49051
48986 /* Can we just expand an old private anonymous mapping? */ 49052 /* Can we just expand an old private anonymous mapping? */
48987@@ -2050,10 +2437,21 @@ unsigned long do_brk(unsigned long addr, 49053@@ -2050,10 +2402,21 @@ unsigned long do_brk(unsigned long addr,
48988 */ 49054 */
48989 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); 49055 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
48990 if (!vma) { 49056 if (!vma) {
@@ -49007,7 +49073,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
49007 vma->vm_mm = mm; 49073 vma->vm_mm = mm;
49008 vma->vm_start = addr; 49074 vma->vm_start = addr;
49009 vma->vm_end = addr + len; 49075 vma->vm_end = addr + len;
49010@@ -2062,11 +2460,12 @@ unsigned long do_brk(unsigned long addr, 49076@@ -2062,11 +2425,12 @@ unsigned long do_brk(unsigned long addr,
49011 vma->vm_page_prot = vm_get_page_prot(flags); 49077 vma->vm_page_prot = vm_get_page_prot(flags);
49012 vma_link(mm, vma, prev, rb_link, rb_parent); 49078 vma_link(mm, vma, prev, rb_link, rb_parent);
49013 out: 49079 out:
@@ -49022,7 +49088,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
49022 return addr; 49088 return addr;
49023 } 49089 }
49024 49090
49025@@ -2113,8 +2512,10 @@ void exit_mmap(struct mm_struct *mm) 49091@@ -2113,8 +2477,10 @@ void exit_mmap(struct mm_struct *mm)
49026 * Walk the list again, actually closing and freeing it, 49092 * Walk the list again, actually closing and freeing it,
49027 * with preemption enabled, without holding any MM locks. 49093 * with preemption enabled, without holding any MM locks.
49028 */ 49094 */
@@ -49034,7 +49100,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
49034 49100
49035 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT); 49101 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
49036 } 49102 }
49037@@ -2128,6 +2529,10 @@ int insert_vm_struct(struct mm_struct * 49103@@ -2128,6 +2494,10 @@ int insert_vm_struct(struct mm_struct *
49038 struct vm_area_struct * __vma, * prev; 49104 struct vm_area_struct * __vma, * prev;
49039 struct rb_node ** rb_link, * rb_parent; 49105 struct rb_node ** rb_link, * rb_parent;
49040 49106
@@ -49045,7 +49111,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
49045 /* 49111 /*
49046 * The vm_pgoff of a purely anonymous vma should be irrelevant 49112 * The vm_pgoff of a purely anonymous vma should be irrelevant
49047 * until its first write fault, when page's anon_vma and index 49113 * until its first write fault, when page's anon_vma and index
49048@@ -2150,7 +2555,22 @@ int insert_vm_struct(struct mm_struct * 49114@@ -2150,7 +2520,22 @@ int insert_vm_struct(struct mm_struct *
49049 if ((vma->vm_flags & VM_ACCOUNT) && 49115 if ((vma->vm_flags & VM_ACCOUNT) &&
49050 security_vm_enough_memory_mm(mm, vma_pages(vma))) 49116 security_vm_enough_memory_mm(mm, vma_pages(vma)))
49051 return -ENOMEM; 49117 return -ENOMEM;
@@ -49068,7 +49134,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
49068 return 0; 49134 return 0;
49069 } 49135 }
49070 49136
49071@@ -2168,6 +2588,8 @@ struct vm_area_struct *copy_vma(struct v 49137@@ -2168,6 +2553,8 @@ struct vm_area_struct *copy_vma(struct v
49072 struct rb_node **rb_link, *rb_parent; 49138 struct rb_node **rb_link, *rb_parent;
49073 struct mempolicy *pol; 49139 struct mempolicy *pol;
49074 49140
@@ -49077,7 +49143,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
49077 /* 49143 /*
49078 * If anonymous vma has not yet been faulted, update new pgoff 49144 * If anonymous vma has not yet been faulted, update new pgoff
49079 * to match new location, to increase its chance of merging. 49145 * to match new location, to increase its chance of merging.
49080@@ -2211,6 +2633,35 @@ struct vm_area_struct *copy_vma(struct v 49146@@ -2211,6 +2598,35 @@ struct vm_area_struct *copy_vma(struct v
49081 return new_vma; 49147 return new_vma;
49082 } 49148 }
49083 49149
@@ -49113,7 +49179,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
49113 /* 49179 /*
49114 * Return true if the calling process may expand its vm space by the passed 49180 * Return true if the calling process may expand its vm space by the passed
49115 * number of pages 49181 * number of pages
49116@@ -2221,7 +2672,7 @@ int may_expand_vm(struct mm_struct *mm, 49182@@ -2221,7 +2637,7 @@ int may_expand_vm(struct mm_struct *mm,
49117 unsigned long lim; 49183 unsigned long lim;
49118 49184
49119 lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT; 49185 lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
@@ -49122,7 +49188,7 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
49122 if (cur + npages > lim) 49188 if (cur + npages > lim)
49123 return 0; 49189 return 0;
49124 return 1; 49190 return 1;
49125@@ -2290,6 +2741,15 @@ int install_special_mapping(struct mm_st 49191@@ -2290,6 +2706,15 @@ int install_special_mapping(struct mm_st
49126 vma->vm_start = addr; 49192 vma->vm_start = addr;
49127 vma->vm_end = addr + len; 49193 vma->vm_end = addr + len;
49128 49194
@@ -49138,9 +49204,9 @@ diff -urNp linux-2.6.32.7/mm/mmap.c linux-2.6.32.7/mm/mmap.c
49138 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; 49204 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
49139 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 49205 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
49140 49206
49141diff -urNp linux-2.6.32.7/mm/mprotect.c linux-2.6.32.7/mm/mprotect.c 49207diff -urNp linux-2.6.32.8/mm/mprotect.c linux-2.6.32.8/mm/mprotect.c
49142--- linux-2.6.32.7/mm/mprotect.c 2010-01-25 13:50:10.000000000 -0500 49208--- linux-2.6.32.8/mm/mprotect.c 2010-02-09 07:57:19.000000000 -0500
49143+++ linux-2.6.32.7/mm/mprotect.c 2010-01-25 17:39:41.103216205 -0500 49209+++ linux-2.6.32.8/mm/mprotect.c 2010-02-10 15:06:24.641981580 -0500
49144@@ -24,10 +24,16 @@ 49210@@ -24,10 +24,16 @@
49145 #include <linux/mmu_notifier.h> 49211 #include <linux/mmu_notifier.h>
49146 #include <linux/migrate.h> 49212 #include <linux/migrate.h>
@@ -49331,9 +49397,9 @@ diff -urNp linux-2.6.32.7/mm/mprotect.c linux-2.6.32.7/mm/mprotect.c
49331 nstart = tmp; 49397 nstart = tmp;
49332 49398
49333 if (nstart < prev->vm_end) 49399 if (nstart < prev->vm_end)
49334diff -urNp linux-2.6.32.7/mm/mremap.c linux-2.6.32.7/mm/mremap.c 49400diff -urNp linux-2.6.32.8/mm/mremap.c linux-2.6.32.8/mm/mremap.c
49335--- linux-2.6.32.7/mm/mremap.c 2010-01-25 13:50:10.000000000 -0500 49401--- linux-2.6.32.8/mm/mremap.c 2010-02-09 07:57:19.000000000 -0500
49336+++ linux-2.6.32.7/mm/mremap.c 2010-01-25 17:51:07.728131761 -0500 49402+++ linux-2.6.32.8/mm/mremap.c 2010-02-10 15:06:24.641981580 -0500
49337@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str 49403@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
49338 continue; 49404 continue;
49339 pte = ptep_clear_flush(vma, old_addr, old_pte); 49405 pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -49434,9 +49500,9 @@ diff -urNp linux-2.6.32.7/mm/mremap.c linux-2.6.32.7/mm/mremap.c
49434 } 49500 }
49435 out: 49501 out:
49436 if (ret & ~PAGE_MASK) 49502 if (ret & ~PAGE_MASK)
49437diff -urNp linux-2.6.32.7/mm/nommu.c linux-2.6.32.7/mm/nommu.c 49503diff -urNp linux-2.6.32.8/mm/nommu.c linux-2.6.32.8/mm/nommu.c
49438--- linux-2.6.32.7/mm/nommu.c 2010-01-25 13:50:10.000000000 -0500 49504--- linux-2.6.32.8/mm/nommu.c 2010-02-09 07:57:19.000000000 -0500
49439+++ linux-2.6.32.7/mm/nommu.c 2010-01-25 17:39:41.113789566 -0500 49505+++ linux-2.6.32.8/mm/nommu.c 2010-02-10 15:06:24.641981580 -0500
49440@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m 49506@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m
49441 EXPORT_SYMBOL(find_vma); 49507 EXPORT_SYMBOL(find_vma);
49442 49508
@@ -49453,10 +49519,10 @@ diff -urNp linux-2.6.32.7/mm/nommu.c linux-2.6.32.7/mm/nommu.c
49453 * expand a stack to a given address 49519 * expand a stack to a given address
49454 * - not supported under NOMMU conditions 49520 * - not supported under NOMMU conditions
49455 */ 49521 */
49456diff -urNp linux-2.6.32.7/mm/page_alloc.c linux-2.6.32.7/mm/page_alloc.c 49522diff -urNp linux-2.6.32.8/mm/page_alloc.c linux-2.6.32.8/mm/page_alloc.c
49457--- linux-2.6.32.7/mm/page_alloc.c 2010-01-25 13:50:10.000000000 -0500 49523--- linux-2.6.32.8/mm/page_alloc.c 2010-02-09 07:57:19.000000000 -0500
49458+++ linux-2.6.32.7/mm/page_alloc.c 2010-01-25 17:39:41.114427717 -0500 49524+++ linux-2.6.32.8/mm/page_alloc.c 2010-02-10 15:06:24.646029734 -0500
49459@@ -585,6 +585,10 @@ static void __free_pages_ok(struct page 49525@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page
49460 int bad = 0; 49526 int bad = 0;
49461 int wasMlocked = __TestClearPageMlocked(page); 49527 int wasMlocked = __TestClearPageMlocked(page);
49462 49528
@@ -49467,7 +49533,7 @@ diff -urNp linux-2.6.32.7/mm/page_alloc.c linux-2.6.32.7/mm/page_alloc.c
49467 kmemcheck_free_shadow(page, order); 49533 kmemcheck_free_shadow(page, order);
49468 49534
49469 for (i = 0 ; i < (1 << order) ; ++i) 49535 for (i = 0 ; i < (1 << order) ; ++i)
49470@@ -597,6 +601,12 @@ static void __free_pages_ok(struct page 49536@@ -598,6 +602,12 @@ static void __free_pages_ok(struct page
49471 debug_check_no_obj_freed(page_address(page), 49537 debug_check_no_obj_freed(page_address(page),
49472 PAGE_SIZE << order); 49538 PAGE_SIZE << order);
49473 } 49539 }
@@ -49480,7 +49546,7 @@ diff -urNp linux-2.6.32.7/mm/page_alloc.c linux-2.6.32.7/mm/page_alloc.c
49480 arch_free_page(page, order); 49546 arch_free_page(page, order);
49481 kernel_map_pages(page, 1 << order, 0); 49547 kernel_map_pages(page, 1 << order, 0);
49482 49548
49483@@ -700,8 +710,10 @@ static int prep_new_page(struct page *pa 49549@@ -701,8 +711,10 @@ static int prep_new_page(struct page *pa
49484 arch_alloc_page(page, order); 49550 arch_alloc_page(page, order);
49485 kernel_map_pages(page, 1 << order, 1); 49551 kernel_map_pages(page, 1 << order, 1);
49486 49552
@@ -49491,7 +49557,7 @@ diff -urNp linux-2.6.32.7/mm/page_alloc.c linux-2.6.32.7/mm/page_alloc.c
49491 49557
49492 if (order && (gfp_flags & __GFP_COMP)) 49558 if (order && (gfp_flags & __GFP_COMP))
49493 prep_compound_page(page, order); 49559 prep_compound_page(page, order);
49494@@ -1095,6 +1107,11 @@ static void free_hot_cold_page(struct pa 49560@@ -1096,6 +1108,11 @@ static void free_hot_cold_page(struct pa
49495 debug_check_no_locks_freed(page_address(page), PAGE_SIZE); 49561 debug_check_no_locks_freed(page_address(page), PAGE_SIZE);
49496 debug_check_no_obj_freed(page_address(page), PAGE_SIZE); 49562 debug_check_no_obj_freed(page_address(page), PAGE_SIZE);
49497 } 49563 }
@@ -49503,9 +49569,9 @@ diff -urNp linux-2.6.32.7/mm/page_alloc.c linux-2.6.32.7/mm/page_alloc.c
49503 arch_free_page(page, 0); 49569 arch_free_page(page, 0);
49504 kernel_map_pages(page, 1, 0); 49570 kernel_map_pages(page, 1, 0);
49505 49571
49506diff -urNp linux-2.6.32.7/mm/percpu.c linux-2.6.32.7/mm/percpu.c 49572diff -urNp linux-2.6.32.8/mm/percpu.c linux-2.6.32.8/mm/percpu.c
49507--- linux-2.6.32.7/mm/percpu.c 2010-01-25 13:50:10.000000000 -0500 49573--- linux-2.6.32.8/mm/percpu.c 2010-02-09 07:57:19.000000000 -0500
49508+++ linux-2.6.32.7/mm/percpu.c 2010-01-25 17:39:41.115366990 -0500 49574+++ linux-2.6.32.8/mm/percpu.c 2010-02-10 15:06:24.646029734 -0500
49509@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu 49575@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
49510 static unsigned int pcpu_last_unit_cpu __read_mostly; 49576 static unsigned int pcpu_last_unit_cpu __read_mostly;
49511 49577
@@ -49515,9 +49581,9 @@ diff -urNp linux-2.6.32.7/mm/percpu.c linux-2.6.32.7/mm/percpu.c
49515 EXPORT_SYMBOL_GPL(pcpu_base_addr); 49581 EXPORT_SYMBOL_GPL(pcpu_base_addr);
49516 49582
49517 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ 49583 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
49518diff -urNp linux-2.6.32.7/mm/rmap.c linux-2.6.32.7/mm/rmap.c 49584diff -urNp linux-2.6.32.8/mm/rmap.c linux-2.6.32.8/mm/rmap.c
49519--- linux-2.6.32.7/mm/rmap.c 2010-01-25 13:50:10.000000000 -0500 49585--- linux-2.6.32.8/mm/rmap.c 2010-02-09 07:57:19.000000000 -0500
49520+++ linux-2.6.32.7/mm/rmap.c 2010-01-25 17:39:41.115366990 -0500 49586+++ linux-2.6.32.8/mm/rmap.c 2010-02-10 15:06:24.646029734 -0500
49521@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru 49587@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru
49522 struct mm_struct *mm = vma->vm_mm; 49588 struct mm_struct *mm = vma->vm_mm;
49523 struct anon_vma *allocated; 49589 struct anon_vma *allocated;
@@ -49545,9 +49611,9 @@ diff -urNp linux-2.6.32.7/mm/rmap.c linux-2.6.32.7/mm/rmap.c
49545 vma->anon_vma = anon_vma; 49611 vma->anon_vma = anon_vma;
49546 list_add_tail(&vma->anon_vma_node, &anon_vma->head); 49612 list_add_tail(&vma->anon_vma_node, &anon_vma->head);
49547 allocated = NULL; 49613 allocated = NULL;
49548diff -urNp linux-2.6.32.7/mm/shmem.c linux-2.6.32.7/mm/shmem.c 49614diff -urNp linux-2.6.32.8/mm/shmem.c linux-2.6.32.8/mm/shmem.c
49549--- linux-2.6.32.7/mm/shmem.c 2010-01-25 13:50:10.000000000 -0500 49615--- linux-2.6.32.8/mm/shmem.c 2010-02-09 07:57:19.000000000 -0500
49550+++ linux-2.6.32.7/mm/shmem.c 2010-01-25 17:39:41.125336894 -0500 49616+++ linux-2.6.32.8/mm/shmem.c 2010-02-10 15:06:24.646029734 -0500
49551@@ -31,7 +31,7 @@ 49617@@ -31,7 +31,7 @@
49552 #include <linux/swap.h> 49618 #include <linux/swap.h>
49553 #include <linux/ima.h> 49619 #include <linux/ima.h>
@@ -49557,9 +49623,9 @@ diff -urNp linux-2.6.32.7/mm/shmem.c linux-2.6.32.7/mm/shmem.c
49557 49623
49558 #ifdef CONFIG_SHMEM 49624 #ifdef CONFIG_SHMEM
49559 /* 49625 /*
49560diff -urNp linux-2.6.32.7/mm/slab.c linux-2.6.32.7/mm/slab.c 49626diff -urNp linux-2.6.32.8/mm/slab.c linux-2.6.32.8/mm/slab.c
49561--- linux-2.6.32.7/mm/slab.c 2010-01-25 13:50:10.000000000 -0500 49627--- linux-2.6.32.8/mm/slab.c 2010-02-09 07:57:19.000000000 -0500
49562+++ linux-2.6.32.7/mm/slab.c 2010-01-25 17:39:41.126129280 -0500 49628+++ linux-2.6.32.8/mm/slab.c 2010-02-10 15:06:24.646029734 -0500
49563@@ -308,7 +308,7 @@ struct kmem_list3 { 49629@@ -308,7 +308,7 @@ struct kmem_list3 {
49564 * Need this for bootstrapping a per node allocator. 49630 * Need this for bootstrapping a per node allocator.
49565 */ 49631 */
@@ -49657,9 +49723,9 @@ diff -urNp linux-2.6.32.7/mm/slab.c linux-2.6.32.7/mm/slab.c
49657 /** 49723 /**
49658 * ksize - get the actual amount of memory allocated for a given object 49724 * ksize - get the actual amount of memory allocated for a given object
49659 * @objp: Pointer to the object 49725 * @objp: Pointer to the object
49660diff -urNp linux-2.6.32.7/mm/slob.c linux-2.6.32.7/mm/slob.c 49726diff -urNp linux-2.6.32.8/mm/slob.c linux-2.6.32.8/mm/slob.c
49661--- linux-2.6.32.7/mm/slob.c 2010-01-25 13:50:10.000000000 -0500 49727--- linux-2.6.32.8/mm/slob.c 2010-02-09 07:57:19.000000000 -0500
49662+++ linux-2.6.32.7/mm/slob.c 2010-01-25 17:39:41.126129280 -0500 49728+++ linux-2.6.32.8/mm/slob.c 2010-02-10 15:06:24.646029734 -0500
49663@@ -29,7 +29,7 @@ 49729@@ -29,7 +29,7 @@
49664 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls 49730 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
49665 * alloc_pages() directly, allocating compound pages so the page order 49731 * alloc_pages() directly, allocating compound pages so the page order
@@ -49980,9 +50046,9 @@ diff -urNp linux-2.6.32.7/mm/slob.c linux-2.6.32.7/mm/slob.c
49980 } 50046 }
49981 50047
49982 trace_kmem_cache_free(_RET_IP_, b); 50048 trace_kmem_cache_free(_RET_IP_, b);
49983diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c 50049diff -urNp linux-2.6.32.8/mm/slub.c linux-2.6.32.8/mm/slub.c
49984--- linux-2.6.32.7/mm/slub.c 2010-01-25 13:50:10.000000000 -0500 50050--- linux-2.6.32.8/mm/slub.c 2010-02-09 07:57:19.000000000 -0500
49985+++ linux-2.6.32.7/mm/slub.c 2010-01-25 17:39:41.127430872 -0500 50051+++ linux-2.6.32.8/mm/slub.c 2010-02-10 15:06:24.646029734 -0500
49986@@ -1937,7 +1937,7 @@ static int slub_min_objects; 50052@@ -1937,7 +1937,7 @@ static int slub_min_objects;
49987 * Merge control. If this is set then no merging of slab caches will occur. 50053 * Merge control. If this is set then no merging of slab caches will occur.
49988 * (Could be removed. This was introduced to pacify the merge skeptics.) 50054 * (Could be removed. This was introduced to pacify the merge skeptics.)
@@ -50130,9 +50196,9 @@ diff -urNp linux-2.6.32.7/mm/slub.c linux-2.6.32.7/mm/slub.c
50130 static void print_slabinfo_header(struct seq_file *m) 50196 static void print_slabinfo_header(struct seq_file *m)
50131 { 50197 {
50132 seq_puts(m, "slabinfo - version: 2.1\n"); 50198 seq_puts(m, "slabinfo - version: 2.1\n");
50133diff -urNp linux-2.6.32.7/mm/util.c linux-2.6.32.7/mm/util.c 50199diff -urNp linux-2.6.32.8/mm/util.c linux-2.6.32.8/mm/util.c
50134--- linux-2.6.32.7/mm/util.c 2010-01-25 13:50:10.000000000 -0500 50200--- linux-2.6.32.8/mm/util.c 2010-02-09 07:57:19.000000000 -0500
50135+++ linux-2.6.32.7/mm/util.c 2010-01-25 17:39:41.127430872 -0500 50201+++ linux-2.6.32.8/mm/util.c 2010-02-10 15:06:24.646029734 -0500
50136@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); 50202@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
50137 void arch_pick_mmap_layout(struct mm_struct *mm) 50203 void arch_pick_mmap_layout(struct mm_struct *mm)
50138 { 50204 {
@@ -50146,9 +50212,9 @@ diff -urNp linux-2.6.32.7/mm/util.c linux-2.6.32.7/mm/util.c
50146 mm->get_unmapped_area = arch_get_unmapped_area; 50212 mm->get_unmapped_area = arch_get_unmapped_area;
50147 mm->unmap_area = arch_unmap_area; 50213 mm->unmap_area = arch_unmap_area;
50148 } 50214 }
50149diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c 50215diff -urNp linux-2.6.32.8/mm/vmalloc.c linux-2.6.32.8/mm/vmalloc.c
50150--- linux-2.6.32.7/mm/vmalloc.c 2010-01-25 13:50:10.000000000 -0500 50216--- linux-2.6.32.8/mm/vmalloc.c 2010-02-09 07:57:19.000000000 -0500
50151+++ linux-2.6.32.7/mm/vmalloc.c 2010-01-25 17:39:41.128331156 -0500 50217+++ linux-2.6.32.8/mm/vmalloc.c 2010-02-10 15:06:24.650030083 -0500
50152@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, 50218@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
50153 50219
50154 pte = pte_offset_kernel(pmd, addr); 50220 pte = pte_offset_kernel(pmd, addr);
@@ -50255,7 +50321,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c
50255 p = &(*p)->rb_right; 50321 p = &(*p)->rb_right;
50256 else 50322 else
50257 BUG(); 50323 BUG();
50258@@ -1162,6 +1196,16 @@ static struct vm_struct *__get_vm_area_n 50324@@ -1223,6 +1257,16 @@ static struct vm_struct *__get_vm_area_n
50259 struct vm_struct *area; 50325 struct vm_struct *area;
50260 50326
50261 BUG_ON(in_interrupt()); 50327 BUG_ON(in_interrupt());
@@ -50272,7 +50338,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c
50272 if (flags & VM_IOREMAP) { 50338 if (flags & VM_IOREMAP) {
50273 int bit = fls(size); 50339 int bit = fls(size);
50274 50340
50275@@ -1387,6 +1431,11 @@ void *vmap(struct page **pages, unsigned 50341@@ -1448,6 +1492,11 @@ void *vmap(struct page **pages, unsigned
50276 if (count > totalram_pages) 50342 if (count > totalram_pages)
50277 return NULL; 50343 return NULL;
50278 50344
@@ -50284,7 +50350,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c
50284 area = get_vm_area_caller((count << PAGE_SHIFT), flags, 50350 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
50285 __builtin_return_address(0)); 50351 __builtin_return_address(0));
50286 if (!area) 50352 if (!area)
50287@@ -1497,6 +1546,13 @@ static void *__vmalloc_node(unsigned lon 50353@@ -1558,6 +1607,13 @@ static void *__vmalloc_node(unsigned lon
50288 if (!size || (size >> PAGE_SHIFT) > totalram_pages) 50354 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
50289 return NULL; 50355 return NULL;
50290 50356
@@ -50298,7 +50364,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c
50298 area = __get_vm_area_node(size, align, VM_ALLOC, VMALLOC_START, 50364 area = __get_vm_area_node(size, align, VM_ALLOC, VMALLOC_START,
50299 VMALLOC_END, node, gfp_mask, caller); 50365 VMALLOC_END, node, gfp_mask, caller);
50300 50366
50301@@ -1515,6 +1571,7 @@ static void *__vmalloc_node(unsigned lon 50367@@ -1576,6 +1632,7 @@ static void *__vmalloc_node(unsigned lon
50302 return addr; 50368 return addr;
50303 } 50369 }
50304 50370
@@ -50306,7 +50372,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c
50306 void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) 50372 void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
50307 { 50373 {
50308 return __vmalloc_node(size, 1, gfp_mask, prot, -1, 50374 return __vmalloc_node(size, 1, gfp_mask, prot, -1,
50309@@ -1531,6 +1588,7 @@ EXPORT_SYMBOL(__vmalloc); 50375@@ -1592,6 +1649,7 @@ EXPORT_SYMBOL(__vmalloc);
50310 * For tight control over page level allocator and protection flags 50376 * For tight control over page level allocator and protection flags
50311 * use __vmalloc() instead. 50377 * use __vmalloc() instead.
50312 */ 50378 */
@@ -50314,7 +50380,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c
50314 void *vmalloc(unsigned long size) 50380 void *vmalloc(unsigned long size)
50315 { 50381 {
50316 return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, 50382 return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
50317@@ -1545,6 +1603,7 @@ EXPORT_SYMBOL(vmalloc); 50383@@ -1606,6 +1664,7 @@ EXPORT_SYMBOL(vmalloc);
50318 * The resulting memory area is zeroed so it can be mapped to userspace 50384 * The resulting memory area is zeroed so it can be mapped to userspace
50319 * without leaking data. 50385 * without leaking data.
50320 */ 50386 */
@@ -50322,7 +50388,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c
50322 void *vmalloc_user(unsigned long size) 50388 void *vmalloc_user(unsigned long size)
50323 { 50389 {
50324 struct vm_struct *area; 50390 struct vm_struct *area;
50325@@ -1572,6 +1631,7 @@ EXPORT_SYMBOL(vmalloc_user); 50391@@ -1633,6 +1692,7 @@ EXPORT_SYMBOL(vmalloc_user);
50326 * For tight control over page level allocator and protection flags 50392 * For tight control over page level allocator and protection flags
50327 * use __vmalloc() instead. 50393 * use __vmalloc() instead.
50328 */ 50394 */
@@ -50330,7 +50396,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c
50330 void *vmalloc_node(unsigned long size, int node) 50396 void *vmalloc_node(unsigned long size, int node)
50331 { 50397 {
50332 return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, 50398 return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
50333@@ -1594,10 +1654,10 @@ EXPORT_SYMBOL(vmalloc_node); 50399@@ -1655,10 +1715,10 @@ EXPORT_SYMBOL(vmalloc_node);
50334 * For tight control over page level allocator and protection flags 50400 * For tight control over page level allocator and protection flags
50335 * use __vmalloc() instead. 50401 * use __vmalloc() instead.
50336 */ 50402 */
@@ -50343,7 +50409,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c
50343 -1, __builtin_return_address(0)); 50409 -1, __builtin_return_address(0));
50344 } 50410 }
50345 50411
50346@@ -1616,6 +1676,7 @@ void *vmalloc_exec(unsigned long size) 50412@@ -1677,6 +1737,7 @@ void *vmalloc_exec(unsigned long size)
50347 * Allocate enough 32bit PA addressable pages to cover @size from the 50413 * Allocate enough 32bit PA addressable pages to cover @size from the
50348 * page level allocator and map them into contiguous kernel virtual space. 50414 * page level allocator and map them into contiguous kernel virtual space.
50349 */ 50415 */
@@ -50351,7 +50417,7 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c
50351 void *vmalloc_32(unsigned long size) 50417 void *vmalloc_32(unsigned long size)
50352 { 50418 {
50353 return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL, 50419 return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
50354@@ -1630,6 +1691,7 @@ EXPORT_SYMBOL(vmalloc_32); 50420@@ -1691,6 +1752,7 @@ EXPORT_SYMBOL(vmalloc_32);
50355 * The resulting memory area is 32bit addressable and zeroed so it can be 50421 * The resulting memory area is 32bit addressable and zeroed so it can be
50356 * mapped to userspace without leaking data. 50422 * mapped to userspace without leaking data.
50357 */ 50423 */
@@ -50359,9 +50425,9 @@ diff -urNp linux-2.6.32.7/mm/vmalloc.c linux-2.6.32.7/mm/vmalloc.c
50359 void *vmalloc_32_user(unsigned long size) 50425 void *vmalloc_32_user(unsigned long size)
50360 { 50426 {
50361 struct vm_struct *area; 50427 struct vm_struct *area;
50362diff -urNp linux-2.6.32.7/net/atm/atm_misc.c linux-2.6.32.7/net/atm/atm_misc.c 50428diff -urNp linux-2.6.32.8/net/atm/atm_misc.c linux-2.6.32.8/net/atm/atm_misc.c
50363--- linux-2.6.32.7/net/atm/atm_misc.c 2010-01-25 13:50:10.000000000 -0500 50429--- linux-2.6.32.8/net/atm/atm_misc.c 2010-02-09 07:57:19.000000000 -0500
50364+++ linux-2.6.32.7/net/atm/atm_misc.c 2010-01-25 17:39:41.128331156 -0500 50430+++ linux-2.6.32.8/net/atm/atm_misc.c 2010-02-10 15:06:24.650030083 -0500
50365@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t 50431@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
50366 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) 50432 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
50367 return 1; 50433 return 1;
@@ -50398,9 +50464,9 @@ diff -urNp linux-2.6.32.7/net/atm/atm_misc.c linux-2.6.32.7/net/atm/atm_misc.c
50398 __SONET_ITEMS 50464 __SONET_ITEMS
50399 #undef __HANDLE_ITEM 50465 #undef __HANDLE_ITEM
50400 } 50466 }
50401diff -urNp linux-2.6.32.7/net/atm/proc.c linux-2.6.32.7/net/atm/proc.c 50467diff -urNp linux-2.6.32.8/net/atm/proc.c linux-2.6.32.8/net/atm/proc.c
50402--- linux-2.6.32.7/net/atm/proc.c 2010-01-25 13:50:10.000000000 -0500 50468--- linux-2.6.32.8/net/atm/proc.c 2010-02-09 07:57:19.000000000 -0500
50403+++ linux-2.6.32.7/net/atm/proc.c 2010-01-25 17:39:41.129325123 -0500 50469+++ linux-2.6.32.8/net/atm/proc.c 2010-02-10 15:06:24.650030083 -0500
50404@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s 50470@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
50405 const struct k_atm_aal_stats *stats) 50471 const struct k_atm_aal_stats *stats)
50406 { 50472 {
@@ -50414,9 +50480,9 @@ diff -urNp linux-2.6.32.7/net/atm/proc.c linux-2.6.32.7/net/atm/proc.c
50414 } 50480 }
50415 50481
50416 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) 50482 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
50417diff -urNp linux-2.6.32.7/net/atm/resources.c linux-2.6.32.7/net/atm/resources.c 50483diff -urNp linux-2.6.32.8/net/atm/resources.c linux-2.6.32.8/net/atm/resources.c
50418--- linux-2.6.32.7/net/atm/resources.c 2010-01-25 13:50:10.000000000 -0500 50484--- linux-2.6.32.8/net/atm/resources.c 2010-02-09 07:57:19.000000000 -0500
50419+++ linux-2.6.32.7/net/atm/resources.c 2010-01-25 17:39:41.129325123 -0500 50485+++ linux-2.6.32.8/net/atm/resources.c 2010-02-10 15:06:24.650030083 -0500
50420@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * 50486@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
50421 static void copy_aal_stats(struct k_atm_aal_stats *from, 50487 static void copy_aal_stats(struct k_atm_aal_stats *from,
50422 struct atm_aal_stats *to) 50488 struct atm_aal_stats *to)
@@ -50435,9 +50501,9 @@ diff -urNp linux-2.6.32.7/net/atm/resources.c linux-2.6.32.7/net/atm/resources.c
50435 __AAL_STAT_ITEMS 50501 __AAL_STAT_ITEMS
50436 #undef __HANDLE_ITEM 50502 #undef __HANDLE_ITEM
50437 } 50503 }
50438diff -urNp linux-2.6.32.7/net/bridge/br_private.h linux-2.6.32.7/net/bridge/br_private.h 50504diff -urNp linux-2.6.32.8/net/bridge/br_private.h linux-2.6.32.8/net/bridge/br_private.h
50439--- linux-2.6.32.7/net/bridge/br_private.h 2010-01-25 13:50:10.000000000 -0500 50505--- linux-2.6.32.8/net/bridge/br_private.h 2010-02-09 07:57:19.000000000 -0500
50440+++ linux-2.6.32.7/net/bridge/br_private.h 2010-01-25 17:39:41.129325123 -0500 50506+++ linux-2.6.32.8/net/bridge/br_private.h 2010-02-10 15:06:24.650030083 -0500
50441@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, 50507@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
50442 50508
50443 #ifdef CONFIG_SYSFS 50509 #ifdef CONFIG_SYSFS
@@ -50447,9 +50513,9 @@ diff -urNp linux-2.6.32.7/net/bridge/br_private.h linux-2.6.32.7/net/bridge/br_p
50447 extern int br_sysfs_addif(struct net_bridge_port *p); 50513 extern int br_sysfs_addif(struct net_bridge_port *p);
50448 50514
50449 /* br_sysfs_br.c */ 50515 /* br_sysfs_br.c */
50450diff -urNp linux-2.6.32.7/net/bridge/br_stp_if.c linux-2.6.32.7/net/bridge/br_stp_if.c 50516diff -urNp linux-2.6.32.8/net/bridge/br_stp_if.c linux-2.6.32.8/net/bridge/br_stp_if.c
50451--- linux-2.6.32.7/net/bridge/br_stp_if.c 2010-01-25 13:50:10.000000000 -0500 50517--- linux-2.6.32.8/net/bridge/br_stp_if.c 2010-02-09 07:57:19.000000000 -0500
50452+++ linux-2.6.32.7/net/bridge/br_stp_if.c 2010-01-25 17:39:41.129325123 -0500 50518+++ linux-2.6.32.8/net/bridge/br_stp_if.c 2010-02-10 15:06:24.650030083 -0500
50453@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg 50519@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
50454 char *envp[] = { NULL }; 50520 char *envp[] = { NULL };
50455 50521
@@ -50459,9 +50525,9 @@ diff -urNp linux-2.6.32.7/net/bridge/br_stp_if.c linux-2.6.32.7/net/bridge/br_st
50459 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", 50525 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
50460 br->dev->name, r); 50526 br->dev->name, r);
50461 50527
50462diff -urNp linux-2.6.32.7/net/bridge/br_sysfs_if.c linux-2.6.32.7/net/bridge/br_sysfs_if.c 50528diff -urNp linux-2.6.32.8/net/bridge/br_sysfs_if.c linux-2.6.32.8/net/bridge/br_sysfs_if.c
50463--- linux-2.6.32.7/net/bridge/br_sysfs_if.c 2010-01-25 13:50:10.000000000 -0500 50529--- linux-2.6.32.8/net/bridge/br_sysfs_if.c 2010-02-09 07:57:19.000000000 -0500
50464+++ linux-2.6.32.7/net/bridge/br_sysfs_if.c 2010-01-25 17:39:41.130433823 -0500 50530+++ linux-2.6.32.8/net/bridge/br_sysfs_if.c 2010-02-10 15:06:24.650030083 -0500
50465@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje 50531@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
50466 return ret; 50532 return ret;
50467 } 50533 }
@@ -50471,9 +50537,9 @@ diff -urNp linux-2.6.32.7/net/bridge/br_sysfs_if.c linux-2.6.32.7/net/bridge/br_
50471 .show = brport_show, 50537 .show = brport_show,
50472 .store = brport_store, 50538 .store = brport_store,
50473 }; 50539 };
50474diff -urNp linux-2.6.32.7/net/core/flow.c linux-2.6.32.7/net/core/flow.c 50540diff -urNp linux-2.6.32.8/net/core/flow.c linux-2.6.32.8/net/core/flow.c
50475--- linux-2.6.32.7/net/core/flow.c 2010-01-25 13:50:10.000000000 -0500 50541--- linux-2.6.32.8/net/core/flow.c 2010-02-09 07:57:19.000000000 -0500
50476+++ linux-2.6.32.7/net/core/flow.c 2010-01-25 17:39:41.130433823 -0500 50542+++ linux-2.6.32.8/net/core/flow.c 2010-02-10 15:06:24.650030083 -0500
50477@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( 50543@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
50478 50544
50479 static u32 flow_hash_shift; 50545 static u32 flow_hash_shift;
@@ -50501,9 +50567,9 @@ diff -urNp linux-2.6.32.7/net/core/flow.c linux-2.6.32.7/net/core/flow.c
50501 50567
50502 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) 50568 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
50503 50569
50504diff -urNp linux-2.6.32.7/net/dccp/ccids/ccid3.c linux-2.6.32.7/net/dccp/ccids/ccid3.c 50570diff -urNp linux-2.6.32.8/net/dccp/ccids/ccid3.c linux-2.6.32.8/net/dccp/ccids/ccid3.c
50505--- linux-2.6.32.7/net/dccp/ccids/ccid3.c 2010-01-25 13:50:10.000000000 -0500 50571--- linux-2.6.32.8/net/dccp/ccids/ccid3.c 2010-02-09 07:57:19.000000000 -0500
50506+++ linux-2.6.32.7/net/dccp/ccids/ccid3.c 2010-01-25 17:39:41.131431700 -0500 50572+++ linux-2.6.32.8/net/dccp/ccids/ccid3.c 2010-02-10 15:06:24.650030083 -0500
50507@@ -41,7 +41,7 @@ 50573@@ -41,7 +41,7 @@
50508 static int ccid3_debug; 50574 static int ccid3_debug;
50509 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) 50575 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -50513,9 +50579,9 @@ diff -urNp linux-2.6.32.7/net/dccp/ccids/ccid3.c linux-2.6.32.7/net/dccp/ccids/c
50513 #endif 50579 #endif
50514 50580
50515 /* 50581 /*
50516diff -urNp linux-2.6.32.7/net/dccp/dccp.h linux-2.6.32.7/net/dccp/dccp.h 50582diff -urNp linux-2.6.32.8/net/dccp/dccp.h linux-2.6.32.8/net/dccp/dccp.h
50517--- linux-2.6.32.7/net/dccp/dccp.h 2010-01-25 13:50:10.000000000 -0500 50583--- linux-2.6.32.8/net/dccp/dccp.h 2010-02-09 07:57:19.000000000 -0500
50518+++ linux-2.6.32.7/net/dccp/dccp.h 2010-01-25 17:39:41.131431700 -0500 50584+++ linux-2.6.32.8/net/dccp/dccp.h 2010-02-10 15:06:24.650030083 -0500
50519@@ -44,9 +44,9 @@ extern int dccp_debug; 50585@@ -44,9 +44,9 @@ extern int dccp_debug;
50520 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) 50586 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
50521 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) 50587 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -50529,9 +50595,9 @@ diff -urNp linux-2.6.32.7/net/dccp/dccp.h linux-2.6.32.7/net/dccp/dccp.h
50529 #endif 50595 #endif
50530 50596
50531 extern struct inet_hashinfo dccp_hashinfo; 50597 extern struct inet_hashinfo dccp_hashinfo;
50532diff -urNp linux-2.6.32.7/net/ipv4/inet_hashtables.c linux-2.6.32.7/net/ipv4/inet_hashtables.c 50598diff -urNp linux-2.6.32.8/net/ipv4/inet_hashtables.c linux-2.6.32.8/net/ipv4/inet_hashtables.c
50533--- linux-2.6.32.7/net/ipv4/inet_hashtables.c 2010-01-25 13:50:10.000000000 -0500 50599--- linux-2.6.32.8/net/ipv4/inet_hashtables.c 2010-02-09 07:57:19.000000000 -0500
50534+++ linux-2.6.32.7/net/ipv4/inet_hashtables.c 2010-01-25 17:39:41.131431700 -0500 50600+++ linux-2.6.32.8/net/ipv4/inet_hashtables.c 2010-02-10 15:06:24.650030083 -0500
50535@@ -18,11 +18,14 @@ 50601@@ -18,11 +18,14 @@
50536 #include <linux/sched.h> 50602 #include <linux/sched.h>
50537 #include <linux/slab.h> 50603 #include <linux/slab.h>
@@ -50556,9 +50622,9 @@ diff -urNp linux-2.6.32.7/net/ipv4/inet_hashtables.c linux-2.6.32.7/net/ipv4/ine
50556 if (tw) { 50622 if (tw) {
50557 inet_twsk_deschedule(tw, death_row); 50623 inet_twsk_deschedule(tw, death_row);
50558 inet_twsk_put(tw); 50624 inet_twsk_put(tw);
50559diff -urNp linux-2.6.32.7/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.7/net/ipv4/netfilter/nf_nat_snmp_basic.c 50625diff -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
50560--- linux-2.6.32.7/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-01-25 13:50:10.000000000 -0500 50626--- linux-2.6.32.8/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-02-09 07:57:19.000000000 -0500
50561+++ linux-2.6.32.7/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-01-25 17:39:41.132304817 -0500 50627+++ linux-2.6.32.8/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-02-10 15:06:24.650030083 -0500
50562@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( 50628@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
50563 50629
50564 *len = 0; 50630 *len = 0;
@@ -50568,9 +50634,9 @@ diff -urNp linux-2.6.32.7/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.7/
50568 if (*octets == NULL) { 50634 if (*octets == NULL) {
50569 if (net_ratelimit()) 50635 if (net_ratelimit())
50570 printk("OOM in bsalg (%d)\n", __LINE__); 50636 printk("OOM in bsalg (%d)\n", __LINE__);
50571diff -urNp linux-2.6.32.7/net/ipv4/tcp_ipv4.c linux-2.6.32.7/net/ipv4/tcp_ipv4.c 50637diff -urNp linux-2.6.32.8/net/ipv4/tcp_ipv4.c linux-2.6.32.8/net/ipv4/tcp_ipv4.c
50572--- linux-2.6.32.7/net/ipv4/tcp_ipv4.c 2010-01-25 13:50:10.000000000 -0500 50638--- linux-2.6.32.8/net/ipv4/tcp_ipv4.c 2010-02-09 07:57:19.000000000 -0500
50573+++ linux-2.6.32.7/net/ipv4/tcp_ipv4.c 2010-01-25 17:39:41.132304817 -0500 50639+++ linux-2.6.32.8/net/ipv4/tcp_ipv4.c 2010-02-10 15:06:24.650030083 -0500
50574@@ -1542,6 +1542,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc 50640@@ -1542,6 +1542,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
50575 return 0; 50641 return 0;
50576 50642
@@ -50591,9 +50657,9 @@ diff -urNp linux-2.6.32.7/net/ipv4/tcp_ipv4.c linux-2.6.32.7/net/ipv4/tcp_ipv4.c
50591 tcp_v4_send_reset(NULL, skb); 50657 tcp_v4_send_reset(NULL, skb);
50592 } 50658 }
50593 50659
50594diff -urNp linux-2.6.32.7/net/ipv4/tcp_minisocks.c linux-2.6.32.7/net/ipv4/tcp_minisocks.c 50660diff -urNp linux-2.6.32.8/net/ipv4/tcp_minisocks.c linux-2.6.32.8/net/ipv4/tcp_minisocks.c
50595--- linux-2.6.32.7/net/ipv4/tcp_minisocks.c 2010-01-25 13:50:10.000000000 -0500 50661--- linux-2.6.32.8/net/ipv4/tcp_minisocks.c 2010-02-09 07:57:19.000000000 -0500
50596+++ linux-2.6.32.7/net/ipv4/tcp_minisocks.c 2010-01-25 17:39:41.132304817 -0500 50662+++ linux-2.6.32.8/net/ipv4/tcp_minisocks.c 2010-02-10 15:06:24.650030083 -0500
50597@@ -672,8 +672,11 @@ listen_overflow: 50663@@ -672,8 +672,11 @@ listen_overflow:
50598 50664
50599 embryonic_reset: 50665 embryonic_reset:
@@ -50606,9 +50672,9 @@ diff -urNp linux-2.6.32.7/net/ipv4/tcp_minisocks.c linux-2.6.32.7/net/ipv4/tcp_m
50606 50672
50607 inet_csk_reqsk_queue_drop(sk, req, prev); 50673 inet_csk_reqsk_queue_drop(sk, req, prev);
50608 return NULL; 50674 return NULL;
50609diff -urNp linux-2.6.32.7/net/ipv4/udp.c linux-2.6.32.7/net/ipv4/udp.c 50675diff -urNp linux-2.6.32.8/net/ipv4/udp.c linux-2.6.32.8/net/ipv4/udp.c
50610--- linux-2.6.32.7/net/ipv4/udp.c 2010-01-25 13:50:10.000000000 -0500 50676--- linux-2.6.32.8/net/ipv4/udp.c 2010-02-09 07:57:19.000000000 -0500
50611+++ linux-2.6.32.7/net/ipv4/udp.c 2010-01-25 17:39:41.133351107 -0500 50677+++ linux-2.6.32.8/net/ipv4/udp.c 2010-02-10 15:06:24.650030083 -0500
50612@@ -86,6 +86,7 @@ 50678@@ -86,6 +86,7 @@
50613 #include <linux/types.h> 50679 #include <linux/types.h>
50614 #include <linux/fcntl.h> 50680 #include <linux/fcntl.h>
@@ -50667,9 +50733,9 @@ diff -urNp linux-2.6.32.7/net/ipv4/udp.c linux-2.6.32.7/net/ipv4/udp.c
50667 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); 50733 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
50668 50734
50669 /* 50735 /*
50670diff -urNp linux-2.6.32.7/net/ipv6/exthdrs.c linux-2.6.32.7/net/ipv6/exthdrs.c 50736diff -urNp linux-2.6.32.8/net/ipv6/exthdrs.c linux-2.6.32.8/net/ipv6/exthdrs.c
50671--- linux-2.6.32.7/net/ipv6/exthdrs.c 2010-01-25 13:50:10.000000000 -0500 50737--- linux-2.6.32.8/net/ipv6/exthdrs.c 2010-02-09 07:57:19.000000000 -0500
50672+++ linux-2.6.32.7/net/ipv6/exthdrs.c 2010-01-25 17:39:41.133351107 -0500 50738+++ linux-2.6.32.8/net/ipv6/exthdrs.c 2010-02-10 15:06:24.654031137 -0500
50673@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt 50739@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
50674 .type = IPV6_TLV_JUMBO, 50740 .type = IPV6_TLV_JUMBO,
50675 .func = ipv6_hop_jumbo, 50741 .func = ipv6_hop_jumbo,
@@ -50679,9 +50745,9 @@ diff -urNp linux-2.6.32.7/net/ipv6/exthdrs.c linux-2.6.32.7/net/ipv6/exthdrs.c
50679 }; 50745 };
50680 50746
50681 int ipv6_parse_hopopts(struct sk_buff *skb) 50747 int ipv6_parse_hopopts(struct sk_buff *skb)
50682diff -urNp linux-2.6.32.7/net/ipv6/raw.c linux-2.6.32.7/net/ipv6/raw.c 50748diff -urNp linux-2.6.32.8/net/ipv6/raw.c linux-2.6.32.8/net/ipv6/raw.c
50683--- linux-2.6.32.7/net/ipv6/raw.c 2010-01-25 13:50:10.000000000 -0500 50749--- linux-2.6.32.8/net/ipv6/raw.c 2010-02-09 07:57:19.000000000 -0500
50684+++ linux-2.6.32.7/net/ipv6/raw.c 2010-01-25 17:39:41.133351107 -0500 50750+++ linux-2.6.32.8/net/ipv6/raw.c 2010-02-10 15:06:24.654031137 -0500
50685@@ -600,7 +600,7 @@ out: 50751@@ -600,7 +600,7 @@ out:
50686 return err; 50752 return err;
50687 } 50753 }
@@ -50691,9 +50757,9 @@ diff -urNp linux-2.6.32.7/net/ipv6/raw.c linux-2.6.32.7/net/ipv6/raw.c
50691 struct flowi *fl, struct rt6_info *rt, 50757 struct flowi *fl, struct rt6_info *rt,
50692 unsigned int flags) 50758 unsigned int flags)
50693 { 50759 {
50694diff -urNp linux-2.6.32.7/net/ipv6/tcp_ipv6.c linux-2.6.32.7/net/ipv6/tcp_ipv6.c 50760diff -urNp linux-2.6.32.8/net/ipv6/tcp_ipv6.c linux-2.6.32.8/net/ipv6/tcp_ipv6.c
50695--- linux-2.6.32.7/net/ipv6/tcp_ipv6.c 2010-01-25 13:50:10.000000000 -0500 50761--- linux-2.6.32.8/net/ipv6/tcp_ipv6.c 2010-02-09 07:57:19.000000000 -0500
50696+++ linux-2.6.32.7/net/ipv6/tcp_ipv6.c 2010-01-25 17:39:41.134431806 -0500 50762+++ linux-2.6.32.8/net/ipv6/tcp_ipv6.c 2010-02-10 15:06:24.654031137 -0500
50697@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk 50763@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk
50698 return 0; 50764 return 0;
50699 50765
@@ -50714,9 +50780,9 @@ diff -urNp linux-2.6.32.7/net/ipv6/tcp_ipv6.c linux-2.6.32.7/net/ipv6/tcp_ipv6.c
50714 tcp_v6_send_reset(NULL, skb); 50780 tcp_v6_send_reset(NULL, skb);
50715 } 50781 }
50716 50782
50717diff -urNp linux-2.6.32.7/net/ipv6/udp.c linux-2.6.32.7/net/ipv6/udp.c 50783diff -urNp linux-2.6.32.8/net/ipv6/udp.c linux-2.6.32.8/net/ipv6/udp.c
50718--- linux-2.6.32.7/net/ipv6/udp.c 2010-01-25 13:50:10.000000000 -0500 50784--- linux-2.6.32.8/net/ipv6/udp.c 2010-02-09 07:57:19.000000000 -0500
50719+++ linux-2.6.32.7/net/ipv6/udp.c 2010-01-25 17:39:41.135121229 -0500 50785+++ linux-2.6.32.8/net/ipv6/udp.c 2010-02-10 15:06:24.654031137 -0500
50720@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, 50786@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb,
50721 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, 50787 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
50722 proto == IPPROTO_UDPLITE); 50788 proto == IPPROTO_UDPLITE);
@@ -50727,9 +50793,9 @@ diff -urNp linux-2.6.32.7/net/ipv6/udp.c linux-2.6.32.7/net/ipv6/udp.c
50727 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); 50793 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
50728 50794
50729 kfree_skb(skb); 50795 kfree_skb(skb);
50730diff -urNp linux-2.6.32.7/net/irda/ircomm/ircomm_tty.c linux-2.6.32.7/net/irda/ircomm/ircomm_tty.c 50796diff -urNp linux-2.6.32.8/net/irda/ircomm/ircomm_tty.c linux-2.6.32.8/net/irda/ircomm/ircomm_tty.c
50731--- linux-2.6.32.7/net/irda/ircomm/ircomm_tty.c 2010-01-25 13:50:10.000000000 -0500 50797--- linux-2.6.32.8/net/irda/ircomm/ircomm_tty.c 2010-02-09 07:57:19.000000000 -0500
50732+++ linux-2.6.32.7/net/irda/ircomm/ircomm_tty.c 2010-01-25 17:39:41.135121229 -0500 50798+++ linux-2.6.32.8/net/irda/ircomm/ircomm_tty.c 2010-02-10 15:06:24.654031137 -0500
50733@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st 50799@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
50734 add_wait_queue(&self->open_wait, &wait); 50800 add_wait_queue(&self->open_wait, &wait);
50735 50801
@@ -50852,9 +50918,9 @@ diff -urNp linux-2.6.32.7/net/irda/ircomm/ircomm_tty.c linux-2.6.32.7/net/irda/i
50852 seq_printf(m, "Max data size: %d\n", self->max_data_size); 50918 seq_printf(m, "Max data size: %d\n", self->max_data_size);
50853 seq_printf(m, "Max header size: %d\n", self->max_header_size); 50919 seq_printf(m, "Max header size: %d\n", self->max_header_size);
50854 50920
50855diff -urNp linux-2.6.32.7/net/mac80211/ieee80211_i.h linux-2.6.32.7/net/mac80211/ieee80211_i.h 50921diff -urNp linux-2.6.32.8/net/mac80211/ieee80211_i.h linux-2.6.32.8/net/mac80211/ieee80211_i.h
50856--- linux-2.6.32.7/net/mac80211/ieee80211_i.h 2010-01-25 13:50:10.000000000 -0500 50922--- linux-2.6.32.8/net/mac80211/ieee80211_i.h 2010-02-09 07:57:19.000000000 -0500
50857+++ linux-2.6.32.7/net/mac80211/ieee80211_i.h 2010-01-25 17:39:41.163782599 -0500 50923+++ linux-2.6.32.8/net/mac80211/ieee80211_i.h 2010-02-10 15:06:24.654031137 -0500
50858@@ -634,7 +634,7 @@ struct ieee80211_local { 50924@@ -634,7 +634,7 @@ struct ieee80211_local {
50859 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ 50925 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
50860 spinlock_t queue_stop_reason_lock; 50926 spinlock_t queue_stop_reason_lock;
@@ -50864,9 +50930,9 @@ diff -urNp linux-2.6.32.7/net/mac80211/ieee80211_i.h linux-2.6.32.7/net/mac80211
50864 int monitors, cooked_mntrs; 50930 int monitors, cooked_mntrs;
50865 /* number of interfaces with corresponding FIF_ flags */ 50931 /* number of interfaces with corresponding FIF_ flags */
50866 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; 50932 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
50867diff -urNp linux-2.6.32.7/net/mac80211/iface.c linux-2.6.32.7/net/mac80211/iface.c 50933diff -urNp linux-2.6.32.8/net/mac80211/iface.c linux-2.6.32.8/net/mac80211/iface.c
50868--- linux-2.6.32.7/net/mac80211/iface.c 2010-01-25 13:50:10.000000000 -0500 50934--- linux-2.6.32.8/net/mac80211/iface.c 2010-02-09 07:57:19.000000000 -0500
50869+++ linux-2.6.32.7/net/mac80211/iface.c 2010-01-25 17:39:41.165269289 -0500 50935+++ linux-2.6.32.8/net/mac80211/iface.c 2010-02-10 15:06:24.654031137 -0500
50870@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev 50936@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
50871 break; 50937 break;
50872 } 50938 }
@@ -50921,9 +50987,9 @@ diff -urNp linux-2.6.32.7/net/mac80211/iface.c linux-2.6.32.7/net/mac80211/iface
50921 ieee80211_clear_tx_pending(local); 50987 ieee80211_clear_tx_pending(local);
50922 ieee80211_stop_device(local); 50988 ieee80211_stop_device(local);
50923 50989
50924diff -urNp linux-2.6.32.7/net/mac80211/main.c linux-2.6.32.7/net/mac80211/main.c 50990diff -urNp linux-2.6.32.8/net/mac80211/main.c linux-2.6.32.8/net/mac80211/main.c
50925--- linux-2.6.32.7/net/mac80211/main.c 2010-01-25 13:50:10.000000000 -0500 50991--- linux-2.6.32.8/net/mac80211/main.c 2010-02-09 07:57:19.000000000 -0500
50926+++ linux-2.6.32.7/net/mac80211/main.c 2010-01-25 17:39:41.165269289 -0500 50992+++ linux-2.6.32.8/net/mac80211/main.c 2010-02-10 15:06:24.654031137 -0500
50927@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 50993@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
50928 local->hw.conf.power_level = power; 50994 local->hw.conf.power_level = power;
50929 } 50995 }
@@ -50933,9 +50999,9 @@ diff -urNp linux-2.6.32.7/net/mac80211/main.c linux-2.6.32.7/net/mac80211/main.c
50933 ret = drv_config(local, changed); 50999 ret = drv_config(local, changed);
50934 /* 51000 /*
50935 * Goal: 51001 * Goal:
50936diff -urNp linux-2.6.32.7/net/mac80211/pm.c linux-2.6.32.7/net/mac80211/pm.c 51002diff -urNp linux-2.6.32.8/net/mac80211/pm.c linux-2.6.32.8/net/mac80211/pm.c
50937--- linux-2.6.32.7/net/mac80211/pm.c 2010-01-25 13:50:10.000000000 -0500 51003--- linux-2.6.32.8/net/mac80211/pm.c 2010-02-09 07:57:19.000000000 -0500
50938+++ linux-2.6.32.7/net/mac80211/pm.c 2010-01-25 17:39:41.165269289 -0500 51004+++ linux-2.6.32.8/net/mac80211/pm.c 2010-02-10 15:06:24.654031137 -0500
50939@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 51005@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
50940 } 51006 }
50941 51007
@@ -50945,9 +51011,9 @@ diff -urNp linux-2.6.32.7/net/mac80211/pm.c linux-2.6.32.7/net/mac80211/pm.c
50945 ieee80211_stop_device(local); 51011 ieee80211_stop_device(local);
50946 51012
50947 local->suspended = true; 51013 local->suspended = true;
50948diff -urNp linux-2.6.32.7/net/mac80211/rate.c linux-2.6.32.7/net/mac80211/rate.c 51014diff -urNp linux-2.6.32.8/net/mac80211/rate.c linux-2.6.32.8/net/mac80211/rate.c
50949--- linux-2.6.32.7/net/mac80211/rate.c 2010-01-25 13:50:10.000000000 -0500 51015--- linux-2.6.32.8/net/mac80211/rate.c 2010-02-09 07:57:19.000000000 -0500
50950+++ linux-2.6.32.7/net/mac80211/rate.c 2010-01-25 17:39:41.165269289 -0500 51016+++ linux-2.6.32.8/net/mac80211/rate.c 2010-02-10 15:06:24.654031137 -0500
50951@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct 51017@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
50952 struct rate_control_ref *ref, *old; 51018 struct rate_control_ref *ref, *old;
50953 51019
@@ -50957,9 +51023,9 @@ diff -urNp linux-2.6.32.7/net/mac80211/rate.c linux-2.6.32.7/net/mac80211/rate.c
50957 return -EBUSY; 51023 return -EBUSY;
50958 51024
50959 ref = rate_control_alloc(name, local); 51025 ref = rate_control_alloc(name, local);
50960diff -urNp linux-2.6.32.7/net/mac80211/util.c linux-2.6.32.7/net/mac80211/util.c 51026diff -urNp linux-2.6.32.8/net/mac80211/util.c linux-2.6.32.8/net/mac80211/util.c
50961--- linux-2.6.32.7/net/mac80211/util.c 2010-01-25 13:50:10.000000000 -0500 51027--- linux-2.6.32.8/net/mac80211/util.c 2010-02-09 07:57:19.000000000 -0500
50962+++ linux-2.6.32.7/net/mac80211/util.c 2010-01-25 17:39:41.166283290 -0500 51028+++ linux-2.6.32.8/net/mac80211/util.c 2010-02-10 15:06:24.654031137 -0500
50963@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ 51029@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_
50964 local->resuming = true; 51030 local->resuming = true;
50965 51031
@@ -50977,9 +51043,9 @@ diff -urNp linux-2.6.32.7/net/mac80211/util.c linux-2.6.32.7/net/mac80211/util.c
50977 if (res) { 51043 if (res) {
50978 WARN(local->suspended, "Harware became unavailable " 51044 WARN(local->suspended, "Harware became unavailable "
50979 "upon resume. This is could be a software issue" 51045 "upon resume. This is could be a software issue"
50980diff -urNp linux-2.6.32.7/net/sctp/socket.c linux-2.6.32.7/net/sctp/socket.c 51046diff -urNp linux-2.6.32.8/net/sctp/socket.c linux-2.6.32.8/net/sctp/socket.c
50981--- linux-2.6.32.7/net/sctp/socket.c 2010-01-25 13:50:10.000000000 -0500 51047--- linux-2.6.32.8/net/sctp/socket.c 2010-02-09 07:57:19.000000000 -0500
50982+++ linux-2.6.32.7/net/sctp/socket.c 2010-01-25 17:39:41.167436540 -0500 51048+++ linux-2.6.32.8/net/sctp/socket.c 2010-02-10 15:06:24.658030270 -0500
50983@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc 51049@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
50984 struct sctp_sndrcvinfo *sinfo; 51050 struct sctp_sndrcvinfo *sinfo;
50985 struct sctp_initmsg *sinit; 51051 struct sctp_initmsg *sinit;
@@ -50997,9 +51063,9 @@ diff -urNp linux-2.6.32.7/net/sctp/socket.c linux-2.6.32.7/net/sctp/socket.c
50997 51063
50998 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); 51064 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
50999 if (pp->fastreuse && sk->sk_reuse && 51065 if (pp->fastreuse && sk->sk_reuse &&
51000diff -urNp linux-2.6.32.7/net/socket.c linux-2.6.32.7/net/socket.c 51066diff -urNp linux-2.6.32.8/net/socket.c linux-2.6.32.8/net/socket.c
51001--- linux-2.6.32.7/net/socket.c 2010-01-25 13:50:10.000000000 -0500 51067--- linux-2.6.32.8/net/socket.c 2010-02-09 07:57:19.000000000 -0500
51002+++ linux-2.6.32.7/net/socket.c 2010-01-25 17:39:41.167436540 -0500 51068+++ linux-2.6.32.8/net/socket.c 2010-02-10 15:06:24.658030270 -0500
51003@@ -87,6 +87,7 @@ 51069@@ -87,6 +87,7 @@
51004 #include <linux/wireless.h> 51070 #include <linux/wireless.h>
51005 #include <linux/nsproxy.h> 51071 #include <linux/nsproxy.h>
@@ -51154,9 +51220,9 @@ diff -urNp linux-2.6.32.7/net/socket.c linux-2.6.32.7/net/socket.c
51154 err = 51220 err =
51155 security_socket_connect(sock, (struct sockaddr *)&address, addrlen); 51221 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
51156 if (err) 51222 if (err)
51157diff -urNp linux-2.6.32.7/net/sysctl_net.c linux-2.6.32.7/net/sysctl_net.c 51223diff -urNp linux-2.6.32.8/net/sysctl_net.c linux-2.6.32.8/net/sysctl_net.c
51158--- linux-2.6.32.7/net/sysctl_net.c 2010-01-25 13:50:10.000000000 -0500 51224--- linux-2.6.32.8/net/sysctl_net.c 2010-02-09 07:57:19.000000000 -0500
51159+++ linux-2.6.32.7/net/sysctl_net.c 2010-01-25 20:00:09.495268524 -0500 51225+++ linux-2.6.32.8/net/sysctl_net.c 2010-02-10 15:06:24.658030270 -0500
51160@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct 51226@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
51161 struct ctl_table *table) 51227 struct ctl_table *table)
51162 { 51228 {
@@ -51166,9 +51232,9 @@ diff -urNp linux-2.6.32.7/net/sysctl_net.c linux-2.6.32.7/net/sysctl_net.c
51166 int mode = (table->mode >> 6) & 7; 51232 int mode = (table->mode >> 6) & 7;
51167 return (mode << 6) | (mode << 3) | mode; 51233 return (mode << 6) | (mode << 3) | mode;
51168 } 51234 }
51169diff -urNp linux-2.6.32.7/net/unix/af_unix.c linux-2.6.32.7/net/unix/af_unix.c 51235diff -urNp linux-2.6.32.8/net/unix/af_unix.c linux-2.6.32.8/net/unix/af_unix.c
51170--- linux-2.6.32.7/net/unix/af_unix.c 2010-01-25 13:50:10.000000000 -0500 51236--- linux-2.6.32.8/net/unix/af_unix.c 2010-02-09 07:57:19.000000000 -0500
51171+++ linux-2.6.32.7/net/unix/af_unix.c 2010-01-25 17:39:41.168432831 -0500 51237+++ linux-2.6.32.8/net/unix/af_unix.c 2010-02-10 15:06:24.658030270 -0500
51172@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru 51238@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru
51173 err = -ECONNREFUSED; 51239 err = -ECONNREFUSED;
51174 if (!S_ISSOCK(inode->i_mode)) 51240 if (!S_ISSOCK(inode->i_mode))
@@ -51226,9 +51292,9 @@ diff -urNp linux-2.6.32.7/net/unix/af_unix.c linux-2.6.32.7/net/unix/af_unix.c
51226 list = &unix_socket_table[addr->hash]; 51292 list = &unix_socket_table[addr->hash];
51227 } else { 51293 } else {
51228 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; 51294 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
51229diff -urNp linux-2.6.32.7/samples/kobject/kset-example.c linux-2.6.32.7/samples/kobject/kset-example.c 51295diff -urNp linux-2.6.32.8/samples/kobject/kset-example.c linux-2.6.32.8/samples/kobject/kset-example.c
51230--- linux-2.6.32.7/samples/kobject/kset-example.c 2010-01-25 13:50:10.000000000 -0500 51296--- linux-2.6.32.8/samples/kobject/kset-example.c 2010-02-09 07:57:19.000000000 -0500
51231+++ linux-2.6.32.7/samples/kobject/kset-example.c 2010-01-25 17:39:41.168432831 -0500 51297+++ linux-2.6.32.8/samples/kobject/kset-example.c 2010-02-10 15:06:24.658030270 -0500
51232@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob 51298@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
51233 } 51299 }
51234 51300
@@ -51238,9 +51304,9 @@ diff -urNp linux-2.6.32.7/samples/kobject/kset-example.c linux-2.6.32.7/samples/
51238 .show = foo_attr_show, 51304 .show = foo_attr_show,
51239 .store = foo_attr_store, 51305 .store = foo_attr_store,
51240 }; 51306 };
51241diff -urNp linux-2.6.32.7/scripts/basic/fixdep.c linux-2.6.32.7/scripts/basic/fixdep.c 51307diff -urNp linux-2.6.32.8/scripts/basic/fixdep.c linux-2.6.32.8/scripts/basic/fixdep.c
51242--- linux-2.6.32.7/scripts/basic/fixdep.c 2010-01-25 13:50:10.000000000 -0500 51308--- linux-2.6.32.8/scripts/basic/fixdep.c 2010-02-09 07:57:19.000000000 -0500
51243+++ linux-2.6.32.7/scripts/basic/fixdep.c 2010-01-25 17:39:41.168432831 -0500 51309+++ linux-2.6.32.8/scripts/basic/fixdep.c 2010-02-10 15:06:24.658030270 -0500
51244@@ -222,9 +222,9 @@ static void use_config(char *m, int slen 51310@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
51245 51311
51246 static void parse_config_file(char *map, size_t len) 51312 static void parse_config_file(char *map, size_t len)
@@ -51262,9 +51328,9 @@ diff -urNp linux-2.6.32.7/scripts/basic/fixdep.c linux-2.6.32.7/scripts/basic/fi
51262 51328
51263 if (*p != INT_CONF) { 51329 if (*p != INT_CONF) {
51264 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", 51330 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
51265diff -urNp linux-2.6.32.7/scripts/kallsyms.c linux-2.6.32.7/scripts/kallsyms.c 51331diff -urNp linux-2.6.32.8/scripts/kallsyms.c linux-2.6.32.8/scripts/kallsyms.c
51266--- linux-2.6.32.7/scripts/kallsyms.c 2010-01-25 13:50:10.000000000 -0500 51332--- linux-2.6.32.8/scripts/kallsyms.c 2010-02-09 07:57:19.000000000 -0500
51267+++ linux-2.6.32.7/scripts/kallsyms.c 2010-01-25 17:39:41.169311253 -0500 51333+++ linux-2.6.32.8/scripts/kallsyms.c 2010-02-10 15:06:24.658030270 -0500
51268@@ -43,10 +43,10 @@ struct text_range { 51334@@ -43,10 +43,10 @@ struct text_range {
51269 51335
51270 static unsigned long long _text; 51336 static unsigned long long _text;
@@ -51280,9 +51346,9 @@ diff -urNp linux-2.6.32.7/scripts/kallsyms.c linux-2.6.32.7/scripts/kallsyms.c
51280 }; 51346 };
51281 #define text_range_text (&text_ranges[0]) 51347 #define text_range_text (&text_ranges[0])
51282 #define text_range_inittext (&text_ranges[1]) 51348 #define text_range_inittext (&text_ranges[1])
51283diff -urNp linux-2.6.32.7/scripts/mod/file2alias.c linux-2.6.32.7/scripts/mod/file2alias.c 51349diff -urNp linux-2.6.32.8/scripts/mod/file2alias.c linux-2.6.32.8/scripts/mod/file2alias.c
51284--- linux-2.6.32.7/scripts/mod/file2alias.c 2010-01-25 13:50:10.000000000 -0500 51350--- linux-2.6.32.8/scripts/mod/file2alias.c 2010-02-09 07:57:19.000000000 -0500
51285+++ linux-2.6.32.7/scripts/mod/file2alias.c 2010-01-25 17:39:41.169311253 -0500 51351+++ linux-2.6.32.8/scripts/mod/file2alias.c 2010-02-10 15:06:24.658030270 -0500
51286@@ -72,7 +72,7 @@ static void device_id_check(const char * 51352@@ -72,7 +72,7 @@ static void device_id_check(const char *
51287 unsigned long size, unsigned long id_size, 51353 unsigned long size, unsigned long id_size,
51288 void *symval) 51354 void *symval)
@@ -51337,9 +51403,9 @@ diff -urNp linux-2.6.32.7/scripts/mod/file2alias.c linux-2.6.32.7/scripts/mod/fi
51337 51403
51338 sprintf(alias, "dmi*"); 51404 sprintf(alias, "dmi*");
51339 51405
51340diff -urNp linux-2.6.32.7/scripts/mod/modpost.c linux-2.6.32.7/scripts/mod/modpost.c 51406diff -urNp linux-2.6.32.8/scripts/mod/modpost.c linux-2.6.32.8/scripts/mod/modpost.c
51341--- linux-2.6.32.7/scripts/mod/modpost.c 2010-01-25 13:50:10.000000000 -0500 51407--- linux-2.6.32.8/scripts/mod/modpost.c 2010-02-09 07:57:19.000000000 -0500
51342+++ linux-2.6.32.7/scripts/mod/modpost.c 2010-01-25 17:39:41.169311253 -0500 51408+++ linux-2.6.32.8/scripts/mod/modpost.c 2010-02-10 15:06:24.658030270 -0500
51343@@ -835,6 +835,7 @@ enum mismatch { 51409@@ -835,6 +835,7 @@ enum mismatch {
51344 INIT_TO_EXIT, 51410 INIT_TO_EXIT,
51345 EXIT_TO_INIT, 51411 EXIT_TO_INIT,
@@ -51407,9 +51473,9 @@ diff -urNp linux-2.6.32.7/scripts/mod/modpost.c linux-2.6.32.7/scripts/mod/modpo
51407 goto close_write; 51473 goto close_write;
51408 51474
51409 tmp = NOFAIL(malloc(b->pos)); 51475 tmp = NOFAIL(malloc(b->pos));
51410diff -urNp linux-2.6.32.7/scripts/mod/modpost.h linux-2.6.32.7/scripts/mod/modpost.h 51476diff -urNp linux-2.6.32.8/scripts/mod/modpost.h linux-2.6.32.8/scripts/mod/modpost.h
51411--- linux-2.6.32.7/scripts/mod/modpost.h 2010-01-25 13:50:10.000000000 -0500 51477--- linux-2.6.32.8/scripts/mod/modpost.h 2010-02-09 07:57:19.000000000 -0500
51412+++ linux-2.6.32.7/scripts/mod/modpost.h 2010-01-25 17:39:41.169311253 -0500 51478+++ linux-2.6.32.8/scripts/mod/modpost.h 2010-02-10 15:06:24.658030270 -0500
51413@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e 51479@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
51414 51480
51415 struct buffer { 51481 struct buffer {
@@ -51429,9 +51495,9 @@ diff -urNp linux-2.6.32.7/scripts/mod/modpost.h linux-2.6.32.7/scripts/mod/modpo
51429 51495
51430 struct module { 51496 struct module {
51431 struct module *next; 51497 struct module *next;
51432diff -urNp linux-2.6.32.7/scripts/mod/sumversion.c linux-2.6.32.7/scripts/mod/sumversion.c 51498diff -urNp linux-2.6.32.8/scripts/mod/sumversion.c linux-2.6.32.8/scripts/mod/sumversion.c
51433--- linux-2.6.32.7/scripts/mod/sumversion.c 2010-01-25 13:50:10.000000000 -0500 51499--- linux-2.6.32.8/scripts/mod/sumversion.c 2010-02-09 07:57:19.000000000 -0500
51434+++ linux-2.6.32.7/scripts/mod/sumversion.c 2010-01-25 17:39:41.170429115 -0500 51500+++ linux-2.6.32.8/scripts/mod/sumversion.c 2010-02-10 15:06:24.658030270 -0500
51435@@ -455,7 +455,7 @@ static void write_version(const char *fi 51501@@ -455,7 +455,7 @@ static void write_version(const char *fi
51436 goto out; 51502 goto out;
51437 } 51503 }
@@ -51441,9 +51507,9 @@ diff -urNp linux-2.6.32.7/scripts/mod/sumversion.c linux-2.6.32.7/scripts/mod/su
51441 warn("writing sum in %s failed: %s\n", 51507 warn("writing sum in %s failed: %s\n",
51442 filename, strerror(errno)); 51508 filename, strerror(errno));
51443 goto out; 51509 goto out;
51444diff -urNp linux-2.6.32.7/scripts/pnmtologo.c linux-2.6.32.7/scripts/pnmtologo.c 51510diff -urNp linux-2.6.32.8/scripts/pnmtologo.c linux-2.6.32.8/scripts/pnmtologo.c
51445--- linux-2.6.32.7/scripts/pnmtologo.c 2010-01-25 13:50:10.000000000 -0500 51511--- linux-2.6.32.8/scripts/pnmtologo.c 2010-02-09 07:57:19.000000000 -0500
51446+++ linux-2.6.32.7/scripts/pnmtologo.c 2010-01-25 17:39:41.170429115 -0500 51512+++ linux-2.6.32.8/scripts/pnmtologo.c 2010-02-10 15:06:24.658030270 -0500
51447@@ -237,14 +237,14 @@ static void write_header(void) 51513@@ -237,14 +237,14 @@ static void write_header(void)
51448 fprintf(out, " * Linux logo %s\n", logoname); 51514 fprintf(out, " * Linux logo %s\n", logoname);
51449 fputs(" */\n\n", out); 51515 fputs(" */\n\n", out);
@@ -51470,9 +51536,9 @@ diff -urNp linux-2.6.32.7/scripts/pnmtologo.c linux-2.6.32.7/scripts/pnmtologo.c
51470 logoname); 51536 logoname);
51471 write_hex_cnt = 0; 51537 write_hex_cnt = 0;
51472 for (i = 0; i < logo_clutsize; i++) { 51538 for (i = 0; i < logo_clutsize; i++) {
51473diff -urNp linux-2.6.32.7/security/commoncap.c linux-2.6.32.7/security/commoncap.c 51539diff -urNp linux-2.6.32.8/security/commoncap.c linux-2.6.32.8/security/commoncap.c
51474--- linux-2.6.32.7/security/commoncap.c 2010-01-25 13:50:10.000000000 -0500 51540--- linux-2.6.32.8/security/commoncap.c 2010-02-09 07:57:19.000000000 -0500
51475+++ linux-2.6.32.7/security/commoncap.c 2010-01-25 17:39:41.170429115 -0500 51541+++ linux-2.6.32.8/security/commoncap.c 2010-02-10 15:06:24.658030270 -0500
51476@@ -27,7 +27,7 @@ 51542@@ -27,7 +27,7 @@
51477 #include <linux/sched.h> 51543 #include <linux/sched.h>
51478 #include <linux/prctl.h> 51544 #include <linux/prctl.h>
@@ -51495,9 +51561,9 @@ diff -urNp linux-2.6.32.7/security/commoncap.c linux-2.6.32.7/security/commoncap
51495 return 0; 51561 return 0;
51496 } 51562 }
51497 51563
51498diff -urNp linux-2.6.32.7/security/integrity/ima/ima_api.c linux-2.6.32.7/security/integrity/ima/ima_api.c 51564diff -urNp linux-2.6.32.8/security/integrity/ima/ima_api.c linux-2.6.32.8/security/integrity/ima/ima_api.c
51499--- linux-2.6.32.7/security/integrity/ima/ima_api.c 2010-01-25 13:50:10.000000000 -0500 51565--- linux-2.6.32.8/security/integrity/ima/ima_api.c 2010-02-09 07:57:19.000000000 -0500
51500+++ linux-2.6.32.7/security/integrity/ima/ima_api.c 2010-01-25 17:39:41.170429115 -0500 51566+++ linux-2.6.32.8/security/integrity/ima/ima_api.c 2010-02-10 15:06:24.658030270 -0500
51501@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino 51567@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
51502 int result; 51568 int result;
51503 51569
@@ -51507,9 +51573,9 @@ diff -urNp linux-2.6.32.7/security/integrity/ima/ima_api.c linux-2.6.32.7/securi
51507 51573
51508 entry = kmalloc(sizeof(*entry), GFP_KERNEL); 51574 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
51509 if (!entry) { 51575 if (!entry) {
51510diff -urNp linux-2.6.32.7/security/integrity/ima/ima_fs.c linux-2.6.32.7/security/integrity/ima/ima_fs.c 51576diff -urNp linux-2.6.32.8/security/integrity/ima/ima_fs.c linux-2.6.32.8/security/integrity/ima/ima_fs.c
51511--- linux-2.6.32.7/security/integrity/ima/ima_fs.c 2010-01-25 13:50:10.000000000 -0500 51577--- linux-2.6.32.8/security/integrity/ima/ima_fs.c 2010-02-09 07:57:19.000000000 -0500
51512+++ linux-2.6.32.7/security/integrity/ima/ima_fs.c 2010-01-25 17:39:41.170429115 -0500 51578+++ linux-2.6.32.8/security/integrity/ima/ima_fs.c 2010-02-10 15:06:24.658030270 -0500
51513@@ -27,12 +27,12 @@ 51579@@ -27,12 +27,12 @@
51514 static int valid_policy = 1; 51580 static int valid_policy = 1;
51515 #define TMPBUFLEN 12 51581 #define TMPBUFLEN 12
@@ -51525,9 +51591,9 @@ diff -urNp linux-2.6.32.7/security/integrity/ima/ima_fs.c linux-2.6.32.7/securit
51525 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); 51591 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
51526 } 51592 }
51527 51593
51528diff -urNp linux-2.6.32.7/security/integrity/ima/ima.h linux-2.6.32.7/security/integrity/ima/ima.h 51594diff -urNp linux-2.6.32.8/security/integrity/ima/ima.h linux-2.6.32.8/security/integrity/ima/ima.h
51529--- linux-2.6.32.7/security/integrity/ima/ima.h 2010-01-25 13:50:10.000000000 -0500 51595--- linux-2.6.32.8/security/integrity/ima/ima.h 2010-02-09 07:57:19.000000000 -0500
51530+++ linux-2.6.32.7/security/integrity/ima/ima.h 2010-01-25 17:39:41.171256372 -0500 51596+++ linux-2.6.32.8/security/integrity/ima/ima.h 2010-02-10 15:06:24.658030270 -0500
51531@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino 51597@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
51532 extern spinlock_t ima_queue_lock; 51598 extern spinlock_t ima_queue_lock;
51533 51599
@@ -51539,9 +51605,9 @@ diff -urNp linux-2.6.32.7/security/integrity/ima/ima.h linux-2.6.32.7/security/i
51539 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; 51605 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
51540 }; 51606 };
51541 extern struct ima_h_table ima_htable; 51607 extern struct ima_h_table ima_htable;
51542diff -urNp linux-2.6.32.7/security/integrity/ima/ima_queue.c linux-2.6.32.7/security/integrity/ima/ima_queue.c 51608diff -urNp linux-2.6.32.8/security/integrity/ima/ima_queue.c linux-2.6.32.8/security/integrity/ima/ima_queue.c
51543--- linux-2.6.32.7/security/integrity/ima/ima_queue.c 2010-01-25 13:50:10.000000000 -0500 51609--- linux-2.6.32.8/security/integrity/ima/ima_queue.c 2010-02-09 07:57:19.000000000 -0500
51544+++ linux-2.6.32.7/security/integrity/ima/ima_queue.c 2010-01-25 17:39:41.171256372 -0500 51610+++ linux-2.6.32.8/security/integrity/ima/ima_queue.c 2010-02-10 15:06:24.658030270 -0500
51545@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i 51611@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
51546 INIT_LIST_HEAD(&qe->later); 51612 INIT_LIST_HEAD(&qe->later);
51547 list_add_tail_rcu(&qe->later, &ima_measurements); 51613 list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -51551,9 +51617,9 @@ diff -urNp linux-2.6.32.7/security/integrity/ima/ima_queue.c linux-2.6.32.7/secu
51551 key = ima_hash_key(entry->digest); 51617 key = ima_hash_key(entry->digest);
51552 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); 51618 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
51553 return 0; 51619 return 0;
51554diff -urNp linux-2.6.32.7/security/Kconfig linux-2.6.32.7/security/Kconfig 51620diff -urNp linux-2.6.32.8/security/Kconfig linux-2.6.32.8/security/Kconfig
51555--- linux-2.6.32.7/security/Kconfig 2010-01-25 13:50:10.000000000 -0500 51621--- linux-2.6.32.8/security/Kconfig 2010-02-09 07:57:19.000000000 -0500
51556+++ linux-2.6.32.7/security/Kconfig 2010-01-25 20:02:43.052267501 -0500 51622+++ linux-2.6.32.8/security/Kconfig 2010-02-10 15:06:29.738308213 -0500
51557@@ -4,6 +4,465 @@ 51623@@ -4,6 +4,465 @@
51558 51624
51559 menu "Security options" 51625 menu "Security options"
@@ -51652,7 +51718,7 @@ diff -urNp linux-2.6.32.7/security/Kconfig linux-2.6.32.7/security/Kconfig
51652+ 51718+
51653+config PAX_NOEXEC 51719+config PAX_NOEXEC
51654+ bool "Enforce non-executable pages" 51720+ bool "Enforce non-executable pages"
51655+ depends on (PAX_EI_PAX || PAX_PT_PAX_FLAGS || PAX_HAVE_ACL_FLAGS || PAX_HOOK_ACL_FLAGS) && (ALPHA || IA64 || MIPS32 || MIPS64 || PARISC || PPC32 || PPC64 || SPARC32 || SPARC64 || X86) 51721+ 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)
51656+ help 51722+ help
51657+ By design some architectures do not allow for protecting memory 51723+ By design some architectures do not allow for protecting memory
51658+ pages against execution or even if they do, Linux does not make 51724+ pages against execution or even if they do, Linux does not make
@@ -52029,9 +52095,9 @@ diff -urNp linux-2.6.32.7/security/Kconfig linux-2.6.32.7/security/Kconfig
52029 help 52095 help
52030 This is the portion of low virtual memory which should be protected 52096 This is the portion of low virtual memory which should be protected
52031 from userspace allocation. Keeping a user from writing to low pages 52097 from userspace allocation. Keeping a user from writing to low pages
52032diff -urNp linux-2.6.32.7/security/min_addr.c linux-2.6.32.7/security/min_addr.c 52098diff -urNp linux-2.6.32.8/security/min_addr.c linux-2.6.32.8/security/min_addr.c
52033--- linux-2.6.32.7/security/min_addr.c 2010-01-25 13:50:10.000000000 -0500 52099--- linux-2.6.32.8/security/min_addr.c 2010-02-09 07:57:19.000000000 -0500
52034+++ linux-2.6.32.7/security/min_addr.c 2010-01-25 17:39:41.171256372 -0500 52100+++ linux-2.6.32.8/security/min_addr.c 2010-02-10 15:06:24.661987205 -0500
52035@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG 52101@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
52036 */ 52102 */
52037 static void update_mmap_min_addr(void) 52103 static void update_mmap_min_addr(void)
@@ -52058,9 +52124,9 @@ diff -urNp linux-2.6.32.7/security/min_addr.c linux-2.6.32.7/security/min_addr.c
52058 ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos); 52124 ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
52059 52125
52060 update_mmap_min_addr(); 52126 update_mmap_min_addr();
52061diff -urNp linux-2.6.32.7/sound/aoa/codecs/onyx.c linux-2.6.32.7/sound/aoa/codecs/onyx.c 52127diff -urNp linux-2.6.32.8/sound/aoa/codecs/onyx.c linux-2.6.32.8/sound/aoa/codecs/onyx.c
52062--- linux-2.6.32.7/sound/aoa/codecs/onyx.c 2010-01-25 13:50:10.000000000 -0500 52128--- linux-2.6.32.8/sound/aoa/codecs/onyx.c 2010-02-09 07:57:19.000000000 -0500
52063+++ linux-2.6.32.7/sound/aoa/codecs/onyx.c 2010-01-25 17:39:41.181130105 -0500 52129+++ linux-2.6.32.8/sound/aoa/codecs/onyx.c 2010-02-10 15:06:24.661987205 -0500
52064@@ -53,7 +53,7 @@ struct onyx { 52130@@ -53,7 +53,7 @@ struct onyx {
52065 spdif_locked:1, 52131 spdif_locked:1,
52066 analog_locked:1, 52132 analog_locked:1,
@@ -52089,9 +52155,9 @@ diff -urNp linux-2.6.32.7/sound/aoa/codecs/onyx.c linux-2.6.32.7/sound/aoa/codec
52089 onyx->spdif_locked = onyx->analog_locked = 0; 52155 onyx->spdif_locked = onyx->analog_locked = 0;
52090 mutex_unlock(&onyx->mutex); 52156 mutex_unlock(&onyx->mutex);
52091 52157
52092diff -urNp linux-2.6.32.7/sound/core/oss/pcm_oss.c linux-2.6.32.7/sound/core/oss/pcm_oss.c 52158diff -urNp linux-2.6.32.8/sound/core/oss/pcm_oss.c linux-2.6.32.8/sound/core/oss/pcm_oss.c
52093--- linux-2.6.32.7/sound/core/oss/pcm_oss.c 2010-01-25 13:50:10.000000000 -0500 52159--- linux-2.6.32.8/sound/core/oss/pcm_oss.c 2010-02-09 07:57:19.000000000 -0500
52094+++ linux-2.6.32.7/sound/core/oss/pcm_oss.c 2010-01-25 17:39:41.199290725 -0500 52160+++ linux-2.6.32.8/sound/core/oss/pcm_oss.c 2010-02-10 15:06:24.661987205 -0500
52095@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct 52161@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
52096 } 52162 }
52097 } 52163 }
@@ -52103,9 +52169,9 @@ diff -urNp linux-2.6.32.7/sound/core/oss/pcm_oss.c linux-2.6.32.7/sound/core/oss
52103 #endif /* CONFIG_SND_VERBOSE_PROCFS */ 52169 #endif /* CONFIG_SND_VERBOSE_PROCFS */
52104 52170
52105 /* 52171 /*
52106diff -urNp linux-2.6.32.7/sound/core/seq/seq_lock.h linux-2.6.32.7/sound/core/seq/seq_lock.h 52172diff -urNp linux-2.6.32.8/sound/core/seq/seq_lock.h linux-2.6.32.8/sound/core/seq/seq_lock.h
52107--- linux-2.6.32.7/sound/core/seq/seq_lock.h 2010-01-25 13:50:10.000000000 -0500 52173--- linux-2.6.32.8/sound/core/seq/seq_lock.h 2010-02-09 07:57:19.000000000 -0500
52108+++ linux-2.6.32.7/sound/core/seq/seq_lock.h 2010-01-25 17:39:41.209263615 -0500 52174+++ linux-2.6.32.8/sound/core/seq/seq_lock.h 2010-02-10 15:06:24.661987205 -0500
52109@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo 52175@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
52110 #else /* SMP || CONFIG_SND_DEBUG */ 52176 #else /* SMP || CONFIG_SND_DEBUG */
52111 52177
@@ -52121,9 +52187,9 @@ diff -urNp linux-2.6.32.7/sound/core/seq/seq_lock.h linux-2.6.32.7/sound/core/se
52121 52187
52122 #endif /* SMP || CONFIG_SND_DEBUG */ 52188 #endif /* SMP || CONFIG_SND_DEBUG */
52123 52189
52124diff -urNp linux-2.6.32.7/sound/drivers/mts64.c linux-2.6.32.7/sound/drivers/mts64.c 52190diff -urNp linux-2.6.32.8/sound/drivers/mts64.c linux-2.6.32.8/sound/drivers/mts64.c
52125--- linux-2.6.32.7/sound/drivers/mts64.c 2010-01-25 13:50:10.000000000 -0500 52191--- linux-2.6.32.8/sound/drivers/mts64.c 2010-02-09 07:57:19.000000000 -0500
52126+++ linux-2.6.32.7/sound/drivers/mts64.c 2010-01-25 17:39:41.215440169 -0500 52192+++ linux-2.6.32.8/sound/drivers/mts64.c 2010-02-10 15:06:24.661987205 -0500
52127@@ -65,7 +65,7 @@ struct mts64 { 52193@@ -65,7 +65,7 @@ struct mts64 {
52128 struct pardevice *pardev; 52194 struct pardevice *pardev;
52129 int pardev_claimed; 52195 int pardev_claimed;
@@ -52172,9 +52238,9 @@ diff -urNp linux-2.6.32.7/sound/drivers/mts64.c linux-2.6.32.7/sound/drivers/mts
52172 52238
52173 return 0; 52239 return 0;
52174 } 52240 }
52175diff -urNp linux-2.6.32.7/sound/drivers/portman2x4.c linux-2.6.32.7/sound/drivers/portman2x4.c 52241diff -urNp linux-2.6.32.8/sound/drivers/portman2x4.c linux-2.6.32.8/sound/drivers/portman2x4.c
52176--- linux-2.6.32.7/sound/drivers/portman2x4.c 2010-01-25 13:50:10.000000000 -0500 52242--- linux-2.6.32.8/sound/drivers/portman2x4.c 2010-02-09 07:57:19.000000000 -0500
52177+++ linux-2.6.32.7/sound/drivers/portman2x4.c 2010-01-25 17:39:41.237254086 -0500 52243+++ linux-2.6.32.8/sound/drivers/portman2x4.c 2010-02-10 15:06:24.661987205 -0500
52178@@ -83,7 +83,7 @@ struct portman { 52244@@ -83,7 +83,7 @@ struct portman {
52179 struct pardevice *pardev; 52245 struct pardevice *pardev;
52180 int pardev_claimed; 52246 int pardev_claimed;
@@ -52184,9 +52250,9 @@ diff -urNp linux-2.6.32.7/sound/drivers/portman2x4.c linux-2.6.32.7/sound/driver
52184 int mode[PORTMAN_NUM_INPUT_PORTS]; 52250 int mode[PORTMAN_NUM_INPUT_PORTS];
52185 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; 52251 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
52186 }; 52252 };
52187diff -urNp linux-2.6.32.7/sound/pci/ac97/ac97_codec.c linux-2.6.32.7/sound/pci/ac97/ac97_codec.c 52253diff -urNp linux-2.6.32.8/sound/pci/ac97/ac97_codec.c linux-2.6.32.8/sound/pci/ac97/ac97_codec.c
52188--- linux-2.6.32.7/sound/pci/ac97/ac97_codec.c 2010-01-25 13:50:10.000000000 -0500 52254--- linux-2.6.32.8/sound/pci/ac97/ac97_codec.c 2010-02-09 07:57:19.000000000 -0500
52189+++ linux-2.6.32.7/sound/pci/ac97/ac97_codec.c 2010-01-25 17:39:41.261223638 -0500 52255+++ linux-2.6.32.8/sound/pci/ac97/ac97_codec.c 2010-02-10 15:06:24.661987205 -0500
52190@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc 52256@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
52191 } 52257 }
52192 52258
@@ -52196,9 +52262,9 @@ diff -urNp linux-2.6.32.7/sound/pci/ac97/ac97_codec.c linux-2.6.32.7/sound/pci/a
52196 52262
52197 #ifdef CONFIG_SND_AC97_POWER_SAVE 52263 #ifdef CONFIG_SND_AC97_POWER_SAVE
52198 static void do_update_power(struct work_struct *work) 52264 static void do_update_power(struct work_struct *work)
52199diff -urNp linux-2.6.32.7/sound/pci/ac97/ac97_patch.c linux-2.6.32.7/sound/pci/ac97/ac97_patch.c 52265diff -urNp linux-2.6.32.8/sound/pci/ac97/ac97_patch.c linux-2.6.32.8/sound/pci/ac97/ac97_patch.c
52200--- linux-2.6.32.7/sound/pci/ac97/ac97_patch.c 2010-01-25 13:50:10.000000000 -0500 52266--- linux-2.6.32.8/sound/pci/ac97/ac97_patch.c 2010-02-09 07:57:19.000000000 -0500
52201+++ linux-2.6.32.7/sound/pci/ac97/ac97_patch.c 2010-01-25 17:39:41.263433086 -0500 52267+++ linux-2.6.32.8/sound/pci/ac97/ac97_patch.c 2010-02-10 15:06:24.661987205 -0500
52202@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd 52268@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
52203 return 0; 52269 return 0;
52204 } 52270 }
@@ -52505,9 +52571,9 @@ diff -urNp linux-2.6.32.7/sound/pci/ac97/ac97_patch.c linux-2.6.32.7/sound/pci/a
52505 .build_specific = patch_ucb1400_specific, 52571 .build_specific = patch_ucb1400_specific,
52506 }; 52572 };
52507 52573
52508diff -urNp linux-2.6.32.7/sound/pci/ens1370.c linux-2.6.32.7/sound/pci/ens1370.c 52574diff -urNp linux-2.6.32.8/sound/pci/ens1370.c linux-2.6.32.8/sound/pci/ens1370.c
52509--- linux-2.6.32.7/sound/pci/ens1370.c 2010-01-25 13:50:10.000000000 -0500 52575--- linux-2.6.32.8/sound/pci/ens1370.c 2010-02-09 07:57:19.000000000 -0500
52510+++ linux-2.6.32.7/sound/pci/ens1370.c 2010-01-25 17:39:41.279868970 -0500 52576+++ linux-2.6.32.8/sound/pci/ens1370.c 2010-02-10 15:06:24.666037441 -0500
52511@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci 52577@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
52512 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ 52578 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
52513 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ 52579 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
@@ -52517,9 +52583,9 @@ diff -urNp linux-2.6.32.7/sound/pci/ens1370.c linux-2.6.32.7/sound/pci/ens1370.c
52517 }; 52583 };
52518 52584
52519 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); 52585 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
52520diff -urNp linux-2.6.32.7/sound/pci/intel8x0.c linux-2.6.32.7/sound/pci/intel8x0.c 52586diff -urNp linux-2.6.32.8/sound/pci/intel8x0.c linux-2.6.32.8/sound/pci/intel8x0.c
52521--- linux-2.6.32.7/sound/pci/intel8x0.c 2010-01-25 13:50:10.000000000 -0500 52587--- linux-2.6.32.8/sound/pci/intel8x0.c 2010-02-09 07:57:19.000000000 -0500
52522+++ linux-2.6.32.7/sound/pci/intel8x0.c 2010-01-25 17:39:41.315386368 -0500 52588+++ linux-2.6.32.8/sound/pci/intel8x0.c 2010-02-10 15:06:24.666037441 -0500
52523@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 52589@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
52524 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 52590 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
52525 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ 52591 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
@@ -52538,9 +52604,9 @@ diff -urNp linux-2.6.32.7/sound/pci/intel8x0.c linux-2.6.32.7/sound/pci/intel8x0
52538 }; 52604 };
52539 52605
52540 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, 52606 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
52541diff -urNp linux-2.6.32.7/sound/pci/intel8x0m.c linux-2.6.32.7/sound/pci/intel8x0m.c 52607diff -urNp linux-2.6.32.8/sound/pci/intel8x0m.c linux-2.6.32.8/sound/pci/intel8x0m.c
52542--- linux-2.6.32.7/sound/pci/intel8x0m.c 2010-01-25 13:50:10.000000000 -0500 52608--- linux-2.6.32.8/sound/pci/intel8x0m.c 2010-02-09 07:57:19.000000000 -0500
52543+++ linux-2.6.32.7/sound/pci/intel8x0m.c 2010-01-25 17:39:41.336823427 -0500 52609+++ linux-2.6.32.8/sound/pci/intel8x0m.c 2010-02-10 15:06:24.666037441 -0500
52544@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 52610@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
52545 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 52611 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
52546 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ 52612 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
@@ -52559,9 +52625,9 @@ diff -urNp linux-2.6.32.7/sound/pci/intel8x0m.c linux-2.6.32.7/sound/pci/intel8x
52559 }; 52625 };
52560 52626
52561 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, 52627 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
52562diff -urNp linux-2.6.32.7/usr/gen_init_cpio.c linux-2.6.32.7/usr/gen_init_cpio.c 52628diff -urNp linux-2.6.32.8/usr/gen_init_cpio.c linux-2.6.32.8/usr/gen_init_cpio.c
52563--- linux-2.6.32.7/usr/gen_init_cpio.c 2010-01-25 13:50:10.000000000 -0500 52629--- linux-2.6.32.8/usr/gen_init_cpio.c 2010-02-09 07:57:19.000000000 -0500
52564+++ linux-2.6.32.7/usr/gen_init_cpio.c 2010-01-25 17:39:41.337270296 -0500 52630+++ linux-2.6.32.8/usr/gen_init_cpio.c 2010-02-10 15:06:24.666037441 -0500
52565@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, 52631@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
52566 int retval; 52632 int retval;
52567 int rc = -1; 52633 int rc = -1;
@@ -52584,9 +52650,9 @@ diff -urNp linux-2.6.32.7/usr/gen_init_cpio.c linux-2.6.32.7/usr/gen_init_cpio.c
52584 } else 52650 } else
52585 break; 52651 break;
52586 } 52652 }
52587diff -urNp linux-2.6.32.7/virt/kvm/kvm_main.c linux-2.6.32.7/virt/kvm/kvm_main.c 52653diff -urNp linux-2.6.32.8/virt/kvm/kvm_main.c linux-2.6.32.8/virt/kvm/kvm_main.c
52588--- linux-2.6.32.7/virt/kvm/kvm_main.c 2010-01-25 13:50:10.000000000 -0500 52654--- linux-2.6.32.8/virt/kvm/kvm_main.c 2010-02-09 07:57:19.000000000 -0500
52589+++ linux-2.6.32.7/virt/kvm/kvm_main.c 2010-01-25 17:39:41.337270296 -0500 52655+++ linux-2.6.32.8/virt/kvm/kvm_main.c 2010-02-10 15:06:24.666037441 -0500
52590@@ -1745,6 +1745,7 @@ static int kvm_vcpu_release(struct inode 52656@@ -1745,6 +1745,7 @@ static int kvm_vcpu_release(struct inode
52591 return 0; 52657 return 0;
52592 } 52658 }
© 2015 Mike Crute