aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-06-03 07:37:23 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-06-07 11:22:17 +0000
commit638f229c484439918cf26212ba2c4022965f6f12 (patch)
tree34884ba623684436715d30fd8fd7099f3e1f0f2a
parentef877852c9b22ca81986cddffc345730bbae73f9 (diff)
downloadalpine_aports-638f229c484439918cf26212ba2c4022965f6f12.tar.bz2
alpine_aports-638f229c484439918cf26212ba2c4022965f6f12.tar.xz
alpine_aports-638f229c484439918cf26212ba2c4022965f6f12.zip
main/linux-grsec: upgrade to 2.1.14-2.6.32.15-201006011506
(cherry picked from commit 8abb83fea8f76cd8c2dc0da2381ff5f9ef78f851)
Diffstat
-rw-r--r--main/linux-grsec/APKBUILD10
-rw-r--r--main/linux-grsec/grsecurity-2.1.14-2.6.32.15-201006011506.patch (renamed from main/linux-grsec/grsecurity-2.1.14-2.6.32.14-201005291720.patch)6893
2 files changed, 3464 insertions, 3439 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index c7ee2f2fc5..c17fa89384 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,9 +2,9 @@
2 2
3_flavor=grsec 3_flavor=grsec
4pkgname=linux-${_flavor} 4pkgname=linux-${_flavor}
5pkgver=2.6.32.14 5pkgver=2.6.32.15
6_kernver=2.6.32 6_kernver=2.6.32
7pkgrel=1 7pkgrel=0
8pkgdesc="Linux kernel with grsecurity" 8pkgdesc="Linux kernel with grsecurity"
9url=http://grsecurity.net 9url=http://grsecurity.net
10depends="mkinitfs linux-firmware" 10depends="mkinitfs linux-firmware"
@@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
14install= 14install=
15source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 15source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
16 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 16 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
17 grsecurity-2.1.14-2.6.32.14-201005291720.patch 17 grsecurity-2.1.14-2.6.32.15-201006011506.patch
18 0001-grsec-revert-conflicting-flow-cache-changes.patch 18 0001-grsec-revert-conflicting-flow-cache-changes.patch
19 0002-gre-fix-hard-header-destination-address-checking.patch 19 0002-gre-fix-hard-header-destination-address-checking.patch
20 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch 20 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
@@ -139,8 +139,8 @@ firmware() {
139} 139}
140 140
141md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 141md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
14290f0ec928aff643f05a8b98fad54b10c patch-2.6.32.14.bz2 1425c9251844c2819eddee4dba1293bd46d patch-2.6.32.15.bz2
143a9985ec4cf7a50beaa755b1ebde839c4 grsecurity-2.1.14-2.6.32.14-201005291720.patch 1437f61d0de3d703c465bff03a20b2dbd30 grsecurity-2.1.14-2.6.32.15-201006011506.patch
1441d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch 1441d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch
145437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch 145437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch
146151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch 146151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.32.14-201005291720.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.32.15-201006011506.patch
index 3e14e9ee25..215c62b4e2 100644
--- a/main/linux-grsec/grsecurity-2.1.14-2.6.32.14-201005291720.patch
+++ b/main/linux-grsec/grsecurity-2.1.14-2.6.32.15-201006011506.patch
@@ -1,6 +1,6 @@
1diff -urNp linux-2.6.32.14/arch/alpha/include/asm/elf.h linux-2.6.32.14/arch/alpha/include/asm/elf.h 1diff -urNp linux-2.6.32.15/arch/alpha/include/asm/elf.h linux-2.6.32.15/arch/alpha/include/asm/elf.h
2--- linux-2.6.32.14/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 2--- linux-2.6.32.15/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
3+++ linux-2.6.32.14/arch/alpha/include/asm/elf.h 2010-05-28 21:27:14.402915497 -0400 3+++ linux-2.6.32.15/arch/alpha/include/asm/elf.h 2010-05-28 21:27:14.402915497 -0400
4@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N 4@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
5 5
6 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) 6 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -15,9 +15,9 @@ diff -urNp linux-2.6.32.14/arch/alpha/include/asm/elf.h linux-2.6.32.14/arch/alp
15 /* $0 is set by ld.so to a pointer to a function which might be 15 /* $0 is set by ld.so to a pointer to a function which might be
16 registered using atexit. This provides a mean for the dynamic 16 registered using atexit. This provides a mean for the dynamic
17 linker to call DT_FINI functions for shared libraries that have 17 linker to call DT_FINI functions for shared libraries that have
18diff -urNp linux-2.6.32.14/arch/alpha/include/asm/pgtable.h linux-2.6.32.14/arch/alpha/include/asm/pgtable.h 18diff -urNp linux-2.6.32.15/arch/alpha/include/asm/pgtable.h linux-2.6.32.15/arch/alpha/include/asm/pgtable.h
19--- linux-2.6.32.14/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 19--- linux-2.6.32.15/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
20+++ linux-2.6.32.14/arch/alpha/include/asm/pgtable.h 2010-05-28 21:27:14.420270024 -0400 20+++ linux-2.6.32.15/arch/alpha/include/asm/pgtable.h 2010-05-28 21:27:14.420270024 -0400
21@@ -101,6 +101,17 @@ struct vm_area_struct; 21@@ -101,6 +101,17 @@ struct vm_area_struct;
22 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) 22 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
23 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) 23 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -36,9 +36,9 @@ diff -urNp linux-2.6.32.14/arch/alpha/include/asm/pgtable.h linux-2.6.32.14/arch
36 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) 36 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
37 37
38 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) 38 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
39diff -urNp linux-2.6.32.14/arch/alpha/kernel/module.c linux-2.6.32.14/arch/alpha/kernel/module.c 39diff -urNp linux-2.6.32.15/arch/alpha/kernel/module.c linux-2.6.32.15/arch/alpha/kernel/module.c
40--- linux-2.6.32.14/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 40--- linux-2.6.32.15/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
41+++ linux-2.6.32.14/arch/alpha/kernel/module.c 2010-05-28 21:27:14.523207400 -0400 41+++ linux-2.6.32.15/arch/alpha/kernel/module.c 2010-05-28 21:27:14.523207400 -0400
42@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 42@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
43 43
44 /* The small sections were sorted to the end of the segment. 44 /* The small sections were sorted to the end of the segment.
@@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.14/arch/alpha/kernel/module.c linux-2.6.32.14/arch/alpha
48 got = sechdrs[me->arch.gotsecindex].sh_addr; 48 got = sechdrs[me->arch.gotsecindex].sh_addr;
49 49
50 for (i = 0; i < n; i++) { 50 for (i = 0; i < n; i++) {
51diff -urNp linux-2.6.32.14/arch/alpha/kernel/osf_sys.c linux-2.6.32.14/arch/alpha/kernel/osf_sys.c 51diff -urNp linux-2.6.32.15/arch/alpha/kernel/osf_sys.c linux-2.6.32.15/arch/alpha/kernel/osf_sys.c
52--- linux-2.6.32.14/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400 52--- linux-2.6.32.15/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400
53+++ linux-2.6.32.14/arch/alpha/kernel/osf_sys.c 2010-05-28 21:27:14.523207400 -0400 53+++ linux-2.6.32.15/arch/alpha/kernel/osf_sys.c 2010-05-28 21:27:14.523207400 -0400
54@@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp 54@@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp
55 merely specific addresses, but regions of memory -- perhaps 55 merely specific addresses, but regions of memory -- perhaps
56 this feature should be incorporated into all ports? */ 56 this feature should be incorporated into all ports? */
@@ -73,9 +73,9 @@ diff -urNp linux-2.6.32.14/arch/alpha/kernel/osf_sys.c linux-2.6.32.14/arch/alph
73 if (addr != (unsigned long) -ENOMEM) 73 if (addr != (unsigned long) -ENOMEM)
74 return addr; 74 return addr;
75 75
76diff -urNp linux-2.6.32.14/arch/alpha/mm/fault.c linux-2.6.32.14/arch/alpha/mm/fault.c 76diff -urNp linux-2.6.32.15/arch/alpha/mm/fault.c linux-2.6.32.15/arch/alpha/mm/fault.c
77--- linux-2.6.32.14/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 77--- linux-2.6.32.15/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
78+++ linux-2.6.32.14/arch/alpha/mm/fault.c 2010-05-28 21:27:14.523207400 -0400 78+++ linux-2.6.32.15/arch/alpha/mm/fault.c 2010-05-28 21:27:14.523207400 -0400
79@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * 79@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
80 __reload_thread(pcb); 80 __reload_thread(pcb);
81 } 81 }
@@ -232,9 +232,9 @@ diff -urNp linux-2.6.32.14/arch/alpha/mm/fault.c linux-2.6.32.14/arch/alpha/mm/f
232 } else if (!cause) { 232 } else if (!cause) {
233 /* Allow reads even for write-only mappings */ 233 /* Allow reads even for write-only mappings */
234 if (!(vma->vm_flags & (VM_READ | VM_WRITE))) 234 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
235diff -urNp linux-2.6.32.14/arch/arm/include/asm/elf.h linux-2.6.32.14/arch/arm/include/asm/elf.h 235diff -urNp linux-2.6.32.15/arch/arm/include/asm/elf.h linux-2.6.32.15/arch/arm/include/asm/elf.h
236--- linux-2.6.32.14/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 236--- linux-2.6.32.15/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
237+++ linux-2.6.32.14/arch/arm/include/asm/elf.h 2010-05-28 21:27:14.523207400 -0400 237+++ linux-2.6.32.15/arch/arm/include/asm/elf.h 2010-05-28 21:27:14.523207400 -0400
238@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t 238@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
239 the loader. We need to make sure that it is out of the way of the program 239 the loader. We need to make sure that it is out of the way of the program
240 that it will "exec", and that there is sufficient room for the brk. */ 240 that it will "exec", and that there is sufficient room for the brk. */
@@ -251,9 +251,9 @@ diff -urNp linux-2.6.32.14/arch/arm/include/asm/elf.h linux-2.6.32.14/arch/arm/i
251 251
252 /* When the program starts, a1 contains a pointer to a function to be 252 /* When the program starts, a1 contains a pointer to a function to be
253 registered with atexit, as per the SVR4 ABI. A value of 0 means we 253 registered with atexit, as per the SVR4 ABI. A value of 0 means we
254diff -urNp linux-2.6.32.14/arch/arm/include/asm/kmap_types.h linux-2.6.32.14/arch/arm/include/asm/kmap_types.h 254diff -urNp linux-2.6.32.15/arch/arm/include/asm/kmap_types.h linux-2.6.32.15/arch/arm/include/asm/kmap_types.h
255--- linux-2.6.32.14/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 255--- linux-2.6.32.15/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
256+++ linux-2.6.32.14/arch/arm/include/asm/kmap_types.h 2010-05-28 21:27:14.523207400 -0400 256+++ linux-2.6.32.15/arch/arm/include/asm/kmap_types.h 2010-05-28 21:27:14.523207400 -0400
257@@ -19,6 +19,7 @@ enum km_type { 257@@ -19,6 +19,7 @@ enum km_type {
258 KM_SOFTIRQ0, 258 KM_SOFTIRQ0,
259 KM_SOFTIRQ1, 259 KM_SOFTIRQ1,
@@ -262,9 +262,9 @@ diff -urNp linux-2.6.32.14/arch/arm/include/asm/kmap_types.h linux-2.6.32.14/arc
262 KM_TYPE_NR 262 KM_TYPE_NR
263 }; 263 };
264 264
265diff -urNp linux-2.6.32.14/arch/arm/include/asm/uaccess.h linux-2.6.32.14/arch/arm/include/asm/uaccess.h 265diff -urNp linux-2.6.32.15/arch/arm/include/asm/uaccess.h linux-2.6.32.15/arch/arm/include/asm/uaccess.h
266--- linux-2.6.32.14/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 266--- linux-2.6.32.15/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
267+++ linux-2.6.32.14/arch/arm/include/asm/uaccess.h 2010-05-28 21:27:14.539151073 -0400 267+++ linux-2.6.32.15/arch/arm/include/asm/uaccess.h 2010-05-28 21:27:14.539151073 -0400
268@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn 268@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
269 269
270 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) 270 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -285,9 +285,9 @@ diff -urNp linux-2.6.32.14/arch/arm/include/asm/uaccess.h linux-2.6.32.14/arch/a
285 if (access_ok(VERIFY_WRITE, to, n)) 285 if (access_ok(VERIFY_WRITE, to, n))
286 n = __copy_to_user(to, from, n); 286 n = __copy_to_user(to, from, n);
287 return n; 287 return n;
288diff -urNp linux-2.6.32.14/arch/arm/kernel/kgdb.c linux-2.6.32.14/arch/arm/kernel/kgdb.c 288diff -urNp linux-2.6.32.15/arch/arm/kernel/kgdb.c linux-2.6.32.15/arch/arm/kernel/kgdb.c
289--- linux-2.6.32.14/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 289--- linux-2.6.32.15/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
290+++ linux-2.6.32.14/arch/arm/kernel/kgdb.c 2010-05-28 21:27:14.539151073 -0400 290+++ linux-2.6.32.15/arch/arm/kernel/kgdb.c 2010-05-28 21:27:14.539151073 -0400
291@@ -190,7 +190,7 @@ void kgdb_arch_exit(void) 291@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
292 * and we handle the normal undef case within the do_undefinstr 292 * and we handle the normal undef case within the do_undefinstr
293 * handler. 293 * handler.
@@ -297,9 +297,9 @@ diff -urNp linux-2.6.32.14/arch/arm/kernel/kgdb.c linux-2.6.32.14/arch/arm/kerne
297 #ifndef __ARMEB__ 297 #ifndef __ARMEB__
298 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} 298 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
299 #else /* ! __ARMEB__ */ 299 #else /* ! __ARMEB__ */
300diff -urNp linux-2.6.32.14/arch/arm/mach-at91/pm.c linux-2.6.32.14/arch/arm/mach-at91/pm.c 300diff -urNp linux-2.6.32.15/arch/arm/mach-at91/pm.c linux-2.6.32.15/arch/arm/mach-at91/pm.c
301--- linux-2.6.32.14/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400 301--- linux-2.6.32.15/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400
302+++ linux-2.6.32.14/arch/arm/mach-at91/pm.c 2010-05-28 21:27:14.600189804 -0400 302+++ linux-2.6.32.15/arch/arm/mach-at91/pm.c 2010-05-28 21:27:14.600189804 -0400
303@@ -348,7 +348,7 @@ static void at91_pm_end(void) 303@@ -348,7 +348,7 @@ static void at91_pm_end(void)
304 } 304 }
305 305
@@ -309,9 +309,9 @@ diff -urNp linux-2.6.32.14/arch/arm/mach-at91/pm.c linux-2.6.32.14/arch/arm/mach
309 .valid = at91_pm_valid_state, 309 .valid = at91_pm_valid_state,
310 .begin = at91_pm_begin, 310 .begin = at91_pm_begin,
311 .enter = at91_pm_enter, 311 .enter = at91_pm_enter,
312diff -urNp linux-2.6.32.14/arch/arm/mach-omap1/pm.c linux-2.6.32.14/arch/arm/mach-omap1/pm.c 312diff -urNp linux-2.6.32.15/arch/arm/mach-omap1/pm.c linux-2.6.32.15/arch/arm/mach-omap1/pm.c
313--- linux-2.6.32.14/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400 313--- linux-2.6.32.15/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400
314+++ linux-2.6.32.14/arch/arm/mach-omap1/pm.c 2010-05-28 21:27:14.600189804 -0400 314+++ linux-2.6.32.15/arch/arm/mach-omap1/pm.c 2010-05-28 21:27:14.600189804 -0400
315@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq 315@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
316 316
317 317
@@ -321,9 +321,9 @@ diff -urNp linux-2.6.32.14/arch/arm/mach-omap1/pm.c linux-2.6.32.14/arch/arm/mac
321 .prepare = omap_pm_prepare, 321 .prepare = omap_pm_prepare,
322 .enter = omap_pm_enter, 322 .enter = omap_pm_enter,
323 .finish = omap_pm_finish, 323 .finish = omap_pm_finish,
324diff -urNp linux-2.6.32.14/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.14/arch/arm/mach-omap2/pm24xx.c 324diff -urNp linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c
325--- linux-2.6.32.14/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400 325--- linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400
326+++ linux-2.6.32.14/arch/arm/mach-omap2/pm24xx.c 2010-05-28 21:27:14.650418612 -0400 326+++ linux-2.6.32.15/arch/arm/mach-omap2/pm24xx.c 2010-05-28 21:27:14.650418612 -0400
327@@ -326,7 +326,7 @@ static void omap2_pm_finish(void) 327@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
328 enable_hlt(); 328 enable_hlt();
329 } 329 }
@@ -333,9 +333,9 @@ diff -urNp linux-2.6.32.14/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.14/arch/arm
333 .prepare = omap2_pm_prepare, 333 .prepare = omap2_pm_prepare,
334 .enter = omap2_pm_enter, 334 .enter = omap2_pm_enter,
335 .finish = omap2_pm_finish, 335 .finish = omap2_pm_finish,
336diff -urNp linux-2.6.32.14/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.14/arch/arm/mach-omap2/pm34xx.c 336diff -urNp linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c
337--- linux-2.6.32.14/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400 337--- linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400
338+++ linux-2.6.32.14/arch/arm/mach-omap2/pm34xx.c 2010-05-28 21:27:14.651073283 -0400 338+++ linux-2.6.32.15/arch/arm/mach-omap2/pm34xx.c 2010-05-28 21:27:14.651073283 -0400
339@@ -401,7 +401,7 @@ static void omap3_pm_end(void) 339@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
340 return; 340 return;
341 } 341 }
@@ -345,9 +345,9 @@ diff -urNp linux-2.6.32.14/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.14/arch/arm
345 .begin = omap3_pm_begin, 345 .begin = omap3_pm_begin,
346 .end = omap3_pm_end, 346 .end = omap3_pm_end,
347 .prepare = omap3_pm_prepare, 347 .prepare = omap3_pm_prepare,
348diff -urNp linux-2.6.32.14/arch/arm/mach-pnx4008/pm.c linux-2.6.32.14/arch/arm/mach-pnx4008/pm.c 348diff -urNp linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c
349--- linux-2.6.32.14/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400 349--- linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400
350+++ linux-2.6.32.14/arch/arm/mach-pnx4008/pm.c 2010-05-28 21:27:14.651073283 -0400 350+++ linux-2.6.32.15/arch/arm/mach-pnx4008/pm.c 2010-05-28 21:27:14.651073283 -0400
351@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat 351@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
352 (state == PM_SUSPEND_MEM); 352 (state == PM_SUSPEND_MEM);
353 } 353 }
@@ -357,9 +357,9 @@ diff -urNp linux-2.6.32.14/arch/arm/mach-pnx4008/pm.c linux-2.6.32.14/arch/arm/m
357 .enter = pnx4008_pm_enter, 357 .enter = pnx4008_pm_enter,
358 .valid = pnx4008_pm_valid, 358 .valid = pnx4008_pm_valid,
359 }; 359 };
360diff -urNp linux-2.6.32.14/arch/arm/mach-pxa/pm.c linux-2.6.32.14/arch/arm/mach-pxa/pm.c 360diff -urNp linux-2.6.32.15/arch/arm/mach-pxa/pm.c linux-2.6.32.15/arch/arm/mach-pxa/pm.c
361--- linux-2.6.32.14/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400 361--- linux-2.6.32.15/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400
362+++ linux-2.6.32.14/arch/arm/mach-pxa/pm.c 2010-05-28 21:27:14.651073283 -0400 362+++ linux-2.6.32.15/arch/arm/mach-pxa/pm.c 2010-05-28 21:27:14.651073283 -0400
363@@ -95,7 +95,7 @@ void pxa_pm_finish(void) 363@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
364 pxa_cpu_pm_fns->finish(); 364 pxa_cpu_pm_fns->finish();
365 } 365 }
@@ -369,9 +369,9 @@ diff -urNp linux-2.6.32.14/arch/arm/mach-pxa/pm.c linux-2.6.32.14/arch/arm/mach-
369 .valid = pxa_pm_valid, 369 .valid = pxa_pm_valid,
370 .enter = pxa_pm_enter, 370 .enter = pxa_pm_enter,
371 .prepare = pxa_pm_prepare, 371 .prepare = pxa_pm_prepare,
372diff -urNp linux-2.6.32.14/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.14/arch/arm/mach-pxa/sharpsl_pm.c 372diff -urNp linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c
373--- linux-2.6.32.14/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400 373--- linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400
374+++ linux-2.6.32.14/arch/arm/mach-pxa/sharpsl_pm.c 2010-05-28 21:27:14.674954367 -0400 374+++ linux-2.6.32.15/arch/arm/mach-pxa/sharpsl_pm.c 2010-05-28 21:27:14.674954367 -0400
375@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status 375@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
376 } 376 }
377 377
@@ -381,9 +381,9 @@ diff -urNp linux-2.6.32.14/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.14/arch/a
381 .prepare = pxa_pm_prepare, 381 .prepare = pxa_pm_prepare,
382 .finish = pxa_pm_finish, 382 .finish = pxa_pm_finish,
383 .enter = corgi_pxa_pm_enter, 383 .enter = corgi_pxa_pm_enter,
384diff -urNp linux-2.6.32.14/arch/arm/mach-sa1100/pm.c linux-2.6.32.14/arch/arm/mach-sa1100/pm.c 384diff -urNp linux-2.6.32.15/arch/arm/mach-sa1100/pm.c linux-2.6.32.15/arch/arm/mach-sa1100/pm.c
385--- linux-2.6.32.14/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400 385--- linux-2.6.32.15/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400
386+++ linux-2.6.32.14/arch/arm/mach-sa1100/pm.c 2010-05-28 21:27:14.674954367 -0400 386+++ linux-2.6.32.15/arch/arm/mach-sa1100/pm.c 2010-05-28 21:27:14.674954367 -0400
387@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) 387@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
388 return virt_to_phys(sp); 388 return virt_to_phys(sp);
389 } 389 }
@@ -393,9 +393,9 @@ diff -urNp linux-2.6.32.14/arch/arm/mach-sa1100/pm.c linux-2.6.32.14/arch/arm/ma
393 .enter = sa11x0_pm_enter, 393 .enter = sa11x0_pm_enter,
394 .valid = suspend_valid_only_mem, 394 .valid = suspend_valid_only_mem,
395 }; 395 };
396diff -urNp linux-2.6.32.14/arch/arm/mm/fault.c linux-2.6.32.14/arch/arm/mm/fault.c 396diff -urNp linux-2.6.32.15/arch/arm/mm/fault.c linux-2.6.32.15/arch/arm/mm/fault.c
397--- linux-2.6.32.14/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 397--- linux-2.6.32.15/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
398+++ linux-2.6.32.14/arch/arm/mm/fault.c 2010-05-28 21:27:14.683127211 -0400 398+++ linux-2.6.32.15/arch/arm/mm/fault.c 2010-05-28 21:27:14.683127211 -0400
399@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, 399@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
400 } 400 }
401 #endif 401 #endif
@@ -444,9 +444,9 @@ diff -urNp linux-2.6.32.14/arch/arm/mm/fault.c linux-2.6.32.14/arch/arm/mm/fault
444 /* 444 /*
445 * First Level Translation Fault Handler 445 * First Level Translation Fault Handler
446 * 446 *
447diff -urNp linux-2.6.32.14/arch/arm/mm/mmap.c linux-2.6.32.14/arch/arm/mm/mmap.c 447diff -urNp linux-2.6.32.15/arch/arm/mm/mmap.c linux-2.6.32.15/arch/arm/mm/mmap.c
448--- linux-2.6.32.14/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 448--- linux-2.6.32.15/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
449+++ linux-2.6.32.14/arch/arm/mm/mmap.c 2010-05-28 21:27:14.704140649 -0400 449+++ linux-2.6.32.15/arch/arm/mm/mmap.c 2010-05-28 21:27:14.704140649 -0400
450@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp 450@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
451 if (len > TASK_SIZE) 451 if (len > TASK_SIZE)
452 return -ENOMEM; 452 return -ENOMEM;
@@ -483,9 +483,9 @@ diff -urNp linux-2.6.32.14/arch/arm/mm/mmap.c linux-2.6.32.14/arch/arm/mm/mmap.c
483 mm->cached_hole_size = 0; 483 mm->cached_hole_size = 0;
484 goto full_search; 484 goto full_search;
485 } 485 }
486diff -urNp linux-2.6.32.14/arch/arm/plat-s3c/pm.c linux-2.6.32.14/arch/arm/plat-s3c/pm.c 486diff -urNp linux-2.6.32.15/arch/arm/plat-s3c/pm.c linux-2.6.32.15/arch/arm/plat-s3c/pm.c
487--- linux-2.6.32.14/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400 487--- linux-2.6.32.15/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400
488+++ linux-2.6.32.14/arch/arm/plat-s3c/pm.c 2010-05-28 21:27:14.704140649 -0400 488+++ linux-2.6.32.15/arch/arm/plat-s3c/pm.c 2010-05-28 21:27:14.704140649 -0400
489@@ -355,7 +355,7 @@ static void s3c_pm_finish(void) 489@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
490 s3c_pm_check_cleanup(); 490 s3c_pm_check_cleanup();
491 } 491 }
@@ -495,9 +495,9 @@ diff -urNp linux-2.6.32.14/arch/arm/plat-s3c/pm.c linux-2.6.32.14/arch/arm/plat-
495 .enter = s3c_pm_enter, 495 .enter = s3c_pm_enter,
496 .prepare = s3c_pm_prepare, 496 .prepare = s3c_pm_prepare,
497 .finish = s3c_pm_finish, 497 .finish = s3c_pm_finish,
498diff -urNp linux-2.6.32.14/arch/avr32/include/asm/elf.h linux-2.6.32.14/arch/avr32/include/asm/elf.h 498diff -urNp linux-2.6.32.15/arch/avr32/include/asm/elf.h linux-2.6.32.15/arch/avr32/include/asm/elf.h
499--- linux-2.6.32.14/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 499--- linux-2.6.32.15/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
500+++ linux-2.6.32.14/arch/avr32/include/asm/elf.h 2010-05-28 21:27:14.704140649 -0400 500+++ linux-2.6.32.15/arch/avr32/include/asm/elf.h 2010-05-28 21:27:14.704140649 -0400
501@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg 501@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
502 the loader. We need to make sure that it is out of the way of the program 502 the loader. We need to make sure that it is out of the way of the program
503 that it will "exec", and that there is sufficient room for the brk. */ 503 that it will "exec", and that there is sufficient room for the brk. */
@@ -514,9 +514,9 @@ diff -urNp linux-2.6.32.14/arch/avr32/include/asm/elf.h linux-2.6.32.14/arch/avr
514 514
515 /* This yields a mask that user programs can use to figure out what 515 /* This yields a mask that user programs can use to figure out what
516 instruction set this CPU supports. This could be done in user space, 516 instruction set this CPU supports. This could be done in user space,
517diff -urNp linux-2.6.32.14/arch/avr32/include/asm/kmap_types.h linux-2.6.32.14/arch/avr32/include/asm/kmap_types.h 517diff -urNp linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h
518--- linux-2.6.32.14/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 518--- linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
519+++ linux-2.6.32.14/arch/avr32/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400 519+++ linux-2.6.32.15/arch/avr32/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400
520@@ -22,7 +22,8 @@ D(10) KM_IRQ0, 520@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
521 D(11) KM_IRQ1, 521 D(11) KM_IRQ1,
522 D(12) KM_SOFTIRQ0, 522 D(12) KM_SOFTIRQ0,
@@ -527,9 +527,9 @@ diff -urNp linux-2.6.32.14/arch/avr32/include/asm/kmap_types.h linux-2.6.32.14/a
527 }; 527 };
528 528
529 #undef D 529 #undef D
530diff -urNp linux-2.6.32.14/arch/avr32/mach-at32ap/pm.c linux-2.6.32.14/arch/avr32/mach-at32ap/pm.c 530diff -urNp linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c
531--- linux-2.6.32.14/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400 531--- linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400
532+++ linux-2.6.32.14/arch/avr32/mach-at32ap/pm.c 2010-05-28 21:27:14.706951400 -0400 532+++ linux-2.6.32.15/arch/avr32/mach-at32ap/pm.c 2010-05-28 21:27:14.706951400 -0400
533@@ -176,7 +176,7 @@ out: 533@@ -176,7 +176,7 @@ out:
534 return 0; 534 return 0;
535 } 535 }
@@ -539,9 +539,9 @@ diff -urNp linux-2.6.32.14/arch/avr32/mach-at32ap/pm.c linux-2.6.32.14/arch/avr3
539 .valid = avr32_pm_valid_state, 539 .valid = avr32_pm_valid_state,
540 .enter = avr32_pm_enter, 540 .enter = avr32_pm_enter,
541 }; 541 };
542diff -urNp linux-2.6.32.14/arch/avr32/mm/fault.c linux-2.6.32.14/arch/avr32/mm/fault.c 542diff -urNp linux-2.6.32.15/arch/avr32/mm/fault.c linux-2.6.32.15/arch/avr32/mm/fault.c
543--- linux-2.6.32.14/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 543--- linux-2.6.32.15/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
544+++ linux-2.6.32.14/arch/avr32/mm/fault.c 2010-05-28 21:27:14.706951400 -0400 544+++ linux-2.6.32.15/arch/avr32/mm/fault.c 2010-05-28 21:27:14.706951400 -0400
545@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru 545@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
546 546
547 int exception_trace = 1; 547 int exception_trace = 1;
@@ -583,9 +583,9 @@ diff -urNp linux-2.6.32.14/arch/avr32/mm/fault.c linux-2.6.32.14/arch/avr32/mm/f
583 if (exception_trace && printk_ratelimit()) 583 if (exception_trace && printk_ratelimit())
584 printk("%s%s[%d]: segfault at %08lx pc %08lx " 584 printk("%s%s[%d]: segfault at %08lx pc %08lx "
585 "sp %08lx ecr %lu\n", 585 "sp %08lx ecr %lu\n",
586diff -urNp linux-2.6.32.14/arch/blackfin/kernel/kgdb.c linux-2.6.32.14/arch/blackfin/kernel/kgdb.c 586diff -urNp linux-2.6.32.15/arch/blackfin/kernel/kgdb.c linux-2.6.32.15/arch/blackfin/kernel/kgdb.c
587--- linux-2.6.32.14/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 587--- linux-2.6.32.15/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
588+++ linux-2.6.32.14/arch/blackfin/kernel/kgdb.c 2010-05-28 21:27:14.706951400 -0400 588+++ linux-2.6.32.15/arch/blackfin/kernel/kgdb.c 2010-05-28 21:27:14.706951400 -0400
589@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto 589@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
590 return -1; /* this means that we do not want to exit from the handler */ 590 return -1; /* this means that we do not want to exit from the handler */
591 } 591 }
@@ -595,9 +595,9 @@ diff -urNp linux-2.6.32.14/arch/blackfin/kernel/kgdb.c linux-2.6.32.14/arch/blac
595 .gdb_bpt_instr = {0xa1}, 595 .gdb_bpt_instr = {0xa1},
596 #ifdef CONFIG_SMP 596 #ifdef CONFIG_SMP
597 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, 597 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
598diff -urNp linux-2.6.32.14/arch/blackfin/mach-common/pm.c linux-2.6.32.14/arch/blackfin/mach-common/pm.c 598diff -urNp linux-2.6.32.15/arch/blackfin/mach-common/pm.c linux-2.6.32.15/arch/blackfin/mach-common/pm.c
599--- linux-2.6.32.14/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400 599--- linux-2.6.32.15/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400
600+++ linux-2.6.32.14/arch/blackfin/mach-common/pm.c 2010-05-28 21:27:14.706951400 -0400 600+++ linux-2.6.32.15/arch/blackfin/mach-common/pm.c 2010-05-28 21:27:14.706951400 -0400
601@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t 601@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
602 return 0; 602 return 0;
603 } 603 }
@@ -607,9 +607,9 @@ diff -urNp linux-2.6.32.14/arch/blackfin/mach-common/pm.c linux-2.6.32.14/arch/b
607 .enter = bfin_pm_enter, 607 .enter = bfin_pm_enter,
608 .valid = bfin_pm_valid, 608 .valid = bfin_pm_valid,
609 }; 609 };
610diff -urNp linux-2.6.32.14/arch/frv/include/asm/kmap_types.h linux-2.6.32.14/arch/frv/include/asm/kmap_types.h 610diff -urNp linux-2.6.32.15/arch/frv/include/asm/kmap_types.h linux-2.6.32.15/arch/frv/include/asm/kmap_types.h
611--- linux-2.6.32.14/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 611--- linux-2.6.32.15/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
612+++ linux-2.6.32.14/arch/frv/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400 612+++ linux-2.6.32.15/arch/frv/include/asm/kmap_types.h 2010-05-28 21:27:14.706951400 -0400
613@@ -23,6 +23,7 @@ enum km_type { 613@@ -23,6 +23,7 @@ enum km_type {
614 KM_IRQ1, 614 KM_IRQ1,
615 KM_SOFTIRQ0, 615 KM_SOFTIRQ0,
@@ -618,9 +618,9 @@ diff -urNp linux-2.6.32.14/arch/frv/include/asm/kmap_types.h linux-2.6.32.14/arc
618 KM_TYPE_NR 618 KM_TYPE_NR
619 }; 619 };
620 620
621diff -urNp linux-2.6.32.14/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.14/arch/ia64/hp/common/hwsw_iommu.c 621diff -urNp linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c
622--- linux-2.6.32.14/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400 622--- linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400
623+++ linux-2.6.32.14/arch/ia64/hp/common/hwsw_iommu.c 2010-05-28 21:27:14.706951400 -0400 623+++ linux-2.6.32.15/arch/ia64/hp/common/hwsw_iommu.c 2010-05-28 21:27:14.706951400 -0400
624@@ -17,7 +17,7 @@ 624@@ -17,7 +17,7 @@
625 #include <linux/swiotlb.h> 625 #include <linux/swiotlb.h>
626 #include <asm/machvec.h> 626 #include <asm/machvec.h>
@@ -639,9 +639,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.14/arch
639 { 639 {
640 if (use_swiotlb(dev)) 640 if (use_swiotlb(dev))
641 return &swiotlb_dma_ops; 641 return &swiotlb_dma_ops;
642diff -urNp linux-2.6.32.14/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.14/arch/ia64/hp/common/sba_iommu.c 642diff -urNp linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c
643--- linux-2.6.32.14/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400 643--- linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400
644+++ linux-2.6.32.14/arch/ia64/hp/common/sba_iommu.c 2010-05-28 21:27:14.706951400 -0400 644+++ linux-2.6.32.15/arch/ia64/hp/common/sba_iommu.c 2010-05-28 21:27:14.706951400 -0400
645@@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d 645@@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d
646 }, 646 },
647 }; 647 };
@@ -660,9 +660,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.14/arch/
660 .alloc_coherent = sba_alloc_coherent, 660 .alloc_coherent = sba_alloc_coherent,
661 .free_coherent = sba_free_coherent, 661 .free_coherent = sba_free_coherent,
662 .map_page = sba_map_page, 662 .map_page = sba_map_page,
663diff -urNp linux-2.6.32.14/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.14/arch/ia64/ia32/binfmt_elf32.c 663diff -urNp linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c
664--- linux-2.6.32.14/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400 664--- linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400
665+++ linux-2.6.32.14/arch/ia64/ia32/binfmt_elf32.c 2010-05-28 21:27:14.706951400 -0400 665+++ linux-2.6.32.15/arch/ia64/ia32/binfmt_elf32.c 2010-05-28 21:27:14.706951400 -0400
666@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ 666@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
667 667
668 #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) 668 #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack))
@@ -677,9 +677,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.14/arch/ia
677 /* Ugly but avoids duplication */ 677 /* Ugly but avoids duplication */
678 #include "../../../fs/binfmt_elf.c" 678 #include "../../../fs/binfmt_elf.c"
679 679
680diff -urNp linux-2.6.32.14/arch/ia64/ia32/ia32priv.h linux-2.6.32.14/arch/ia64/ia32/ia32priv.h 680diff -urNp linux-2.6.32.15/arch/ia64/ia32/ia32priv.h linux-2.6.32.15/arch/ia64/ia32/ia32priv.h
681--- linux-2.6.32.14/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400 681--- linux-2.6.32.15/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400
682+++ linux-2.6.32.14/arch/ia64/ia32/ia32priv.h 2010-05-28 21:27:14.716122970 -0400 682+++ linux-2.6.32.15/arch/ia64/ia32/ia32priv.h 2010-05-28 21:27:14.716122970 -0400
683@@ -296,7 +296,14 @@ typedef struct compat_siginfo { 683@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
684 #define ELF_DATA ELFDATA2LSB 684 #define ELF_DATA ELFDATA2LSB
685 #define ELF_ARCH EM_386 685 #define ELF_ARCH EM_386
@@ -696,9 +696,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/ia32/ia32priv.h linux-2.6.32.14/arch/ia64/i
696 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET 696 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET
697 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE 697 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
698 698
699diff -urNp linux-2.6.32.14/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.14/arch/ia64/include/asm/dma-mapping.h 699diff -urNp linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h
700--- linux-2.6.32.14/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 700--- linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
701+++ linux-2.6.32.14/arch/ia64/include/asm/dma-mapping.h 2010-05-28 21:27:14.716122970 -0400 701+++ linux-2.6.32.15/arch/ia64/include/asm/dma-mapping.h 2010-05-28 21:27:14.716122970 -0400
702@@ -12,7 +12,7 @@ 702@@ -12,7 +12,7 @@
703 703
704 #define ARCH_HAS_DMA_GET_REQUIRED_MASK 704 #define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -742,9 +742,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.14/a
742 return ops->dma_supported(dev, mask); 742 return ops->dma_supported(dev, mask);
743 } 743 }
744 744
745diff -urNp linux-2.6.32.14/arch/ia64/include/asm/elf.h linux-2.6.32.14/arch/ia64/include/asm/elf.h 745diff -urNp linux-2.6.32.15/arch/ia64/include/asm/elf.h linux-2.6.32.15/arch/ia64/include/asm/elf.h
746--- linux-2.6.32.14/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 746--- linux-2.6.32.15/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
747+++ linux-2.6.32.14/arch/ia64/include/asm/elf.h 2010-05-28 21:27:14.716122970 -0400 747+++ linux-2.6.32.15/arch/ia64/include/asm/elf.h 2010-05-28 21:27:14.716122970 -0400
748@@ -43,6 +43,13 @@ 748@@ -43,6 +43,13 @@
749 */ 749 */
750 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) 750 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -759,9 +759,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/include/asm/elf.h linux-2.6.32.14/arch/ia64
759 #define PT_IA_64_UNWIND 0x70000001 759 #define PT_IA_64_UNWIND 0x70000001
760 760
761 /* IA-64 relocations: */ 761 /* IA-64 relocations: */
762diff -urNp linux-2.6.32.14/arch/ia64/include/asm/machvec.h linux-2.6.32.14/arch/ia64/include/asm/machvec.h 762diff -urNp linux-2.6.32.15/arch/ia64/include/asm/machvec.h linux-2.6.32.15/arch/ia64/include/asm/machvec.h
763--- linux-2.6.32.14/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400 763--- linux-2.6.32.15/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400
764+++ linux-2.6.32.14/arch/ia64/include/asm/machvec.h 2010-05-28 21:27:14.716122970 -0400 764+++ linux-2.6.32.15/arch/ia64/include/asm/machvec.h 2010-05-28 21:27:14.716122970 -0400
765@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event 765@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
766 /* DMA-mapping interface: */ 766 /* DMA-mapping interface: */
767 typedef void ia64_mv_dma_init (void); 767 typedef void ia64_mv_dma_init (void);
@@ -780,9 +780,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/include/asm/machvec.h linux-2.6.32.14/arch/
780 780
781 /* 781 /*
782 * Define default versions so we can extend machvec for new platforms without having 782 * Define default versions so we can extend machvec for new platforms without having
783diff -urNp linux-2.6.32.14/arch/ia64/include/asm/pgtable.h linux-2.6.32.14/arch/ia64/include/asm/pgtable.h 783diff -urNp linux-2.6.32.15/arch/ia64/include/asm/pgtable.h linux-2.6.32.15/arch/ia64/include/asm/pgtable.h
784--- linux-2.6.32.14/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 784--- linux-2.6.32.15/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
785+++ linux-2.6.32.14/arch/ia64/include/asm/pgtable.h 2010-05-28 21:27:14.716122970 -0400 785+++ linux-2.6.32.15/arch/ia64/include/asm/pgtable.h 2010-05-28 21:27:14.716122970 -0400
786@@ -143,6 +143,17 @@ 786@@ -143,6 +143,17 @@
787 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) 787 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
788 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) 788 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
@@ -801,9 +801,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/include/asm/pgtable.h linux-2.6.32.14/arch/
801 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) 801 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
802 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) 802 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
803 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) 803 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
804diff -urNp linux-2.6.32.14/arch/ia64/include/asm/uaccess.h linux-2.6.32.14/arch/ia64/include/asm/uaccess.h 804diff -urNp linux-2.6.32.15/arch/ia64/include/asm/uaccess.h linux-2.6.32.15/arch/ia64/include/asm/uaccess.h
805--- linux-2.6.32.14/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 805--- linux-2.6.32.15/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
806+++ linux-2.6.32.14/arch/ia64/include/asm/uaccess.h 2010-05-28 21:27:14.728159079 -0400 806+++ linux-2.6.32.15/arch/ia64/include/asm/uaccess.h 2010-05-28 21:27:14.728159079 -0400
807@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ 807@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
808 const void *__cu_from = (from); \ 808 const void *__cu_from = (from); \
809 long __cu_len = (n); \ 809 long __cu_len = (n); \
@@ -822,9 +822,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/include/asm/uaccess.h linux-2.6.32.14/arch/
822 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ 822 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
823 __cu_len; \ 823 __cu_len; \
824 }) 824 })
825diff -urNp linux-2.6.32.14/arch/ia64/kernel/dma-mapping.c linux-2.6.32.14/arch/ia64/kernel/dma-mapping.c 825diff -urNp linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c
826--- linux-2.6.32.14/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400 826--- linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400
827+++ linux-2.6.32.14/arch/ia64/kernel/dma-mapping.c 2010-05-28 21:27:14.731127928 -0400 827+++ linux-2.6.32.15/arch/ia64/kernel/dma-mapping.c 2010-05-28 21:27:14.731127928 -0400
828@@ -3,7 +3,7 @@ 828@@ -3,7 +3,7 @@
829 /* Set this to 1 if there is a HW IOMMU in the system */ 829 /* Set this to 1 if there is a HW IOMMU in the system */
830 int iommu_detected __read_mostly; 830 int iommu_detected __read_mostly;
@@ -843,9 +843,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/kernel/dma-mapping.c linux-2.6.32.14/arch/i
843 { 843 {
844 return dma_ops; 844 return dma_ops;
845 } 845 }
846diff -urNp linux-2.6.32.14/arch/ia64/kernel/module.c linux-2.6.32.14/arch/ia64/kernel/module.c 846diff -urNp linux-2.6.32.15/arch/ia64/kernel/module.c linux-2.6.32.15/arch/ia64/kernel/module.c
847--- linux-2.6.32.14/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 847--- linux-2.6.32.15/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
848+++ linux-2.6.32.14/arch/ia64/kernel/module.c 2010-05-28 21:27:14.734962469 -0400 848+++ linux-2.6.32.15/arch/ia64/kernel/module.c 2010-05-28 21:27:14.734962469 -0400
849@@ -315,8 +315,7 @@ module_alloc (unsigned long size) 849@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
850 void 850 void
851 module_free (struct module *mod, void *module_region) 851 module_free (struct module *mod, void *module_region)
@@ -934,9 +934,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/kernel/module.c linux-2.6.32.14/arch/ia64/k
934 mod->arch.gp = gp; 934 mod->arch.gp = gp;
935 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); 935 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
936 } 936 }
937diff -urNp linux-2.6.32.14/arch/ia64/kernel/pci-dma.c linux-2.6.32.14/arch/ia64/kernel/pci-dma.c 937diff -urNp linux-2.6.32.15/arch/ia64/kernel/pci-dma.c linux-2.6.32.15/arch/ia64/kernel/pci-dma.c
938--- linux-2.6.32.14/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 938--- linux-2.6.32.15/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
939+++ linux-2.6.32.14/arch/ia64/kernel/pci-dma.c 2010-05-28 21:27:14.734962469 -0400 939+++ linux-2.6.32.15/arch/ia64/kernel/pci-dma.c 2010-05-28 21:27:14.734962469 -0400
940@@ -43,7 +43,7 @@ struct device fallback_dev = { 940@@ -43,7 +43,7 @@ struct device fallback_dev = {
941 .dma_mask = &fallback_dev.coherent_dma_mask, 941 .dma_mask = &fallback_dev.coherent_dma_mask,
942 }; 942 };
@@ -946,9 +946,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/kernel/pci-dma.c linux-2.6.32.14/arch/ia64/
946 946
947 static int __init pci_iommu_init(void) 947 static int __init pci_iommu_init(void)
948 { 948 {
949diff -urNp linux-2.6.32.14/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.14/arch/ia64/kernel/pci-swiotlb.c 949diff -urNp linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c
950--- linux-2.6.32.14/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 950--- linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
951+++ linux-2.6.32.14/arch/ia64/kernel/pci-swiotlb.c 2010-05-28 21:27:14.734962469 -0400 951+++ linux-2.6.32.15/arch/ia64/kernel/pci-swiotlb.c 2010-05-28 21:27:14.734962469 -0400
952@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent 952@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
953 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); 953 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
954 } 954 }
@@ -958,9 +958,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.14/arch/i
958 .alloc_coherent = ia64_swiotlb_alloc_coherent, 958 .alloc_coherent = ia64_swiotlb_alloc_coherent,
959 .free_coherent = swiotlb_free_coherent, 959 .free_coherent = swiotlb_free_coherent,
960 .map_page = swiotlb_map_page, 960 .map_page = swiotlb_map_page,
961diff -urNp linux-2.6.32.14/arch/ia64/kernel/sys_ia64.c linux-2.6.32.14/arch/ia64/kernel/sys_ia64.c 961diff -urNp linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c
962--- linux-2.6.32.14/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400 962--- linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400
963+++ linux-2.6.32.14/arch/ia64/kernel/sys_ia64.c 2010-05-28 21:27:14.734962469 -0400 963+++ linux-2.6.32.15/arch/ia64/kernel/sys_ia64.c 2010-05-28 21:27:14.734962469 -0400
964@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil 964@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
965 if (REGION_NUMBER(addr) == RGN_HPAGE) 965 if (REGION_NUMBER(addr) == RGN_HPAGE)
966 addr = 0; 966 addr = 0;
@@ -987,9 +987,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/kernel/sys_ia64.c linux-2.6.32.14/arch/ia64
987 goto full_search; 987 goto full_search;
988 } 988 }
989 return -ENOMEM; 989 return -ENOMEM;
990diff -urNp linux-2.6.32.14/arch/ia64/kernel/topology.c linux-2.6.32.14/arch/ia64/kernel/topology.c 990diff -urNp linux-2.6.32.15/arch/ia64/kernel/topology.c linux-2.6.32.15/arch/ia64/kernel/topology.c
991--- linux-2.6.32.14/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400 991--- linux-2.6.32.15/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400
992+++ linux-2.6.32.14/arch/ia64/kernel/topology.c 2010-05-28 21:27:14.743147071 -0400 992+++ linux-2.6.32.15/arch/ia64/kernel/topology.c 2010-05-28 21:27:14.743147071 -0400
993@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject 993@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
994 return ret; 994 return ret;
995 } 995 }
@@ -999,9 +999,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/kernel/topology.c linux-2.6.32.14/arch/ia64
999 .show = cache_show 999 .show = cache_show
1000 }; 1000 };
1001 1001
1002diff -urNp linux-2.6.32.14/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.14/arch/ia64/kernel/vmlinux.lds.S 1002diff -urNp linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S
1003--- linux-2.6.32.14/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 1003--- linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
1004+++ linux-2.6.32.14/arch/ia64/kernel/vmlinux.lds.S 2010-05-28 21:27:14.743147071 -0400 1004+++ linux-2.6.32.15/arch/ia64/kernel/vmlinux.lds.S 2010-05-28 21:27:14.743147071 -0400
1005@@ -190,7 +190,7 @@ SECTIONS 1005@@ -190,7 +190,7 @@ SECTIONS
1006 /* Per-cpu data: */ 1006 /* Per-cpu data: */
1007 . = ALIGN(PERCPU_PAGE_SIZE); 1007 . = ALIGN(PERCPU_PAGE_SIZE);
@@ -1011,9 +1011,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.14/arch/i
1011 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits 1011 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
1012 * into percpu page size 1012 * into percpu page size
1013 */ 1013 */
1014diff -urNp linux-2.6.32.14/arch/ia64/mm/fault.c linux-2.6.32.14/arch/ia64/mm/fault.c 1014diff -urNp linux-2.6.32.15/arch/ia64/mm/fault.c linux-2.6.32.15/arch/ia64/mm/fault.c
1015--- linux-2.6.32.14/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 1015--- linux-2.6.32.15/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1016+++ linux-2.6.32.14/arch/ia64/mm/fault.c 2010-05-28 21:27:14.743147071 -0400 1016+++ linux-2.6.32.15/arch/ia64/mm/fault.c 2010-05-28 21:27:14.743147071 -0400
1017@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 1017@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
1018 return pte_present(pte); 1018 return pte_present(pte);
1019 } 1019 }
@@ -1063,9 +1063,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/mm/fault.c linux-2.6.32.14/arch/ia64/mm/fau
1063 survive: 1063 survive:
1064 /* 1064 /*
1065 * If for any reason at all we couldn't handle the fault, make 1065 * If for any reason at all we couldn't handle the fault, make
1066diff -urNp linux-2.6.32.14/arch/ia64/mm/init.c linux-2.6.32.14/arch/ia64/mm/init.c 1066diff -urNp linux-2.6.32.15/arch/ia64/mm/init.c linux-2.6.32.15/arch/ia64/mm/init.c
1067--- linux-2.6.32.14/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400 1067--- linux-2.6.32.15/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400
1068+++ linux-2.6.32.14/arch/ia64/mm/init.c 2010-05-28 21:27:14.755165915 -0400 1068+++ linux-2.6.32.15/arch/ia64/mm/init.c 2010-05-28 21:27:14.755165915 -0400
1069@@ -122,6 +122,19 @@ ia64_init_addr_space (void) 1069@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
1070 vma->vm_start = current->thread.rbs_bot & PAGE_MASK; 1070 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
1071 vma->vm_end = vma->vm_start + PAGE_SIZE; 1071 vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1086,9 +1086,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/mm/init.c linux-2.6.32.14/arch/ia64/mm/init
1086 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 1086 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
1087 down_write(&current->mm->mmap_sem); 1087 down_write(&current->mm->mmap_sem);
1088 if (insert_vm_struct(current->mm, vma)) { 1088 if (insert_vm_struct(current->mm, vma)) {
1089diff -urNp linux-2.6.32.14/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.14/arch/ia64/sn/pci/pci_dma.c 1089diff -urNp linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c
1090--- linux-2.6.32.14/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400 1090--- linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400
1091+++ linux-2.6.32.14/arch/ia64/sn/pci/pci_dma.c 2010-05-28 21:27:14.755165915 -0400 1091+++ linux-2.6.32.15/arch/ia64/sn/pci/pci_dma.c 2010-05-28 21:27:14.755165915 -0400
1092@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * 1092@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
1093 return ret; 1093 return ret;
1094 } 1094 }
@@ -1098,9 +1098,9 @@ diff -urNp linux-2.6.32.14/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.14/arch/ia64/
1098 .alloc_coherent = sn_dma_alloc_coherent, 1098 .alloc_coherent = sn_dma_alloc_coherent,
1099 .free_coherent = sn_dma_free_coherent, 1099 .free_coherent = sn_dma_free_coherent,
1100 .map_page = sn_dma_map_page, 1100 .map_page = sn_dma_map_page,
1101diff -urNp linux-2.6.32.14/arch/m32r/lib/usercopy.c linux-2.6.32.14/arch/m32r/lib/usercopy.c 1101diff -urNp linux-2.6.32.15/arch/m32r/lib/usercopy.c linux-2.6.32.15/arch/m32r/lib/usercopy.c
1102--- linux-2.6.32.14/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400 1102--- linux-2.6.32.15/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400
1103+++ linux-2.6.32.14/arch/m32r/lib/usercopy.c 2010-05-28 21:27:14.755165915 -0400 1103+++ linux-2.6.32.15/arch/m32r/lib/usercopy.c 2010-05-28 21:27:14.755165915 -0400
1104@@ -14,6 +14,9 @@ 1104@@ -14,6 +14,9 @@
1105 unsigned long 1105 unsigned long
1106 __generic_copy_to_user(void __user *to, const void *from, unsigned long n) 1106 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1121,9 +1121,9 @@ diff -urNp linux-2.6.32.14/arch/m32r/lib/usercopy.c linux-2.6.32.14/arch/m32r/li
1121 prefetchw(to); 1121 prefetchw(to);
1122 if (access_ok(VERIFY_READ, from, n)) 1122 if (access_ok(VERIFY_READ, from, n))
1123 __copy_user_zeroing(to,from,n); 1123 __copy_user_zeroing(to,from,n);
1124diff -urNp linux-2.6.32.14/arch/mips/alchemy/devboards/pm.c linux-2.6.32.14/arch/mips/alchemy/devboards/pm.c 1124diff -urNp linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c
1125--- linux-2.6.32.14/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400 1125--- linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400
1126+++ linux-2.6.32.14/arch/mips/alchemy/devboards/pm.c 2010-05-28 21:27:14.755165915 -0400 1126+++ linux-2.6.32.15/arch/mips/alchemy/devboards/pm.c 2010-05-28 21:27:14.755165915 -0400
1127@@ -78,7 +78,7 @@ static void db1x_pm_end(void) 1127@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
1128 1128
1129 } 1129 }
@@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.32.14/arch/mips/alchemy/devboards/pm.c linux-2.6.32.14/arch
1133 .valid = suspend_valid_only_mem, 1133 .valid = suspend_valid_only_mem,
1134 .begin = db1x_pm_begin, 1134 .begin = db1x_pm_begin,
1135 .enter = db1x_pm_enter, 1135 .enter = db1x_pm_enter,
1136diff -urNp linux-2.6.32.14/arch/mips/include/asm/elf.h linux-2.6.32.14/arch/mips/include/asm/elf.h 1136diff -urNp linux-2.6.32.15/arch/mips/include/asm/elf.h linux-2.6.32.15/arch/mips/include/asm/elf.h
1137--- linux-2.6.32.14/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 1137--- linux-2.6.32.15/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1138+++ linux-2.6.32.14/arch/mips/include/asm/elf.h 2010-05-28 21:27:14.755165915 -0400 1138+++ linux-2.6.32.15/arch/mips/include/asm/elf.h 2010-05-28 21:27:14.755165915 -0400
1139@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str 1139@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
1140 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) 1140 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1141 #endif 1141 #endif
@@ -1148,9 +1148,9 @@ diff -urNp linux-2.6.32.14/arch/mips/include/asm/elf.h linux-2.6.32.14/arch/mips
1148+#endif 1148+#endif
1149+ 1149+
1150 #endif /* _ASM_ELF_H */ 1150 #endif /* _ASM_ELF_H */
1151diff -urNp linux-2.6.32.14/arch/mips/include/asm/page.h linux-2.6.32.14/arch/mips/include/asm/page.h 1151diff -urNp linux-2.6.32.15/arch/mips/include/asm/page.h linux-2.6.32.15/arch/mips/include/asm/page.h
1152--- linux-2.6.32.14/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 1152--- linux-2.6.32.15/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
1153+++ linux-2.6.32.14/arch/mips/include/asm/page.h 2010-05-28 21:27:14.755165915 -0400 1153+++ linux-2.6.32.15/arch/mips/include/asm/page.h 2010-05-28 21:27:14.755165915 -0400
1154@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa 1154@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
1155 #ifdef CONFIG_CPU_MIPS32 1155 #ifdef CONFIG_CPU_MIPS32
1156 typedef struct { unsigned long pte_low, pte_high; } pte_t; 1156 typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1160,9 +1160,9 @@ diff -urNp linux-2.6.32.14/arch/mips/include/asm/page.h linux-2.6.32.14/arch/mip
1160 #else 1160 #else
1161 typedef struct { unsigned long long pte; } pte_t; 1161 typedef struct { unsigned long long pte; } pte_t;
1162 #define pte_val(x) ((x).pte) 1162 #define pte_val(x) ((x).pte)
1163diff -urNp linux-2.6.32.14/arch/mips/include/asm/system.h linux-2.6.32.14/arch/mips/include/asm/system.h 1163diff -urNp linux-2.6.32.15/arch/mips/include/asm/system.h linux-2.6.32.15/arch/mips/include/asm/system.h
1164--- linux-2.6.32.14/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 1164--- linux-2.6.32.15/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
1165+++ linux-2.6.32.14/arch/mips/include/asm/system.h 2010-05-28 21:27:14.755165915 -0400 1165+++ linux-2.6.32.15/arch/mips/include/asm/system.h 2010-05-28 21:27:14.755165915 -0400
1166@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); 1166@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
1167 */ 1167 */
1168 #define __ARCH_WANT_UNLOCKED_CTXSW 1168 #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1171,9 +1171,9 @@ diff -urNp linux-2.6.32.14/arch/mips/include/asm/system.h linux-2.6.32.14/arch/m
1171+#define arch_align_stack(x) ((x) & ALMASK) 1171+#define arch_align_stack(x) ((x) & ALMASK)
1172 1172
1173 #endif /* _ASM_SYSTEM_H */ 1173 #endif /* _ASM_SYSTEM_H */
1174diff -urNp linux-2.6.32.14/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.14/arch/mips/kernel/binfmt_elfn32.c 1174diff -urNp linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c
1175--- linux-2.6.32.14/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400 1175--- linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400
1176+++ linux-2.6.32.14/arch/mips/kernel/binfmt_elfn32.c 2010-05-28 21:27:14.755165915 -0400 1176+++ linux-2.6.32.15/arch/mips/kernel/binfmt_elfn32.c 2010-05-28 21:27:14.755165915 -0400
1177@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N 1177@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
1178 #undef ELF_ET_DYN_BASE 1178 #undef ELF_ET_DYN_BASE
1179 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) 1179 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1188,9 +1188,9 @@ diff -urNp linux-2.6.32.14/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.14/arch
1188 #include <asm/processor.h> 1188 #include <asm/processor.h>
1189 #include <linux/module.h> 1189 #include <linux/module.h>
1190 #include <linux/elfcore.h> 1190 #include <linux/elfcore.h>
1191diff -urNp linux-2.6.32.14/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.14/arch/mips/kernel/binfmt_elfo32.c 1191diff -urNp linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c
1192--- linux-2.6.32.14/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400 1192--- linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400
1193+++ linux-2.6.32.14/arch/mips/kernel/binfmt_elfo32.c 2010-05-28 21:27:14.755165915 -0400 1193+++ linux-2.6.32.15/arch/mips/kernel/binfmt_elfo32.c 2010-05-28 21:27:14.755165915 -0400
1194@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N 1194@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
1195 #undef ELF_ET_DYN_BASE 1195 #undef ELF_ET_DYN_BASE
1196 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) 1196 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1205,9 +1205,9 @@ diff -urNp linux-2.6.32.14/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.14/arch
1205 #include <asm/processor.h> 1205 #include <asm/processor.h>
1206 1206
1207 /* 1207 /*
1208diff -urNp linux-2.6.32.14/arch/mips/kernel/kgdb.c linux-2.6.32.14/arch/mips/kernel/kgdb.c 1208diff -urNp linux-2.6.32.15/arch/mips/kernel/kgdb.c linux-2.6.32.15/arch/mips/kernel/kgdb.c
1209--- linux-2.6.32.14/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 1209--- linux-2.6.32.15/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
1210+++ linux-2.6.32.14/arch/mips/kernel/kgdb.c 2010-05-28 21:27:14.771146775 -0400 1210+++ linux-2.6.32.15/arch/mips/kernel/kgdb.c 2010-05-28 21:27:14.771146775 -0400
1211@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto 1211@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
1212 return -1; 1212 return -1;
1213 } 1213 }
@@ -1216,9 +1216,9 @@ diff -urNp linux-2.6.32.14/arch/mips/kernel/kgdb.c linux-2.6.32.14/arch/mips/ker
1216 struct kgdb_arch arch_kgdb_ops; 1216 struct kgdb_arch arch_kgdb_ops;
1217 1217
1218 /* 1218 /*
1219diff -urNp linux-2.6.32.14/arch/mips/kernel/process.c linux-2.6.32.14/arch/mips/kernel/process.c 1219diff -urNp linux-2.6.32.15/arch/mips/kernel/process.c linux-2.6.32.15/arch/mips/kernel/process.c
1220--- linux-2.6.32.14/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 1220--- linux-2.6.32.15/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
1221+++ linux-2.6.32.14/arch/mips/kernel/process.c 2010-05-28 21:27:14.796819534 -0400 1221+++ linux-2.6.32.15/arch/mips/kernel/process.c 2010-05-28 21:27:14.796819534 -0400
1222@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru 1222@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
1223 out: 1223 out:
1224 return pc; 1224 return pc;
@@ -1235,9 +1235,9 @@ diff -urNp linux-2.6.32.14/arch/mips/kernel/process.c linux-2.6.32.14/arch/mips/
1235- 1235-
1236- return sp & ALMASK; 1236- return sp & ALMASK;
1237-} 1237-}
1238diff -urNp linux-2.6.32.14/arch/mips/kernel/syscall.c linux-2.6.32.14/arch/mips/kernel/syscall.c 1238diff -urNp linux-2.6.32.15/arch/mips/kernel/syscall.c linux-2.6.32.15/arch/mips/kernel/syscall.c
1239--- linux-2.6.32.14/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400 1239--- linux-2.6.32.15/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400
1240+++ linux-2.6.32.14/arch/mips/kernel/syscall.c 2010-05-28 21:27:14.796819534 -0400 1240+++ linux-2.6.32.15/arch/mips/kernel/syscall.c 2010-05-28 21:27:14.796819534 -0400
1241@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str 1241@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str
1242 do_color_align = 0; 1242 do_color_align = 0;
1243 if (filp || (flags & MAP_SHARED)) 1243 if (filp || (flags & MAP_SHARED))
@@ -1259,9 +1259,9 @@ diff -urNp linux-2.6.32.14/arch/mips/kernel/syscall.c linux-2.6.32.14/arch/mips/
1259 if (do_color_align) 1259 if (do_color_align)
1260 addr = COLOUR_ALIGN(addr, pgoff); 1260 addr = COLOUR_ALIGN(addr, pgoff);
1261 else 1261 else
1262diff -urNp linux-2.6.32.14/arch/mips/mm/fault.c linux-2.6.32.14/arch/mips/mm/fault.c 1262diff -urNp linux-2.6.32.15/arch/mips/mm/fault.c linux-2.6.32.15/arch/mips/mm/fault.c
1263--- linux-2.6.32.14/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 1263--- linux-2.6.32.15/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1264+++ linux-2.6.32.14/arch/mips/mm/fault.c 2010-05-28 21:27:14.796819534 -0400 1264+++ linux-2.6.32.15/arch/mips/mm/fault.c 2010-05-28 21:27:14.796819534 -0400
1265@@ -26,6 +26,23 @@ 1265@@ -26,6 +26,23 @@
1266 #include <asm/ptrace.h> 1266 #include <asm/ptrace.h>
1267 #include <asm/highmem.h> /* For VMALLOC_END */ 1267 #include <asm/highmem.h> /* For VMALLOC_END */
@@ -1286,9 +1286,9 @@ diff -urNp linux-2.6.32.14/arch/mips/mm/fault.c linux-2.6.32.14/arch/mips/mm/fau
1286 /* 1286 /*
1287 * This routine handles page faults. It determines the address, 1287 * This routine handles page faults. It determines the address,
1288 * and the problem, and then passes it off to one of the appropriate 1288 * and the problem, and then passes it off to one of the appropriate
1289diff -urNp linux-2.6.32.14/arch/parisc/include/asm/elf.h linux-2.6.32.14/arch/parisc/include/asm/elf.h 1289diff -urNp linux-2.6.32.15/arch/parisc/include/asm/elf.h linux-2.6.32.15/arch/parisc/include/asm/elf.h
1290--- linux-2.6.32.14/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 1290--- linux-2.6.32.15/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1291+++ linux-2.6.32.14/arch/parisc/include/asm/elf.h 2010-05-28 21:27:14.796819534 -0400 1291+++ linux-2.6.32.15/arch/parisc/include/asm/elf.h 2010-05-28 21:27:14.796819534 -0400
1292@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. 1292@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
1293 1293
1294 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) 1294 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1303,9 +1303,9 @@ diff -urNp linux-2.6.32.14/arch/parisc/include/asm/elf.h linux-2.6.32.14/arch/pa
1303 /* This yields a mask that user programs can use to figure out what 1303 /* This yields a mask that user programs can use to figure out what
1304 instruction set this CPU supports. This could be done in user space, 1304 instruction set this CPU supports. This could be done in user space,
1305 but it's not easy, and we've already done it here. */ 1305 but it's not easy, and we've already done it here. */
1306diff -urNp linux-2.6.32.14/arch/parisc/include/asm/pgtable.h linux-2.6.32.14/arch/parisc/include/asm/pgtable.h 1306diff -urNp linux-2.6.32.15/arch/parisc/include/asm/pgtable.h linux-2.6.32.15/arch/parisc/include/asm/pgtable.h
1307--- linux-2.6.32.14/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 1307--- linux-2.6.32.15/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
1308+++ linux-2.6.32.14/arch/parisc/include/asm/pgtable.h 2010-05-28 21:27:14.796819534 -0400 1308+++ linux-2.6.32.15/arch/parisc/include/asm/pgtable.h 2010-05-28 21:27:14.796819534 -0400
1309@@ -207,6 +207,17 @@ 1309@@ -207,6 +207,17 @@
1310 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) 1310 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
1311 #define PAGE_COPY PAGE_EXECREAD 1311 #define PAGE_COPY PAGE_EXECREAD
@@ -1324,9 +1324,9 @@ diff -urNp linux-2.6.32.14/arch/parisc/include/asm/pgtable.h linux-2.6.32.14/arc
1324 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) 1324 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
1325 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) 1325 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
1326 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) 1326 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
1327diff -urNp linux-2.6.32.14/arch/parisc/kernel/module.c linux-2.6.32.14/arch/parisc/kernel/module.c 1327diff -urNp linux-2.6.32.15/arch/parisc/kernel/module.c linux-2.6.32.15/arch/parisc/kernel/module.c
1328--- linux-2.6.32.14/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 1328--- linux-2.6.32.15/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
1329+++ linux-2.6.32.14/arch/parisc/kernel/module.c 2010-05-28 21:27:14.796819534 -0400 1329+++ linux-2.6.32.15/arch/parisc/kernel/module.c 2010-05-28 21:27:14.796819534 -0400
1330@@ -95,16 +95,38 @@ 1330@@ -95,16 +95,38 @@
1331 1331
1332 /* three functions to determine where in the module core 1332 /* three functions to determine where in the module core
@@ -1427,9 +1427,9 @@ diff -urNp linux-2.6.32.14/arch/parisc/kernel/module.c linux-2.6.32.14/arch/pari
1427 1427
1428 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", 1428 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
1429 me->arch.unwind_section, table, end, gp); 1429 me->arch.unwind_section, table, end, gp);
1430diff -urNp linux-2.6.32.14/arch/parisc/kernel/sys_parisc.c linux-2.6.32.14/arch/parisc/kernel/sys_parisc.c 1430diff -urNp linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c
1431--- linux-2.6.32.14/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400 1431--- linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400
1432+++ linux-2.6.32.14/arch/parisc/kernel/sys_parisc.c 2010-05-28 21:27:14.796819534 -0400 1432+++ linux-2.6.32.15/arch/parisc/kernel/sys_parisc.c 2010-05-28 21:27:14.796819534 -0400
1433@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str 1433@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str
1434 if (flags & MAP_FIXED) 1434 if (flags & MAP_FIXED)
1435 return addr; 1435 return addr;
@@ -1439,9 +1439,9 @@ diff -urNp linux-2.6.32.14/arch/parisc/kernel/sys_parisc.c linux-2.6.32.14/arch/
1439 1439
1440 if (filp) { 1440 if (filp) {
1441 addr = get_shared_area(filp->f_mapping, addr, len, pgoff); 1441 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
1442diff -urNp linux-2.6.32.14/arch/parisc/kernel/traps.c linux-2.6.32.14/arch/parisc/kernel/traps.c 1442diff -urNp linux-2.6.32.15/arch/parisc/kernel/traps.c linux-2.6.32.15/arch/parisc/kernel/traps.c
1443--- linux-2.6.32.14/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 1443--- linux-2.6.32.15/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
1444+++ linux-2.6.32.14/arch/parisc/kernel/traps.c 2010-05-28 21:27:14.796819534 -0400 1444+++ linux-2.6.32.15/arch/parisc/kernel/traps.c 2010-05-28 21:27:14.796819534 -0400
1445@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod 1445@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
1446 1446
1447 down_read(&current->mm->mmap_sem); 1447 down_read(&current->mm->mmap_sem);
@@ -1453,9 +1453,9 @@ diff -urNp linux-2.6.32.14/arch/parisc/kernel/traps.c linux-2.6.32.14/arch/paris
1453 fault_address = regs->iaoq[0]; 1453 fault_address = regs->iaoq[0];
1454 fault_space = regs->iasq[0]; 1454 fault_space = regs->iasq[0];
1455 1455
1456diff -urNp linux-2.6.32.14/arch/parisc/mm/fault.c linux-2.6.32.14/arch/parisc/mm/fault.c 1456diff -urNp linux-2.6.32.15/arch/parisc/mm/fault.c linux-2.6.32.15/arch/parisc/mm/fault.c
1457--- linux-2.6.32.14/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 1457--- linux-2.6.32.15/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1458+++ linux-2.6.32.14/arch/parisc/mm/fault.c 2010-05-28 21:27:14.796819534 -0400 1458+++ linux-2.6.32.15/arch/parisc/mm/fault.c 2010-05-28 21:27:14.796819534 -0400
1459@@ -15,6 +15,7 @@ 1459@@ -15,6 +15,7 @@
1460 #include <linux/sched.h> 1460 #include <linux/sched.h>
1461 #include <linux/interrupt.h> 1461 #include <linux/interrupt.h>
@@ -1625,9 +1625,9 @@ diff -urNp linux-2.6.32.14/arch/parisc/mm/fault.c linux-2.6.32.14/arch/parisc/mm
1625 1625
1626 /* 1626 /*
1627 * If for any reason at all we couldn't handle the fault, make 1627 * If for any reason at all we couldn't handle the fault, make
1628diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/device.h linux-2.6.32.14/arch/powerpc/include/asm/device.h 1628diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/device.h linux-2.6.32.15/arch/powerpc/include/asm/device.h
1629--- linux-2.6.32.14/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 1629--- linux-2.6.32.15/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
1630+++ linux-2.6.32.14/arch/powerpc/include/asm/device.h 2010-05-28 21:27:14.796819534 -0400 1630+++ linux-2.6.32.15/arch/powerpc/include/asm/device.h 2010-05-28 21:27:14.796819534 -0400
1631@@ -14,7 +14,7 @@ struct dev_archdata { 1631@@ -14,7 +14,7 @@ struct dev_archdata {
1632 struct device_node *of_node; 1632 struct device_node *of_node;
1633 1633
@@ -1637,9 +1637,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/device.h linux-2.6.32.14/arc
1637 1637
1638 /* 1638 /*
1639 * When an iommu is in use, dma_data is used as a ptr to the base of the 1639 * When an iommu is in use, dma_data is used as a ptr to the base of the
1640diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.14/arch/powerpc/include/asm/dma-mapping.h 1640diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h
1641--- linux-2.6.32.14/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 1641--- linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
1642+++ linux-2.6.32.14/arch/powerpc/include/asm/dma-mapping.h 2010-05-28 21:27:14.796819534 -0400 1642+++ linux-2.6.32.15/arch/powerpc/include/asm/dma-mapping.h 2010-05-28 21:27:14.796819534 -0400
1643@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma 1643@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
1644 #ifdef CONFIG_PPC64 1644 #ifdef CONFIG_PPC64
1645 extern struct dma_map_ops dma_iommu_ops; 1645 extern struct dma_map_ops dma_iommu_ops;
@@ -1706,9 +1706,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1
1706 1706
1707 if (dma_ops->mapping_error) 1707 if (dma_ops->mapping_error)
1708 return dma_ops->mapping_error(dev, dma_addr); 1708 return dma_ops->mapping_error(dev, dma_addr);
1709diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/elf.h linux-2.6.32.14/arch/powerpc/include/asm/elf.h 1709diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/elf.h linux-2.6.32.15/arch/powerpc/include/asm/elf.h
1710--- linux-2.6.32.14/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 1710--- linux-2.6.32.15/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1711+++ linux-2.6.32.14/arch/powerpc/include/asm/elf.h 2010-05-28 21:27:14.799129463 -0400 1711+++ linux-2.6.32.15/arch/powerpc/include/asm/elf.h 2010-05-28 21:27:14.799129463 -0400
1712@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E 1712@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
1713 the loader. We need to make sure that it is out of the way of the program 1713 the loader. We need to make sure that it is out of the way of the program
1714 that it will "exec", and that there is sufficient room for the brk. */ 1714 that it will "exec", and that there is sufficient room for the brk. */
@@ -1741,9 +1741,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/elf.h linux-2.6.32.14/arch/p
1741 #endif /* __KERNEL__ */ 1741 #endif /* __KERNEL__ */
1742 1742
1743 /* 1743 /*
1744diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/iommu.h linux-2.6.32.14/arch/powerpc/include/asm/iommu.h 1744diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/iommu.h linux-2.6.32.15/arch/powerpc/include/asm/iommu.h
1745--- linux-2.6.32.14/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 1745--- linux-2.6.32.15/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
1746+++ linux-2.6.32.14/arch/powerpc/include/asm/iommu.h 2010-05-28 21:27:14.799129463 -0400 1746+++ linux-2.6.32.15/arch/powerpc/include/asm/iommu.h 2010-05-28 21:27:14.799129463 -0400
1747@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi 1747@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
1748 extern void iommu_init_early_dart(void); 1748 extern void iommu_init_early_dart(void);
1749 extern void iommu_init_early_pasemi(void); 1749 extern void iommu_init_early_pasemi(void);
@@ -1754,9 +1754,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/iommu.h linux-2.6.32.14/arch
1754 #ifdef CONFIG_PCI 1754 #ifdef CONFIG_PCI
1755 extern void pci_iommu_init(void); 1755 extern void pci_iommu_init(void);
1756 extern void pci_direct_iommu_init(void); 1756 extern void pci_direct_iommu_init(void);
1757diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.14/arch/powerpc/include/asm/kmap_types.h 1757diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h
1758--- linux-2.6.32.14/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 1758--- linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
1759+++ linux-2.6.32.14/arch/powerpc/include/asm/kmap_types.h 2010-05-28 21:27:14.799129463 -0400 1759+++ linux-2.6.32.15/arch/powerpc/include/asm/kmap_types.h 2010-05-28 21:27:14.799129463 -0400
1760@@ -26,6 +26,7 @@ enum km_type { 1760@@ -26,6 +26,7 @@ enum km_type {
1761 KM_SOFTIRQ1, 1761 KM_SOFTIRQ1,
1762 KM_PPC_SYNC_PAGE, 1762 KM_PPC_SYNC_PAGE,
@@ -1765,9 +1765,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.14
1765 KM_TYPE_NR 1765 KM_TYPE_NR
1766 }; 1766 };
1767 1767
1768diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/page_64.h linux-2.6.32.14/arch/powerpc/include/asm/page_64.h 1768diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/page_64.h linux-2.6.32.15/arch/powerpc/include/asm/page_64.h
1769--- linux-2.6.32.14/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400 1769--- linux-2.6.32.15/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400
1770+++ linux-2.6.32.14/arch/powerpc/include/asm/page_64.h 2010-05-28 21:27:14.799129463 -0400 1770+++ linux-2.6.32.15/arch/powerpc/include/asm/page_64.h 2010-05-28 21:27:14.799129463 -0400
1771@@ -180,15 +180,18 @@ do { \ 1771@@ -180,15 +180,18 @@ do { \
1772 * stack by default, so in the absense of a PT_GNU_STACK program header 1772 * stack by default, so in the absense of a PT_GNU_STACK program header
1773 * we turn execute permission off. 1773 * we turn execute permission off.
@@ -1789,9 +1789,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/page_64.h linux-2.6.32.14/ar
1789 1789
1790 #include <asm-generic/getorder.h> 1790 #include <asm-generic/getorder.h>
1791 1791
1792diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/page.h linux-2.6.32.14/arch/powerpc/include/asm/page.h 1792diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/page.h linux-2.6.32.15/arch/powerpc/include/asm/page.h
1793--- linux-2.6.32.14/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 1793--- linux-2.6.32.15/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
1794+++ linux-2.6.32.14/arch/powerpc/include/asm/page.h 2010-05-28 21:27:14.799129463 -0400 1794+++ linux-2.6.32.15/arch/powerpc/include/asm/page.h 2010-05-28 21:27:14.799129463 -0400
1795@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; 1795@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
1796 * and needs to be executable. This means the whole heap ends 1796 * and needs to be executable. This means the whole heap ends
1797 * up being executable. 1797 * up being executable.
@@ -1814,9 +1814,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/page.h linux-2.6.32.14/arch/
1814 #ifndef __ASSEMBLY__ 1814 #ifndef __ASSEMBLY__
1815 1815
1816 #undef STRICT_MM_TYPECHECKS 1816 #undef STRICT_MM_TYPECHECKS
1817diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/pci.h linux-2.6.32.14/arch/powerpc/include/asm/pci.h 1817diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/pci.h linux-2.6.32.15/arch/powerpc/include/asm/pci.h
1818--- linux-2.6.32.14/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400 1818--- linux-2.6.32.15/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400
1819+++ linux-2.6.32.14/arch/powerpc/include/asm/pci.h 2010-05-28 21:27:14.803145185 -0400 1819+++ linux-2.6.32.15/arch/powerpc/include/asm/pci.h 2010-05-28 21:27:14.803145185 -0400
1820@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq 1820@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
1821 } 1821 }
1822 1822
@@ -1828,9 +1828,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/pci.h linux-2.6.32.14/arch/p
1828 #else /* CONFIG_PCI */ 1828 #else /* CONFIG_PCI */
1829 #define set_pci_dma_ops(d) 1829 #define set_pci_dma_ops(d)
1830 #define get_pci_dma_ops() NULL 1830 #define get_pci_dma_ops() NULL
1831diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.14/arch/powerpc/include/asm/pte-hash32.h 1831diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h
1832--- linux-2.6.32.14/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400 1832--- linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400
1833+++ linux-2.6.32.14/arch/powerpc/include/asm/pte-hash32.h 2010-05-28 21:27:14.803145185 -0400 1833+++ linux-2.6.32.15/arch/powerpc/include/asm/pte-hash32.h 2010-05-28 21:27:14.803145185 -0400
1834@@ -21,6 +21,7 @@ 1834@@ -21,6 +21,7 @@
1835 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ 1835 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
1836 #define _PAGE_USER 0x004 /* usermode access allowed */ 1836 #define _PAGE_USER 0x004 /* usermode access allowed */
@@ -1839,9 +1839,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.14
1839 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ 1839 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
1840 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ 1840 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
1841 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ 1841 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
1842diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/reg.h linux-2.6.32.14/arch/powerpc/include/asm/reg.h 1842diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/reg.h linux-2.6.32.15/arch/powerpc/include/asm/reg.h
1843--- linux-2.6.32.14/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400 1843--- linux-2.6.32.15/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400
1844+++ linux-2.6.32.14/arch/powerpc/include/asm/reg.h 2010-05-28 21:27:14.803145185 -0400 1844+++ linux-2.6.32.15/arch/powerpc/include/asm/reg.h 2010-05-28 21:27:14.803145185 -0400
1845@@ -191,6 +191,7 @@ 1845@@ -191,6 +191,7 @@
1846 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ 1846 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
1847 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ 1847 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -1850,9 +1850,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/reg.h linux-2.6.32.14/arch/p
1850 #define DSISR_PROTFAULT 0x08000000 /* protection fault */ 1850 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
1851 #define DSISR_ISSTORE 0x02000000 /* access was a store */ 1851 #define DSISR_ISSTORE 0x02000000 /* access was a store */
1852 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ 1852 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
1853diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.14/arch/powerpc/include/asm/swiotlb.h 1853diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h
1854--- linux-2.6.32.14/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400 1854--- linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400
1855+++ linux-2.6.32.14/arch/powerpc/include/asm/swiotlb.h 2010-05-28 21:27:14.803145185 -0400 1855+++ linux-2.6.32.15/arch/powerpc/include/asm/swiotlb.h 2010-05-28 21:27:14.803145185 -0400
1856@@ -13,7 +13,7 @@ 1856@@ -13,7 +13,7 @@
1857 1857
1858 #include <linux/swiotlb.h> 1858 #include <linux/swiotlb.h>
@@ -1862,9 +1862,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.14/ar
1862 1862
1863 static inline void dma_mark_clean(void *addr, size_t size) {} 1863 static inline void dma_mark_clean(void *addr, size_t size) {}
1864 1864
1865diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/uaccess.h linux-2.6.32.14/arch/powerpc/include/asm/uaccess.h 1865diff -urNp linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h
1866--- linux-2.6.32.14/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 1866--- linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
1867+++ linux-2.6.32.14/arch/powerpc/include/asm/uaccess.h 2010-05-28 21:27:14.803145185 -0400 1867+++ linux-2.6.32.15/arch/powerpc/include/asm/uaccess.h 2010-05-28 21:27:14.803145185 -0400
1868@@ -327,52 +327,6 @@ do { \ 1868@@ -327,52 +327,6 @@ do { \
1869 extern unsigned long __copy_tofrom_user(void __user *to, 1869 extern unsigned long __copy_tofrom_user(void __user *to,
1870 const void __user *from, unsigned long size); 1870 const void __user *from, unsigned long size);
@@ -2033,9 +2033,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/include/asm/uaccess.h linux-2.6.32.14/ar
2033 extern unsigned long __clear_user(void __user *addr, unsigned long size); 2033 extern unsigned long __clear_user(void __user *addr, unsigned long size);
2034 2034
2035 static inline unsigned long clear_user(void __user *addr, unsigned long size) 2035 static inline unsigned long clear_user(void __user *addr, unsigned long size)
2036diff -urNp linux-2.6.32.14/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.14/arch/powerpc/kernel/cacheinfo.c 2036diff -urNp linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c
2037--- linux-2.6.32.14/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 2037--- linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400
2038+++ linux-2.6.32.14/arch/powerpc/kernel/cacheinfo.c 2010-05-28 21:27:14.807143556 -0400 2038+++ linux-2.6.32.15/arch/powerpc/kernel/cacheinfo.c 2010-05-28 21:27:14.807143556 -0400
2039@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde 2039@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
2040 &cache_assoc_attr, 2040 &cache_assoc_attr,
2041 }; 2041 };
@@ -2045,9 +2045,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.14/arch/
2045 .show = cache_index_show, 2045 .show = cache_index_show,
2046 }; 2046 };
2047 2047
2048diff -urNp linux-2.6.32.14/arch/powerpc/kernel/dma.c linux-2.6.32.14/arch/powerpc/kernel/dma.c 2048diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma.c linux-2.6.32.15/arch/powerpc/kernel/dma.c
2049--- linux-2.6.32.14/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400 2049--- linux-2.6.32.15/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400
2050+++ linux-2.6.32.14/arch/powerpc/kernel/dma.c 2010-05-28 21:27:14.807143556 -0400 2050+++ linux-2.6.32.15/arch/powerpc/kernel/dma.c 2010-05-28 21:27:14.807143556 -0400
2051@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl 2051@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
2052 } 2052 }
2053 #endif 2053 #endif
@@ -2057,9 +2057,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/dma.c linux-2.6.32.14/arch/powerp
2057 .alloc_coherent = dma_direct_alloc_coherent, 2057 .alloc_coherent = dma_direct_alloc_coherent,
2058 .free_coherent = dma_direct_free_coherent, 2058 .free_coherent = dma_direct_free_coherent,
2059 .map_sg = dma_direct_map_sg, 2059 .map_sg = dma_direct_map_sg,
2060diff -urNp linux-2.6.32.14/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.14/arch/powerpc/kernel/dma-iommu.c 2060diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c
2061--- linux-2.6.32.14/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400 2061--- linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400
2062+++ linux-2.6.32.14/arch/powerpc/kernel/dma-iommu.c 2010-05-28 21:27:14.807143556 -0400 2062+++ linux-2.6.32.15/arch/powerpc/kernel/dma-iommu.c 2010-05-28 21:27:14.807143556 -0400
2063@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de 2063@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
2064 } 2064 }
2065 2065
@@ -2069,9 +2069,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.14/arch/
2069 { 2069 {
2070 struct iommu_table *tbl = get_iommu_table_base(dev); 2070 struct iommu_table *tbl = get_iommu_table_base(dev);
2071 2071
2072diff -urNp linux-2.6.32.14/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.14/arch/powerpc/kernel/dma-swiotlb.c 2072diff -urNp linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c
2073--- linux-2.6.32.14/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 2073--- linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
2074+++ linux-2.6.32.14/arch/powerpc/kernel/dma-swiotlb.c 2010-05-28 21:27:14.807143556 -0400 2074+++ linux-2.6.32.15/arch/powerpc/kernel/dma-swiotlb.c 2010-05-28 21:27:14.807143556 -0400
2075@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; 2075@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
2076 * map_page, and unmap_page on highmem, use normal dma_ops 2076 * map_page, and unmap_page on highmem, use normal dma_ops
2077 * for everything else. 2077 * for everything else.
@@ -2081,9 +2081,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.14/arc
2081 .alloc_coherent = dma_direct_alloc_coherent, 2081 .alloc_coherent = dma_direct_alloc_coherent,
2082 .free_coherent = dma_direct_free_coherent, 2082 .free_coherent = dma_direct_free_coherent,
2083 .map_sg = swiotlb_map_sg_attrs, 2083 .map_sg = swiotlb_map_sg_attrs,
2084diff -urNp linux-2.6.32.14/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.14/arch/powerpc/kernel/exceptions-64e.S 2084diff -urNp linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S
2085--- linux-2.6.32.14/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400 2085--- linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400
2086+++ linux-2.6.32.14/arch/powerpc/kernel/exceptions-64e.S 2010-05-28 21:27:14.823138187 -0400 2086+++ linux-2.6.32.15/arch/powerpc/kernel/exceptions-64e.S 2010-05-28 21:27:14.823138187 -0400
2087@@ -455,6 +455,7 @@ storage_fault_common: 2087@@ -455,6 +455,7 @@ storage_fault_common:
2088 std r14,_DAR(r1) 2088 std r14,_DAR(r1)
2089 std r15,_DSISR(r1) 2089 std r15,_DSISR(r1)
@@ -2102,9 +2102,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.14/
2102 addi r3,r1,STACK_FRAME_OVERHEAD 2102 addi r3,r1,STACK_FRAME_OVERHEAD
2103 ld r4,_DAR(r1) 2103 ld r4,_DAR(r1)
2104 bl .bad_page_fault 2104 bl .bad_page_fault
2105diff -urNp linux-2.6.32.14/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.14/arch/powerpc/kernel/exceptions-64s.S 2105diff -urNp linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S
2106--- linux-2.6.32.14/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400 2106--- linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400
2107+++ linux-2.6.32.14/arch/powerpc/kernel/exceptions-64s.S 2010-05-28 21:27:14.834966791 -0400 2107+++ linux-2.6.32.15/arch/powerpc/kernel/exceptions-64s.S 2010-05-28 21:27:14.834966791 -0400
2108@@ -818,10 +818,10 @@ handle_page_fault: 2108@@ -818,10 +818,10 @@ handle_page_fault:
2109 11: ld r4,_DAR(r1) 2109 11: ld r4,_DAR(r1)
2110 ld r5,_DSISR(r1) 2110 ld r5,_DSISR(r1)
@@ -2117,9 +2117,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.14/
2117 mr r5,r3 2117 mr r5,r3
2118 addi r3,r1,STACK_FRAME_OVERHEAD 2118 addi r3,r1,STACK_FRAME_OVERHEAD
2119 lwz r4,_DAR(r1) 2119 lwz r4,_DAR(r1)
2120diff -urNp linux-2.6.32.14/arch/powerpc/kernel/ibmebus.c linux-2.6.32.14/arch/powerpc/kernel/ibmebus.c 2120diff -urNp linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c
2121--- linux-2.6.32.14/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400 2121--- linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400
2122+++ linux-2.6.32.14/arch/powerpc/kernel/ibmebus.c 2010-05-28 21:27:14.834966791 -0400 2122+++ linux-2.6.32.15/arch/powerpc/kernel/ibmebus.c 2010-05-28 21:27:14.834966791 -0400
2123@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct 2123@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
2124 return 1; 2124 return 1;
2125 } 2125 }
@@ -2129,9 +2129,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/ibmebus.c linux-2.6.32.14/arch/po
2129 .alloc_coherent = ibmebus_alloc_coherent, 2129 .alloc_coherent = ibmebus_alloc_coherent,
2130 .free_coherent = ibmebus_free_coherent, 2130 .free_coherent = ibmebus_free_coherent,
2131 .map_sg = ibmebus_map_sg, 2131 .map_sg = ibmebus_map_sg,
2132diff -urNp linux-2.6.32.14/arch/powerpc/kernel/kgdb.c linux-2.6.32.14/arch/powerpc/kernel/kgdb.c 2132diff -urNp linux-2.6.32.15/arch/powerpc/kernel/kgdb.c linux-2.6.32.15/arch/powerpc/kernel/kgdb.c
2133--- linux-2.6.32.14/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 2133--- linux-2.6.32.15/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
2134+++ linux-2.6.32.14/arch/powerpc/kernel/kgdb.c 2010-05-28 21:27:14.834966791 -0400 2134+++ linux-2.6.32.15/arch/powerpc/kernel/kgdb.c 2010-05-28 21:27:14.834966791 -0400
2135@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct 2135@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
2136 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) 2136 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
2137 return 0; 2137 return 0;
@@ -2150,9 +2150,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/kgdb.c linux-2.6.32.14/arch/power
2150 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, 2150 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
2151 }; 2151 };
2152 2152
2153diff -urNp linux-2.6.32.14/arch/powerpc/kernel/module_32.c linux-2.6.32.14/arch/powerpc/kernel/module_32.c 2153diff -urNp linux-2.6.32.15/arch/powerpc/kernel/module_32.c linux-2.6.32.15/arch/powerpc/kernel/module_32.c
2154--- linux-2.6.32.14/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400 2154--- linux-2.6.32.15/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400
2155+++ linux-2.6.32.14/arch/powerpc/kernel/module_32.c 2010-05-28 21:27:14.841132469 -0400 2155+++ linux-2.6.32.15/arch/powerpc/kernel/module_32.c 2010-05-28 21:27:14.841132469 -0400
2156@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr 2156@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
2157 me->arch.core_plt_section = i; 2157 me->arch.core_plt_section = i;
2158 } 2158 }
@@ -2182,9 +2182,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/module_32.c linux-2.6.32.14/arch/
2182 2182
2183 /* Find this entry, or if that fails, the next avail. entry */ 2183 /* Find this entry, or if that fails, the next avail. entry */
2184 while (entry->jump[0]) { 2184 while (entry->jump[0]) {
2185diff -urNp linux-2.6.32.14/arch/powerpc/kernel/module.c linux-2.6.32.14/arch/powerpc/kernel/module.c 2185diff -urNp linux-2.6.32.15/arch/powerpc/kernel/module.c linux-2.6.32.15/arch/powerpc/kernel/module.c
2186--- linux-2.6.32.14/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 2186--- linux-2.6.32.15/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
2187+++ linux-2.6.32.14/arch/powerpc/kernel/module.c 2010-05-28 21:27:14.841132469 -0400 2187+++ linux-2.6.32.15/arch/powerpc/kernel/module.c 2010-05-28 21:27:14.841132469 -0400
2188@@ -31,11 +31,24 @@ 2188@@ -31,11 +31,24 @@
2189 2189
2190 LIST_HEAD(module_bug_list); 2190 LIST_HEAD(module_bug_list);
@@ -2224,9 +2224,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/module.c linux-2.6.32.14/arch/pow
2224 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, 2224 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
2225 const Elf_Shdr *sechdrs, 2225 const Elf_Shdr *sechdrs,
2226 const char *name) 2226 const char *name)
2227diff -urNp linux-2.6.32.14/arch/powerpc/kernel/pci-common.c linux-2.6.32.14/arch/powerpc/kernel/pci-common.c 2227diff -urNp linux-2.6.32.15/arch/powerpc/kernel/pci-common.c linux-2.6.32.15/arch/powerpc/kernel/pci-common.c
2228--- linux-2.6.32.14/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400 2228--- linux-2.6.32.15/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400
2229+++ linux-2.6.32.14/arch/powerpc/kernel/pci-common.c 2010-05-28 21:27:14.841132469 -0400 2229+++ linux-2.6.32.15/arch/powerpc/kernel/pci-common.c 2010-05-28 21:27:14.841132469 -0400
2230@@ -50,14 +50,14 @@ resource_size_t isa_mem_base; 2230@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
2231 unsigned int ppc_pci_flags = 0; 2231 unsigned int ppc_pci_flags = 0;
2232 2232
@@ -2245,9 +2245,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/pci-common.c linux-2.6.32.14/arch
2245 { 2245 {
2246 return pci_dma_ops; 2246 return pci_dma_ops;
2247 } 2247 }
2248diff -urNp linux-2.6.32.14/arch/powerpc/kernel/process.c linux-2.6.32.14/arch/powerpc/kernel/process.c 2248diff -urNp linux-2.6.32.15/arch/powerpc/kernel/process.c linux-2.6.32.15/arch/powerpc/kernel/process.c
2249--- linux-2.6.32.14/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 2249--- linux-2.6.32.15/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
2250+++ linux-2.6.32.14/arch/powerpc/kernel/process.c 2010-05-28 21:27:14.843133123 -0400 2250+++ linux-2.6.32.15/arch/powerpc/kernel/process.c 2010-05-28 21:27:14.843133123 -0400
2251@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned 2251@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned
2252 sp -= get_random_int() & ~PAGE_MASK; 2252 sp -= get_random_int() & ~PAGE_MASK;
2253 return sp & ~0xf; 2253 return sp & ~0xf;
@@ -2300,9 +2300,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/process.c linux-2.6.32.14/arch/po
2300- 2300-
2301- return ret; 2301- return ret;
2302-} 2302-}
2303diff -urNp linux-2.6.32.14/arch/powerpc/kernel/signal_32.c linux-2.6.32.14/arch/powerpc/kernel/signal_32.c 2303diff -urNp linux-2.6.32.15/arch/powerpc/kernel/signal_32.c linux-2.6.32.15/arch/powerpc/kernel/signal_32.c
2304--- linux-2.6.32.14/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400 2304--- linux-2.6.32.15/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400
2305+++ linux-2.6.32.14/arch/powerpc/kernel/signal_32.c 2010-05-28 21:27:14.843133123 -0400 2305+++ linux-2.6.32.15/arch/powerpc/kernel/signal_32.c 2010-05-28 21:27:14.843133123 -0400
2306@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig 2306@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
2307 /* Save user registers on the stack */ 2307 /* Save user registers on the stack */
2308 frame = &rt_sf->uc.uc_mcontext; 2308 frame = &rt_sf->uc.uc_mcontext;
@@ -2312,9 +2312,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/signal_32.c linux-2.6.32.14/arch/
2312 if (save_user_regs(regs, frame, 0, 1)) 2312 if (save_user_regs(regs, frame, 0, 1))
2313 goto badframe; 2313 goto badframe;
2314 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; 2314 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
2315diff -urNp linux-2.6.32.14/arch/powerpc/kernel/signal_64.c linux-2.6.32.14/arch/powerpc/kernel/signal_64.c 2315diff -urNp linux-2.6.32.15/arch/powerpc/kernel/signal_64.c linux-2.6.32.15/arch/powerpc/kernel/signal_64.c
2316--- linux-2.6.32.14/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400 2316--- linux-2.6.32.15/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400
2317+++ linux-2.6.32.14/arch/powerpc/kernel/signal_64.c 2010-05-28 21:27:14.843133123 -0400 2317+++ linux-2.6.32.15/arch/powerpc/kernel/signal_64.c 2010-05-28 21:27:14.843133123 -0400
2318@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct 2318@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
2319 current->thread.fpscr.val = 0; 2319 current->thread.fpscr.val = 0;
2320 2320
@@ -2324,9 +2324,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/signal_64.c linux-2.6.32.14/arch/
2324 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; 2324 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
2325 } else { 2325 } else {
2326 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); 2326 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
2327diff -urNp linux-2.6.32.14/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.14/arch/powerpc/kernel/sys_ppc32.c 2327diff -urNp linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c
2328--- linux-2.6.32.14/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400 2328--- linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400
2329+++ linux-2.6.32.14/arch/powerpc/kernel/sys_ppc32.c 2010-05-28 21:27:14.843133123 -0400 2329+++ linux-2.6.32.15/arch/powerpc/kernel/sys_ppc32.c 2010-05-28 21:27:14.843133123 -0400
2330@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct 2330@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
2331 if (oldlenp) { 2331 if (oldlenp) {
2332 if (!error) { 2332 if (!error) {
@@ -2340,9 +2340,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.14/arch/
2340 } 2340 }
2341 return error; 2341 return error;
2342 } 2342 }
2343diff -urNp linux-2.6.32.14/arch/powerpc/kernel/vdso.c linux-2.6.32.14/arch/powerpc/kernel/vdso.c 2343diff -urNp linux-2.6.32.15/arch/powerpc/kernel/vdso.c linux-2.6.32.15/arch/powerpc/kernel/vdso.c
2344--- linux-2.6.32.14/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400 2344--- linux-2.6.32.15/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400
2345+++ linux-2.6.32.14/arch/powerpc/kernel/vdso.c 2010-05-28 21:27:14.843133123 -0400 2345+++ linux-2.6.32.15/arch/powerpc/kernel/vdso.c 2010-05-28 21:27:14.843133123 -0400
2346@@ -36,6 +36,7 @@ 2346@@ -36,6 +36,7 @@
2347 #include <asm/firmware.h> 2347 #include <asm/firmware.h>
2348 #include <asm/vdso.h> 2348 #include <asm/vdso.h>
@@ -2369,9 +2369,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/vdso.c linux-2.6.32.14/arch/power
2369 if (IS_ERR_VALUE(vdso_base)) { 2369 if (IS_ERR_VALUE(vdso_base)) {
2370 rc = vdso_base; 2370 rc = vdso_base;
2371 goto fail_mmapsem; 2371 goto fail_mmapsem;
2372diff -urNp linux-2.6.32.14/arch/powerpc/kernel/vio.c linux-2.6.32.14/arch/powerpc/kernel/vio.c 2372diff -urNp linux-2.6.32.15/arch/powerpc/kernel/vio.c linux-2.6.32.15/arch/powerpc/kernel/vio.c
2373--- linux-2.6.32.14/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400 2373--- linux-2.6.32.15/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400
2374+++ linux-2.6.32.14/arch/powerpc/kernel/vio.c 2010-05-28 21:27:14.843133123 -0400 2374+++ linux-2.6.32.15/arch/powerpc/kernel/vio.c 2010-05-28 21:27:14.843133123 -0400
2375@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc 2375@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
2376 vio_cmo_dealloc(viodev, alloc_size); 2376 vio_cmo_dealloc(viodev, alloc_size);
2377 } 2377 }
@@ -2394,9 +2394,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/kernel/vio.c linux-2.6.32.14/arch/powerp
2394 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; 2394 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
2395 } 2395 }
2396 2396
2397diff -urNp linux-2.6.32.14/arch/powerpc/lib/usercopy_64.c linux-2.6.32.14/arch/powerpc/lib/usercopy_64.c 2397diff -urNp linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c
2398--- linux-2.6.32.14/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 2398--- linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
2399+++ linux-2.6.32.14/arch/powerpc/lib/usercopy_64.c 2010-05-28 21:27:14.843133123 -0400 2399+++ linux-2.6.32.15/arch/powerpc/lib/usercopy_64.c 2010-05-28 21:27:14.843133123 -0400
2400@@ -9,22 +9,6 @@ 2400@@ -9,22 +9,6 @@
2401 #include <linux/module.h> 2401 #include <linux/module.h>
2402 #include <asm/uaccess.h> 2402 #include <asm/uaccess.h>
@@ -2428,9 +2428,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/lib/usercopy_64.c linux-2.6.32.14/arch/p
2428-EXPORT_SYMBOL(copy_to_user); 2428-EXPORT_SYMBOL(copy_to_user);
2429 EXPORT_SYMBOL(copy_in_user); 2429 EXPORT_SYMBOL(copy_in_user);
2430 2430
2431diff -urNp linux-2.6.32.14/arch/powerpc/mm/fault.c linux-2.6.32.14/arch/powerpc/mm/fault.c 2431diff -urNp linux-2.6.32.15/arch/powerpc/mm/fault.c linux-2.6.32.15/arch/powerpc/mm/fault.c
2432--- linux-2.6.32.14/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 2432--- linux-2.6.32.15/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
2433+++ linux-2.6.32.14/arch/powerpc/mm/fault.c 2010-05-28 21:27:14.843133123 -0400 2433+++ linux-2.6.32.15/arch/powerpc/mm/fault.c 2010-05-28 21:27:14.843133123 -0400
2434@@ -30,6 +30,10 @@ 2434@@ -30,6 +30,10 @@
2435 #include <linux/kprobes.h> 2435 #include <linux/kprobes.h>
2436 #include <linux/kdebug.h> 2436 #include <linux/kdebug.h>
@@ -2535,9 +2535,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/mm/fault.c linux-2.6.32.14/arch/powerpc/
2535 _exception(SIGSEGV, regs, code, address); 2535 _exception(SIGSEGV, regs, code, address);
2536 return 0; 2536 return 0;
2537 } 2537 }
2538diff -urNp linux-2.6.32.14/arch/powerpc/mm/mmap_64.c linux-2.6.32.14/arch/powerpc/mm/mmap_64.c 2538diff -urNp linux-2.6.32.15/arch/powerpc/mm/mmap_64.c linux-2.6.32.15/arch/powerpc/mm/mmap_64.c
2539--- linux-2.6.32.14/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400 2539--- linux-2.6.32.15/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400
2540+++ linux-2.6.32.14/arch/powerpc/mm/mmap_64.c 2010-05-28 21:27:14.843133123 -0400 2540+++ linux-2.6.32.15/arch/powerpc/mm/mmap_64.c 2010-05-28 21:27:14.843133123 -0400
2541@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str 2541@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
2542 */ 2542 */
2543 if (mmap_is_legacy()) { 2543 if (mmap_is_legacy()) {
@@ -2561,9 +2561,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/mm/mmap_64.c linux-2.6.32.14/arch/powerp
2561 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 2561 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
2562 mm->unmap_area = arch_unmap_area_topdown; 2562 mm->unmap_area = arch_unmap_area_topdown;
2563 } 2563 }
2564diff -urNp linux-2.6.32.14/arch/powerpc/mm/slice.c linux-2.6.32.14/arch/powerpc/mm/slice.c 2564diff -urNp linux-2.6.32.15/arch/powerpc/mm/slice.c linux-2.6.32.15/arch/powerpc/mm/slice.c
2565--- linux-2.6.32.14/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400 2565--- linux-2.6.32.15/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400
2566+++ linux-2.6.32.14/arch/powerpc/mm/slice.c 2010-05-28 21:27:14.843133123 -0400 2566+++ linux-2.6.32.15/arch/powerpc/mm/slice.c 2010-05-28 21:27:14.843133123 -0400
2567@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un 2567@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
2568 if (fixed && addr > (mm->task_size - len)) 2568 if (fixed && addr > (mm->task_size - len))
2569 return -EINVAL; 2569 return -EINVAL;
@@ -2576,9 +2576,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/mm/slice.c linux-2.6.32.14/arch/powerpc/
2576 /* If hint, make sure it matches our alignment restrictions */ 2576 /* If hint, make sure it matches our alignment restrictions */
2577 if (!fixed && addr) { 2577 if (!fixed && addr) {
2578 addr = _ALIGN_UP(addr, 1ul << pshift); 2578 addr = _ALIGN_UP(addr, 1ul << pshift);
2579diff -urNp linux-2.6.32.14/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.14/arch/powerpc/platforms/52xx/lite5200_pm.c 2579diff -urNp linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c
2580--- linux-2.6.32.14/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400 2580--- linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400
2581+++ linux-2.6.32.14/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-05-28 21:27:14.843133123 -0400 2581+++ linux-2.6.32.15/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-05-28 21:27:14.843133123 -0400
2582@@ -235,7 +235,7 @@ static void lite5200_pm_end(void) 2582@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
2583 lite5200_pm_target_state = PM_SUSPEND_ON; 2583 lite5200_pm_target_state = PM_SUSPEND_ON;
2584 } 2584 }
@@ -2588,9 +2588,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
2588 .valid = lite5200_pm_valid, 2588 .valid = lite5200_pm_valid,
2589 .begin = lite5200_pm_begin, 2589 .begin = lite5200_pm_begin,
2590 .prepare = lite5200_pm_prepare, 2590 .prepare = lite5200_pm_prepare,
2591diff -urNp linux-2.6.32.14/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.14/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2591diff -urNp linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c
2592--- linux-2.6.32.14/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400 2592--- linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400
2593+++ linux-2.6.32.14/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-05-28 21:27:14.843133123 -0400 2593+++ linux-2.6.32.15/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-05-28 21:27:14.843133123 -0400
2594@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) 2594@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
2595 iounmap(mbar); 2595 iounmap(mbar);
2596 } 2596 }
@@ -2600,9 +2600,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32
2600 .valid = mpc52xx_pm_valid, 2600 .valid = mpc52xx_pm_valid,
2601 .prepare = mpc52xx_pm_prepare, 2601 .prepare = mpc52xx_pm_prepare,
2602 .enter = mpc52xx_pm_enter, 2602 .enter = mpc52xx_pm_enter,
2603diff -urNp linux-2.6.32.14/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.14/arch/powerpc/platforms/83xx/suspend.c 2603diff -urNp linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c
2604--- linux-2.6.32.14/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400 2604--- linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400
2605+++ linux-2.6.32.14/arch/powerpc/platforms/83xx/suspend.c 2010-05-28 21:27:14.843133123 -0400 2605+++ linux-2.6.32.15/arch/powerpc/platforms/83xx/suspend.c 2010-05-28 21:27:14.843133123 -0400
2606@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) 2606@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
2607 return ret; 2607 return ret;
2608 } 2608 }
@@ -2612,9 +2612,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.14
2612 .valid = mpc83xx_suspend_valid, 2612 .valid = mpc83xx_suspend_valid,
2613 .begin = mpc83xx_suspend_begin, 2613 .begin = mpc83xx_suspend_begin,
2614 .enter = mpc83xx_suspend_enter, 2614 .enter = mpc83xx_suspend_enter,
2615diff -urNp linux-2.6.32.14/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.14/arch/powerpc/platforms/cell/iommu.c 2615diff -urNp linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c
2616--- linux-2.6.32.14/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400 2616--- linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400
2617+++ linux-2.6.32.14/arch/powerpc/platforms/cell/iommu.c 2010-05-28 21:27:14.864087018 -0400 2617+++ linux-2.6.32.15/arch/powerpc/platforms/cell/iommu.c 2010-05-28 21:27:14.864087018 -0400
2618@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc 2618@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
2619 2619
2620 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); 2620 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -2624,9 +2624,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.14/a
2624 .alloc_coherent = dma_fixed_alloc_coherent, 2624 .alloc_coherent = dma_fixed_alloc_coherent,
2625 .free_coherent = dma_fixed_free_coherent, 2625 .free_coherent = dma_fixed_free_coherent,
2626 .map_sg = dma_fixed_map_sg, 2626 .map_sg = dma_fixed_map_sg,
2627diff -urNp linux-2.6.32.14/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.14/arch/powerpc/platforms/ps3/system-bus.c 2627diff -urNp linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c
2628--- linux-2.6.32.14/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400 2628--- linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400
2629+++ linux-2.6.32.14/arch/powerpc/platforms/ps3/system-bus.c 2010-05-28 21:27:14.867153288 -0400 2629+++ linux-2.6.32.15/arch/powerpc/platforms/ps3/system-bus.c 2010-05-28 21:27:14.867153288 -0400
2630@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi 2630@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
2631 return mask >= DMA_BIT_MASK(32); 2631 return mask >= DMA_BIT_MASK(32);
2632 } 2632 }
@@ -2645,9 +2645,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
2645 .alloc_coherent = ps3_alloc_coherent, 2645 .alloc_coherent = ps3_alloc_coherent,
2646 .free_coherent = ps3_free_coherent, 2646 .free_coherent = ps3_free_coherent,
2647 .map_sg = ps3_ioc0_map_sg, 2647 .map_sg = ps3_ioc0_map_sg,
2648diff -urNp linux-2.6.32.14/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.14/arch/powerpc/platforms/pseries/Kconfig 2648diff -urNp linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig
2649--- linux-2.6.32.14/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400 2649--- linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400
2650+++ linux-2.6.32.14/arch/powerpc/platforms/pseries/Kconfig 2010-05-28 21:27:14.867153288 -0400 2650+++ linux-2.6.32.15/arch/powerpc/platforms/pseries/Kconfig 2010-05-28 21:27:14.867153288 -0400
2651@@ -2,6 +2,8 @@ config PPC_PSERIES 2651@@ -2,6 +2,8 @@ config PPC_PSERIES
2652 depends on PPC64 && PPC_BOOK3S 2652 depends on PPC64 && PPC_BOOK3S
2653 bool "IBM pSeries & new (POWER5-based) iSeries" 2653 bool "IBM pSeries & new (POWER5-based) iSeries"
@@ -2657,9 +2657,9 @@ diff -urNp linux-2.6.32.14/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.1
2657 select PPC_I8259 2657 select PPC_I8259
2658 select PPC_RTAS 2658 select PPC_RTAS
2659 select RTAS_ERROR_LOGGING 2659 select RTAS_ERROR_LOGGING
2660diff -urNp linux-2.6.32.14/arch/s390/include/asm/elf.h linux-2.6.32.14/arch/s390/include/asm/elf.h 2660diff -urNp linux-2.6.32.15/arch/s390/include/asm/elf.h linux-2.6.32.15/arch/s390/include/asm/elf.h
2661--- linux-2.6.32.14/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 2661--- linux-2.6.32.15/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
2662+++ linux-2.6.32.14/arch/s390/include/asm/elf.h 2010-05-28 21:27:14.871031796 -0400 2662+++ linux-2.6.32.15/arch/s390/include/asm/elf.h 2010-05-28 21:27:14.871031796 -0400
2663@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; 2663@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
2664 that it will "exec", and that there is sufficient room for the brk. */ 2664 that it will "exec", and that there is sufficient room for the brk. */
2665 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) 2665 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
@@ -2674,9 +2674,9 @@ diff -urNp linux-2.6.32.14/arch/s390/include/asm/elf.h linux-2.6.32.14/arch/s390
2674 /* This yields a mask that user programs can use to figure out what 2674 /* This yields a mask that user programs can use to figure out what
2675 instruction set this CPU supports. */ 2675 instruction set this CPU supports. */
2676 2676
2677diff -urNp linux-2.6.32.14/arch/s390/include/asm/setup.h linux-2.6.32.14/arch/s390/include/asm/setup.h 2677diff -urNp linux-2.6.32.15/arch/s390/include/asm/setup.h linux-2.6.32.15/arch/s390/include/asm/setup.h
2678--- linux-2.6.32.14/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400 2678--- linux-2.6.32.15/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400
2679+++ linux-2.6.32.14/arch/s390/include/asm/setup.h 2010-05-28 21:27:14.871031796 -0400 2679+++ linux-2.6.32.15/arch/s390/include/asm/setup.h 2010-05-28 21:27:14.871031796 -0400
2680@@ -50,13 +50,13 @@ extern unsigned long memory_end; 2680@@ -50,13 +50,13 @@ extern unsigned long memory_end;
2681 void detect_memory_layout(struct mem_chunk chunk[]); 2681 void detect_memory_layout(struct mem_chunk chunk[]);
2682 2682
@@ -2693,9 +2693,9 @@ diff -urNp linux-2.6.32.14/arch/s390/include/asm/setup.h linux-2.6.32.14/arch/s3
2693 #else 2693 #else
2694 #define s390_noexec (0) 2694 #define s390_noexec (0)
2695 #endif 2695 #endif
2696diff -urNp linux-2.6.32.14/arch/s390/include/asm/uaccess.h linux-2.6.32.14/arch/s390/include/asm/uaccess.h 2696diff -urNp linux-2.6.32.15/arch/s390/include/asm/uaccess.h linux-2.6.32.15/arch/s390/include/asm/uaccess.h
2697--- linux-2.6.32.14/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 2697--- linux-2.6.32.15/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
2698+++ linux-2.6.32.14/arch/s390/include/asm/uaccess.h 2010-05-28 21:27:14.871031796 -0400 2698+++ linux-2.6.32.15/arch/s390/include/asm/uaccess.h 2010-05-28 21:27:14.871031796 -0400
2699@@ -232,6 +232,10 @@ static inline unsigned long __must_check 2699@@ -232,6 +232,10 @@ static inline unsigned long __must_check
2700 copy_to_user(void __user *to, const void *from, unsigned long n) 2700 copy_to_user(void __user *to, const void *from, unsigned long n)
2701 { 2701 {
@@ -2728,9 +2728,9 @@ diff -urNp linux-2.6.32.14/arch/s390/include/asm/uaccess.h linux-2.6.32.14/arch/
2728 if (access_ok(VERIFY_READ, from, n)) 2728 if (access_ok(VERIFY_READ, from, n))
2729 n = __copy_from_user(to, from, n); 2729 n = __copy_from_user(to, from, n);
2730 else 2730 else
2731diff -urNp linux-2.6.32.14/arch/s390/Kconfig linux-2.6.32.14/arch/s390/Kconfig 2731diff -urNp linux-2.6.32.15/arch/s390/Kconfig linux-2.6.32.15/arch/s390/Kconfig
2732--- linux-2.6.32.14/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400 2732--- linux-2.6.32.15/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400
2733+++ linux-2.6.32.14/arch/s390/Kconfig 2010-05-28 21:27:14.871031796 -0400 2733+++ linux-2.6.32.15/arch/s390/Kconfig 2010-05-28 21:27:14.871031796 -0400
2734@@ -194,28 +194,26 @@ config AUDIT_ARCH 2734@@ -194,28 +194,26 @@ config AUDIT_ARCH
2735 2735
2736 config S390_SWITCH_AMODE 2736 config S390_SWITCH_AMODE
@@ -2768,9 +2768,9 @@ diff -urNp linux-2.6.32.14/arch/s390/Kconfig linux-2.6.32.14/arch/s390/Kconfig
2768 2768
2769 comment "Code generation options" 2769 comment "Code generation options"
2770 2770
2771diff -urNp linux-2.6.32.14/arch/s390/kernel/module.c linux-2.6.32.14/arch/s390/kernel/module.c 2771diff -urNp linux-2.6.32.15/arch/s390/kernel/module.c linux-2.6.32.15/arch/s390/kernel/module.c
2772--- linux-2.6.32.14/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 2772--- linux-2.6.32.15/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
2773+++ linux-2.6.32.14/arch/s390/kernel/module.c 2010-05-28 21:27:14.871031796 -0400 2773+++ linux-2.6.32.15/arch/s390/kernel/module.c 2010-05-28 21:27:14.871031796 -0400
2774@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, 2774@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
2775 2775
2776 /* Increase core size by size of got & plt and set start 2776 /* Increase core size by size of got & plt and set start
@@ -2842,9 +2842,9 @@ diff -urNp linux-2.6.32.14/arch/s390/kernel/module.c linux-2.6.32.14/arch/s390/k
2842 rela->r_addend - loc; 2842 rela->r_addend - loc;
2843 if (r_type == R_390_GOTPC) 2843 if (r_type == R_390_GOTPC)
2844 *(unsigned int *) loc = val; 2844 *(unsigned int *) loc = val;
2845diff -urNp linux-2.6.32.14/arch/s390/kernel/setup.c linux-2.6.32.14/arch/s390/kernel/setup.c 2845diff -urNp linux-2.6.32.15/arch/s390/kernel/setup.c linux-2.6.32.15/arch/s390/kernel/setup.c
2846--- linux-2.6.32.14/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 2846--- linux-2.6.32.15/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
2847+++ linux-2.6.32.14/arch/s390/kernel/setup.c 2010-05-28 21:27:14.871031796 -0400 2847+++ linux-2.6.32.15/arch/s390/kernel/setup.c 2010-05-28 21:27:14.871031796 -0400
2848@@ -306,9 +306,6 @@ static int __init early_parse_mem(char * 2848@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
2849 early_param("mem", early_parse_mem); 2849 early_param("mem", early_parse_mem);
2850 2850
@@ -2898,9 +2898,9 @@ diff -urNp linux-2.6.32.14/arch/s390/kernel/setup.c linux-2.6.32.14/arch/s390/ke
2898 static void setup_addressing_mode(void) 2898 static void setup_addressing_mode(void)
2899 { 2899 {
2900 if (s390_noexec) { 2900 if (s390_noexec) {
2901diff -urNp linux-2.6.32.14/arch/s390/mm/mmap.c linux-2.6.32.14/arch/s390/mm/mmap.c 2901diff -urNp linux-2.6.32.15/arch/s390/mm/mmap.c linux-2.6.32.15/arch/s390/mm/mmap.c
2902--- linux-2.6.32.14/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 2902--- linux-2.6.32.15/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
2903+++ linux-2.6.32.14/arch/s390/mm/mmap.c 2010-05-28 21:27:14.871031796 -0400 2903+++ linux-2.6.32.15/arch/s390/mm/mmap.c 2010-05-28 21:27:14.871031796 -0400
2904@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str 2904@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
2905 */ 2905 */
2906 if (mmap_is_legacy()) { 2906 if (mmap_is_legacy()) {
@@ -2947,9 +2947,9 @@ diff -urNp linux-2.6.32.14/arch/s390/mm/mmap.c linux-2.6.32.14/arch/s390/mm/mmap
2947 mm->get_unmapped_area = s390_get_unmapped_area_topdown; 2947 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
2948 mm->unmap_area = arch_unmap_area_topdown; 2948 mm->unmap_area = arch_unmap_area_topdown;
2949 } 2949 }
2950diff -urNp linux-2.6.32.14/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.14/arch/sh/boards/mach-hp6xx/pm.c 2950diff -urNp linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c
2951--- linux-2.6.32.14/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400 2951--- linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400
2952+++ linux-2.6.32.14/arch/sh/boards/mach-hp6xx/pm.c 2010-05-28 21:27:14.871031796 -0400 2952+++ linux-2.6.32.15/arch/sh/boards/mach-hp6xx/pm.c 2010-05-28 21:27:14.871031796 -0400
2953@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ 2953@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
2954 return 0; 2954 return 0;
2955 } 2955 }
@@ -2959,9 +2959,9 @@ diff -urNp linux-2.6.32.14/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.14/arch/s
2959 .enter = hp6x0_pm_enter, 2959 .enter = hp6x0_pm_enter,
2960 .valid = suspend_valid_only_mem, 2960 .valid = suspend_valid_only_mem,
2961 }; 2961 };
2962diff -urNp linux-2.6.32.14/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.14/arch/sh/kernel/cpu/sh4/sq.c 2962diff -urNp linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c
2963--- linux-2.6.32.14/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400 2963--- linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400
2964+++ linux-2.6.32.14/arch/sh/kernel/cpu/sh4/sq.c 2010-05-28 21:27:14.871031796 -0400 2964+++ linux-2.6.32.15/arch/sh/kernel/cpu/sh4/sq.c 2010-05-28 21:27:14.871031796 -0400
2965@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ 2965@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
2966 NULL, 2966 NULL,
2967 }; 2967 };
@@ -2971,9 +2971,9 @@ diff -urNp linux-2.6.32.14/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.14/arch/sh/k
2971 .show = sq_sysfs_show, 2971 .show = sq_sysfs_show,
2972 .store = sq_sysfs_store, 2972 .store = sq_sysfs_store,
2973 }; 2973 };
2974diff -urNp linux-2.6.32.14/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.14/arch/sh/kernel/cpu/shmobile/pm.c 2974diff -urNp linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c
2975--- linux-2.6.32.14/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400 2975--- linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400
2976+++ linux-2.6.32.14/arch/sh/kernel/cpu/shmobile/pm.c 2010-05-28 21:27:14.871031796 -0400 2976+++ linux-2.6.32.15/arch/sh/kernel/cpu/shmobile/pm.c 2010-05-28 21:27:14.871031796 -0400
2977@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s 2977@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
2978 return 0; 2978 return 0;
2979 } 2979 }
@@ -2983,9 +2983,9 @@ diff -urNp linux-2.6.32.14/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.14/arch
2983 .enter = sh_pm_enter, 2983 .enter = sh_pm_enter,
2984 .valid = suspend_valid_only_mem, 2984 .valid = suspend_valid_only_mem,
2985 }; 2985 };
2986diff -urNp linux-2.6.32.14/arch/sh/kernel/kgdb.c linux-2.6.32.14/arch/sh/kernel/kgdb.c 2986diff -urNp linux-2.6.32.15/arch/sh/kernel/kgdb.c linux-2.6.32.15/arch/sh/kernel/kgdb.c
2987--- linux-2.6.32.14/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 2987--- linux-2.6.32.15/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
2988+++ linux-2.6.32.14/arch/sh/kernel/kgdb.c 2010-05-28 21:27:14.871031796 -0400 2988+++ linux-2.6.32.15/arch/sh/kernel/kgdb.c 2010-05-28 21:27:14.871031796 -0400
2989@@ -271,7 +271,7 @@ void kgdb_arch_exit(void) 2989@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
2990 { 2990 {
2991 } 2991 }
@@ -2995,9 +2995,9 @@ diff -urNp linux-2.6.32.14/arch/sh/kernel/kgdb.c linux-2.6.32.14/arch/sh/kernel/
2995 /* Breakpoint instruction: trapa #0x3c */ 2995 /* Breakpoint instruction: trapa #0x3c */
2996 #ifdef CONFIG_CPU_LITTLE_ENDIAN 2996 #ifdef CONFIG_CPU_LITTLE_ENDIAN
2997 .gdb_bpt_instr = { 0x3c, 0xc3 }, 2997 .gdb_bpt_instr = { 0x3c, 0xc3 },
2998diff -urNp linux-2.6.32.14/arch/sparc/include/asm/atomic_64.h linux-2.6.32.14/arch/sparc/include/asm/atomic_64.h 2998diff -urNp linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h
2999--- linux-2.6.32.14/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 2999--- linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
3000+++ linux-2.6.32.14/arch/sparc/include/asm/atomic_64.h 2010-05-28 21:27:14.871031796 -0400 3000+++ linux-2.6.32.15/arch/sparc/include/asm/atomic_64.h 2010-05-28 21:27:14.871031796 -0400
3001@@ -14,18 +14,38 @@ 3001@@ -14,18 +14,38 @@
3002 #define ATOMIC64_INIT(i) { (i) } 3002 #define ATOMIC64_INIT(i) { (i) }
3003 3003
@@ -3127,9 +3127,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/include/asm/atomic_64.h linux-2.6.32.14/ar
3127 } 3127 }
3128 3128
3129 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) 3129 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3130diff -urNp linux-2.6.32.14/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.14/arch/sparc/include/asm/dma-mapping.h 3130diff -urNp linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h
3131--- linux-2.6.32.14/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 3131--- linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
3132+++ linux-2.6.32.14/arch/sparc/include/asm/dma-mapping.h 2010-05-28 21:27:14.871031796 -0400 3132+++ linux-2.6.32.15/arch/sparc/include/asm/dma-mapping.h 2010-05-28 21:27:14.871031796 -0400
3133@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d 3133@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
3134 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) 3134 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
3135 #define dma_is_consistent(d, h) (1) 3135 #define dma_is_consistent(d, h) (1)
@@ -3161,9 +3161,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.14/
3161 3161
3162 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); 3162 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
3163 ops->free_coherent(dev, size, cpu_addr, dma_handle); 3163 ops->free_coherent(dev, size, cpu_addr, dma_handle);
3164diff -urNp linux-2.6.32.14/arch/sparc/include/asm/elf_32.h linux-2.6.32.14/arch/sparc/include/asm/elf_32.h 3164diff -urNp linux-2.6.32.15/arch/sparc/include/asm/elf_32.h linux-2.6.32.15/arch/sparc/include/asm/elf_32.h
3165--- linux-2.6.32.14/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400 3165--- linux-2.6.32.15/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400
3166+++ linux-2.6.32.14/arch/sparc/include/asm/elf_32.h 2010-05-28 21:27:14.871031796 -0400 3166+++ linux-2.6.32.15/arch/sparc/include/asm/elf_32.h 2010-05-28 21:27:14.871031796 -0400
3167@@ -116,6 +116,13 @@ typedef struct { 3167@@ -116,6 +116,13 @@ typedef struct {
3168 3168
3169 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) 3169 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -3178,9 +3178,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/include/asm/elf_32.h linux-2.6.32.14/arch/
3178 /* This yields a mask that user programs can use to figure out what 3178 /* This yields a mask that user programs can use to figure out what
3179 instruction set this cpu supports. This can NOT be done in userspace 3179 instruction set this cpu supports. This can NOT be done in userspace
3180 on Sparc. */ 3180 on Sparc. */
3181diff -urNp linux-2.6.32.14/arch/sparc/include/asm/elf_64.h linux-2.6.32.14/arch/sparc/include/asm/elf_64.h 3181diff -urNp linux-2.6.32.15/arch/sparc/include/asm/elf_64.h linux-2.6.32.15/arch/sparc/include/asm/elf_64.h
3182--- linux-2.6.32.14/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400 3182--- linux-2.6.32.15/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400
3183+++ linux-2.6.32.14/arch/sparc/include/asm/elf_64.h 2010-05-28 21:27:14.871031796 -0400 3183+++ linux-2.6.32.15/arch/sparc/include/asm/elf_64.h 2010-05-28 21:27:14.871031796 -0400
3184@@ -163,6 +163,12 @@ typedef struct { 3184@@ -163,6 +163,12 @@ typedef struct {
3185 #define ELF_ET_DYN_BASE 0x0000010000000000UL 3185 #define ELF_ET_DYN_BASE 0x0000010000000000UL
3186 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL 3186 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -3194,9 +3194,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/include/asm/elf_64.h linux-2.6.32.14/arch/
3194 3194
3195 /* This yields a mask that user programs can use to figure out what 3195 /* This yields a mask that user programs can use to figure out what
3196 instruction set this cpu supports. */ 3196 instruction set this cpu supports. */
3197diff -urNp linux-2.6.32.14/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.14/arch/sparc/include/asm/pgtable_32.h 3197diff -urNp linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h
3198--- linux-2.6.32.14/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 3198--- linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
3199+++ linux-2.6.32.14/arch/sparc/include/asm/pgtable_32.h 2010-05-28 21:27:14.871031796 -0400 3199+++ linux-2.6.32.15/arch/sparc/include/asm/pgtable_32.h 2010-05-28 21:27:14.871031796 -0400
3200@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) 3200@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
3201 BTFIXUPDEF_INT(page_none) 3201 BTFIXUPDEF_INT(page_none)
3202 BTFIXUPDEF_INT(page_copy) 3202 BTFIXUPDEF_INT(page_copy)
@@ -3228,9 +3228,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.14/a
3228 extern unsigned long page_kernel; 3228 extern unsigned long page_kernel;
3229 3229
3230 #ifdef MODULE 3230 #ifdef MODULE
3231diff -urNp linux-2.6.32.14/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.14/arch/sparc/include/asm/pgtsrmmu.h 3231diff -urNp linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h
3232--- linux-2.6.32.14/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400 3232--- linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400
3233+++ linux-2.6.32.14/arch/sparc/include/asm/pgtsrmmu.h 2010-05-28 21:27:14.871031796 -0400 3233+++ linux-2.6.32.15/arch/sparc/include/asm/pgtsrmmu.h 2010-05-28 21:27:14.871031796 -0400
3234@@ -115,6 +115,13 @@ 3234@@ -115,6 +115,13 @@
3235 SRMMU_EXEC | SRMMU_REF) 3235 SRMMU_EXEC | SRMMU_REF)
3236 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ 3236 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3245,9 +3245,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.14/arc
3245 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ 3245 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
3246 SRMMU_DIRTY | SRMMU_REF) 3246 SRMMU_DIRTY | SRMMU_REF)
3247 3247
3248diff -urNp linux-2.6.32.14/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.14/arch/sparc/include/asm/spinlock_64.h 3248diff -urNp linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h
3249--- linux-2.6.32.14/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400 3249--- linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400
3250+++ linux-2.6.32.14/arch/sparc/include/asm/spinlock_64.h 2010-05-28 21:27:14.871031796 -0400 3250+++ linux-2.6.32.15/arch/sparc/include/asm/spinlock_64.h 2010-05-28 21:27:14.871031796 -0400
3251@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw 3251@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
3252 __asm__ __volatile__ ( 3252 __asm__ __volatile__ (
3253 "1: ldsw [%2], %0\n" 3253 "1: ldsw [%2], %0\n"
@@ -3299,9 +3299,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.14/
3299 " cas [%2], %0, %1\n" 3299 " cas [%2], %0, %1\n"
3300 " cmp %0, %1\n" 3300 " cmp %0, %1\n"
3301 " bne,pn %%xcc, 1b\n" 3301 " bne,pn %%xcc, 1b\n"
3302diff -urNp linux-2.6.32.14/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.14/arch/sparc/include/asm/uaccess_32.h 3302diff -urNp linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h
3303--- linux-2.6.32.14/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 3303--- linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
3304+++ linux-2.6.32.14/arch/sparc/include/asm/uaccess_32.h 2010-05-28 21:27:14.871031796 -0400 3304+++ linux-2.6.32.15/arch/sparc/include/asm/uaccess_32.h 2010-05-28 21:27:14.871031796 -0400
3305@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ 3305@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
3306 3306
3307 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) 3307 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3353,9 +3353,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.14/a
3353 return __copy_user((__force void __user *) to, from, n); 3353 return __copy_user((__force void __user *) to, from, n);
3354 } 3354 }
3355 3355
3356diff -urNp linux-2.6.32.14/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.14/arch/sparc/include/asm/uaccess_64.h 3356diff -urNp linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h
3357--- linux-2.6.32.14/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 3357--- linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
3358+++ linux-2.6.32.14/arch/sparc/include/asm/uaccess_64.h 2010-05-28 21:27:14.871031796 -0400 3358+++ linux-2.6.32.15/arch/sparc/include/asm/uaccess_64.h 2010-05-28 21:27:14.871031796 -0400
3359@@ -9,6 +9,7 @@ 3359@@ -9,6 +9,7 @@
3360 #include <linux/compiler.h> 3360 #include <linux/compiler.h>
3361 #include <linux/string.h> 3361 #include <linux/string.h>
@@ -3406,9 +3406,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.14/a
3406 if (unlikely(ret)) 3406 if (unlikely(ret))
3407 ret = copy_to_user_fixup(to, from, size); 3407 ret = copy_to_user_fixup(to, from, size);
3408 return ret; 3408 return ret;
3409diff -urNp linux-2.6.32.14/arch/sparc/kernel/iommu.c linux-2.6.32.14/arch/sparc/kernel/iommu.c 3409diff -urNp linux-2.6.32.15/arch/sparc/kernel/iommu.c linux-2.6.32.15/arch/sparc/kernel/iommu.c
3410--- linux-2.6.32.14/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400 3410--- linux-2.6.32.15/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400
3411+++ linux-2.6.32.14/arch/sparc/kernel/iommu.c 2010-05-28 21:27:14.874960218 -0400 3411+++ linux-2.6.32.15/arch/sparc/kernel/iommu.c 2010-05-28 21:27:14.874960218 -0400
3412@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc 3412@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
3413 spin_unlock_irqrestore(&iommu->lock, flags); 3413 spin_unlock_irqrestore(&iommu->lock, flags);
3414 } 3414 }
@@ -3427,9 +3427,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/kernel/iommu.c linux-2.6.32.14/arch/sparc/
3427 EXPORT_SYMBOL(dma_ops); 3427 EXPORT_SYMBOL(dma_ops);
3428 3428
3429 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); 3429 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
3430diff -urNp linux-2.6.32.14/arch/sparc/kernel/ioport.c linux-2.6.32.14/arch/sparc/kernel/ioport.c 3430diff -urNp linux-2.6.32.15/arch/sparc/kernel/ioport.c linux-2.6.32.15/arch/sparc/kernel/ioport.c
3431--- linux-2.6.32.14/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 3431--- linux-2.6.32.15/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
3432+++ linux-2.6.32.14/arch/sparc/kernel/ioport.c 2010-05-28 21:27:14.874960218 -0400 3432+++ linux-2.6.32.15/arch/sparc/kernel/ioport.c 2010-05-28 21:27:14.874960218 -0400
3433@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru 3433@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
3434 BUG(); 3434 BUG();
3435 } 3435 }
@@ -3457,9 +3457,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/kernel/ioport.c linux-2.6.32.14/arch/sparc
3457 .alloc_coherent = pci32_alloc_coherent, 3457 .alloc_coherent = pci32_alloc_coherent,
3458 .free_coherent = pci32_free_coherent, 3458 .free_coherent = pci32_free_coherent,
3459 .map_page = pci32_map_page, 3459 .map_page = pci32_map_page,
3460diff -urNp linux-2.6.32.14/arch/sparc/kernel/kgdb_32.c linux-2.6.32.14/arch/sparc/kernel/kgdb_32.c 3460diff -urNp linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c
3461--- linux-2.6.32.14/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400 3461--- linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400
3462+++ linux-2.6.32.14/arch/sparc/kernel/kgdb_32.c 2010-05-28 21:27:14.874960218 -0400 3462+++ linux-2.6.32.15/arch/sparc/kernel/kgdb_32.c 2010-05-28 21:27:14.874960218 -0400
3463@@ -158,7 +158,7 @@ void kgdb_arch_exit(void) 3463@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
3464 { 3464 {
3465 } 3465 }
@@ -3469,9 +3469,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/kernel/kgdb_32.c linux-2.6.32.14/arch/spar
3469 /* Breakpoint instruction: ta 0x7d */ 3469 /* Breakpoint instruction: ta 0x7d */
3470 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, 3470 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
3471 }; 3471 };
3472diff -urNp linux-2.6.32.14/arch/sparc/kernel/kgdb_64.c linux-2.6.32.14/arch/sparc/kernel/kgdb_64.c 3472diff -urNp linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c
3473--- linux-2.6.32.14/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400 3473--- linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400
3474+++ linux-2.6.32.14/arch/sparc/kernel/kgdb_64.c 2010-05-28 21:27:14.874960218 -0400 3474+++ linux-2.6.32.15/arch/sparc/kernel/kgdb_64.c 2010-05-28 21:27:14.874960218 -0400
3475@@ -180,7 +180,7 @@ void kgdb_arch_exit(void) 3475@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
3476 { 3476 {
3477 } 3477 }
@@ -3481,9 +3481,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/kernel/kgdb_64.c linux-2.6.32.14/arch/spar
3481 /* Breakpoint instruction: ta 0x72 */ 3481 /* Breakpoint instruction: ta 0x72 */
3482 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, 3482 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
3483 }; 3483 };
3484diff -urNp linux-2.6.32.14/arch/sparc/kernel/Makefile linux-2.6.32.14/arch/sparc/kernel/Makefile 3484diff -urNp linux-2.6.32.15/arch/sparc/kernel/Makefile linux-2.6.32.15/arch/sparc/kernel/Makefile
3485--- linux-2.6.32.14/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400 3485--- linux-2.6.32.15/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400
3486+++ linux-2.6.32.14/arch/sparc/kernel/Makefile 2010-05-28 21:27:14.874960218 -0400 3486+++ linux-2.6.32.15/arch/sparc/kernel/Makefile 2010-05-28 21:27:14.874960218 -0400
3487@@ -3,7 +3,7 @@ 3487@@ -3,7 +3,7 @@
3488 # 3488 #
3489 3489
@@ -3493,9 +3493,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/kernel/Makefile linux-2.6.32.14/arch/sparc
3493 3493
3494 extra-y := head_$(BITS).o 3494 extra-y := head_$(BITS).o
3495 extra-y += init_task.o 3495 extra-y += init_task.o
3496diff -urNp linux-2.6.32.14/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.14/arch/sparc/kernel/pci_sun4v.c 3496diff -urNp linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c
3497--- linux-2.6.32.14/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400 3497--- linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400
3498+++ linux-2.6.32.14/arch/sparc/kernel/pci_sun4v.c 2010-05-28 21:27:14.874960218 -0400 3498+++ linux-2.6.32.15/arch/sparc/kernel/pci_sun4v.c 2010-05-28 21:27:14.874960218 -0400
3499@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic 3499@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
3500 spin_unlock_irqrestore(&iommu->lock, flags); 3500 spin_unlock_irqrestore(&iommu->lock, flags);
3501 } 3501 }
@@ -3505,9 +3505,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.14/arch/sp
3505 .alloc_coherent = dma_4v_alloc_coherent, 3505 .alloc_coherent = dma_4v_alloc_coherent,
3506 .free_coherent = dma_4v_free_coherent, 3506 .free_coherent = dma_4v_free_coherent,
3507 .map_page = dma_4v_map_page, 3507 .map_page = dma_4v_map_page,
3508diff -urNp linux-2.6.32.14/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.14/arch/sparc/kernel/sys_sparc_32.c 3508diff -urNp linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c
3509--- linux-2.6.32.14/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400 3509--- linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400
3510+++ linux-2.6.32.14/arch/sparc/kernel/sys_sparc_32.c 2010-05-28 21:27:14.874960218 -0400 3510+++ linux-2.6.32.15/arch/sparc/kernel/sys_sparc_32.c 2010-05-28 21:27:14.874960218 -0400
3511@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str 3511@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
3512 if (ARCH_SUN4C && len > 0x20000000) 3512 if (ARCH_SUN4C && len > 0x20000000)
3513 return -ENOMEM; 3513 return -ENOMEM;
@@ -3517,9 +3517,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.14/arch
3517 3517
3518 if (flags & MAP_SHARED) 3518 if (flags & MAP_SHARED)
3519 addr = COLOUR_ALIGN(addr); 3519 addr = COLOUR_ALIGN(addr);
3520diff -urNp linux-2.6.32.14/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.14/arch/sparc/kernel/sys_sparc_64.c 3520diff -urNp linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c
3521--- linux-2.6.32.14/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400 3521--- linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400
3522+++ linux-2.6.32.14/arch/sparc/kernel/sys_sparc_64.c 2010-05-28 21:27:14.874960218 -0400 3522+++ linux-2.6.32.15/arch/sparc/kernel/sys_sparc_64.c 2010-05-28 21:27:14.874960218 -0400
3523@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str 3523@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
3524 /* We do not accept a shared mapping if it would violate 3524 /* We do not accept a shared mapping if it would violate
3525 * cache aliasing constraints. 3525 * cache aliasing constraints.
@@ -3598,9 +3598,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.14/arch
3598 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 3598 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
3599 mm->unmap_area = arch_unmap_area_topdown; 3599 mm->unmap_area = arch_unmap_area_topdown;
3600 } 3600 }
3601diff -urNp linux-2.6.32.14/arch/sparc/kernel/traps_64.c linux-2.6.32.14/arch/sparc/kernel/traps_64.c 3601diff -urNp linux-2.6.32.15/arch/sparc/kernel/traps_64.c linux-2.6.32.15/arch/sparc/kernel/traps_64.c
3602--- linux-2.6.32.14/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400 3602--- linux-2.6.32.15/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400
3603+++ linux-2.6.32.14/arch/sparc/kernel/traps_64.c 2010-05-28 21:27:14.874960218 -0400 3603+++ linux-2.6.32.15/arch/sparc/kernel/traps_64.c 2010-05-28 21:27:14.874960218 -0400
3604@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long 3604@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long
3605 3605
3606 lvl -= 0x100; 3606 lvl -= 0x100;
@@ -3632,9 +3632,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/kernel/traps_64.c linux-2.6.32.14/arch/spa
3632 dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); 3632 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
3633 3633
3634 sprintf (buffer, "Bad trap %lx at tl>0", lvl); 3634 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
3635diff -urNp linux-2.6.32.14/arch/sparc/lib/atomic_64.S linux-2.6.32.14/arch/sparc/lib/atomic_64.S 3635diff -urNp linux-2.6.32.15/arch/sparc/lib/atomic_64.S linux-2.6.32.15/arch/sparc/lib/atomic_64.S
3636--- linux-2.6.32.14/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400 3636--- linux-2.6.32.15/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400
3637+++ linux-2.6.32.14/arch/sparc/lib/atomic_64.S 2010-05-28 21:27:14.874960218 -0400 3637+++ linux-2.6.32.15/arch/sparc/lib/atomic_64.S 2010-05-28 21:27:14.874960218 -0400
3638@@ -18,7 +18,12 @@ 3638@@ -18,7 +18,12 @@
3639 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ 3639 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
3640 BACKOFF_SETUP(%o2) 3640 BACKOFF_SETUP(%o2)
@@ -3828,9 +3828,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/lib/atomic_64.S linux-2.6.32.14/arch/sparc
3828 casx [%o1], %g1, %g7 3828 casx [%o1], %g1, %g7
3829 cmp %g1, %g7 3829 cmp %g1, %g7
3830 bne,pn %xcc, 2f 3830 bne,pn %xcc, 2f
3831diff -urNp linux-2.6.32.14/arch/sparc/lib/ksyms.c linux-2.6.32.14/arch/sparc/lib/ksyms.c 3831diff -urNp linux-2.6.32.15/arch/sparc/lib/ksyms.c linux-2.6.32.15/arch/sparc/lib/ksyms.c
3832--- linux-2.6.32.14/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400 3832--- linux-2.6.32.15/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400
3833+++ linux-2.6.32.14/arch/sparc/lib/ksyms.c 2010-05-28 21:27:14.874960218 -0400 3833+++ linux-2.6.32.15/arch/sparc/lib/ksyms.c 2010-05-28 21:27:14.874960218 -0400
3834@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); 3834@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write);
3835 3835
3836 /* Atomic counter implementation. */ 3836 /* Atomic counter implementation. */
@@ -3842,9 +3842,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/lib/ksyms.c linux-2.6.32.14/arch/sparc/lib
3842 EXPORT_SYMBOL(atomic_sub_ret); 3842 EXPORT_SYMBOL(atomic_sub_ret);
3843 EXPORT_SYMBOL(atomic64_add); 3843 EXPORT_SYMBOL(atomic64_add);
3844 EXPORT_SYMBOL(atomic64_add_ret); 3844 EXPORT_SYMBOL(atomic64_add_ret);
3845diff -urNp linux-2.6.32.14/arch/sparc/lib/rwsem_64.S linux-2.6.32.14/arch/sparc/lib/rwsem_64.S 3845diff -urNp linux-2.6.32.15/arch/sparc/lib/rwsem_64.S linux-2.6.32.15/arch/sparc/lib/rwsem_64.S
3846--- linux-2.6.32.14/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400 3846--- linux-2.6.32.15/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400
3847+++ linux-2.6.32.14/arch/sparc/lib/rwsem_64.S 2010-05-28 21:27:14.874960218 -0400 3847+++ linux-2.6.32.15/arch/sparc/lib/rwsem_64.S 2010-05-28 21:27:14.874960218 -0400
3848@@ -11,7 +11,12 @@ 3848@@ -11,7 +11,12 @@
3849 .globl __down_read 3849 .globl __down_read
3850 __down_read: 3850 __down_read:
@@ -3943,9 +3943,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/lib/rwsem_64.S linux-2.6.32.14/arch/sparc/
3943 cas [%o0], %g3, %g7 3943 cas [%o0], %g3, %g7
3944 cmp %g3, %g7 3944 cmp %g3, %g7
3945 bne,pn %icc, 1b 3945 bne,pn %icc, 1b
3946diff -urNp linux-2.6.32.14/arch/sparc/Makefile linux-2.6.32.14/arch/sparc/Makefile 3946diff -urNp linux-2.6.32.15/arch/sparc/Makefile linux-2.6.32.15/arch/sparc/Makefile
3947--- linux-2.6.32.14/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400 3947--- linux-2.6.32.15/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400
3948+++ linux-2.6.32.14/arch/sparc/Makefile 2010-05-28 21:27:14.874960218 -0400 3948+++ linux-2.6.32.15/arch/sparc/Makefile 2010-05-28 21:27:14.874960218 -0400
3949@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc 3949@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
3950 # Export what is needed by arch/sparc/boot/Makefile 3950 # Export what is needed by arch/sparc/boot/Makefile
3951 export VMLINUX_INIT VMLINUX_MAIN 3951 export VMLINUX_INIT VMLINUX_MAIN
@@ -3955,9 +3955,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/Makefile linux-2.6.32.14/arch/sparc/Makefi
3955 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) 3955 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
3956 VMLINUX_MAIN += $(drivers-y) $(net-y) 3956 VMLINUX_MAIN += $(drivers-y) $(net-y)
3957 3957
3958diff -urNp linux-2.6.32.14/arch/sparc/mm/fault_32.c linux-2.6.32.14/arch/sparc/mm/fault_32.c 3958diff -urNp linux-2.6.32.15/arch/sparc/mm/fault_32.c linux-2.6.32.15/arch/sparc/mm/fault_32.c
3959--- linux-2.6.32.14/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400 3959--- linux-2.6.32.15/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400
3960+++ linux-2.6.32.14/arch/sparc/mm/fault_32.c 2010-05-28 21:27:14.874960218 -0400 3960+++ linux-2.6.32.15/arch/sparc/mm/fault_32.c 2010-05-28 21:27:14.874960218 -0400
3961@@ -21,6 +21,9 @@ 3961@@ -21,6 +21,9 @@
3962 #include <linux/interrupt.h> 3962 #include <linux/interrupt.h>
3963 #include <linux/module.h> 3963 #include <linux/module.h>
@@ -4261,9 +4261,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/mm/fault_32.c linux-2.6.32.14/arch/sparc/m
4261 /* Allow reads even for write-only mappings */ 4261 /* Allow reads even for write-only mappings */
4262 if(!(vma->vm_flags & (VM_READ | VM_EXEC))) 4262 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
4263 goto bad_area; 4263 goto bad_area;
4264diff -urNp linux-2.6.32.14/arch/sparc/mm/fault_64.c linux-2.6.32.14/arch/sparc/mm/fault_64.c 4264diff -urNp linux-2.6.32.15/arch/sparc/mm/fault_64.c linux-2.6.32.15/arch/sparc/mm/fault_64.c
4265--- linux-2.6.32.14/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400 4265--- linux-2.6.32.15/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400
4266+++ linux-2.6.32.14/arch/sparc/mm/fault_64.c 2010-05-28 21:27:14.878908357 -0400 4266+++ linux-2.6.32.15/arch/sparc/mm/fault_64.c 2010-05-28 21:27:14.878908357 -0400
4267@@ -20,6 +20,9 @@ 4267@@ -20,6 +20,9 @@
4268 #include <linux/kprobes.h> 4268 #include <linux/kprobes.h>
4269 #include <linux/kdebug.h> 4269 #include <linux/kdebug.h>
@@ -4761,9 +4761,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/mm/fault_64.c linux-2.6.32.14/arch/sparc/m
4761 /* Pure DTLB misses do not tell us whether the fault causing 4761 /* Pure DTLB misses do not tell us whether the fault causing
4762 * load/store/atomic was a write or not, it only says that there 4762 * load/store/atomic was a write or not, it only says that there
4763 * was no match. So in such a case we (carefully) read the 4763 * was no match. So in such a case we (carefully) read the
4764diff -urNp linux-2.6.32.14/arch/sparc/mm/init_32.c linux-2.6.32.14/arch/sparc/mm/init_32.c 4764diff -urNp linux-2.6.32.15/arch/sparc/mm/init_32.c linux-2.6.32.15/arch/sparc/mm/init_32.c
4765--- linux-2.6.32.14/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 4765--- linux-2.6.32.15/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
4766+++ linux-2.6.32.14/arch/sparc/mm/init_32.c 2010-05-28 21:27:14.878908357 -0400 4766+++ linux-2.6.32.15/arch/sparc/mm/init_32.c 2010-05-28 21:27:14.878908357 -0400
4767@@ -317,6 +317,9 @@ extern void device_scan(void); 4767@@ -317,6 +317,9 @@ extern void device_scan(void);
4768 pgprot_t PAGE_SHARED __read_mostly; 4768 pgprot_t PAGE_SHARED __read_mostly;
4769 EXPORT_SYMBOL(PAGE_SHARED); 4769 EXPORT_SYMBOL(PAGE_SHARED);
@@ -4798,9 +4798,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/mm/init_32.c linux-2.6.32.14/arch/sparc/mm
4798 protection_map[12] = PAGE_READONLY; 4798 protection_map[12] = PAGE_READONLY;
4799 protection_map[13] = PAGE_READONLY; 4799 protection_map[13] = PAGE_READONLY;
4800 protection_map[14] = PAGE_SHARED; 4800 protection_map[14] = PAGE_SHARED;
4801diff -urNp linux-2.6.32.14/arch/sparc/mm/Makefile linux-2.6.32.14/arch/sparc/mm/Makefile 4801diff -urNp linux-2.6.32.15/arch/sparc/mm/Makefile linux-2.6.32.15/arch/sparc/mm/Makefile
4802--- linux-2.6.32.14/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400 4802--- linux-2.6.32.15/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400
4803+++ linux-2.6.32.14/arch/sparc/mm/Makefile 2010-05-28 21:27:14.878908357 -0400 4803+++ linux-2.6.32.15/arch/sparc/mm/Makefile 2010-05-28 21:27:14.878908357 -0400
4804@@ -2,7 +2,7 @@ 4804@@ -2,7 +2,7 @@
4805 # 4805 #
4806 4806
@@ -4810,9 +4810,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/mm/Makefile linux-2.6.32.14/arch/sparc/mm/
4810 4810
4811 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o 4811 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
4812 obj-y += fault_$(BITS).o 4812 obj-y += fault_$(BITS).o
4813diff -urNp linux-2.6.32.14/arch/sparc/mm/srmmu.c linux-2.6.32.14/arch/sparc/mm/srmmu.c 4813diff -urNp linux-2.6.32.15/arch/sparc/mm/srmmu.c linux-2.6.32.15/arch/sparc/mm/srmmu.c
4814--- linux-2.6.32.14/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400 4814--- linux-2.6.32.15/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400
4815+++ linux-2.6.32.14/arch/sparc/mm/srmmu.c 2010-05-28 21:27:14.878908357 -0400 4815+++ linux-2.6.32.15/arch/sparc/mm/srmmu.c 2010-05-28 21:27:14.878908357 -0400
4816@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) 4816@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
4817 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); 4817 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
4818 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); 4818 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -4827,9 +4827,9 @@ diff -urNp linux-2.6.32.14/arch/sparc/mm/srmmu.c linux-2.6.32.14/arch/sparc/mm/s
4827 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); 4827 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
4828 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); 4828 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
4829 4829
4830diff -urNp linux-2.6.32.14/arch/um/include/asm/kmap_types.h linux-2.6.32.14/arch/um/include/asm/kmap_types.h 4830diff -urNp linux-2.6.32.15/arch/um/include/asm/kmap_types.h linux-2.6.32.15/arch/um/include/asm/kmap_types.h
4831--- linux-2.6.32.14/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 4831--- linux-2.6.32.15/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
4832+++ linux-2.6.32.14/arch/um/include/asm/kmap_types.h 2010-05-28 21:27:14.883145356 -0400 4832+++ linux-2.6.32.15/arch/um/include/asm/kmap_types.h 2010-05-28 21:27:14.883145356 -0400
4833@@ -23,6 +23,7 @@ enum km_type { 4833@@ -23,6 +23,7 @@ enum km_type {
4834 KM_IRQ1, 4834 KM_IRQ1,
4835 KM_SOFTIRQ0, 4835 KM_SOFTIRQ0,
@@ -4838,9 +4838,9 @@ diff -urNp linux-2.6.32.14/arch/um/include/asm/kmap_types.h linux-2.6.32.14/arch
4838 KM_TYPE_NR 4838 KM_TYPE_NR
4839 }; 4839 };
4840 4840
4841diff -urNp linux-2.6.32.14/arch/um/include/asm/page.h linux-2.6.32.14/arch/um/include/asm/page.h 4841diff -urNp linux-2.6.32.15/arch/um/include/asm/page.h linux-2.6.32.15/arch/um/include/asm/page.h
4842--- linux-2.6.32.14/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 4842--- linux-2.6.32.15/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
4843+++ linux-2.6.32.14/arch/um/include/asm/page.h 2010-05-28 21:27:14.883145356 -0400 4843+++ linux-2.6.32.15/arch/um/include/asm/page.h 2010-05-28 21:27:14.883145356 -0400
4844@@ -14,6 +14,9 @@ 4844@@ -14,6 +14,9 @@
4845 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) 4845 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
4846 #define PAGE_MASK (~(PAGE_SIZE-1)) 4846 #define PAGE_MASK (~(PAGE_SIZE-1))
@@ -4851,9 +4851,9 @@ diff -urNp linux-2.6.32.14/arch/um/include/asm/page.h linux-2.6.32.14/arch/um/in
4851 #ifndef __ASSEMBLY__ 4851 #ifndef __ASSEMBLY__
4852 4852
4853 struct page; 4853 struct page;
4854diff -urNp linux-2.6.32.14/arch/um/sys-i386/syscalls.c linux-2.6.32.14/arch/um/sys-i386/syscalls.c 4854diff -urNp linux-2.6.32.15/arch/um/sys-i386/syscalls.c linux-2.6.32.15/arch/um/sys-i386/syscalls.c
4855--- linux-2.6.32.14/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400 4855--- linux-2.6.32.15/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400
4856+++ linux-2.6.32.14/arch/um/sys-i386/syscalls.c 2010-05-28 21:27:14.883145356 -0400 4856+++ linux-2.6.32.15/arch/um/sys-i386/syscalls.c 2010-05-28 21:27:14.883145356 -0400
4857@@ -11,6 +11,21 @@ 4857@@ -11,6 +11,21 @@
4858 #include "asm/uaccess.h" 4858 #include "asm/uaccess.h"
4859 #include "asm/unistd.h" 4859 #include "asm/unistd.h"
@@ -4876,9 +4876,9 @@ diff -urNp linux-2.6.32.14/arch/um/sys-i386/syscalls.c linux-2.6.32.14/arch/um/s
4876 /* 4876 /*
4877 * Perform the select(nd, in, out, ex, tv) and mmap() system 4877 * Perform the select(nd, in, out, ex, tv) and mmap() system
4878 * calls. Linux/i386 didn't use to be able to handle more than 4878 * calls. Linux/i386 didn't use to be able to handle more than
4879diff -urNp linux-2.6.32.14/arch/x86/boot/bitops.h linux-2.6.32.14/arch/x86/boot/bitops.h 4879diff -urNp linux-2.6.32.15/arch/x86/boot/bitops.h linux-2.6.32.15/arch/x86/boot/bitops.h
4880--- linux-2.6.32.14/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400 4880--- linux-2.6.32.15/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400
4881+++ linux-2.6.32.14/arch/x86/boot/bitops.h 2010-05-28 21:27:14.891136655 -0400 4881+++ linux-2.6.32.15/arch/x86/boot/bitops.h 2010-05-28 21:27:14.891136655 -0400
4882@@ -26,7 +26,7 @@ static inline int variable_test_bit(int 4882@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
4883 u8 v; 4883 u8 v;
4884 const u32 *p = (const u32 *)addr; 4884 const u32 *p = (const u32 *)addr;
@@ -4897,9 +4897,9 @@ diff -urNp linux-2.6.32.14/arch/x86/boot/bitops.h linux-2.6.32.14/arch/x86/boot/
4897 } 4897 }
4898 4898
4899 #endif /* BOOT_BITOPS_H */ 4899 #endif /* BOOT_BITOPS_H */
4900diff -urNp linux-2.6.32.14/arch/x86/boot/boot.h linux-2.6.32.14/arch/x86/boot/boot.h 4900diff -urNp linux-2.6.32.15/arch/x86/boot/boot.h linux-2.6.32.15/arch/x86/boot/boot.h
4901--- linux-2.6.32.14/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400 4901--- linux-2.6.32.15/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400
4902+++ linux-2.6.32.14/arch/x86/boot/boot.h 2010-05-28 21:27:14.891136655 -0400 4902+++ linux-2.6.32.15/arch/x86/boot/boot.h 2010-05-28 21:27:14.891136655 -0400
4903@@ -82,7 +82,7 @@ static inline void io_delay(void) 4903@@ -82,7 +82,7 @@ static inline void io_delay(void)
4904 static inline u16 ds(void) 4904 static inline u16 ds(void)
4905 { 4905 {
@@ -4918,9 +4918,9 @@ diff -urNp linux-2.6.32.14/arch/x86/boot/boot.h linux-2.6.32.14/arch/x86/boot/bo
4918 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); 4918 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
4919 return diff; 4919 return diff;
4920 } 4920 }
4921diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/head_32.S linux-2.6.32.14/arch/x86/boot/compressed/head_32.S 4921diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/head_32.S linux-2.6.32.15/arch/x86/boot/compressed/head_32.S
4922--- linux-2.6.32.14/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400 4922--- linux-2.6.32.15/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400
4923+++ linux-2.6.32.14/arch/x86/boot/compressed/head_32.S 2010-05-28 21:27:14.891136655 -0400 4923+++ linux-2.6.32.15/arch/x86/boot/compressed/head_32.S 2010-05-28 21:27:14.891136655 -0400
4924@@ -76,7 +76,7 @@ ENTRY(startup_32) 4924@@ -76,7 +76,7 @@ ENTRY(startup_32)
4925 notl %eax 4925 notl %eax
4926 andl %eax, %ebx 4926 andl %eax, %ebx
@@ -4949,9 +4949,9 @@ diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/head_32.S linux-2.6.32.14/ar
4949 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) 4949 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
4950 jmp 1b 4950 jmp 1b
4951 2: 4951 2:
4952diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/head_64.S linux-2.6.32.14/arch/x86/boot/compressed/head_64.S 4952diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/head_64.S linux-2.6.32.15/arch/x86/boot/compressed/head_64.S
4953--- linux-2.6.32.14/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400 4953--- linux-2.6.32.15/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400
4954+++ linux-2.6.32.14/arch/x86/boot/compressed/head_64.S 2010-05-28 21:27:14.891136655 -0400 4954+++ linux-2.6.32.15/arch/x86/boot/compressed/head_64.S 2010-05-28 21:27:14.891136655 -0400
4955@@ -91,7 +91,7 @@ ENTRY(startup_32) 4955@@ -91,7 +91,7 @@ ENTRY(startup_32)
4956 notl %eax 4956 notl %eax
4957 andl %eax, %ebx 4957 andl %eax, %ebx
@@ -4970,9 +4970,9 @@ diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/head_64.S linux-2.6.32.14/ar
4970 #endif 4970 #endif
4971 4971
4972 /* Target address to relocate to for decompression */ 4972 /* Target address to relocate to for decompression */
4973diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/misc.c linux-2.6.32.14/arch/x86/boot/compressed/misc.c 4973diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/misc.c linux-2.6.32.15/arch/x86/boot/compressed/misc.c
4974--- linux-2.6.32.14/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400 4974--- linux-2.6.32.15/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400
4975+++ linux-2.6.32.14/arch/x86/boot/compressed/misc.c 2010-05-28 21:27:14.895019280 -0400 4975+++ linux-2.6.32.15/arch/x86/boot/compressed/misc.c 2010-05-28 21:27:14.895019280 -0400
4976@@ -288,7 +288,7 @@ static void parse_elf(void *output) 4976@@ -288,7 +288,7 @@ static void parse_elf(void *output)
4977 case PT_LOAD: 4977 case PT_LOAD:
4978 #ifdef CONFIG_RELOCATABLE 4978 #ifdef CONFIG_RELOCATABLE
@@ -4991,9 +4991,9 @@ diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/misc.c linux-2.6.32.14/arch/
4991 error("Wrong destination address"); 4991 error("Wrong destination address");
4992 #endif 4992 #endif
4993 4993
4994diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.14/arch/x86/boot/compressed/mkpiggy.c 4994diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c
4995--- linux-2.6.32.14/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400 4995--- linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400
4996+++ linux-2.6.32.14/arch/x86/boot/compressed/mkpiggy.c 2010-05-28 21:27:14.895019280 -0400 4996+++ linux-2.6.32.15/arch/x86/boot/compressed/mkpiggy.c 2010-05-28 21:27:14.895019280 -0400
4997@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) 4997@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
4998 4998
4999 offs = (olen > ilen) ? olen - ilen : 0; 4999 offs = (olen > ilen) ? olen - ilen : 0;
@@ -5003,9 +5003,9 @@ diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.14/ar
5003 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ 5003 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
5004 5004
5005 printf(".section \".rodata.compressed\",\"a\",@progbits\n"); 5005 printf(".section \".rodata.compressed\",\"a\",@progbits\n");
5006diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/relocs.c linux-2.6.32.14/arch/x86/boot/compressed/relocs.c 5006diff -urNp linux-2.6.32.15/arch/x86/boot/compressed/relocs.c linux-2.6.32.15/arch/x86/boot/compressed/relocs.c
5007--- linux-2.6.32.14/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400 5007--- linux-2.6.32.15/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400
5008+++ linux-2.6.32.14/arch/x86/boot/compressed/relocs.c 2010-05-28 21:27:14.895019280 -0400 5008+++ linux-2.6.32.15/arch/x86/boot/compressed/relocs.c 2010-05-28 21:27:14.895019280 -0400
5009@@ -10,8 +10,11 @@ 5009@@ -10,8 +10,11 @@
5010 #define USE_BSD 5010 #define USE_BSD
5011 #include <endian.h> 5011 #include <endian.h>
@@ -5206,9 +5206,9 @@ diff -urNp linux-2.6.32.14/arch/x86/boot/compressed/relocs.c linux-2.6.32.14/arc
5206 read_shdrs(fp); 5206 read_shdrs(fp);
5207 read_strtabs(fp); 5207 read_strtabs(fp);
5208 read_symtabs(fp); 5208 read_symtabs(fp);
5209diff -urNp linux-2.6.32.14/arch/x86/boot/cpucheck.c linux-2.6.32.14/arch/x86/boot/cpucheck.c 5209diff -urNp linux-2.6.32.15/arch/x86/boot/cpucheck.c linux-2.6.32.15/arch/x86/boot/cpucheck.c
5210--- linux-2.6.32.14/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400 5210--- linux-2.6.32.15/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400
5211+++ linux-2.6.32.14/arch/x86/boot/cpucheck.c 2010-05-28 21:27:14.895019280 -0400 5211+++ linux-2.6.32.15/arch/x86/boot/cpucheck.c 2010-05-28 21:27:14.895019280 -0400
5212@@ -74,7 +74,7 @@ static int has_fpu(void) 5212@@ -74,7 +74,7 @@ static int has_fpu(void)
5213 u16 fcw = -1, fsw = -1; 5213 u16 fcw = -1, fsw = -1;
5214 u32 cr0; 5214 u32 cr0;
@@ -5304,9 +5304,9 @@ diff -urNp linux-2.6.32.14/arch/x86/boot/cpucheck.c linux-2.6.32.14/arch/x86/boo
5304 5304
5305 err = check_flags(); 5305 err = check_flags();
5306 } 5306 }
5307diff -urNp linux-2.6.32.14/arch/x86/boot/header.S linux-2.6.32.14/arch/x86/boot/header.S 5307diff -urNp linux-2.6.32.15/arch/x86/boot/header.S linux-2.6.32.15/arch/x86/boot/header.S
5308--- linux-2.6.32.14/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400 5308--- linux-2.6.32.15/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400
5309+++ linux-2.6.32.14/arch/x86/boot/header.S 2010-05-28 21:27:14.895019280 -0400 5309+++ linux-2.6.32.15/arch/x86/boot/header.S 2010-05-28 21:27:14.895019280 -0400
5310@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical 5310@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
5311 # single linked list of 5311 # single linked list of
5312 # struct setup_data 5312 # struct setup_data
@@ -5316,9 +5316,9 @@ diff -urNp linux-2.6.32.14/arch/x86/boot/header.S linux-2.6.32.14/arch/x86/boot/
5316 5316
5317 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) 5317 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
5318 #define VO_INIT_SIZE (VO__end - VO__text) 5318 #define VO_INIT_SIZE (VO__end - VO__text)
5319diff -urNp linux-2.6.32.14/arch/x86/boot/memory.c linux-2.6.32.14/arch/x86/boot/memory.c 5319diff -urNp linux-2.6.32.15/arch/x86/boot/memory.c linux-2.6.32.15/arch/x86/boot/memory.c
5320--- linux-2.6.32.14/arch/x86/boot/memory.c 2010-03-15 11:52:04.000000000 -0400 5320--- linux-2.6.32.15/arch/x86/boot/memory.c 2010-03-15 11:52:04.000000000 -0400
5321+++ linux-2.6.32.14/arch/x86/boot/memory.c 2010-05-28 21:27:14.895019280 -0400 5321+++ linux-2.6.32.15/arch/x86/boot/memory.c 2010-05-28 21:27:14.895019280 -0400
5322@@ -19,7 +19,7 @@ 5322@@ -19,7 +19,7 @@
5323 5323
5324 static int detect_memory_e820(void) 5324 static int detect_memory_e820(void)
@@ -5328,9 +5328,9 @@ diff -urNp linux-2.6.32.14/arch/x86/boot/memory.c linux-2.6.32.14/arch/x86/boot/
5328 struct biosregs ireg, oreg; 5328 struct biosregs ireg, oreg;
5329 struct e820entry *desc = boot_params.e820_map; 5329 struct e820entry *desc = boot_params.e820_map;
5330 static struct e820entry buf; /* static so it is zeroed */ 5330 static struct e820entry buf; /* static so it is zeroed */
5331diff -urNp linux-2.6.32.14/arch/x86/boot/video.c linux-2.6.32.14/arch/x86/boot/video.c 5331diff -urNp linux-2.6.32.15/arch/x86/boot/video.c linux-2.6.32.15/arch/x86/boot/video.c
5332--- linux-2.6.32.14/arch/x86/boot/video.c 2010-03-15 11:52:04.000000000 -0400 5332--- linux-2.6.32.15/arch/x86/boot/video.c 2010-03-15 11:52:04.000000000 -0400
5333+++ linux-2.6.32.14/arch/x86/boot/video.c 2010-05-28 21:27:14.895019280 -0400 5333+++ linux-2.6.32.15/arch/x86/boot/video.c 2010-05-28 21:27:14.895019280 -0400
5334@@ -90,7 +90,7 @@ static void store_mode_params(void) 5334@@ -90,7 +90,7 @@ static void store_mode_params(void)
5335 static unsigned int get_entry(void) 5335 static unsigned int get_entry(void)
5336 { 5336 {
@@ -5340,9 +5340,9 @@ diff -urNp linux-2.6.32.14/arch/x86/boot/video.c linux-2.6.32.14/arch/x86/boot/v
5340 int key; 5340 int key;
5341 unsigned int v; 5341 unsigned int v;
5342 5342
5343diff -urNp linux-2.6.32.14/arch/x86/boot/video-vesa.c linux-2.6.32.14/arch/x86/boot/video-vesa.c 5343diff -urNp linux-2.6.32.15/arch/x86/boot/video-vesa.c linux-2.6.32.15/arch/x86/boot/video-vesa.c
5344--- linux-2.6.32.14/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400 5344--- linux-2.6.32.15/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400
5345+++ linux-2.6.32.14/arch/x86/boot/video-vesa.c 2010-05-28 21:27:14.895019280 -0400 5345+++ linux-2.6.32.15/arch/x86/boot/video-vesa.c 2010-05-28 21:27:14.895019280 -0400
5346@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) 5346@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
5347 5347
5348 boot_params.screen_info.vesapm_seg = oreg.es; 5348 boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5351,9 +5351,9 @@ diff -urNp linux-2.6.32.14/arch/x86/boot/video-vesa.c linux-2.6.32.14/arch/x86/b
5351 } 5351 }
5352 5352
5353 /* 5353 /*
5354diff -urNp linux-2.6.32.14/arch/x86/ia32/ia32entry.S linux-2.6.32.14/arch/x86/ia32/ia32entry.S 5354diff -urNp linux-2.6.32.15/arch/x86/ia32/ia32entry.S linux-2.6.32.15/arch/x86/ia32/ia32entry.S
5355--- linux-2.6.32.14/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400 5355--- linux-2.6.32.15/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400
5356+++ linux-2.6.32.14/arch/x86/ia32/ia32entry.S 2010-05-28 21:27:14.895019280 -0400 5356+++ linux-2.6.32.15/arch/x86/ia32/ia32entry.S 2010-05-28 21:27:14.895019280 -0400
5357@@ -13,6 +13,7 @@ 5357@@ -13,6 +13,7 @@
5358 #include <asm/thread_info.h> 5358 #include <asm/thread_info.h>
5359 #include <asm/segment.h> 5359 #include <asm/segment.h>
@@ -5448,9 +5448,9 @@ diff -urNp linux-2.6.32.14/arch/x86/ia32/ia32entry.S linux-2.6.32.14/arch/x86/ia
5448 /* 5448 /*
5449 * No need to follow this irqs on/off section: the syscall 5449 * No need to follow this irqs on/off section: the syscall
5450 * disabled irqs and here we enable it straight after entry: 5450 * disabled irqs and here we enable it straight after entry:
5451diff -urNp linux-2.6.32.14/arch/x86/ia32/ia32_signal.c linux-2.6.32.14/arch/x86/ia32/ia32_signal.c 5451diff -urNp linux-2.6.32.15/arch/x86/ia32/ia32_signal.c linux-2.6.32.15/arch/x86/ia32/ia32_signal.c
5452--- linux-2.6.32.14/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400 5452--- linux-2.6.32.15/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400
5453+++ linux-2.6.32.14/arch/x86/ia32/ia32_signal.c 2010-05-28 21:27:14.895019280 -0400 5453+++ linux-2.6.32.15/arch/x86/ia32/ia32_signal.c 2010-05-28 21:27:14.895019280 -0400
5454@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 5454@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
5455 sp -= frame_size; 5455 sp -= frame_size;
5456 /* Align the stack pointer according to the i386 ABI, 5456 /* Align the stack pointer according to the i386 ABI,
@@ -5469,9 +5469,9 @@ diff -urNp linux-2.6.32.14/arch/x86/ia32/ia32_signal.c linux-2.6.32.14/arch/x86/
5469 }; 5469 };
5470 5470
5471 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); 5471 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
5472diff -urNp linux-2.6.32.14/arch/x86/include/asm/alternative.h linux-2.6.32.14/arch/x86/include/asm/alternative.h 5472diff -urNp linux-2.6.32.15/arch/x86/include/asm/alternative.h linux-2.6.32.15/arch/x86/include/asm/alternative.h
5473--- linux-2.6.32.14/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400 5473--- linux-2.6.32.15/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400
5474+++ linux-2.6.32.14/arch/x86/include/asm/alternative.h 2010-05-28 21:27:14.895019280 -0400 5474+++ linux-2.6.32.15/arch/x86/include/asm/alternative.h 2010-05-28 21:27:14.895019280 -0400
5475@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit 5475@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
5476 " .byte 662b-661b\n" /* sourcelen */ \ 5476 " .byte 662b-661b\n" /* sourcelen */ \
5477 " .byte 664f-663f\n" /* replacementlen */ \ 5477 " .byte 664f-663f\n" /* replacementlen */ \
@@ -5481,9 +5481,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/alternative.h linux-2.6.32.14/ar
5481 "663:\n\t" newinstr "\n664:\n" /* replacement */ \ 5481 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
5482 ".previous" 5482 ".previous"
5483 5483
5484diff -urNp linux-2.6.32.14/arch/x86/include/asm/apm.h linux-2.6.32.14/arch/x86/include/asm/apm.h 5484diff -urNp linux-2.6.32.15/arch/x86/include/asm/apm.h linux-2.6.32.15/arch/x86/include/asm/apm.h
5485--- linux-2.6.32.14/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400 5485--- linux-2.6.32.15/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400
5486+++ linux-2.6.32.14/arch/x86/include/asm/apm.h 2010-05-28 21:27:14.903156603 -0400 5486+++ linux-2.6.32.15/arch/x86/include/asm/apm.h 2010-05-28 21:27:14.903156603 -0400
5487@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 5487@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
5488 __asm__ __volatile__(APM_DO_ZERO_SEGS 5488 __asm__ __volatile__(APM_DO_ZERO_SEGS
5489 "pushl %%edi\n\t" 5489 "pushl %%edi\n\t"
@@ -5502,9 +5502,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/apm.h linux-2.6.32.14/arch/x86/i
5502 "setc %%bl\n\t" 5502 "setc %%bl\n\t"
5503 "popl %%ebp\n\t" 5503 "popl %%ebp\n\t"
5504 "popl %%edi\n\t" 5504 "popl %%edi\n\t"
5505diff -urNp linux-2.6.32.14/arch/x86/include/asm/atomic_32.h linux-2.6.32.14/arch/x86/include/asm/atomic_32.h 5505diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_32.h linux-2.6.32.15/arch/x86/include/asm/atomic_32.h
5506--- linux-2.6.32.14/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400 5506--- linux-2.6.32.15/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400
5507+++ linux-2.6.32.14/arch/x86/include/asm/atomic_32.h 2010-05-28 21:27:14.903156603 -0400 5507+++ linux-2.6.32.15/arch/x86/include/asm/atomic_32.h 2010-05-28 21:27:14.903156603 -0400
5508@@ -25,6 +25,17 @@ static inline int atomic_read(const atom 5508@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
5509 } 5509 }
5510 5510
@@ -5835,9 +5835,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/atomic_32.h linux-2.6.32.14/arch
5835 #define ATOMIC64_INIT(val) { (val) } 5835 #define ATOMIC64_INIT(val) { (val) }
5836 5836
5837 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); 5837 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
5838diff -urNp linux-2.6.32.14/arch/x86/include/asm/atomic_64.h linux-2.6.32.14/arch/x86/include/asm/atomic_64.h 5838diff -urNp linux-2.6.32.15/arch/x86/include/asm/atomic_64.h linux-2.6.32.15/arch/x86/include/asm/atomic_64.h
5839--- linux-2.6.32.14/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 5839--- linux-2.6.32.15/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
5840+++ linux-2.6.32.14/arch/x86/include/asm/atomic_64.h 2010-05-28 21:27:14.906924566 -0400 5840+++ linux-2.6.32.15/arch/x86/include/asm/atomic_64.h 2010-05-28 21:27:14.906924566 -0400
5841@@ -24,6 +24,17 @@ static inline int atomic_read(const atom 5841@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
5842 } 5842 }
5843 5843
@@ -6415,9 +6415,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/atomic_64.h linux-2.6.32.14/arch
6415 } 6415 }
6416 6416
6417 /** 6417 /**
6418diff -urNp linux-2.6.32.14/arch/x86/include/asm/boot.h linux-2.6.32.14/arch/x86/include/asm/boot.h 6418diff -urNp linux-2.6.32.15/arch/x86/include/asm/boot.h linux-2.6.32.15/arch/x86/include/asm/boot.h
6419--- linux-2.6.32.14/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400 6419--- linux-2.6.32.15/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400
6420+++ linux-2.6.32.14/arch/x86/include/asm/boot.h 2010-05-28 21:27:14.906924566 -0400 6420+++ linux-2.6.32.15/arch/x86/include/asm/boot.h 2010-05-28 21:27:14.906924566 -0400
6421@@ -11,10 +11,15 @@ 6421@@ -11,10 +11,15 @@
6422 #include <asm/pgtable_types.h> 6422 #include <asm/pgtable_types.h>
6423 6423
@@ -6435,9 +6435,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/boot.h linux-2.6.32.14/arch/x86/
6435 /* Minimum kernel alignment, as a power of two */ 6435 /* Minimum kernel alignment, as a power of two */
6436 #ifdef CONFIG_X86_64 6436 #ifdef CONFIG_X86_64
6437 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT 6437 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
6438diff -urNp linux-2.6.32.14/arch/x86/include/asm/cacheflush.h linux-2.6.32.14/arch/x86/include/asm/cacheflush.h 6438diff -urNp linux-2.6.32.15/arch/x86/include/asm/cacheflush.h linux-2.6.32.15/arch/x86/include/asm/cacheflush.h
6439--- linux-2.6.32.14/arch/x86/include/asm/cacheflush.h 2010-03-15 11:52:04.000000000 -0400 6439--- linux-2.6.32.15/arch/x86/include/asm/cacheflush.h 2010-03-15 11:52:04.000000000 -0400
6440+++ linux-2.6.32.14/arch/x86/include/asm/cacheflush.h 2010-05-28 21:27:14.906924566 -0400 6440+++ linux-2.6.32.15/arch/x86/include/asm/cacheflush.h 2010-05-28 21:27:14.906924566 -0400
6441@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) 6441@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
6442 static inline unsigned long get_page_memtype(struct page *pg) 6442 static inline unsigned long get_page_memtype(struct page *pg)
6443 { 6443 {
@@ -6456,9 +6456,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/cacheflush.h linux-2.6.32.14/arc
6456 ClearPageUncached(pg); 6456 ClearPageUncached(pg);
6457 ClearPageWC(pg); 6457 ClearPageWC(pg);
6458 break; 6458 break;
6459diff -urNp linux-2.6.32.14/arch/x86/include/asm/cache.h linux-2.6.32.14/arch/x86/include/asm/cache.h 6459diff -urNp linux-2.6.32.15/arch/x86/include/asm/cache.h linux-2.6.32.15/arch/x86/include/asm/cache.h
6460--- linux-2.6.32.14/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400 6460--- linux-2.6.32.15/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400
6461+++ linux-2.6.32.14/arch/x86/include/asm/cache.h 2010-05-28 21:27:14.906924566 -0400 6461+++ linux-2.6.32.15/arch/x86/include/asm/cache.h 2010-05-28 21:27:14.906924566 -0400
6462@@ -8,6 +8,7 @@ 6462@@ -8,6 +8,7 @@
6463 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) 6463 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6464 6464
@@ -6467,9 +6467,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/cache.h linux-2.6.32.14/arch/x86
6467 6467
6468 #ifdef CONFIG_X86_VSMP 6468 #ifdef CONFIG_X86_VSMP
6469 /* vSMP Internode cacheline shift */ 6469 /* vSMP Internode cacheline shift */
6470diff -urNp linux-2.6.32.14/arch/x86/include/asm/checksum_32.h linux-2.6.32.14/arch/x86/include/asm/checksum_32.h 6470diff -urNp linux-2.6.32.15/arch/x86/include/asm/checksum_32.h linux-2.6.32.15/arch/x86/include/asm/checksum_32.h
6471--- linux-2.6.32.14/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400 6471--- linux-2.6.32.15/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400
6472+++ linux-2.6.32.14/arch/x86/include/asm/checksum_32.h 2010-05-28 21:27:14.906924566 -0400 6472+++ linux-2.6.32.15/arch/x86/include/asm/checksum_32.h 2010-05-28 21:27:14.906924566 -0400
6473@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene 6473@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
6474 int len, __wsum sum, 6474 int len, __wsum sum,
6475 int *src_err_ptr, int *dst_err_ptr); 6475 int *src_err_ptr, int *dst_err_ptr);
@@ -6503,9 +6503,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/checksum_32.h linux-2.6.32.14/ar
6503 len, sum, NULL, err_ptr); 6503 len, sum, NULL, err_ptr);
6504 6504
6505 if (len) 6505 if (len)
6506diff -urNp linux-2.6.32.14/arch/x86/include/asm/desc.h linux-2.6.32.14/arch/x86/include/asm/desc.h 6506diff -urNp linux-2.6.32.15/arch/x86/include/asm/desc.h linux-2.6.32.15/arch/x86/include/asm/desc.h
6507--- linux-2.6.32.14/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400 6507--- linux-2.6.32.15/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400
6508+++ linux-2.6.32.14/arch/x86/include/asm/desc.h 2010-05-28 21:27:14.906924566 -0400 6508+++ linux-2.6.32.15/arch/x86/include/asm/desc.h 2010-05-28 21:27:14.906924566 -0400
6509@@ -4,6 +4,7 @@ 6509@@ -4,6 +4,7 @@
6510 #include <asm/desc_defs.h> 6510 #include <asm/desc_defs.h>
6511 #include <asm/ldt.h> 6511 #include <asm/ldt.h>
@@ -6675,9 +6675,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/desc.h linux-2.6.32.14/arch/x86/
6675+#endif 6675+#endif
6676+ 6676+
6677 #endif /* _ASM_X86_DESC_H */ 6677 #endif /* _ASM_X86_DESC_H */
6678diff -urNp linux-2.6.32.14/arch/x86/include/asm/device.h linux-2.6.32.14/arch/x86/include/asm/device.h 6678diff -urNp linux-2.6.32.15/arch/x86/include/asm/device.h linux-2.6.32.15/arch/x86/include/asm/device.h
6679--- linux-2.6.32.14/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 6679--- linux-2.6.32.15/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
6680+++ linux-2.6.32.14/arch/x86/include/asm/device.h 2010-05-28 21:27:14.911025615 -0400 6680+++ linux-2.6.32.15/arch/x86/include/asm/device.h 2010-05-28 21:27:14.911025615 -0400
6681@@ -6,7 +6,7 @@ struct dev_archdata { 6681@@ -6,7 +6,7 @@ struct dev_archdata {
6682 void *acpi_handle; 6682 void *acpi_handle;
6683 #endif 6683 #endif
@@ -6687,9 +6687,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/device.h linux-2.6.32.14/arch/x8
6687 #endif 6687 #endif
6688 #ifdef CONFIG_DMAR 6688 #ifdef CONFIG_DMAR
6689 void *iommu; /* hook for IOMMU specific extension */ 6689 void *iommu; /* hook for IOMMU specific extension */
6690diff -urNp linux-2.6.32.14/arch/x86/include/asm/dma-mapping.h linux-2.6.32.14/arch/x86/include/asm/dma-mapping.h 6690diff -urNp linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h
6691--- linux-2.6.32.14/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 6691--- linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
6692+++ linux-2.6.32.14/arch/x86/include/asm/dma-mapping.h 2010-05-28 21:27:14.911025615 -0400 6692+++ linux-2.6.32.15/arch/x86/include/asm/dma-mapping.h 2010-05-28 21:27:14.911025615 -0400
6693@@ -25,9 +25,9 @@ extern int iommu_merge; 6693@@ -25,9 +25,9 @@ extern int iommu_merge;
6694 extern struct device x86_dma_fallback_dev; 6694 extern struct device x86_dma_fallback_dev;
6695 extern int panic_on_overflow; 6695 extern int panic_on_overflow;
@@ -6729,9 +6729,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/dma-mapping.h linux-2.6.32.14/ar
6729 6729
6730 WARN_ON(irqs_disabled()); /* for portability */ 6730 WARN_ON(irqs_disabled()); /* for portability */
6731 6731
6732diff -urNp linux-2.6.32.14/arch/x86/include/asm/e820.h linux-2.6.32.14/arch/x86/include/asm/e820.h 6732diff -urNp linux-2.6.32.15/arch/x86/include/asm/e820.h linux-2.6.32.15/arch/x86/include/asm/e820.h
6733--- linux-2.6.32.14/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400 6733--- linux-2.6.32.15/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400
6734+++ linux-2.6.32.14/arch/x86/include/asm/e820.h 2010-05-28 21:27:14.911025615 -0400 6734+++ linux-2.6.32.15/arch/x86/include/asm/e820.h 2010-05-28 21:27:14.911025615 -0400
6735@@ -133,7 +133,7 @@ extern char *default_machine_specific_me 6735@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
6736 #define ISA_END_ADDRESS 0x100000 6736 #define ISA_END_ADDRESS 0x100000
6737 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) 6737 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
@@ -6741,9 +6741,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/e820.h linux-2.6.32.14/arch/x86/
6741 #define BIOS_END 0x00100000 6741 #define BIOS_END 0x00100000
6742 6742
6743 #ifdef __KERNEL__ 6743 #ifdef __KERNEL__
6744diff -urNp linux-2.6.32.14/arch/x86/include/asm/elf.h linux-2.6.32.14/arch/x86/include/asm/elf.h 6744diff -urNp linux-2.6.32.15/arch/x86/include/asm/elf.h linux-2.6.32.15/arch/x86/include/asm/elf.h
6745--- linux-2.6.32.14/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 6745--- linux-2.6.32.15/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
6746+++ linux-2.6.32.14/arch/x86/include/asm/elf.h 2010-05-28 21:27:14.911025615 -0400 6746+++ linux-2.6.32.15/arch/x86/include/asm/elf.h 2010-05-28 21:27:14.911025615 -0400
6747@@ -257,7 +257,25 @@ extern int force_personality32; 6747@@ -257,7 +257,25 @@ extern int force_personality32;
6748 the loader. We need to make sure that it is out of the way of the program 6748 the loader. We need to make sure that it is out of the way of the program
6749 that it will "exec", and that there is sufficient room for the brk. */ 6749 that it will "exec", and that there is sufficient room for the brk. */
@@ -6797,9 +6797,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/elf.h linux-2.6.32.14/arch/x86/i
6797-#define arch_randomize_brk arch_randomize_brk 6797-#define arch_randomize_brk arch_randomize_brk
6798- 6798-
6799 #endif /* _ASM_X86_ELF_H */ 6799 #endif /* _ASM_X86_ELF_H */
6800diff -urNp linux-2.6.32.14/arch/x86/include/asm/futex.h linux-2.6.32.14/arch/x86/include/asm/futex.h 6800diff -urNp linux-2.6.32.15/arch/x86/include/asm/futex.h linux-2.6.32.15/arch/x86/include/asm/futex.h
6801--- linux-2.6.32.14/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400 6801--- linux-2.6.32.15/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400
6802+++ linux-2.6.32.14/arch/x86/include/asm/futex.h 2010-05-28 21:27:14.911025615 -0400 6802+++ linux-2.6.32.15/arch/x86/include/asm/futex.h 2010-05-28 21:27:14.911025615 -0400
6803@@ -11,17 +11,54 @@ 6803@@ -11,17 +11,54 @@
6804 #include <asm/processor.h> 6804 #include <asm/processor.h>
6805 #include <asm/system.h> 6805 #include <asm/system.h>
@@ -6936,9 +6936,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/futex.h linux-2.6.32.14/arch/x86
6936 : "memory" 6936 : "memory"
6937 ); 6937 );
6938 6938
6939diff -urNp linux-2.6.32.14/arch/x86/include/asm/i387.h linux-2.6.32.14/arch/x86/include/asm/i387.h 6939diff -urNp linux-2.6.32.15/arch/x86/include/asm/i387.h linux-2.6.32.15/arch/x86/include/asm/i387.h
6940--- linux-2.6.32.14/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400 6940--- linux-2.6.32.15/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400
6941+++ linux-2.6.32.14/arch/x86/include/asm/i387.h 2010-05-28 21:27:14.911025615 -0400 6941+++ linux-2.6.32.15/arch/x86/include/asm/i387.h 2010-05-28 21:27:14.911025615 -0400
6942@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc 6942@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
6943 { 6943 {
6944 int err; 6944 int err;
@@ -6979,9 +6979,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/i387.h linux-2.6.32.14/arch/x86/
6979 6979
6980 /* 6980 /*
6981 * These must be called with preempt disabled 6981 * These must be called with preempt disabled
6982diff -urNp linux-2.6.32.14/arch/x86/include/asm/io_64.h linux-2.6.32.14/arch/x86/include/asm/io_64.h 6982diff -urNp linux-2.6.32.15/arch/x86/include/asm/io_64.h linux-2.6.32.15/arch/x86/include/asm/io_64.h
6983--- linux-2.6.32.14/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400 6983--- linux-2.6.32.15/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400
6984+++ linux-2.6.32.14/arch/x86/include/asm/io_64.h 2010-05-28 21:27:14.911025615 -0400 6984+++ linux-2.6.32.15/arch/x86/include/asm/io_64.h 2010-05-28 21:27:14.911025615 -0400
6985@@ -140,6 +140,17 @@ __OUTS(l) 6985@@ -140,6 +140,17 @@ __OUTS(l)
6986 6986
6987 #include <linux/vmalloc.h> 6987 #include <linux/vmalloc.h>
@@ -7000,9 +7000,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/io_64.h linux-2.6.32.14/arch/x86
7000 #include <asm-generic/iomap.h> 7000 #include <asm-generic/iomap.h>
7001 7001
7002 void __memcpy_fromio(void *, unsigned long, unsigned); 7002 void __memcpy_fromio(void *, unsigned long, unsigned);
7003diff -urNp linux-2.6.32.14/arch/x86/include/asm/iommu.h linux-2.6.32.14/arch/x86/include/asm/iommu.h 7003diff -urNp linux-2.6.32.15/arch/x86/include/asm/iommu.h linux-2.6.32.15/arch/x86/include/asm/iommu.h
7004--- linux-2.6.32.14/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 7004--- linux-2.6.32.15/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
7005+++ linux-2.6.32.14/arch/x86/include/asm/iommu.h 2010-05-28 21:27:14.911025615 -0400 7005+++ linux-2.6.32.15/arch/x86/include/asm/iommu.h 2010-05-28 21:27:14.911025615 -0400
7006@@ -3,7 +3,7 @@ 7006@@ -3,7 +3,7 @@
7007 7007
7008 extern void pci_iommu_shutdown(void); 7008 extern void pci_iommu_shutdown(void);
@@ -7012,9 +7012,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/iommu.h linux-2.6.32.14/arch/x86
7012 extern int force_iommu, no_iommu; 7012 extern int force_iommu, no_iommu;
7013 extern int iommu_detected; 7013 extern int iommu_detected;
7014 extern int iommu_pass_through; 7014 extern int iommu_pass_through;
7015diff -urNp linux-2.6.32.14/arch/x86/include/asm/irqflags.h linux-2.6.32.14/arch/x86/include/asm/irqflags.h 7015diff -urNp linux-2.6.32.15/arch/x86/include/asm/irqflags.h linux-2.6.32.15/arch/x86/include/asm/irqflags.h
7016--- linux-2.6.32.14/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400 7016--- linux-2.6.32.15/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400
7017+++ linux-2.6.32.14/arch/x86/include/asm/irqflags.h 2010-05-28 21:27:14.911025615 -0400 7017+++ linux-2.6.32.15/arch/x86/include/asm/irqflags.h 2010-05-28 21:27:14.911025615 -0400
7018@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ 7018@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
7019 sti; \ 7019 sti; \
7020 sysexit 7020 sysexit
@@ -7027,9 +7027,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/irqflags.h linux-2.6.32.14/arch/
7027 #else 7027 #else
7028 #define INTERRUPT_RETURN iret 7028 #define INTERRUPT_RETURN iret
7029 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit 7029 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
7030diff -urNp linux-2.6.32.14/arch/x86/include/asm/kvm_host.h linux-2.6.32.14/arch/x86/include/asm/kvm_host.h 7030diff -urNp linux-2.6.32.15/arch/x86/include/asm/kvm_host.h linux-2.6.32.15/arch/x86/include/asm/kvm_host.h
7031--- linux-2.6.32.14/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:37.497949072 -0400 7031--- linux-2.6.32.15/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:37.497949072 -0400
7032+++ linux-2.6.32.14/arch/x86/include/asm/kvm_host.h 2010-05-28 21:27:14.911025615 -0400 7032+++ linux-2.6.32.15/arch/x86/include/asm/kvm_host.h 2010-05-28 21:27:14.911025615 -0400
7033@@ -532,7 +532,7 @@ struct kvm_x86_ops { 7033@@ -532,7 +532,7 @@ struct kvm_x86_ops {
7034 const struct trace_print_flags *exit_reasons_str; 7034 const struct trace_print_flags *exit_reasons_str;
7035 }; 7035 };
@@ -7039,9 +7039,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/kvm_host.h linux-2.6.32.14/arch/
7039 7039
7040 int kvm_mmu_module_init(void); 7040 int kvm_mmu_module_init(void);
7041 void kvm_mmu_module_exit(void); 7041 void kvm_mmu_module_exit(void);
7042diff -urNp linux-2.6.32.14/arch/x86/include/asm/local.h linux-2.6.32.14/arch/x86/include/asm/local.h 7042diff -urNp linux-2.6.32.15/arch/x86/include/asm/local.h linux-2.6.32.15/arch/x86/include/asm/local.h
7043--- linux-2.6.32.14/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400 7043--- linux-2.6.32.15/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400
7044+++ linux-2.6.32.14/arch/x86/include/asm/local.h 2010-05-28 21:27:14.911025615 -0400 7044+++ linux-2.6.32.15/arch/x86/include/asm/local.h 2010-05-28 21:27:14.911025615 -0400
7045@@ -18,26 +18,90 @@ typedef struct { 7045@@ -18,26 +18,90 @@ typedef struct {
7046 7046
7047 static inline void local_inc(local_t *l) 7047 static inline void local_inc(local_t *l)
@@ -7266,9 +7266,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/local.h linux-2.6.32.14/arch/x86
7266 : "+r" (i), "+m" (l->a.counter) 7266 : "+r" (i), "+m" (l->a.counter)
7267 : : "memory"); 7267 : : "memory");
7268 return i + __i; 7268 return i + __i;
7269diff -urNp linux-2.6.32.14/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.14/arch/x86/include/asm/mc146818rtc.h 7269diff -urNp linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h
7270--- linux-2.6.32.14/arch/x86/include/asm/mc146818rtc.h 2010-03-15 11:52:04.000000000 -0400 7270--- linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h 2010-03-15 11:52:04.000000000 -0400
7271+++ linux-2.6.32.14/arch/x86/include/asm/mc146818rtc.h 2010-05-28 21:27:14.911025615 -0400 7271+++ linux-2.6.32.15/arch/x86/include/asm/mc146818rtc.h 2010-05-28 21:27:14.911025615 -0400
7272@@ -81,8 +81,8 @@ static inline unsigned char current_lock 7272@@ -81,8 +81,8 @@ static inline unsigned char current_lock
7273 #else 7273 #else
7274 #define lock_cmos_prefix(reg) do {} while (0) 7274 #define lock_cmos_prefix(reg) do {} while (0)
@@ -7280,9 +7280,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.14/ar
7280 #define do_i_have_lock_cmos() 0 7280 #define do_i_have_lock_cmos() 0
7281 #define current_lock_cmos_reg() 0 7281 #define current_lock_cmos_reg() 0
7282 #endif 7282 #endif
7283diff -urNp linux-2.6.32.14/arch/x86/include/asm/microcode.h linux-2.6.32.14/arch/x86/include/asm/microcode.h 7283diff -urNp linux-2.6.32.15/arch/x86/include/asm/microcode.h linux-2.6.32.15/arch/x86/include/asm/microcode.h
7284--- linux-2.6.32.14/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400 7284--- linux-2.6.32.15/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400
7285+++ linux-2.6.32.14/arch/x86/include/asm/microcode.h 2010-05-28 21:27:14.911025615 -0400 7285+++ linux-2.6.32.15/arch/x86/include/asm/microcode.h 2010-05-28 21:27:14.911025615 -0400
7286@@ -12,13 +12,13 @@ struct device; 7286@@ -12,13 +12,13 @@ struct device;
7287 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; 7287 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
7288 7288
@@ -7323,9 +7323,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/microcode.h linux-2.6.32.14/arch
7323 { 7323 {
7324 return NULL; 7324 return NULL;
7325 } 7325 }
7326diff -urNp linux-2.6.32.14/arch/x86/include/asm/mman.h linux-2.6.32.14/arch/x86/include/asm/mman.h 7326diff -urNp linux-2.6.32.15/arch/x86/include/asm/mman.h linux-2.6.32.15/arch/x86/include/asm/mman.h
7327--- linux-2.6.32.14/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400 7327--- linux-2.6.32.15/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400
7328+++ linux-2.6.32.14/arch/x86/include/asm/mman.h 2010-05-28 21:27:14.911025615 -0400 7328+++ linux-2.6.32.15/arch/x86/include/asm/mman.h 2010-05-28 21:27:14.911025615 -0400
7329@@ -5,4 +5,14 @@ 7329@@ -5,4 +5,14 @@
7330 7330
7331 #include <asm-generic/mman.h> 7331 #include <asm-generic/mman.h>
@@ -7341,9 +7341,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/mman.h linux-2.6.32.14/arch/x86/
7341+#endif 7341+#endif
7342+ 7342+
7343 #endif /* _ASM_X86_MMAN_H */ 7343 #endif /* _ASM_X86_MMAN_H */
7344diff -urNp linux-2.6.32.14/arch/x86/include/asm/mmu_context.h linux-2.6.32.14/arch/x86/include/asm/mmu_context.h 7344diff -urNp linux-2.6.32.15/arch/x86/include/asm/mmu_context.h linux-2.6.32.15/arch/x86/include/asm/mmu_context.h
7345--- linux-2.6.32.14/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400 7345--- linux-2.6.32.15/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400
7346+++ linux-2.6.32.14/arch/x86/include/asm/mmu_context.h 2010-05-28 21:27:14.915041226 -0400 7346+++ linux-2.6.32.15/arch/x86/include/asm/mmu_context.h 2010-05-28 21:27:14.915041226 -0400
7347@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m 7347@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
7348 7348
7349 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) 7349 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -7468,9 +7468,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/mmu_context.h linux-2.6.32.14/ar
7468 } 7468 }
7469 7469
7470 #define activate_mm(prev, next) \ 7470 #define activate_mm(prev, next) \
7471diff -urNp linux-2.6.32.14/arch/x86/include/asm/mmu.h linux-2.6.32.14/arch/x86/include/asm/mmu.h 7471diff -urNp linux-2.6.32.15/arch/x86/include/asm/mmu.h linux-2.6.32.15/arch/x86/include/asm/mmu.h
7472--- linux-2.6.32.14/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400 7472--- linux-2.6.32.15/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400
7473+++ linux-2.6.32.14/arch/x86/include/asm/mmu.h 2010-05-28 21:27:14.915041226 -0400 7473+++ linux-2.6.32.15/arch/x86/include/asm/mmu.h 2010-05-28 21:27:14.915041226 -0400
7474@@ -9,10 +9,23 @@ 7474@@ -9,10 +9,23 @@
7475 * we put the segment information here. 7475 * we put the segment information here.
7476 */ 7476 */
@@ -7497,9 +7497,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/mmu.h linux-2.6.32.14/arch/x86/i
7497 } mm_context_t; 7497 } mm_context_t;
7498 7498
7499 #ifdef CONFIG_SMP 7499 #ifdef CONFIG_SMP
7500diff -urNp linux-2.6.32.14/arch/x86/include/asm/module.h linux-2.6.32.14/arch/x86/include/asm/module.h 7500diff -urNp linux-2.6.32.15/arch/x86/include/asm/module.h linux-2.6.32.15/arch/x86/include/asm/module.h
7501--- linux-2.6.32.14/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400 7501--- linux-2.6.32.15/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400
7502+++ linux-2.6.32.14/arch/x86/include/asm/module.h 2010-05-28 21:27:14.915041226 -0400 7502+++ linux-2.6.32.15/arch/x86/include/asm/module.h 2010-05-28 21:27:14.915041226 -0400
7503@@ -59,13 +59,31 @@ 7503@@ -59,13 +59,31 @@
7504 #error unknown processor family 7504 #error unknown processor family
7505 #endif 7505 #endif
@@ -7533,9 +7533,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/module.h linux-2.6.32.14/arch/x8
7533 #endif 7533 #endif
7534 7534
7535 #endif /* _ASM_X86_MODULE_H */ 7535 #endif /* _ASM_X86_MODULE_H */
7536diff -urNp linux-2.6.32.14/arch/x86/include/asm/page_32_types.h linux-2.6.32.14/arch/x86/include/asm/page_32_types.h 7536diff -urNp linux-2.6.32.15/arch/x86/include/asm/page_32_types.h linux-2.6.32.15/arch/x86/include/asm/page_32_types.h
7537--- linux-2.6.32.14/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400 7537--- linux-2.6.32.15/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400
7538+++ linux-2.6.32.14/arch/x86/include/asm/page_32_types.h 2010-05-28 21:27:14.915041226 -0400 7538+++ linux-2.6.32.15/arch/x86/include/asm/page_32_types.h 2010-05-28 21:27:14.915041226 -0400
7539@@ -15,6 +15,10 @@ 7539@@ -15,6 +15,10 @@
7540 */ 7540 */
7541 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) 7541 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
@@ -7547,9 +7547,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/page_32_types.h linux-2.6.32.14/
7547 #ifdef CONFIG_4KSTACKS 7547 #ifdef CONFIG_4KSTACKS
7548 #define THREAD_ORDER 0 7548 #define THREAD_ORDER 0
7549 #else 7549 #else
7550diff -urNp linux-2.6.32.14/arch/x86/include/asm/page_64_types.h linux-2.6.32.14/arch/x86/include/asm/page_64_types.h 7550diff -urNp linux-2.6.32.15/arch/x86/include/asm/page_64_types.h linux-2.6.32.15/arch/x86/include/asm/page_64_types.h
7551--- linux-2.6.32.14/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400 7551--- linux-2.6.32.15/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400
7552+++ linux-2.6.32.14/arch/x86/include/asm/page_64_types.h 2010-05-28 21:27:14.915041226 -0400 7552+++ linux-2.6.32.15/arch/x86/include/asm/page_64_types.h 2010-05-28 21:27:14.915041226 -0400
7553@@ -39,6 +39,9 @@ 7553@@ -39,6 +39,9 @@
7554 #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) 7554 #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START)
7555 #define __START_KERNEL_map _AC(0xffffffff80000000, UL) 7555 #define __START_KERNEL_map _AC(0xffffffff80000000, UL)
@@ -7560,9 +7560,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/page_64_types.h linux-2.6.32.14/
7560 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ 7560 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
7561 #define __PHYSICAL_MASK_SHIFT 46 7561 #define __PHYSICAL_MASK_SHIFT 46
7562 #define __VIRTUAL_MASK_SHIFT 47 7562 #define __VIRTUAL_MASK_SHIFT 47
7563diff -urNp linux-2.6.32.14/arch/x86/include/asm/paravirt.h linux-2.6.32.14/arch/x86/include/asm/paravirt.h 7563diff -urNp linux-2.6.32.15/arch/x86/include/asm/paravirt.h linux-2.6.32.15/arch/x86/include/asm/paravirt.h
7564--- linux-2.6.32.14/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400 7564--- linux-2.6.32.15/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400
7565+++ linux-2.6.32.14/arch/x86/include/asm/paravirt.h 2010-05-28 21:27:14.915041226 -0400 7565+++ linux-2.6.32.15/arch/x86/include/asm/paravirt.h 2010-05-28 21:27:14.915041226 -0400
7566@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned 7566@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
7567 pv_mmu_ops.set_fixmap(idx, phys, flags); 7567 pv_mmu_ops.set_fixmap(idx, phys, flags);
7568 } 7568 }
@@ -7616,9 +7616,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/paravirt.h linux-2.6.32.14/arch/
7616 #endif /* CONFIG_X86_32 */ 7616 #endif /* CONFIG_X86_32 */
7617 7617
7618 #endif /* __ASSEMBLY__ */ 7618 #endif /* __ASSEMBLY__ */
7619diff -urNp linux-2.6.32.14/arch/x86/include/asm/paravirt_types.h linux-2.6.32.14/arch/x86/include/asm/paravirt_types.h 7619diff -urNp linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h
7620--- linux-2.6.32.14/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400 7620--- linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400
7621+++ linux-2.6.32.14/arch/x86/include/asm/paravirt_types.h 2010-05-28 21:27:14.915041226 -0400 7621+++ linux-2.6.32.15/arch/x86/include/asm/paravirt_types.h 2010-05-28 21:27:14.915041226 -0400
7622@@ -316,6 +316,12 @@ struct pv_mmu_ops { 7622@@ -316,6 +316,12 @@ struct pv_mmu_ops {
7623 an mfn. We can tell which is which from the index. */ 7623 an mfn. We can tell which is which from the index. */
7624 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, 7624 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
@@ -7632,9 +7632,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/paravirt_types.h linux-2.6.32.14
7632 }; 7632 };
7633 7633
7634 struct raw_spinlock; 7634 struct raw_spinlock;
7635diff -urNp linux-2.6.32.14/arch/x86/include/asm/pci_x86.h linux-2.6.32.14/arch/x86/include/asm/pci_x86.h 7635diff -urNp linux-2.6.32.15/arch/x86/include/asm/pci_x86.h linux-2.6.32.15/arch/x86/include/asm/pci_x86.h
7636--- linux-2.6.32.14/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400 7636--- linux-2.6.32.15/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400
7637+++ linux-2.6.32.14/arch/x86/include/asm/pci_x86.h 2010-05-28 21:27:14.915041226 -0400 7637+++ linux-2.6.32.15/arch/x86/include/asm/pci_x86.h 2010-05-28 21:27:14.915041226 -0400
7638@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct 7638@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
7639 extern void (*pcibios_disable_irq)(struct pci_dev *dev); 7639 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
7640 7640
@@ -7657,9 +7657,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/pci_x86.h linux-2.6.32.14/arch/x
7657 extern bool port_cf9_safe; 7657 extern bool port_cf9_safe;
7658 7658
7659 /* arch_initcall level */ 7659 /* arch_initcall level */
7660diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgalloc.h linux-2.6.32.14/arch/x86/include/asm/pgalloc.h 7660diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgalloc.h linux-2.6.32.15/arch/x86/include/asm/pgalloc.h
7661--- linux-2.6.32.14/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400 7661--- linux-2.6.32.15/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400
7662+++ linux-2.6.32.14/arch/x86/include/asm/pgalloc.h 2010-05-28 21:27:14.915041226 -0400 7662+++ linux-2.6.32.15/arch/x86/include/asm/pgalloc.h 2010-05-28 21:27:14.915041226 -0400
7663@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s 7663@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
7664 pmd_t *pmd, pte_t *pte) 7664 pmd_t *pmd, pte_t *pte)
7665 { 7665 {
@@ -7674,9 +7674,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgalloc.h linux-2.6.32.14/arch/x
7674 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); 7674 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
7675 } 7675 }
7676 7676
7677diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.14/arch/x86/include/asm/pgtable-2level.h 7677diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h
7678--- linux-2.6.32.14/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400 7678--- linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400
7679+++ linux-2.6.32.14/arch/x86/include/asm/pgtable-2level.h 2010-05-28 21:27:14.915041226 -0400 7679+++ linux-2.6.32.15/arch/x86/include/asm/pgtable-2level.h 2010-05-28 21:27:14.915041226 -0400
7680@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 7680@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
7681 7681
7682 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7682 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7687,9 +7687,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.14
7687 } 7687 }
7688 7688
7689 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) 7689 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
7690diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_32.h linux-2.6.32.14/arch/x86/include/asm/pgtable_32.h 7690diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h
7691--- linux-2.6.32.14/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 7691--- linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
7692+++ linux-2.6.32.14/arch/x86/include/asm/pgtable_32.h 2010-05-28 21:27:14.915041226 -0400 7692+++ linux-2.6.32.15/arch/x86/include/asm/pgtable_32.h 2010-05-28 21:27:14.915041226 -0400
7693@@ -26,8 +26,6 @@ 7693@@ -26,8 +26,6 @@
7694 struct mm_struct; 7694 struct mm_struct;
7695 struct vm_area_struct; 7695 struct vm_area_struct;
@@ -7731,9 +7731,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_32.h linux-2.6.32.14/arc
7731 /* 7731 /*
7732 * kern_addr_valid() is (1) for FLATMEM and (0) for 7732 * kern_addr_valid() is (1) for FLATMEM and (0) for
7733 * SPARSEMEM and DISCONTIGMEM 7733 * SPARSEMEM and DISCONTIGMEM
7734diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.14/arch/x86/include/asm/pgtable_32_types.h 7734diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h
7735--- linux-2.6.32.14/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400 7735--- linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400
7736+++ linux-2.6.32.14/arch/x86/include/asm/pgtable_32_types.h 2010-05-28 21:27:14.915041226 -0400 7736+++ linux-2.6.32.15/arch/x86/include/asm/pgtable_32_types.h 2010-05-28 21:27:14.915041226 -0400
7737@@ -8,7 +8,7 @@ 7737@@ -8,7 +8,7 @@
7738 */ 7738 */
7739 #ifdef CONFIG_X86_PAE 7739 #ifdef CONFIG_X86_PAE
@@ -7763,9 +7763,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.
7763 #define MODULES_VADDR VMALLOC_START 7763 #define MODULES_VADDR VMALLOC_START
7764 #define MODULES_END VMALLOC_END 7764 #define MODULES_END VMALLOC_END
7765 #define MODULES_LEN (MODULES_VADDR - MODULES_END) 7765 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
7766diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.14/arch/x86/include/asm/pgtable-3level.h 7766diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h
7767--- linux-2.6.32.14/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400 7767--- linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400
7768+++ linux-2.6.32.14/arch/x86/include/asm/pgtable-3level.h 2010-05-28 21:27:14.915041226 -0400 7768+++ linux-2.6.32.15/arch/x86/include/asm/pgtable-3level.h 2010-05-28 21:27:14.915041226 -0400
7769@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic 7769@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
7770 7770
7771 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7771 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7783,9 +7783,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.14
7783 } 7783 }
7784 7784
7785 /* 7785 /*
7786diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_64.h linux-2.6.32.14/arch/x86/include/asm/pgtable_64.h 7786diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h
7787--- linux-2.6.32.14/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400 7787--- linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400
7788+++ linux-2.6.32.14/arch/x86/include/asm/pgtable_64.h 2010-05-28 21:27:14.915041226 -0400 7788+++ linux-2.6.32.15/arch/x86/include/asm/pgtable_64.h 2010-05-28 21:27:14.915041226 -0400
7789@@ -16,10 +16,13 @@ 7789@@ -16,10 +16,13 @@
7790 7790
7791 extern pud_t level3_kernel_pgt[512]; 7791 extern pud_t level3_kernel_pgt[512];
@@ -7831,9 +7831,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_64.h linux-2.6.32.14/arc
7831 } 7831 }
7832 7832
7833 /* 7833 /*
7834diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.14/arch/x86/include/asm/pgtable_64_types.h 7834diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h
7835--- linux-2.6.32.14/arch/x86/include/asm/pgtable_64_types.h 2010-03-15 11:52:04.000000000 -0400 7835--- linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h 2010-03-15 11:52:04.000000000 -0400
7836+++ linux-2.6.32.14/arch/x86/include/asm/pgtable_64_types.h 2010-05-28 21:27:14.915041226 -0400 7836+++ linux-2.6.32.15/arch/x86/include/asm/pgtable_64_types.h 2010-05-28 21:27:14.915041226 -0400
7837@@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t; 7837@@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t;
7838 #define MODULES_VADDR _AC(0xffffffffa0000000, UL) 7838 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
7839 #define MODULES_END _AC(0xffffffffff000000, UL) 7839 #define MODULES_END _AC(0xffffffffff000000, UL)
@@ -7842,9 +7842,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.
7842+#define MODULES_EXEC_END MODULES_END 7842+#define MODULES_EXEC_END MODULES_END
7843 7843
7844 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ 7844 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
7845diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable.h linux-2.6.32.14/arch/x86/include/asm/pgtable.h 7845diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable.h linux-2.6.32.15/arch/x86/include/asm/pgtable.h
7846--- linux-2.6.32.14/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 7846--- linux-2.6.32.15/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
7847+++ linux-2.6.32.14/arch/x86/include/asm/pgtable.h 2010-05-28 21:27:14.918896182 -0400 7847+++ linux-2.6.32.15/arch/x86/include/asm/pgtable.h 2010-05-28 21:27:14.918896182 -0400
7848@@ -74,12 +74,51 @@ extern struct list_head pgd_list; 7848@@ -74,12 +74,51 @@ extern struct list_head pgd_list;
7849 7849
7850 #define arch_end_context_switch(prev) do {} while(0) 7850 #define arch_end_context_switch(prev) do {} while(0)
@@ -8009,9 +8009,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable.h linux-2.6.32.14/arch/x
8009 8009
8010 #include <asm-generic/pgtable.h> 8010 #include <asm-generic/pgtable.h>
8011 #endif /* __ASSEMBLY__ */ 8011 #endif /* __ASSEMBLY__ */
8012diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_types.h linux-2.6.32.14/arch/x86/include/asm/pgtable_types.h 8012diff -urNp linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h
8013--- linux-2.6.32.14/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400 8013--- linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400
8014+++ linux-2.6.32.14/arch/x86/include/asm/pgtable_types.h 2010-05-28 21:27:14.918896182 -0400 8014+++ linux-2.6.32.15/arch/x86/include/asm/pgtable_types.h 2010-05-28 21:27:14.918896182 -0400
8015@@ -16,12 +16,11 @@ 8015@@ -16,12 +16,11 @@
8016 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ 8016 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
8017 #define _PAGE_BIT_PAT 7 /* on 4KB pages */ 8017 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -8096,9 +8096,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/pgtable_types.h linux-2.6.32.14/
8096 8096
8097 #define pgprot_writecombine pgprot_writecombine 8097 #define pgprot_writecombine pgprot_writecombine
8098 extern pgprot_t pgprot_writecombine(pgprot_t prot); 8098 extern pgprot_t pgprot_writecombine(pgprot_t prot);
8099diff -urNp linux-2.6.32.14/arch/x86/include/asm/processor.h linux-2.6.32.14/arch/x86/include/asm/processor.h 8099diff -urNp linux-2.6.32.15/arch/x86/include/asm/processor.h linux-2.6.32.15/arch/x86/include/asm/processor.h
8100--- linux-2.6.32.14/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400 8100--- linux-2.6.32.15/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400
8101+++ linux-2.6.32.14/arch/x86/include/asm/processor.h 2010-05-28 21:27:14.918896182 -0400 8101+++ linux-2.6.32.15/arch/x86/include/asm/processor.h 2010-05-28 21:27:14.918896182 -0400
8102@@ -272,7 +272,7 @@ struct tss_struct { 8102@@ -272,7 +272,7 @@ struct tss_struct {
8103 8103
8104 } ____cacheline_aligned; 8104 } ____cacheline_aligned;
@@ -8183,9 +8183,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/processor.h linux-2.6.32.14/arch
8183 #define KSTK_EIP(task) (task_pt_regs(task)->ip) 8183 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
8184 8184
8185 /* Get/set a process' ability to use the timestamp counter instruction */ 8185 /* Get/set a process' ability to use the timestamp counter instruction */
8186diff -urNp linux-2.6.32.14/arch/x86/include/asm/ptrace.h linux-2.6.32.14/arch/x86/include/asm/ptrace.h 8186diff -urNp linux-2.6.32.15/arch/x86/include/asm/ptrace.h linux-2.6.32.15/arch/x86/include/asm/ptrace.h
8187--- linux-2.6.32.14/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400 8187--- linux-2.6.32.15/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400
8188+++ linux-2.6.32.14/arch/x86/include/asm/ptrace.h 2010-05-28 21:27:14.918896182 -0400 8188+++ linux-2.6.32.15/arch/x86/include/asm/ptrace.h 2010-05-28 21:27:14.918896182 -0400
8189@@ -151,28 +151,29 @@ static inline unsigned long regs_return_ 8189@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
8190 } 8190 }
8191 8191
@@ -8222,9 +8222,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/ptrace.h linux-2.6.32.14/arch/x8
8222 #endif 8222 #endif
8223 } 8223 }
8224 8224
8225diff -urNp linux-2.6.32.14/arch/x86/include/asm/reboot.h linux-2.6.32.14/arch/x86/include/asm/reboot.h 8225diff -urNp linux-2.6.32.15/arch/x86/include/asm/reboot.h linux-2.6.32.15/arch/x86/include/asm/reboot.h
8226--- linux-2.6.32.14/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400 8226--- linux-2.6.32.15/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400
8227+++ linux-2.6.32.14/arch/x86/include/asm/reboot.h 2010-05-28 21:27:14.918896182 -0400 8227+++ linux-2.6.32.15/arch/x86/include/asm/reboot.h 2010-05-28 21:27:14.918896182 -0400
8228@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; 8228@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
8229 8229
8230 void native_machine_crash_shutdown(struct pt_regs *regs); 8230 void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -8234,9 +8234,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/reboot.h linux-2.6.32.14/arch/x8
8234 8234
8235 typedef void (*nmi_shootdown_cb)(int, struct die_args*); 8235 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
8236 void nmi_shootdown_cpus(nmi_shootdown_cb callback); 8236 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
8237diff -urNp linux-2.6.32.14/arch/x86/include/asm/rwsem.h linux-2.6.32.14/arch/x86/include/asm/rwsem.h 8237diff -urNp linux-2.6.32.15/arch/x86/include/asm/rwsem.h linux-2.6.32.15/arch/x86/include/asm/rwsem.h
8238--- linux-2.6.32.14/arch/x86/include/asm/rwsem.h 2010-04-29 17:49:37.501451369 -0400 8238--- linux-2.6.32.15/arch/x86/include/asm/rwsem.h 2010-04-29 17:49:37.501451369 -0400
8239+++ linux-2.6.32.14/arch/x86/include/asm/rwsem.h 2010-05-28 21:27:14.918896182 -0400 8239+++ linux-2.6.32.15/arch/x86/include/asm/rwsem.h 2010-05-28 21:27:14.918896182 -0400
8240@@ -118,10 +118,26 @@ static inline void __down_read(struct rw 8240@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
8241 { 8241 {
8242 asm volatile("# beginning down_read\n\t" 8242 asm volatile("# beginning down_read\n\t"
@@ -8472,9 +8472,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/rwsem.h linux-2.6.32.14/arch/x86
8472 : "+r" (tmp), "+m" (sem->count) 8472 : "+r" (tmp), "+m" (sem->count)
8473 : : "memory"); 8473 : : "memory");
8474 8474
8475diff -urNp linux-2.6.32.14/arch/x86/include/asm/segment.h linux-2.6.32.14/arch/x86/include/asm/segment.h 8475diff -urNp linux-2.6.32.15/arch/x86/include/asm/segment.h linux-2.6.32.15/arch/x86/include/asm/segment.h
8476--- linux-2.6.32.14/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400 8476--- linux-2.6.32.15/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400
8477+++ linux-2.6.32.14/arch/x86/include/asm/segment.h 2010-05-28 21:27:14.918896182 -0400 8477+++ linux-2.6.32.15/arch/x86/include/asm/segment.h 2010-05-28 21:27:14.918896182 -0400
8478@@ -62,8 +62,8 @@ 8478@@ -62,8 +62,8 @@
8479 * 26 - ESPFIX small SS 8479 * 26 - ESPFIX small SS
8480 * 27 - per-cpu [ offset to per-cpu data area ] 8480 * 27 - per-cpu [ offset to per-cpu data area ]
@@ -8543,9 +8543,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/segment.h linux-2.6.32.14/arch/x
8543 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) 8543 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
8544 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) 8544 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
8545 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) 8545 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
8546diff -urNp linux-2.6.32.14/arch/x86/include/asm/spinlock.h linux-2.6.32.14/arch/x86/include/asm/spinlock.h 8546diff -urNp linux-2.6.32.15/arch/x86/include/asm/spinlock.h linux-2.6.32.15/arch/x86/include/asm/spinlock.h
8547--- linux-2.6.32.14/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400 8547--- linux-2.6.32.15/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400
8548+++ linux-2.6.32.14/arch/x86/include/asm/spinlock.h 2010-05-28 21:27:14.918896182 -0400 8548+++ linux-2.6.32.15/arch/x86/include/asm/spinlock.h 2010-05-28 21:27:14.918896182 -0400
8549@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r 8549@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r
8550 static inline void __raw_read_lock(raw_rwlock_t *rw) 8550 static inline void __raw_read_lock(raw_rwlock_t *rw)
8551 { 8551 {
@@ -8649,9 +8649,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/spinlock.h linux-2.6.32.14/arch/
8649 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); 8649 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
8650 } 8650 }
8651 8651
8652diff -urNp linux-2.6.32.14/arch/x86/include/asm/system.h linux-2.6.32.14/arch/x86/include/asm/system.h 8652diff -urNp linux-2.6.32.15/arch/x86/include/asm/system.h linux-2.6.32.15/arch/x86/include/asm/system.h
8653--- linux-2.6.32.14/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 8653--- linux-2.6.32.15/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
8654+++ linux-2.6.32.14/arch/x86/include/asm/system.h 2010-05-28 21:27:14.922894828 -0400 8654+++ linux-2.6.32.15/arch/x86/include/asm/system.h 2010-05-28 21:27:14.922894828 -0400
8655@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un 8655@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
8656 { 8656 {
8657 unsigned long __limit; 8657 unsigned long __limit;
@@ -8670,9 +8670,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/system.h linux-2.6.32.14/arch/x8
8670 extern void free_init_pages(char *what, unsigned long begin, unsigned long end); 8670 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
8671 8671
8672 void default_idle(void); 8672 void default_idle(void);
8673diff -urNp linux-2.6.32.14/arch/x86/include/asm/uaccess_32.h linux-2.6.32.14/arch/x86/include/asm/uaccess_32.h 8673diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h
8674--- linux-2.6.32.14/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 8674--- linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
8675+++ linux-2.6.32.14/arch/x86/include/asm/uaccess_32.h 2010-05-28 21:27:14.922894828 -0400 8675+++ linux-2.6.32.15/arch/x86/include/asm/uaccess_32.h 2010-05-28 21:27:14.922894828 -0400
8676@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u 8676@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
8677 static __always_inline unsigned long __must_check 8677 static __always_inline unsigned long __must_check
8678 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) 8678 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -8802,9 +8802,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/uaccess_32.h linux-2.6.32.14/arc
8802 long __must_check strncpy_from_user(char *dst, const char __user *src, 8802 long __must_check strncpy_from_user(char *dst, const char __user *src,
8803 long count); 8803 long count);
8804 long __must_check __strncpy_from_user(char *dst, 8804 long __must_check __strncpy_from_user(char *dst,
8805diff -urNp linux-2.6.32.14/arch/x86/include/asm/uaccess_64.h linux-2.6.32.14/arch/x86/include/asm/uaccess_64.h 8805diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h
8806--- linux-2.6.32.14/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 8806--- linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
8807+++ linux-2.6.32.14/arch/x86/include/asm/uaccess_64.h 2010-05-28 21:27:14.922894828 -0400 8807+++ linux-2.6.32.15/arch/x86/include/asm/uaccess_64.h 2010-05-28 21:27:14.922894828 -0400
8808@@ -9,6 +9,9 @@ 8808@@ -9,6 +9,9 @@
8809 #include <linux/prefetch.h> 8809 #include <linux/prefetch.h>
8810 #include <linux/lockdep.h> 8810 #include <linux/lockdep.h>
@@ -8996,9 +8996,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/uaccess_64.h linux-2.6.32.14/arc
8996 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); 8996 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
8997 8997
8998 #endif /* _ASM_X86_UACCESS_64_H */ 8998 #endif /* _ASM_X86_UACCESS_64_H */
8999diff -urNp linux-2.6.32.14/arch/x86/include/asm/uaccess.h linux-2.6.32.14/arch/x86/include/asm/uaccess.h 8999diff -urNp linux-2.6.32.15/arch/x86/include/asm/uaccess.h linux-2.6.32.15/arch/x86/include/asm/uaccess.h
9000--- linux-2.6.32.14/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 9000--- linux-2.6.32.15/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
9001+++ linux-2.6.32.14/arch/x86/include/asm/uaccess.h 2010-05-28 21:27:14.922894828 -0400 9001+++ linux-2.6.32.15/arch/x86/include/asm/uaccess.h 2010-05-28 21:27:14.922894828 -0400
9002@@ -8,6 +8,8 @@ 9002@@ -8,6 +8,8 @@
9003 #include <linux/thread_info.h> 9003 #include <linux/thread_info.h>
9004 #include <linux/prefetch.h> 9004 #include <linux/prefetch.h>
@@ -9216,9 +9216,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/uaccess.h linux-2.6.32.14/arch/x
9216 #ifdef CONFIG_X86_32 9216 #ifdef CONFIG_X86_32
9217 # include "uaccess_32.h" 9217 # include "uaccess_32.h"
9218 #else 9218 #else
9219diff -urNp linux-2.6.32.14/arch/x86/include/asm/vgtod.h linux-2.6.32.14/arch/x86/include/asm/vgtod.h 9219diff -urNp linux-2.6.32.15/arch/x86/include/asm/vgtod.h linux-2.6.32.15/arch/x86/include/asm/vgtod.h
9220--- linux-2.6.32.14/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400 9220--- linux-2.6.32.15/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400
9221+++ linux-2.6.32.14/arch/x86/include/asm/vgtod.h 2010-05-28 21:27:14.922894828 -0400 9221+++ linux-2.6.32.15/arch/x86/include/asm/vgtod.h 2010-05-28 21:27:14.922894828 -0400
9222@@ -14,6 +14,7 @@ struct vsyscall_gtod_data { 9222@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
9223 int sysctl_enabled; 9223 int sysctl_enabled;
9224 struct timezone sys_tz; 9224 struct timezone sys_tz;
@@ -9227,9 +9227,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/vgtod.h linux-2.6.32.14/arch/x86
9227 cycle_t (*vread)(void); 9227 cycle_t (*vread)(void);
9228 cycle_t cycle_last; 9228 cycle_t cycle_last;
9229 cycle_t mask; 9229 cycle_t mask;
9230diff -urNp linux-2.6.32.14/arch/x86/include/asm/vmi.h linux-2.6.32.14/arch/x86/include/asm/vmi.h 9230diff -urNp linux-2.6.32.15/arch/x86/include/asm/vmi.h linux-2.6.32.15/arch/x86/include/asm/vmi.h
9231--- linux-2.6.32.14/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400 9231--- linux-2.6.32.15/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400
9232+++ linux-2.6.32.14/arch/x86/include/asm/vmi.h 2010-05-28 21:27:14.922894828 -0400 9232+++ linux-2.6.32.15/arch/x86/include/asm/vmi.h 2010-05-28 21:27:14.922894828 -0400
9233@@ -191,6 +191,7 @@ struct vrom_header { 9233@@ -191,6 +191,7 @@ struct vrom_header {
9234 u8 reserved[96]; /* Reserved for headers */ 9234 u8 reserved[96]; /* Reserved for headers */
9235 char vmi_init[8]; /* VMI_Init jump point */ 9235 char vmi_init[8]; /* VMI_Init jump point */
@@ -9238,9 +9238,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/vmi.h linux-2.6.32.14/arch/x86/i
9238 } __attribute__((packed)); 9238 } __attribute__((packed));
9239 9239
9240 struct pnp_header { 9240 struct pnp_header {
9241diff -urNp linux-2.6.32.14/arch/x86/include/asm/vsyscall.h linux-2.6.32.14/arch/x86/include/asm/vsyscall.h 9241diff -urNp linux-2.6.32.15/arch/x86/include/asm/vsyscall.h linux-2.6.32.15/arch/x86/include/asm/vsyscall.h
9242--- linux-2.6.32.14/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400 9242--- linux-2.6.32.15/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400
9243+++ linux-2.6.32.14/arch/x86/include/asm/vsyscall.h 2010-05-28 21:27:14.922894828 -0400 9243+++ linux-2.6.32.15/arch/x86/include/asm/vsyscall.h 2010-05-28 21:27:14.922894828 -0400
9244@@ -15,9 +15,10 @@ enum vsyscall_num { 9244@@ -15,9 +15,10 @@ enum vsyscall_num {
9245 9245
9246 #ifdef __KERNEL__ 9246 #ifdef __KERNEL__
@@ -9271,9 +9271,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/vsyscall.h linux-2.6.32.14/arch/
9271 #endif /* __KERNEL__ */ 9271 #endif /* __KERNEL__ */
9272 9272
9273 #endif /* _ASM_X86_VSYSCALL_H */ 9273 #endif /* _ASM_X86_VSYSCALL_H */
9274diff -urNp linux-2.6.32.14/arch/x86/include/asm/xsave.h linux-2.6.32.14/arch/x86/include/asm/xsave.h 9274diff -urNp linux-2.6.32.15/arch/x86/include/asm/xsave.h linux-2.6.32.15/arch/x86/include/asm/xsave.h
9275--- linux-2.6.32.14/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400 9275--- linux-2.6.32.15/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400
9276+++ linux-2.6.32.14/arch/x86/include/asm/xsave.h 2010-05-28 21:27:14.922894828 -0400 9276+++ linux-2.6.32.15/arch/x86/include/asm/xsave.h 2010-05-28 21:27:14.922894828 -0400
9277@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct 9277@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
9278 static inline int xsave_user(struct xsave_struct __user *buf) 9278 static inline int xsave_user(struct xsave_struct __user *buf)
9279 { 9279 {
@@ -9299,9 +9299,9 @@ diff -urNp linux-2.6.32.14/arch/x86/include/asm/xsave.h linux-2.6.32.14/arch/x86
9299 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" 9299 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
9300 "2:\n" 9300 "2:\n"
9301 ".section .fixup,\"ax\"\n" 9301 ".section .fixup,\"ax\"\n"
9302diff -urNp linux-2.6.32.14/arch/x86/Kconfig linux-2.6.32.14/arch/x86/Kconfig 9302diff -urNp linux-2.6.32.15/arch/x86/Kconfig linux-2.6.32.15/arch/x86/Kconfig
9303--- linux-2.6.32.14/arch/x86/Kconfig 2010-05-15 13:20:18.407099662 -0400 9303--- linux-2.6.32.15/arch/x86/Kconfig 2010-05-15 13:20:18.407099662 -0400
9304+++ linux-2.6.32.14/arch/x86/Kconfig 2010-05-28 21:27:14.922894828 -0400 9304+++ linux-2.6.32.15/arch/x86/Kconfig 2010-05-28 21:27:14.922894828 -0400
9305@@ -531,6 +531,7 @@ source "arch/x86/lguest/Kconfig" 9305@@ -531,6 +531,7 @@ source "arch/x86/lguest/Kconfig"
9306 9306
9307 config PARAVIRT 9307 config PARAVIRT
@@ -9356,9 +9356,9 @@ diff -urNp linux-2.6.32.14/arch/x86/Kconfig linux-2.6.32.14/arch/x86/Kconfig
9356 ---help--- 9356 ---help---
9357 Map the 32-bit VDSO to the predictable old-style address too. 9357 Map the 32-bit VDSO to the predictable old-style address too.
9358 ---help--- 9358 ---help---
9359diff -urNp linux-2.6.32.14/arch/x86/Kconfig.cpu linux-2.6.32.14/arch/x86/Kconfig.cpu 9359diff -urNp linux-2.6.32.15/arch/x86/Kconfig.cpu linux-2.6.32.15/arch/x86/Kconfig.cpu
9360--- linux-2.6.32.14/arch/x86/Kconfig.cpu 2010-04-29 17:49:37.481119841 -0400 9360--- linux-2.6.32.15/arch/x86/Kconfig.cpu 2010-04-29 17:49:37.481119841 -0400
9361+++ linux-2.6.32.14/arch/x86/Kconfig.cpu 2010-05-28 21:27:14.922894828 -0400 9361+++ linux-2.6.32.15/arch/x86/Kconfig.cpu 2010-05-28 21:27:14.922894828 -0400
9362@@ -340,7 +340,7 @@ config X86_PPRO_FENCE 9362@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
9363 9363
9364 config X86_F00F_BUG 9364 config X86_F00F_BUG
@@ -9386,9 +9386,9 @@ diff -urNp linux-2.6.32.14/arch/x86/Kconfig.cpu linux-2.6.32.14/arch/x86/Kconfig
9386 9386
9387 config X86_MINIMUM_CPU_FAMILY 9387 config X86_MINIMUM_CPU_FAMILY
9388 int 9388 int
9389diff -urNp linux-2.6.32.14/arch/x86/Kconfig.debug linux-2.6.32.14/arch/x86/Kconfig.debug 9389diff -urNp linux-2.6.32.15/arch/x86/Kconfig.debug linux-2.6.32.15/arch/x86/Kconfig.debug
9390--- linux-2.6.32.14/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 9390--- linux-2.6.32.15/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400
9391+++ linux-2.6.32.14/arch/x86/Kconfig.debug 2010-05-28 21:27:14.926914091 -0400 9391+++ linux-2.6.32.15/arch/x86/Kconfig.debug 2010-05-28 21:27:14.926914091 -0400
9392@@ -99,7 +99,7 @@ config X86_PTDUMP 9392@@ -99,7 +99,7 @@ config X86_PTDUMP
9393 config DEBUG_RODATA 9393 config DEBUG_RODATA
9394 bool "Write protect kernel read-only data structures" 9394 bool "Write protect kernel read-only data structures"
@@ -9398,9 +9398,9 @@ diff -urNp linux-2.6.32.14/arch/x86/Kconfig.debug linux-2.6.32.14/arch/x86/Kconf
9398 ---help--- 9398 ---help---
9399 Mark the kernel read-only data as write-protected in the pagetables, 9399 Mark the kernel read-only data as write-protected in the pagetables,
9400 in order to catch accidental (and incorrect) writes to such const 9400 in order to catch accidental (and incorrect) writes to such const
9401diff -urNp linux-2.6.32.14/arch/x86/kernel/acpi/boot.c linux-2.6.32.14/arch/x86/kernel/acpi/boot.c 9401diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/boot.c linux-2.6.32.15/arch/x86/kernel/acpi/boot.c
9402--- linux-2.6.32.14/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400 9402--- linux-2.6.32.15/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400
9403+++ linux-2.6.32.14/arch/x86/kernel/acpi/boot.c 2010-05-28 21:27:14.939148318 -0400 9403+++ linux-2.6.32.15/arch/x86/kernel/acpi/boot.c 2010-05-28 21:27:14.939148318 -0400
9404@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a 9404@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a
9405 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), 9405 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
9406 }, 9406 },
@@ -9410,9 +9410,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/acpi/boot.c linux-2.6.32.14/arch/x86/
9410 }; 9410 };
9411 9411
9412 /* 9412 /*
9413diff -urNp linux-2.6.32.14/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.14/arch/x86/kernel/acpi/realmode/wakeup.S 9413diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S
9414--- linux-2.6.32.14/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400 9414--- linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400
9415+++ linux-2.6.32.14/arch/x86/kernel/acpi/realmode/wakeup.S 2010-05-28 21:27:14.939148318 -0400 9415+++ linux-2.6.32.15/arch/x86/kernel/acpi/realmode/wakeup.S 2010-05-28 21:27:14.939148318 -0400
9416@@ -104,7 +104,7 @@ _start: 9416@@ -104,7 +104,7 @@ _start:
9417 movl %eax, %ecx 9417 movl %eax, %ecx
9418 orl %edx, %ecx 9418 orl %edx, %ecx
@@ -9422,9 +9422,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.1
9422 wrmsr 9422 wrmsr
9423 1: 9423 1:
9424 9424
9425diff -urNp linux-2.6.32.14/arch/x86/kernel/acpi/sleep.c linux-2.6.32.14/arch/x86/kernel/acpi/sleep.c 9425diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c
9426--- linux-2.6.32.14/arch/x86/kernel/acpi/sleep.c 2010-05-15 13:20:18.407099662 -0400 9426--- linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c 2010-05-15 13:20:18.407099662 -0400
9427+++ linux-2.6.32.14/arch/x86/kernel/acpi/sleep.c 2010-05-28 21:27:14.943027635 -0400 9427+++ linux-2.6.32.15/arch/x86/kernel/acpi/sleep.c 2010-05-28 21:27:14.943027635 -0400
9428@@ -11,11 +11,12 @@ 9428@@ -11,11 +11,12 @@
9429 #include <linux/cpumask.h> 9429 #include <linux/cpumask.h>
9430 #include <asm/segment.h> 9430 #include <asm/segment.h>
@@ -9469,9 +9469,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/acpi/sleep.c linux-2.6.32.14/arch/x86
9469 } 9469 }
9470 9470
9471 9471
9472diff -urNp linux-2.6.32.14/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.14/arch/x86/kernel/acpi/wakeup_32.S 9472diff -urNp linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S
9473--- linux-2.6.32.14/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400 9473--- linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400
9474+++ linux-2.6.32.14/arch/x86/kernel/acpi/wakeup_32.S 2010-05-28 21:27:14.943027635 -0400 9474+++ linux-2.6.32.15/arch/x86/kernel/acpi/wakeup_32.S 2010-05-28 21:27:14.943027635 -0400
9475@@ -30,13 +30,11 @@ wakeup_pmode_return: 9475@@ -30,13 +30,11 @@ wakeup_pmode_return:
9476 # and restore the stack ... but you need gdt for this to work 9476 # and restore the stack ... but you need gdt for this to work
9477 movl saved_context_esp, %esp 9477 movl saved_context_esp, %esp
@@ -9488,9 +9488,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.14/arch
9488 9488
9489 bogus_magic: 9489 bogus_magic:
9490 jmp bogus_magic 9490 jmp bogus_magic
9491diff -urNp linux-2.6.32.14/arch/x86/kernel/alternative.c linux-2.6.32.14/arch/x86/kernel/alternative.c 9491diff -urNp linux-2.6.32.15/arch/x86/kernel/alternative.c linux-2.6.32.15/arch/x86/kernel/alternative.c
9492--- linux-2.6.32.14/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400 9492--- linux-2.6.32.15/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400
9493+++ linux-2.6.32.14/arch/x86/kernel/alternative.c 2010-05-28 21:27:14.943027635 -0400 9493+++ linux-2.6.32.15/arch/x86/kernel/alternative.c 2010-05-28 21:27:14.943027635 -0400
9494@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str 9494@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
9495 9495
9496 BUG_ON(p->len > MAX_PATCH_LEN); 9496 BUG_ON(p->len > MAX_PATCH_LEN);
@@ -9563,9 +9563,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/alternative.c linux-2.6.32.14/arch/x8
9563+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); 9563+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]);
9564 return addr; 9564 return addr;
9565 } 9565 }
9566diff -urNp linux-2.6.32.14/arch/x86/kernel/amd_iommu.c linux-2.6.32.14/arch/x86/kernel/amd_iommu.c 9566diff -urNp linux-2.6.32.15/arch/x86/kernel/amd_iommu.c linux-2.6.32.15/arch/x86/kernel/amd_iommu.c
9567--- linux-2.6.32.14/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:37.521943068 -0400 9567--- linux-2.6.32.15/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:37.521943068 -0400
9568+++ linux-2.6.32.14/arch/x86/kernel/amd_iommu.c 2010-05-28 21:27:14.959145751 -0400 9568+++ linux-2.6.32.15/arch/x86/kernel/amd_iommu.c 2010-05-28 21:27:14.959145751 -0400
9569@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( 9569@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains(
9570 } 9570 }
9571 } 9571 }
@@ -9575,9 +9575,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/amd_iommu.c linux-2.6.32.14/arch/x86/
9575 .alloc_coherent = alloc_coherent, 9575 .alloc_coherent = alloc_coherent,
9576 .free_coherent = free_coherent, 9576 .free_coherent = free_coherent,
9577 .map_page = map_page, 9577 .map_page = map_page,
9578diff -urNp linux-2.6.32.14/arch/x86/kernel/apic/io_apic.c linux-2.6.32.14/arch/x86/kernel/apic/io_apic.c 9578diff -urNp linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c
9579--- linux-2.6.32.14/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400 9579--- linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400
9580+++ linux-2.6.32.14/arch/x86/kernel/apic/io_apic.c 2010-05-28 21:27:14.967145332 -0400 9580+++ linux-2.6.32.15/arch/x86/kernel/apic/io_apic.c 2010-05-28 21:27:14.967145332 -0400
9581@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi 9581@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi
9582 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, 9582 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
9583 GFP_ATOMIC); 9583 GFP_ATOMIC);
@@ -9614,9 +9614,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/apic/io_apic.c linux-2.6.32.14/arch/x
9614 { 9614 {
9615 spin_unlock(&vector_lock); 9615 spin_unlock(&vector_lock);
9616 } 9616 }
9617diff -urNp linux-2.6.32.14/arch/x86/kernel/apm_32.c linux-2.6.32.14/arch/x86/kernel/apm_32.c 9617diff -urNp linux-2.6.32.15/arch/x86/kernel/apm_32.c linux-2.6.32.15/arch/x86/kernel/apm_32.c
9618--- linux-2.6.32.14/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400 9618--- linux-2.6.32.15/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400
9619+++ linux-2.6.32.14/arch/x86/kernel/apm_32.c 2010-05-28 21:27:14.975148965 -0400 9619+++ linux-2.6.32.15/arch/x86/kernel/apm_32.c 2010-05-28 21:27:14.975148965 -0400
9620@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); 9620@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
9621 * This is for buggy BIOS's that refer to (real mode) segment 0x40 9621 * This is for buggy BIOS's that refer to (real mode) segment 0x40
9622 * even though they are called in protected mode. 9622 * even though they are called in protected mode.
@@ -9718,9 +9718,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/apm_32.c linux-2.6.32.14/arch/x86/ker
9718 9718
9719 proc_create("apm", 0, NULL, &apm_file_ops); 9719 proc_create("apm", 0, NULL, &apm_file_ops);
9720 9720
9721diff -urNp linux-2.6.32.14/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.14/arch/x86/kernel/asm-offsets_32.c 9721diff -urNp linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c
9722--- linux-2.6.32.14/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400 9722--- linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400
9723+++ linux-2.6.32.14/arch/x86/kernel/asm-offsets_32.c 2010-05-28 21:27:14.975148965 -0400 9723+++ linux-2.6.32.15/arch/x86/kernel/asm-offsets_32.c 2010-05-28 21:27:14.975148965 -0400
9724@@ -115,6 +115,11 @@ void foo(void) 9724@@ -115,6 +115,11 @@ void foo(void)
9725 OFFSET(PV_CPU_iret, pv_cpu_ops, iret); 9725 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
9726 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 9726 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
@@ -9733,9 +9733,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.14/arch
9733 #endif 9733 #endif
9734 9734
9735 #ifdef CONFIG_XEN 9735 #ifdef CONFIG_XEN
9736diff -urNp linux-2.6.32.14/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.14/arch/x86/kernel/asm-offsets_64.c 9736diff -urNp linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c
9737--- linux-2.6.32.14/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400 9737--- linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400
9738+++ linux-2.6.32.14/arch/x86/kernel/asm-offsets_64.c 2010-05-28 21:27:14.975148965 -0400 9738+++ linux-2.6.32.15/arch/x86/kernel/asm-offsets_64.c 2010-05-28 21:27:14.975148965 -0400
9739@@ -63,6 +63,18 @@ int main(void) 9739@@ -63,6 +63,18 @@ int main(void)
9740 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 9740 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
9741 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); 9741 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
@@ -9763,9 +9763,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.14/arch
9763 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); 9763 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
9764 BLANK(); 9764 BLANK();
9765 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); 9765 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
9766diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/common.c linux-2.6.32.14/arch/x86/kernel/cpu/common.c 9766diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/common.c linux-2.6.32.15/arch/x86/kernel/cpu/common.c
9767--- linux-2.6.32.14/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400 9767--- linux-2.6.32.15/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400
9768+++ linux-2.6.32.14/arch/x86/kernel/cpu/common.c 2010-05-28 21:27:14.975148965 -0400 9768+++ linux-2.6.32.15/arch/x86/kernel/cpu/common.c 2010-05-28 21:27:14.975148965 -0400
9769@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon 9769@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
9770 9770
9771 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; 9771 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -9874,9 +9874,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/common.c linux-2.6.32.14/arch/x86
9874 struct thread_struct *thread = &curr->thread; 9874 struct thread_struct *thread = &curr->thread;
9875 9875
9876 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { 9876 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
9877diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 9877diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
9878--- linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400 9878--- linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400
9879+++ linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-05-28 21:27:14.975148965 -0400 9879+++ linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-05-28 21:27:14.975148965 -0400
9880@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any 9880@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
9881 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), 9881 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
9882 }, 9882 },
@@ -9886,9 +9886,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.
9886 }; 9886 };
9887 9887
9888 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) 9888 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
9889diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 9889diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
9890--- linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400 9890--- linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400
9891+++ linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-05-28 21:27:14.975148965 -0400 9891+++ linux-2.6.32.15/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-05-28 21:27:14.975148965 -0400
9892@@ -225,7 +225,7 @@ static struct cpu_model models[] = 9892@@ -225,7 +225,7 @@ static struct cpu_model models[] =
9893 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, 9893 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
9894 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, 9894 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
@@ -9898,9 +9898,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu
9898 }; 9898 };
9899 #undef _BANIAS 9899 #undef _BANIAS
9900 #undef BANIAS 9900 #undef BANIAS
9901diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/intel.c linux-2.6.32.14/arch/x86/kernel/cpu/intel.c 9901diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/intel.c linux-2.6.32.15/arch/x86/kernel/cpu/intel.c
9902--- linux-2.6.32.14/arch/x86/kernel/cpu/intel.c 2010-05-15 13:20:18.427075180 -0400 9902--- linux-2.6.32.15/arch/x86/kernel/cpu/intel.c 2010-05-15 13:20:18.427075180 -0400
9903+++ linux-2.6.32.14/arch/x86/kernel/cpu/intel.c 2010-05-28 21:27:14.975148965 -0400 9903+++ linux-2.6.32.15/arch/x86/kernel/cpu/intel.c 2010-05-28 21:27:14.975148965 -0400
9904@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug 9904@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug
9905 * Update the IDT descriptor and reload the IDT so that 9905 * Update the IDT descriptor and reload the IDT so that
9906 * it uses the read-only mapped virtual address. 9906 * it uses the read-only mapped virtual address.
@@ -9910,9 +9910,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/intel.c linux-2.6.32.14/arch/x86/
9910 load_idt(&idt_descr); 9910 load_idt(&idt_descr);
9911 } 9911 }
9912 #endif 9912 #endif
9913diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.14/arch/x86/kernel/cpu/intel_cacheinfo.c 9913diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c
9914--- linux-2.6.32.14/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-28 20:16:44.430924650 -0400 9914--- linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-28 20:16:44.430924650 -0400
9915+++ linux-2.6.32.14/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-28 21:27:14.987166265 -0400 9915+++ linux-2.6.32.15/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-28 21:27:14.987166265 -0400
9916@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob 9916@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob
9917 return ret; 9917 return ret;
9918 } 9918 }
@@ -9922,9 +9922,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.14
9922 .show = show, 9922 .show = show,
9923 .store = store, 9923 .store = store,
9924 }; 9924 };
9925diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/Makefile linux-2.6.32.14/arch/x86/kernel/cpu/Makefile 9925diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/Makefile linux-2.6.32.15/arch/x86/kernel/cpu/Makefile
9926--- linux-2.6.32.14/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400 9926--- linux-2.6.32.15/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400
9927+++ linux-2.6.32.14/arch/x86/kernel/cpu/Makefile 2010-05-28 21:27:14.987166265 -0400 9927+++ linux-2.6.32.15/arch/x86/kernel/cpu/Makefile 2010-05-28 21:27:14.987166265 -0400
9928@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER 9928@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
9929 CFLAGS_REMOVE_common.o = -pg 9929 CFLAGS_REMOVE_common.o = -pg
9930 endif 9930 endif
@@ -9936,9 +9936,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/Makefile linux-2.6.32.14/arch/x86
9936 obj-y := intel_cacheinfo.o addon_cpuid_features.o 9936 obj-y := intel_cacheinfo.o addon_cpuid_features.o
9937 obj-y += proc.o capflags.o powerflags.o common.o 9937 obj-y += proc.o capflags.o powerflags.o common.o
9938 obj-y += vmware.o hypervisor.o sched.o 9938 obj-y += vmware.o hypervisor.o sched.o
9939diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce_amd.c 9939diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c
9940--- linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400 9940--- linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400
9941+++ linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-05-28 21:27:14.995163789 -0400 9941+++ linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-05-28 21:27:14.995163789 -0400
9942@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob 9942@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob
9943 return ret; 9943 return ret;
9944 } 9944 }
@@ -9948,9 +9948,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.14/
9948 .show = show, 9948 .show = show,
9949 .store = store, 9949 .store = store,
9950 }; 9950 };
9951diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce.c 9951diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c
9952--- linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400 9952--- linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400
9953+++ linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce.c 2010-05-28 21:27:15.011149672 -0400 9953+++ linux-2.6.32.15/arch/x86/kernel/cpu/mcheck/mce.c 2010-05-28 21:27:15.011149672 -0400
9954@@ -187,7 +187,7 @@ static void print_mce(struct mce *m) 9954@@ -187,7 +187,7 @@ static void print_mce(struct mce *m)
9955 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", 9955 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
9956 m->cs, m->ip); 9956 m->cs, m->ip);
@@ -10003,9 +10003,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.14/arch
10003 }; 10003 };
10004 10004
10005 /* 10005 /*
10006diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/amd.c 10006diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c
10007--- linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400 10007--- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400
10008+++ linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/amd.c 2010-05-28 21:27:15.011149672 -0400 10008+++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/amd.c 2010-05-28 21:27:15.011149672 -0400
10009@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base 10009@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
10010 return 0; 10010 return 0;
10011 } 10011 }
@@ -10015,9 +10015,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.14/arch/x
10015 .vendor = X86_VENDOR_AMD, 10015 .vendor = X86_VENDOR_AMD,
10016 .set = amd_set_mtrr, 10016 .set = amd_set_mtrr,
10017 .get = amd_get_mtrr, 10017 .get = amd_get_mtrr,
10018diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/centaur.c 10018diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c
10019--- linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400 10019--- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400
10020+++ linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/centaur.c 2010-05-28 21:27:15.011149672 -0400 10020+++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/centaur.c 2010-05-28 21:27:15.011149672 -0400
10021@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long 10021@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
10022 return 0; 10022 return 0;
10023 } 10023 }
@@ -10027,9 +10027,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.14/ar
10027 .vendor = X86_VENDOR_CENTAUR, 10027 .vendor = X86_VENDOR_CENTAUR,
10028 .set = centaur_set_mcr, 10028 .set = centaur_set_mcr,
10029 .get = centaur_get_mcr, 10029 .get = centaur_get_mcr,
10030diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/cyrix.c 10030diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c
10031--- linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400 10031--- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400
10032+++ linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-05-28 21:27:15.011149672 -0400 10032+++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-05-28 21:27:15.011149672 -0400
10033@@ -265,7 +265,7 @@ static void cyrix_set_all(void) 10033@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
10034 post_set(); 10034 post_set();
10035 } 10035 }
@@ -10039,9 +10039,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.14/arch
10039 .vendor = X86_VENDOR_CYRIX, 10039 .vendor = X86_VENDOR_CYRIX,
10040 .set_all = cyrix_set_all, 10040 .set_all = cyrix_set_all,
10041 .set = cyrix_set_arr, 10041 .set = cyrix_set_arr,
10042diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/generic.c 10042diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c
10043--- linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400 10043--- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400
10044+++ linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/generic.c 2010-05-28 21:27:15.011149672 -0400 10044+++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/generic.c 2010-05-28 21:27:15.011149672 -0400
10045@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra 10045@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
10046 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ 10046 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
10047 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ 10047 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
@@ -10060,9 +10060,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.14/ar
10060 .use_intel_if = 1, 10060 .use_intel_if = 1,
10061 .set_all = generic_set_all, 10061 .set_all = generic_set_all,
10062 .get = generic_get_mtrr, 10062 .get = generic_get_mtrr,
10063diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/main.c 10063diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c
10064--- linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400 10064--- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400
10065+++ linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/main.c 2010-05-28 21:27:15.011149672 -0400 10065+++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/main.c 2010-05-28 21:27:15.011149672 -0400
10066@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); 10066@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
10067 u64 size_or_mask, size_and_mask; 10067 u64 size_or_mask, size_and_mask;
10068 static bool mtrr_aps_delayed_init; 10068 static bool mtrr_aps_delayed_init;
@@ -10081,9 +10081,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.14/arch/
10081 { 10081 {
10082 if (ops->vendor && ops->vendor < X86_VENDOR_NUM) 10082 if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
10083 mtrr_ops[ops->vendor] = ops; 10083 mtrr_ops[ops->vendor] = ops;
10084diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/mtrr.h 10084diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h
10085--- linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400 10085--- linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400
10086+++ linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-05-28 21:27:15.011149672 -0400 10086+++ linux-2.6.32.15/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-05-28 21:27:15.011149672 -0400
10087@@ -12,19 +12,19 @@ 10087@@ -12,19 +12,19 @@
10088 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; 10088 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
10089 10089
@@ -10134,9 +10134,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.14/arch/
10134 10134
10135 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) 10135 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
10136 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) 10136 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
10137diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.14/arch/x86/kernel/cpu/perfctr-watchdog.c 10137diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c
10138--- linux-2.6.32.14/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400 10138--- linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400
10139+++ linux-2.6.32.14/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-05-28 21:27:15.011149672 -0400 10139+++ linux-2.6.32.15/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-05-28 21:27:15.011149672 -0400
10140@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { 10140@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
10141 10141
10142 /* Interface defining a CPU specific perfctr watchdog */ 10142 /* Interface defining a CPU specific perfctr watchdog */
@@ -10170,9 +10170,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.1
10170 static struct wd_ops intel_arch_wd_ops __read_mostly = { 10170 static struct wd_ops intel_arch_wd_ops __read_mostly = {
10171 .reserve = single_msr_reserve, 10171 .reserve = single_msr_reserve,
10172 .unreserve = single_msr_unreserve, 10172 .unreserve = single_msr_unreserve,
10173diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.14/arch/x86/kernel/cpu/perf_event.c 10173diff -urNp linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c
10174--- linux-2.6.32.14/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:37.537108997 -0400 10174--- linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:37.537108997 -0400
10175+++ linux-2.6.32.14/arch/x86/kernel/cpu/perf_event.c 2010-05-28 21:27:15.015028232 -0400 10175+++ linux-2.6.32.15/arch/x86/kernel/cpu/perf_event.c 2010-05-28 21:27:15.015028232 -0400
10176@@ -2354,7 +2354,7 @@ perf_callchain_user(struct pt_regs *regs 10176@@ -2354,7 +2354,7 @@ perf_callchain_user(struct pt_regs *regs
10177 break; 10177 break;
10178 10178
@@ -10182,9 +10182,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.14/arch
10182 } 10182 }
10183 } 10183 }
10184 10184
10185diff -urNp linux-2.6.32.14/arch/x86/kernel/crash.c linux-2.6.32.14/arch/x86/kernel/crash.c 10185diff -urNp linux-2.6.32.15/arch/x86/kernel/crash.c linux-2.6.32.15/arch/x86/kernel/crash.c
10186--- linux-2.6.32.14/arch/x86/kernel/crash.c 2010-04-29 17:49:37.537108997 -0400 10186--- linux-2.6.32.15/arch/x86/kernel/crash.c 2010-04-29 17:49:37.537108997 -0400
10187+++ linux-2.6.32.14/arch/x86/kernel/crash.c 2010-05-28 21:27:15.015028232 -0400 10187+++ linux-2.6.32.15/arch/x86/kernel/crash.c 2010-05-28 21:27:15.015028232 -0400
10188@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, 10188@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,
10189 regs = args->regs; 10189 regs = args->regs;
10190 10190
@@ -10194,9 +10194,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/crash.c linux-2.6.32.14/arch/x86/kern
10194 crash_fixup_ss_esp(&fixed_regs, regs); 10194 crash_fixup_ss_esp(&fixed_regs, regs);
10195 regs = &fixed_regs; 10195 regs = &fixed_regs;
10196 } 10196 }
10197diff -urNp linux-2.6.32.14/arch/x86/kernel/doublefault_32.c linux-2.6.32.14/arch/x86/kernel/doublefault_32.c 10197diff -urNp linux-2.6.32.15/arch/x86/kernel/doublefault_32.c linux-2.6.32.15/arch/x86/kernel/doublefault_32.c
10198--- linux-2.6.32.14/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400 10198--- linux-2.6.32.15/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400
10199+++ linux-2.6.32.14/arch/x86/kernel/doublefault_32.c 2010-05-28 21:27:15.015028232 -0400 10199+++ linux-2.6.32.15/arch/x86/kernel/doublefault_32.c 2010-05-28 21:27:15.015028232 -0400
10200@@ -11,7 +11,7 @@ 10200@@ -11,7 +11,7 @@
10201 10201
10202 #define DOUBLEFAULT_STACKSIZE (1024) 10202 #define DOUBLEFAULT_STACKSIZE (1024)
@@ -10228,9 +10228,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/doublefault_32.c linux-2.6.32.14/arch
10228 .fs = __KERNEL_PERCPU, 10228 .fs = __KERNEL_PERCPU,
10229 10229
10230 .__cr3 = __pa_nodebug(swapper_pg_dir), 10230 .__cr3 = __pa_nodebug(swapper_pg_dir),
10231diff -urNp linux-2.6.32.14/arch/x86/kernel/dumpstack_32.c linux-2.6.32.14/arch/x86/kernel/dumpstack_32.c 10231diff -urNp linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c
10232--- linux-2.6.32.14/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400 10232--- linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400
10233+++ linux-2.6.32.14/arch/x86/kernel/dumpstack_32.c 2010-05-28 21:27:15.015028232 -0400 10233+++ linux-2.6.32.15/arch/x86/kernel/dumpstack_32.c 2010-05-28 21:27:15.015028232 -0400
10234@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs 10234@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
10235 * When in-kernel, we also print out the stack and code at the 10235 * When in-kernel, we also print out the stack and code at the
10236 * time of the fault.. 10236 * time of the fault..
@@ -10275,9 +10275,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/dumpstack_32.c linux-2.6.32.14/arch/x
10275 if (ip < PAGE_OFFSET) 10275 if (ip < PAGE_OFFSET)
10276 return 0; 10276 return 0;
10277 if (probe_kernel_address((unsigned short *)ip, ud2)) 10277 if (probe_kernel_address((unsigned short *)ip, ud2))
10278diff -urNp linux-2.6.32.14/arch/x86/kernel/dumpstack.c linux-2.6.32.14/arch/x86/kernel/dumpstack.c 10278diff -urNp linux-2.6.32.15/arch/x86/kernel/dumpstack.c linux-2.6.32.15/arch/x86/kernel/dumpstack.c
10279--- linux-2.6.32.14/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400 10279--- linux-2.6.32.15/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400
10280+++ linux-2.6.32.14/arch/x86/kernel/dumpstack.c 2010-05-28 21:27:15.023156603 -0400 10280+++ linux-2.6.32.15/arch/x86/kernel/dumpstack.c 2010-05-28 21:27:15.023156603 -0400
10281@@ -180,7 +180,7 @@ void dump_stack(void) 10281@@ -180,7 +180,7 @@ void dump_stack(void)
10282 #endif 10282 #endif
10283 10283
@@ -10305,9 +10305,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/dumpstack.c linux-2.6.32.14/arch/x86/
10305 report_bug(regs->ip, regs); 10305 report_bug(regs->ip, regs);
10306 10306
10307 if (__die(str, regs, err)) 10307 if (__die(str, regs, err))
10308diff -urNp linux-2.6.32.14/arch/x86/kernel/e820.c linux-2.6.32.14/arch/x86/kernel/e820.c 10308diff -urNp linux-2.6.32.15/arch/x86/kernel/e820.c linux-2.6.32.15/arch/x86/kernel/e820.c
10309--- linux-2.6.32.14/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400 10309--- linux-2.6.32.15/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400
10310+++ linux-2.6.32.14/arch/x86/kernel/e820.c 2010-05-28 21:27:15.023156603 -0400 10310+++ linux-2.6.32.15/arch/x86/kernel/e820.c 2010-05-28 21:27:15.023156603 -0400
10311@@ -733,7 +733,7 @@ struct early_res { 10311@@ -733,7 +733,7 @@ struct early_res {
10312 }; 10312 };
10313 static struct early_res early_res[MAX_EARLY_RES] __initdata = { 10313 static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -10317,9 +10317,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/e820.c linux-2.6.32.14/arch/x86/kerne
10317 }; 10317 };
10318 10318
10319 static int __init find_overlapped_early(u64 start, u64 end) 10319 static int __init find_overlapped_early(u64 start, u64 end)
10320diff -urNp linux-2.6.32.14/arch/x86/kernel/efi_32.c linux-2.6.32.14/arch/x86/kernel/efi_32.c 10320diff -urNp linux-2.6.32.15/arch/x86/kernel/efi_32.c linux-2.6.32.15/arch/x86/kernel/efi_32.c
10321--- linux-2.6.32.14/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400 10321--- linux-2.6.32.15/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400
10322+++ linux-2.6.32.14/arch/x86/kernel/efi_32.c 2010-05-28 21:27:15.023156603 -0400 10322+++ linux-2.6.32.15/arch/x86/kernel/efi_32.c 2010-05-28 21:27:15.023156603 -0400
10323@@ -38,70 +38,38 @@ 10323@@ -38,70 +38,38 @@
10324 */ 10324 */
10325 10325
@@ -10400,9 +10400,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/efi_32.c linux-2.6.32.14/arch/x86/ker
10400 10400
10401 /* 10401 /*
10402 * After the lock is released, the original page table is restored. 10402 * After the lock is released, the original page table is restored.
10403diff -urNp linux-2.6.32.14/arch/x86/kernel/efi_stub_32.S linux-2.6.32.14/arch/x86/kernel/efi_stub_32.S 10403diff -urNp linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S
10404--- linux-2.6.32.14/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400 10404--- linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400
10405+++ linux-2.6.32.14/arch/x86/kernel/efi_stub_32.S 2010-05-28 21:27:15.031137412 -0400 10405+++ linux-2.6.32.15/arch/x86/kernel/efi_stub_32.S 2010-05-28 21:27:15.031137412 -0400
10406@@ -6,6 +6,7 @@ 10406@@ -6,6 +6,7 @@
10407 */ 10407 */
10408 10408
@@ -10501,9 +10501,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/efi_stub_32.S linux-2.6.32.14/arch/x8
10501 saved_return_addr: 10501 saved_return_addr:
10502 .long 0 10502 .long 0
10503 efi_rt_function_ptr: 10503 efi_rt_function_ptr:
10504diff -urNp linux-2.6.32.14/arch/x86/kernel/entry_32.S linux-2.6.32.14/arch/x86/kernel/entry_32.S 10504diff -urNp linux-2.6.32.15/arch/x86/kernel/entry_32.S linux-2.6.32.15/arch/x86/kernel/entry_32.S
10505--- linux-2.6.32.14/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400 10505--- linux-2.6.32.15/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400
10506+++ linux-2.6.32.14/arch/x86/kernel/entry_32.S 2010-05-28 21:27:15.031137412 -0400 10506+++ linux-2.6.32.15/arch/x86/kernel/entry_32.S 2010-05-28 21:27:15.031137412 -0400
10507@@ -191,7 +191,67 @@ 10507@@ -191,7 +191,67 @@
10508 10508
10509 #endif /* CONFIG_X86_32_LAZY_GS */ 10509 #endif /* CONFIG_X86_32_LAZY_GS */
@@ -10817,9 +10817,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/entry_32.S linux-2.6.32.14/arch/x86/k
10817 RESTORE_REGS 10817 RESTORE_REGS
10818 lss 12+4(%esp), %esp # back to espfix stack 10818 lss 12+4(%esp), %esp # back to espfix stack
10819 CFI_ADJUST_CFA_OFFSET -24 10819 CFI_ADJUST_CFA_OFFSET -24
10820diff -urNp linux-2.6.32.14/arch/x86/kernel/entry_64.S linux-2.6.32.14/arch/x86/kernel/entry_64.S 10820diff -urNp linux-2.6.32.15/arch/x86/kernel/entry_64.S linux-2.6.32.15/arch/x86/kernel/entry_64.S
10821--- linux-2.6.32.14/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400 10821--- linux-2.6.32.15/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400
10822+++ linux-2.6.32.14/arch/x86/kernel/entry_64.S 2010-05-28 21:27:15.031137412 -0400 10822+++ linux-2.6.32.15/arch/x86/kernel/entry_64.S 2010-05-28 21:27:15.031137412 -0400
10823@@ -53,6 +53,7 @@ 10823@@ -53,6 +53,7 @@
10824 #include <asm/paravirt.h> 10824 #include <asm/paravirt.h>
10825 #include <asm/ftrace.h> 10825 #include <asm/ftrace.h>
@@ -11277,9 +11277,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/entry_64.S linux-2.6.32.14/arch/x86/k
11277 RESTORE_ALL 8 11277 RESTORE_ALL 8
11278 jmp irq_return 11278 jmp irq_return
11279 nmi_userspace: 11279 nmi_userspace:
11280diff -urNp linux-2.6.32.14/arch/x86/kernel/ftrace.c linux-2.6.32.14/arch/x86/kernel/ftrace.c 11280diff -urNp linux-2.6.32.15/arch/x86/kernel/ftrace.c linux-2.6.32.15/arch/x86/kernel/ftrace.c
11281--- linux-2.6.32.14/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400 11281--- linux-2.6.32.15/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400
11282+++ linux-2.6.32.14/arch/x86/kernel/ftrace.c 2010-05-28 21:27:15.031137412 -0400 11282+++ linux-2.6.32.15/arch/x86/kernel/ftrace.c 2010-05-28 21:27:15.031137412 -0400
11283@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) 11283@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
11284 { 11284 {
11285 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { 11285 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -11345,9 +11345,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/ftrace.c linux-2.6.32.14/arch/x86/ker
11345 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) 11345 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
11346 return -EFAULT; 11346 return -EFAULT;
11347 11347
11348diff -urNp linux-2.6.32.14/arch/x86/kernel/head32.c linux-2.6.32.14/arch/x86/kernel/head32.c 11348diff -urNp linux-2.6.32.15/arch/x86/kernel/head32.c linux-2.6.32.15/arch/x86/kernel/head32.c
11349--- linux-2.6.32.14/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400 11349--- linux-2.6.32.15/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400
11350+++ linux-2.6.32.14/arch/x86/kernel/head32.c 2010-05-28 21:27:15.031137412 -0400 11350+++ linux-2.6.32.15/arch/x86/kernel/head32.c 2010-05-28 21:27:15.031137412 -0400
11351@@ -16,6 +16,7 @@ 11351@@ -16,6 +16,7 @@
11352 #include <asm/apic.h> 11352 #include <asm/apic.h>
11353 #include <asm/io_apic.h> 11353 #include <asm/io_apic.h>
@@ -11365,9 +11365,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/head32.c linux-2.6.32.14/arch/x86/ker
11365 11365
11366 #ifdef CONFIG_BLK_DEV_INITRD 11366 #ifdef CONFIG_BLK_DEV_INITRD
11367 /* Reserve INITRD */ 11367 /* Reserve INITRD */
11368diff -urNp linux-2.6.32.14/arch/x86/kernel/head_32.S linux-2.6.32.14/arch/x86/kernel/head_32.S 11368diff -urNp linux-2.6.32.15/arch/x86/kernel/head_32.S linux-2.6.32.15/arch/x86/kernel/head_32.S
11369--- linux-2.6.32.14/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400 11369--- linux-2.6.32.15/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400
11370+++ linux-2.6.32.14/arch/x86/kernel/head_32.S 2010-05-28 21:27:15.039159907 -0400 11370+++ linux-2.6.32.15/arch/x86/kernel/head_32.S 2010-05-28 21:27:15.039159907 -0400
11371@@ -19,10 +19,17 @@ 11371@@ -19,10 +19,17 @@
11372 #include <asm/setup.h> 11372 #include <asm/setup.h>
11373 #include <asm/processor-flags.h> 11373 #include <asm/processor-flags.h>
@@ -11809,9 +11809,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/head_32.S linux-2.6.32.14/arch/x86/ke
11809+ /* Be sure this is zeroed to avoid false validations in Xen */ 11809+ /* Be sure this is zeroed to avoid false validations in Xen */
11810+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0 11810+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
11811+ .endr 11811+ .endr
11812diff -urNp linux-2.6.32.14/arch/x86/kernel/head64.c linux-2.6.32.14/arch/x86/kernel/head64.c 11812diff -urNp linux-2.6.32.15/arch/x86/kernel/head64.c linux-2.6.32.15/arch/x86/kernel/head64.c
11813--- linux-2.6.32.14/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400 11813--- linux-2.6.32.15/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400
11814+++ linux-2.6.32.14/arch/x86/kernel/head64.c 2010-05-28 21:27:15.039159907 -0400 11814+++ linux-2.6.32.15/arch/x86/kernel/head64.c 2010-05-28 21:27:15.039159907 -0400
11815@@ -29,7 +29,13 @@ 11815@@ -29,7 +29,13 @@
11816 static void __init zap_identity_mappings(void) 11816 static void __init zap_identity_mappings(void)
11817 { 11817 {
@@ -11826,9 +11826,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/head64.c linux-2.6.32.14/arch/x86/ker
11826 __flush_tlb_all(); 11826 __flush_tlb_all();
11827 } 11827 }
11828 11828
11829diff -urNp linux-2.6.32.14/arch/x86/kernel/head_64.S linux-2.6.32.14/arch/x86/kernel/head_64.S 11829diff -urNp linux-2.6.32.15/arch/x86/kernel/head_64.S linux-2.6.32.15/arch/x86/kernel/head_64.S
11830--- linux-2.6.32.14/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400 11830--- linux-2.6.32.15/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400
11831+++ linux-2.6.32.14/arch/x86/kernel/head_64.S 2010-05-28 21:27:15.039159907 -0400 11831+++ linux-2.6.32.15/arch/x86/kernel/head_64.S 2010-05-28 21:27:15.039159907 -0400
11832@@ -19,6 +19,7 @@ 11832@@ -19,6 +19,7 @@
11833 #include <asm/cache.h> 11833 #include <asm/cache.h>
11834 #include <asm/processor-flags.h> 11834 #include <asm/processor-flags.h>
@@ -12099,9 +12099,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/head_64.S linux-2.6.32.14/arch/x86/ke
12099 12099
12100 __PAGE_ALIGNED_BSS 12100 __PAGE_ALIGNED_BSS
12101 .align PAGE_SIZE 12101 .align PAGE_SIZE
12102diff -urNp linux-2.6.32.14/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.14/arch/x86/kernel/i386_ksyms_32.c 12102diff -urNp linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c
12103--- linux-2.6.32.14/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400 12103--- linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400
12104+++ linux-2.6.32.14/arch/x86/kernel/i386_ksyms_32.c 2010-05-28 21:27:15.039159907 -0400 12104+++ linux-2.6.32.15/arch/x86/kernel/i386_ksyms_32.c 2010-05-28 21:27:15.039159907 -0400
12105@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); 12105@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
12106 EXPORT_SYMBOL(cmpxchg8b_emu); 12106 EXPORT_SYMBOL(cmpxchg8b_emu);
12107 #endif 12107 #endif
@@ -12123,9 +12123,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.14/arch/
12123+#ifdef CONFIG_PAX_KERNEXEC 12123+#ifdef CONFIG_PAX_KERNEXEC
12124+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); 12124+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
12125+#endif 12125+#endif
12126diff -urNp linux-2.6.32.14/arch/x86/kernel/init_task.c linux-2.6.32.14/arch/x86/kernel/init_task.c 12126diff -urNp linux-2.6.32.15/arch/x86/kernel/init_task.c linux-2.6.32.15/arch/x86/kernel/init_task.c
12127--- linux-2.6.32.14/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400 12127--- linux-2.6.32.15/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400
12128+++ linux-2.6.32.14/arch/x86/kernel/init_task.c 2010-05-28 21:27:15.039159907 -0400 12128+++ linux-2.6.32.15/arch/x86/kernel/init_task.c 2010-05-28 21:27:15.039159907 -0400
12129@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); 12129@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
12130 * section. Since TSS's are completely CPU-local, we want them 12130 * section. Since TSS's are completely CPU-local, we want them
12131 * on exact cacheline boundaries, to eliminate cacheline ping-pong. 12131 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -12134,9 +12134,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/init_task.c linux-2.6.32.14/arch/x86/
12134- 12134-
12135+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; 12135+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
12136+EXPORT_SYMBOL(init_tss); 12136+EXPORT_SYMBOL(init_tss);
12137diff -urNp linux-2.6.32.14/arch/x86/kernel/ioport.c linux-2.6.32.14/arch/x86/kernel/ioport.c 12137diff -urNp linux-2.6.32.15/arch/x86/kernel/ioport.c linux-2.6.32.15/arch/x86/kernel/ioport.c
12138--- linux-2.6.32.14/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 12138--- linux-2.6.32.15/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
12139+++ linux-2.6.32.14/arch/x86/kernel/ioport.c 2010-05-28 21:27:15.039159907 -0400 12139+++ linux-2.6.32.15/arch/x86/kernel/ioport.c 2010-05-28 21:27:15.039159907 -0400
12140@@ -6,6 +6,7 @@ 12140@@ -6,6 +6,7 @@
12141 #include <linux/sched.h> 12141 #include <linux/sched.h>
12142 #include <linux/kernel.h> 12142 #include <linux/kernel.h>
@@ -12181,9 +12181,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/ioport.c linux-2.6.32.14/arch/x86/ker
12181 } 12181 }
12182 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); 12182 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
12183 12183
12184diff -urNp linux-2.6.32.14/arch/x86/kernel/irq_32.c linux-2.6.32.14/arch/x86/kernel/irq_32.c 12184diff -urNp linux-2.6.32.15/arch/x86/kernel/irq_32.c linux-2.6.32.15/arch/x86/kernel/irq_32.c
12185--- linux-2.6.32.14/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400 12185--- linux-2.6.32.15/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400
12186+++ linux-2.6.32.14/arch/x86/kernel/irq_32.c 2010-05-28 21:27:15.039159907 -0400 12186+++ linux-2.6.32.15/arch/x86/kernel/irq_32.c 2010-05-28 21:27:15.039159907 -0400
12187@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc 12187@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
12188 return 0; 12188 return 0;
12189 12189
@@ -12202,9 +12202,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/irq_32.c linux-2.6.32.14/arch/x86/ker
12202 12202
12203 call_on_stack(__do_softirq, isp); 12203 call_on_stack(__do_softirq, isp);
12204 /* 12204 /*
12205diff -urNp linux-2.6.32.14/arch/x86/kernel/kgdb.c linux-2.6.32.14/arch/x86/kernel/kgdb.c 12205diff -urNp linux-2.6.32.15/arch/x86/kernel/kgdb.c linux-2.6.32.15/arch/x86/kernel/kgdb.c
12206--- linux-2.6.32.14/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 12206--- linux-2.6.32.15/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
12207+++ linux-2.6.32.14/arch/x86/kernel/kgdb.c 2010-05-28 21:27:15.039159907 -0400 12207+++ linux-2.6.32.15/arch/x86/kernel/kgdb.c 2010-05-28 21:27:15.039159907 -0400
12208@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception 12208@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
12209 return instruction_pointer(regs); 12209 return instruction_pointer(regs);
12210 } 12210 }
@@ -12214,9 +12214,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/kgdb.c linux-2.6.32.14/arch/x86/kerne
12214 /* Breakpoint instruction: */ 12214 /* Breakpoint instruction: */
12215 .gdb_bpt_instr = { 0xcc }, 12215 .gdb_bpt_instr = { 0xcc },
12216 .flags = KGDB_HW_BREAKPOINT, 12216 .flags = KGDB_HW_BREAKPOINT,
12217diff -urNp linux-2.6.32.14/arch/x86/kernel/kprobes.c linux-2.6.32.14/arch/x86/kernel/kprobes.c 12217diff -urNp linux-2.6.32.15/arch/x86/kernel/kprobes.c linux-2.6.32.15/arch/x86/kernel/kprobes.c
12218--- linux-2.6.32.14/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 12218--- linux-2.6.32.15/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400
12219+++ linux-2.6.32.14/arch/x86/kernel/kprobes.c 2010-05-28 21:27:15.039159907 -0400 12219+++ linux-2.6.32.15/arch/x86/kernel/kprobes.c 2010-05-28 21:27:15.039159907 -0400
12220@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f 12220@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
12221 char op; 12221 char op;
12222 s32 raddr; 12222 s32 raddr;
@@ -12309,9 +12309,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/kprobes.c linux-2.6.32.14/arch/x86/ke
12309 return ret; 12309 return ret;
12310 12310
12311 switch (val) { 12311 switch (val) {
12312diff -urNp linux-2.6.32.14/arch/x86/kernel/ldt.c linux-2.6.32.14/arch/x86/kernel/ldt.c 12312diff -urNp linux-2.6.32.15/arch/x86/kernel/ldt.c linux-2.6.32.15/arch/x86/kernel/ldt.c
12313--- linux-2.6.32.14/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400 12313--- linux-2.6.32.15/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400
12314+++ linux-2.6.32.14/arch/x86/kernel/ldt.c 2010-05-28 21:27:15.039159907 -0400 12314+++ linux-2.6.32.15/arch/x86/kernel/ldt.c 2010-05-28 21:27:15.039159907 -0400
12315@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i 12315@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
12316 if (reload) { 12316 if (reload) {
12317 #ifdef CONFIG_SMP 12317 #ifdef CONFIG_SMP
@@ -12376,9 +12376,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/ldt.c linux-2.6.32.14/arch/x86/kernel
12376 fill_ldt(&ldt, &ldt_info); 12376 fill_ldt(&ldt, &ldt_info);
12377 if (oldmode) 12377 if (oldmode)
12378 ldt.avl = 0; 12378 ldt.avl = 0;
12379diff -urNp linux-2.6.32.14/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.14/arch/x86/kernel/machine_kexec_32.c 12379diff -urNp linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c
12380--- linux-2.6.32.14/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400 12380--- linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400
12381+++ linux-2.6.32.14/arch/x86/kernel/machine_kexec_32.c 2010-05-28 21:27:15.043064911 -0400 12381+++ linux-2.6.32.15/arch/x86/kernel/machine_kexec_32.c 2010-05-28 21:27:15.043064911 -0400
12382@@ -26,7 +26,7 @@ 12382@@ -26,7 +26,7 @@
12383 #include <asm/system.h> 12383 #include <asm/system.h>
12384 #include <asm/cacheflush.h> 12384 #include <asm/cacheflush.h>
@@ -12406,9 +12406,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.14/ar
12406 12406
12407 relocate_kernel_ptr = control_page; 12407 relocate_kernel_ptr = control_page;
12408 page_list[PA_CONTROL_PAGE] = __pa(control_page); 12408 page_list[PA_CONTROL_PAGE] = __pa(control_page);
12409diff -urNp linux-2.6.32.14/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.14/arch/x86/kernel/machine_kexec_64.c 12409diff -urNp linux-2.6.32.15/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.15/arch/x86/kernel/machine_kexec_64.c
12410--- linux-2.6.32.14/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400 12410--- linux-2.6.32.15/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400
12411+++ linux-2.6.32.14/arch/x86/kernel/machine_kexec_64.c 2010-05-28 21:27:15.043064911 -0400 12411+++ linux-2.6.32.15/arch/x86/kernel/machine_kexec_64.c 2010-05-28 21:27:15.043064911 -0400
12412@@ -126,7 +126,13 @@ static int init_level4_page(struct kimag 12412@@ -126,7 +126,13 @@ static int init_level4_page(struct kimag
12413 } 12413 }
12414 /* clear the unused entries */ 12414 /* clear the unused entries */
@@ -12423,9 +12423,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.14/ar
12423 addr += PGDIR_SIZE; 12423 addr += PGDIR_SIZE;
12424 } 12424 }
12425 out: 12425 out:
12426diff -urNp linux-2.6.32.14/arch/x86/kernel/microcode_amd.c linux-2.6.32.14/arch/x86/kernel/microcode_amd.c 12426diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_amd.c linux-2.6.32.15/arch/x86/kernel/microcode_amd.c
12427--- linux-2.6.32.14/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400 12427--- linux-2.6.32.15/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400
12428+++ linux-2.6.32.14/arch/x86/kernel/microcode_amd.c 2010-05-28 21:27:15.043064911 -0400 12428+++ linux-2.6.32.15/arch/x86/kernel/microcode_amd.c 2010-05-28 21:27:15.043064911 -0400
12429@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c 12429@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
12430 uci->mc = NULL; 12430 uci->mc = NULL;
12431 } 12431 }
@@ -12444,9 +12444,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/microcode_amd.c linux-2.6.32.14/arch/
12444 { 12444 {
12445 return &microcode_amd_ops; 12445 return &microcode_amd_ops;
12446 } 12446 }
12447diff -urNp linux-2.6.32.14/arch/x86/kernel/microcode_core.c linux-2.6.32.14/arch/x86/kernel/microcode_core.c 12447diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_core.c linux-2.6.32.15/arch/x86/kernel/microcode_core.c
12448--- linux-2.6.32.14/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400 12448--- linux-2.6.32.15/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400
12449+++ linux-2.6.32.14/arch/x86/kernel/microcode_core.c 2010-05-28 21:27:15.043064911 -0400 12449+++ linux-2.6.32.15/arch/x86/kernel/microcode_core.c 2010-05-28 21:27:15.043064911 -0400
12450@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); 12450@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
12451 12451
12452 #define MICROCODE_VERSION "2.00" 12452 #define MICROCODE_VERSION "2.00"
@@ -12456,9 +12456,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/microcode_core.c linux-2.6.32.14/arch
12456 12456
12457 /* 12457 /*
12458 * Synchronization. 12458 * Synchronization.
12459diff -urNp linux-2.6.32.14/arch/x86/kernel/microcode_intel.c linux-2.6.32.14/arch/x86/kernel/microcode_intel.c 12459diff -urNp linux-2.6.32.15/arch/x86/kernel/microcode_intel.c linux-2.6.32.15/arch/x86/kernel/microcode_intel.c
12460--- linux-2.6.32.14/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400 12460--- linux-2.6.32.15/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400
12461+++ linux-2.6.32.14/arch/x86/kernel/microcode_intel.c 2010-05-28 21:27:15.043064911 -0400 12461+++ linux-2.6.32.15/arch/x86/kernel/microcode_intel.c 2010-05-28 21:27:15.043064911 -0400
12462@@ -443,13 +443,13 @@ static enum ucode_state request_microcod 12462@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
12463 12463
12464 static int get_ucode_user(void *to, const void *from, size_t n) 12464 static int get_ucode_user(void *to, const void *from, size_t n)
@@ -12493,9 +12493,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/microcode_intel.c linux-2.6.32.14/arc
12493 { 12493 {
12494 return &microcode_intel_ops; 12494 return &microcode_intel_ops;
12495 } 12495 }
12496diff -urNp linux-2.6.32.14/arch/x86/kernel/module.c linux-2.6.32.14/arch/x86/kernel/module.c 12496diff -urNp linux-2.6.32.15/arch/x86/kernel/module.c linux-2.6.32.15/arch/x86/kernel/module.c
12497--- linux-2.6.32.14/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 12497--- linux-2.6.32.15/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
12498+++ linux-2.6.32.14/arch/x86/kernel/module.c 2010-05-28 21:27:15.043064911 -0400 12498+++ linux-2.6.32.15/arch/x86/kernel/module.c 2010-05-28 21:27:15.043064911 -0400
12499@@ -34,7 +34,7 @@ 12499@@ -34,7 +34,7 @@
12500 #define DEBUGP(fmt...) 12500 #define DEBUGP(fmt...)
12501 #endif 12501 #endif
@@ -12636,9 +12636,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/module.c linux-2.6.32.14/arch/x86/ker
12636 #if 0 12636 #if 0
12637 if ((s64)val != *(s32 *)loc) 12637 if ((s64)val != *(s32 *)loc)
12638 goto overflow; 12638 goto overflow;
12639diff -urNp linux-2.6.32.14/arch/x86/kernel/paravirt.c linux-2.6.32.14/arch/x86/kernel/paravirt.c 12639diff -urNp linux-2.6.32.15/arch/x86/kernel/paravirt.c linux-2.6.32.15/arch/x86/kernel/paravirt.c
12640--- linux-2.6.32.14/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400 12640--- linux-2.6.32.15/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400
12641+++ linux-2.6.32.14/arch/x86/kernel/paravirt.c 2010-05-28 21:27:15.043064911 -0400 12641+++ linux-2.6.32.15/arch/x86/kernel/paravirt.c 2010-05-28 21:27:15.043064911 -0400
12642@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu 12642@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
12643 * corresponding structure. */ 12643 * corresponding structure. */
12644 static void *get_call_destination(u8 type) 12644 static void *get_call_destination(u8 type)
@@ -12742,9 +12742,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/paravirt.c linux-2.6.32.14/arch/x86/k
12742 }; 12742 };
12743 12743
12744 EXPORT_SYMBOL_GPL(pv_time_ops); 12744 EXPORT_SYMBOL_GPL(pv_time_ops);
12745diff -urNp linux-2.6.32.14/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.14/arch/x86/kernel/paravirt-spinlocks.c 12745diff -urNp linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c
12746--- linux-2.6.32.14/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400 12746--- linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400
12747+++ linux-2.6.32.14/arch/x86/kernel/paravirt-spinlocks.c 2010-05-28 21:27:15.043064911 -0400 12747+++ linux-2.6.32.15/arch/x86/kernel/paravirt-spinlocks.c 2010-05-28 21:27:15.043064911 -0400
12748@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * 12748@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
12749 __raw_spin_lock(lock); 12749 __raw_spin_lock(lock);
12750 } 12750 }
@@ -12754,9 +12754,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.14/
12754 #ifdef CONFIG_SMP 12754 #ifdef CONFIG_SMP
12755 .spin_is_locked = __ticket_spin_is_locked, 12755 .spin_is_locked = __ticket_spin_is_locked,
12756 .spin_is_contended = __ticket_spin_is_contended, 12756 .spin_is_contended = __ticket_spin_is_contended,
12757diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.14/arch/x86/kernel/pci-calgary_64.c 12757diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c
12758--- linux-2.6.32.14/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400 12758--- linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400
12759+++ linux-2.6.32.14/arch/x86/kernel/pci-calgary_64.c 2010-05-28 21:27:15.043064911 -0400 12759+++ linux-2.6.32.15/arch/x86/kernel/pci-calgary_64.c 2010-05-28 21:27:15.043064911 -0400
12760@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct 12760@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct
12761 free_pages((unsigned long)vaddr, get_order(size)); 12761 free_pages((unsigned long)vaddr, get_order(size));
12762 } 12762 }
@@ -12766,9 +12766,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.14/arch
12766 .alloc_coherent = calgary_alloc_coherent, 12766 .alloc_coherent = calgary_alloc_coherent,
12767 .free_coherent = calgary_free_coherent, 12767 .free_coherent = calgary_free_coherent,
12768 .map_sg = calgary_map_sg, 12768 .map_sg = calgary_map_sg,
12769diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-dma.c linux-2.6.32.14/arch/x86/kernel/pci-dma.c 12769diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-dma.c linux-2.6.32.15/arch/x86/kernel/pci-dma.c
12770--- linux-2.6.32.14/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 12770--- linux-2.6.32.15/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
12771+++ linux-2.6.32.14/arch/x86/kernel/pci-dma.c 2010-05-28 21:27:15.043064911 -0400 12771+++ linux-2.6.32.15/arch/x86/kernel/pci-dma.c 2010-05-28 21:27:15.043064911 -0400
12772@@ -14,7 +14,7 @@ 12772@@ -14,7 +14,7 @@
12773 12773
12774 static int forbid_dac __read_mostly; 12774 static int forbid_dac __read_mostly;
@@ -12787,9 +12787,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-dma.c linux-2.6.32.14/arch/x86/ke
12787 12787
12788 #ifdef CONFIG_PCI 12788 #ifdef CONFIG_PCI
12789 if (mask > 0xffffffff && forbid_dac > 0) { 12789 if (mask > 0xffffffff && forbid_dac > 0) {
12790diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-gart_64.c linux-2.6.32.14/arch/x86/kernel/pci-gart_64.c 12790diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c
12791--- linux-2.6.32.14/arch/x86/kernel/pci-gart_64.c 2010-05-15 13:20:18.438563899 -0400 12791--- linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c 2010-05-15 13:20:18.438563899 -0400
12792+++ linux-2.6.32.14/arch/x86/kernel/pci-gart_64.c 2010-05-28 21:27:15.047155410 -0400 12792+++ linux-2.6.32.15/arch/x86/kernel/pci-gart_64.c 2010-05-28 21:27:15.047155410 -0400
12793@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag 12793@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
12794 return -1; 12794 return -1;
12795 } 12795 }
@@ -12799,9 +12799,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-gart_64.c linux-2.6.32.14/arch/x8
12799 .map_sg = gart_map_sg, 12799 .map_sg = gart_map_sg,
12800 .unmap_sg = gart_unmap_sg, 12800 .unmap_sg = gart_unmap_sg,
12801 .map_page = gart_map_page, 12801 .map_page = gart_map_page,
12802diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-nommu.c linux-2.6.32.14/arch/x86/kernel/pci-nommu.c 12802diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-nommu.c linux-2.6.32.15/arch/x86/kernel/pci-nommu.c
12803--- linux-2.6.32.14/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400 12803--- linux-2.6.32.15/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400
12804+++ linux-2.6.32.14/arch/x86/kernel/pci-nommu.c 2010-05-28 21:27:15.047155410 -0400 12804+++ linux-2.6.32.15/arch/x86/kernel/pci-nommu.c 2010-05-28 21:27:15.047155410 -0400
12805@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str 12805@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
12806 flush_write_buffers(); 12806 flush_write_buffers();
12807 } 12807 }
@@ -12811,9 +12811,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-nommu.c linux-2.6.32.14/arch/x86/
12811 .alloc_coherent = dma_generic_alloc_coherent, 12811 .alloc_coherent = dma_generic_alloc_coherent,
12812 .free_coherent = nommu_free_coherent, 12812 .free_coherent = nommu_free_coherent,
12813 .map_sg = nommu_map_sg, 12813 .map_sg = nommu_map_sg,
12814diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.14/arch/x86/kernel/pci-swiotlb.c 12814diff -urNp linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c
12815--- linux-2.6.32.14/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 12815--- linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
12816+++ linux-2.6.32.14/arch/x86/kernel/pci-swiotlb.c 2010-05-28 21:27:15.047155410 -0400 12816+++ linux-2.6.32.15/arch/x86/kernel/pci-swiotlb.c 2010-05-28 21:27:15.047155410 -0400
12817@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( 12817@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
12818 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); 12818 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
12819 } 12819 }
@@ -12823,9 +12823,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.14/arch/x8
12823 .mapping_error = swiotlb_dma_mapping_error, 12823 .mapping_error = swiotlb_dma_mapping_error,
12824 .alloc_coherent = x86_swiotlb_alloc_coherent, 12824 .alloc_coherent = x86_swiotlb_alloc_coherent,
12825 .free_coherent = swiotlb_free_coherent, 12825 .free_coherent = swiotlb_free_coherent,
12826diff -urNp linux-2.6.32.14/arch/x86/kernel/process_32.c linux-2.6.32.14/arch/x86/kernel/process_32.c 12826diff -urNp linux-2.6.32.15/arch/x86/kernel/process_32.c linux-2.6.32.15/arch/x86/kernel/process_32.c
12827--- linux-2.6.32.14/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400 12827--- linux-2.6.32.15/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400
12828+++ linux-2.6.32.14/arch/x86/kernel/process_32.c 2010-05-28 21:27:15.047155410 -0400 12828+++ linux-2.6.32.15/arch/x86/kernel/process_32.c 2010-05-28 21:27:15.047155410 -0400
12829@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as 12829@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
12830 unsigned long thread_saved_pc(struct task_struct *tsk) 12830 unsigned long thread_saved_pc(struct task_struct *tsk)
12831 { 12831 {
@@ -12920,9 +12920,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/process_32.c linux-2.6.32.14/arch/x86
12920+ load_sp0(init_tss + smp_processor_id(), thread); 12920+ load_sp0(init_tss + smp_processor_id(), thread);
12921+} 12921+}
12922+#endif 12922+#endif
12923diff -urNp linux-2.6.32.14/arch/x86/kernel/process_64.c linux-2.6.32.14/arch/x86/kernel/process_64.c 12923diff -urNp linux-2.6.32.15/arch/x86/kernel/process_64.c linux-2.6.32.15/arch/x86/kernel/process_64.c
12924--- linux-2.6.32.14/arch/x86/kernel/process_64.c 2010-05-15 13:20:18.438563899 -0400 12924--- linux-2.6.32.15/arch/x86/kernel/process_64.c 2010-05-15 13:20:18.438563899 -0400
12925+++ linux-2.6.32.14/arch/x86/kernel/process_64.c 2010-05-28 21:27:15.047155410 -0400 12925+++ linux-2.6.32.15/arch/x86/kernel/process_64.c 2010-05-28 21:27:15.047155410 -0400
12926@@ -91,7 +91,7 @@ static void __exit_idle(void) 12926@@ -91,7 +91,7 @@ static void __exit_idle(void)
12927 void exit_idle(void) 12927 void exit_idle(void)
12928 { 12928 {
@@ -12965,9 +12965,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/process_64.c linux-2.6.32.14/arch/x86
12965 return 0; 12965 return 0;
12966 ip = *(u64 *)(fp+8); 12966 ip = *(u64 *)(fp+8);
12967 if (!in_sched_functions(ip)) 12967 if (!in_sched_functions(ip))
12968diff -urNp linux-2.6.32.14/arch/x86/kernel/process.c linux-2.6.32.14/arch/x86/kernel/process.c 12968diff -urNp linux-2.6.32.15/arch/x86/kernel/process.c linux-2.6.32.15/arch/x86/kernel/process.c
12969--- linux-2.6.32.14/arch/x86/kernel/process.c 2010-05-28 20:16:44.430924650 -0400 12969--- linux-2.6.32.15/arch/x86/kernel/process.c 2010-05-28 20:16:44.430924650 -0400
12970+++ linux-2.6.32.14/arch/x86/kernel/process.c 2010-05-28 21:27:15.047155410 -0400 12970+++ linux-2.6.32.15/arch/x86/kernel/process.c 2010-05-28 21:27:15.047155410 -0400
12971@@ -73,7 +73,7 @@ void exit_thread(void) 12971@@ -73,7 +73,7 @@ void exit_thread(void)
12972 unsigned long *bp = t->io_bitmap_ptr; 12972 unsigned long *bp = t->io_bitmap_ptr;
12973 12973
@@ -13005,9 +13005,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/process.c linux-2.6.32.14/arch/x86/ke
13005- return randomize_range(mm->brk, range_end, 0) ? : mm->brk; 13005- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
13006-} 13006-}
13007- 13007-
13008diff -urNp linux-2.6.32.14/arch/x86/kernel/ptrace.c linux-2.6.32.14/arch/x86/kernel/ptrace.c 13008diff -urNp linux-2.6.32.15/arch/x86/kernel/ptrace.c linux-2.6.32.15/arch/x86/kernel/ptrace.c
13009--- linux-2.6.32.14/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 13009--- linux-2.6.32.15/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400
13010+++ linux-2.6.32.14/arch/x86/kernel/ptrace.c 2010-05-28 21:27:15.047155410 -0400 13010+++ linux-2.6.32.15/arch/x86/kernel/ptrace.c 2010-05-28 21:27:15.047155410 -0400
13011@@ -925,7 +925,7 @@ static const struct user_regset_view use 13011@@ -925,7 +925,7 @@ static const struct user_regset_view use
13012 long arch_ptrace(struct task_struct *child, long request, long addr, long data) 13012 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
13013 { 13013 {
@@ -13076,9 +13076,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/ptrace.c linux-2.6.32.14/arch/x86/ker
13076 13076
13077 /* Send us the fake SIGTRAP */ 13077 /* Send us the fake SIGTRAP */
13078 force_sig_info(SIGTRAP, &info, tsk); 13078 force_sig_info(SIGTRAP, &info, tsk);
13079diff -urNp linux-2.6.32.14/arch/x86/kernel/reboot.c linux-2.6.32.14/arch/x86/kernel/reboot.c 13079diff -urNp linux-2.6.32.15/arch/x86/kernel/reboot.c linux-2.6.32.15/arch/x86/kernel/reboot.c
13080--- linux-2.6.32.14/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400 13080--- linux-2.6.32.15/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400
13081+++ linux-2.6.32.14/arch/x86/kernel/reboot.c 2010-05-28 21:27:15.050883545 -0400 13081+++ linux-2.6.32.15/arch/x86/kernel/reboot.c 2010-05-28 21:27:15.050883545 -0400
13082@@ -33,7 +33,7 @@ void (*pm_power_off)(void); 13082@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
13083 EXPORT_SYMBOL(pm_power_off); 13083 EXPORT_SYMBOL(pm_power_off);
13084 13084
@@ -13155,9 +13155,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/reboot.c linux-2.6.32.14/arch/x86/ker
13155 13155
13156 /* Set up the IDT for real mode. */ 13156 /* Set up the IDT for real mode. */
13157 load_idt(&real_mode_idt); 13157 load_idt(&real_mode_idt);
13158diff -urNp linux-2.6.32.14/arch/x86/kernel/setup.c linux-2.6.32.14/arch/x86/kernel/setup.c 13158diff -urNp linux-2.6.32.15/arch/x86/kernel/setup.c linux-2.6.32.15/arch/x86/kernel/setup.c
13159--- linux-2.6.32.14/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 13159--- linux-2.6.32.15/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
13160+++ linux-2.6.32.14/arch/x86/kernel/setup.c 2010-05-28 21:27:15.062911922 -0400 13160+++ linux-2.6.32.15/arch/x86/kernel/setup.c 2010-05-28 21:27:15.062911922 -0400
13161@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p) 13161@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p)
13162 13162
13163 if (!boot_params.hdr.root_flags) 13163 if (!boot_params.hdr.root_flags)
@@ -13178,9 +13178,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/setup.c linux-2.6.32.14/arch/x86/kern
13178 data_resource.end = virt_to_phys(_edata)-1; 13178 data_resource.end = virt_to_phys(_edata)-1;
13179 bss_resource.start = virt_to_phys(&__bss_start); 13179 bss_resource.start = virt_to_phys(&__bss_start);
13180 bss_resource.end = virt_to_phys(&__bss_stop)-1; 13180 bss_resource.end = virt_to_phys(&__bss_stop)-1;
13181diff -urNp linux-2.6.32.14/arch/x86/kernel/setup_percpu.c linux-2.6.32.14/arch/x86/kernel/setup_percpu.c 13181diff -urNp linux-2.6.32.15/arch/x86/kernel/setup_percpu.c linux-2.6.32.15/arch/x86/kernel/setup_percpu.c
13182--- linux-2.6.32.14/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400 13182--- linux-2.6.32.15/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400
13183+++ linux-2.6.32.14/arch/x86/kernel/setup_percpu.c 2010-05-28 21:27:15.062911922 -0400 13183+++ linux-2.6.32.15/arch/x86/kernel/setup_percpu.c 2010-05-28 21:27:15.062911922 -0400
13184@@ -25,19 +25,17 @@ 13184@@ -25,19 +25,17 @@
13185 # define DBG(x...) 13185 # define DBG(x...)
13186 #endif 13186 #endif
@@ -13243,9 +13243,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/setup_percpu.c linux-2.6.32.14/arch/x
13243 /* 13243 /*
13244 * Up to this point, the boot CPU has been using .data.init 13244 * Up to this point, the boot CPU has been using .data.init
13245 * area. Reload any changed state for the boot CPU. 13245 * area. Reload any changed state for the boot CPU.
13246diff -urNp linux-2.6.32.14/arch/x86/kernel/signal.c linux-2.6.32.14/arch/x86/kernel/signal.c 13246diff -urNp linux-2.6.32.15/arch/x86/kernel/signal.c linux-2.6.32.15/arch/x86/kernel/signal.c
13247--- linux-2.6.32.14/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 13247--- linux-2.6.32.15/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400
13248+++ linux-2.6.32.14/arch/x86/kernel/signal.c 2010-05-28 21:27:15.062911922 -0400 13248+++ linux-2.6.32.15/arch/x86/kernel/signal.c 2010-05-28 21:27:15.062911922 -0400
13249@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi 13249@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
13250 * Align the stack pointer according to the i386 ABI, 13250 * Align the stack pointer according to the i386 ABI,
13251 * i.e. so that on function entry ((sp + 4) & 15) == 0. 13251 * i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -13317,9 +13317,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/signal.c linux-2.6.32.14/arch/x86/ker
13317 return; 13317 return;
13318 13318
13319 if (current_thread_info()->status & TS_RESTORE_SIGMASK) 13319 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
13320diff -urNp linux-2.6.32.14/arch/x86/kernel/smpboot.c linux-2.6.32.14/arch/x86/kernel/smpboot.c 13320diff -urNp linux-2.6.32.15/arch/x86/kernel/smpboot.c linux-2.6.32.15/arch/x86/kernel/smpboot.c
13321--- linux-2.6.32.14/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400 13321--- linux-2.6.32.15/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400
13322+++ linux-2.6.32.14/arch/x86/kernel/smpboot.c 2010-05-28 21:27:15.062911922 -0400 13322+++ linux-2.6.32.15/arch/x86/kernel/smpboot.c 2010-05-28 21:27:15.062911922 -0400
13323@@ -729,7 +729,11 @@ do_rest: 13323@@ -729,7 +729,11 @@ do_rest:
13324 (unsigned long)task_stack_page(c_idle.idle) - 13324 (unsigned long)task_stack_page(c_idle.idle) -
13325 KERNEL_STACK_OFFSET + THREAD_SIZE; 13325 KERNEL_STACK_OFFSET + THREAD_SIZE;
@@ -13345,9 +13345,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/smpboot.c linux-2.6.32.14/arch/x86/ke
13345 #ifdef CONFIG_X86_32 13345 #ifdef CONFIG_X86_32
13346 /* init low mem mapping */ 13346 /* init low mem mapping */
13347 clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, 13347 clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
13348diff -urNp linux-2.6.32.14/arch/x86/kernel/step.c linux-2.6.32.14/arch/x86/kernel/step.c 13348diff -urNp linux-2.6.32.15/arch/x86/kernel/step.c linux-2.6.32.15/arch/x86/kernel/step.c
13349--- linux-2.6.32.14/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400 13349--- linux-2.6.32.15/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400
13350+++ linux-2.6.32.14/arch/x86/kernel/step.c 2010-05-28 21:27:15.062911922 -0400 13350+++ linux-2.6.32.15/arch/x86/kernel/step.c 2010-05-28 21:27:15.062911922 -0400
13351@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc 13351@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
13352 struct desc_struct *desc; 13352 struct desc_struct *desc;
13353 unsigned long base; 13353 unsigned long base;
@@ -13380,17 +13380,17 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/step.c linux-2.6.32.14/arch/x86/kerne
13380 /* 32-bit mode: register increment */ 13380 /* 32-bit mode: register increment */
13381 return 0; 13381 return 0;
13382 /* 64-bit mode: REX prefix */ 13382 /* 64-bit mode: REX prefix */
13383diff -urNp linux-2.6.32.14/arch/x86/kernel/syscall_table_32.S linux-2.6.32.14/arch/x86/kernel/syscall_table_32.S 13383diff -urNp linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S
13384--- linux-2.6.32.14/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400 13384--- linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400
13385+++ linux-2.6.32.14/arch/x86/kernel/syscall_table_32.S 2010-05-28 21:27:15.062911922 -0400 13385+++ linux-2.6.32.15/arch/x86/kernel/syscall_table_32.S 2010-05-28 21:27:15.062911922 -0400
13386@@ -1,3 +1,4 @@ 13386@@ -1,3 +1,4 @@
13387+.section .rodata,"a",@progbits 13387+.section .rodata,"a",@progbits
13388 ENTRY(sys_call_table) 13388 ENTRY(sys_call_table)
13389 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ 13389 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
13390 .long sys_exit 13390 .long sys_exit
13391diff -urNp linux-2.6.32.14/arch/x86/kernel/sys_i386_32.c linux-2.6.32.14/arch/x86/kernel/sys_i386_32.c 13391diff -urNp linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c
13392--- linux-2.6.32.14/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400 13392--- linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400
13393+++ linux-2.6.32.14/arch/x86/kernel/sys_i386_32.c 2010-05-28 21:27:15.062911922 -0400 13393+++ linux-2.6.32.15/arch/x86/kernel/sys_i386_32.c 2010-05-28 21:27:15.062911922 -0400
13394@@ -24,6 +24,21 @@ 13394@@ -24,6 +24,21 @@
13395 13395
13396 #include <asm/syscalls.h> 13396 #include <asm/syscalls.h>
@@ -13637,9 +13637,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/sys_i386_32.c linux-2.6.32.14/arch/x8
13637 } 13637 }
13638 case 1: /* iBCS2 emulator entry point */ 13638 case 1: /* iBCS2 emulator entry point */
13639 if (!segment_eq(get_fs(), get_ds())) 13639 if (!segment_eq(get_fs(), get_ds()))
13640diff -urNp linux-2.6.32.14/arch/x86/kernel/sys_x86_64.c linux-2.6.32.14/arch/x86/kernel/sys_x86_64.c 13640diff -urNp linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c
13641--- linux-2.6.32.14/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400 13641--- linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400
13642+++ linux-2.6.32.14/arch/x86/kernel/sys_x86_64.c 2010-05-28 21:27:15.062911922 -0400 13642+++ linux-2.6.32.15/arch/x86/kernel/sys_x86_64.c 2010-05-28 21:27:15.062911922 -0400
13643@@ -32,8 +32,8 @@ out: 13643@@ -32,8 +32,8 @@ out:
13644 return error; 13644 return error;
13645 } 13645 }
@@ -13721,9 +13721,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/sys_x86_64.c linux-2.6.32.14/arch/x86
13721 mm->cached_hole_size = ~0UL; 13721 mm->cached_hole_size = ~0UL;
13722 13722
13723 return addr; 13723 return addr;
13724diff -urNp linux-2.6.32.14/arch/x86/kernel/time.c linux-2.6.32.14/arch/x86/kernel/time.c 13724diff -urNp linux-2.6.32.15/arch/x86/kernel/time.c linux-2.6.32.15/arch/x86/kernel/time.c
13725--- linux-2.6.32.14/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 13725--- linux-2.6.32.15/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400
13726+++ linux-2.6.32.14/arch/x86/kernel/time.c 2010-05-28 21:27:15.062911922 -0400 13726+++ linux-2.6.32.15/arch/x86/kernel/time.c 2010-05-28 21:27:15.062911922 -0400
13727@@ -26,17 +26,13 @@ 13727@@ -26,17 +26,13 @@
13728 int timer_ack; 13728 int timer_ack;
13729 #endif 13729 #endif
@@ -13762,9 +13762,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/time.c linux-2.6.32.14/arch/x86/kerne
13762 } 13762 }
13763 return pc; 13763 return pc;
13764 } 13764 }
13765diff -urNp linux-2.6.32.14/arch/x86/kernel/tls.c linux-2.6.32.14/arch/x86/kernel/tls.c 13765diff -urNp linux-2.6.32.15/arch/x86/kernel/tls.c linux-2.6.32.15/arch/x86/kernel/tls.c
13766--- linux-2.6.32.14/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400 13766--- linux-2.6.32.15/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400
13767+++ linux-2.6.32.14/arch/x86/kernel/tls.c 2010-05-28 21:27:15.062911922 -0400 13767+++ linux-2.6.32.15/arch/x86/kernel/tls.c 2010-05-28 21:27:15.062911922 -0400
13768@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc 13768@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
13769 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) 13769 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
13770 return -EINVAL; 13770 return -EINVAL;
@@ -13777,9 +13777,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/tls.c linux-2.6.32.14/arch/x86/kernel
13777 set_tls_desc(p, idx, &info, 1); 13777 set_tls_desc(p, idx, &info, 1);
13778 13778
13779 return 0; 13779 return 0;
13780diff -urNp linux-2.6.32.14/arch/x86/kernel/trampoline_32.S linux-2.6.32.14/arch/x86/kernel/trampoline_32.S 13780diff -urNp linux-2.6.32.15/arch/x86/kernel/trampoline_32.S linux-2.6.32.15/arch/x86/kernel/trampoline_32.S
13781--- linux-2.6.32.14/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400 13781--- linux-2.6.32.15/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400
13782+++ linux-2.6.32.14/arch/x86/kernel/trampoline_32.S 2010-05-28 21:27:15.062911922 -0400 13782+++ linux-2.6.32.15/arch/x86/kernel/trampoline_32.S 2010-05-28 21:27:15.062911922 -0400
13783@@ -32,6 +32,12 @@ 13783@@ -32,6 +32,12 @@
13784 #include <asm/segment.h> 13784 #include <asm/segment.h>
13785 #include <asm/page_types.h> 13785 #include <asm/page_types.h>
@@ -13802,9 +13802,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/trampoline_32.S linux-2.6.32.14/arch/
13802 13802
13803 # These need to be in the same 64K segment as the above; 13803 # These need to be in the same 64K segment as the above;
13804 # hence we don't use the boot_gdt_descr defined in head.S 13804 # hence we don't use the boot_gdt_descr defined in head.S
13805diff -urNp linux-2.6.32.14/arch/x86/kernel/traps.c linux-2.6.32.14/arch/x86/kernel/traps.c 13805diff -urNp linux-2.6.32.15/arch/x86/kernel/traps.c linux-2.6.32.15/arch/x86/kernel/traps.c
13806--- linux-2.6.32.14/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 13806--- linux-2.6.32.15/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
13807+++ linux-2.6.32.14/arch/x86/kernel/traps.c 2010-05-28 21:27:15.067055592 -0400 13807+++ linux-2.6.32.15/arch/x86/kernel/traps.c 2010-05-28 21:27:15.067055592 -0400
13808@@ -69,12 +69,6 @@ asmlinkage int system_call(void); 13808@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
13809 13809
13810 /* Do we ignore FPU interrupts ? */ 13810 /* Do we ignore FPU interrupts ? */
@@ -13954,9 +13954,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/traps.c linux-2.6.32.14/arch/x86/kern
13954 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); 13954 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
13955 return; 13955 return;
13956 } 13956 }
13957diff -urNp linux-2.6.32.14/arch/x86/kernel/tsc.c linux-2.6.32.14/arch/x86/kernel/tsc.c 13957diff -urNp linux-2.6.32.15/arch/x86/kernel/tsc.c linux-2.6.32.15/arch/x86/kernel/tsc.c
13958--- linux-2.6.32.14/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400 13958--- linux-2.6.32.15/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400
13959+++ linux-2.6.32.14/arch/x86/kernel/tsc.c 2010-05-28 21:27:15.067055592 -0400 13959+++ linux-2.6.32.15/arch/x86/kernel/tsc.c 2010-05-28 21:27:15.067055592 -0400
13960@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b 13960@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b
13961 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), 13961 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
13962 }, 13962 },
@@ -13966,9 +13966,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/tsc.c linux-2.6.32.14/arch/x86/kernel
13966 }; 13966 };
13967 13967
13968 static void __init check_system_tsc_reliable(void) 13968 static void __init check_system_tsc_reliable(void)
13969diff -urNp linux-2.6.32.14/arch/x86/kernel/vm86_32.c linux-2.6.32.14/arch/x86/kernel/vm86_32.c 13969diff -urNp linux-2.6.32.15/arch/x86/kernel/vm86_32.c linux-2.6.32.15/arch/x86/kernel/vm86_32.c
13970--- linux-2.6.32.14/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400 13970--- linux-2.6.32.15/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400
13971+++ linux-2.6.32.14/arch/x86/kernel/vm86_32.c 2010-05-28 21:27:15.067055592 -0400 13971+++ linux-2.6.32.15/arch/x86/kernel/vm86_32.c 2010-05-28 21:27:15.067055592 -0400
13972@@ -41,6 +41,7 @@ 13972@@ -41,6 +41,7 @@
13973 #include <linux/ptrace.h> 13973 #include <linux/ptrace.h>
13974 #include <linux/audit.h> 13974 #include <linux/audit.h>
@@ -14033,9 +14033,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/vm86_32.c linux-2.6.32.14/arch/x86/ke
14033 if (get_user(segoffs, intr_ptr)) 14033 if (get_user(segoffs, intr_ptr))
14034 goto cannot_handle; 14034 goto cannot_handle;
14035 if ((segoffs >> 16) == BIOSSEG) 14035 if ((segoffs >> 16) == BIOSSEG)
14036diff -urNp linux-2.6.32.14/arch/x86/kernel/vmi_32.c linux-2.6.32.14/arch/x86/kernel/vmi_32.c 14036diff -urNp linux-2.6.32.15/arch/x86/kernel/vmi_32.c linux-2.6.32.15/arch/x86/kernel/vmi_32.c
14037--- linux-2.6.32.14/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400 14037--- linux-2.6.32.15/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400
14038+++ linux-2.6.32.14/arch/x86/kernel/vmi_32.c 2010-05-28 21:27:15.067055592 -0400 14038+++ linux-2.6.32.15/arch/x86/kernel/vmi_32.c 2010-05-28 21:27:15.067055592 -0400
14039@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) 14039@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
14040 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); 14040 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
14041 14041
@@ -14195,9 +14195,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/vmi_32.c linux-2.6.32.14/arch/x86/ker
14195 return; 14195 return;
14196 14196
14197 local_irq_save(flags); 14197 local_irq_save(flags);
14198diff -urNp linux-2.6.32.14/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.14/arch/x86/kernel/vmlinux.lds.S 14198diff -urNp linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S
14199--- linux-2.6.32.14/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 14199--- linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
14200+++ linux-2.6.32.14/arch/x86/kernel/vmlinux.lds.S 2010-05-28 21:27:15.067055592 -0400 14200+++ linux-2.6.32.15/arch/x86/kernel/vmlinux.lds.S 2010-05-28 21:27:15.067055592 -0400
14201@@ -26,6 +26,22 @@ 14201@@ -26,6 +26,22 @@
14202 #include <asm/page_types.h> 14202 #include <asm/page_types.h>
14203 #include <asm/cache.h> 14203 #include <asm/cache.h>
@@ -14485,9 +14485,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.14/arch/x8
14485 "kernel image bigger than KERNEL_IMAGE_SIZE"); 14485 "kernel image bigger than KERNEL_IMAGE_SIZE");
14486 14486
14487 #ifdef CONFIG_SMP 14487 #ifdef CONFIG_SMP
14488diff -urNp linux-2.6.32.14/arch/x86/kernel/vsyscall_64.c linux-2.6.32.14/arch/x86/kernel/vsyscall_64.c 14488diff -urNp linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c
14489--- linux-2.6.32.14/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400 14489--- linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400
14490+++ linux-2.6.32.14/arch/x86/kernel/vsyscall_64.c 2010-05-28 21:27:15.067055592 -0400 14490+++ linux-2.6.32.15/arch/x86/kernel/vsyscall_64.c 2010-05-28 21:27:15.067055592 -0400
14491@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa 14491@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa
14492 14492
14493 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); 14493 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -14521,9 +14521,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/vsyscall_64.c linux-2.6.32.14/arch/x8
14521 }; 14521 };
14522 #endif 14522 #endif
14523 14523
14524diff -urNp linux-2.6.32.14/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.14/arch/x86/kernel/x8664_ksyms_64.c 14524diff -urNp linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c
14525--- linux-2.6.32.14/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400 14525--- linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400
14526+++ linux-2.6.32.14/arch/x86/kernel/x8664_ksyms_64.c 2010-05-28 21:27:15.067055592 -0400 14526+++ linux-2.6.32.15/arch/x86/kernel/x8664_ksyms_64.c 2010-05-28 21:27:15.067055592 -0400
14527@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); 14527@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
14528 14528
14529 EXPORT_SYMBOL(copy_user_generic); 14529 EXPORT_SYMBOL(copy_user_generic);
@@ -14533,9 +14533,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.14/arch
14533 EXPORT_SYMBOL(__copy_from_user_inatomic); 14533 EXPORT_SYMBOL(__copy_from_user_inatomic);
14534 14534
14535 EXPORT_SYMBOL(copy_page); 14535 EXPORT_SYMBOL(copy_page);
14536diff -urNp linux-2.6.32.14/arch/x86/kernel/xsave.c linux-2.6.32.14/arch/x86/kernel/xsave.c 14536diff -urNp linux-2.6.32.15/arch/x86/kernel/xsave.c linux-2.6.32.15/arch/x86/kernel/xsave.c
14537--- linux-2.6.32.14/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400 14537--- linux-2.6.32.15/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400
14538+++ linux-2.6.32.14/arch/x86/kernel/xsave.c 2010-05-28 21:27:15.067055592 -0400 14538+++ linux-2.6.32.15/arch/x86/kernel/xsave.c 2010-05-28 21:27:15.067055592 -0400
14539@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ 14539@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
14540 fx_sw_user->xstate_size > fx_sw_user->extended_size) 14540 fx_sw_user->xstate_size > fx_sw_user->extended_size)
14541 return -1; 14541 return -1;
@@ -14563,9 +14563,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kernel/xsave.c linux-2.6.32.14/arch/x86/kern
14563 buf); 14563 buf);
14564 if (unlikely(err)) { 14564 if (unlikely(err)) {
14565 /* 14565 /*
14566diff -urNp linux-2.6.32.14/arch/x86/kvm/emulate.c linux-2.6.32.14/arch/x86/kvm/emulate.c 14566diff -urNp linux-2.6.32.15/arch/x86/kvm/emulate.c linux-2.6.32.15/arch/x86/kvm/emulate.c
14567--- linux-2.6.32.14/arch/x86/kvm/emulate.c 2010-04-29 17:49:37.541027029 -0400 14567--- linux-2.6.32.15/arch/x86/kvm/emulate.c 2010-04-29 17:49:37.541027029 -0400
14568+++ linux-2.6.32.14/arch/x86/kvm/emulate.c 2010-05-28 21:27:15.086896808 -0400 14568+++ linux-2.6.32.15/arch/x86/kvm/emulate.c 2010-05-28 21:27:15.086896808 -0400
14569@@ -81,8 +81,8 @@ 14569@@ -81,8 +81,8 @@
14570 #define Src2CL (1<<29) 14570 #define Src2CL (1<<29)
14571 #define Src2ImmByte (2<<29) 14571 #define Src2ImmByte (2<<29)
@@ -14602,9 +14602,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kvm/emulate.c linux-2.6.32.14/arch/x86/kvm/e
14602 switch ((_dst).bytes) { \ 14602 switch ((_dst).bytes) { \
14603 case 1: \ 14603 case 1: \
14604 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ 14604 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
14605diff -urNp linux-2.6.32.14/arch/x86/kvm/lapic.c linux-2.6.32.14/arch/x86/kvm/lapic.c 14605diff -urNp linux-2.6.32.15/arch/x86/kvm/lapic.c linux-2.6.32.15/arch/x86/kvm/lapic.c
14606--- linux-2.6.32.14/arch/x86/kvm/lapic.c 2010-03-15 11:52:04.000000000 -0400 14606--- linux-2.6.32.15/arch/x86/kvm/lapic.c 2010-03-15 11:52:04.000000000 -0400
14607+++ linux-2.6.32.14/arch/x86/kvm/lapic.c 2010-05-28 21:27:15.086896808 -0400 14607+++ linux-2.6.32.15/arch/x86/kvm/lapic.c 2010-05-28 21:27:15.086896808 -0400
14608@@ -52,7 +52,7 @@ 14608@@ -52,7 +52,7 @@
14609 #define APIC_BUS_CYCLE_NS 1 14609 #define APIC_BUS_CYCLE_NS 1
14610 14610
@@ -14614,9 +14614,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kvm/lapic.c linux-2.6.32.14/arch/x86/kvm/lap
14614 14614
14615 #define APIC_LVT_NUM 6 14615 #define APIC_LVT_NUM 6
14616 /* 14 is the version for Xeon and Pentium 8.4.8*/ 14616 /* 14 is the version for Xeon and Pentium 8.4.8*/
14617diff -urNp linux-2.6.32.14/arch/x86/kvm/svm.c linux-2.6.32.14/arch/x86/kvm/svm.c 14617diff -urNp linux-2.6.32.15/arch/x86/kvm/svm.c linux-2.6.32.15/arch/x86/kvm/svm.c
14618--- linux-2.6.32.14/arch/x86/kvm/svm.c 2010-04-29 17:49:37.601044544 -0400 14618--- linux-2.6.32.15/arch/x86/kvm/svm.c 2010-04-29 17:49:37.601044544 -0400
14619+++ linux-2.6.32.14/arch/x86/kvm/svm.c 2010-05-28 21:27:15.086896808 -0400 14619+++ linux-2.6.32.15/arch/x86/kvm/svm.c 2010-05-28 21:27:15.086896808 -0400
14620@@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k 14620@@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k
14621 static void reload_tss(struct kvm_vcpu *vcpu) 14621 static void reload_tss(struct kvm_vcpu *vcpu)
14622 { 14622 {
@@ -14640,9 +14640,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kvm/svm.c linux-2.6.32.14/arch/x86/kvm/svm.c
14640 .cpu_has_kvm_support = has_svm, 14640 .cpu_has_kvm_support = has_svm,
14641 .disabled_by_bios = is_disabled, 14641 .disabled_by_bios = is_disabled,
14642 .hardware_setup = svm_hardware_setup, 14642 .hardware_setup = svm_hardware_setup,
14643diff -urNp linux-2.6.32.14/arch/x86/kvm/vmx.c linux-2.6.32.14/arch/x86/kvm/vmx.c 14643diff -urNp linux-2.6.32.15/arch/x86/kvm/vmx.c linux-2.6.32.15/arch/x86/kvm/vmx.c
14644--- linux-2.6.32.14/arch/x86/kvm/vmx.c 2010-04-29 17:49:37.601044544 -0400 14644--- linux-2.6.32.15/arch/x86/kvm/vmx.c 2010-04-29 17:49:37.601044544 -0400
14645+++ linux-2.6.32.14/arch/x86/kvm/vmx.c 2010-05-28 21:27:15.091170095 -0400 14645+++ linux-2.6.32.15/arch/x86/kvm/vmx.c 2010-05-28 21:27:15.091170095 -0400
14646@@ -568,7 +568,11 @@ static void reload_tss(void) 14646@@ -568,7 +568,11 @@ static void reload_tss(void)
14647 14647
14648 kvm_get_gdt(&gdt); 14648 kvm_get_gdt(&gdt);
@@ -14724,9 +14724,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kvm/vmx.c linux-2.6.32.14/arch/x86/kvm/vmx.c
14724 .cpu_has_kvm_support = cpu_has_kvm_support, 14724 .cpu_has_kvm_support = cpu_has_kvm_support,
14725 .disabled_by_bios = vmx_disabled_by_bios, 14725 .disabled_by_bios = vmx_disabled_by_bios,
14726 .hardware_setup = hardware_setup, 14726 .hardware_setup = hardware_setup,
14727diff -urNp linux-2.6.32.14/arch/x86/kvm/x86.c linux-2.6.32.14/arch/x86/kvm/x86.c 14727diff -urNp linux-2.6.32.15/arch/x86/kvm/x86.c linux-2.6.32.15/arch/x86/kvm/x86.c
14728--- linux-2.6.32.14/arch/x86/kvm/x86.c 2010-05-15 13:20:18.454567530 -0400 14728--- linux-2.6.32.15/arch/x86/kvm/x86.c 2010-05-15 13:20:18.454567530 -0400
14729+++ linux-2.6.32.14/arch/x86/kvm/x86.c 2010-05-28 21:27:15.095006556 -0400 14729+++ linux-2.6.32.15/arch/x86/kvm/x86.c 2010-05-28 21:27:15.095006556 -0400
14730@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct 14730@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct
14731 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, 14731 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
14732 struct kvm_cpuid_entry2 __user *entries); 14732 struct kvm_cpuid_entry2 __user *entries);
@@ -14828,9 +14828,9 @@ diff -urNp linux-2.6.32.14/arch/x86/kvm/x86.c linux-2.6.32.14/arch/x86/kvm/x86.c
14828 14828
14829 if (kvm_x86_ops) { 14829 if (kvm_x86_ops) {
14830 printk(KERN_ERR "kvm: already loaded the other module\n"); 14830 printk(KERN_ERR "kvm: already loaded the other module\n");
14831diff -urNp linux-2.6.32.14/arch/x86/lib/checksum_32.S linux-2.6.32.14/arch/x86/lib/checksum_32.S 14831diff -urNp linux-2.6.32.15/arch/x86/lib/checksum_32.S linux-2.6.32.15/arch/x86/lib/checksum_32.S
14832--- linux-2.6.32.14/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400 14832--- linux-2.6.32.15/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400
14833+++ linux-2.6.32.14/arch/x86/lib/checksum_32.S 2010-05-28 21:27:15.095006556 -0400 14833+++ linux-2.6.32.15/arch/x86/lib/checksum_32.S 2010-05-28 21:27:15.095006556 -0400
14834@@ -28,7 +28,8 @@ 14834@@ -28,7 +28,8 @@
14835 #include <linux/linkage.h> 14835 #include <linux/linkage.h>
14836 #include <asm/dwarf2.h> 14836 #include <asm/dwarf2.h>
@@ -15076,9 +15076,9 @@ diff -urNp linux-2.6.32.14/arch/x86/lib/checksum_32.S linux-2.6.32.14/arch/x86/l
15076 15076
15077 #undef ROUND 15077 #undef ROUND
15078 #undef ROUND1 15078 #undef ROUND1
15079diff -urNp linux-2.6.32.14/arch/x86/lib/clear_page_64.S linux-2.6.32.14/arch/x86/lib/clear_page_64.S 15079diff -urNp linux-2.6.32.15/arch/x86/lib/clear_page_64.S linux-2.6.32.15/arch/x86/lib/clear_page_64.S
15080--- linux-2.6.32.14/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400 15080--- linux-2.6.32.15/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400
15081+++ linux-2.6.32.14/arch/x86/lib/clear_page_64.S 2010-05-28 21:27:15.095006556 -0400 15081+++ linux-2.6.32.15/arch/x86/lib/clear_page_64.S 2010-05-28 21:27:15.095006556 -0400
15082@@ -43,7 +43,7 @@ ENDPROC(clear_page) 15082@@ -43,7 +43,7 @@ ENDPROC(clear_page)
15083 15083
15084 #include <asm/cpufeature.h> 15084 #include <asm/cpufeature.h>
@@ -15088,9 +15088,9 @@ diff -urNp linux-2.6.32.14/arch/x86/lib/clear_page_64.S linux-2.6.32.14/arch/x86
15088 1: .byte 0xeb /* jmp <disp8> */ 15088 1: .byte 0xeb /* jmp <disp8> */
15089 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 15089 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
15090 2: 15090 2:
15091diff -urNp linux-2.6.32.14/arch/x86/lib/copy_page_64.S linux-2.6.32.14/arch/x86/lib/copy_page_64.S 15091diff -urNp linux-2.6.32.15/arch/x86/lib/copy_page_64.S linux-2.6.32.15/arch/x86/lib/copy_page_64.S
15092--- linux-2.6.32.14/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400 15092--- linux-2.6.32.15/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400
15093+++ linux-2.6.32.14/arch/x86/lib/copy_page_64.S 2010-05-28 21:27:15.095006556 -0400 15093+++ linux-2.6.32.15/arch/x86/lib/copy_page_64.S 2010-05-28 21:27:15.095006556 -0400
15094@@ -104,7 +104,7 @@ ENDPROC(copy_page) 15094@@ -104,7 +104,7 @@ ENDPROC(copy_page)
15095 15095
15096 #include <asm/cpufeature.h> 15096 #include <asm/cpufeature.h>
@@ -15100,9 +15100,9 @@ diff -urNp linux-2.6.32.14/arch/x86/lib/copy_page_64.S linux-2.6.32.14/arch/x86/
15100 1: .byte 0xeb /* jmp <disp8> */ 15100 1: .byte 0xeb /* jmp <disp8> */
15101 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 15101 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
15102 2: 15102 2:
15103diff -urNp linux-2.6.32.14/arch/x86/lib/copy_user_64.S linux-2.6.32.14/arch/x86/lib/copy_user_64.S 15103diff -urNp linux-2.6.32.15/arch/x86/lib/copy_user_64.S linux-2.6.32.15/arch/x86/lib/copy_user_64.S
15104--- linux-2.6.32.14/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400 15104--- linux-2.6.32.15/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400
15105+++ linux-2.6.32.14/arch/x86/lib/copy_user_64.S 2010-05-28 21:27:15.095006556 -0400 15105+++ linux-2.6.32.15/arch/x86/lib/copy_user_64.S 2010-05-28 21:27:15.095006556 -0400
15106@@ -15,13 +15,14 @@ 15106@@ -15,13 +15,14 @@
15107 #include <asm/asm-offsets.h> 15107 #include <asm/asm-offsets.h>
15108 #include <asm/thread_info.h> 15108 #include <asm/thread_info.h>
@@ -15177,9 +15177,9 @@ diff -urNp linux-2.6.32.14/arch/x86/lib/copy_user_64.S linux-2.6.32.14/arch/x86/
15177 movl %edx,%ecx 15177 movl %edx,%ecx
15178 xorl %eax,%eax 15178 xorl %eax,%eax
15179 rep 15179 rep
15180diff -urNp linux-2.6.32.14/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.14/arch/x86/lib/copy_user_nocache_64.S 15180diff -urNp linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S
15181--- linux-2.6.32.14/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400 15181--- linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400
15182+++ linux-2.6.32.14/arch/x86/lib/copy_user_nocache_64.S 2010-05-28 21:27:15.095006556 -0400 15182+++ linux-2.6.32.15/arch/x86/lib/copy_user_nocache_64.S 2010-05-28 21:27:15.095006556 -0400
15183@@ -14,6 +14,7 @@ 15183@@ -14,6 +14,7 @@
15184 #include <asm/current.h> 15184 #include <asm/current.h>
15185 #include <asm/asm-offsets.h> 15185 #include <asm/asm-offsets.h>
@@ -15204,9 +15204,9 @@ diff -urNp linux-2.6.32.14/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.14/a
15204 cmpl $8,%edx 15204 cmpl $8,%edx
15205 jb 20f /* less then 8 bytes, go to byte copy loop */ 15205 jb 20f /* less then 8 bytes, go to byte copy loop */
15206 ALIGN_DESTINATION 15206 ALIGN_DESTINATION
15207diff -urNp linux-2.6.32.14/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.14/arch/x86/lib/csum-wrappers_64.c 15207diff -urNp linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c
15208--- linux-2.6.32.14/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400 15208--- linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400
15209+++ linux-2.6.32.14/arch/x86/lib/csum-wrappers_64.c 2010-05-28 21:27:15.095006556 -0400 15209+++ linux-2.6.32.15/arch/x86/lib/csum-wrappers_64.c 2010-05-28 21:27:15.095006556 -0400
15210@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ 15210@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
15211 len -= 2; 15211 len -= 2;
15212 } 15212 }
@@ -15225,9 +15225,9 @@ diff -urNp linux-2.6.32.14/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.14/arch/
15225 return csum_partial_copy_generic(src, (void __force *)dst, 15225 return csum_partial_copy_generic(src, (void __force *)dst,
15226 len, isum, NULL, errp); 15226 len, isum, NULL, errp);
15227 } 15227 }
15228diff -urNp linux-2.6.32.14/arch/x86/lib/getuser.S linux-2.6.32.14/arch/x86/lib/getuser.S 15228diff -urNp linux-2.6.32.15/arch/x86/lib/getuser.S linux-2.6.32.15/arch/x86/lib/getuser.S
15229--- linux-2.6.32.14/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400 15229--- linux-2.6.32.15/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400
15230+++ linux-2.6.32.14/arch/x86/lib/getuser.S 2010-05-28 21:27:15.095006556 -0400 15230+++ linux-2.6.32.15/arch/x86/lib/getuser.S 2010-05-28 21:27:15.095006556 -0400
15231@@ -33,14 +33,38 @@ 15231@@ -33,14 +33,38 @@
15232 #include <asm/asm-offsets.h> 15232 #include <asm/asm-offsets.h>
15233 #include <asm/thread_info.h> 15233 #include <asm/thread_info.h>
@@ -15364,9 +15364,9 @@ diff -urNp linux-2.6.32.14/arch/x86/lib/getuser.S linux-2.6.32.14/arch/x86/lib/g
15364 xor %edx,%edx 15364 xor %edx,%edx
15365 mov $(-EFAULT),%_ASM_AX 15365 mov $(-EFAULT),%_ASM_AX
15366 ret 15366 ret
15367diff -urNp linux-2.6.32.14/arch/x86/lib/memcpy_64.S linux-2.6.32.14/arch/x86/lib/memcpy_64.S 15367diff -urNp linux-2.6.32.15/arch/x86/lib/memcpy_64.S linux-2.6.32.15/arch/x86/lib/memcpy_64.S
15368--- linux-2.6.32.14/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400 15368--- linux-2.6.32.15/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400
15369+++ linux-2.6.32.14/arch/x86/lib/memcpy_64.S 2010-05-28 21:27:15.095006556 -0400 15369+++ linux-2.6.32.15/arch/x86/lib/memcpy_64.S 2010-05-28 21:27:15.095006556 -0400
15370@@ -128,7 +128,7 @@ ENDPROC(__memcpy) 15370@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
15371 * It is also a lot simpler. Use this when possible: 15371 * It is also a lot simpler. Use this when possible:
15372 */ 15372 */
@@ -15376,9 +15376,9 @@ diff -urNp linux-2.6.32.14/arch/x86/lib/memcpy_64.S linux-2.6.32.14/arch/x86/lib
15376 1: .byte 0xeb /* jmp <disp8> */ 15376 1: .byte 0xeb /* jmp <disp8> */
15377 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 15377 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
15378 2: 15378 2:
15379diff -urNp linux-2.6.32.14/arch/x86/lib/memset_64.S linux-2.6.32.14/arch/x86/lib/memset_64.S 15379diff -urNp linux-2.6.32.15/arch/x86/lib/memset_64.S linux-2.6.32.15/arch/x86/lib/memset_64.S
15380--- linux-2.6.32.14/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400 15380--- linux-2.6.32.15/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400
15381+++ linux-2.6.32.14/arch/x86/lib/memset_64.S 2010-05-28 21:27:15.095006556 -0400 15381+++ linux-2.6.32.15/arch/x86/lib/memset_64.S 2010-05-28 21:27:15.095006556 -0400
15382@@ -118,7 +118,7 @@ ENDPROC(__memset) 15382@@ -118,7 +118,7 @@ ENDPROC(__memset)
15383 15383
15384 #include <asm/cpufeature.h> 15384 #include <asm/cpufeature.h>
@@ -15388,9 +15388,9 @@ diff -urNp linux-2.6.32.14/arch/x86/lib/memset_64.S linux-2.6.32.14/arch/x86/lib
15388 1: .byte 0xeb /* jmp <disp8> */ 15388 1: .byte 0xeb /* jmp <disp8> */
15389 .byte (memset_c - memset) - (2f - 1b) /* offset */ 15389 .byte (memset_c - memset) - (2f - 1b) /* offset */
15390 2: 15390 2:
15391diff -urNp linux-2.6.32.14/arch/x86/lib/mmx_32.c linux-2.6.32.14/arch/x86/lib/mmx_32.c 15391diff -urNp linux-2.6.32.15/arch/x86/lib/mmx_32.c linux-2.6.32.15/arch/x86/lib/mmx_32.c
15392--- linux-2.6.32.14/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400 15392--- linux-2.6.32.15/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400
15393+++ linux-2.6.32.14/arch/x86/lib/mmx_32.c 2010-05-28 21:27:15.095006556 -0400 15393+++ linux-2.6.32.15/arch/x86/lib/mmx_32.c 2010-05-28 21:27:15.095006556 -0400
15394@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * 15394@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
15395 { 15395 {
15396 void *p; 15396 void *p;
@@ -15706,9 +15706,9 @@ diff -urNp linux-2.6.32.14/arch/x86/lib/mmx_32.c linux-2.6.32.14/arch/x86/lib/mm
15706 15706
15707 from += 64; 15707 from += 64;
15708 to += 64; 15708 to += 64;
15709diff -urNp linux-2.6.32.14/arch/x86/lib/putuser.S linux-2.6.32.14/arch/x86/lib/putuser.S 15709diff -urNp linux-2.6.32.15/arch/x86/lib/putuser.S linux-2.6.32.15/arch/x86/lib/putuser.S
15710--- linux-2.6.32.14/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400 15710--- linux-2.6.32.15/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400
15711+++ linux-2.6.32.14/arch/x86/lib/putuser.S 2010-05-28 21:27:15.095006556 -0400 15711+++ linux-2.6.32.15/arch/x86/lib/putuser.S 2010-05-28 21:27:15.095006556 -0400
15712@@ -15,7 +15,8 @@ 15712@@ -15,7 +15,8 @@
15713 #include <asm/thread_info.h> 15713 #include <asm/thread_info.h>
15714 #include <asm/errno.h> 15714 #include <asm/errno.h>
@@ -15878,9 +15878,9 @@ diff -urNp linux-2.6.32.14/arch/x86/lib/putuser.S linux-2.6.32.14/arch/x86/lib/p
15878 movl $-EFAULT,%eax 15878 movl $-EFAULT,%eax
15879 EXIT 15879 EXIT
15880 END(bad_put_user) 15880 END(bad_put_user)
15881diff -urNp linux-2.6.32.14/arch/x86/lib/usercopy_32.c linux-2.6.32.14/arch/x86/lib/usercopy_32.c 15881diff -urNp linux-2.6.32.15/arch/x86/lib/usercopy_32.c linux-2.6.32.15/arch/x86/lib/usercopy_32.c
15882--- linux-2.6.32.14/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400 15882--- linux-2.6.32.15/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400
15883+++ linux-2.6.32.14/arch/x86/lib/usercopy_32.c 2010-05-28 21:27:15.107152206 -0400 15883+++ linux-2.6.32.15/arch/x86/lib/usercopy_32.c 2010-05-28 21:27:15.107152206 -0400
15884@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned 15884@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
15885 * Copy a null terminated string from userspace. 15885 * Copy a null terminated string from userspace.
15886 */ 15886 */
@@ -16849,9 +16849,9 @@ diff -urNp linux-2.6.32.14/arch/x86/lib/usercopy_32.c linux-2.6.32.14/arch/x86/l
16849+#endif 16849+#endif
16850+ 16850+
16851+EXPORT_SYMBOL(set_fs); 16851+EXPORT_SYMBOL(set_fs);
16852diff -urNp linux-2.6.32.14/arch/x86/lib/usercopy_64.c linux-2.6.32.14/arch/x86/lib/usercopy_64.c 16852diff -urNp linux-2.6.32.15/arch/x86/lib/usercopy_64.c linux-2.6.32.15/arch/x86/lib/usercopy_64.c
16853--- linux-2.6.32.14/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 16853--- linux-2.6.32.15/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
16854+++ linux-2.6.32.14/arch/x86/lib/usercopy_64.c 2010-05-28 21:27:15.107152206 -0400 16854+++ linux-2.6.32.15/arch/x86/lib/usercopy_64.c 2010-05-28 21:27:15.107152206 -0400
16855@@ -42,6 +42,8 @@ long 16855@@ -42,6 +42,8 @@ long
16856 __strncpy_from_user(char *dst, const char __user *src, long count) 16856 __strncpy_from_user(char *dst, const char __user *src, long count)
16857 { 16857 {
@@ -16888,9 +16888,9 @@ diff -urNp linux-2.6.32.14/arch/x86/lib/usercopy_64.c linux-2.6.32.14/arch/x86/l
16888 } 16888 }
16889 EXPORT_SYMBOL(copy_in_user); 16889 EXPORT_SYMBOL(copy_in_user);
16890 16890
16891diff -urNp linux-2.6.32.14/arch/x86/Makefile linux-2.6.32.14/arch/x86/Makefile 16891diff -urNp linux-2.6.32.15/arch/x86/Makefile linux-2.6.32.15/arch/x86/Makefile
16892--- linux-2.6.32.14/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400 16892--- linux-2.6.32.15/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400
16893+++ linux-2.6.32.14/arch/x86/Makefile 2010-05-28 21:27:15.107152206 -0400 16893+++ linux-2.6.32.15/arch/x86/Makefile 2010-05-28 21:27:15.107152206 -0400
16894@@ -189,3 +189,12 @@ define archhelp 16894@@ -189,3 +189,12 @@ define archhelp
16895 echo ' FDARGS="..." arguments for the booted kernel' 16895 echo ' FDARGS="..." arguments for the booted kernel'
16896 echo ' FDINITRD=file initrd for the booted kernel' 16896 echo ' FDINITRD=file initrd for the booted kernel'
@@ -16904,9 +16904,9 @@ diff -urNp linux-2.6.32.14/arch/x86/Makefile linux-2.6.32.14/arch/x86/Makefile
16904+ 16904+
16905+archprepare: 16905+archprepare:
16906+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) 16906+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
16907diff -urNp linux-2.6.32.14/arch/x86/mm/extable.c linux-2.6.32.14/arch/x86/mm/extable.c 16907diff -urNp linux-2.6.32.15/arch/x86/mm/extable.c linux-2.6.32.15/arch/x86/mm/extable.c
16908--- linux-2.6.32.14/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400 16908--- linux-2.6.32.15/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400
16909+++ linux-2.6.32.14/arch/x86/mm/extable.c 2010-05-28 21:27:15.107152206 -0400 16909+++ linux-2.6.32.15/arch/x86/mm/extable.c 2010-05-28 21:27:15.107152206 -0400
16910@@ -1,14 +1,71 @@ 16910@@ -1,14 +1,71 @@
16911 #include <linux/module.h> 16911 #include <linux/module.h>
16912 #include <linux/spinlock.h> 16912 #include <linux/spinlock.h>
@@ -16980,9 +16980,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/extable.c linux-2.6.32.14/arch/x86/mm/ext
16980 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; 16980 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
16981 extern u32 pnp_bios_is_utter_crap; 16981 extern u32 pnp_bios_is_utter_crap;
16982 pnp_bios_is_utter_crap = 1; 16982 pnp_bios_is_utter_crap = 1;
16983diff -urNp linux-2.6.32.14/arch/x86/mm/fault.c linux-2.6.32.14/arch/x86/mm/fault.c 16983diff -urNp linux-2.6.32.15/arch/x86/mm/fault.c linux-2.6.32.15/arch/x86/mm/fault.c
16984--- linux-2.6.32.14/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 16984--- linux-2.6.32.15/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
16985+++ linux-2.6.32.14/arch/x86/mm/fault.c 2010-05-28 21:27:15.107152206 -0400 16985+++ linux-2.6.32.15/arch/x86/mm/fault.c 2010-05-28 21:27:15.107152206 -0400
16986@@ -11,10 +11,19 @@ 16986@@ -11,10 +11,19 @@
16987 #include <linux/kprobes.h> /* __kprobes, ... */ 16987 #include <linux/kprobes.h> /* __kprobes, ... */
16988 #include <linux/mmiotrace.h> /* kmmio_handler, ... */ 16988 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
@@ -17648,9 +17648,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/fault.c linux-2.6.32.14/arch/x86/mm/fault
17648+ 17648+
17649+ return ret ? -EFAULT : 0; 17649+ return ret ? -EFAULT : 0;
17650+} 17650+}
17651diff -urNp linux-2.6.32.14/arch/x86/mm/gup.c linux-2.6.32.14/arch/x86/mm/gup.c 17651diff -urNp linux-2.6.32.15/arch/x86/mm/gup.c linux-2.6.32.15/arch/x86/mm/gup.c
17652--- linux-2.6.32.14/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400 17652--- linux-2.6.32.15/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400
17653+++ linux-2.6.32.14/arch/x86/mm/gup.c 2010-05-28 21:27:15.107152206 -0400 17653+++ linux-2.6.32.15/arch/x86/mm/gup.c 2010-05-28 21:27:15.107152206 -0400
17654@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long 17654@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
17655 addr = start; 17655 addr = start;
17656 len = (unsigned long) nr_pages << PAGE_SHIFT; 17656 len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -17660,9 +17660,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/gup.c linux-2.6.32.14/arch/x86/mm/gup.c
17660 (void __user *)start, len))) 17660 (void __user *)start, len)))
17661 return 0; 17661 return 0;
17662 17662
17663diff -urNp linux-2.6.32.14/arch/x86/mm/highmem_32.c linux-2.6.32.14/arch/x86/mm/highmem_32.c 17663diff -urNp linux-2.6.32.15/arch/x86/mm/highmem_32.c linux-2.6.32.15/arch/x86/mm/highmem_32.c
17664--- linux-2.6.32.14/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400 17664--- linux-2.6.32.15/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400
17665+++ linux-2.6.32.14/arch/x86/mm/highmem_32.c 2010-05-28 21:27:15.107152206 -0400 17665+++ linux-2.6.32.15/arch/x86/mm/highmem_32.c 2010-05-28 21:27:15.107152206 -0400
17666@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page 17666@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
17667 idx = type + KM_TYPE_NR*smp_processor_id(); 17667 idx = type + KM_TYPE_NR*smp_processor_id();
17668 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); 17668 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -17674,9 +17674,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/highmem_32.c linux-2.6.32.14/arch/x86/mm/
17674 17674
17675 return (void *)vaddr; 17675 return (void *)vaddr;
17676 } 17676 }
17677diff -urNp linux-2.6.32.14/arch/x86/mm/hugetlbpage.c linux-2.6.32.14/arch/x86/mm/hugetlbpage.c 17677diff -urNp linux-2.6.32.15/arch/x86/mm/hugetlbpage.c linux-2.6.32.15/arch/x86/mm/hugetlbpage.c
17678--- linux-2.6.32.14/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400 17678--- linux-2.6.32.15/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400
17679+++ linux-2.6.32.14/arch/x86/mm/hugetlbpage.c 2010-05-28 21:27:15.107152206 -0400 17679+++ linux-2.6.32.15/arch/x86/mm/hugetlbpage.c 2010-05-28 21:27:15.107152206 -0400
17680@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe 17680@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe
17681 struct hstate *h = hstate_file(file); 17681 struct hstate *h = hstate_file(file);
17682 struct mm_struct *mm = current->mm; 17682 struct mm_struct *mm = current->mm;
@@ -17811,9 +17811,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/hugetlbpage.c linux-2.6.32.14/arch/x86/mm
17811 (!vma || addr + len <= vma->vm_start)) 17811 (!vma || addr + len <= vma->vm_start))
17812 return addr; 17812 return addr;
17813 } 17813 }
17814diff -urNp linux-2.6.32.14/arch/x86/mm/init_32.c linux-2.6.32.14/arch/x86/mm/init_32.c 17814diff -urNp linux-2.6.32.15/arch/x86/mm/init_32.c linux-2.6.32.15/arch/x86/mm/init_32.c
17815--- linux-2.6.32.14/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 17815--- linux-2.6.32.15/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
17816+++ linux-2.6.32.14/arch/x86/mm/init_32.c 2010-05-28 21:27:15.114903294 -0400 17816+++ linux-2.6.32.15/arch/x86/mm/init_32.c 2010-05-28 21:27:15.114903294 -0400
17817@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) 17817@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
17818 } 17818 }
17819 17819
@@ -18117,9 +18117,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/init_32.c linux-2.6.32.14/arch/x86/mm/ini
18117 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); 18117 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
18118 printk(KERN_INFO "Write protecting the kernel text: %luk\n", 18118 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
18119 size >> 10); 18119 size >> 10);
18120diff -urNp linux-2.6.32.14/arch/x86/mm/init_64.c linux-2.6.32.14/arch/x86/mm/init_64.c 18120diff -urNp linux-2.6.32.15/arch/x86/mm/init_64.c linux-2.6.32.15/arch/x86/mm/init_64.c
18121--- linux-2.6.32.14/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400 18121--- linux-2.6.32.15/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400
18122+++ linux-2.6.32.14/arch/x86/mm/init_64.c 2010-05-28 21:27:15.114903294 -0400 18122+++ linux-2.6.32.15/arch/x86/mm/init_64.c 2010-05-28 21:27:15.114903294 -0400
18123@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 18123@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
18124 pmd = fill_pmd(pud, vaddr); 18124 pmd = fill_pmd(pud, vaddr);
18125 pte = fill_pte(pmd, vaddr); 18125 pte = fill_pte(pmd, vaddr);
@@ -18180,9 +18180,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/init_64.c linux-2.6.32.14/arch/x86/mm/ini
18180 return "[vdso]"; 18180 return "[vdso]";
18181 if (vma == &gate_vma) 18181 if (vma == &gate_vma)
18182 return "[vsyscall]"; 18182 return "[vsyscall]";
18183diff -urNp linux-2.6.32.14/arch/x86/mm/init.c linux-2.6.32.14/arch/x86/mm/init.c 18183diff -urNp linux-2.6.32.15/arch/x86/mm/init.c linux-2.6.32.15/arch/x86/mm/init.c
18184--- linux-2.6.32.14/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400 18184--- linux-2.6.32.15/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400
18185+++ linux-2.6.32.14/arch/x86/mm/init.c 2010-05-28 21:27:15.114903294 -0400 18185+++ linux-2.6.32.15/arch/x86/mm/init.c 2010-05-28 21:27:15.114903294 -0400
18186@@ -69,11 +69,7 @@ static void __init find_early_table_spac 18186@@ -69,11 +69,7 @@ static void __init find_early_table_spac
18187 * cause a hotspot and fill up ZONE_DMA. The page tables 18187 * cause a hotspot and fill up ZONE_DMA. The page tables
18188 * need roughly 0.5KB per GB. 18188 * need roughly 0.5KB per GB.
@@ -18299,9 +18299,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/init.c linux-2.6.32.14/arch/x86/mm/init.c
18299 free_init_pages("unused kernel memory", 18299 free_init_pages("unused kernel memory",
18300 (unsigned long)(&__init_begin), 18300 (unsigned long)(&__init_begin),
18301 (unsigned long)(&__init_end)); 18301 (unsigned long)(&__init_end));
18302diff -urNp linux-2.6.32.14/arch/x86/mm/iomap_32.c linux-2.6.32.14/arch/x86/mm/iomap_32.c 18302diff -urNp linux-2.6.32.15/arch/x86/mm/iomap_32.c linux-2.6.32.15/arch/x86/mm/iomap_32.c
18303--- linux-2.6.32.14/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400 18303--- linux-2.6.32.15/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400
18304+++ linux-2.6.32.14/arch/x86/mm/iomap_32.c 2010-05-28 21:27:15.114903294 -0400 18304+++ linux-2.6.32.15/arch/x86/mm/iomap_32.c 2010-05-28 21:27:15.114903294 -0400
18305@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long 18305@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
18306 debug_kmap_atomic(type); 18306 debug_kmap_atomic(type);
18307 idx = type + KM_TYPE_NR * smp_processor_id(); 18307 idx = type + KM_TYPE_NR * smp_processor_id();
@@ -18314,9 +18314,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/iomap_32.c linux-2.6.32.14/arch/x86/mm/io
18314 arch_flush_lazy_mmu_mode(); 18314 arch_flush_lazy_mmu_mode();
18315 18315
18316 return (void *)vaddr; 18316 return (void *)vaddr;
18317diff -urNp linux-2.6.32.14/arch/x86/mm/ioremap.c linux-2.6.32.14/arch/x86/mm/ioremap.c 18317diff -urNp linux-2.6.32.15/arch/x86/mm/ioremap.c linux-2.6.32.15/arch/x86/mm/ioremap.c
18318--- linux-2.6.32.14/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400 18318--- linux-2.6.32.15/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400
18319+++ linux-2.6.32.14/arch/x86/mm/ioremap.c 2010-05-28 21:27:15.114903294 -0400 18319+++ linux-2.6.32.15/arch/x86/mm/ioremap.c 2010-05-28 21:27:15.114903294 -0400
18320@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) 18320@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
18321 * Second special case: Some BIOSen report the PC BIOS 18321 * Second special case: Some BIOSen report the PC BIOS
18322 * area (640->1Mb) as ram even though it is not. 18322 * area (640->1Mb) as ram even though it is not.
@@ -18363,9 +18363,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/ioremap.c linux-2.6.32.14/arch/x86/mm/ior
18363 18363
18364 /* 18364 /*
18365 * The boot-ioremap range spans multiple pmds, for which 18365 * The boot-ioremap range spans multiple pmds, for which
18366diff -urNp linux-2.6.32.14/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.14/arch/x86/mm/kmemcheck/kmemcheck.c 18366diff -urNp linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c
18367--- linux-2.6.32.14/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400 18367--- linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400
18368+++ linux-2.6.32.14/arch/x86/mm/kmemcheck/kmemcheck.c 2010-05-28 21:27:15.114903294 -0400 18368+++ linux-2.6.32.15/arch/x86/mm/kmemcheck/kmemcheck.c 2010-05-28 21:27:15.114903294 -0400
18369@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg 18369@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
18370 * memory (e.g. tracked pages)? For now, we need this to avoid 18370 * memory (e.g. tracked pages)? For now, we need this to avoid
18371 * invoking kmemcheck for PnP BIOS calls. 18371 * invoking kmemcheck for PnP BIOS calls.
@@ -18378,9 +18378,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.14/arc
18378 return false; 18378 return false;
18379 18379
18380 pte = kmemcheck_pte_lookup(address); 18380 pte = kmemcheck_pte_lookup(address);
18381diff -urNp linux-2.6.32.14/arch/x86/mm/mmap.c linux-2.6.32.14/arch/x86/mm/mmap.c 18381diff -urNp linux-2.6.32.15/arch/x86/mm/mmap.c linux-2.6.32.15/arch/x86/mm/mmap.c
18382--- linux-2.6.32.14/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 18382--- linux-2.6.32.15/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
18383+++ linux-2.6.32.14/arch/x86/mm/mmap.c 2010-05-28 21:27:15.114903294 -0400 18383+++ linux-2.6.32.15/arch/x86/mm/mmap.c 2010-05-28 21:27:15.114903294 -0400
18384@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size 18384@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
18385 * Leave an at least ~128 MB hole with possible stack randomization. 18385 * Leave an at least ~128 MB hole with possible stack randomization.
18386 */ 18386 */
@@ -18462,9 +18462,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/mmap.c linux-2.6.32.14/arch/x86/mm/mmap.c
18462 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 18462 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
18463 mm->unmap_area = arch_unmap_area_topdown; 18463 mm->unmap_area = arch_unmap_area_topdown;
18464 } 18464 }
18465diff -urNp linux-2.6.32.14/arch/x86/mm/numa_32.c linux-2.6.32.14/arch/x86/mm/numa_32.c 18465diff -urNp linux-2.6.32.15/arch/x86/mm/numa_32.c linux-2.6.32.15/arch/x86/mm/numa_32.c
18466--- linux-2.6.32.14/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400 18466--- linux-2.6.32.15/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400
18467+++ linux-2.6.32.14/arch/x86/mm/numa_32.c 2010-05-28 21:27:15.118897735 -0400 18467+++ linux-2.6.32.15/arch/x86/mm/numa_32.c 2010-05-28 21:27:15.118897735 -0400
18468@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int 18468@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
18469 } 18469 }
18470 #endif 18470 #endif
@@ -18473,9 +18473,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/numa_32.c linux-2.6.32.14/arch/x86/mm/num
18473 extern unsigned long highend_pfn, highstart_pfn; 18473 extern unsigned long highend_pfn, highstart_pfn;
18474 18474
18475 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) 18475 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
18476diff -urNp linux-2.6.32.14/arch/x86/mm/pageattr.c linux-2.6.32.14/arch/x86/mm/pageattr.c 18476diff -urNp linux-2.6.32.15/arch/x86/mm/pageattr.c linux-2.6.32.15/arch/x86/mm/pageattr.c
18477--- linux-2.6.32.14/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400 18477--- linux-2.6.32.15/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400
18478+++ linux-2.6.32.14/arch/x86/mm/pageattr.c 2010-05-28 21:27:15.118897735 -0400 18478+++ linux-2.6.32.15/arch/x86/mm/pageattr.c 2010-05-28 21:27:15.118897735 -0400
18479@@ -268,9 +268,10 @@ static inline pgprot_t static_protection 18479@@ -268,9 +268,10 @@ static inline pgprot_t static_protection
18480 * Does not cover __inittext since that is gone later on. On 18480 * Does not cover __inittext since that is gone later on. On
18481 * 64bit we do not enforce !NX on the low mapping 18481 * 64bit we do not enforce !NX on the low mapping
@@ -18507,9 +18507,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/pageattr.c linux-2.6.32.14/arch/x86/mm/pa
18507 #ifdef CONFIG_X86_32 18507 #ifdef CONFIG_X86_32
18508 if (!SHARED_KERNEL_PMD) { 18508 if (!SHARED_KERNEL_PMD) {
18509 struct page *page; 18509 struct page *page;
18510diff -urNp linux-2.6.32.14/arch/x86/mm/pageattr-test.c linux-2.6.32.14/arch/x86/mm/pageattr-test.c 18510diff -urNp linux-2.6.32.15/arch/x86/mm/pageattr-test.c linux-2.6.32.15/arch/x86/mm/pageattr-test.c
18511--- linux-2.6.32.14/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400 18511--- linux-2.6.32.15/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400
18512+++ linux-2.6.32.14/arch/x86/mm/pageattr-test.c 2010-05-28 21:27:15.118897735 -0400 18512+++ linux-2.6.32.15/arch/x86/mm/pageattr-test.c 2010-05-28 21:27:15.118897735 -0400
18513@@ -36,7 +36,7 @@ enum { 18513@@ -36,7 +36,7 @@ enum {
18514 18514
18515 static int pte_testbit(pte_t pte) 18515 static int pte_testbit(pte_t pte)
@@ -18519,9 +18519,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/pageattr-test.c linux-2.6.32.14/arch/x86/
18519 } 18519 }
18520 18520
18521 struct split_state { 18521 struct split_state {
18522diff -urNp linux-2.6.32.14/arch/x86/mm/pat.c linux-2.6.32.14/arch/x86/mm/pat.c 18522diff -urNp linux-2.6.32.15/arch/x86/mm/pat.c linux-2.6.32.15/arch/x86/mm/pat.c
18523--- linux-2.6.32.14/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400 18523--- linux-2.6.32.15/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400
18524+++ linux-2.6.32.14/arch/x86/mm/pat.c 2010-05-28 21:27:15.118897735 -0400 18524+++ linux-2.6.32.15/arch/x86/mm/pat.c 2010-05-28 21:27:15.118897735 -0400
18525@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct 18525@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
18526 18526
18527 conflict: 18527 conflict:
@@ -18558,9 +18558,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/pat.c linux-2.6.32.14/arch/x86/mm/pat.c
18558 cattr_name(want_flags), 18558 cattr_name(want_flags),
18559 (unsigned long long)paddr, 18559 (unsigned long long)paddr,
18560 (unsigned long long)(paddr + size), 18560 (unsigned long long)(paddr + size),
18561diff -urNp linux-2.6.32.14/arch/x86/mm/pgtable_32.c linux-2.6.32.14/arch/x86/mm/pgtable_32.c 18561diff -urNp linux-2.6.32.15/arch/x86/mm/pgtable_32.c linux-2.6.32.15/arch/x86/mm/pgtable_32.c
18562--- linux-2.6.32.14/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400 18562--- linux-2.6.32.15/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400
18563+++ linux-2.6.32.14/arch/x86/mm/pgtable_32.c 2010-05-28 21:27:15.118897735 -0400 18563+++ linux-2.6.32.15/arch/x86/mm/pgtable_32.c 2010-05-28 21:27:15.118897735 -0400
18564@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 18564@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
18565 return; 18565 return;
18566 } 18566 }
@@ -18575,9 +18575,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/pgtable_32.c linux-2.6.32.14/arch/x86/mm/
18575 18575
18576 /* 18576 /*
18577 * It's enough to flush this one mapping. 18577 * It's enough to flush this one mapping.
18578diff -urNp linux-2.6.32.14/arch/x86/mm/pgtable.c linux-2.6.32.14/arch/x86/mm/pgtable.c 18578diff -urNp linux-2.6.32.15/arch/x86/mm/pgtable.c linux-2.6.32.15/arch/x86/mm/pgtable.c
18579--- linux-2.6.32.14/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400 18579--- linux-2.6.32.15/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400
18580+++ linux-2.6.32.14/arch/x86/mm/pgtable.c 2010-05-28 21:27:15.118897735 -0400 18580+++ linux-2.6.32.15/arch/x86/mm/pgtable.c 2010-05-28 21:27:15.118897735 -0400
18581@@ -63,8 +63,12 @@ void ___pmd_free_tlb(struct mmu_gather * 18581@@ -63,8 +63,12 @@ void ___pmd_free_tlb(struct mmu_gather *
18582 #if PAGETABLE_LEVELS > 3 18582 #if PAGETABLE_LEVELS > 3
18583 void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud) 18583 void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud)
@@ -18847,9 +18847,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/pgtable.c linux-2.6.32.14/arch/x86/mm/pgt
18847 pgd_dtor(pgd); 18847 pgd_dtor(pgd);
18848 paravirt_pgd_free(mm, pgd); 18848 paravirt_pgd_free(mm, pgd);
18849 free_page((unsigned long)pgd); 18849 free_page((unsigned long)pgd);
18850diff -urNp linux-2.6.32.14/arch/x86/mm/setup_nx.c linux-2.6.32.14/arch/x86/mm/setup_nx.c 18850diff -urNp linux-2.6.32.15/arch/x86/mm/setup_nx.c linux-2.6.32.15/arch/x86/mm/setup_nx.c
18851--- linux-2.6.32.14/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400 18851--- linux-2.6.32.15/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400
18852+++ linux-2.6.32.14/arch/x86/mm/setup_nx.c 2010-05-28 21:27:15.118897735 -0400 18852+++ linux-2.6.32.15/arch/x86/mm/setup_nx.c 2010-05-28 21:27:15.118897735 -0400
18853@@ -4,11 +4,10 @@ 18853@@ -4,11 +4,10 @@
18854 18854
18855 #include <asm/pgtable.h> 18855 #include <asm/pgtable.h>
@@ -18915,9 +18915,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/setup_nx.c linux-2.6.32.14/arch/x86/mm/se
18915 __supported_pte_mask &= ~_PAGE_NX; 18915 __supported_pte_mask &= ~_PAGE_NX;
18916 } 18916 }
18917 #endif 18917 #endif
18918diff -urNp linux-2.6.32.14/arch/x86/mm/tlb.c linux-2.6.32.14/arch/x86/mm/tlb.c 18918diff -urNp linux-2.6.32.15/arch/x86/mm/tlb.c linux-2.6.32.15/arch/x86/mm/tlb.c
18919--- linux-2.6.32.14/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400 18919--- linux-2.6.32.15/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400
18920+++ linux-2.6.32.14/arch/x86/mm/tlb.c 2010-05-28 21:27:15.118897735 -0400 18920+++ linux-2.6.32.15/arch/x86/mm/tlb.c 2010-05-28 21:27:15.118897735 -0400
18921@@ -12,7 +12,7 @@ 18921@@ -12,7 +12,7 @@
18922 #include <asm/uv/uv.h> 18922 #include <asm/uv/uv.h>
18923 18923
@@ -18939,9 +18939,9 @@ diff -urNp linux-2.6.32.14/arch/x86/mm/tlb.c linux-2.6.32.14/arch/x86/mm/tlb.c
18939 } 18939 }
18940 EXPORT_SYMBOL_GPL(leave_mm); 18940 EXPORT_SYMBOL_GPL(leave_mm);
18941 18941
18942diff -urNp linux-2.6.32.14/arch/x86/oprofile/backtrace.c linux-2.6.32.14/arch/x86/oprofile/backtrace.c 18942diff -urNp linux-2.6.32.15/arch/x86/oprofile/backtrace.c linux-2.6.32.15/arch/x86/oprofile/backtrace.c
18943--- linux-2.6.32.14/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400 18943--- linux-2.6.32.15/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400
18944+++ linux-2.6.32.14/arch/x86/oprofile/backtrace.c 2010-05-28 21:27:15.118897735 -0400 18944+++ linux-2.6.32.15/arch/x86/oprofile/backtrace.c 2010-05-28 21:27:15.118897735 -0400
18945@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back 18945@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
18946 struct frame_head bufhead[2]; 18946 struct frame_head bufhead[2];
18947 18947
@@ -18960,9 +18960,9 @@ diff -urNp linux-2.6.32.14/arch/x86/oprofile/backtrace.c linux-2.6.32.14/arch/x8
18960 unsigned long stack = kernel_stack_pointer(regs); 18960 unsigned long stack = kernel_stack_pointer(regs);
18961 if (depth) 18961 if (depth)
18962 dump_trace(NULL, regs, (unsigned long *)stack, 0, 18962 dump_trace(NULL, regs, (unsigned long *)stack, 0,
18963diff -urNp linux-2.6.32.14/arch/x86/oprofile/op_model_p4.c linux-2.6.32.14/arch/x86/oprofile/op_model_p4.c 18963diff -urNp linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c
18964--- linux-2.6.32.14/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400 18964--- linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400
18965+++ linux-2.6.32.14/arch/x86/oprofile/op_model_p4.c 2010-05-28 21:27:15.118897735 -0400 18965+++ linux-2.6.32.15/arch/x86/oprofile/op_model_p4.c 2010-05-28 21:27:15.118897735 -0400
18966@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo 18966@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
18967 #endif 18967 #endif
18968 } 18968 }
@@ -18972,9 +18972,9 @@ diff -urNp linux-2.6.32.14/arch/x86/oprofile/op_model_p4.c linux-2.6.32.14/arch/
18972 { 18972 {
18973 #ifdef CONFIG_SMP 18973 #ifdef CONFIG_SMP
18974 return smp_num_siblings == 2 ? 2 : 1; 18974 return smp_num_siblings == 2 ? 2 : 1;
18975diff -urNp linux-2.6.32.14/arch/x86/pci/common.c linux-2.6.32.14/arch/x86/pci/common.c 18975diff -urNp linux-2.6.32.15/arch/x86/pci/common.c linux-2.6.32.15/arch/x86/pci/common.c
18976--- linux-2.6.32.14/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400 18976--- linux-2.6.32.15/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400
18977+++ linux-2.6.32.14/arch/x86/pci/common.c 2010-05-28 21:27:15.118897735 -0400 18977+++ linux-2.6.32.15/arch/x86/pci/common.c 2010-05-28 21:27:15.118897735 -0400
18978@@ -31,8 +31,8 @@ int noioapicreroute = 1; 18978@@ -31,8 +31,8 @@ int noioapicreroute = 1;
18979 int pcibios_last_bus = -1; 18979 int pcibios_last_bus = -1;
18980 unsigned long pirq_table_addr; 18980 unsigned long pirq_table_addr;
@@ -18995,9 +18995,9 @@ diff -urNp linux-2.6.32.14/arch/x86/pci/common.c linux-2.6.32.14/arch/x86/pci/co
18995 }; 18995 };
18996 18996
18997 void __init dmi_check_pciprobe(void) 18997 void __init dmi_check_pciprobe(void)
18998diff -urNp linux-2.6.32.14/arch/x86/pci/direct.c linux-2.6.32.14/arch/x86/pci/direct.c 18998diff -urNp linux-2.6.32.15/arch/x86/pci/direct.c linux-2.6.32.15/arch/x86/pci/direct.c
18999--- linux-2.6.32.14/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400 18999--- linux-2.6.32.15/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400
19000+++ linux-2.6.32.14/arch/x86/pci/direct.c 2010-05-28 21:27:15.118897735 -0400 19000+++ linux-2.6.32.15/arch/x86/pci/direct.c 2010-05-28 21:27:15.118897735 -0400
19001@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 19001@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
19002 19002
19003 #undef PCI_CONF1_ADDRESS 19003 #undef PCI_CONF1_ADDRESS
@@ -19025,9 +19025,9 @@ diff -urNp linux-2.6.32.14/arch/x86/pci/direct.c linux-2.6.32.14/arch/x86/pci/di
19025 { 19025 {
19026 u32 x = 0; 19026 u32 x = 0;
19027 int year, devfn; 19027 int year, devfn;
19028diff -urNp linux-2.6.32.14/arch/x86/pci/fixup.c linux-2.6.32.14/arch/x86/pci/fixup.c 19028diff -urNp linux-2.6.32.15/arch/x86/pci/fixup.c linux-2.6.32.15/arch/x86/pci/fixup.c
19029--- linux-2.6.32.14/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400 19029--- linux-2.6.32.15/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400
19030+++ linux-2.6.32.14/arch/x86/pci/fixup.c 2010-05-28 21:27:15.118897735 -0400 19030+++ linux-2.6.32.15/arch/x86/pci/fixup.c 2010-05-28 21:27:15.118897735 -0400
19031@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi 19031@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
19032 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), 19032 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
19033 }, 19033 },
@@ -19046,9 +19046,9 @@ diff -urNp linux-2.6.32.14/arch/x86/pci/fixup.c linux-2.6.32.14/arch/x86/pci/fix
19046 }; 19046 };
19047 19047
19048 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) 19048 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
19049diff -urNp linux-2.6.32.14/arch/x86/pci/irq.c linux-2.6.32.14/arch/x86/pci/irq.c 19049diff -urNp linux-2.6.32.15/arch/x86/pci/irq.c linux-2.6.32.15/arch/x86/pci/irq.c
19050--- linux-2.6.32.14/arch/x86/pci/irq.c 2010-04-29 17:49:37.625451376 -0400 19050--- linux-2.6.32.15/arch/x86/pci/irq.c 2010-04-29 17:49:37.625451376 -0400
19051+++ linux-2.6.32.14/arch/x86/pci/irq.c 2010-05-28 21:27:15.118897735 -0400 19051+++ linux-2.6.32.15/arch/x86/pci/irq.c 2010-05-28 21:27:15.118897735 -0400
19052@@ -543,7 +543,7 @@ static __init int intel_router_probe(str 19052@@ -543,7 +543,7 @@ static __init int intel_router_probe(str
19053 static struct pci_device_id __initdata pirq_440gx[] = { 19053 static struct pci_device_id __initdata pirq_440gx[] = {
19054 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, 19054 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
@@ -19067,9 +19067,9 @@ diff -urNp linux-2.6.32.14/arch/x86/pci/irq.c linux-2.6.32.14/arch/x86/pci/irq.c
19067 }; 19067 };
19068 19068
19069 int __init pcibios_irq_init(void) 19069 int __init pcibios_irq_init(void)
19070diff -urNp linux-2.6.32.14/arch/x86/pci/mmconfig_32.c linux-2.6.32.14/arch/x86/pci/mmconfig_32.c 19070diff -urNp linux-2.6.32.15/arch/x86/pci/mmconfig_32.c linux-2.6.32.15/arch/x86/pci/mmconfig_32.c
19071--- linux-2.6.32.14/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400 19071--- linux-2.6.32.15/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400
19072+++ linux-2.6.32.14/arch/x86/pci/mmconfig_32.c 2010-05-28 21:27:15.118897735 -0400 19072+++ linux-2.6.32.15/arch/x86/pci/mmconfig_32.c 2010-05-28 21:27:15.118897735 -0400
19073@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int 19073@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
19074 return 0; 19074 return 0;
19075 } 19075 }
@@ -19079,9 +19079,9 @@ diff -urNp linux-2.6.32.14/arch/x86/pci/mmconfig_32.c linux-2.6.32.14/arch/x86/p
19079 .read = pci_mmcfg_read, 19079 .read = pci_mmcfg_read,
19080 .write = pci_mmcfg_write, 19080 .write = pci_mmcfg_write,
19081 }; 19081 };
19082diff -urNp linux-2.6.32.14/arch/x86/pci/mmconfig_64.c linux-2.6.32.14/arch/x86/pci/mmconfig_64.c 19082diff -urNp linux-2.6.32.15/arch/x86/pci/mmconfig_64.c linux-2.6.32.15/arch/x86/pci/mmconfig_64.c
19083--- linux-2.6.32.14/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400 19083--- linux-2.6.32.15/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400
19084+++ linux-2.6.32.14/arch/x86/pci/mmconfig_64.c 2010-05-28 21:27:15.118897735 -0400 19084+++ linux-2.6.32.15/arch/x86/pci/mmconfig_64.c 2010-05-28 21:27:15.118897735 -0400
19085@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int 19085@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
19086 return 0; 19086 return 0;
19087 } 19087 }
@@ -19091,9 +19091,9 @@ diff -urNp linux-2.6.32.14/arch/x86/pci/mmconfig_64.c linux-2.6.32.14/arch/x86/p
19091 .read = pci_mmcfg_read, 19091 .read = pci_mmcfg_read,
19092 .write = pci_mmcfg_write, 19092 .write = pci_mmcfg_write,
19093 }; 19093 };
19094diff -urNp linux-2.6.32.14/arch/x86/pci/numaq_32.c linux-2.6.32.14/arch/x86/pci/numaq_32.c 19094diff -urNp linux-2.6.32.15/arch/x86/pci/numaq_32.c linux-2.6.32.15/arch/x86/pci/numaq_32.c
19095--- linux-2.6.32.14/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400 19095--- linux-2.6.32.15/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400
19096+++ linux-2.6.32.14/arch/x86/pci/numaq_32.c 2010-05-28 21:27:15.118897735 -0400 19096+++ linux-2.6.32.15/arch/x86/pci/numaq_32.c 2010-05-28 21:27:15.118897735 -0400
19097@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i 19097@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
19098 19098
19099 #undef PCI_CONF1_MQ_ADDRESS 19099 #undef PCI_CONF1_MQ_ADDRESS
@@ -19103,9 +19103,9 @@ diff -urNp linux-2.6.32.14/arch/x86/pci/numaq_32.c linux-2.6.32.14/arch/x86/pci/
19103 .read = pci_conf1_mq_read, 19103 .read = pci_conf1_mq_read,
19104 .write = pci_conf1_mq_write 19104 .write = pci_conf1_mq_write
19105 }; 19105 };
19106diff -urNp linux-2.6.32.14/arch/x86/pci/olpc.c linux-2.6.32.14/arch/x86/pci/olpc.c 19106diff -urNp linux-2.6.32.15/arch/x86/pci/olpc.c linux-2.6.32.15/arch/x86/pci/olpc.c
19107--- linux-2.6.32.14/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400 19107--- linux-2.6.32.15/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400
19108+++ linux-2.6.32.14/arch/x86/pci/olpc.c 2010-05-28 21:27:15.118897735 -0400 19108+++ linux-2.6.32.15/arch/x86/pci/olpc.c 2010-05-28 21:27:15.118897735 -0400
19109@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s 19109@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
19110 return 0; 19110 return 0;
19111 } 19111 }
@@ -19115,9 +19115,9 @@ diff -urNp linux-2.6.32.14/arch/x86/pci/olpc.c linux-2.6.32.14/arch/x86/pci/olpc
19115 .read = pci_olpc_read, 19115 .read = pci_olpc_read,
19116 .write = pci_olpc_write, 19116 .write = pci_olpc_write,
19117 }; 19117 };
19118diff -urNp linux-2.6.32.14/arch/x86/pci/pcbios.c linux-2.6.32.14/arch/x86/pci/pcbios.c 19118diff -urNp linux-2.6.32.15/arch/x86/pci/pcbios.c linux-2.6.32.15/arch/x86/pci/pcbios.c
19119--- linux-2.6.32.14/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400 19119--- linux-2.6.32.15/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400
19120+++ linux-2.6.32.14/arch/x86/pci/pcbios.c 2010-05-28 21:27:15.135148926 -0400 19120+++ linux-2.6.32.15/arch/x86/pci/pcbios.c 2010-05-28 21:27:15.135148926 -0400
19121@@ -56,50 +56,93 @@ union bios32 { 19121@@ -56,50 +56,93 @@ union bios32 {
19122 static struct { 19122 static struct {
19123 unsigned long address; 19123 unsigned long address;
@@ -19440,9 +19440,9 @@ diff -urNp linux-2.6.32.14/arch/x86/pci/pcbios.c linux-2.6.32.14/arch/x86/pci/pc
19440 return !(ret & 0xff00); 19440 return !(ret & 0xff00);
19441 } 19441 }
19442 EXPORT_SYMBOL(pcibios_set_irq_routing); 19442 EXPORT_SYMBOL(pcibios_set_irq_routing);
19443diff -urNp linux-2.6.32.14/arch/x86/power/cpu.c linux-2.6.32.14/arch/x86/power/cpu.c 19443diff -urNp linux-2.6.32.15/arch/x86/power/cpu.c linux-2.6.32.15/arch/x86/power/cpu.c
19444--- linux-2.6.32.14/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400 19444--- linux-2.6.32.15/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400
19445+++ linux-2.6.32.14/arch/x86/power/cpu.c 2010-05-28 21:27:15.135148926 -0400 19445+++ linux-2.6.32.15/arch/x86/power/cpu.c 2010-05-28 21:27:15.135148926 -0400
19446@@ -126,7 +126,7 @@ static void do_fpu_end(void) 19446@@ -126,7 +126,7 @@ static void do_fpu_end(void)
19447 static void fix_processor_context(void) 19447 static void fix_processor_context(void)
19448 { 19448 {
@@ -19462,9 +19462,9 @@ diff -urNp linux-2.6.32.14/arch/x86/power/cpu.c linux-2.6.32.14/arch/x86/power/c
19462 19462
19463 syscall_init(); /* This sets MSR_*STAR and related */ 19463 syscall_init(); /* This sets MSR_*STAR and related */
19464 #endif 19464 #endif
19465diff -urNp linux-2.6.32.14/arch/x86/vdso/Makefile linux-2.6.32.14/arch/x86/vdso/Makefile 19465diff -urNp linux-2.6.32.15/arch/x86/vdso/Makefile linux-2.6.32.15/arch/x86/vdso/Makefile
19466--- linux-2.6.32.14/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400 19466--- linux-2.6.32.15/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400
19467+++ linux-2.6.32.14/arch/x86/vdso/Makefile 2010-05-28 21:27:15.135148926 -0400 19467+++ linux-2.6.32.15/arch/x86/vdso/Makefile 2010-05-28 21:27:15.135148926 -0400
19468@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ 19468@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
19469 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ 19469 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
19470 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) 19470 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -19474,9 +19474,9 @@ diff -urNp linux-2.6.32.14/arch/x86/vdso/Makefile linux-2.6.32.14/arch/x86/vdso/
19474 GCOV_PROFILE := n 19474 GCOV_PROFILE := n
19475 19475
19476 # 19476 #
19477diff -urNp linux-2.6.32.14/arch/x86/vdso/vclock_gettime.c linux-2.6.32.14/arch/x86/vdso/vclock_gettime.c 19477diff -urNp linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c
19478--- linux-2.6.32.14/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400 19478--- linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400
19479+++ linux-2.6.32.14/arch/x86/vdso/vclock_gettime.c 2010-05-28 21:27:15.151704467 -0400 19479+++ linux-2.6.32.15/arch/x86/vdso/vclock_gettime.c 2010-05-28 21:27:15.151704467 -0400
19480@@ -22,24 +22,48 @@ 19480@@ -22,24 +22,48 @@
19481 #include <asm/hpet.h> 19481 #include <asm/hpet.h>
19482 #include <asm/unistd.h> 19482 #include <asm/unistd.h>
@@ -19575,9 +19575,9 @@ diff -urNp linux-2.6.32.14/arch/x86/vdso/vclock_gettime.c linux-2.6.32.14/arch/x
19575 } 19575 }
19576 int gettimeofday(struct timeval *, struct timezone *) 19576 int gettimeofday(struct timeval *, struct timezone *)
19577 __attribute__((weak, alias("__vdso_gettimeofday"))); 19577 __attribute__((weak, alias("__vdso_gettimeofday")));
19578diff -urNp linux-2.6.32.14/arch/x86/vdso/vdso32-setup.c linux-2.6.32.14/arch/x86/vdso/vdso32-setup.c 19578diff -urNp linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c
19579--- linux-2.6.32.14/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400 19579--- linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400
19580+++ linux-2.6.32.14/arch/x86/vdso/vdso32-setup.c 2010-05-28 21:27:15.151704467 -0400 19580+++ linux-2.6.32.15/arch/x86/vdso/vdso32-setup.c 2010-05-28 21:27:15.151704467 -0400
19581@@ -25,6 +25,7 @@ 19581@@ -25,6 +25,7 @@
19582 #include <asm/tlbflush.h> 19582 #include <asm/tlbflush.h>
19583 #include <asm/vdso.h> 19583 #include <asm/vdso.h>
@@ -19678,9 +19678,9 @@ diff -urNp linux-2.6.32.14/arch/x86/vdso/vdso32-setup.c linux-2.6.32.14/arch/x86
19678 return &gate_vma; 19678 return &gate_vma;
19679 return NULL; 19679 return NULL;
19680 } 19680 }
19681diff -urNp linux-2.6.32.14/arch/x86/vdso/vdso.lds.S linux-2.6.32.14/arch/x86/vdso/vdso.lds.S 19681diff -urNp linux-2.6.32.15/arch/x86/vdso/vdso.lds.S linux-2.6.32.15/arch/x86/vdso/vdso.lds.S
19682--- linux-2.6.32.14/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400 19682--- linux-2.6.32.15/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400
19683+++ linux-2.6.32.14/arch/x86/vdso/vdso.lds.S 2010-05-28 21:27:15.151704467 -0400 19683+++ linux-2.6.32.15/arch/x86/vdso/vdso.lds.S 2010-05-28 21:27:15.151704467 -0400
19684@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; 19684@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
19685 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; 19685 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
19686 #include "vextern.h" 19686 #include "vextern.h"
@@ -19691,9 +19691,9 @@ diff -urNp linux-2.6.32.14/arch/x86/vdso/vdso.lds.S linux-2.6.32.14/arch/x86/vds
19691+VEXTERN(fallback_time) 19691+VEXTERN(fallback_time)
19692+VEXTERN(getcpu) 19692+VEXTERN(getcpu)
19693+#undef VEXTERN 19693+#undef VEXTERN
19694diff -urNp linux-2.6.32.14/arch/x86/vdso/vextern.h linux-2.6.32.14/arch/x86/vdso/vextern.h 19694diff -urNp linux-2.6.32.15/arch/x86/vdso/vextern.h linux-2.6.32.15/arch/x86/vdso/vextern.h
19695--- linux-2.6.32.14/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400 19695--- linux-2.6.32.15/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400
19696+++ linux-2.6.32.14/arch/x86/vdso/vextern.h 2010-05-28 21:27:15.151704467 -0400 19696+++ linux-2.6.32.15/arch/x86/vdso/vextern.h 2010-05-28 21:27:15.151704467 -0400
19697@@ -11,6 +11,5 @@ 19697@@ -11,6 +11,5 @@
19698 put into vextern.h and be referenced as a pointer with vdso prefix. 19698 put into vextern.h and be referenced as a pointer with vdso prefix.
19699 The main kernel later fills in the values. */ 19699 The main kernel later fills in the values. */
@@ -19701,9 +19701,9 @@ diff -urNp linux-2.6.32.14/arch/x86/vdso/vextern.h linux-2.6.32.14/arch/x86/vdso
19701-VEXTERN(jiffies) 19701-VEXTERN(jiffies)
19702 VEXTERN(vgetcpu_mode) 19702 VEXTERN(vgetcpu_mode)
19703 VEXTERN(vsyscall_gtod_data) 19703 VEXTERN(vsyscall_gtod_data)
19704diff -urNp linux-2.6.32.14/arch/x86/vdso/vma.c linux-2.6.32.14/arch/x86/vdso/vma.c 19704diff -urNp linux-2.6.32.15/arch/x86/vdso/vma.c linux-2.6.32.15/arch/x86/vdso/vma.c
19705--- linux-2.6.32.14/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400 19705--- linux-2.6.32.15/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400
19706+++ linux-2.6.32.14/arch/x86/vdso/vma.c 2010-05-28 21:27:15.151704467 -0400 19706+++ linux-2.6.32.15/arch/x86/vdso/vma.c 2010-05-28 21:27:15.151704467 -0400
19707@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) 19707@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
19708 if (!vbase) 19708 if (!vbase)
19709 goto oom; 19709 goto oom;
@@ -19750,9 +19750,9 @@ diff -urNp linux-2.6.32.14/arch/x86/vdso/vma.c linux-2.6.32.14/arch/x86/vdso/vma
19750- return 0; 19750- return 0;
19751-} 19751-}
19752-__setup("vdso=", vdso_setup); 19752-__setup("vdso=", vdso_setup);
19753diff -urNp linux-2.6.32.14/arch/x86/xen/enlighten.c linux-2.6.32.14/arch/x86/xen/enlighten.c 19753diff -urNp linux-2.6.32.15/arch/x86/xen/enlighten.c linux-2.6.32.15/arch/x86/xen/enlighten.c
19754--- linux-2.6.32.14/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400 19754--- linux-2.6.32.15/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400
19755+++ linux-2.6.32.14/arch/x86/xen/enlighten.c 2010-05-29 16:33:34.251291763 -0400 19755+++ linux-2.6.32.15/arch/x86/xen/enlighten.c 2010-05-29 16:33:34.251291763 -0400
19756@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); 19756@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
19757 19757
19758 struct shared_info xen_dummy_shared_info; 19758 struct shared_info xen_dummy_shared_info;
@@ -19808,9 +19808,9 @@ diff -urNp linux-2.6.32.14/arch/x86/xen/enlighten.c linux-2.6.32.14/arch/x86/xen
19808 xen_smp_init(); 19808 xen_smp_init();
19809 19809
19810 pgd = (pgd_t *)xen_start_info->pt_base; 19810 pgd = (pgd_t *)xen_start_info->pt_base;
19811diff -urNp linux-2.6.32.14/arch/x86/xen/mmu.c linux-2.6.32.14/arch/x86/xen/mmu.c 19811diff -urNp linux-2.6.32.15/arch/x86/xen/mmu.c linux-2.6.32.15/arch/x86/xen/mmu.c
19812--- linux-2.6.32.14/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400 19812--- linux-2.6.32.15/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400
19813+++ linux-2.6.32.14/arch/x86/xen/mmu.c 2010-05-28 21:27:15.151704467 -0400 19813+++ linux-2.6.32.15/arch/x86/xen/mmu.c 2010-05-28 21:27:15.151704467 -0400
19814@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable 19814@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
19815 convert_pfn_mfn(init_level4_pgt); 19815 convert_pfn_mfn(init_level4_pgt);
19816 convert_pfn_mfn(level3_ident_pgt); 19816 convert_pfn_mfn(level3_ident_pgt);
@@ -19831,9 +19831,9 @@ diff -urNp linux-2.6.32.14/arch/x86/xen/mmu.c linux-2.6.32.14/arch/x86/xen/mmu.c
19831 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); 19831 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
19832 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); 19832 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
19833 19833
19834diff -urNp linux-2.6.32.14/arch/x86/xen/smp.c linux-2.6.32.14/arch/x86/xen/smp.c 19834diff -urNp linux-2.6.32.15/arch/x86/xen/smp.c linux-2.6.32.15/arch/x86/xen/smp.c
19835--- linux-2.6.32.14/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400 19835--- linux-2.6.32.15/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400
19836+++ linux-2.6.32.14/arch/x86/xen/smp.c 2010-05-28 21:27:15.155009648 -0400 19836+++ linux-2.6.32.15/arch/x86/xen/smp.c 2010-05-28 21:27:15.155009648 -0400
19837@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ 19837@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
19838 { 19838 {
19839 BUG_ON(smp_processor_id() != 0); 19839 BUG_ON(smp_processor_id() != 0);
@@ -19857,9 +19857,9 @@ diff -urNp linux-2.6.32.14/arch/x86/xen/smp.c linux-2.6.32.14/arch/x86/xen/smp.c
19857 ctxt->user_regs.ss = __KERNEL_DS; 19857 ctxt->user_regs.ss = __KERNEL_DS;
19858 #ifdef CONFIG_X86_32 19858 #ifdef CONFIG_X86_32
19859 ctxt->user_regs.fs = __KERNEL_PERCPU; 19859 ctxt->user_regs.fs = __KERNEL_PERCPU;
19860diff -urNp linux-2.6.32.14/arch/x86/xen/xen-head.S linux-2.6.32.14/arch/x86/xen/xen-head.S 19860diff -urNp linux-2.6.32.15/arch/x86/xen/xen-head.S linux-2.6.32.15/arch/x86/xen/xen-head.S
19861--- linux-2.6.32.14/arch/x86/xen/xen-head.S 2010-03-15 11:52:04.000000000 -0400 19861--- linux-2.6.32.15/arch/x86/xen/xen-head.S 2010-03-15 11:52:04.000000000 -0400
19862+++ linux-2.6.32.14/arch/x86/xen/xen-head.S 2010-05-28 21:27:15.155009648 -0400 19862+++ linux-2.6.32.15/arch/x86/xen/xen-head.S 2010-05-28 21:27:15.155009648 -0400
19863@@ -19,6 +19,17 @@ ENTRY(startup_xen) 19863@@ -19,6 +19,17 @@ ENTRY(startup_xen)
19864 #ifdef CONFIG_X86_32 19864 #ifdef CONFIG_X86_32
19865 mov %esi,xen_start_info 19865 mov %esi,xen_start_info
@@ -19878,9 +19878,9 @@ diff -urNp linux-2.6.32.14/arch/x86/xen/xen-head.S linux-2.6.32.14/arch/x86/xen/
19878 #else 19878 #else
19879 mov %rsi,xen_start_info 19879 mov %rsi,xen_start_info
19880 mov $init_thread_union+THREAD_SIZE,%rsp 19880 mov $init_thread_union+THREAD_SIZE,%rsp
19881diff -urNp linux-2.6.32.14/arch/x86/xen/xen-ops.h linux-2.6.32.14/arch/x86/xen/xen-ops.h 19881diff -urNp linux-2.6.32.15/arch/x86/xen/xen-ops.h linux-2.6.32.15/arch/x86/xen/xen-ops.h
19882--- linux-2.6.32.14/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400 19882--- linux-2.6.32.15/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400
19883+++ linux-2.6.32.14/arch/x86/xen/xen-ops.h 2010-05-28 21:27:15.155009648 -0400 19883+++ linux-2.6.32.15/arch/x86/xen/xen-ops.h 2010-05-28 21:27:15.155009648 -0400
19884@@ -10,8 +10,6 @@ 19884@@ -10,8 +10,6 @@
19885 extern const char xen_hypervisor_callback[]; 19885 extern const char xen_hypervisor_callback[];
19886 extern const char xen_failsafe_callback[]; 19886 extern const char xen_failsafe_callback[];
@@ -19890,9 +19890,9 @@ diff -urNp linux-2.6.32.14/arch/x86/xen/xen-ops.h linux-2.6.32.14/arch/x86/xen/x
19890 struct trap_info; 19890 struct trap_info;
19891 void xen_copy_trap_info(struct trap_info *traps); 19891 void xen_copy_trap_info(struct trap_info *traps);
19892 19892
19893diff -urNp linux-2.6.32.14/block/blk-integrity.c linux-2.6.32.14/block/blk-integrity.c 19893diff -urNp linux-2.6.32.15/block/blk-integrity.c linux-2.6.32.15/block/blk-integrity.c
19894--- linux-2.6.32.14/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400 19894--- linux-2.6.32.15/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400
19895+++ linux-2.6.32.14/block/blk-integrity.c 2010-05-28 21:27:15.167161810 -0400 19895+++ linux-2.6.32.15/block/blk-integrity.c 2010-05-28 21:27:15.167161810 -0400
19896@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs 19896@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
19897 NULL, 19897 NULL,
19898 }; 19898 };
@@ -19902,9 +19902,9 @@ diff -urNp linux-2.6.32.14/block/blk-integrity.c linux-2.6.32.14/block/blk-integ
19902 .show = &integrity_attr_show, 19902 .show = &integrity_attr_show,
19903 .store = &integrity_attr_store, 19903 .store = &integrity_attr_store,
19904 }; 19904 };
19905diff -urNp linux-2.6.32.14/block/blk-iopoll.c linux-2.6.32.14/block/blk-iopoll.c 19905diff -urNp linux-2.6.32.15/block/blk-iopoll.c linux-2.6.32.15/block/blk-iopoll.c
19906--- linux-2.6.32.14/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400 19906--- linux-2.6.32.15/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400
19907+++ linux-2.6.32.14/block/blk-iopoll.c 2010-05-28 21:27:15.167161810 -0400 19907+++ linux-2.6.32.15/block/blk-iopoll.c 2010-05-28 21:27:15.167161810 -0400
19908@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo 19908@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
19909 } 19909 }
19910 EXPORT_SYMBOL(blk_iopoll_complete); 19910 EXPORT_SYMBOL(blk_iopoll_complete);
@@ -19914,9 +19914,9 @@ diff -urNp linux-2.6.32.14/block/blk-iopoll.c linux-2.6.32.14/block/blk-iopoll.c
19914 { 19914 {
19915 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); 19915 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
19916 int rearm = 0, budget = blk_iopoll_budget; 19916 int rearm = 0, budget = blk_iopoll_budget;
19917diff -urNp linux-2.6.32.14/block/blk-map.c linux-2.6.32.14/block/blk-map.c 19917diff -urNp linux-2.6.32.15/block/blk-map.c linux-2.6.32.15/block/blk-map.c
19918--- linux-2.6.32.14/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400 19918--- linux-2.6.32.15/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400
19919+++ linux-2.6.32.14/block/blk-map.c 2010-05-28 21:27:15.167161810 -0400 19919+++ linux-2.6.32.15/block/blk-map.c 2010-05-28 21:27:15.167161810 -0400
19920@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ 19920@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
19921 * direct dma. else, set up kernel bounce buffers 19921 * direct dma. else, set up kernel bounce buffers
19922 */ 19922 */
@@ -19935,9 +19935,9 @@ diff -urNp linux-2.6.32.14/block/blk-map.c linux-2.6.32.14/block/blk-map.c
19935 if (do_copy) 19935 if (do_copy)
19936 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); 19936 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
19937 else 19937 else
19938diff -urNp linux-2.6.32.14/block/blk-softirq.c linux-2.6.32.14/block/blk-softirq.c 19938diff -urNp linux-2.6.32.15/block/blk-softirq.c linux-2.6.32.15/block/blk-softirq.c
19939--- linux-2.6.32.14/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400 19939--- linux-2.6.32.15/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400
19940+++ linux-2.6.32.14/block/blk-softirq.c 2010-05-28 21:27:15.179152446 -0400 19940+++ linux-2.6.32.15/block/blk-softirq.c 2010-05-28 21:27:15.179152446 -0400
19941@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 19941@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
19942 * Softirq action handler - move entries to local list and loop over them 19942 * Softirq action handler - move entries to local list and loop over them
19943 * while passing them to the queue registered handler. 19943 * while passing them to the queue registered handler.
@@ -19947,9 +19947,9 @@ diff -urNp linux-2.6.32.14/block/blk-softirq.c linux-2.6.32.14/block/blk-softirq
19947 { 19947 {
19948 struct list_head *cpu_list, local_list; 19948 struct list_head *cpu_list, local_list;
19949 19949
19950diff -urNp linux-2.6.32.14/block/blk-sysfs.c linux-2.6.32.14/block/blk-sysfs.c 19950diff -urNp linux-2.6.32.15/block/blk-sysfs.c linux-2.6.32.15/block/blk-sysfs.c
19951--- linux-2.6.32.14/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400 19951--- linux-2.6.32.15/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400
19952+++ linux-2.6.32.14/block/blk-sysfs.c 2010-05-28 21:27:15.179152446 -0400 19952+++ linux-2.6.32.15/block/blk-sysfs.c 2010-05-28 21:27:15.179152446 -0400
19953@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob 19953@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
19954 kmem_cache_free(blk_requestq_cachep, q); 19954 kmem_cache_free(blk_requestq_cachep, q);
19955 } 19955 }
@@ -19959,9 +19959,9 @@ diff -urNp linux-2.6.32.14/block/blk-sysfs.c linux-2.6.32.14/block/blk-sysfs.c
19959 .show = queue_attr_show, 19959 .show = queue_attr_show,
19960 .store = queue_attr_store, 19960 .store = queue_attr_store,
19961 }; 19961 };
19962diff -urNp linux-2.6.32.14/block/elevator.c linux-2.6.32.14/block/elevator.c 19962diff -urNp linux-2.6.32.15/block/elevator.c linux-2.6.32.15/block/elevator.c
19963--- linux-2.6.32.14/block/elevator.c 2010-03-15 11:52:04.000000000 -0400 19963--- linux-2.6.32.15/block/elevator.c 2010-03-15 11:52:04.000000000 -0400
19964+++ linux-2.6.32.14/block/elevator.c 2010-05-28 21:27:15.179152446 -0400 19964+++ linux-2.6.32.15/block/elevator.c 2010-05-28 21:27:15.179152446 -0400
19965@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str 19965@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
19966 return error; 19966 return error;
19967 } 19967 }
@@ -19971,9 +19971,9 @@ diff -urNp linux-2.6.32.14/block/elevator.c linux-2.6.32.14/block/elevator.c
19971 .show = elv_attr_show, 19971 .show = elv_attr_show,
19972 .store = elv_attr_store, 19972 .store = elv_attr_store,
19973 }; 19973 };
19974diff -urNp linux-2.6.32.14/crypto/lrw.c linux-2.6.32.14/crypto/lrw.c 19974diff -urNp linux-2.6.32.15/crypto/lrw.c linux-2.6.32.15/crypto/lrw.c
19975--- linux-2.6.32.14/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400 19975--- linux-2.6.32.15/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400
19976+++ linux-2.6.32.14/crypto/lrw.c 2010-05-28 21:27:15.179152446 -0400 19976+++ linux-2.6.32.15/crypto/lrw.c 2010-05-28 21:27:15.179152446 -0400
19977@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par 19977@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
19978 struct priv *ctx = crypto_tfm_ctx(parent); 19978 struct priv *ctx = crypto_tfm_ctx(parent);
19979 struct crypto_cipher *child = ctx->child; 19979 struct crypto_cipher *child = ctx->child;
@@ -19983,9 +19983,9 @@ diff -urNp linux-2.6.32.14/crypto/lrw.c linux-2.6.32.14/crypto/lrw.c
19983 int bsize = crypto_cipher_blocksize(child); 19983 int bsize = crypto_cipher_blocksize(child);
19984 19984
19985 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); 19985 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
19986diff -urNp linux-2.6.32.14/Documentation/dontdiff linux-2.6.32.14/Documentation/dontdiff 19986diff -urNp linux-2.6.32.15/Documentation/dontdiff linux-2.6.32.15/Documentation/dontdiff
19987--- linux-2.6.32.14/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400 19987--- linux-2.6.32.15/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400
19988+++ linux-2.6.32.14/Documentation/dontdiff 2010-05-28 21:27:15.179152446 -0400 19988+++ linux-2.6.32.15/Documentation/dontdiff 2010-05-28 21:27:15.179152446 -0400
19989@@ -3,6 +3,7 @@ 19989@@ -3,6 +3,7 @@
19990 *.bin 19990 *.bin
19991 *.cpio 19991 *.cpio
@@ -20093,9 +20093,9 @@ diff -urNp linux-2.6.32.14/Documentation/dontdiff linux-2.6.32.14/Documentation/
20093 zImage* 20093 zImage*
20094 zconf.hash.c 20094 zconf.hash.c
20095+zoffset.h 20095+zoffset.h
20096diff -urNp linux-2.6.32.14/Documentation/kernel-parameters.txt linux-2.6.32.14/Documentation/kernel-parameters.txt 20096diff -urNp linux-2.6.32.15/Documentation/kernel-parameters.txt linux-2.6.32.15/Documentation/kernel-parameters.txt
20097--- linux-2.6.32.14/Documentation/kernel-parameters.txt 2010-05-15 13:20:18.374565913 -0400 20097--- linux-2.6.32.15/Documentation/kernel-parameters.txt 2010-05-15 13:20:18.374565913 -0400
20098+++ linux-2.6.32.14/Documentation/kernel-parameters.txt 2010-05-28 21:27:15.179152446 -0400 20098+++ linux-2.6.32.15/Documentation/kernel-parameters.txt 2010-05-28 21:27:15.179152446 -0400
20099@@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters. 20099@@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters.
20100 the specified number of seconds. This is to be used if 20100 the specified number of seconds. This is to be used if
20101 your oopses keep scrolling off the screen. 20101 your oopses keep scrolling off the screen.
@@ -20109,9 +20109,9 @@ diff -urNp linux-2.6.32.14/Documentation/kernel-parameters.txt linux-2.6.32.14/D
20109 pcbit= [HW,ISDN] 20109 pcbit= [HW,ISDN]
20110 20110
20111 pcd. [PARIDE] 20111 pcd. [PARIDE]
20112diff -urNp linux-2.6.32.14/drivers/acpi/battery.c linux-2.6.32.14/drivers/acpi/battery.c 20112diff -urNp linux-2.6.32.15/drivers/acpi/battery.c linux-2.6.32.15/drivers/acpi/battery.c
20113--- linux-2.6.32.14/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400 20113--- linux-2.6.32.15/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400
20114+++ linux-2.6.32.14/drivers/acpi/battery.c 2010-05-28 21:27:15.179152446 -0400 20114+++ linux-2.6.32.15/drivers/acpi/battery.c 2010-05-28 21:27:15.179152446 -0400
20115@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); 20115@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
20116 } 20116 }
20117 20117
@@ -20121,9 +20121,9 @@ diff -urNp linux-2.6.32.14/drivers/acpi/battery.c linux-2.6.32.14/drivers/acpi/b
20121 mode_t mode; 20121 mode_t mode;
20122 const char *name; 20122 const char *name;
20123 } acpi_battery_file[] = { 20123 } acpi_battery_file[] = {
20124diff -urNp linux-2.6.32.14/drivers/acpi/blacklist.c linux-2.6.32.14/drivers/acpi/blacklist.c 20124diff -urNp linux-2.6.32.15/drivers/acpi/blacklist.c linux-2.6.32.15/drivers/acpi/blacklist.c
20125--- linux-2.6.32.14/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400 20125--- linux-2.6.32.15/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400
20126+++ linux-2.6.32.14/drivers/acpi/blacklist.c 2010-05-28 21:27:15.179152446 -0400 20126+++ linux-2.6.32.15/drivers/acpi/blacklist.c 2010-05-28 21:27:15.179152446 -0400
20127@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b 20127@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
20128 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, 20128 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
20129 "Incorrect _ADR", 1}, 20129 "Incorrect _ADR", 1},
@@ -20133,9 +20133,9 @@ diff -urNp linux-2.6.32.14/drivers/acpi/blacklist.c linux-2.6.32.14/drivers/acpi
20133 }; 20133 };
20134 20134
20135 #if CONFIG_ACPI_BLACKLIST_YEAR 20135 #if CONFIG_ACPI_BLACKLIST_YEAR
20136diff -urNp linux-2.6.32.14/drivers/acpi/dock.c linux-2.6.32.14/drivers/acpi/dock.c 20136diff -urNp linux-2.6.32.15/drivers/acpi/dock.c linux-2.6.32.15/drivers/acpi/dock.c
20137--- linux-2.6.32.14/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400 20137--- linux-2.6.32.15/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400
20138+++ linux-2.6.32.14/drivers/acpi/dock.c 2010-05-28 21:27:15.179152446 -0400 20138+++ linux-2.6.32.15/drivers/acpi/dock.c 2010-05-28 21:27:15.179152446 -0400
20139@@ -77,7 +77,7 @@ struct dock_dependent_device { 20139@@ -77,7 +77,7 @@ struct dock_dependent_device {
20140 struct list_head list; 20140 struct list_head list;
20141 struct list_head hotplug_list; 20141 struct list_head hotplug_list;
@@ -20154,9 +20154,9 @@ diff -urNp linux-2.6.32.14/drivers/acpi/dock.c linux-2.6.32.14/drivers/acpi/dock
20154 void *context) 20154 void *context)
20155 { 20155 {
20156 struct dock_dependent_device *dd; 20156 struct dock_dependent_device *dd;
20157diff -urNp linux-2.6.32.14/drivers/acpi/osl.c linux-2.6.32.14/drivers/acpi/osl.c 20157diff -urNp linux-2.6.32.15/drivers/acpi/osl.c linux-2.6.32.15/drivers/acpi/osl.c
20158--- linux-2.6.32.14/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400 20158--- linux-2.6.32.15/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400
20159+++ linux-2.6.32.14/drivers/acpi/osl.c 2010-05-28 21:27:15.183173771 -0400 20159+++ linux-2.6.32.15/drivers/acpi/osl.c 2010-05-28 21:27:15.183173771 -0400
20160@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres 20160@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
20161 void __iomem *virt_addr; 20161 void __iomem *virt_addr;
20162 20162
@@ -20175,9 +20175,9 @@ diff -urNp linux-2.6.32.14/drivers/acpi/osl.c linux-2.6.32.14/drivers/acpi/osl.c
20175 20175
20176 switch (width) { 20176 switch (width) {
20177 case 8: 20177 case 8:
20178diff -urNp linux-2.6.32.14/drivers/acpi/power_meter.c linux-2.6.32.14/drivers/acpi/power_meter.c 20178diff -urNp linux-2.6.32.15/drivers/acpi/power_meter.c linux-2.6.32.15/drivers/acpi/power_meter.c
20179--- linux-2.6.32.14/drivers/acpi/power_meter.c 2010-05-15 13:20:18.454567530 -0400 20179--- linux-2.6.32.15/drivers/acpi/power_meter.c 2010-05-15 13:20:18.454567530 -0400
20180+++ linux-2.6.32.14/drivers/acpi/power_meter.c 2010-05-28 21:27:15.191153765 -0400 20180+++ linux-2.6.32.15/drivers/acpi/power_meter.c 2010-05-28 21:27:15.191153765 -0400
20181@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d 20181@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
20182 return res; 20182 return res;
20183 20183
@@ -20187,9 +20187,9 @@ diff -urNp linux-2.6.32.14/drivers/acpi/power_meter.c linux-2.6.32.14/drivers/ac
20187 20187
20188 mutex_lock(&resource->lock); 20188 mutex_lock(&resource->lock);
20189 resource->trip[attr->index - 7] = temp; 20189 resource->trip[attr->index - 7] = temp;
20190diff -urNp linux-2.6.32.14/drivers/acpi/proc.c linux-2.6.32.14/drivers/acpi/proc.c 20190diff -urNp linux-2.6.32.15/drivers/acpi/proc.c linux-2.6.32.15/drivers/acpi/proc.c
20191--- linux-2.6.32.14/drivers/acpi/proc.c 2010-03-15 11:52:04.000000000 -0400 20191--- linux-2.6.32.15/drivers/acpi/proc.c 2010-03-15 11:52:04.000000000 -0400
20192+++ linux-2.6.32.14/drivers/acpi/proc.c 2010-05-28 21:27:15.191153765 -0400 20192+++ linux-2.6.32.15/drivers/acpi/proc.c 2010-05-28 21:27:15.191153765 -0400
20193@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f 20193@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
20194 size_t count, loff_t * ppos) 20194 size_t count, loff_t * ppos)
20195 { 20195 {
@@ -20225,9 +20225,9 @@ diff -urNp linux-2.6.32.14/drivers/acpi/proc.c linux-2.6.32.14/drivers/acpi/proc
20225 dev->wakeup.state.enabled = 20225 dev->wakeup.state.enabled =
20226 dev->wakeup.state.enabled ? 0 : 1; 20226 dev->wakeup.state.enabled ? 0 : 1;
20227 found_dev = dev; 20227 found_dev = dev;
20228diff -urNp linux-2.6.32.14/drivers/acpi/processor_core.c linux-2.6.32.14/drivers/acpi/processor_core.c 20228diff -urNp linux-2.6.32.15/drivers/acpi/processor_core.c linux-2.6.32.15/drivers/acpi/processor_core.c
20229--- linux-2.6.32.14/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400 20229--- linux-2.6.32.15/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400
20230+++ linux-2.6.32.14/drivers/acpi/processor_core.c 2010-05-28 21:27:15.191153765 -0400 20230+++ linux-2.6.32.15/drivers/acpi/processor_core.c 2010-05-28 21:27:15.191153765 -0400
20231@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( 20231@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add(
20232 return 0; 20232 return 0;
20233 } 20233 }
@@ -20237,9 +20237,9 @@ diff -urNp linux-2.6.32.14/drivers/acpi/processor_core.c linux-2.6.32.14/drivers
20237 20237
20238 /* 20238 /*
20239 * Buggy BIOS check 20239 * Buggy BIOS check
20240diff -urNp linux-2.6.32.14/drivers/acpi/processor_idle.c linux-2.6.32.14/drivers/acpi/processor_idle.c 20240diff -urNp linux-2.6.32.15/drivers/acpi/processor_idle.c linux-2.6.32.15/drivers/acpi/processor_idle.c
20241--- linux-2.6.32.14/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400 20241--- linux-2.6.32.15/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400
20242+++ linux-2.6.32.14/drivers/acpi/processor_idle.c 2010-05-28 21:27:15.191153765 -0400 20242+++ linux-2.6.32.15/drivers/acpi/processor_idle.c 2010-05-28 21:27:15.191153765 -0400
20243@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat 20243@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
20244 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), 20244 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
20245 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, 20245 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
@@ -20249,9 +20249,21 @@ diff -urNp linux-2.6.32.14/drivers/acpi/processor_idle.c linux-2.6.32.14/drivers
20249 }; 20249 };
20250 20250
20251 20251
20252diff -urNp linux-2.6.32.14/drivers/acpi/sleep.c linux-2.6.32.14/drivers/acpi/sleep.c 20252diff -urNp linux-2.6.32.15/drivers/acpi/sbshc.c linux-2.6.32.15/drivers/acpi/sbshc.c
20253--- linux-2.6.32.14/drivers/acpi/sleep.c 2010-05-28 20:16:44.438931092 -0400 20253--- linux-2.6.32.15/drivers/acpi/sbshc.c 2010-03-15 11:52:04.000000000 -0400
20254+++ linux-2.6.32.14/drivers/acpi/sleep.c 2010-05-28 21:27:15.191153765 -0400 20254+++ linux-2.6.32.15/drivers/acpi/sbshc.c 2010-05-31 11:26:43.164958464 -0400
20255@@ -17,7 +17,7 @@
20256
20257 #define PREFIX "ACPI: "
20258
20259-#define ACPI_SMB_HC_CLASS "smbus_host_controller"
20260+#define ACPI_SMB_HC_CLASS "smbus_host_ctl"
20261 #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC"
20262
20263 struct acpi_smb_hc {
20264diff -urNp linux-2.6.32.15/drivers/acpi/sleep.c linux-2.6.32.15/drivers/acpi/sleep.c
20265--- linux-2.6.32.15/drivers/acpi/sleep.c 2010-05-28 20:16:44.438931092 -0400
20266+++ linux-2.6.32.15/drivers/acpi/sleep.c 2010-05-28 21:27:15.191153765 -0400
20255@@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp 20267@@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp
20256 } 20268 }
20257 } 20269 }
@@ -20288,9 +20300,9 @@ diff -urNp linux-2.6.32.14/drivers/acpi/sleep.c linux-2.6.32.14/drivers/acpi/sle
20288 .begin = acpi_hibernation_begin_old, 20300 .begin = acpi_hibernation_begin_old,
20289 .end = acpi_pm_end, 20301 .end = acpi_pm_end,
20290 .pre_snapshot = acpi_hibernation_pre_snapshot_old, 20302 .pre_snapshot = acpi_hibernation_pre_snapshot_old,
20291diff -urNp linux-2.6.32.14/drivers/acpi/video.c linux-2.6.32.14/drivers/acpi/video.c 20303diff -urNp linux-2.6.32.15/drivers/acpi/video.c linux-2.6.32.15/drivers/acpi/video.c
20292--- linux-2.6.32.14/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400 20304--- linux-2.6.32.15/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400
20293+++ linux-2.6.32.14/drivers/acpi/video.c 2010-05-28 21:27:15.203165017 -0400 20305+++ linux-2.6.32.15/drivers/acpi/video.c 2010-05-28 21:27:15.203165017 -0400
20294@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str 20306@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
20295 vd->brightness->levels[request_level]); 20307 vd->brightness->levels[request_level]);
20296 } 20308 }
@@ -20300,9 +20312,9 @@ diff -urNp linux-2.6.32.14/drivers/acpi/video.c linux-2.6.32.14/drivers/acpi/vid
20300 .get_brightness = acpi_video_get_brightness, 20312 .get_brightness = acpi_video_get_brightness,
20301 .update_status = acpi_video_set_brightness, 20313 .update_status = acpi_video_set_brightness,
20302 }; 20314 };
20303diff -urNp linux-2.6.32.14/drivers/ata/ahci.c linux-2.6.32.14/drivers/ata/ahci.c 20315diff -urNp linux-2.6.32.15/drivers/ata/ahci.c linux-2.6.32.15/drivers/ata/ahci.c
20304--- linux-2.6.32.14/drivers/ata/ahci.c 2010-04-29 17:49:37.661448235 -0400 20316--- linux-2.6.32.15/drivers/ata/ahci.c 2010-04-29 17:49:37.661448235 -0400
20305+++ linux-2.6.32.14/drivers/ata/ahci.c 2010-05-28 21:27:15.203165017 -0400 20317+++ linux-2.6.32.15/drivers/ata/ahci.c 2010-05-28 21:27:15.203165017 -0400
20306@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh 20318@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
20307 .sdev_attrs = ahci_sdev_attrs, 20319 .sdev_attrs = ahci_sdev_attrs,
20308 }; 20320 };
@@ -20342,9 +20354,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/ahci.c linux-2.6.32.14/drivers/ata/ahci.c
20342 }; 20354 };
20343 20355
20344 20356
20345diff -urNp linux-2.6.32.14/drivers/ata/ata_generic.c linux-2.6.32.14/drivers/ata/ata_generic.c 20357diff -urNp linux-2.6.32.15/drivers/ata/ata_generic.c linux-2.6.32.15/drivers/ata/ata_generic.c
20346--- linux-2.6.32.14/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400 20358--- linux-2.6.32.15/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400
20347+++ linux-2.6.32.14/drivers/ata/ata_generic.c 2010-05-28 21:27:15.203165017 -0400 20359+++ linux-2.6.32.15/drivers/ata/ata_generic.c 2010-05-28 21:27:15.203165017 -0400
20348@@ -95,7 +95,7 @@ static struct scsi_host_template generic 20360@@ -95,7 +95,7 @@ static struct scsi_host_template generic
20349 ATA_BMDMA_SHT(DRV_NAME), 20361 ATA_BMDMA_SHT(DRV_NAME),
20350 }; 20362 };
@@ -20354,9 +20366,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/ata_generic.c linux-2.6.32.14/drivers/ata
20354 .inherits = &ata_bmdma_port_ops, 20366 .inherits = &ata_bmdma_port_ops,
20355 .cable_detect = ata_cable_unknown, 20367 .cable_detect = ata_cable_unknown,
20356 .set_mode = generic_set_mode, 20368 .set_mode = generic_set_mode,
20357diff -urNp linux-2.6.32.14/drivers/ata/ata_piix.c linux-2.6.32.14/drivers/ata/ata_piix.c 20369diff -urNp linux-2.6.32.15/drivers/ata/ata_piix.c linux-2.6.32.15/drivers/ata/ata_piix.c
20358--- linux-2.6.32.14/drivers/ata/ata_piix.c 2010-04-29 17:49:37.669446700 -0400 20370--- linux-2.6.32.15/drivers/ata/ata_piix.c 2010-04-29 17:49:37.669446700 -0400
20359+++ linux-2.6.32.14/drivers/ata/ata_piix.c 2010-05-28 21:27:15.203165017 -0400 20371+++ linux-2.6.32.15/drivers/ata/ata_piix.c 2010-05-28 21:27:15.203165017 -0400
20360@@ -299,7 +299,7 @@ static const struct pci_device_id piix_p 20372@@ -299,7 +299,7 @@ static const struct pci_device_id piix_p
20361 { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, 20373 { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
20362 /* SATA Controller IDE (CPT) */ 20374 /* SATA Controller IDE (CPT) */
@@ -20420,9 +20432,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/ata_piix.c linux-2.6.32.14/drivers/ata/at
20420 }; 20432 };
20421 static const char *oemstrs[] = { 20433 static const char *oemstrs[] = {
20422 "Tecra M3,", 20434 "Tecra M3,",
20423diff -urNp linux-2.6.32.14/drivers/ata/libata-acpi.c linux-2.6.32.14/drivers/ata/libata-acpi.c 20435diff -urNp linux-2.6.32.15/drivers/ata/libata-acpi.c linux-2.6.32.15/drivers/ata/libata-acpi.c
20424--- linux-2.6.32.14/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400 20436--- linux-2.6.32.15/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400
20425+++ linux-2.6.32.14/drivers/ata/libata-acpi.c 2010-05-28 21:27:15.203165017 -0400 20437+++ linux-2.6.32.15/drivers/ata/libata-acpi.c 2010-05-28 21:27:15.203165017 -0400
20426@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han 20438@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
20427 ata_acpi_uevent(dev->link->ap, dev, event); 20439 ata_acpi_uevent(dev->link->ap, dev, event);
20428 } 20440 }
@@ -20438,9 +20450,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/libata-acpi.c linux-2.6.32.14/drivers/ata
20438 .handler = ata_acpi_ap_notify_dock, 20450 .handler = ata_acpi_ap_notify_dock,
20439 .uevent = ata_acpi_ap_uevent, 20451 .uevent = ata_acpi_ap_uevent,
20440 }; 20452 };
20441diff -urNp linux-2.6.32.14/drivers/ata/libata-core.c linux-2.6.32.14/drivers/ata/libata-core.c 20453diff -urNp linux-2.6.32.15/drivers/ata/libata-core.c linux-2.6.32.15/drivers/ata/libata-core.c
20442--- linux-2.6.32.14/drivers/ata/libata-core.c 2010-04-29 17:49:37.689144697 -0400 20454--- linux-2.6.32.15/drivers/ata/libata-core.c 2010-04-29 17:49:37.689144697 -0400
20443+++ linux-2.6.32.14/drivers/ata/libata-core.c 2010-05-28 21:27:15.207155482 -0400 20455+++ linux-2.6.32.15/drivers/ata/libata-core.c 2010-05-28 21:27:15.207155482 -0400
20444@@ -896,7 +896,7 @@ static const struct ata_xfer_ent { 20456@@ -896,7 +896,7 @@ static const struct ata_xfer_ent {
20445 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, 20457 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
20446 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, 20458 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
@@ -20514,9 +20526,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/libata-core.c linux-2.6.32.14/drivers/ata
20514 .qc_prep = ata_noop_qc_prep, 20526 .qc_prep = ata_noop_qc_prep,
20515 .qc_issue = ata_dummy_qc_issue, 20527 .qc_issue = ata_dummy_qc_issue,
20516 .error_handler = ata_dummy_error_handler, 20528 .error_handler = ata_dummy_error_handler,
20517diff -urNp linux-2.6.32.14/drivers/ata/libata-eh.c linux-2.6.32.14/drivers/ata/libata-eh.c 20529diff -urNp linux-2.6.32.15/drivers/ata/libata-eh.c linux-2.6.32.15/drivers/ata/libata-eh.c
20518--- linux-2.6.32.14/drivers/ata/libata-eh.c 2010-05-15 13:20:18.462978524 -0400 20530--- linux-2.6.32.15/drivers/ata/libata-eh.c 2010-05-15 13:20:18.462978524 -0400
20519+++ linux-2.6.32.14/drivers/ata/libata-eh.c 2010-05-28 21:27:15.215165530 -0400 20531+++ linux-2.6.32.15/drivers/ata/libata-eh.c 2010-05-28 21:27:15.215165530 -0400
20520@@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_ 20532@@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_
20521 */ 20533 */
20522 void ata_std_error_handler(struct ata_port *ap) 20534 void ata_std_error_handler(struct ata_port *ap)
@@ -20526,9 +20538,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/libata-eh.c linux-2.6.32.14/drivers/ata/l
20526 ata_reset_fn_t hardreset = ops->hardreset; 20538 ata_reset_fn_t hardreset = ops->hardreset;
20527 20539
20528 /* ignore built-in hardreset if SCR access is not available */ 20540 /* ignore built-in hardreset if SCR access is not available */
20529diff -urNp linux-2.6.32.14/drivers/ata/libata-pmp.c linux-2.6.32.14/drivers/ata/libata-pmp.c 20541diff -urNp linux-2.6.32.15/drivers/ata/libata-pmp.c linux-2.6.32.15/drivers/ata/libata-pmp.c
20530--- linux-2.6.32.14/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400 20542--- linux-2.6.32.15/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400
20531+++ linux-2.6.32.14/drivers/ata/libata-pmp.c 2010-05-28 21:27:15.215165530 -0400 20543+++ linux-2.6.32.15/drivers/ata/libata-pmp.c 2010-05-28 21:27:15.215165530 -0400
20532@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str 20544@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
20533 */ 20545 */
20534 static int sata_pmp_eh_recover(struct ata_port *ap) 20546 static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -20538,9 +20550,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/libata-pmp.c linux-2.6.32.14/drivers/ata/
20538 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; 20550 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
20539 struct ata_link *pmp_link = &ap->link; 20551 struct ata_link *pmp_link = &ap->link;
20540 struct ata_device *pmp_dev = pmp_link->device; 20552 struct ata_device *pmp_dev = pmp_link->device;
20541diff -urNp linux-2.6.32.14/drivers/ata/pata_acpi.c linux-2.6.32.14/drivers/ata/pata_acpi.c 20553diff -urNp linux-2.6.32.15/drivers/ata/pata_acpi.c linux-2.6.32.15/drivers/ata/pata_acpi.c
20542--- linux-2.6.32.14/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400 20554--- linux-2.6.32.15/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400
20543+++ linux-2.6.32.14/drivers/ata/pata_acpi.c 2010-05-28 21:27:15.215165530 -0400 20555+++ linux-2.6.32.15/drivers/ata/pata_acpi.c 2010-05-28 21:27:15.215165530 -0400
20544@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s 20556@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
20545 ATA_BMDMA_SHT(DRV_NAME), 20557 ATA_BMDMA_SHT(DRV_NAME),
20546 }; 20558 };
@@ -20550,9 +20562,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_acpi.c linux-2.6.32.14/drivers/ata/p
20550 .inherits = &ata_bmdma_port_ops, 20562 .inherits = &ata_bmdma_port_ops,
20551 .qc_issue = pacpi_qc_issue, 20563 .qc_issue = pacpi_qc_issue,
20552 .cable_detect = pacpi_cable_detect, 20564 .cable_detect = pacpi_cable_detect,
20553diff -urNp linux-2.6.32.14/drivers/ata/pata_ali.c linux-2.6.32.14/drivers/ata/pata_ali.c 20565diff -urNp linux-2.6.32.15/drivers/ata/pata_ali.c linux-2.6.32.15/drivers/ata/pata_ali.c
20554--- linux-2.6.32.14/drivers/ata/pata_ali.c 2010-04-29 17:49:37.689144697 -0400 20566--- linux-2.6.32.15/drivers/ata/pata_ali.c 2010-04-29 17:49:37.689144697 -0400
20555+++ linux-2.6.32.14/drivers/ata/pata_ali.c 2010-05-28 21:27:15.215165530 -0400 20567+++ linux-2.6.32.15/drivers/ata/pata_ali.c 2010-05-28 21:27:15.215165530 -0400
20556@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht 20568@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
20557 * Port operations for PIO only ALi 20569 * Port operations for PIO only ALi
20558 */ 20570 */
@@ -20598,9 +20610,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_ali.c linux-2.6.32.14/drivers/ata/pa
20598 .inherits = &ali_dma_base_ops, 20610 .inherits = &ali_dma_base_ops,
20599 .check_atapi_dma = ali_check_atapi_dma, 20611 .check_atapi_dma = ali_check_atapi_dma,
20600 .dev_config = ali_warn_atapi_dma, 20612 .dev_config = ali_warn_atapi_dma,
20601diff -urNp linux-2.6.32.14/drivers/ata/pata_amd.c linux-2.6.32.14/drivers/ata/pata_amd.c 20613diff -urNp linux-2.6.32.15/drivers/ata/pata_amd.c linux-2.6.32.15/drivers/ata/pata_amd.c
20602--- linux-2.6.32.14/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400 20614--- linux-2.6.32.15/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400
20603+++ linux-2.6.32.14/drivers/ata/pata_amd.c 2010-05-28 21:27:15.215165530 -0400 20615+++ linux-2.6.32.15/drivers/ata/pata_amd.c 2010-05-28 21:27:15.215165530 -0400
20604@@ -397,28 +397,28 @@ static const struct ata_port_operations 20616@@ -397,28 +397,28 @@ static const struct ata_port_operations
20605 .prereset = amd_pre_reset, 20617 .prereset = amd_pre_reset,
20606 }; 20618 };
@@ -20650,9 +20662,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_amd.c linux-2.6.32.14/drivers/ata/pa
20650 .inherits = &nv_base_port_ops, 20662 .inherits = &nv_base_port_ops,
20651 .set_piomode = nv133_set_piomode, 20663 .set_piomode = nv133_set_piomode,
20652 .set_dmamode = nv133_set_dmamode, 20664 .set_dmamode = nv133_set_dmamode,
20653diff -urNp linux-2.6.32.14/drivers/ata/pata_artop.c linux-2.6.32.14/drivers/ata/pata_artop.c 20665diff -urNp linux-2.6.32.15/drivers/ata/pata_artop.c linux-2.6.32.15/drivers/ata/pata_artop.c
20654--- linux-2.6.32.14/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400 20666--- linux-2.6.32.15/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400
20655+++ linux-2.6.32.14/drivers/ata/pata_artop.c 2010-05-28 21:27:15.215165530 -0400 20667+++ linux-2.6.32.15/drivers/ata/pata_artop.c 2010-05-28 21:27:15.215165530 -0400
20656@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s 20668@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
20657 ATA_BMDMA_SHT(DRV_NAME), 20669 ATA_BMDMA_SHT(DRV_NAME),
20658 }; 20670 };
@@ -20671,9 +20683,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_artop.c linux-2.6.32.14/drivers/ata/
20671 .inherits = &ata_bmdma_port_ops, 20683 .inherits = &ata_bmdma_port_ops,
20672 .cable_detect = artop6260_cable_detect, 20684 .cable_detect = artop6260_cable_detect,
20673 .set_piomode = artop6260_set_piomode, 20685 .set_piomode = artop6260_set_piomode,
20674diff -urNp linux-2.6.32.14/drivers/ata/pata_at32.c linux-2.6.32.14/drivers/ata/pata_at32.c 20686diff -urNp linux-2.6.32.15/drivers/ata/pata_at32.c linux-2.6.32.15/drivers/ata/pata_at32.c
20675--- linux-2.6.32.14/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400 20687--- linux-2.6.32.15/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400
20676+++ linux-2.6.32.14/drivers/ata/pata_at32.c 2010-05-28 21:27:15.215165530 -0400 20688+++ linux-2.6.32.15/drivers/ata/pata_at32.c 2010-05-28 21:27:15.215165530 -0400
20677@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh 20689@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
20678 ATA_PIO_SHT(DRV_NAME), 20690 ATA_PIO_SHT(DRV_NAME),
20679 }; 20691 };
@@ -20683,9 +20695,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_at32.c linux-2.6.32.14/drivers/ata/p
20683 .inherits = &ata_sff_port_ops, 20695 .inherits = &ata_sff_port_ops,
20684 .cable_detect = ata_cable_40wire, 20696 .cable_detect = ata_cable_40wire,
20685 .set_piomode = pata_at32_set_piomode, 20697 .set_piomode = pata_at32_set_piomode,
20686diff -urNp linux-2.6.32.14/drivers/ata/pata_at91.c linux-2.6.32.14/drivers/ata/pata_at91.c 20698diff -urNp linux-2.6.32.15/drivers/ata/pata_at91.c linux-2.6.32.15/drivers/ata/pata_at91.c
20687--- linux-2.6.32.14/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400 20699--- linux-2.6.32.15/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400
20688+++ linux-2.6.32.14/drivers/ata/pata_at91.c 2010-05-28 21:27:15.227169983 -0400 20700+++ linux-2.6.32.15/drivers/ata/pata_at91.c 2010-05-28 21:27:15.227169983 -0400
20689@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at 20701@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
20690 ATA_PIO_SHT(DRV_NAME), 20702 ATA_PIO_SHT(DRV_NAME),
20691 }; 20703 };
@@ -20695,9 +20707,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_at91.c linux-2.6.32.14/drivers/ata/p
20695 .inherits = &ata_sff_port_ops, 20707 .inherits = &ata_sff_port_ops,
20696 20708
20697 .sff_data_xfer = pata_at91_data_xfer_noirq, 20709 .sff_data_xfer = pata_at91_data_xfer_noirq,
20698diff -urNp linux-2.6.32.14/drivers/ata/pata_atiixp.c linux-2.6.32.14/drivers/ata/pata_atiixp.c 20710diff -urNp linux-2.6.32.15/drivers/ata/pata_atiixp.c linux-2.6.32.15/drivers/ata/pata_atiixp.c
20699--- linux-2.6.32.14/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400 20711--- linux-2.6.32.15/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400
20700+++ linux-2.6.32.14/drivers/ata/pata_atiixp.c 2010-05-28 21:27:15.227169983 -0400 20712+++ linux-2.6.32.15/drivers/ata/pata_atiixp.c 2010-05-28 21:27:15.227169983 -0400
20701@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ 20713@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
20702 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 20714 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
20703 }; 20715 };
@@ -20707,9 +20719,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_atiixp.c linux-2.6.32.14/drivers/ata
20707 .inherits = &ata_bmdma_port_ops, 20719 .inherits = &ata_bmdma_port_ops,
20708 20720
20709 .qc_prep = ata_sff_dumb_qc_prep, 20721 .qc_prep = ata_sff_dumb_qc_prep,
20710diff -urNp linux-2.6.32.14/drivers/ata/pata_atp867x.c linux-2.6.32.14/drivers/ata/pata_atp867x.c 20722diff -urNp linux-2.6.32.15/drivers/ata/pata_atp867x.c linux-2.6.32.15/drivers/ata/pata_atp867x.c
20711--- linux-2.6.32.14/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400 20723--- linux-2.6.32.15/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400
20712+++ linux-2.6.32.14/drivers/ata/pata_atp867x.c 2010-05-28 21:27:15.227169983 -0400 20724+++ linux-2.6.32.15/drivers/ata/pata_atp867x.c 2010-05-28 21:27:15.227169983 -0400
20713@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x 20725@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
20714 ATA_BMDMA_SHT(DRV_NAME), 20726 ATA_BMDMA_SHT(DRV_NAME),
20715 }; 20727 };
@@ -20719,9 +20731,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_atp867x.c linux-2.6.32.14/drivers/at
20719 .inherits = &ata_bmdma_port_ops, 20731 .inherits = &ata_bmdma_port_ops,
20720 .cable_detect = atp867x_cable_detect, 20732 .cable_detect = atp867x_cable_detect,
20721 .set_piomode = atp867x_set_piomode, 20733 .set_piomode = atp867x_set_piomode,
20722diff -urNp linux-2.6.32.14/drivers/ata/pata_bf54x.c linux-2.6.32.14/drivers/ata/pata_bf54x.c 20734diff -urNp linux-2.6.32.15/drivers/ata/pata_bf54x.c linux-2.6.32.15/drivers/ata/pata_bf54x.c
20723--- linux-2.6.32.14/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400 20735--- linux-2.6.32.15/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400
20724+++ linux-2.6.32.14/drivers/ata/pata_bf54x.c 2010-05-28 21:27:15.235166526 -0400 20736+++ linux-2.6.32.15/drivers/ata/pata_bf54x.c 2010-05-28 21:27:15.235166526 -0400
20725@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh 20737@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
20726 .dma_boundary = ATA_DMA_BOUNDARY, 20738 .dma_boundary = ATA_DMA_BOUNDARY,
20727 }; 20739 };
@@ -20731,9 +20743,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_bf54x.c linux-2.6.32.14/drivers/ata/
20731 .inherits = &ata_sff_port_ops, 20743 .inherits = &ata_sff_port_ops,
20732 20744
20733 .set_piomode = bfin_set_piomode, 20745 .set_piomode = bfin_set_piomode,
20734diff -urNp linux-2.6.32.14/drivers/ata/pata_cmd640.c linux-2.6.32.14/drivers/ata/pata_cmd640.c 20746diff -urNp linux-2.6.32.15/drivers/ata/pata_cmd640.c linux-2.6.32.15/drivers/ata/pata_cmd640.c
20735--- linux-2.6.32.14/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400 20747--- linux-2.6.32.15/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400
20736+++ linux-2.6.32.14/drivers/ata/pata_cmd640.c 2010-05-28 21:27:15.235166526 -0400 20748+++ linux-2.6.32.15/drivers/ata/pata_cmd640.c 2010-05-28 21:27:15.235166526 -0400
20737@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ 20749@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
20738 ATA_BMDMA_SHT(DRV_NAME), 20750 ATA_BMDMA_SHT(DRV_NAME),
20739 }; 20751 };
@@ -20743,9 +20755,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_cmd640.c linux-2.6.32.14/drivers/ata
20743 .inherits = &ata_bmdma_port_ops, 20755 .inherits = &ata_bmdma_port_ops,
20744 /* In theory xfer_noirq is not needed once we kill the prefetcher */ 20756 /* In theory xfer_noirq is not needed once we kill the prefetcher */
20745 .sff_data_xfer = ata_sff_data_xfer_noirq, 20757 .sff_data_xfer = ata_sff_data_xfer_noirq,
20746diff -urNp linux-2.6.32.14/drivers/ata/pata_cmd64x.c linux-2.6.32.14/drivers/ata/pata_cmd64x.c 20758diff -urNp linux-2.6.32.15/drivers/ata/pata_cmd64x.c linux-2.6.32.15/drivers/ata/pata_cmd64x.c
20747--- linux-2.6.32.14/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400 20759--- linux-2.6.32.15/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400
20748+++ linux-2.6.32.14/drivers/ata/pata_cmd64x.c 2010-05-28 21:27:15.235166526 -0400 20760+++ linux-2.6.32.15/drivers/ata/pata_cmd64x.c 2010-05-28 21:27:15.235166526 -0400
20749@@ -275,18 +275,18 @@ static const struct ata_port_operations 20761@@ -275,18 +275,18 @@ static const struct ata_port_operations
20750 .set_dmamode = cmd64x_set_dmamode, 20762 .set_dmamode = cmd64x_set_dmamode,
20751 }; 20763 };
@@ -20768,9 +20780,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_cmd64x.c linux-2.6.32.14/drivers/ata
20768 .inherits = &cmd64x_base_ops, 20780 .inherits = &cmd64x_base_ops,
20769 .bmdma_stop = cmd648_bmdma_stop, 20781 .bmdma_stop = cmd648_bmdma_stop,
20770 .cable_detect = cmd648_cable_detect, 20782 .cable_detect = cmd648_cable_detect,
20771diff -urNp linux-2.6.32.14/drivers/ata/pata_cs5520.c linux-2.6.32.14/drivers/ata/pata_cs5520.c 20783diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5520.c linux-2.6.32.15/drivers/ata/pata_cs5520.c
20772--- linux-2.6.32.14/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400 20784--- linux-2.6.32.15/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400
20773+++ linux-2.6.32.14/drivers/ata/pata_cs5520.c 2010-05-28 21:27:15.239154462 -0400 20785+++ linux-2.6.32.15/drivers/ata/pata_cs5520.c 2010-05-28 21:27:15.239154462 -0400
20774@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ 20786@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
20775 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 20787 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
20776 }; 20788 };
@@ -20780,9 +20792,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_cs5520.c linux-2.6.32.14/drivers/ata
20780 .inherits = &ata_bmdma_port_ops, 20792 .inherits = &ata_bmdma_port_ops,
20781 .qc_prep = ata_sff_dumb_qc_prep, 20793 .qc_prep = ata_sff_dumb_qc_prep,
20782 .cable_detect = ata_cable_40wire, 20794 .cable_detect = ata_cable_40wire,
20783diff -urNp linux-2.6.32.14/drivers/ata/pata_cs5530.c linux-2.6.32.14/drivers/ata/pata_cs5530.c 20795diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5530.c linux-2.6.32.15/drivers/ata/pata_cs5530.c
20784--- linux-2.6.32.14/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400 20796--- linux-2.6.32.15/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400
20785+++ linux-2.6.32.14/drivers/ata/pata_cs5530.c 2010-05-28 21:27:15.239154462 -0400 20797+++ linux-2.6.32.15/drivers/ata/pata_cs5530.c 2010-05-28 21:27:15.239154462 -0400
20786@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ 20798@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
20787 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 20799 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
20788 }; 20800 };
@@ -20792,9 +20804,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_cs5530.c linux-2.6.32.14/drivers/ata
20792 .inherits = &ata_bmdma_port_ops, 20804 .inherits = &ata_bmdma_port_ops,
20793 20805
20794 .qc_prep = ata_sff_dumb_qc_prep, 20806 .qc_prep = ata_sff_dumb_qc_prep,
20795diff -urNp linux-2.6.32.14/drivers/ata/pata_cs5535.c linux-2.6.32.14/drivers/ata/pata_cs5535.c 20807diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5535.c linux-2.6.32.15/drivers/ata/pata_cs5535.c
20796--- linux-2.6.32.14/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400 20808--- linux-2.6.32.15/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400
20797+++ linux-2.6.32.14/drivers/ata/pata_cs5535.c 2010-05-28 21:27:15.239154462 -0400 20809+++ linux-2.6.32.15/drivers/ata/pata_cs5535.c 2010-05-28 21:27:15.239154462 -0400
20798@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ 20810@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
20799 ATA_BMDMA_SHT(DRV_NAME), 20811 ATA_BMDMA_SHT(DRV_NAME),
20800 }; 20812 };
@@ -20804,9 +20816,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_cs5535.c linux-2.6.32.14/drivers/ata
20804 .inherits = &ata_bmdma_port_ops, 20816 .inherits = &ata_bmdma_port_ops,
20805 .cable_detect = cs5535_cable_detect, 20817 .cable_detect = cs5535_cable_detect,
20806 .set_piomode = cs5535_set_piomode, 20818 .set_piomode = cs5535_set_piomode,
20807diff -urNp linux-2.6.32.14/drivers/ata/pata_cs5536.c linux-2.6.32.14/drivers/ata/pata_cs5536.c 20819diff -urNp linux-2.6.32.15/drivers/ata/pata_cs5536.c linux-2.6.32.15/drivers/ata/pata_cs5536.c
20808--- linux-2.6.32.14/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400 20820--- linux-2.6.32.15/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400
20809+++ linux-2.6.32.14/drivers/ata/pata_cs5536.c 2010-05-28 21:27:15.239154462 -0400 20821+++ linux-2.6.32.15/drivers/ata/pata_cs5536.c 2010-05-28 21:27:15.239154462 -0400
20810@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ 20822@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
20811 ATA_BMDMA_SHT(DRV_NAME), 20823 ATA_BMDMA_SHT(DRV_NAME),
20812 }; 20824 };
@@ -20816,9 +20828,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_cs5536.c linux-2.6.32.14/drivers/ata
20816 .inherits = &ata_bmdma_port_ops, 20828 .inherits = &ata_bmdma_port_ops,
20817 .cable_detect = cs5536_cable_detect, 20829 .cable_detect = cs5536_cable_detect,
20818 .set_piomode = cs5536_set_piomode, 20830 .set_piomode = cs5536_set_piomode,
20819diff -urNp linux-2.6.32.14/drivers/ata/pata_cypress.c linux-2.6.32.14/drivers/ata/pata_cypress.c 20831diff -urNp linux-2.6.32.15/drivers/ata/pata_cypress.c linux-2.6.32.15/drivers/ata/pata_cypress.c
20820--- linux-2.6.32.14/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400 20832--- linux-2.6.32.15/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400
20821+++ linux-2.6.32.14/drivers/ata/pata_cypress.c 2010-05-28 21:27:15.243179627 -0400 20833+++ linux-2.6.32.15/drivers/ata/pata_cypress.c 2010-05-28 21:27:15.243179627 -0400
20822@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 20834@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
20823 ATA_BMDMA_SHT(DRV_NAME), 20835 ATA_BMDMA_SHT(DRV_NAME),
20824 }; 20836 };
@@ -20828,9 +20840,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_cypress.c linux-2.6.32.14/drivers/at
20828 .inherits = &ata_bmdma_port_ops, 20840 .inherits = &ata_bmdma_port_ops,
20829 .cable_detect = ata_cable_40wire, 20841 .cable_detect = ata_cable_40wire,
20830 .set_piomode = cy82c693_set_piomode, 20842 .set_piomode = cy82c693_set_piomode,
20831diff -urNp linux-2.6.32.14/drivers/ata/pata_efar.c linux-2.6.32.14/drivers/ata/pata_efar.c 20843diff -urNp linux-2.6.32.15/drivers/ata/pata_efar.c linux-2.6.32.15/drivers/ata/pata_efar.c
20832--- linux-2.6.32.14/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400 20844--- linux-2.6.32.15/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400
20833+++ linux-2.6.32.14/drivers/ata/pata_efar.c 2010-05-28 21:27:15.243179627 -0400 20845+++ linux-2.6.32.15/drivers/ata/pata_efar.c 2010-05-28 21:27:15.243179627 -0400
20834@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh 20846@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
20835 ATA_BMDMA_SHT(DRV_NAME), 20847 ATA_BMDMA_SHT(DRV_NAME),
20836 }; 20848 };
@@ -20840,9 +20852,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_efar.c linux-2.6.32.14/drivers/ata/p
20840 .inherits = &ata_bmdma_port_ops, 20852 .inherits = &ata_bmdma_port_ops,
20841 .cable_detect = efar_cable_detect, 20853 .cable_detect = efar_cable_detect,
20842 .set_piomode = efar_set_piomode, 20854 .set_piomode = efar_set_piomode,
20843diff -urNp linux-2.6.32.14/drivers/ata/pata_hpt366.c linux-2.6.32.14/drivers/ata/pata_hpt366.c 20855diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt366.c linux-2.6.32.15/drivers/ata/pata_hpt366.c
20844--- linux-2.6.32.14/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400 20856--- linux-2.6.32.15/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400
20845+++ linux-2.6.32.14/drivers/ata/pata_hpt366.c 2010-05-28 21:27:15.243179627 -0400 20857+++ linux-2.6.32.15/drivers/ata/pata_hpt366.c 2010-05-28 21:27:15.243179627 -0400
20846@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ 20858@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
20847 * Configuration for HPT366/68 20859 * Configuration for HPT366/68
20848 */ 20860 */
@@ -20852,9 +20864,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_hpt366.c linux-2.6.32.14/drivers/ata
20852 .inherits = &ata_bmdma_port_ops, 20864 .inherits = &ata_bmdma_port_ops,
20853 .cable_detect = hpt36x_cable_detect, 20865 .cable_detect = hpt36x_cable_detect,
20854 .mode_filter = hpt366_filter, 20866 .mode_filter = hpt366_filter,
20855diff -urNp linux-2.6.32.14/drivers/ata/pata_hpt37x.c linux-2.6.32.14/drivers/ata/pata_hpt37x.c 20867diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt37x.c linux-2.6.32.15/drivers/ata/pata_hpt37x.c
20856--- linux-2.6.32.14/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400 20868--- linux-2.6.32.15/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400
20857+++ linux-2.6.32.14/drivers/ata/pata_hpt37x.c 2010-05-28 21:27:15.247200461 -0400 20869+++ linux-2.6.32.15/drivers/ata/pata_hpt37x.c 2010-05-28 21:27:15.247200461 -0400
20858@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ 20870@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
20859 * Configuration for HPT370 20871 * Configuration for HPT370
20860 */ 20872 */
@@ -20891,9 +20903,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_hpt37x.c linux-2.6.32.14/drivers/ata
20891 .inherits = &hpt372_port_ops, 20903 .inherits = &hpt372_port_ops,
20892 .prereset = hpt374_fn1_pre_reset, 20904 .prereset = hpt374_fn1_pre_reset,
20893 }; 20905 };
20894diff -urNp linux-2.6.32.14/drivers/ata/pata_hpt3x2n.c linux-2.6.32.14/drivers/ata/pata_hpt3x2n.c 20906diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c
20895--- linux-2.6.32.14/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400 20907--- linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400
20896+++ linux-2.6.32.14/drivers/ata/pata_hpt3x2n.c 2010-05-28 21:27:15.247200461 -0400 20908+++ linux-2.6.32.15/drivers/ata/pata_hpt3x2n.c 2010-05-28 21:27:15.247200461 -0400
20897@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n 20909@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
20898 * Configuration for HPT3x2n. 20910 * Configuration for HPT3x2n.
20899 */ 20911 */
@@ -20903,9 +20915,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_hpt3x2n.c linux-2.6.32.14/drivers/at
20903 .inherits = &ata_bmdma_port_ops, 20915 .inherits = &ata_bmdma_port_ops,
20904 20916
20905 .bmdma_stop = hpt3x2n_bmdma_stop, 20917 .bmdma_stop = hpt3x2n_bmdma_stop,
20906diff -urNp linux-2.6.32.14/drivers/ata/pata_hpt3x3.c linux-2.6.32.14/drivers/ata/pata_hpt3x3.c 20918diff -urNp linux-2.6.32.15/drivers/ata/pata_hpt3x3.c linux-2.6.32.15/drivers/ata/pata_hpt3x3.c
20907--- linux-2.6.32.14/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400 20919--- linux-2.6.32.15/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400
20908+++ linux-2.6.32.14/drivers/ata/pata_hpt3x3.c 2010-05-28 21:27:15.247200461 -0400 20920+++ linux-2.6.32.15/drivers/ata/pata_hpt3x3.c 2010-05-28 21:27:15.247200461 -0400
20909@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ 20921@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
20910 ATA_BMDMA_SHT(DRV_NAME), 20922 ATA_BMDMA_SHT(DRV_NAME),
20911 }; 20923 };
@@ -20915,9 +20927,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_hpt3x3.c linux-2.6.32.14/drivers/ata
20915 .inherits = &ata_bmdma_port_ops, 20927 .inherits = &ata_bmdma_port_ops,
20916 .cable_detect = ata_cable_40wire, 20928 .cable_detect = ata_cable_40wire,
20917 .set_piomode = hpt3x3_set_piomode, 20929 .set_piomode = hpt3x3_set_piomode,
20918diff -urNp linux-2.6.32.14/drivers/ata/pata_icside.c linux-2.6.32.14/drivers/ata/pata_icside.c 20930diff -urNp linux-2.6.32.15/drivers/ata/pata_icside.c linux-2.6.32.15/drivers/ata/pata_icside.c
20919--- linux-2.6.32.14/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400 20931--- linux-2.6.32.15/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400
20920+++ linux-2.6.32.14/drivers/ata/pata_icside.c 2010-05-28 21:27:15.251151122 -0400 20932+++ linux-2.6.32.15/drivers/ata/pata_icside.c 2010-05-28 21:27:15.251151122 -0400
20921@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct 20933@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
20922 } 20934 }
20923 } 20935 }
@@ -20927,9 +20939,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_icside.c linux-2.6.32.14/drivers/ata
20927 .inherits = &ata_sff_port_ops, 20939 .inherits = &ata_sff_port_ops,
20928 /* no need to build any PRD tables for DMA */ 20940 /* no need to build any PRD tables for DMA */
20929 .qc_prep = ata_noop_qc_prep, 20941 .qc_prep = ata_noop_qc_prep,
20930diff -urNp linux-2.6.32.14/drivers/ata/pata_isapnp.c linux-2.6.32.14/drivers/ata/pata_isapnp.c 20942diff -urNp linux-2.6.32.15/drivers/ata/pata_isapnp.c linux-2.6.32.15/drivers/ata/pata_isapnp.c
20931--- linux-2.6.32.14/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400 20943--- linux-2.6.32.15/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400
20932+++ linux-2.6.32.14/drivers/ata/pata_isapnp.c 2010-05-28 21:27:15.251151122 -0400 20944+++ linux-2.6.32.15/drivers/ata/pata_isapnp.c 2010-05-28 21:27:15.251151122 -0400
20933@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ 20945@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
20934 ATA_PIO_SHT(DRV_NAME), 20946 ATA_PIO_SHT(DRV_NAME),
20935 }; 20947 };
@@ -20945,9 +20957,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_isapnp.c linux-2.6.32.14/drivers/ata
20945 .inherits = &ata_sff_port_ops, 20957 .inherits = &ata_sff_port_ops,
20946 .cable_detect = ata_cable_40wire, 20958 .cable_detect = ata_cable_40wire,
20947 /* No altstatus so we don't want to use the lost interrupt poll */ 20959 /* No altstatus so we don't want to use the lost interrupt poll */
20948diff -urNp linux-2.6.32.14/drivers/ata/pata_it8213.c linux-2.6.32.14/drivers/ata/pata_it8213.c 20960diff -urNp linux-2.6.32.15/drivers/ata/pata_it8213.c linux-2.6.32.15/drivers/ata/pata_it8213.c
20949--- linux-2.6.32.14/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400 20961--- linux-2.6.32.15/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400
20950+++ linux-2.6.32.14/drivers/ata/pata_it8213.c 2010-05-28 21:27:15.251151122 -0400 20962+++ linux-2.6.32.15/drivers/ata/pata_it8213.c 2010-05-28 21:27:15.251151122 -0400
20951@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ 20963@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
20952 }; 20964 };
20953 20965
@@ -20957,9 +20969,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_it8213.c linux-2.6.32.14/drivers/ata
20957 .inherits = &ata_bmdma_port_ops, 20969 .inherits = &ata_bmdma_port_ops,
20958 .cable_detect = it8213_cable_detect, 20970 .cable_detect = it8213_cable_detect,
20959 .set_piomode = it8213_set_piomode, 20971 .set_piomode = it8213_set_piomode,
20960diff -urNp linux-2.6.32.14/drivers/ata/pata_it821x.c linux-2.6.32.14/drivers/ata/pata_it821x.c 20972diff -urNp linux-2.6.32.15/drivers/ata/pata_it821x.c linux-2.6.32.15/drivers/ata/pata_it821x.c
20961--- linux-2.6.32.14/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400 20973--- linux-2.6.32.15/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400
20962+++ linux-2.6.32.14/drivers/ata/pata_it821x.c 2010-05-28 21:27:15.251151122 -0400 20974+++ linux-2.6.32.15/drivers/ata/pata_it821x.c 2010-05-28 21:27:15.251151122 -0400
20963@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ 20975@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
20964 ATA_BMDMA_SHT(DRV_NAME), 20976 ATA_BMDMA_SHT(DRV_NAME),
20965 }; 20977 };
@@ -20987,9 +20999,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_it821x.c linux-2.6.32.14/drivers/ata
20987 .inherits = &ata_bmdma_port_ops, 20999 .inherits = &ata_bmdma_port_ops,
20988 21000
20989 .check_atapi_dma= it821x_check_atapi_dma, 21001 .check_atapi_dma= it821x_check_atapi_dma,
20990diff -urNp linux-2.6.32.14/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.14/drivers/ata/pata_ixp4xx_cf.c 21002diff -urNp linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c
20991--- linux-2.6.32.14/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400 21003--- linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400
20992+++ linux-2.6.32.14/drivers/ata/pata_ixp4xx_cf.c 2010-05-28 21:27:15.251151122 -0400 21004+++ linux-2.6.32.15/drivers/ata/pata_ixp4xx_cf.c 2010-05-28 21:27:15.251151122 -0400
20993@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ 21005@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
20994 ATA_PIO_SHT(DRV_NAME), 21006 ATA_PIO_SHT(DRV_NAME),
20995 }; 21007 };
@@ -20999,9 +21011,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.14/drivers/
20999 .inherits = &ata_sff_port_ops, 21011 .inherits = &ata_sff_port_ops,
21000 .sff_data_xfer = ixp4xx_mmio_data_xfer, 21012 .sff_data_xfer = ixp4xx_mmio_data_xfer,
21001 .cable_detect = ata_cable_40wire, 21013 .cable_detect = ata_cable_40wire,
21002diff -urNp linux-2.6.32.14/drivers/ata/pata_jmicron.c linux-2.6.32.14/drivers/ata/pata_jmicron.c 21014diff -urNp linux-2.6.32.15/drivers/ata/pata_jmicron.c linux-2.6.32.15/drivers/ata/pata_jmicron.c
21003--- linux-2.6.32.14/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400 21015--- linux-2.6.32.15/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400
21004+++ linux-2.6.32.14/drivers/ata/pata_jmicron.c 2010-05-28 21:27:15.251151122 -0400 21016+++ linux-2.6.32.15/drivers/ata/pata_jmicron.c 2010-05-28 21:27:15.251151122 -0400
21005@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron 21017@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
21006 ATA_BMDMA_SHT(DRV_NAME), 21018 ATA_BMDMA_SHT(DRV_NAME),
21007 }; 21019 };
@@ -21011,9 +21023,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_jmicron.c linux-2.6.32.14/drivers/at
21011 .inherits = &ata_bmdma_port_ops, 21023 .inherits = &ata_bmdma_port_ops,
21012 .prereset = jmicron_pre_reset, 21024 .prereset = jmicron_pre_reset,
21013 }; 21025 };
21014diff -urNp linux-2.6.32.14/drivers/ata/pata_legacy.c linux-2.6.32.14/drivers/ata/pata_legacy.c 21026diff -urNp linux-2.6.32.15/drivers/ata/pata_legacy.c linux-2.6.32.15/drivers/ata/pata_legacy.c
21015--- linux-2.6.32.14/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400 21027--- linux-2.6.32.15/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400
21016+++ linux-2.6.32.14/drivers/ata/pata_legacy.c 2010-05-28 21:27:15.251151122 -0400 21028+++ linux-2.6.32.15/drivers/ata/pata_legacy.c 2010-05-28 21:27:15.251151122 -0400
21017@@ -106,7 +106,7 @@ struct legacy_probe { 21029@@ -106,7 +106,7 @@ struct legacy_probe {
21018 21030
21019 struct legacy_controller { 21031 struct legacy_controller {
@@ -21125,9 +21137,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_legacy.c linux-2.6.32.14/drivers/ata
21125 struct legacy_data *ld = &legacy_data[probe->slot]; 21137 struct legacy_data *ld = &legacy_data[probe->slot];
21126 struct ata_host *host = NULL; 21138 struct ata_host *host = NULL;
21127 struct ata_port *ap; 21139 struct ata_port *ap;
21128diff -urNp linux-2.6.32.14/drivers/ata/pata_marvell.c linux-2.6.32.14/drivers/ata/pata_marvell.c 21140diff -urNp linux-2.6.32.15/drivers/ata/pata_marvell.c linux-2.6.32.15/drivers/ata/pata_marvell.c
21129--- linux-2.6.32.14/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400 21141--- linux-2.6.32.15/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400
21130+++ linux-2.6.32.14/drivers/ata/pata_marvell.c 2010-05-28 21:27:15.251151122 -0400 21142+++ linux-2.6.32.15/drivers/ata/pata_marvell.c 2010-05-28 21:27:15.251151122 -0400
21131@@ -100,7 +100,7 @@ static struct scsi_host_template marvell 21143@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
21132 ATA_BMDMA_SHT(DRV_NAME), 21144 ATA_BMDMA_SHT(DRV_NAME),
21133 }; 21145 };
@@ -21137,9 +21149,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_marvell.c linux-2.6.32.14/drivers/at
21137 .inherits = &ata_bmdma_port_ops, 21149 .inherits = &ata_bmdma_port_ops,
21138 .cable_detect = marvell_cable_detect, 21150 .cable_detect = marvell_cable_detect,
21139 .prereset = marvell_pre_reset, 21151 .prereset = marvell_pre_reset,
21140diff -urNp linux-2.6.32.14/drivers/ata/pata_mpc52xx.c linux-2.6.32.14/drivers/ata/pata_mpc52xx.c 21152diff -urNp linux-2.6.32.15/drivers/ata/pata_mpc52xx.c linux-2.6.32.15/drivers/ata/pata_mpc52xx.c
21141--- linux-2.6.32.14/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400 21153--- linux-2.6.32.15/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400
21142+++ linux-2.6.32.14/drivers/ata/pata_mpc52xx.c 2010-05-28 21:27:15.251151122 -0400 21154+++ linux-2.6.32.15/drivers/ata/pata_mpc52xx.c 2010-05-28 21:27:15.251151122 -0400
21143@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx 21155@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
21144 ATA_PIO_SHT(DRV_NAME), 21156 ATA_PIO_SHT(DRV_NAME),
21145 }; 21157 };
@@ -21149,9 +21161,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_mpc52xx.c linux-2.6.32.14/drivers/at
21149 .inherits = &ata_sff_port_ops, 21161 .inherits = &ata_sff_port_ops,
21150 .sff_dev_select = mpc52xx_ata_dev_select, 21162 .sff_dev_select = mpc52xx_ata_dev_select,
21151 .set_piomode = mpc52xx_ata_set_piomode, 21163 .set_piomode = mpc52xx_ata_set_piomode,
21152diff -urNp linux-2.6.32.14/drivers/ata/pata_mpiix.c linux-2.6.32.14/drivers/ata/pata_mpiix.c 21164diff -urNp linux-2.6.32.15/drivers/ata/pata_mpiix.c linux-2.6.32.15/drivers/ata/pata_mpiix.c
21153--- linux-2.6.32.14/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400 21165--- linux-2.6.32.15/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400
21154+++ linux-2.6.32.14/drivers/ata/pata_mpiix.c 2010-05-28 21:27:15.251151122 -0400 21166+++ linux-2.6.32.15/drivers/ata/pata_mpiix.c 2010-05-28 21:27:15.251151122 -0400
21155@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s 21167@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
21156 ATA_PIO_SHT(DRV_NAME), 21168 ATA_PIO_SHT(DRV_NAME),
21157 }; 21169 };
@@ -21161,9 +21173,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_mpiix.c linux-2.6.32.14/drivers/ata/
21161 .inherits = &ata_sff_port_ops, 21173 .inherits = &ata_sff_port_ops,
21162 .qc_issue = mpiix_qc_issue, 21174 .qc_issue = mpiix_qc_issue,
21163 .cable_detect = ata_cable_40wire, 21175 .cable_detect = ata_cable_40wire,
21164diff -urNp linux-2.6.32.14/drivers/ata/pata_netcell.c linux-2.6.32.14/drivers/ata/pata_netcell.c 21176diff -urNp linux-2.6.32.15/drivers/ata/pata_netcell.c linux-2.6.32.15/drivers/ata/pata_netcell.c
21165--- linux-2.6.32.14/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400 21177--- linux-2.6.32.15/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400
21166+++ linux-2.6.32.14/drivers/ata/pata_netcell.c 2010-05-28 21:27:15.251151122 -0400 21178+++ linux-2.6.32.15/drivers/ata/pata_netcell.c 2010-05-28 21:27:15.251151122 -0400
21167@@ -34,7 +34,7 @@ static struct scsi_host_template netcell 21179@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
21168 ATA_BMDMA_SHT(DRV_NAME), 21180 ATA_BMDMA_SHT(DRV_NAME),
21169 }; 21181 };
@@ -21173,9 +21185,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_netcell.c linux-2.6.32.14/drivers/at
21173 .inherits = &ata_bmdma_port_ops, 21185 .inherits = &ata_bmdma_port_ops,
21174 .cable_detect = ata_cable_80wire, 21186 .cable_detect = ata_cable_80wire,
21175 .read_id = netcell_read_id, 21187 .read_id = netcell_read_id,
21176diff -urNp linux-2.6.32.14/drivers/ata/pata_ninja32.c linux-2.6.32.14/drivers/ata/pata_ninja32.c 21188diff -urNp linux-2.6.32.15/drivers/ata/pata_ninja32.c linux-2.6.32.15/drivers/ata/pata_ninja32.c
21177--- linux-2.6.32.14/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400 21189--- linux-2.6.32.15/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400
21178+++ linux-2.6.32.14/drivers/ata/pata_ninja32.c 2010-05-28 21:27:15.251151122 -0400 21190+++ linux-2.6.32.15/drivers/ata/pata_ninja32.c 2010-05-28 21:27:15.251151122 -0400
21179@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 21191@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
21180 ATA_BMDMA_SHT(DRV_NAME), 21192 ATA_BMDMA_SHT(DRV_NAME),
21181 }; 21193 };
@@ -21185,9 +21197,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_ninja32.c linux-2.6.32.14/drivers/at
21185 .inherits = &ata_bmdma_port_ops, 21197 .inherits = &ata_bmdma_port_ops,
21186 .sff_dev_select = ninja32_dev_select, 21198 .sff_dev_select = ninja32_dev_select,
21187 .cable_detect = ata_cable_40wire, 21199 .cable_detect = ata_cable_40wire,
21188diff -urNp linux-2.6.32.14/drivers/ata/pata_ns87410.c linux-2.6.32.14/drivers/ata/pata_ns87410.c 21200diff -urNp linux-2.6.32.15/drivers/ata/pata_ns87410.c linux-2.6.32.15/drivers/ata/pata_ns87410.c
21189--- linux-2.6.32.14/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400 21201--- linux-2.6.32.15/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400
21190+++ linux-2.6.32.14/drivers/ata/pata_ns87410.c 2010-05-28 21:27:15.251151122 -0400 21202+++ linux-2.6.32.15/drivers/ata/pata_ns87410.c 2010-05-28 21:27:15.251151122 -0400
21191@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 21203@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
21192 ATA_PIO_SHT(DRV_NAME), 21204 ATA_PIO_SHT(DRV_NAME),
21193 }; 21205 };
@@ -21197,9 +21209,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_ns87410.c linux-2.6.32.14/drivers/at
21197 .inherits = &ata_sff_port_ops, 21209 .inherits = &ata_sff_port_ops,
21198 .qc_issue = ns87410_qc_issue, 21210 .qc_issue = ns87410_qc_issue,
21199 .cable_detect = ata_cable_40wire, 21211 .cable_detect = ata_cable_40wire,
21200diff -urNp linux-2.6.32.14/drivers/ata/pata_ns87415.c linux-2.6.32.14/drivers/ata/pata_ns87415.c 21212diff -urNp linux-2.6.32.15/drivers/ata/pata_ns87415.c linux-2.6.32.15/drivers/ata/pata_ns87415.c
21201--- linux-2.6.32.14/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400 21213--- linux-2.6.32.15/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400
21202+++ linux-2.6.32.14/drivers/ata/pata_ns87415.c 2010-05-28 21:27:15.251151122 -0400 21214+++ linux-2.6.32.15/drivers/ata/pata_ns87415.c 2010-05-28 21:27:15.251151122 -0400
21203@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at 21215@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
21204 } 21216 }
21205 #endif /* 87560 SuperIO Support */ 21217 #endif /* 87560 SuperIO Support */
@@ -21218,9 +21230,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_ns87415.c linux-2.6.32.14/drivers/at
21218 .inherits = &ns87415_pata_ops, 21230 .inherits = &ns87415_pata_ops,
21219 .sff_tf_read = ns87560_tf_read, 21231 .sff_tf_read = ns87560_tf_read,
21220 .sff_check_status = ns87560_check_status, 21232 .sff_check_status = ns87560_check_status,
21221diff -urNp linux-2.6.32.14/drivers/ata/pata_octeon_cf.c linux-2.6.32.14/drivers/ata/pata_octeon_cf.c 21233diff -urNp linux-2.6.32.15/drivers/ata/pata_octeon_cf.c linux-2.6.32.15/drivers/ata/pata_octeon_cf.c
21222--- linux-2.6.32.14/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400 21234--- linux-2.6.32.15/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400
21223+++ linux-2.6.32.14/drivers/ata/pata_octeon_cf.c 2010-05-28 21:27:15.251151122 -0400 21235+++ linux-2.6.32.15/drivers/ata/pata_octeon_cf.c 2010-05-28 21:27:15.251151122 -0400
21224@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s 21236@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
21225 return 0; 21237 return 0;
21226 } 21238 }
@@ -21229,9 +21241,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_octeon_cf.c linux-2.6.32.14/drivers/
21229 static struct ata_port_operations octeon_cf_ops = { 21241 static struct ata_port_operations octeon_cf_ops = {
21230 .inherits = &ata_sff_port_ops, 21242 .inherits = &ata_sff_port_ops,
21231 .check_atapi_dma = octeon_cf_check_atapi_dma, 21243 .check_atapi_dma = octeon_cf_check_atapi_dma,
21232diff -urNp linux-2.6.32.14/drivers/ata/pata_oldpiix.c linux-2.6.32.14/drivers/ata/pata_oldpiix.c 21244diff -urNp linux-2.6.32.15/drivers/ata/pata_oldpiix.c linux-2.6.32.15/drivers/ata/pata_oldpiix.c
21233--- linux-2.6.32.14/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400 21245--- linux-2.6.32.15/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400
21234+++ linux-2.6.32.14/drivers/ata/pata_oldpiix.c 2010-05-28 21:27:15.251151122 -0400 21246+++ linux-2.6.32.15/drivers/ata/pata_oldpiix.c 2010-05-28 21:27:15.251151122 -0400
21235@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix 21247@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
21236 ATA_BMDMA_SHT(DRV_NAME), 21248 ATA_BMDMA_SHT(DRV_NAME),
21237 }; 21249 };
@@ -21241,9 +21253,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_oldpiix.c linux-2.6.32.14/drivers/at
21241 .inherits = &ata_bmdma_port_ops, 21253 .inherits = &ata_bmdma_port_ops,
21242 .qc_issue = oldpiix_qc_issue, 21254 .qc_issue = oldpiix_qc_issue,
21243 .cable_detect = ata_cable_40wire, 21255 .cable_detect = ata_cable_40wire,
21244diff -urNp linux-2.6.32.14/drivers/ata/pata_opti.c linux-2.6.32.14/drivers/ata/pata_opti.c 21256diff -urNp linux-2.6.32.15/drivers/ata/pata_opti.c linux-2.6.32.15/drivers/ata/pata_opti.c
21245--- linux-2.6.32.14/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400 21257--- linux-2.6.32.15/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400
21246+++ linux-2.6.32.14/drivers/ata/pata_opti.c 2010-05-28 21:27:15.263188611 -0400 21258+++ linux-2.6.32.15/drivers/ata/pata_opti.c 2010-05-28 21:27:15.263188611 -0400
21247@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh 21259@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
21248 ATA_PIO_SHT(DRV_NAME), 21260 ATA_PIO_SHT(DRV_NAME),
21249 }; 21261 };
@@ -21253,9 +21265,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_opti.c linux-2.6.32.14/drivers/ata/p
21253 .inherits = &ata_sff_port_ops, 21265 .inherits = &ata_sff_port_ops,
21254 .cable_detect = ata_cable_40wire, 21266 .cable_detect = ata_cable_40wire,
21255 .set_piomode = opti_set_piomode, 21267 .set_piomode = opti_set_piomode,
21256diff -urNp linux-2.6.32.14/drivers/ata/pata_optidma.c linux-2.6.32.14/drivers/ata/pata_optidma.c 21268diff -urNp linux-2.6.32.15/drivers/ata/pata_optidma.c linux-2.6.32.15/drivers/ata/pata_optidma.c
21257--- linux-2.6.32.14/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400 21269--- linux-2.6.32.15/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400
21258+++ linux-2.6.32.14/drivers/ata/pata_optidma.c 2010-05-28 21:27:15.263188611 -0400 21270+++ linux-2.6.32.15/drivers/ata/pata_optidma.c 2010-05-28 21:27:15.263188611 -0400
21259@@ -337,7 +337,7 @@ static struct scsi_host_template optidma 21271@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
21260 ATA_BMDMA_SHT(DRV_NAME), 21272 ATA_BMDMA_SHT(DRV_NAME),
21261 }; 21273 };
@@ -21274,9 +21286,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_optidma.c linux-2.6.32.14/drivers/at
21274 .inherits = &optidma_port_ops, 21286 .inherits = &optidma_port_ops,
21275 .set_piomode = optiplus_set_pio_mode, 21287 .set_piomode = optiplus_set_pio_mode,
21276 .set_dmamode = optiplus_set_dma_mode, 21288 .set_dmamode = optiplus_set_dma_mode,
21277diff -urNp linux-2.6.32.14/drivers/ata/pata_palmld.c linux-2.6.32.14/drivers/ata/pata_palmld.c 21289diff -urNp linux-2.6.32.15/drivers/ata/pata_palmld.c linux-2.6.32.15/drivers/ata/pata_palmld.c
21278--- linux-2.6.32.14/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400 21290--- linux-2.6.32.15/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400
21279+++ linux-2.6.32.14/drivers/ata/pata_palmld.c 2010-05-28 21:27:15.263188611 -0400 21291+++ linux-2.6.32.15/drivers/ata/pata_palmld.c 2010-05-28 21:27:15.263188611 -0400
21280@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ 21292@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
21281 ATA_PIO_SHT(DRV_NAME), 21293 ATA_PIO_SHT(DRV_NAME),
21282 }; 21294 };
@@ -21286,9 +21298,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_palmld.c linux-2.6.32.14/drivers/ata
21286 .inherits = &ata_sff_port_ops, 21298 .inherits = &ata_sff_port_ops,
21287 .sff_data_xfer = ata_sff_data_xfer_noirq, 21299 .sff_data_xfer = ata_sff_data_xfer_noirq,
21288 .cable_detect = ata_cable_40wire, 21300 .cable_detect = ata_cable_40wire,
21289diff -urNp linux-2.6.32.14/drivers/ata/pata_pcmcia.c linux-2.6.32.14/drivers/ata/pata_pcmcia.c 21301diff -urNp linux-2.6.32.15/drivers/ata/pata_pcmcia.c linux-2.6.32.15/drivers/ata/pata_pcmcia.c
21290--- linux-2.6.32.14/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400 21302--- linux-2.6.32.15/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400
21291+++ linux-2.6.32.14/drivers/ata/pata_pcmcia.c 2010-05-28 21:27:15.263188611 -0400 21303+++ linux-2.6.32.15/drivers/ata/pata_pcmcia.c 2010-05-28 21:27:15.263188611 -0400
21292@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ 21304@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
21293 ATA_PIO_SHT(DRV_NAME), 21305 ATA_PIO_SHT(DRV_NAME),
21294 }; 21306 };
@@ -21315,9 +21327,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_pcmcia.c linux-2.6.32.14/drivers/ata
21315 21327
21316 info = kzalloc(sizeof(*info), GFP_KERNEL); 21328 info = kzalloc(sizeof(*info), GFP_KERNEL);
21317 if (info == NULL) 21329 if (info == NULL)
21318diff -urNp linux-2.6.32.14/drivers/ata/pata_pdc2027x.c linux-2.6.32.14/drivers/ata/pata_pdc2027x.c 21330diff -urNp linux-2.6.32.15/drivers/ata/pata_pdc2027x.c linux-2.6.32.15/drivers/ata/pata_pdc2027x.c
21319--- linux-2.6.32.14/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400 21331--- linux-2.6.32.15/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400
21320+++ linux-2.6.32.14/drivers/ata/pata_pdc2027x.c 2010-05-28 21:27:15.263188611 -0400 21332+++ linux-2.6.32.15/drivers/ata/pata_pdc2027x.c 2010-05-28 21:27:15.263188611 -0400
21321@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 21333@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
21322 ATA_BMDMA_SHT(DRV_NAME), 21334 ATA_BMDMA_SHT(DRV_NAME),
21323 }; 21335 };
@@ -21335,9 +21347,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_pdc2027x.c linux-2.6.32.14/drivers/a
21335 .inherits = &pdc2027x_pata100_ops, 21347 .inherits = &pdc2027x_pata100_ops,
21336 .mode_filter = pdc2027x_mode_filter, 21348 .mode_filter = pdc2027x_mode_filter,
21337 .set_piomode = pdc2027x_set_piomode, 21349 .set_piomode = pdc2027x_set_piomode,
21338diff -urNp linux-2.6.32.14/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.14/drivers/ata/pata_pdc202xx_old.c 21350diff -urNp linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c
21339--- linux-2.6.32.14/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400 21351--- linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400
21340+++ linux-2.6.32.14/drivers/ata/pata_pdc202xx_old.c 2010-05-28 21:27:15.263188611 -0400 21352+++ linux-2.6.32.15/drivers/ata/pata_pdc202xx_old.c 2010-05-28 21:27:15.263188611 -0400
21341@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x 21353@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x
21342 ATA_BMDMA_SHT(DRV_NAME), 21354 ATA_BMDMA_SHT(DRV_NAME),
21343 }; 21355 };
@@ -21356,9 +21368,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.14/drive
21356 .inherits = &pdc2024x_port_ops, 21368 .inherits = &pdc2024x_port_ops,
21357 21369
21358 .check_atapi_dma = pdc2026x_check_atapi_dma, 21370 .check_atapi_dma = pdc2026x_check_atapi_dma,
21359diff -urNp linux-2.6.32.14/drivers/ata/pata_platform.c linux-2.6.32.14/drivers/ata/pata_platform.c 21371diff -urNp linux-2.6.32.15/drivers/ata/pata_platform.c linux-2.6.32.15/drivers/ata/pata_platform.c
21360--- linux-2.6.32.14/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400 21372--- linux-2.6.32.15/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400
21361+++ linux-2.6.32.14/drivers/ata/pata_platform.c 2010-05-28 21:27:15.263188611 -0400 21373+++ linux-2.6.32.15/drivers/ata/pata_platform.c 2010-05-28 21:27:15.263188611 -0400
21362@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl 21374@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
21363 ATA_PIO_SHT(DRV_NAME), 21375 ATA_PIO_SHT(DRV_NAME),
21364 }; 21376 };
@@ -21368,9 +21380,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_platform.c linux-2.6.32.14/drivers/a
21368 .inherits = &ata_sff_port_ops, 21380 .inherits = &ata_sff_port_ops,
21369 .sff_data_xfer = ata_sff_data_xfer_noirq, 21381 .sff_data_xfer = ata_sff_data_xfer_noirq,
21370 .cable_detect = ata_cable_unknown, 21382 .cable_detect = ata_cable_unknown,
21371diff -urNp linux-2.6.32.14/drivers/ata/pata_qdi.c linux-2.6.32.14/drivers/ata/pata_qdi.c 21383diff -urNp linux-2.6.32.15/drivers/ata/pata_qdi.c linux-2.6.32.15/drivers/ata/pata_qdi.c
21372--- linux-2.6.32.14/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400 21384--- linux-2.6.32.15/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400
21373+++ linux-2.6.32.14/drivers/ata/pata_qdi.c 2010-05-28 21:27:15.263188611 -0400 21385+++ linux-2.6.32.15/drivers/ata/pata_qdi.c 2010-05-28 21:27:15.263188611 -0400
21374@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht 21386@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
21375 ATA_PIO_SHT(DRV_NAME), 21387 ATA_PIO_SHT(DRV_NAME),
21376 }; 21388 };
@@ -21389,9 +21401,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_qdi.c linux-2.6.32.14/drivers/ata/pa
21389 .inherits = &qdi6500_port_ops, 21401 .inherits = &qdi6500_port_ops,
21390 .set_piomode = qdi6580_set_piomode, 21402 .set_piomode = qdi6580_set_piomode,
21391 }; 21403 };
21392diff -urNp linux-2.6.32.14/drivers/ata/pata_radisys.c linux-2.6.32.14/drivers/ata/pata_radisys.c 21404diff -urNp linux-2.6.32.15/drivers/ata/pata_radisys.c linux-2.6.32.15/drivers/ata/pata_radisys.c
21393--- linux-2.6.32.14/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400 21405--- linux-2.6.32.15/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400
21394+++ linux-2.6.32.14/drivers/ata/pata_radisys.c 2010-05-28 21:27:15.267180677 -0400 21406+++ linux-2.6.32.15/drivers/ata/pata_radisys.c 2010-05-28 21:27:15.267180677 -0400
21395@@ -187,7 +187,7 @@ static struct scsi_host_template radisys 21407@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
21396 ATA_BMDMA_SHT(DRV_NAME), 21408 ATA_BMDMA_SHT(DRV_NAME),
21397 }; 21409 };
@@ -21401,9 +21413,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_radisys.c linux-2.6.32.14/drivers/at
21401 .inherits = &ata_bmdma_port_ops, 21413 .inherits = &ata_bmdma_port_ops,
21402 .qc_issue = radisys_qc_issue, 21414 .qc_issue = radisys_qc_issue,
21403 .cable_detect = ata_cable_unknown, 21415 .cable_detect = ata_cable_unknown,
21404diff -urNp linux-2.6.32.14/drivers/ata/pata_rb532_cf.c linux-2.6.32.14/drivers/ata/pata_rb532_cf.c 21416diff -urNp linux-2.6.32.15/drivers/ata/pata_rb532_cf.c linux-2.6.32.15/drivers/ata/pata_rb532_cf.c
21405--- linux-2.6.32.14/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400 21417--- linux-2.6.32.15/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400
21406+++ linux-2.6.32.14/drivers/ata/pata_rb532_cf.c 2010-05-28 21:27:15.267180677 -0400 21418+++ linux-2.6.32.15/drivers/ata/pata_rb532_cf.c 2010-05-28 21:27:15.267180677 -0400
21407@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle 21419@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
21408 return IRQ_HANDLED; 21420 return IRQ_HANDLED;
21409 } 21421 }
@@ -21413,9 +21425,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_rb532_cf.c linux-2.6.32.14/drivers/a
21413 .inherits = &ata_sff_port_ops, 21425 .inherits = &ata_sff_port_ops,
21414 .sff_data_xfer = ata_sff_data_xfer32, 21426 .sff_data_xfer = ata_sff_data_xfer32,
21415 }; 21427 };
21416diff -urNp linux-2.6.32.14/drivers/ata/pata_rdc.c linux-2.6.32.14/drivers/ata/pata_rdc.c 21428diff -urNp linux-2.6.32.15/drivers/ata/pata_rdc.c linux-2.6.32.15/drivers/ata/pata_rdc.c
21417--- linux-2.6.32.14/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400 21429--- linux-2.6.32.15/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400
21418+++ linux-2.6.32.14/drivers/ata/pata_rdc.c 2010-05-28 21:27:15.267180677 -0400 21430+++ linux-2.6.32.15/drivers/ata/pata_rdc.c 2010-05-28 21:27:15.267180677 -0400
21419@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p 21431@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
21420 pci_write_config_byte(dev, 0x48, udma_enable); 21432 pci_write_config_byte(dev, 0x48, udma_enable);
21421 } 21433 }
@@ -21425,9 +21437,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_rdc.c linux-2.6.32.14/drivers/ata/pa
21425 .inherits = &ata_bmdma32_port_ops, 21437 .inherits = &ata_bmdma32_port_ops,
21426 .cable_detect = rdc_pata_cable_detect, 21438 .cable_detect = rdc_pata_cable_detect,
21427 .set_piomode = rdc_set_piomode, 21439 .set_piomode = rdc_set_piomode,
21428diff -urNp linux-2.6.32.14/drivers/ata/pata_rz1000.c linux-2.6.32.14/drivers/ata/pata_rz1000.c 21440diff -urNp linux-2.6.32.15/drivers/ata/pata_rz1000.c linux-2.6.32.15/drivers/ata/pata_rz1000.c
21429--- linux-2.6.32.14/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400 21441--- linux-2.6.32.15/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400
21430+++ linux-2.6.32.14/drivers/ata/pata_rz1000.c 2010-05-28 21:27:15.267180677 -0400 21442+++ linux-2.6.32.15/drivers/ata/pata_rz1000.c 2010-05-28 21:27:15.267180677 -0400
21431@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ 21443@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
21432 ATA_PIO_SHT(DRV_NAME), 21444 ATA_PIO_SHT(DRV_NAME),
21433 }; 21445 };
@@ -21437,9 +21449,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_rz1000.c linux-2.6.32.14/drivers/ata
21437 .inherits = &ata_sff_port_ops, 21449 .inherits = &ata_sff_port_ops,
21438 .cable_detect = ata_cable_40wire, 21450 .cable_detect = ata_cable_40wire,
21439 .set_mode = rz1000_set_mode, 21451 .set_mode = rz1000_set_mode,
21440diff -urNp linux-2.6.32.14/drivers/ata/pata_sc1200.c linux-2.6.32.14/drivers/ata/pata_sc1200.c 21452diff -urNp linux-2.6.32.15/drivers/ata/pata_sc1200.c linux-2.6.32.15/drivers/ata/pata_sc1200.c
21441--- linux-2.6.32.14/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400 21453--- linux-2.6.32.15/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400
21442+++ linux-2.6.32.14/drivers/ata/pata_sc1200.c 2010-05-28 21:27:15.267180677 -0400 21454+++ linux-2.6.32.15/drivers/ata/pata_sc1200.c 2010-05-28 21:27:15.267180677 -0400
21443@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ 21455@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
21444 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 21456 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
21445 }; 21457 };
@@ -21449,9 +21461,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_sc1200.c linux-2.6.32.14/drivers/ata
21449 .inherits = &ata_bmdma_port_ops, 21461 .inherits = &ata_bmdma_port_ops,
21450 .qc_prep = ata_sff_dumb_qc_prep, 21462 .qc_prep = ata_sff_dumb_qc_prep,
21451 .qc_issue = sc1200_qc_issue, 21463 .qc_issue = sc1200_qc_issue,
21452diff -urNp linux-2.6.32.14/drivers/ata/pata_scc.c linux-2.6.32.14/drivers/ata/pata_scc.c 21464diff -urNp linux-2.6.32.15/drivers/ata/pata_scc.c linux-2.6.32.15/drivers/ata/pata_scc.c
21453--- linux-2.6.32.14/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400 21465--- linux-2.6.32.15/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400
21454+++ linux-2.6.32.14/drivers/ata/pata_scc.c 2010-05-28 21:27:15.267180677 -0400 21466+++ linux-2.6.32.15/drivers/ata/pata_scc.c 2010-05-28 21:27:15.267180677 -0400
21455@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht 21467@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
21456 ATA_BMDMA_SHT(DRV_NAME), 21468 ATA_BMDMA_SHT(DRV_NAME),
21457 }; 21469 };
@@ -21461,9 +21473,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_scc.c linux-2.6.32.14/drivers/ata/pa
21461 .inherits = &ata_bmdma_port_ops, 21473 .inherits = &ata_bmdma_port_ops,
21462 21474
21463 .set_piomode = scc_set_piomode, 21475 .set_piomode = scc_set_piomode,
21464diff -urNp linux-2.6.32.14/drivers/ata/pata_sch.c linux-2.6.32.14/drivers/ata/pata_sch.c 21476diff -urNp linux-2.6.32.15/drivers/ata/pata_sch.c linux-2.6.32.15/drivers/ata/pata_sch.c
21465--- linux-2.6.32.14/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400 21477--- linux-2.6.32.15/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400
21466+++ linux-2.6.32.14/drivers/ata/pata_sch.c 2010-05-28 21:27:15.267180677 -0400 21478+++ linux-2.6.32.15/drivers/ata/pata_sch.c 2010-05-28 21:27:15.267180677 -0400
21467@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht 21479@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
21468 ATA_BMDMA_SHT(DRV_NAME), 21480 ATA_BMDMA_SHT(DRV_NAME),
21469 }; 21481 };
@@ -21473,9 +21485,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_sch.c linux-2.6.32.14/drivers/ata/pa
21473 .inherits = &ata_bmdma_port_ops, 21485 .inherits = &ata_bmdma_port_ops,
21474 .cable_detect = ata_cable_unknown, 21486 .cable_detect = ata_cable_unknown,
21475 .set_piomode = sch_set_piomode, 21487 .set_piomode = sch_set_piomode,
21476diff -urNp linux-2.6.32.14/drivers/ata/pata_serverworks.c linux-2.6.32.14/drivers/ata/pata_serverworks.c 21488diff -urNp linux-2.6.32.15/drivers/ata/pata_serverworks.c linux-2.6.32.15/drivers/ata/pata_serverworks.c
21477--- linux-2.6.32.14/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400 21489--- linux-2.6.32.15/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400
21478+++ linux-2.6.32.14/drivers/ata/pata_serverworks.c 2010-05-28 21:27:15.267180677 -0400 21490+++ linux-2.6.32.15/drivers/ata/pata_serverworks.c 2010-05-28 21:27:15.267180677 -0400
21479@@ -299,7 +299,7 @@ static struct scsi_host_template serverw 21491@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
21480 ATA_BMDMA_SHT(DRV_NAME), 21492 ATA_BMDMA_SHT(DRV_NAME),
21481 }; 21493 };
@@ -21494,9 +21506,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_serverworks.c linux-2.6.32.14/driver
21494 .inherits = &serverworks_osb4_port_ops, 21506 .inherits = &serverworks_osb4_port_ops,
21495 .mode_filter = serverworks_csb_filter, 21507 .mode_filter = serverworks_csb_filter,
21496 }; 21508 };
21497diff -urNp linux-2.6.32.14/drivers/ata/pata_sil680.c linux-2.6.32.14/drivers/ata/pata_sil680.c 21509diff -urNp linux-2.6.32.15/drivers/ata/pata_sil680.c linux-2.6.32.15/drivers/ata/pata_sil680.c
21498--- linux-2.6.32.14/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400 21510--- linux-2.6.32.15/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400
21499+++ linux-2.6.32.14/drivers/ata/pata_sil680.c 2010-05-28 21:27:15.267180677 -0400 21511+++ linux-2.6.32.15/drivers/ata/pata_sil680.c 2010-05-28 21:27:15.267180677 -0400
21500@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ 21512@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
21501 ATA_BMDMA_SHT(DRV_NAME), 21513 ATA_BMDMA_SHT(DRV_NAME),
21502 }; 21514 };
@@ -21506,9 +21518,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_sil680.c linux-2.6.32.14/drivers/ata
21506 .inherits = &ata_bmdma32_port_ops, 21518 .inherits = &ata_bmdma32_port_ops,
21507 .cable_detect = sil680_cable_detect, 21519 .cable_detect = sil680_cable_detect,
21508 .set_piomode = sil680_set_piomode, 21520 .set_piomode = sil680_set_piomode,
21509diff -urNp linux-2.6.32.14/drivers/ata/pata_sis.c linux-2.6.32.14/drivers/ata/pata_sis.c 21521diff -urNp linux-2.6.32.15/drivers/ata/pata_sis.c linux-2.6.32.15/drivers/ata/pata_sis.c
21510--- linux-2.6.32.14/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400 21522--- linux-2.6.32.15/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400
21511+++ linux-2.6.32.14/drivers/ata/pata_sis.c 2010-05-28 21:27:15.267180677 -0400 21523+++ linux-2.6.32.15/drivers/ata/pata_sis.c 2010-05-28 21:27:15.267180677 -0400
21512@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht 21524@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
21513 ATA_BMDMA_SHT(DRV_NAME), 21525 ATA_BMDMA_SHT(DRV_NAME),
21514 }; 21526 };
@@ -21564,9 +21576,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_sis.c linux-2.6.32.14/drivers/ata/pa
21564 .inherits = &sis_base_ops, 21576 .inherits = &sis_base_ops,
21565 .set_piomode = sis_old_set_piomode, 21577 .set_piomode = sis_old_set_piomode,
21566 .set_dmamode = sis_old_set_dmamode, 21578 .set_dmamode = sis_old_set_dmamode,
21567diff -urNp linux-2.6.32.14/drivers/ata/pata_sl82c105.c linux-2.6.32.14/drivers/ata/pata_sl82c105.c 21579diff -urNp linux-2.6.32.15/drivers/ata/pata_sl82c105.c linux-2.6.32.15/drivers/ata/pata_sl82c105.c
21568--- linux-2.6.32.14/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400 21580--- linux-2.6.32.15/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400
21569+++ linux-2.6.32.14/drivers/ata/pata_sl82c105.c 2010-05-28 21:27:15.267180677 -0400 21581+++ linux-2.6.32.15/drivers/ata/pata_sl82c105.c 2010-05-28 21:27:15.267180677 -0400
21570@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 21582@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
21571 ATA_BMDMA_SHT(DRV_NAME), 21583 ATA_BMDMA_SHT(DRV_NAME),
21572 }; 21584 };
@@ -21576,9 +21588,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_sl82c105.c linux-2.6.32.14/drivers/a
21576 .inherits = &ata_bmdma_port_ops, 21588 .inherits = &ata_bmdma_port_ops,
21577 .qc_defer = sl82c105_qc_defer, 21589 .qc_defer = sl82c105_qc_defer,
21578 .bmdma_start = sl82c105_bmdma_start, 21590 .bmdma_start = sl82c105_bmdma_start,
21579diff -urNp linux-2.6.32.14/drivers/ata/pata_triflex.c linux-2.6.32.14/drivers/ata/pata_triflex.c 21591diff -urNp linux-2.6.32.15/drivers/ata/pata_triflex.c linux-2.6.32.15/drivers/ata/pata_triflex.c
21580--- linux-2.6.32.14/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400 21592--- linux-2.6.32.15/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400
21581+++ linux-2.6.32.14/drivers/ata/pata_triflex.c 2010-05-28 21:27:15.267180677 -0400 21593+++ linux-2.6.32.15/drivers/ata/pata_triflex.c 2010-05-28 21:27:15.267180677 -0400
21582@@ -178,7 +178,7 @@ static struct scsi_host_template triflex 21594@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
21583 ATA_BMDMA_SHT(DRV_NAME), 21595 ATA_BMDMA_SHT(DRV_NAME),
21584 }; 21596 };
@@ -21588,9 +21600,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_triflex.c linux-2.6.32.14/drivers/at
21588 .inherits = &ata_bmdma_port_ops, 21600 .inherits = &ata_bmdma_port_ops,
21589 .bmdma_start = triflex_bmdma_start, 21601 .bmdma_start = triflex_bmdma_start,
21590 .bmdma_stop = triflex_bmdma_stop, 21602 .bmdma_stop = triflex_bmdma_stop,
21591diff -urNp linux-2.6.32.14/drivers/ata/pata_via.c linux-2.6.32.14/drivers/ata/pata_via.c 21603diff -urNp linux-2.6.32.15/drivers/ata/pata_via.c linux-2.6.32.15/drivers/ata/pata_via.c
21592--- linux-2.6.32.14/drivers/ata/pata_via.c 2010-04-29 17:49:37.709698369 -0400 21604--- linux-2.6.32.15/drivers/ata/pata_via.c 2010-04-29 17:49:37.709698369 -0400
21593+++ linux-2.6.32.14/drivers/ata/pata_via.c 2010-05-28 21:27:15.267180677 -0400 21605+++ linux-2.6.32.15/drivers/ata/pata_via.c 2010-05-28 21:27:15.267180677 -0400
21594@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht 21606@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
21595 ATA_BMDMA_SHT(DRV_NAME), 21607 ATA_BMDMA_SHT(DRV_NAME),
21596 }; 21608 };
@@ -21609,9 +21621,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_via.c linux-2.6.32.14/drivers/ata/pa
21609 .inherits = &via_port_ops, 21621 .inherits = &via_port_ops,
21610 .sff_data_xfer = ata_sff_data_xfer_noirq, 21622 .sff_data_xfer = ata_sff_data_xfer_noirq,
21611 }; 21623 };
21612diff -urNp linux-2.6.32.14/drivers/ata/pata_winbond.c linux-2.6.32.14/drivers/ata/pata_winbond.c 21624diff -urNp linux-2.6.32.15/drivers/ata/pata_winbond.c linux-2.6.32.15/drivers/ata/pata_winbond.c
21613--- linux-2.6.32.14/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400 21625--- linux-2.6.32.15/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400
21614+++ linux-2.6.32.14/drivers/ata/pata_winbond.c 2010-05-28 21:27:15.267180677 -0400 21626+++ linux-2.6.32.15/drivers/ata/pata_winbond.c 2010-05-28 21:27:15.267180677 -0400
21615@@ -125,7 +125,7 @@ static struct scsi_host_template winbond 21627@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
21616 ATA_PIO_SHT(DRV_NAME), 21628 ATA_PIO_SHT(DRV_NAME),
21617 }; 21629 };
@@ -21621,9 +21633,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pata_winbond.c linux-2.6.32.14/drivers/at
21621 .inherits = &ata_sff_port_ops, 21633 .inherits = &ata_sff_port_ops,
21622 .sff_data_xfer = winbond_data_xfer, 21634 .sff_data_xfer = winbond_data_xfer,
21623 .cable_detect = ata_cable_40wire, 21635 .cable_detect = ata_cable_40wire,
21624diff -urNp linux-2.6.32.14/drivers/ata/pdc_adma.c linux-2.6.32.14/drivers/ata/pdc_adma.c 21636diff -urNp linux-2.6.32.15/drivers/ata/pdc_adma.c linux-2.6.32.15/drivers/ata/pdc_adma.c
21625--- linux-2.6.32.14/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400 21637--- linux-2.6.32.15/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400
21626+++ linux-2.6.32.14/drivers/ata/pdc_adma.c 2010-05-28 21:27:15.267180677 -0400 21638+++ linux-2.6.32.15/drivers/ata/pdc_adma.c 2010-05-28 21:27:15.267180677 -0400
21627@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at 21639@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
21628 .dma_boundary = ADMA_DMA_BOUNDARY, 21640 .dma_boundary = ADMA_DMA_BOUNDARY,
21629 }; 21641 };
@@ -21633,9 +21645,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/pdc_adma.c linux-2.6.32.14/drivers/ata/pd
21633 .inherits = &ata_sff_port_ops, 21645 .inherits = &ata_sff_port_ops,
21634 21646
21635 .lost_interrupt = ATA_OP_NULL, 21647 .lost_interrupt = ATA_OP_NULL,
21636diff -urNp linux-2.6.32.14/drivers/ata/sata_fsl.c linux-2.6.32.14/drivers/ata/sata_fsl.c 21648diff -urNp linux-2.6.32.15/drivers/ata/sata_fsl.c linux-2.6.32.15/drivers/ata/sata_fsl.c
21637--- linux-2.6.32.14/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400 21649--- linux-2.6.32.15/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400
21638+++ linux-2.6.32.14/drivers/ata/sata_fsl.c 2010-05-28 21:27:15.270965204 -0400 21650+++ linux-2.6.32.15/drivers/ata/sata_fsl.c 2010-05-28 21:27:15.270965204 -0400
21639@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs 21651@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
21640 .dma_boundary = ATA_DMA_BOUNDARY, 21652 .dma_boundary = ATA_DMA_BOUNDARY,
21641 }; 21653 };
@@ -21645,9 +21657,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/sata_fsl.c linux-2.6.32.14/drivers/ata/sa
21645 .inherits = &sata_pmp_port_ops, 21657 .inherits = &sata_pmp_port_ops,
21646 21658
21647 .qc_defer = ata_std_qc_defer, 21659 .qc_defer = ata_std_qc_defer,
21648diff -urNp linux-2.6.32.14/drivers/ata/sata_inic162x.c linux-2.6.32.14/drivers/ata/sata_inic162x.c 21660diff -urNp linux-2.6.32.15/drivers/ata/sata_inic162x.c linux-2.6.32.15/drivers/ata/sata_inic162x.c
21649--- linux-2.6.32.14/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400 21661--- linux-2.6.32.15/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400
21650+++ linux-2.6.32.14/drivers/ata/sata_inic162x.c 2010-05-28 21:27:15.270965204 -0400 21662+++ linux-2.6.32.15/drivers/ata/sata_inic162x.c 2010-05-28 21:27:15.270965204 -0400
21651@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po 21663@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
21652 return 0; 21664 return 0;
21653 } 21665 }
@@ -21657,9 +21669,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/sata_inic162x.c linux-2.6.32.14/drivers/a
21657 .inherits = &sata_port_ops, 21669 .inherits = &sata_port_ops,
21658 21670
21659 .check_atapi_dma = inic_check_atapi_dma, 21671 .check_atapi_dma = inic_check_atapi_dma,
21660diff -urNp linux-2.6.32.14/drivers/ata/sata_mv.c linux-2.6.32.14/drivers/ata/sata_mv.c 21672diff -urNp linux-2.6.32.15/drivers/ata/sata_mv.c linux-2.6.32.15/drivers/ata/sata_mv.c
21661--- linux-2.6.32.14/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400 21673--- linux-2.6.32.15/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400
21662+++ linux-2.6.32.14/drivers/ata/sata_mv.c 2010-05-28 21:27:15.270965204 -0400 21674+++ linux-2.6.32.15/drivers/ata/sata_mv.c 2010-05-28 21:27:15.270965204 -0400
21663@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht 21675@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
21664 .dma_boundary = MV_DMA_BOUNDARY, 21676 .dma_boundary = MV_DMA_BOUNDARY,
21665 }; 21677 };
@@ -21687,9 +21699,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/sata_mv.c linux-2.6.32.14/drivers/ata/sat
21687 .inherits = &mv6_ops, 21699 .inherits = &mv6_ops,
21688 .dev_config = ATA_OP_NULL, 21700 .dev_config = ATA_OP_NULL,
21689 .qc_prep = mv_qc_prep_iie, 21701 .qc_prep = mv_qc_prep_iie,
21690diff -urNp linux-2.6.32.14/drivers/ata/sata_nv.c linux-2.6.32.14/drivers/ata/sata_nv.c 21702diff -urNp linux-2.6.32.15/drivers/ata/sata_nv.c linux-2.6.32.15/drivers/ata/sata_nv.c
21691--- linux-2.6.32.14/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400 21703--- linux-2.6.32.15/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400
21692+++ linux-2.6.32.14/drivers/ata/sata_nv.c 2010-05-28 21:27:15.275100842 -0400 21704+++ linux-2.6.32.15/drivers/ata/sata_nv.c 2010-05-28 21:27:15.275100842 -0400
21693@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc 21705@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
21694 * cases. Define nv_hardreset() which only kicks in for post-boot 21706 * cases. Define nv_hardreset() which only kicks in for post-boot
21695 * probing and use it for all variants. 21707 * probing and use it for all variants.
@@ -21732,9 +21744,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/sata_nv.c linux-2.6.32.14/drivers/ata/sat
21732 .inherits = &nv_generic_ops, 21744 .inherits = &nv_generic_ops,
21733 21745
21734 .qc_defer = ata_std_qc_defer, 21746 .qc_defer = ata_std_qc_defer,
21735diff -urNp linux-2.6.32.14/drivers/ata/sata_promise.c linux-2.6.32.14/drivers/ata/sata_promise.c 21747diff -urNp linux-2.6.32.15/drivers/ata/sata_promise.c linux-2.6.32.15/drivers/ata/sata_promise.c
21736--- linux-2.6.32.14/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400 21748--- linux-2.6.32.15/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400
21737+++ linux-2.6.32.14/drivers/ata/sata_promise.c 2010-05-28 21:27:15.275100842 -0400 21749+++ linux-2.6.32.15/drivers/ata/sata_promise.c 2010-05-28 21:27:15.275100842 -0400
21738@@ -195,7 +195,7 @@ static const struct ata_port_operations 21750@@ -195,7 +195,7 @@ static const struct ata_port_operations
21739 .error_handler = pdc_error_handler, 21751 .error_handler = pdc_error_handler,
21740 }; 21752 };
@@ -21761,9 +21773,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/sata_promise.c linux-2.6.32.14/drivers/at
21761 .inherits = &pdc_common_ops, 21773 .inherits = &pdc_common_ops,
21762 .cable_detect = pdc_pata_cable_detect, 21774 .cable_detect = pdc_pata_cable_detect,
21763 .freeze = pdc_freeze, 21775 .freeze = pdc_freeze,
21764diff -urNp linux-2.6.32.14/drivers/ata/sata_qstor.c linux-2.6.32.14/drivers/ata/sata_qstor.c 21776diff -urNp linux-2.6.32.15/drivers/ata/sata_qstor.c linux-2.6.32.15/drivers/ata/sata_qstor.c
21765--- linux-2.6.32.14/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400 21777--- linux-2.6.32.15/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400
21766+++ linux-2.6.32.14/drivers/ata/sata_qstor.c 2010-05-28 21:27:15.275100842 -0400 21778+++ linux-2.6.32.15/drivers/ata/sata_qstor.c 2010-05-28 21:27:15.275100842 -0400
21767@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ 21779@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
21768 .dma_boundary = QS_DMA_BOUNDARY, 21780 .dma_boundary = QS_DMA_BOUNDARY,
21769 }; 21781 };
@@ -21773,9 +21785,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/sata_qstor.c linux-2.6.32.14/drivers/ata/
21773 .inherits = &ata_sff_port_ops, 21785 .inherits = &ata_sff_port_ops,
21774 21786
21775 .check_atapi_dma = qs_check_atapi_dma, 21787 .check_atapi_dma = qs_check_atapi_dma,
21776diff -urNp linux-2.6.32.14/drivers/ata/sata_sil24.c linux-2.6.32.14/drivers/ata/sata_sil24.c 21788diff -urNp linux-2.6.32.15/drivers/ata/sata_sil24.c linux-2.6.32.15/drivers/ata/sata_sil24.c
21777--- linux-2.6.32.14/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400 21789--- linux-2.6.32.15/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400
21778+++ linux-2.6.32.14/drivers/ata/sata_sil24.c 2010-05-28 21:27:15.275100842 -0400 21790+++ linux-2.6.32.15/drivers/ata/sata_sil24.c 2010-05-28 21:27:15.275100842 -0400
21779@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s 21791@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
21780 .dma_boundary = ATA_DMA_BOUNDARY, 21792 .dma_boundary = ATA_DMA_BOUNDARY,
21781 }; 21793 };
@@ -21785,9 +21797,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/sata_sil24.c linux-2.6.32.14/drivers/ata/
21785 .inherits = &sata_pmp_port_ops, 21797 .inherits = &sata_pmp_port_ops,
21786 21798
21787 .qc_defer = sil24_qc_defer, 21799 .qc_defer = sil24_qc_defer,
21788diff -urNp linux-2.6.32.14/drivers/ata/sata_sil.c linux-2.6.32.14/drivers/ata/sata_sil.c 21800diff -urNp linux-2.6.32.15/drivers/ata/sata_sil.c linux-2.6.32.15/drivers/ata/sata_sil.c
21789--- linux-2.6.32.14/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400 21801--- linux-2.6.32.15/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400
21790+++ linux-2.6.32.14/drivers/ata/sata_sil.c 2010-05-28 21:27:15.275100842 -0400 21802+++ linux-2.6.32.15/drivers/ata/sata_sil.c 2010-05-28 21:27:15.275100842 -0400
21791@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht 21803@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
21792 .sg_tablesize = ATA_MAX_PRD 21804 .sg_tablesize = ATA_MAX_PRD
21793 }; 21805 };
@@ -21797,9 +21809,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/sata_sil.c linux-2.6.32.14/drivers/ata/sa
21797 .inherits = &ata_bmdma32_port_ops, 21809 .inherits = &ata_bmdma32_port_ops,
21798 .dev_config = sil_dev_config, 21810 .dev_config = sil_dev_config,
21799 .set_mode = sil_set_mode, 21811 .set_mode = sil_set_mode,
21800diff -urNp linux-2.6.32.14/drivers/ata/sata_sis.c linux-2.6.32.14/drivers/ata/sata_sis.c 21812diff -urNp linux-2.6.32.15/drivers/ata/sata_sis.c linux-2.6.32.15/drivers/ata/sata_sis.c
21801--- linux-2.6.32.14/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400 21813--- linux-2.6.32.15/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400
21802+++ linux-2.6.32.14/drivers/ata/sata_sis.c 2010-05-28 21:27:15.275100842 -0400 21814+++ linux-2.6.32.15/drivers/ata/sata_sis.c 2010-05-28 21:27:15.275100842 -0400
21803@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht 21815@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
21804 ATA_BMDMA_SHT(DRV_NAME), 21816 ATA_BMDMA_SHT(DRV_NAME),
21805 }; 21817 };
@@ -21809,9 +21821,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/sata_sis.c linux-2.6.32.14/drivers/ata/sa
21809 .inherits = &ata_bmdma_port_ops, 21821 .inherits = &ata_bmdma_port_ops,
21810 .scr_read = sis_scr_read, 21822 .scr_read = sis_scr_read,
21811 .scr_write = sis_scr_write, 21823 .scr_write = sis_scr_write,
21812diff -urNp linux-2.6.32.14/drivers/ata/sata_svw.c linux-2.6.32.14/drivers/ata/sata_svw.c 21824diff -urNp linux-2.6.32.15/drivers/ata/sata_svw.c linux-2.6.32.15/drivers/ata/sata_svw.c
21813--- linux-2.6.32.14/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400 21825--- linux-2.6.32.15/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400
21814+++ linux-2.6.32.14/drivers/ata/sata_svw.c 2010-05-28 21:27:15.275100842 -0400 21826+++ linux-2.6.32.15/drivers/ata/sata_svw.c 2010-05-28 21:27:15.275100842 -0400
21815@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata 21827@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
21816 }; 21828 };
21817 21829
@@ -21821,9 +21833,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/sata_svw.c linux-2.6.32.14/drivers/ata/sa
21821 .inherits = &ata_bmdma_port_ops, 21833 .inherits = &ata_bmdma_port_ops,
21822 .sff_tf_load = k2_sata_tf_load, 21834 .sff_tf_load = k2_sata_tf_load,
21823 .sff_tf_read = k2_sata_tf_read, 21835 .sff_tf_read = k2_sata_tf_read,
21824diff -urNp linux-2.6.32.14/drivers/ata/sata_sx4.c linux-2.6.32.14/drivers/ata/sata_sx4.c 21836diff -urNp linux-2.6.32.15/drivers/ata/sata_sx4.c linux-2.6.32.15/drivers/ata/sata_sx4.c
21825--- linux-2.6.32.14/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400 21837--- linux-2.6.32.15/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400
21826+++ linux-2.6.32.14/drivers/ata/sata_sx4.c 2010-05-28 21:27:15.275100842 -0400 21838+++ linux-2.6.32.15/drivers/ata/sata_sx4.c 2010-05-28 21:27:15.275100842 -0400
21827@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat 21839@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
21828 }; 21840 };
21829 21841
@@ -21833,9 +21845,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/sata_sx4.c linux-2.6.32.14/drivers/ata/sa
21833 .inherits = &ata_sff_port_ops, 21845 .inherits = &ata_sff_port_ops,
21834 21846
21835 .check_atapi_dma = pdc_check_atapi_dma, 21847 .check_atapi_dma = pdc_check_atapi_dma,
21836diff -urNp linux-2.6.32.14/drivers/ata/sata_uli.c linux-2.6.32.14/drivers/ata/sata_uli.c 21848diff -urNp linux-2.6.32.15/drivers/ata/sata_uli.c linux-2.6.32.15/drivers/ata/sata_uli.c
21837--- linux-2.6.32.14/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400 21849--- linux-2.6.32.15/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400
21838+++ linux-2.6.32.14/drivers/ata/sata_uli.c 2010-05-28 21:27:15.275100842 -0400 21850+++ linux-2.6.32.15/drivers/ata/sata_uli.c 2010-05-28 21:27:15.275100842 -0400
21839@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht 21851@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
21840 ATA_BMDMA_SHT(DRV_NAME), 21852 ATA_BMDMA_SHT(DRV_NAME),
21841 }; 21853 };
@@ -21845,9 +21857,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/sata_uli.c linux-2.6.32.14/drivers/ata/sa
21845 .inherits = &ata_bmdma_port_ops, 21857 .inherits = &ata_bmdma_port_ops,
21846 .scr_read = uli_scr_read, 21858 .scr_read = uli_scr_read,
21847 .scr_write = uli_scr_write, 21859 .scr_write = uli_scr_write,
21848diff -urNp linux-2.6.32.14/drivers/ata/sata_via.c linux-2.6.32.14/drivers/ata/sata_via.c 21860diff -urNp linux-2.6.32.15/drivers/ata/sata_via.c linux-2.6.32.15/drivers/ata/sata_via.c
21849--- linux-2.6.32.14/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400 21861--- linux-2.6.32.15/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400
21850+++ linux-2.6.32.14/drivers/ata/sata_via.c 2010-05-28 21:27:15.275100842 -0400 21862+++ linux-2.6.32.15/drivers/ata/sata_via.c 2010-05-28 21:27:15.275100842 -0400
21851@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh 21863@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
21852 ATA_BMDMA_SHT(DRV_NAME), 21864 ATA_BMDMA_SHT(DRV_NAME),
21853 }; 21865 };
@@ -21885,9 +21897,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/sata_via.c linux-2.6.32.14/drivers/ata/sa
21885 .inherits = &svia_base_ops, 21897 .inherits = &svia_base_ops,
21886 .hardreset = sata_std_hardreset, 21898 .hardreset = sata_std_hardreset,
21887 .scr_read = vt8251_scr_read, 21899 .scr_read = vt8251_scr_read,
21888diff -urNp linux-2.6.32.14/drivers/ata/sata_vsc.c linux-2.6.32.14/drivers/ata/sata_vsc.c 21900diff -urNp linux-2.6.32.15/drivers/ata/sata_vsc.c linux-2.6.32.15/drivers/ata/sata_vsc.c
21889--- linux-2.6.32.14/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400 21901--- linux-2.6.32.15/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400
21890+++ linux-2.6.32.14/drivers/ata/sata_vsc.c 2010-05-28 21:27:15.275100842 -0400 21902+++ linux-2.6.32.15/drivers/ata/sata_vsc.c 2010-05-28 21:27:15.275100842 -0400
21891@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat 21903@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
21892 }; 21904 };
21893 21905
@@ -21897,9 +21909,9 @@ diff -urNp linux-2.6.32.14/drivers/ata/sata_vsc.c linux-2.6.32.14/drivers/ata/sa
21897 .inherits = &ata_bmdma_port_ops, 21909 .inherits = &ata_bmdma_port_ops,
21898 /* The IRQ handling is not quite standard SFF behaviour so we 21910 /* The IRQ handling is not quite standard SFF behaviour so we
21899 cannot use the default lost interrupt handler */ 21911 cannot use the default lost interrupt handler */
21900diff -urNp linux-2.6.32.14/drivers/atm/adummy.c linux-2.6.32.14/drivers/atm/adummy.c 21912diff -urNp linux-2.6.32.15/drivers/atm/adummy.c linux-2.6.32.15/drivers/atm/adummy.c
21901--- linux-2.6.32.14/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400 21913--- linux-2.6.32.15/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400
21902+++ linux-2.6.32.14/drivers/atm/adummy.c 2010-05-28 21:27:15.275100842 -0400 21914+++ linux-2.6.32.15/drivers/atm/adummy.c 2010-05-28 21:27:15.275100842 -0400
21903@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct 21915@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
21904 vcc->pop(vcc, skb); 21916 vcc->pop(vcc, skb);
21905 else 21917 else
@@ -21909,9 +21921,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/adummy.c linux-2.6.32.14/drivers/atm/adum
21909 21921
21910 return 0; 21922 return 0;
21911 } 21923 }
21912diff -urNp linux-2.6.32.14/drivers/atm/ambassador.c linux-2.6.32.14/drivers/atm/ambassador.c 21924diff -urNp linux-2.6.32.15/drivers/atm/ambassador.c linux-2.6.32.15/drivers/atm/ambassador.c
21913--- linux-2.6.32.14/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400 21925--- linux-2.6.32.15/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400
21914+++ linux-2.6.32.14/drivers/atm/ambassador.c 2010-05-28 21:27:15.283225651 -0400 21926+++ linux-2.6.32.15/drivers/atm/ambassador.c 2010-05-28 21:27:15.283225651 -0400
21915@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, 21927@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
21916 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); 21928 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
21917 21929
@@ -21948,9 +21960,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/ambassador.c linux-2.6.32.14/drivers/atm/
21948 return -ENOMEM; // ? 21960 return -ENOMEM; // ?
21949 } 21961 }
21950 21962
21951diff -urNp linux-2.6.32.14/drivers/atm/atmtcp.c linux-2.6.32.14/drivers/atm/atmtcp.c 21963diff -urNp linux-2.6.32.15/drivers/atm/atmtcp.c linux-2.6.32.15/drivers/atm/atmtcp.c
21952--- linux-2.6.32.14/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400 21964--- linux-2.6.32.15/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400
21953+++ linux-2.6.32.14/drivers/atm/atmtcp.c 2010-05-28 21:27:15.287736634 -0400 21965+++ linux-2.6.32.15/drivers/atm/atmtcp.c 2010-05-28 21:27:15.287736634 -0400
21954@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc 21966@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc
21955 if (vcc->pop) vcc->pop(vcc,skb); 21967 if (vcc->pop) vcc->pop(vcc,skb);
21956 else dev_kfree_skb(skb); 21968 else dev_kfree_skb(skb);
@@ -22000,9 +22012,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/atmtcp.c linux-2.6.32.14/drivers/atm/atmt
22000 done: 22012 done:
22001 if (vcc->pop) vcc->pop(vcc,skb); 22013 if (vcc->pop) vcc->pop(vcc,skb);
22002 else dev_kfree_skb(skb); 22014 else dev_kfree_skb(skb);
22003diff -urNp linux-2.6.32.14/drivers/atm/eni.c linux-2.6.32.14/drivers/atm/eni.c 22015diff -urNp linux-2.6.32.15/drivers/atm/eni.c linux-2.6.32.15/drivers/atm/eni.c
22004--- linux-2.6.32.14/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400 22016--- linux-2.6.32.15/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400
22005+++ linux-2.6.32.14/drivers/atm/eni.c 2010-05-28 21:27:15.299117902 -0400 22017+++ linux-2.6.32.15/drivers/atm/eni.c 2010-05-28 21:27:15.299117902 -0400
22006@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) 22018@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
22007 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", 22019 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
22008 vcc->dev->number); 22020 vcc->dev->number);
@@ -22048,9 +22060,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/eni.c linux-2.6.32.14/drivers/atm/eni.c
22048 wake_up(&eni_dev->tx_wait); 22060 wake_up(&eni_dev->tx_wait);
22049 dma_complete++; 22061 dma_complete++;
22050 } 22062 }
22051diff -urNp linux-2.6.32.14/drivers/atm/firestream.c linux-2.6.32.14/drivers/atm/firestream.c 22063diff -urNp linux-2.6.32.15/drivers/atm/firestream.c linux-2.6.32.15/drivers/atm/firestream.c
22052--- linux-2.6.32.14/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400 22064--- linux-2.6.32.15/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400
22053+++ linux-2.6.32.14/drivers/atm/firestream.c 2010-05-28 21:27:15.303175631 -0400 22065+++ linux-2.6.32.15/drivers/atm/firestream.c 2010-05-28 21:27:15.303175631 -0400
22054@@ -748,7 +748,7 @@ static void process_txdone_queue (struct 22066@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
22055 } 22067 }
22056 } 22068 }
@@ -22084,9 +22096,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/firestream.c linux-2.6.32.14/drivers/atm/
22084 break; 22096 break;
22085 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ 22097 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
22086 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 22098 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
22087diff -urNp linux-2.6.32.14/drivers/atm/fore200e.c linux-2.6.32.14/drivers/atm/fore200e.c 22099diff -urNp linux-2.6.32.15/drivers/atm/fore200e.c linux-2.6.32.15/drivers/atm/fore200e.c
22088--- linux-2.6.32.14/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400 22100--- linux-2.6.32.15/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400
22089+++ linux-2.6.32.14/drivers/atm/fore200e.c 2010-05-28 21:27:15.311169155 -0400 22101+++ linux-2.6.32.15/drivers/atm/fore200e.c 2010-05-28 21:27:15.311169155 -0400
22090@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 22102@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
22091 #endif 22103 #endif
22092 /* check error condition */ 22104 /* check error condition */
@@ -22143,9 +22155,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/fore200e.c linux-2.6.32.14/drivers/atm/fo
22143 22155
22144 fore200e->tx_sat++; 22156 fore200e->tx_sat++;
22145 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", 22157 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
22146diff -urNp linux-2.6.32.14/drivers/atm/he.c linux-2.6.32.14/drivers/atm/he.c 22158diff -urNp linux-2.6.32.15/drivers/atm/he.c linux-2.6.32.15/drivers/atm/he.c
22147--- linux-2.6.32.14/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400 22159--- linux-2.6.32.15/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400
22148+++ linux-2.6.32.14/drivers/atm/he.c 2010-05-28 21:27:15.311169155 -0400 22160+++ linux-2.6.32.15/drivers/atm/he.c 2010-05-28 21:27:15.311169155 -0400
22149@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i 22161@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
22150 22162
22151 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { 22163 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -22227,9 +22239,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/he.c linux-2.6.32.14/drivers/atm/he.c
22227 22239
22228 return 0; 22240 return 0;
22229 } 22241 }
22230diff -urNp linux-2.6.32.14/drivers/atm/horizon.c linux-2.6.32.14/drivers/atm/horizon.c 22242diff -urNp linux-2.6.32.15/drivers/atm/horizon.c linux-2.6.32.15/drivers/atm/horizon.c
22231--- linux-2.6.32.14/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400 22243--- linux-2.6.32.15/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400
22232+++ linux-2.6.32.14/drivers/atm/horizon.c 2010-05-28 21:27:15.311169155 -0400 22244+++ linux-2.6.32.15/drivers/atm/horizon.c 2010-05-28 21:27:15.311169155 -0400
22233@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, 22245@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
22234 { 22246 {
22235 struct atm_vcc * vcc = ATM_SKB(skb)->vcc; 22247 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -22248,9 +22260,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/horizon.c linux-2.6.32.14/drivers/atm/hor
22248 22260
22249 // free the skb 22261 // free the skb
22250 hrz_kfree_skb (skb); 22262 hrz_kfree_skb (skb);
22251diff -urNp linux-2.6.32.14/drivers/atm/idt77252.c linux-2.6.32.14/drivers/atm/idt77252.c 22263diff -urNp linux-2.6.32.15/drivers/atm/idt77252.c linux-2.6.32.15/drivers/atm/idt77252.c
22252--- linux-2.6.32.14/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400 22264--- linux-2.6.32.15/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400
22253+++ linux-2.6.32.14/drivers/atm/idt77252.c 2010-05-28 21:27:15.326952874 -0400 22265+++ linux-2.6.32.15/drivers/atm/idt77252.c 2010-05-28 21:27:15.326952874 -0400
22254@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str 22266@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
22255 else 22267 else
22256 dev_kfree_skb(skb); 22268 dev_kfree_skb(skb);
@@ -22405,9 +22417,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/idt77252.c linux-2.6.32.14/drivers/atm/id
22405 return -ENOMEM; 22417 return -ENOMEM;
22406 } 22418 }
22407 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); 22419 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
22408diff -urNp linux-2.6.32.14/drivers/atm/iphase.c linux-2.6.32.14/drivers/atm/iphase.c 22420diff -urNp linux-2.6.32.15/drivers/atm/iphase.c linux-2.6.32.15/drivers/atm/iphase.c
22409--- linux-2.6.32.14/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400 22421--- linux-2.6.32.15/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400
22410+++ linux-2.6.32.14/drivers/atm/iphase.c 2010-05-28 21:27:15.326952874 -0400 22422+++ linux-2.6.32.15/drivers/atm/iphase.c 2010-05-28 21:27:15.326952874 -0400
22411@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) 22423@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
22412 status = (u_short) (buf_desc_ptr->desc_mode); 22424 status = (u_short) (buf_desc_ptr->desc_mode);
22413 if (status & (RX_CER | RX_PTE | RX_OFL)) 22425 if (status & (RX_CER | RX_PTE | RX_OFL))
@@ -22504,9 +22516,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/iphase.c linux-2.6.32.14/drivers/atm/ipha
22504 if (iavcc->vc_desc_cnt > 10) { 22516 if (iavcc->vc_desc_cnt > 10) {
22505 vcc->tx_quota = vcc->tx_quota * 3 / 4; 22517 vcc->tx_quota = vcc->tx_quota * 3 / 4;
22506 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); 22518 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
22507diff -urNp linux-2.6.32.14/drivers/atm/lanai.c linux-2.6.32.14/drivers/atm/lanai.c 22519diff -urNp linux-2.6.32.15/drivers/atm/lanai.c linux-2.6.32.15/drivers/atm/lanai.c
22508--- linux-2.6.32.14/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400 22520--- linux-2.6.32.15/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400
22509+++ linux-2.6.32.14/drivers/atm/lanai.c 2010-05-28 21:27:15.331218290 -0400 22521+++ linux-2.6.32.15/drivers/atm/lanai.c 2010-05-28 21:27:15.331218290 -0400
22510@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l 22522@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
22511 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); 22523 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
22512 lanai_endtx(lanai, lvcc); 22524 lanai_endtx(lanai, lvcc);
@@ -22561,9 +22573,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/lanai.c linux-2.6.32.14/drivers/atm/lanai
22561 lvcc->stats.x.aal5.service_rxcrc++; 22573 lvcc->stats.x.aal5.service_rxcrc++;
22562 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; 22574 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
22563 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); 22575 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
22564diff -urNp linux-2.6.32.14/drivers/atm/nicstar.c linux-2.6.32.14/drivers/atm/nicstar.c 22576diff -urNp linux-2.6.32.15/drivers/atm/nicstar.c linux-2.6.32.15/drivers/atm/nicstar.c
22565--- linux-2.6.32.14/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400 22577--- linux-2.6.32.15/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400
22566+++ linux-2.6.32.14/drivers/atm/nicstar.c 2010-05-28 21:27:15.368039837 -0400 22578+++ linux-2.6.32.15/drivers/atm/nicstar.c 2010-05-28 21:27:15.368039837 -0400
22567@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, 22579@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
22568 if ((vc = (vc_map *) vcc->dev_data) == NULL) 22580 if ((vc = (vc_map *) vcc->dev_data) == NULL)
22569 { 22581 {
@@ -22766,9 +22778,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/nicstar.c linux-2.6.32.14/drivers/atm/nic
22766 } 22778 }
22767 } 22779 }
22768 22780
22769diff -urNp linux-2.6.32.14/drivers/atm/solos-pci.c linux-2.6.32.14/drivers/atm/solos-pci.c 22781diff -urNp linux-2.6.32.15/drivers/atm/solos-pci.c linux-2.6.32.15/drivers/atm/solos-pci.c
22770--- linux-2.6.32.14/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400 22782--- linux-2.6.32.15/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400
22771+++ linux-2.6.32.14/drivers/atm/solos-pci.c 2010-05-28 21:27:15.368039837 -0400 22783+++ linux-2.6.32.15/drivers/atm/solos-pci.c 2010-05-28 21:27:15.368039837 -0400
22772@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) 22784@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
22773 } 22785 }
22774 atm_charge(vcc, skb->truesize); 22786 atm_charge(vcc, skb->truesize);
@@ -22787,9 +22799,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/solos-pci.c linux-2.6.32.14/drivers/atm/s
22787 solos_pop(vcc, oldskb); 22799 solos_pop(vcc, oldskb);
22788 } else 22800 } else
22789 dev_kfree_skb_irq(oldskb); 22801 dev_kfree_skb_irq(oldskb);
22790diff -urNp linux-2.6.32.14/drivers/atm/suni.c linux-2.6.32.14/drivers/atm/suni.c 22802diff -urNp linux-2.6.32.15/drivers/atm/suni.c linux-2.6.32.15/drivers/atm/suni.c
22791--- linux-2.6.32.14/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400 22803--- linux-2.6.32.15/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400
22792+++ linux-2.6.32.14/drivers/atm/suni.c 2010-05-28 21:27:15.368039837 -0400 22804+++ linux-2.6.32.15/drivers/atm/suni.c 2010-05-28 21:27:15.368039837 -0400
22793@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); 22805@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
22794 22806
22795 22807
@@ -22801,9 +22813,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/suni.c linux-2.6.32.14/drivers/atm/suni.c
22801 22813
22802 22814
22803 static void suni_hz(unsigned long from_timer) 22815 static void suni_hz(unsigned long from_timer)
22804diff -urNp linux-2.6.32.14/drivers/atm/uPD98402.c linux-2.6.32.14/drivers/atm/uPD98402.c 22816diff -urNp linux-2.6.32.15/drivers/atm/uPD98402.c linux-2.6.32.15/drivers/atm/uPD98402.c
22805--- linux-2.6.32.14/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400 22817--- linux-2.6.32.15/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400
22806+++ linux-2.6.32.14/drivers/atm/uPD98402.c 2010-05-28 21:27:15.368039837 -0400 22818+++ linux-2.6.32.15/drivers/atm/uPD98402.c 2010-05-28 21:27:15.368039837 -0400
22807@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d 22819@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
22808 struct sonet_stats tmp; 22820 struct sonet_stats tmp;
22809 int error = 0; 22821 int error = 0;
@@ -22848,9 +22860,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/uPD98402.c linux-2.6.32.14/drivers/atm/uP
22848 return 0; 22860 return 0;
22849 } 22861 }
22850 22862
22851diff -urNp linux-2.6.32.14/drivers/atm/zatm.c linux-2.6.32.14/drivers/atm/zatm.c 22863diff -urNp linux-2.6.32.15/drivers/atm/zatm.c linux-2.6.32.15/drivers/atm/zatm.c
22852--- linux-2.6.32.14/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400 22864--- linux-2.6.32.15/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400
22853+++ linux-2.6.32.14/drivers/atm/zatm.c 2010-05-28 21:27:15.375178174 -0400 22865+++ linux-2.6.32.15/drivers/atm/zatm.c 2010-05-28 21:27:15.375178174 -0400
22854@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy 22866@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
22855 } 22867 }
22856 if (!size) { 22868 if (!size) {
@@ -22878,9 +22890,9 @@ diff -urNp linux-2.6.32.14/drivers/atm/zatm.c linux-2.6.32.14/drivers/atm/zatm.c
22878 wake_up(&zatm_vcc->tx_wait); 22890 wake_up(&zatm_vcc->tx_wait);
22879 } 22891 }
22880 22892
22881diff -urNp linux-2.6.32.14/drivers/base/bus.c linux-2.6.32.14/drivers/base/bus.c 22893diff -urNp linux-2.6.32.15/drivers/base/bus.c linux-2.6.32.15/drivers/base/bus.c
22882--- linux-2.6.32.14/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400 22894--- linux-2.6.32.15/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400
22883+++ linux-2.6.32.14/drivers/base/bus.c 2010-05-28 21:27:15.383215309 -0400 22895+++ linux-2.6.32.15/drivers/base/bus.c 2010-05-28 21:27:15.383215309 -0400
22884@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob 22896@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
22885 return ret; 22897 return ret;
22886 } 22898 }
@@ -22908,9 +22920,9 @@ diff -urNp linux-2.6.32.14/drivers/base/bus.c linux-2.6.32.14/drivers/base/bus.c
22908 .filter = bus_uevent_filter, 22920 .filter = bus_uevent_filter,
22909 }; 22921 };
22910 22922
22911diff -urNp linux-2.6.32.14/drivers/base/class.c linux-2.6.32.14/drivers/base/class.c 22923diff -urNp linux-2.6.32.15/drivers/base/class.c linux-2.6.32.15/drivers/base/class.c
22912--- linux-2.6.32.14/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400 22924--- linux-2.6.32.15/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400
22913+++ linux-2.6.32.14/drivers/base/class.c 2010-05-28 21:27:15.383215309 -0400 22925+++ linux-2.6.32.15/drivers/base/class.c 2010-05-28 21:27:15.383215309 -0400
22914@@ -63,7 +63,7 @@ static void class_release(struct kobject 22926@@ -63,7 +63,7 @@ static void class_release(struct kobject
22915 kfree(cp); 22927 kfree(cp);
22916 } 22928 }
@@ -22920,9 +22932,9 @@ diff -urNp linux-2.6.32.14/drivers/base/class.c linux-2.6.32.14/drivers/base/cla
22920 .show = class_attr_show, 22932 .show = class_attr_show,
22921 .store = class_attr_store, 22933 .store = class_attr_store,
22922 }; 22934 };
22923diff -urNp linux-2.6.32.14/drivers/base/core.c linux-2.6.32.14/drivers/base/core.c 22935diff -urNp linux-2.6.32.15/drivers/base/core.c linux-2.6.32.15/drivers/base/core.c
22924--- linux-2.6.32.14/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400 22936--- linux-2.6.32.15/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400
22925+++ linux-2.6.32.14/drivers/base/core.c 2010-05-28 21:27:15.386909095 -0400 22937+++ linux-2.6.32.15/drivers/base/core.c 2010-05-28 21:27:15.386909095 -0400
22926@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob 22938@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
22927 return ret; 22939 return ret;
22928 } 22940 }
@@ -22941,9 +22953,9 @@ diff -urNp linux-2.6.32.14/drivers/base/core.c linux-2.6.32.14/drivers/base/core
22941 .filter = dev_uevent_filter, 22953 .filter = dev_uevent_filter,
22942 .name = dev_uevent_name, 22954 .name = dev_uevent_name,
22943 .uevent = dev_uevent, 22955 .uevent = dev_uevent,
22944diff -urNp linux-2.6.32.14/drivers/base/memory.c linux-2.6.32.14/drivers/base/memory.c 22956diff -urNp linux-2.6.32.15/drivers/base/memory.c linux-2.6.32.15/drivers/base/memory.c
22945--- linux-2.6.32.14/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400 22957--- linux-2.6.32.15/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400
22946+++ linux-2.6.32.14/drivers/base/memory.c 2010-05-28 21:27:15.386909095 -0400 22958+++ linux-2.6.32.15/drivers/base/memory.c 2010-05-28 21:27:15.386909095 -0400
22947@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks 22959@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
22948 return retval; 22960 return retval;
22949 } 22961 }
@@ -22953,9 +22965,9 @@ diff -urNp linux-2.6.32.14/drivers/base/memory.c linux-2.6.32.14/drivers/base/me
22953 .name = memory_uevent_name, 22965 .name = memory_uevent_name,
22954 .uevent = memory_uevent, 22966 .uevent = memory_uevent,
22955 }; 22967 };
22956diff -urNp linux-2.6.32.14/drivers/base/sys.c linux-2.6.32.14/drivers/base/sys.c 22968diff -urNp linux-2.6.32.15/drivers/base/sys.c linux-2.6.32.15/drivers/base/sys.c
22957--- linux-2.6.32.14/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400 22969--- linux-2.6.32.15/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400
22958+++ linux-2.6.32.14/drivers/base/sys.c 2010-05-28 21:27:15.395045412 -0400 22970+++ linux-2.6.32.15/drivers/base/sys.c 2010-05-28 21:27:15.395045412 -0400
22959@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc 22971@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
22960 return -EIO; 22972 return -EIO;
22961 } 22973 }
@@ -22974,9 +22986,9 @@ diff -urNp linux-2.6.32.14/drivers/base/sys.c linux-2.6.32.14/drivers/base/sys.c
22974 .show = sysdev_class_show, 22986 .show = sysdev_class_show,
22975 .store = sysdev_class_store, 22987 .store = sysdev_class_store,
22976 }; 22988 };
22977diff -urNp linux-2.6.32.14/drivers/block/pktcdvd.c linux-2.6.32.14/drivers/block/pktcdvd.c 22989diff -urNp linux-2.6.32.15/drivers/block/pktcdvd.c linux-2.6.32.15/drivers/block/pktcdvd.c
22978--- linux-2.6.32.14/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400 22990--- linux-2.6.32.15/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400
22979+++ linux-2.6.32.14/drivers/block/pktcdvd.c 2010-05-28 21:27:15.403194679 -0400 22991+++ linux-2.6.32.15/drivers/block/pktcdvd.c 2010-05-28 21:27:15.403194679 -0400
22980@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob 22992@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
22981 return len; 22993 return len;
22982 } 22994 }
@@ -22986,9 +22998,9 @@ diff -urNp linux-2.6.32.14/drivers/block/pktcdvd.c linux-2.6.32.14/drivers/block
22986 .show = kobj_pkt_show, 22998 .show = kobj_pkt_show,
22987 .store = kobj_pkt_store 22999 .store = kobj_pkt_store
22988 }; 23000 };
22989diff -urNp linux-2.6.32.14/drivers/char/agp/frontend.c linux-2.6.32.14/drivers/char/agp/frontend.c 23001diff -urNp linux-2.6.32.15/drivers/char/agp/frontend.c linux-2.6.32.15/drivers/char/agp/frontend.c
22990--- linux-2.6.32.14/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400 23002--- linux-2.6.32.15/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400
22991+++ linux-2.6.32.14/drivers/char/agp/frontend.c 2010-05-28 21:27:15.403194679 -0400 23003+++ linux-2.6.32.15/drivers/char/agp/frontend.c 2010-05-28 21:27:15.403194679 -0400
22992@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag 23004@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
22993 if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) 23005 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
22994 return -EFAULT; 23006 return -EFAULT;
@@ -22998,9 +23010,9 @@ diff -urNp linux-2.6.32.14/drivers/char/agp/frontend.c linux-2.6.32.14/drivers/c
22998 return -EFAULT; 23010 return -EFAULT;
22999 23011
23000 client = agp_find_client_by_pid(reserve.pid); 23012 client = agp_find_client_by_pid(reserve.pid);
23001diff -urNp linux-2.6.32.14/drivers/char/agp/intel-agp.c linux-2.6.32.14/drivers/char/agp/intel-agp.c 23013diff -urNp linux-2.6.32.15/drivers/char/agp/intel-agp.c linux-2.6.32.15/drivers/char/agp/intel-agp.c
23002--- linux-2.6.32.14/drivers/char/agp/intel-agp.c 2010-04-29 17:49:37.777981896 -0400 23014--- linux-2.6.32.15/drivers/char/agp/intel-agp.c 2010-04-29 17:49:37.777981896 -0400
23003+++ linux-2.6.32.14/drivers/char/agp/intel-agp.c 2010-05-28 21:27:15.403194679 -0400 23015+++ linux-2.6.32.15/drivers/char/agp/intel-agp.c 2010-05-28 21:27:15.403194679 -0400
23004@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc 23016@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc
23005 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), 23017 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
23006 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), 23018 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
@@ -23010,9 +23022,9 @@ diff -urNp linux-2.6.32.14/drivers/char/agp/intel-agp.c linux-2.6.32.14/drivers/
23010 }; 23022 };
23011 23023
23012 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); 23024 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
23013diff -urNp linux-2.6.32.14/drivers/char/hpet.c linux-2.6.32.14/drivers/char/hpet.c 23025diff -urNp linux-2.6.32.15/drivers/char/hpet.c linux-2.6.32.15/drivers/char/hpet.c
23014--- linux-2.6.32.14/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400 23026--- linux-2.6.32.15/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400
23015+++ linux-2.6.32.14/drivers/char/hpet.c 2010-05-28 21:27:15.403194679 -0400 23027+++ linux-2.6.32.15/drivers/char/hpet.c 2010-05-28 21:27:15.403194679 -0400
23016@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in 23028@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
23017 return 0; 23029 return 0;
23018 } 23030 }
@@ -23040,9 +23052,9 @@ diff -urNp linux-2.6.32.14/drivers/char/hpet.c linux-2.6.32.14/drivers/char/hpet
23040 23052
23041 static int __init hpet_init(void) 23053 static int __init hpet_init(void)
23042 { 23054 {
23043diff -urNp linux-2.6.32.14/drivers/char/hvc_beat.c linux-2.6.32.14/drivers/char/hvc_beat.c 23055diff -urNp linux-2.6.32.15/drivers/char/hvc_beat.c linux-2.6.32.15/drivers/char/hvc_beat.c
23044--- linux-2.6.32.14/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400 23056--- linux-2.6.32.15/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400
23045+++ linux-2.6.32.14/drivers/char/hvc_beat.c 2010-05-28 21:27:15.403194679 -0400 23057+++ linux-2.6.32.15/drivers/char/hvc_beat.c 2010-05-28 21:27:15.403194679 -0400
23046@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v 23058@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
23047 return cnt; 23059 return cnt;
23048 } 23060 }
@@ -23052,9 +23064,9 @@ diff -urNp linux-2.6.32.14/drivers/char/hvc_beat.c linux-2.6.32.14/drivers/char/
23052 .get_chars = hvc_beat_get_chars, 23064 .get_chars = hvc_beat_get_chars,
23053 .put_chars = hvc_beat_put_chars, 23065 .put_chars = hvc_beat_put_chars,
23054 }; 23066 };
23055diff -urNp linux-2.6.32.14/drivers/char/hvc_console.c linux-2.6.32.14/drivers/char/hvc_console.c 23067diff -urNp linux-2.6.32.15/drivers/char/hvc_console.c linux-2.6.32.15/drivers/char/hvc_console.c
23056--- linux-2.6.32.14/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400 23068--- linux-2.6.32.15/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400
23057+++ linux-2.6.32.14/drivers/char/hvc_console.c 2010-05-28 21:27:15.403194679 -0400 23069+++ linux-2.6.32.15/drivers/char/hvc_console.c 2010-05-28 21:27:15.403194679 -0400
23058@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind 23070@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
23059 * console interfaces but can still be used as a tty device. This has to be 23071 * console interfaces but can still be used as a tty device. This has to be
23060 * static because kmalloc will not work during early console init. 23072 * static because kmalloc will not work during early console init.
@@ -23082,9 +23094,9 @@ diff -urNp linux-2.6.32.14/drivers/char/hvc_console.c linux-2.6.32.14/drivers/ch
23082 { 23094 {
23083 struct hvc_struct *hp; 23095 struct hvc_struct *hp;
23084 int i; 23096 int i;
23085diff -urNp linux-2.6.32.14/drivers/char/hvc_console.h linux-2.6.32.14/drivers/char/hvc_console.h 23097diff -urNp linux-2.6.32.15/drivers/char/hvc_console.h linux-2.6.32.15/drivers/char/hvc_console.h
23086--- linux-2.6.32.14/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400 23098--- linux-2.6.32.15/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400
23087+++ linux-2.6.32.14/drivers/char/hvc_console.h 2010-05-28 21:27:15.403194679 -0400 23099+++ linux-2.6.32.15/drivers/char/hvc_console.h 2010-05-28 21:27:15.403194679 -0400
23088@@ -55,7 +55,7 @@ struct hvc_struct { 23100@@ -55,7 +55,7 @@ struct hvc_struct {
23089 int outbuf_size; 23101 int outbuf_size;
23090 int n_outbuf; 23102 int n_outbuf;
@@ -23108,9 +23120,9 @@ diff -urNp linux-2.6.32.14/drivers/char/hvc_console.h linux-2.6.32.14/drivers/ch
23108 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ 23120 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
23109 extern int hvc_remove(struct hvc_struct *hp); 23121 extern int hvc_remove(struct hvc_struct *hp);
23110 23122
23111diff -urNp linux-2.6.32.14/drivers/char/hvc_iseries.c linux-2.6.32.14/drivers/char/hvc_iseries.c 23123diff -urNp linux-2.6.32.15/drivers/char/hvc_iseries.c linux-2.6.32.15/drivers/char/hvc_iseries.c
23112--- linux-2.6.32.14/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400 23124--- linux-2.6.32.15/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400
23113+++ linux-2.6.32.14/drivers/char/hvc_iseries.c 2010-05-28 21:27:15.403194679 -0400 23125+++ linux-2.6.32.15/drivers/char/hvc_iseries.c 2010-05-28 21:27:15.403194679 -0400
23114@@ -197,7 +197,7 @@ done: 23126@@ -197,7 +197,7 @@ done:
23115 return sent; 23127 return sent;
23116 } 23128 }
@@ -23120,9 +23132,9 @@ diff -urNp linux-2.6.32.14/drivers/char/hvc_iseries.c linux-2.6.32.14/drivers/ch
23120 .get_chars = get_chars, 23132 .get_chars = get_chars,
23121 .put_chars = put_chars, 23133 .put_chars = put_chars,
23122 .notifier_add = notifier_add_irq, 23134 .notifier_add = notifier_add_irq,
23123diff -urNp linux-2.6.32.14/drivers/char/hvc_iucv.c linux-2.6.32.14/drivers/char/hvc_iucv.c 23135diff -urNp linux-2.6.32.15/drivers/char/hvc_iucv.c linux-2.6.32.15/drivers/char/hvc_iucv.c
23124--- linux-2.6.32.14/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400 23136--- linux-2.6.32.15/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400
23125+++ linux-2.6.32.14/drivers/char/hvc_iucv.c 2010-05-28 21:27:15.403194679 -0400 23137+++ linux-2.6.32.15/drivers/char/hvc_iucv.c 2010-05-28 21:27:15.403194679 -0400
23126@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru 23138@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
23127 23139
23128 23140
@@ -23132,9 +23144,9 @@ diff -urNp linux-2.6.32.14/drivers/char/hvc_iucv.c linux-2.6.32.14/drivers/char/
23132 .get_chars = hvc_iucv_get_chars, 23144 .get_chars = hvc_iucv_get_chars,
23133 .put_chars = hvc_iucv_put_chars, 23145 .put_chars = hvc_iucv_put_chars,
23134 .notifier_add = hvc_iucv_notifier_add, 23146 .notifier_add = hvc_iucv_notifier_add,
23135diff -urNp linux-2.6.32.14/drivers/char/hvc_rtas.c linux-2.6.32.14/drivers/char/hvc_rtas.c 23147diff -urNp linux-2.6.32.15/drivers/char/hvc_rtas.c linux-2.6.32.15/drivers/char/hvc_rtas.c
23136--- linux-2.6.32.14/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400 23148--- linux-2.6.32.15/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400
23137+++ linux-2.6.32.14/drivers/char/hvc_rtas.c 2010-05-28 21:27:15.407096871 -0400 23149+++ linux-2.6.32.15/drivers/char/hvc_rtas.c 2010-05-28 21:27:15.407096871 -0400
23138@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ 23150@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
23139 return i; 23151 return i;
23140 } 23152 }
@@ -23144,9 +23156,9 @@ diff -urNp linux-2.6.32.14/drivers/char/hvc_rtas.c linux-2.6.32.14/drivers/char/
23144 .get_chars = hvc_rtas_read_console, 23156 .get_chars = hvc_rtas_read_console,
23145 .put_chars = hvc_rtas_write_console, 23157 .put_chars = hvc_rtas_write_console,
23146 }; 23158 };
23147diff -urNp linux-2.6.32.14/drivers/char/hvcs.c linux-2.6.32.14/drivers/char/hvcs.c 23159diff -urNp linux-2.6.32.15/drivers/char/hvcs.c linux-2.6.32.15/drivers/char/hvcs.c
23148--- linux-2.6.32.14/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400 23160--- linux-2.6.32.15/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400
23149+++ linux-2.6.32.14/drivers/char/hvcs.c 2010-05-28 21:27:15.407096871 -0400 23161+++ linux-2.6.32.15/drivers/char/hvcs.c 2010-05-28 21:27:15.407096871 -0400
23150@@ -269,7 +269,7 @@ struct hvcs_struct { 23162@@ -269,7 +269,7 @@ struct hvcs_struct {
23151 unsigned int index; 23163 unsigned int index;
23152 23164
@@ -23241,9 +23253,9 @@ diff -urNp linux-2.6.32.14/drivers/char/hvcs.c linux-2.6.32.14/drivers/char/hvcs
23241 return 0; 23253 return 0;
23242 23254
23243 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; 23255 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
23244diff -urNp linux-2.6.32.14/drivers/char/hvc_udbg.c linux-2.6.32.14/drivers/char/hvc_udbg.c 23256diff -urNp linux-2.6.32.15/drivers/char/hvc_udbg.c linux-2.6.32.15/drivers/char/hvc_udbg.c
23245--- linux-2.6.32.14/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400 23257--- linux-2.6.32.15/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400
23246+++ linux-2.6.32.14/drivers/char/hvc_udbg.c 2010-05-28 21:27:15.407096871 -0400 23258+++ linux-2.6.32.15/drivers/char/hvc_udbg.c 2010-05-28 21:27:15.407096871 -0400
23247@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno 23259@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
23248 return i; 23260 return i;
23249 } 23261 }
@@ -23253,9 +23265,9 @@ diff -urNp linux-2.6.32.14/drivers/char/hvc_udbg.c linux-2.6.32.14/drivers/char/
23253 .get_chars = hvc_udbg_get, 23265 .get_chars = hvc_udbg_get,
23254 .put_chars = hvc_udbg_put, 23266 .put_chars = hvc_udbg_put,
23255 }; 23267 };
23256diff -urNp linux-2.6.32.14/drivers/char/hvc_vio.c linux-2.6.32.14/drivers/char/hvc_vio.c 23268diff -urNp linux-2.6.32.15/drivers/char/hvc_vio.c linux-2.6.32.15/drivers/char/hvc_vio.c
23257--- linux-2.6.32.14/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400 23269--- linux-2.6.32.15/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400
23258+++ linux-2.6.32.14/drivers/char/hvc_vio.c 2010-05-28 21:27:15.407096871 -0400 23270+++ linux-2.6.32.15/drivers/char/hvc_vio.c 2010-05-28 21:27:15.407096871 -0400
23259@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v 23271@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
23260 return got; 23272 return got;
23261 } 23273 }
@@ -23265,9 +23277,9 @@ diff -urNp linux-2.6.32.14/drivers/char/hvc_vio.c linux-2.6.32.14/drivers/char/h
23265 .get_chars = filtered_get_chars, 23277 .get_chars = filtered_get_chars,
23266 .put_chars = hvc_put_chars, 23278 .put_chars = hvc_put_chars,
23267 .notifier_add = notifier_add_irq, 23279 .notifier_add = notifier_add_irq,
23268diff -urNp linux-2.6.32.14/drivers/char/hvc_xen.c linux-2.6.32.14/drivers/char/hvc_xen.c 23280diff -urNp linux-2.6.32.15/drivers/char/hvc_xen.c linux-2.6.32.15/drivers/char/hvc_xen.c
23269--- linux-2.6.32.14/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400 23281--- linux-2.6.32.15/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400
23270+++ linux-2.6.32.14/drivers/char/hvc_xen.c 2010-05-28 21:27:15.407096871 -0400 23282+++ linux-2.6.32.15/drivers/char/hvc_xen.c 2010-05-28 21:27:15.407096871 -0400
23271@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno 23283@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
23272 return recv; 23284 return recv;
23273 } 23285 }
@@ -23277,9 +23289,9 @@ diff -urNp linux-2.6.32.14/drivers/char/hvc_xen.c linux-2.6.32.14/drivers/char/h
23277 .get_chars = read_console, 23289 .get_chars = read_console,
23278 .put_chars = write_console, 23290 .put_chars = write_console,
23279 .notifier_add = notifier_add_irq, 23291 .notifier_add = notifier_add_irq,
23280diff -urNp linux-2.6.32.14/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.14/drivers/char/ipmi/ipmi_msghandler.c 23292diff -urNp linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c
23281--- linux-2.6.32.14/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400 23293--- linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400
23282+++ linux-2.6.32.14/drivers/char/ipmi/ipmi_msghandler.c 2010-05-28 21:27:15.407096871 -0400 23294+++ linux-2.6.32.15/drivers/char/ipmi/ipmi_msghandler.c 2010-05-28 21:27:15.407096871 -0400
23283@@ -414,7 +414,7 @@ struct ipmi_smi { 23295@@ -414,7 +414,7 @@ struct ipmi_smi {
23284 struct proc_dir_entry *proc_dir; 23296 struct proc_dir_entry *proc_dir;
23285 char proc_dir_name[10]; 23297 char proc_dir_name[10];
@@ -23310,9 +23322,9 @@ diff -urNp linux-2.6.32.14/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.14/d
23310 23322
23311 intf->proc_dir = NULL; 23323 intf->proc_dir = NULL;
23312 23324
23313diff -urNp linux-2.6.32.14/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.14/drivers/char/ipmi/ipmi_si_intf.c 23325diff -urNp linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c
23314--- linux-2.6.32.14/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400 23326--- linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400
23315+++ linux-2.6.32.14/drivers/char/ipmi/ipmi_si_intf.c 2010-05-28 21:27:15.407096871 -0400 23327+++ linux-2.6.32.15/drivers/char/ipmi/ipmi_si_intf.c 2010-05-28 21:27:15.407096871 -0400
23316@@ -277,7 +277,7 @@ struct smi_info { 23328@@ -277,7 +277,7 @@ struct smi_info {
23317 unsigned char slave_addr; 23329 unsigned char slave_addr;
23318 23330
@@ -23343,9 +23355,9 @@ diff -urNp linux-2.6.32.14/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.14/driv
23343 23355
23344 new_smi->interrupt_disabled = 0; 23356 new_smi->interrupt_disabled = 0;
23345 atomic_set(&new_smi->stop_operation, 0); 23357 atomic_set(&new_smi->stop_operation, 0);
23346diff -urNp linux-2.6.32.14/drivers/char/keyboard.c linux-2.6.32.14/drivers/char/keyboard.c 23358diff -urNp linux-2.6.32.15/drivers/char/keyboard.c linux-2.6.32.15/drivers/char/keyboard.c
23347--- linux-2.6.32.14/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400 23359--- linux-2.6.32.15/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400
23348+++ linux-2.6.32.14/drivers/char/keyboard.c 2010-05-28 21:27:15.407096871 -0400 23360+++ linux-2.6.32.15/drivers/char/keyboard.c 2010-05-28 21:27:15.407096871 -0400
23349@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u 23361@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
23350 kbd->kbdmode == VC_MEDIUMRAW) && 23362 kbd->kbdmode == VC_MEDIUMRAW) &&
23351 value != KVAL(K_SAK)) 23363 value != KVAL(K_SAK))
@@ -23372,9 +23384,9 @@ diff -urNp linux-2.6.32.14/drivers/char/keyboard.c linux-2.6.32.14/drivers/char/
23372 }; 23384 };
23373 23385
23374 MODULE_DEVICE_TABLE(input, kbd_ids); 23386 MODULE_DEVICE_TABLE(input, kbd_ids);
23375diff -urNp linux-2.6.32.14/drivers/char/mem.c linux-2.6.32.14/drivers/char/mem.c 23387diff -urNp linux-2.6.32.15/drivers/char/mem.c linux-2.6.32.15/drivers/char/mem.c
23376--- linux-2.6.32.14/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400 23388--- linux-2.6.32.15/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400
23377+++ linux-2.6.32.14/drivers/char/mem.c 2010-05-28 21:27:15.407096871 -0400 23389+++ linux-2.6.32.15/drivers/char/mem.c 2010-05-28 21:27:15.407096871 -0400
23378@@ -18,6 +18,7 @@ 23390@@ -18,6 +18,7 @@
23379 #include <linux/raw.h> 23391 #include <linux/raw.h>
23380 #include <linux/tty.h> 23392 #include <linux/tty.h>
@@ -23465,9 +23477,9 @@ diff -urNp linux-2.6.32.14/drivers/char/mem.c linux-2.6.32.14/drivers/char/mem.c
23465 }; 23477 };
23466 23478
23467 static int memory_open(struct inode *inode, struct file *filp) 23479 static int memory_open(struct inode *inode, struct file *filp)
23468diff -urNp linux-2.6.32.14/drivers/char/nvram.c linux-2.6.32.14/drivers/char/nvram.c 23480diff -urNp linux-2.6.32.15/drivers/char/nvram.c linux-2.6.32.15/drivers/char/nvram.c
23469--- linux-2.6.32.14/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400 23481--- linux-2.6.32.15/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400
23470+++ linux-2.6.32.14/drivers/char/nvram.c 2010-05-28 21:27:15.407096871 -0400 23482+++ linux-2.6.32.15/drivers/char/nvram.c 2010-05-28 21:27:15.407096871 -0400
23471@@ -429,7 +429,10 @@ static const struct file_operations nvra 23483@@ -429,7 +429,10 @@ static const struct file_operations nvra
23472 static struct miscdevice nvram_dev = { 23484 static struct miscdevice nvram_dev = {
23473 NVRAM_MINOR, 23485 NVRAM_MINOR,
@@ -23480,9 +23492,9 @@ diff -urNp linux-2.6.32.14/drivers/char/nvram.c linux-2.6.32.14/drivers/char/nvr
23480 }; 23492 };
23481 23493
23482 static int __init nvram_init(void) 23494 static int __init nvram_init(void)
23483diff -urNp linux-2.6.32.14/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.14/drivers/char/pcmcia/ipwireless/tty.c 23495diff -urNp linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c
23484--- linux-2.6.32.14/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400 23496--- linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400
23485+++ linux-2.6.32.14/drivers/char/pcmcia/ipwireless/tty.c 2010-05-28 21:27:15.407096871 -0400 23497+++ linux-2.6.32.15/drivers/char/pcmcia/ipwireless/tty.c 2010-05-28 21:27:15.407096871 -0400
23486@@ -51,7 +51,7 @@ struct ipw_tty { 23498@@ -51,7 +51,7 @@ struct ipw_tty {
23487 int tty_type; 23499 int tty_type;
23488 struct ipw_network *network; 23500 struct ipw_network *network;
@@ -23597,9 +23609,9 @@ diff -urNp linux-2.6.32.14/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.14/
23597 do_ipw_close(ttyj); 23609 do_ipw_close(ttyj);
23598 ipwireless_disassociate_network_ttys(network, 23610 ipwireless_disassociate_network_ttys(network,
23599 ttyj->channel_idx); 23611 ttyj->channel_idx);
23600diff -urNp linux-2.6.32.14/drivers/char/pty.c linux-2.6.32.14/drivers/char/pty.c 23612diff -urNp linux-2.6.32.15/drivers/char/pty.c linux-2.6.32.15/drivers/char/pty.c
23601--- linux-2.6.32.14/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400 23613--- linux-2.6.32.15/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400
23602+++ linux-2.6.32.14/drivers/char/pty.c 2010-05-28 21:27:15.411167470 -0400 23614+++ linux-2.6.32.15/drivers/char/pty.c 2010-05-28 21:27:15.411167470 -0400
23603@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode 23615@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
23604 return ret; 23616 return ret;
23605 } 23617 }
@@ -23630,9 +23642,9 @@ diff -urNp linux-2.6.32.14/drivers/char/pty.c linux-2.6.32.14/drivers/char/pty.c
23630 cdev_init(&ptmx_cdev, &ptmx_fops); 23642 cdev_init(&ptmx_cdev, &ptmx_fops);
23631 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || 23643 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
23632 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) 23644 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
23633diff -urNp linux-2.6.32.14/drivers/char/random.c linux-2.6.32.14/drivers/char/random.c 23645diff -urNp linux-2.6.32.15/drivers/char/random.c linux-2.6.32.15/drivers/char/random.c
23634--- linux-2.6.32.14/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400 23646--- linux-2.6.32.15/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400
23635+++ linux-2.6.32.14/drivers/char/random.c 2010-05-28 21:27:15.411167470 -0400 23647+++ linux-2.6.32.15/drivers/char/random.c 2010-05-28 21:27:15.411167470 -0400
23636@@ -254,8 +254,13 @@ 23648@@ -254,8 +254,13 @@
23637 /* 23649 /*
23638 * Configuration information 23650 * Configuration information
@@ -23674,9 +23686,9 @@ diff -urNp linux-2.6.32.14/drivers/char/random.c linux-2.6.32.14/drivers/char/ra
23674 static int max_write_thresh = INPUT_POOL_WORDS * 32; 23686 static int max_write_thresh = INPUT_POOL_WORDS * 32;
23675 static char sysctl_bootid[16]; 23687 static char sysctl_bootid[16];
23676 23688
23677diff -urNp linux-2.6.32.14/drivers/char/sonypi.c linux-2.6.32.14/drivers/char/sonypi.c 23689diff -urNp linux-2.6.32.15/drivers/char/sonypi.c linux-2.6.32.15/drivers/char/sonypi.c
23678--- linux-2.6.32.14/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400 23690--- linux-2.6.32.15/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400
23679+++ linux-2.6.32.14/drivers/char/sonypi.c 2010-05-28 21:27:15.411167470 -0400 23691+++ linux-2.6.32.15/drivers/char/sonypi.c 2010-05-28 21:27:15.411167470 -0400
23680@@ -491,7 +491,7 @@ static struct sonypi_device { 23692@@ -491,7 +491,7 @@ static struct sonypi_device {
23681 spinlock_t fifo_lock; 23693 spinlock_t fifo_lock;
23682 wait_queue_head_t fifo_proc_list; 23694 wait_queue_head_t fifo_proc_list;
@@ -23707,9 +23719,9 @@ diff -urNp linux-2.6.32.14/drivers/char/sonypi.c linux-2.6.32.14/drivers/char/so
23707 mutex_unlock(&sonypi_device.lock); 23719 mutex_unlock(&sonypi_device.lock);
23708 unlock_kernel(); 23720 unlock_kernel();
23709 return 0; 23721 return 0;
23710diff -urNp linux-2.6.32.14/drivers/char/tpm/tpm_bios.c linux-2.6.32.14/drivers/char/tpm/tpm_bios.c 23722diff -urNp linux-2.6.32.15/drivers/char/tpm/tpm_bios.c linux-2.6.32.15/drivers/char/tpm/tpm_bios.c
23711--- linux-2.6.32.14/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400 23723--- linux-2.6.32.15/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400
23712+++ linux-2.6.32.14/drivers/char/tpm/tpm_bios.c 2010-05-28 21:27:15.411167470 -0400 23724+++ linux-2.6.32.15/drivers/char/tpm/tpm_bios.c 2010-05-28 21:27:15.411167470 -0400
23713@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start 23725@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
23714 event = addr; 23726 event = addr;
23715 23727
@@ -23750,9 +23762,9 @@ diff -urNp linux-2.6.32.14/drivers/char/tpm/tpm_bios.c linux-2.6.32.14/drivers/c
23750 23762
23751 memcpy(log->bios_event_log, virt, len); 23763 memcpy(log->bios_event_log, virt, len);
23752 23764
23753diff -urNp linux-2.6.32.14/drivers/char/tty_io.c linux-2.6.32.14/drivers/char/tty_io.c 23765diff -urNp linux-2.6.32.15/drivers/char/tty_io.c linux-2.6.32.15/drivers/char/tty_io.c
23754--- linux-2.6.32.14/drivers/char/tty_io.c 2010-04-29 17:49:37.826084348 -0400 23766--- linux-2.6.32.15/drivers/char/tty_io.c 2010-04-29 17:49:37.826084348 -0400
23755+++ linux-2.6.32.14/drivers/char/tty_io.c 2010-05-28 21:27:15.411167470 -0400 23767+++ linux-2.6.32.15/drivers/char/tty_io.c 2010-05-28 21:27:15.411167470 -0400
23756@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list 23768@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
23757 DEFINE_MUTEX(tty_mutex); 23769 DEFINE_MUTEX(tty_mutex);
23758 EXPORT_SYMBOL(tty_mutex); 23770 EXPORT_SYMBOL(tty_mutex);
@@ -23891,9 +23903,9 @@ diff -urNp linux-2.6.32.14/drivers/char/tty_io.c linux-2.6.32.14/drivers/char/tt
23891 /* 23903 /*
23892 * Initialize the console device. This is called *early*, so 23904 * Initialize the console device. This is called *early*, so
23893 * we can't necessarily depend on lots of kernel help here. 23905 * we can't necessarily depend on lots of kernel help here.
23894diff -urNp linux-2.6.32.14/drivers/char/tty_ldisc.c linux-2.6.32.14/drivers/char/tty_ldisc.c 23906diff -urNp linux-2.6.32.15/drivers/char/tty_ldisc.c linux-2.6.32.15/drivers/char/tty_ldisc.c
23895--- linux-2.6.32.14/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400 23907--- linux-2.6.32.15/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400
23896+++ linux-2.6.32.14/drivers/char/tty_ldisc.c 2010-05-28 21:27:15.411167470 -0400 23908+++ linux-2.6.32.15/drivers/char/tty_ldisc.c 2010-05-28 21:27:15.411167470 -0400
23897@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * 23909@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc *
23898 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { 23910 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
23899 struct tty_ldisc_ops *ldo = ld->ops; 23911 struct tty_ldisc_ops *ldo = ld->ops;
@@ -23939,9 +23951,9 @@ diff -urNp linux-2.6.32.14/drivers/char/tty_ldisc.c linux-2.6.32.14/drivers/char
23939 module_put(ldops->owner); 23951 module_put(ldops->owner);
23940 spin_unlock_irqrestore(&tty_ldisc_lock, flags); 23952 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
23941 } 23953 }
23942diff -urNp linux-2.6.32.14/drivers/char/virtio_console.c linux-2.6.32.14/drivers/char/virtio_console.c 23954diff -urNp linux-2.6.32.15/drivers/char/virtio_console.c linux-2.6.32.15/drivers/char/virtio_console.c
23943--- linux-2.6.32.14/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400 23955--- linux-2.6.32.15/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400
23944+++ linux-2.6.32.14/drivers/char/virtio_console.c 2010-05-28 21:27:15.411167470 -0400 23956+++ linux-2.6.32.15/drivers/char/virtio_console.c 2010-05-28 21:27:15.411167470 -0400
23945@@ -44,6 +44,7 @@ static unsigned int in_len; 23957@@ -44,6 +44,7 @@ static unsigned int in_len;
23946 static char *in, *inbuf; 23958 static char *in, *inbuf;
23947 23959
@@ -23950,9 +23962,9 @@ diff -urNp linux-2.6.32.14/drivers/char/virtio_console.c linux-2.6.32.14/drivers
23950 static struct hv_ops virtio_cons; 23962 static struct hv_ops virtio_cons;
23951 23963
23952 /* The hvc device */ 23964 /* The hvc device */
23953diff -urNp linux-2.6.32.14/drivers/char/vt_ioctl.c linux-2.6.32.14/drivers/char/vt_ioctl.c 23965diff -urNp linux-2.6.32.15/drivers/char/vt_ioctl.c linux-2.6.32.15/drivers/char/vt_ioctl.c
23954--- linux-2.6.32.14/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400 23966--- linux-2.6.32.15/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400
23955+++ linux-2.6.32.14/drivers/char/vt_ioctl.c 2010-05-28 21:27:15.414917676 -0400 23967+++ linux-2.6.32.15/drivers/char/vt_ioctl.c 2010-05-28 21:27:15.414917676 -0400
23956@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ 23968@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __
23957 case KDSKBENT: 23969 case KDSKBENT:
23958 if (!perm) 23970 if (!perm)
@@ -23980,9 +23992,9 @@ diff -urNp linux-2.6.32.14/drivers/char/vt_ioctl.c linux-2.6.32.14/drivers/char/
23980 q = func_table[i]; 23992 q = func_table[i];
23981 first_free = funcbufptr + (funcbufsize - funcbufleft); 23993 first_free = funcbufptr + (funcbufsize - funcbufleft);
23982 for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 23994 for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++)
23983diff -urNp linux-2.6.32.14/drivers/cpufreq/cpufreq.c linux-2.6.32.14/drivers/cpufreq/cpufreq.c 23995diff -urNp linux-2.6.32.15/drivers/cpufreq/cpufreq.c linux-2.6.32.15/drivers/cpufreq/cpufreq.c
23984--- linux-2.6.32.14/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400 23996--- linux-2.6.32.15/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400
23985+++ linux-2.6.32.14/drivers/cpufreq/cpufreq.c 2010-05-28 21:27:15.418968453 -0400 23997+++ linux-2.6.32.15/drivers/cpufreq/cpufreq.c 2010-05-28 21:27:15.418968453 -0400
23986@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct 23998@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
23987 complete(&policy->kobj_unregister); 23999 complete(&policy->kobj_unregister);
23988 } 24000 }
@@ -23992,9 +24004,9 @@ diff -urNp linux-2.6.32.14/drivers/cpufreq/cpufreq.c linux-2.6.32.14/drivers/cpu
23992 .show = show, 24004 .show = show,
23993 .store = store, 24005 .store = store,
23994 }; 24006 };
23995diff -urNp linux-2.6.32.14/drivers/cpuidle/sysfs.c linux-2.6.32.14/drivers/cpuidle/sysfs.c 24007diff -urNp linux-2.6.32.15/drivers/cpuidle/sysfs.c linux-2.6.32.15/drivers/cpuidle/sysfs.c
23996--- linux-2.6.32.14/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400 24008--- linux-2.6.32.15/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400
23997+++ linux-2.6.32.14/drivers/cpuidle/sysfs.c 2010-05-28 21:27:15.418968453 -0400 24009+++ linux-2.6.32.15/drivers/cpuidle/sysfs.c 2010-05-28 21:27:15.418968453 -0400
23998@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj 24010@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
23999 return ret; 24011 return ret;
24000 } 24012 }
@@ -24022,9 +24034,9 @@ diff -urNp linux-2.6.32.14/drivers/cpuidle/sysfs.c linux-2.6.32.14/drivers/cpuid
24022 { 24034 {
24023 kobject_put(&device->kobjs[i]->kobj); 24035 kobject_put(&device->kobjs[i]->kobj);
24024 wait_for_completion(&device->kobjs[i]->kobj_unregister); 24036 wait_for_completion(&device->kobjs[i]->kobj_unregister);
24025diff -urNp linux-2.6.32.14/drivers/dma/ioat/dma.c linux-2.6.32.14/drivers/dma/ioat/dma.c 24037diff -urNp linux-2.6.32.15/drivers/dma/ioat/dma.c linux-2.6.32.15/drivers/dma/ioat/dma.c
24026--- linux-2.6.32.14/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400 24038--- linux-2.6.32.15/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400
24027+++ linux-2.6.32.14/drivers/dma/ioat/dma.c 2010-05-28 21:27:15.418968453 -0400 24039+++ linux-2.6.32.15/drivers/dma/ioat/dma.c 2010-05-28 21:27:15.418968453 -0400
24028@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str 24040@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
24029 return entry->show(&chan->common, page); 24041 return entry->show(&chan->common, page);
24030 } 24042 }
@@ -24034,9 +24046,9 @@ diff -urNp linux-2.6.32.14/drivers/dma/ioat/dma.c linux-2.6.32.14/drivers/dma/io
24034 .show = ioat_attr_show, 24046 .show = ioat_attr_show,
24035 }; 24047 };
24036 24048
24037diff -urNp linux-2.6.32.14/drivers/dma/ioat/dma.h linux-2.6.32.14/drivers/dma/ioat/dma.h 24049diff -urNp linux-2.6.32.15/drivers/dma/ioat/dma.h linux-2.6.32.15/drivers/dma/ioat/dma.h
24038--- linux-2.6.32.14/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400 24050--- linux-2.6.32.15/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400
24039+++ linux-2.6.32.14/drivers/dma/ioat/dma.h 2010-05-28 21:27:15.418968453 -0400 24051+++ linux-2.6.32.15/drivers/dma/ioat/dma.h 2010-05-28 21:27:15.418968453 -0400
24040@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c 24052@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
24041 unsigned long *phys_complete); 24053 unsigned long *phys_complete);
24042 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); 24054 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
@@ -24046,9 +24058,9 @@ diff -urNp linux-2.6.32.14/drivers/dma/ioat/dma.h linux-2.6.32.14/drivers/dma/io
24046 extern struct ioat_sysfs_entry ioat_version_attr; 24058 extern struct ioat_sysfs_entry ioat_version_attr;
24047 extern struct ioat_sysfs_entry ioat_cap_attr; 24059 extern struct ioat_sysfs_entry ioat_cap_attr;
24048 #endif /* IOATDMA_H */ 24060 #endif /* IOATDMA_H */
24049diff -urNp linux-2.6.32.14/drivers/edac/edac_core.h linux-2.6.32.14/drivers/edac/edac_core.h 24061diff -urNp linux-2.6.32.15/drivers/edac/edac_core.h linux-2.6.32.15/drivers/edac/edac_core.h
24050--- linux-2.6.32.14/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400 24062--- linux-2.6.32.15/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400
24051+++ linux-2.6.32.14/drivers/edac/edac_core.h 2010-05-28 21:27:15.418968453 -0400 24063+++ linux-2.6.32.15/drivers/edac/edac_core.h 2010-05-28 21:27:15.418968453 -0400
24052@@ -99,11 +99,11 @@ extern int edac_debug_level; 24064@@ -99,11 +99,11 @@ extern int edac_debug_level;
24053 24065
24054 #else /* !CONFIG_EDAC_DEBUG */ 24066 #else /* !CONFIG_EDAC_DEBUG */
@@ -24066,9 +24078,9 @@ diff -urNp linux-2.6.32.14/drivers/edac/edac_core.h linux-2.6.32.14/drivers/edac
24066 24078
24067 #endif /* !CONFIG_EDAC_DEBUG */ 24079 #endif /* !CONFIG_EDAC_DEBUG */
24068 24080
24069diff -urNp linux-2.6.32.14/drivers/edac/edac_device_sysfs.c linux-2.6.32.14/drivers/edac/edac_device_sysfs.c 24081diff -urNp linux-2.6.32.15/drivers/edac/edac_device_sysfs.c linux-2.6.32.15/drivers/edac/edac_device_sysfs.c
24070--- linux-2.6.32.14/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400 24082--- linux-2.6.32.15/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400
24071+++ linux-2.6.32.14/drivers/edac/edac_device_sysfs.c 2010-05-28 21:27:15.418968453 -0400 24083+++ linux-2.6.32.15/drivers/edac/edac_device_sysfs.c 2010-05-28 21:27:15.418968453 -0400
24072@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s 24084@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
24073 } 24085 }
24074 24086
@@ -24096,9 +24108,9 @@ diff -urNp linux-2.6.32.14/drivers/edac/edac_device_sysfs.c linux-2.6.32.14/driv
24096 .show = edac_dev_block_show, 24108 .show = edac_dev_block_show,
24097 .store = edac_dev_block_store 24109 .store = edac_dev_block_store
24098 }; 24110 };
24099diff -urNp linux-2.6.32.14/drivers/edac/edac_mc_sysfs.c linux-2.6.32.14/drivers/edac/edac_mc_sysfs.c 24111diff -urNp linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c
24100--- linux-2.6.32.14/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400 24112--- linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400
24101+++ linux-2.6.32.14/drivers/edac/edac_mc_sysfs.c 2010-05-28 21:27:15.418968453 -0400 24113+++ linux-2.6.32.15/drivers/edac/edac_mc_sysfs.c 2010-05-28 21:27:15.418968453 -0400
24102@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob 24114@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
24103 return -EIO; 24115 return -EIO;
24104 } 24116 }
@@ -24117,9 +24129,9 @@ diff -urNp linux-2.6.32.14/drivers/edac/edac_mc_sysfs.c linux-2.6.32.14/drivers/
24117 .show = mcidev_show, 24129 .show = mcidev_show,
24118 .store = mcidev_store 24130 .store = mcidev_store
24119 }; 24131 };
24120diff -urNp linux-2.6.32.14/drivers/edac/edac_pci_sysfs.c linux-2.6.32.14/drivers/edac/edac_pci_sysfs.c 24132diff -urNp linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c
24121--- linux-2.6.32.14/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400 24133--- linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400
24122+++ linux-2.6.32.14/drivers/edac/edac_pci_sysfs.c 2010-05-28 21:27:15.418968453 -0400 24134+++ linux-2.6.32.15/drivers/edac/edac_pci_sysfs.c 2010-05-28 21:27:15.418968453 -0400
24123@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s 24135@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
24124 } 24136 }
24125 24137
@@ -24138,9 +24150,9 @@ diff -urNp linux-2.6.32.14/drivers/edac/edac_pci_sysfs.c linux-2.6.32.14/drivers
24138 .show = edac_pci_dev_show, 24150 .show = edac_pci_dev_show,
24139 .store = edac_pci_dev_store 24151 .store = edac_pci_dev_store
24140 }; 24152 };
24141diff -urNp linux-2.6.32.14/drivers/firewire/core-cdev.c linux-2.6.32.14/drivers/firewire/core-cdev.c 24153diff -urNp linux-2.6.32.15/drivers/firewire/core-cdev.c linux-2.6.32.15/drivers/firewire/core-cdev.c
24142--- linux-2.6.32.14/drivers/firewire/core-cdev.c 2010-03-15 11:52:04.000000000 -0400 24154--- linux-2.6.32.15/drivers/firewire/core-cdev.c 2010-03-15 11:52:04.000000000 -0400
24143+++ linux-2.6.32.14/drivers/firewire/core-cdev.c 2010-05-28 21:27:15.422980793 -0400 24155+++ linux-2.6.32.15/drivers/firewire/core-cdev.c 2010-05-28 21:27:15.422980793 -0400
24144@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie 24156@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
24145 int ret; 24157 int ret;
24146 24158
@@ -24151,9 +24163,9 @@ diff -urNp linux-2.6.32.14/drivers/firewire/core-cdev.c linux-2.6.32.14/drivers/
24151 return -EINVAL; 24163 return -EINVAL;
24152 24164
24153 r = kmalloc(sizeof(*r), GFP_KERNEL); 24165 r = kmalloc(sizeof(*r), GFP_KERNEL);
24154diff -urNp linux-2.6.32.14/drivers/firmware/dmi_scan.c linux-2.6.32.14/drivers/firmware/dmi_scan.c 24166diff -urNp linux-2.6.32.15/drivers/firmware/dmi_scan.c linux-2.6.32.15/drivers/firmware/dmi_scan.c
24155--- linux-2.6.32.14/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400 24167--- linux-2.6.32.15/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400
24156+++ linux-2.6.32.14/drivers/firmware/dmi_scan.c 2010-05-28 21:27:15.422980793 -0400 24168+++ linux-2.6.32.15/drivers/firmware/dmi_scan.c 2010-05-28 21:27:15.422980793 -0400
24157@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) 24169@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
24158 } 24170 }
24159 } 24171 }
@@ -24166,9 +24178,9 @@ diff -urNp linux-2.6.32.14/drivers/firmware/dmi_scan.c linux-2.6.32.14/drivers/f
24166 p = dmi_ioremap(0xF0000, 0x10000); 24178 p = dmi_ioremap(0xF0000, 0x10000);
24167 if (p == NULL) 24179 if (p == NULL)
24168 goto error; 24180 goto error;
24169diff -urNp linux-2.6.32.14/drivers/firmware/edd.c linux-2.6.32.14/drivers/firmware/edd.c 24181diff -urNp linux-2.6.32.15/drivers/firmware/edd.c linux-2.6.32.15/drivers/firmware/edd.c
24170--- linux-2.6.32.14/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400 24182--- linux-2.6.32.15/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400
24171+++ linux-2.6.32.14/drivers/firmware/edd.c 2010-05-28 21:27:15.422980793 -0400 24183+++ linux-2.6.32.15/drivers/firmware/edd.c 2010-05-28 21:27:15.422980793 -0400
24172@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str 24184@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
24173 return ret; 24185 return ret;
24174 } 24186 }
@@ -24178,9 +24190,9 @@ diff -urNp linux-2.6.32.14/drivers/firmware/edd.c linux-2.6.32.14/drivers/firmwa
24178 .show = edd_attr_show, 24190 .show = edd_attr_show,
24179 }; 24191 };
24180 24192
24181diff -urNp linux-2.6.32.14/drivers/firmware/efivars.c linux-2.6.32.14/drivers/firmware/efivars.c 24193diff -urNp linux-2.6.32.15/drivers/firmware/efivars.c linux-2.6.32.15/drivers/firmware/efivars.c
24182--- linux-2.6.32.14/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400 24194--- linux-2.6.32.15/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400
24183+++ linux-2.6.32.14/drivers/firmware/efivars.c 2010-05-28 21:27:15.422980793 -0400 24195+++ linux-2.6.32.15/drivers/firmware/efivars.c 2010-05-28 21:27:15.422980793 -0400
24184@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct 24196@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
24185 return ret; 24197 return ret;
24186 } 24198 }
@@ -24190,9 +24202,9 @@ diff -urNp linux-2.6.32.14/drivers/firmware/efivars.c linux-2.6.32.14/drivers/fi
24190 .show = efivar_attr_show, 24202 .show = efivar_attr_show,
24191 .store = efivar_attr_store, 24203 .store = efivar_attr_store,
24192 }; 24204 };
24193diff -urNp linux-2.6.32.14/drivers/firmware/iscsi_ibft.c linux-2.6.32.14/drivers/firmware/iscsi_ibft.c 24205diff -urNp linux-2.6.32.15/drivers/firmware/iscsi_ibft.c linux-2.6.32.15/drivers/firmware/iscsi_ibft.c
24194--- linux-2.6.32.14/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400 24206--- linux-2.6.32.15/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400
24195+++ linux-2.6.32.14/drivers/firmware/iscsi_ibft.c 2010-05-28 21:27:15.431186849 -0400 24207+++ linux-2.6.32.15/drivers/firmware/iscsi_ibft.c 2010-05-28 21:27:15.431186849 -0400
24196@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc 24208@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
24197 return ret; 24209 return ret;
24198 } 24210 }
@@ -24202,9 +24214,9 @@ diff -urNp linux-2.6.32.14/drivers/firmware/iscsi_ibft.c linux-2.6.32.14/drivers
24202 .show = ibft_show_attribute, 24214 .show = ibft_show_attribute,
24203 }; 24215 };
24204 24216
24205diff -urNp linux-2.6.32.14/drivers/firmware/memmap.c linux-2.6.32.14/drivers/firmware/memmap.c 24217diff -urNp linux-2.6.32.15/drivers/firmware/memmap.c linux-2.6.32.15/drivers/firmware/memmap.c
24206--- linux-2.6.32.14/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400 24218--- linux-2.6.32.15/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400
24207+++ linux-2.6.32.14/drivers/firmware/memmap.c 2010-05-28 21:27:15.446919696 -0400 24219+++ linux-2.6.32.15/drivers/firmware/memmap.c 2010-05-28 21:27:15.446919696 -0400
24208@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { 24220@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
24209 NULL 24221 NULL
24210 }; 24222 };
@@ -24214,9 +24226,9 @@ diff -urNp linux-2.6.32.14/drivers/firmware/memmap.c linux-2.6.32.14/drivers/fir
24214 .show = memmap_attr_show, 24226 .show = memmap_attr_show,
24215 }; 24227 };
24216 24228
24217diff -urNp linux-2.6.32.14/drivers/gpu/drm/drm_drv.c linux-2.6.32.14/drivers/gpu/drm/drm_drv.c 24229diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_drv.c linux-2.6.32.15/drivers/gpu/drm/drm_drv.c
24218--- linux-2.6.32.14/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400 24230--- linux-2.6.32.15/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400
24219+++ linux-2.6.32.14/drivers/gpu/drm/drm_drv.c 2010-05-28 21:27:15.446919696 -0400 24231+++ linux-2.6.32.15/drivers/gpu/drm/drm_drv.c 2010-05-28 21:27:15.446919696 -0400
24220@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc 24232@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
24221 char *kdata = NULL; 24233 char *kdata = NULL;
24222 24234
@@ -24226,9 +24238,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/drm_drv.c linux-2.6.32.14/drivers/gpu
24226 ++file_priv->ioctl_count; 24238 ++file_priv->ioctl_count;
24227 24239
24228 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", 24240 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
24229diff -urNp linux-2.6.32.14/drivers/gpu/drm/drm_fops.c linux-2.6.32.14/drivers/gpu/drm/drm_fops.c 24241diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_fops.c linux-2.6.32.15/drivers/gpu/drm/drm_fops.c
24230--- linux-2.6.32.14/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:37.845185844 -0400 24242--- linux-2.6.32.15/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:37.845185844 -0400
24231+++ linux-2.6.32.14/drivers/gpu/drm/drm_fops.c 2010-05-28 21:27:15.451193295 -0400 24243+++ linux-2.6.32.15/drivers/gpu/drm/drm_fops.c 2010-05-28 21:27:15.451193295 -0400
24232@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * 24244@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
24233 } 24245 }
24234 24246
@@ -24280,9 +24292,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/drm_fops.c linux-2.6.32.14/drivers/gp
24280 if (atomic_read(&dev->ioctl_count)) { 24292 if (atomic_read(&dev->ioctl_count)) {
24281 DRM_ERROR("Device busy: %d\n", 24293 DRM_ERROR("Device busy: %d\n",
24282 atomic_read(&dev->ioctl_count)); 24294 atomic_read(&dev->ioctl_count));
24283diff -urNp linux-2.6.32.14/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.14/drivers/gpu/drm/drm_ioctl.c 24295diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c
24284--- linux-2.6.32.14/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400 24296--- linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400
24285+++ linux-2.6.32.14/drivers/gpu/drm/drm_ioctl.c 2010-05-28 21:27:15.451193295 -0400 24297+++ linux-2.6.32.15/drivers/gpu/drm/drm_ioctl.c 2010-05-28 21:27:15.451193295 -0400
24286@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, 24298@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
24287 stats->data[i].value = 24299 stats->data[i].value =
24288 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); 24300 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -24292,9 +24304,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.14/drivers/g
24292 stats->data[i].type = dev->types[i]; 24304 stats->data[i].type = dev->types[i];
24293 } 24305 }
24294 24306
24295diff -urNp linux-2.6.32.14/drivers/gpu/drm/drm_lock.c linux-2.6.32.14/drivers/gpu/drm/drm_lock.c 24307diff -urNp linux-2.6.32.15/drivers/gpu/drm/drm_lock.c linux-2.6.32.15/drivers/gpu/drm/drm_lock.c
24296--- linux-2.6.32.14/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400 24308--- linux-2.6.32.15/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400
24297+++ linux-2.6.32.14/drivers/gpu/drm/drm_lock.c 2010-05-28 21:27:15.451193295 -0400 24309+++ linux-2.6.32.15/drivers/gpu/drm/drm_lock.c 2010-05-28 21:27:15.451193295 -0400
24298@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi 24310@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
24299 if (drm_lock_take(&master->lock, lock->context)) { 24311 if (drm_lock_take(&master->lock, lock->context)) {
24300 master->lock.file_priv = file_priv; 24312 master->lock.file_priv = file_priv;
@@ -24313,9 +24325,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/drm_lock.c linux-2.6.32.14/drivers/gp
24313 24325
24314 /* kernel_context_switch isn't used by any of the x86 drm 24326 /* kernel_context_switch isn't used by any of the x86 drm
24315 * modules but is required by the Sparc driver. 24327 * modules but is required by the Sparc driver.
24316diff -urNp linux-2.6.32.14/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.14/drivers/gpu/drm/i810/i810_dma.c 24328diff -urNp linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c
24317--- linux-2.6.32.14/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400 24329--- linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400
24318+++ linux-2.6.32.14/drivers/gpu/drm/i810/i810_dma.c 2010-05-28 21:27:15.455180050 -0400 24330+++ linux-2.6.32.15/drivers/gpu/drm/i810/i810_dma.c 2010-05-28 21:27:15.455180050 -0400
24319@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de 24331@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
24320 dma->buflist[vertex->idx], 24332 dma->buflist[vertex->idx],
24321 vertex->discard, vertex->used); 24333 vertex->discard, vertex->used);
@@ -24338,9 +24350,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.14/drive
24338 sarea_priv->last_enqueue = dev_priv->counter - 1; 24350 sarea_priv->last_enqueue = dev_priv->counter - 1;
24339 sarea_priv->last_dispatch = (int)hw_status[5]; 24351 sarea_priv->last_dispatch = (int)hw_status[5];
24340 24352
24341diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7017.c 24353diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c
24342--- linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400 24354--- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400
24343+++ linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7017.c 2010-05-28 21:27:15.455180050 -0400 24355+++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7017.c 2010-05-28 21:27:15.455180050 -0400
24344@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ 24356@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
24345 } 24357 }
24346 } 24358 }
@@ -24350,9 +24362,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.14/dri
24350 .init = ch7017_init, 24362 .init = ch7017_init,
24351 .detect = ch7017_detect, 24363 .detect = ch7017_detect,
24352 .mode_valid = ch7017_mode_valid, 24364 .mode_valid = ch7017_mode_valid,
24353diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7xxx.c 24365diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c
24354--- linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400 24366--- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400
24355+++ linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-05-28 21:27:15.459183485 -0400 24367+++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-05-28 21:27:15.459183485 -0400
24356@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ 24368@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
24357 } 24369 }
24358 } 24370 }
@@ -24362,9 +24374,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.14/dri
24362 .init = ch7xxx_init, 24374 .init = ch7xxx_init,
24363 .detect = ch7xxx_detect, 24375 .detect = ch7xxx_detect,
24364 .mode_valid = ch7xxx_mode_valid, 24376 .mode_valid = ch7xxx_mode_valid,
24365diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo.h linux-2.6.32.14/drivers/gpu/drm/i915/dvo.h 24377diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h
24366--- linux-2.6.32.14/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400 24378--- linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400
24367+++ linux-2.6.32.14/drivers/gpu/drm/i915/dvo.h 2010-05-28 21:27:15.463172433 -0400 24379+++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo.h 2010-05-28 21:27:15.463172433 -0400
24368@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { 24380@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
24369 * 24381 *
24370 * \return singly-linked list of modes or NULL if no modes found. 24382 * \return singly-linked list of modes or NULL if no modes found.
@@ -24397,9 +24409,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo.h linux-2.6.32.14/drivers/gp
24397+extern const struct intel_dvo_dev_ops ch7017_ops; 24409+extern const struct intel_dvo_dev_ops ch7017_ops;
24398 24410
24399 #endif /* _INTEL_DVO_H */ 24411 #endif /* _INTEL_DVO_H */
24400diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ivch.c 24412diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c
24401--- linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400 24413--- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400
24402+++ linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ivch.c 2010-05-28 21:27:15.463172433 -0400 24414+++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_ivch.c 2010-05-28 21:27:15.463172433 -0400
24403@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv 24415@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
24404 } 24416 }
24405 } 24417 }
@@ -24409,9 +24421,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.14/drive
24409 .init = ivch_init, 24421 .init = ivch_init,
24410 .dpms = ivch_dpms, 24422 .dpms = ivch_dpms,
24411 .save = ivch_save, 24423 .save = ivch_save,
24412diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.14/drivers/gpu/drm/i915/dvo_sil164.c 24424diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c
24413--- linux-2.6.32.14/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400 24425--- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400
24414+++ linux-2.6.32.14/drivers/gpu/drm/i915/dvo_sil164.c 2010-05-28 21:27:15.463172433 -0400 24426+++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_sil164.c 2010-05-28 21:27:15.463172433 -0400
24415@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ 24427@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
24416 } 24428 }
24417 } 24429 }
@@ -24421,9 +24433,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.14/dri
24421 .init = sil164_init, 24433 .init = sil164_init,
24422 .detect = sil164_detect, 24434 .detect = sil164_detect,
24423 .mode_valid = sil164_mode_valid, 24435 .mode_valid = sil164_mode_valid,
24424diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.14/drivers/gpu/drm/i915/dvo_tfp410.c 24436diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c
24425--- linux-2.6.32.14/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400 24437--- linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400
24426+++ linux-2.6.32.14/drivers/gpu/drm/i915/dvo_tfp410.c 2010-05-28 21:27:15.463172433 -0400 24438+++ linux-2.6.32.15/drivers/gpu/drm/i915/dvo_tfp410.c 2010-05-28 21:27:15.463172433 -0400
24427@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ 24439@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
24428 } 24440 }
24429 } 24441 }
@@ -24433,9 +24445,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.14/dri
24433 .init = tfp410_init, 24445 .init = tfp410_init,
24434 .detect = tfp410_detect, 24446 .detect = tfp410_detect,
24435 .mode_valid = tfp410_mode_valid, 24447 .mode_valid = tfp410_mode_valid,
24436diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.14/drivers/gpu/drm/i915/i915_drv.c 24448diff -urNp linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c
24437--- linux-2.6.32.14/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400 24449--- linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400
24438+++ linux-2.6.32.14/drivers/gpu/drm/i915/i915_drv.c 2010-05-28 21:27:15.463172433 -0400 24450+++ linux-2.6.32.15/drivers/gpu/drm/i915/i915_drv.c 2010-05-28 21:27:15.463172433 -0400
24439@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) 24451@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev)
24440 return i915_resume(dev); 24452 return i915_resume(dev);
24441 } 24453 }
@@ -24445,9 +24457,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.14/drive
24445 .fault = i915_gem_fault, 24457 .fault = i915_gem_fault,
24446 .open = drm_gem_vm_open, 24458 .open = drm_gem_vm_open,
24447 .close = drm_gem_vm_close, 24459 .close = drm_gem_vm_close,
24448diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.14/drivers/gpu/drm/radeon/mkregtable.c 24460diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c
24449--- linux-2.6.32.14/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400 24461--- linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400
24450+++ linux-2.6.32.14/drivers/gpu/drm/radeon/mkregtable.c 2010-05-28 21:27:15.467181648 -0400 24462+++ linux-2.6.32.15/drivers/gpu/drm/radeon/mkregtable.c 2010-05-28 21:27:15.467181648 -0400
24451@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 24463@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
24452 regex_t mask_rex; 24464 regex_t mask_rex;
24453 regmatch_t match[4]; 24465 regmatch_t match[4];
@@ -24465,9 +24477,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.14/d
24465 24477
24466 if (regcomp 24478 if (regcomp
24467 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { 24479 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
24468diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_atombios.c 24480diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c
24469--- linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400 24481--- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400
24470+++ linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_atombios.c 2010-05-28 21:27:15.467181648 -0400 24482+++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_atombios.c 2010-05-28 21:27:15.467181648 -0400
24471@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o 24483@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o
24472 } 24484 }
24473 } 24485 }
@@ -24492,9 +24504,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32
24492 24504
24493 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); 24505 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
24494 24506
24495diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_display.c 24507diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c
24496--- linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_display.c 2010-03-15 11:52:04.000000000 -0400 24508--- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c 2010-03-15 11:52:04.000000000 -0400
24497+++ linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_display.c 2010-05-28 21:27:15.467181648 -0400 24509+++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_display.c 2010-05-28 21:27:15.467181648 -0400
24498@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl 24510@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
24499 24511
24500 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { 24512 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
@@ -24504,9 +24516,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.
24504 } else 24516 } else
24505 error = abs(current_freq - freq); 24517 error = abs(current_freq - freq);
24506 vco_diff = abs(vco - best_vco); 24518 vco_diff = abs(vco - best_vco);
24507diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_state.c 24519diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c
24508--- linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400 24520--- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400
24509+++ linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_state.c 2010-05-28 21:27:15.475020618 -0400 24521+++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_state.c 2010-05-28 21:27:15.475020618 -0400
24510@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm 24522@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm
24511 { 24523 {
24512 drm_radeon_private_t *dev_priv = dev->dev_private; 24524 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -24516,9 +24528,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.14
24516 24528
24517 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); 24529 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
24518 24530
24519diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_ttm.c 24531diff -urNp linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c
24520--- linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400 24532--- linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400
24521+++ linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_ttm.c 2010-05-28 21:27:15.475020618 -0400 24533+++ linux-2.6.32.15/drivers/gpu/drm/radeon/radeon_ttm.c 2010-05-28 21:27:15.475020618 -0400
24522@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic 24534@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
24523 DRM_INFO("radeon: ttm finalized\n"); 24535 DRM_INFO("radeon: ttm finalized\n");
24524 } 24536 }
@@ -24570,9 +24582,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.14/d
24570 } 24582 }
24571 24583
24572 24584
24573diff -urNp linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo.c 24585diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c
24574--- linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400 24586--- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400
24575+++ linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo.c 2010-05-28 21:27:15.483213986 -0400 24587+++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo.c 2010-05-28 21:27:15.483213986 -0400
24576@@ -39,7 +39,7 @@ 24588@@ -39,7 +39,7 @@
24577 #include <linux/module.h> 24589 #include <linux/module.h>
24578 24590
@@ -24591,9 +24603,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.14/drivers/
24591 .show = &ttm_bo_global_show 24603 .show = &ttm_bo_global_show
24592 }; 24604 };
24593 24605
24594diff -urNp linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo_vm.c 24606diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c
24595--- linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400 24607--- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400
24596+++ linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-05-28 21:27:15.483213986 -0400 24608+++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-05-28 21:27:15.483213986 -0400
24597@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are 24609@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
24598 { 24610 {
24599 struct ttm_buffer_object *bo = (struct ttm_buffer_object *) 24611 struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -24614,9 +24626,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.14/drive
24614 /* 24626 /*
24615 * Work around locking order reversal in fault / nopfn 24627 * Work around locking order reversal in fault / nopfn
24616 * between mmap_sem and bo_reserve: Perform a trylock operation 24628 * between mmap_sem and bo_reserve: Perform a trylock operation
24617diff -urNp linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_global.c 24629diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c
24618--- linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400 24630--- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400
24619+++ linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_global.c 2010-05-28 21:27:15.487089783 -0400 24631+++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_global.c 2010-05-28 21:27:15.487089783 -0400
24620@@ -36,7 +36,7 @@ 24632@@ -36,7 +36,7 @@
24621 struct ttm_global_item { 24633 struct ttm_global_item {
24622 struct mutex mutex; 24634 struct mutex mutex;
@@ -24674,9 +24686,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.14/driv
24674 ref->release(ref); 24686 ref->release(ref);
24675 item->object = NULL; 24687 item->object = NULL;
24676 } 24688 }
24677diff -urNp linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_memory.c 24689diff -urNp linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c
24678--- linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400 24690--- linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400
24679+++ linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_memory.c 2010-05-28 21:27:15.487089783 -0400 24691+++ linux-2.6.32.15/drivers/gpu/drm/ttm/ttm_memory.c 2010-05-28 21:27:15.487089783 -0400
24680@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at 24692@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
24681 NULL 24693 NULL
24682 }; 24694 };
@@ -24686,9 +24698,9 @@ diff -urNp linux-2.6.32.14/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.14/driv
24686 .show = &ttm_mem_zone_show, 24698 .show = &ttm_mem_zone_show,
24687 .store = &ttm_mem_zone_store 24699 .store = &ttm_mem_zone_store
24688 }; 24700 };
24689diff -urNp linux-2.6.32.14/drivers/hid/usbhid/hiddev.c linux-2.6.32.14/drivers/hid/usbhid/hiddev.c 24701diff -urNp linux-2.6.32.15/drivers/hid/usbhid/hiddev.c linux-2.6.32.15/drivers/hid/usbhid/hiddev.c
24690--- linux-2.6.32.14/drivers/hid/usbhid/hiddev.c 2010-03-15 11:52:04.000000000 -0400 24702--- linux-2.6.32.15/drivers/hid/usbhid/hiddev.c 2010-03-15 11:52:04.000000000 -0400
24691+++ linux-2.6.32.14/drivers/hid/usbhid/hiddev.c 2010-05-28 21:27:15.487089783 -0400 24703+++ linux-2.6.32.15/drivers/hid/usbhid/hiddev.c 2010-05-28 21:27:15.487089783 -0400
24692@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi 24704@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
24693 return put_user(HID_VERSION, (int __user *)arg); 24705 return put_user(HID_VERSION, (int __user *)arg);
24694 24706
@@ -24698,9 +24710,9 @@ diff -urNp linux-2.6.32.14/drivers/hid/usbhid/hiddev.c linux-2.6.32.14/drivers/h
24698 return -EINVAL; 24710 return -EINVAL;
24699 24711
24700 for (i = 0; i < hid->maxcollection; i++) 24712 for (i = 0; i < hid->maxcollection; i++)
24701diff -urNp linux-2.6.32.14/drivers/hwmon/k8temp.c linux-2.6.32.14/drivers/hwmon/k8temp.c 24713diff -urNp linux-2.6.32.15/drivers/hwmon/k8temp.c linux-2.6.32.15/drivers/hwmon/k8temp.c
24702--- linux-2.6.32.14/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400 24714--- linux-2.6.32.15/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400
24703+++ linux-2.6.32.14/drivers/hwmon/k8temp.c 2010-05-28 21:27:15.487089783 -0400 24715+++ linux-2.6.32.15/drivers/hwmon/k8temp.c 2010-05-28 21:27:15.487089783 -0400
24704@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n 24716@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
24705 24717
24706 static struct pci_device_id k8temp_ids[] = { 24718 static struct pci_device_id k8temp_ids[] = {
@@ -24710,9 +24722,9 @@ diff -urNp linux-2.6.32.14/drivers/hwmon/k8temp.c linux-2.6.32.14/drivers/hwmon/
24710 }; 24722 };
24711 24723
24712 MODULE_DEVICE_TABLE(pci, k8temp_ids); 24724 MODULE_DEVICE_TABLE(pci, k8temp_ids);
24713diff -urNp linux-2.6.32.14/drivers/hwmon/sis5595.c linux-2.6.32.14/drivers/hwmon/sis5595.c 24725diff -urNp linux-2.6.32.15/drivers/hwmon/sis5595.c linux-2.6.32.15/drivers/hwmon/sis5595.c
24714--- linux-2.6.32.14/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400 24726--- linux-2.6.32.15/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400
24715+++ linux-2.6.32.14/drivers/hwmon/sis5595.c 2010-05-28 21:27:15.495189257 -0400 24727+++ linux-2.6.32.15/drivers/hwmon/sis5595.c 2010-05-28 21:27:15.495189257 -0400
24716@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda 24728@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
24717 24729
24718 static struct pci_device_id sis5595_pci_ids[] = { 24730 static struct pci_device_id sis5595_pci_ids[] = {
@@ -24722,9 +24734,9 @@ diff -urNp linux-2.6.32.14/drivers/hwmon/sis5595.c linux-2.6.32.14/drivers/hwmon
24722 }; 24734 };
24723 24735
24724 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); 24736 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
24725diff -urNp linux-2.6.32.14/drivers/hwmon/via686a.c linux-2.6.32.14/drivers/hwmon/via686a.c 24737diff -urNp linux-2.6.32.15/drivers/hwmon/via686a.c linux-2.6.32.15/drivers/hwmon/via686a.c
24726--- linux-2.6.32.14/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400 24738--- linux-2.6.32.15/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400
24727+++ linux-2.6.32.14/drivers/hwmon/via686a.c 2010-05-28 21:27:15.495189257 -0400 24739+++ linux-2.6.32.15/drivers/hwmon/via686a.c 2010-05-28 21:27:15.495189257 -0400
24728@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda 24740@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
24729 24741
24730 static struct pci_device_id via686a_pci_ids[] = { 24742 static struct pci_device_id via686a_pci_ids[] = {
@@ -24734,9 +24746,9 @@ diff -urNp linux-2.6.32.14/drivers/hwmon/via686a.c linux-2.6.32.14/drivers/hwmon
24734 }; 24746 };
24735 24747
24736 MODULE_DEVICE_TABLE(pci, via686a_pci_ids); 24748 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
24737diff -urNp linux-2.6.32.14/drivers/hwmon/vt8231.c linux-2.6.32.14/drivers/hwmon/vt8231.c 24749diff -urNp linux-2.6.32.15/drivers/hwmon/vt8231.c linux-2.6.32.15/drivers/hwmon/vt8231.c
24738--- linux-2.6.32.14/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400 24750--- linux-2.6.32.15/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400
24739+++ linux-2.6.32.14/drivers/hwmon/vt8231.c 2010-05-28 21:27:15.507004721 -0400 24751+++ linux-2.6.32.15/drivers/hwmon/vt8231.c 2010-05-28 21:27:15.507004721 -0400
24740@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri 24752@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
24741 24753
24742 static struct pci_device_id vt8231_pci_ids[] = { 24754 static struct pci_device_id vt8231_pci_ids[] = {
@@ -24746,9 +24758,9 @@ diff -urNp linux-2.6.32.14/drivers/hwmon/vt8231.c linux-2.6.32.14/drivers/hwmon/
24746 }; 24758 };
24747 24759
24748 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); 24760 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
24749diff -urNp linux-2.6.32.14/drivers/hwmon/w83791d.c linux-2.6.32.14/drivers/hwmon/w83791d.c 24761diff -urNp linux-2.6.32.15/drivers/hwmon/w83791d.c linux-2.6.32.15/drivers/hwmon/w83791d.c
24750--- linux-2.6.32.14/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400 24762--- linux-2.6.32.15/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400
24751+++ linux-2.6.32.14/drivers/hwmon/w83791d.c 2010-05-28 21:27:15.507004721 -0400 24763+++ linux-2.6.32.15/drivers/hwmon/w83791d.c 2010-05-28 21:27:15.507004721 -0400
24752@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli 24764@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
24753 struct i2c_board_info *info); 24765 struct i2c_board_info *info);
24754 static int w83791d_remove(struct i2c_client *client); 24766 static int w83791d_remove(struct i2c_client *client);
@@ -24760,9 +24772,9 @@ diff -urNp linux-2.6.32.14/drivers/hwmon/w83791d.c linux-2.6.32.14/drivers/hwmon
24760 static struct w83791d_data *w83791d_update_device(struct device *dev); 24772 static struct w83791d_data *w83791d_update_device(struct device *dev);
24761 24773
24762 #ifdef DEBUG 24774 #ifdef DEBUG
24763diff -urNp linux-2.6.32.14/drivers/i2c/busses/i2c-i801.c linux-2.6.32.14/drivers/i2c/busses/i2c-i801.c 24775diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c
24764--- linux-2.6.32.14/drivers/i2c/busses/i2c-i801.c 2010-04-29 17:49:37.945518391 -0400 24776--- linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c 2010-04-29 17:49:37.945518391 -0400
24765+++ linux-2.6.32.14/drivers/i2c/busses/i2c-i801.c 2010-05-28 21:27:15.507004721 -0400 24777+++ linux-2.6.32.15/drivers/i2c/busses/i2c-i801.c 2010-05-28 21:27:15.507004721 -0400
24766@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] = 24778@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] =
24767 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, 24779 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
24768 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, 24780 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
@@ -24772,9 +24784,9 @@ diff -urNp linux-2.6.32.14/drivers/i2c/busses/i2c-i801.c linux-2.6.32.14/drivers
24772 }; 24784 };
24773 24785
24774 MODULE_DEVICE_TABLE (pci, i801_ids); 24786 MODULE_DEVICE_TABLE (pci, i801_ids);
24775diff -urNp linux-2.6.32.14/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.14/drivers/i2c/busses/i2c-piix4.c 24787diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c
24776--- linux-2.6.32.14/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400 24788--- linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400
24777+++ linux-2.6.32.14/drivers/i2c/busses/i2c-piix4.c 2010-05-28 21:27:15.507004721 -0400 24789+++ linux-2.6.32.15/drivers/i2c/busses/i2c-piix4.c 2010-05-28 21:27:15.507004721 -0400
24778@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat 24790@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
24779 .ident = "IBM", 24791 .ident = "IBM",
24780 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, 24792 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -24793,9 +24805,9 @@ diff -urNp linux-2.6.32.14/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.14/driver
24793 }; 24805 };
24794 24806
24795 MODULE_DEVICE_TABLE (pci, piix4_ids); 24807 MODULE_DEVICE_TABLE (pci, piix4_ids);
24796diff -urNp linux-2.6.32.14/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.14/drivers/i2c/busses/i2c-sis630.c 24808diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c
24797--- linux-2.6.32.14/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400 24809--- linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400
24798+++ linux-2.6.32.14/drivers/i2c/busses/i2c-sis630.c 2010-05-28 21:27:15.507004721 -0400 24810+++ linux-2.6.32.15/drivers/i2c/busses/i2c-sis630.c 2010-05-28 21:27:15.507004721 -0400
24799@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter 24811@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
24800 static struct pci_device_id sis630_ids[] __devinitdata = { 24812 static struct pci_device_id sis630_ids[] __devinitdata = {
24801 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 24813 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
@@ -24805,9 +24817,9 @@ diff -urNp linux-2.6.32.14/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.14/drive
24805 }; 24817 };
24806 24818
24807 MODULE_DEVICE_TABLE (pci, sis630_ids); 24819 MODULE_DEVICE_TABLE (pci, sis630_ids);
24808diff -urNp linux-2.6.32.14/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.14/drivers/i2c/busses/i2c-sis96x.c 24820diff -urNp linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c
24809--- linux-2.6.32.14/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400 24821--- linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400
24810+++ linux-2.6.32.14/drivers/i2c/busses/i2c-sis96x.c 2010-05-28 21:27:15.507004721 -0400 24822+++ linux-2.6.32.15/drivers/i2c/busses/i2c-sis96x.c 2010-05-28 21:27:15.507004721 -0400
24811@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter 24823@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
24812 24824
24813 static struct pci_device_id sis96x_ids[] = { 24825 static struct pci_device_id sis96x_ids[] = {
@@ -24817,9 +24829,9 @@ diff -urNp linux-2.6.32.14/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.14/drive
24817 }; 24829 };
24818 24830
24819 MODULE_DEVICE_TABLE (pci, sis96x_ids); 24831 MODULE_DEVICE_TABLE (pci, sis96x_ids);
24820diff -urNp linux-2.6.32.14/drivers/ide/ide-cd.c linux-2.6.32.14/drivers/ide/ide-cd.c 24832diff -urNp linux-2.6.32.15/drivers/ide/ide-cd.c linux-2.6.32.15/drivers/ide/ide-cd.c
24821--- linux-2.6.32.14/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400 24833--- linux-2.6.32.15/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400
24822+++ linux-2.6.32.14/drivers/ide/ide-cd.c 2010-05-28 21:27:15.510961438 -0400 24834+++ linux-2.6.32.15/drivers/ide/ide-cd.c 2010-05-28 21:27:15.510961438 -0400
24823@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ 24835@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_
24824 alignment = queue_dma_alignment(q) | q->dma_pad_mask; 24836 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
24825 if ((unsigned long)buf & alignment 24837 if ((unsigned long)buf & alignment
@@ -24829,9 +24841,9 @@ diff -urNp linux-2.6.32.14/drivers/ide/ide-cd.c linux-2.6.32.14/drivers/ide/ide-
24829 drive->dma = 0; 24841 drive->dma = 0;
24830 } 24842 }
24831 } 24843 }
24832diff -urNp linux-2.6.32.14/drivers/ieee1394/dv1394.c linux-2.6.32.14/drivers/ieee1394/dv1394.c 24844diff -urNp linux-2.6.32.15/drivers/ieee1394/dv1394.c linux-2.6.32.15/drivers/ieee1394/dv1394.c
24833--- linux-2.6.32.14/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400 24845--- linux-2.6.32.15/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400
24834+++ linux-2.6.32.14/drivers/ieee1394/dv1394.c 2010-05-28 21:27:15.527187024 -0400 24846+++ linux-2.6.32.15/drivers/ieee1394/dv1394.c 2010-05-28 21:27:15.527187024 -0400
24835@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c 24847@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
24836 based upon DIF section and sequence 24848 based upon DIF section and sequence
24837 */ 24849 */
@@ -24850,9 +24862,9 @@ diff -urNp linux-2.6.32.14/drivers/ieee1394/dv1394.c linux-2.6.32.14/drivers/iee
24850 }; 24862 };
24851 24863
24852 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); 24864 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
24853diff -urNp linux-2.6.32.14/drivers/ieee1394/eth1394.c linux-2.6.32.14/drivers/ieee1394/eth1394.c 24865diff -urNp linux-2.6.32.15/drivers/ieee1394/eth1394.c linux-2.6.32.15/drivers/ieee1394/eth1394.c
24854--- linux-2.6.32.14/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400 24866--- linux-2.6.32.15/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400
24855+++ linux-2.6.32.14/drivers/ieee1394/eth1394.c 2010-05-28 21:27:15.544607394 -0400 24867+++ linux-2.6.32.15/drivers/ieee1394/eth1394.c 2010-05-28 21:27:15.544607394 -0400
24856@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e 24868@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
24857 .specifier_id = ETHER1394_GASP_SPECIFIER_ID, 24869 .specifier_id = ETHER1394_GASP_SPECIFIER_ID,
24858 .version = ETHER1394_GASP_VERSION, 24870 .version = ETHER1394_GASP_VERSION,
@@ -24862,9 +24874,9 @@ diff -urNp linux-2.6.32.14/drivers/ieee1394/eth1394.c linux-2.6.32.14/drivers/ie
24862 }; 24874 };
24863 24875
24864 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); 24876 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
24865diff -urNp linux-2.6.32.14/drivers/ieee1394/hosts.c linux-2.6.32.14/drivers/ieee1394/hosts.c 24877diff -urNp linux-2.6.32.15/drivers/ieee1394/hosts.c linux-2.6.32.15/drivers/ieee1394/hosts.c
24866--- linux-2.6.32.14/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400 24878--- linux-2.6.32.15/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400
24867+++ linux-2.6.32.14/drivers/ieee1394/hosts.c 2010-05-28 21:27:15.544607394 -0400 24879+++ linux-2.6.32.15/drivers/ieee1394/hosts.c 2010-05-28 21:27:15.544607394 -0400
24868@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso 24880@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
24869 } 24881 }
24870 24882
@@ -24873,9 +24885,9 @@ diff -urNp linux-2.6.32.14/drivers/ieee1394/hosts.c linux-2.6.32.14/drivers/ieee
24873 .transmit_packet = dummy_transmit_packet, 24885 .transmit_packet = dummy_transmit_packet,
24874 .devctl = dummy_devctl, 24886 .devctl = dummy_devctl,
24875 .isoctl = dummy_isoctl 24887 .isoctl = dummy_isoctl
24876diff -urNp linux-2.6.32.14/drivers/ieee1394/ohci1394.c linux-2.6.32.14/drivers/ieee1394/ohci1394.c 24888diff -urNp linux-2.6.32.15/drivers/ieee1394/ohci1394.c linux-2.6.32.15/drivers/ieee1394/ohci1394.c
24877--- linux-2.6.32.14/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400 24889--- linux-2.6.32.15/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400
24878+++ linux-2.6.32.14/drivers/ieee1394/ohci1394.c 2010-05-28 21:27:15.555018453 -0400 24890+++ linux-2.6.32.15/drivers/ieee1394/ohci1394.c 2010-05-28 21:27:15.555018453 -0400
24879@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ 24891@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
24880 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) 24892 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
24881 24893
@@ -24897,9 +24909,9 @@ diff -urNp linux-2.6.32.14/drivers/ieee1394/ohci1394.c linux-2.6.32.14/drivers/i
24897 }; 24909 };
24898 24910
24899 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); 24911 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
24900diff -urNp linux-2.6.32.14/drivers/ieee1394/raw1394.c linux-2.6.32.14/drivers/ieee1394/raw1394.c 24912diff -urNp linux-2.6.32.15/drivers/ieee1394/raw1394.c linux-2.6.32.15/drivers/ieee1394/raw1394.c
24901--- linux-2.6.32.14/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400 24913--- linux-2.6.32.15/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400
24902+++ linux-2.6.32.14/drivers/ieee1394/raw1394.c 2010-05-28 21:27:15.555018453 -0400 24914+++ linux-2.6.32.15/drivers/ieee1394/raw1394.c 2010-05-28 21:27:15.555018453 -0400
24903@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r 24915@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
24904 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 24916 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
24905 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 24917 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -24909,9 +24921,9 @@ diff -urNp linux-2.6.32.14/drivers/ieee1394/raw1394.c linux-2.6.32.14/drivers/ie
24909 }; 24921 };
24910 24922
24911 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); 24923 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
24912diff -urNp linux-2.6.32.14/drivers/ieee1394/sbp2.c linux-2.6.32.14/drivers/ieee1394/sbp2.c 24924diff -urNp linux-2.6.32.15/drivers/ieee1394/sbp2.c linux-2.6.32.15/drivers/ieee1394/sbp2.c
24913--- linux-2.6.32.14/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400 24925--- linux-2.6.32.15/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400
24914+++ linux-2.6.32.14/drivers/ieee1394/sbp2.c 2010-05-28 21:27:15.555018453 -0400 24926+++ linux-2.6.32.15/drivers/ieee1394/sbp2.c 2010-05-28 21:27:15.555018453 -0400
24915@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s 24927@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
24916 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 24928 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
24917 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, 24929 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -24930,9 +24942,9 @@ diff -urNp linux-2.6.32.14/drivers/ieee1394/sbp2.c linux-2.6.32.14/drivers/ieee1
24930 { 24942 {
24931 int ret; 24943 int ret;
24932 24944
24933diff -urNp linux-2.6.32.14/drivers/ieee1394/video1394.c linux-2.6.32.14/drivers/ieee1394/video1394.c 24945diff -urNp linux-2.6.32.15/drivers/ieee1394/video1394.c linux-2.6.32.15/drivers/ieee1394/video1394.c
24934--- linux-2.6.32.14/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400 24946--- linux-2.6.32.15/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400
24935+++ linux-2.6.32.14/drivers/ieee1394/video1394.c 2010-05-28 21:27:15.559201489 -0400 24947+++ linux-2.6.32.15/drivers/ieee1394/video1394.c 2010-05-28 21:27:15.559201489 -0400
24936@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v 24948@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
24937 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 24949 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
24938 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff 24950 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
@@ -24942,9 +24954,9 @@ diff -urNp linux-2.6.32.14/drivers/ieee1394/video1394.c linux-2.6.32.14/drivers/
24942 }; 24954 };
24943 24955
24944 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); 24956 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
24945diff -urNp linux-2.6.32.14/drivers/infiniband/core/cm.c linux-2.6.32.14/drivers/infiniband/core/cm.c 24957diff -urNp linux-2.6.32.15/drivers/infiniband/core/cm.c linux-2.6.32.15/drivers/infiniband/core/cm.c
24946--- linux-2.6.32.14/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400 24958--- linux-2.6.32.15/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400
24947+++ linux-2.6.32.14/drivers/infiniband/core/cm.c 2010-05-28 21:27:15.559201489 -0400 24959+++ linux-2.6.32.15/drivers/infiniband/core/cm.c 2010-05-28 21:27:15.559201489 -0400
24948@@ -112,7 +112,7 @@ static char const counter_group_names[CM 24960@@ -112,7 +112,7 @@ static char const counter_group_names[CM
24949 24961
24950 struct cm_counter_group { 24962 struct cm_counter_group {
@@ -25088,9 +25100,9 @@ diff -urNp linux-2.6.32.14/drivers/infiniband/core/cm.c linux-2.6.32.14/drivers/
25088 .show = cm_show_counter 25100 .show = cm_show_counter
25089 }; 25101 };
25090 25102
25091diff -urNp linux-2.6.32.14/drivers/infiniband/core/sysfs.c linux-2.6.32.14/drivers/infiniband/core/sysfs.c 25103diff -urNp linux-2.6.32.15/drivers/infiniband/core/sysfs.c linux-2.6.32.15/drivers/infiniband/core/sysfs.c
25092--- linux-2.6.32.14/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400 25104--- linux-2.6.32.15/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400
25093+++ linux-2.6.32.14/drivers/infiniband/core/sysfs.c 2010-05-28 21:27:15.563689341 -0400 25105+++ linux-2.6.32.15/drivers/infiniband/core/sysfs.c 2010-05-28 21:27:15.563689341 -0400
25094@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob 25106@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
25095 return port_attr->show(p, port_attr, buf); 25107 return port_attr->show(p, port_attr, buf);
25096 } 25108 }
@@ -25100,9 +25112,9 @@ diff -urNp linux-2.6.32.14/drivers/infiniband/core/sysfs.c linux-2.6.32.14/drive
25100 .show = port_attr_show 25112 .show = port_attr_show
25101 }; 25113 };
25102 25114
25103diff -urNp linux-2.6.32.14/drivers/input/keyboard/atkbd.c linux-2.6.32.14/drivers/input/keyboard/atkbd.c 25115diff -urNp linux-2.6.32.15/drivers/input/keyboard/atkbd.c linux-2.6.32.15/drivers/input/keyboard/atkbd.c
25104--- linux-2.6.32.14/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400 25116--- linux-2.6.32.15/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400
25105+++ linux-2.6.32.14/drivers/input/keyboard/atkbd.c 2010-05-28 21:27:15.568704406 -0400 25117+++ linux-2.6.32.15/drivers/input/keyboard/atkbd.c 2010-05-28 21:27:15.568704406 -0400
25106@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri 25118@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
25107 .id = SERIO_ANY, 25119 .id = SERIO_ANY,
25108 .extra = SERIO_ANY, 25120 .extra = SERIO_ANY,
@@ -25112,9 +25124,9 @@ diff -urNp linux-2.6.32.14/drivers/input/keyboard/atkbd.c linux-2.6.32.14/driver
25112 }; 25124 };
25113 25125
25114 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); 25126 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
25115diff -urNp linux-2.6.32.14/drivers/input/mouse/lifebook.c linux-2.6.32.14/drivers/input/mouse/lifebook.c 25127diff -urNp linux-2.6.32.15/drivers/input/mouse/lifebook.c linux-2.6.32.15/drivers/input/mouse/lifebook.c
25116--- linux-2.6.32.14/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400 25128--- linux-2.6.32.15/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400
25117+++ linux-2.6.32.14/drivers/input/mouse/lifebook.c 2010-05-28 21:27:15.572693057 -0400 25129+++ linux-2.6.32.15/drivers/input/mouse/lifebook.c 2010-05-28 21:27:15.572693057 -0400
25118@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo 25130@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
25119 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), 25131 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
25120 }, 25132 },
@@ -25124,9 +25136,9 @@ diff -urNp linux-2.6.32.14/drivers/input/mouse/lifebook.c linux-2.6.32.14/driver
25124 }; 25136 };
25125 25137
25126 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) 25138 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
25127diff -urNp linux-2.6.32.14/drivers/input/mouse/psmouse-base.c linux-2.6.32.14/drivers/input/mouse/psmouse-base.c 25139diff -urNp linux-2.6.32.15/drivers/input/mouse/psmouse-base.c linux-2.6.32.15/drivers/input/mouse/psmouse-base.c
25128--- linux-2.6.32.14/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400 25140--- linux-2.6.32.15/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400
25129+++ linux-2.6.32.14/drivers/input/mouse/psmouse-base.c 2010-05-28 21:27:15.580689971 -0400 25141+++ linux-2.6.32.15/drivers/input/mouse/psmouse-base.c 2010-05-28 21:27:15.580689971 -0400
25130@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se 25142@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se
25131 .id = SERIO_ANY, 25143 .id = SERIO_ANY,
25132 .extra = SERIO_ANY, 25144 .extra = SERIO_ANY,
@@ -25136,9 +25148,9 @@ diff -urNp linux-2.6.32.14/drivers/input/mouse/psmouse-base.c linux-2.6.32.14/dr
25136 }; 25148 };
25137 25149
25138 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); 25150 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
25139diff -urNp linux-2.6.32.14/drivers/input/mouse/synaptics.c linux-2.6.32.14/drivers/input/mouse/synaptics.c 25151diff -urNp linux-2.6.32.15/drivers/input/mouse/synaptics.c linux-2.6.32.15/drivers/input/mouse/synaptics.c
25140--- linux-2.6.32.14/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400 25152--- linux-2.6.32.15/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400
25141+++ linux-2.6.32.14/drivers/input/mouse/synaptics.c 2010-05-28 21:27:15.587725031 -0400 25153+++ linux-2.6.32.15/drivers/input/mouse/synaptics.c 2010-05-28 21:27:15.587725031 -0400
25142@@ -437,7 +437,7 @@ static void synaptics_process_packet(str 25154@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
25143 break; 25155 break;
25144 case 2: 25156 case 2:
@@ -25167,9 +25179,9 @@ diff -urNp linux-2.6.32.14/drivers/input/mouse/synaptics.c linux-2.6.32.14/drive
25167 }; 25179 };
25168 #endif 25180 #endif
25169 25181
25170diff -urNp linux-2.6.32.14/drivers/input/mousedev.c linux-2.6.32.14/drivers/input/mousedev.c 25182diff -urNp linux-2.6.32.15/drivers/input/mousedev.c linux-2.6.32.15/drivers/input/mousedev.c
25171--- linux-2.6.32.14/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400 25183--- linux-2.6.32.15/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400
25172+++ linux-2.6.32.14/drivers/input/mousedev.c 2010-05-28 21:27:15.592694173 -0400 25184+++ linux-2.6.32.15/drivers/input/mousedev.c 2010-05-28 21:27:15.592694173 -0400
25173@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han 25185@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
25174 25186
25175 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX 25187 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -25179,9 +25191,9 @@ diff -urNp linux-2.6.32.14/drivers/input/mousedev.c linux-2.6.32.14/drivers/inpu
25179 }; 25191 };
25180 static int psaux_registered; 25192 static int psaux_registered;
25181 #endif 25193 #endif
25182diff -urNp linux-2.6.32.14/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.14/drivers/input/serio/i8042-x86ia64io.h 25194diff -urNp linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h
25183--- linux-2.6.32.14/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400 25195--- linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400
25184+++ linux-2.6.32.14/drivers/input/serio/i8042-x86ia64io.h 2010-05-28 21:27:15.592694173 -0400 25196+++ linux-2.6.32.15/drivers/input/serio/i8042-x86ia64io.h 2010-05-28 21:27:15.592694173 -0400
25185@@ -172,7 +172,7 @@ static const struct dmi_system_id __init 25197@@ -172,7 +172,7 @@ static const struct dmi_system_id __init
25186 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), 25198 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
25187 }, 25199 },
@@ -25236,9 +25248,9 @@ diff -urNp linux-2.6.32.14/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.14
25236 }; 25248 };
25237 25249
25238 #endif /* CONFIG_X86 */ 25250 #endif /* CONFIG_X86 */
25239diff -urNp linux-2.6.32.14/drivers/input/serio/serio_raw.c linux-2.6.32.14/drivers/input/serio/serio_raw.c 25251diff -urNp linux-2.6.32.15/drivers/input/serio/serio_raw.c linux-2.6.32.15/drivers/input/serio/serio_raw.c
25240--- linux-2.6.32.14/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400 25252--- linux-2.6.32.15/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400
25241+++ linux-2.6.32.14/drivers/input/serio/serio_raw.c 2010-05-28 21:27:15.596690001 -0400 25253+++ linux-2.6.32.15/drivers/input/serio/serio_raw.c 2010-05-28 21:27:15.596690001 -0400
25242@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ 25254@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
25243 .id = SERIO_ANY, 25255 .id = SERIO_ANY,
25244 .extra = SERIO_ANY, 25256 .extra = SERIO_ANY,
@@ -25248,9 +25260,9 @@ diff -urNp linux-2.6.32.14/drivers/input/serio/serio_raw.c linux-2.6.32.14/drive
25248 }; 25260 };
25249 25261
25250 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); 25262 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
25251diff -urNp linux-2.6.32.14/drivers/isdn/gigaset/common.c linux-2.6.32.14/drivers/isdn/gigaset/common.c 25263diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/common.c linux-2.6.32.15/drivers/isdn/gigaset/common.c
25252--- linux-2.6.32.14/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400 25264--- linux-2.6.32.15/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400
25253+++ linux-2.6.32.14/drivers/isdn/gigaset/common.c 2010-05-28 21:27:15.600680043 -0400 25265+++ linux-2.6.32.15/drivers/isdn/gigaset/common.c 2010-05-28 21:27:15.600680043 -0400
25254@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct 25266@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
25255 cs->commands_pending = 0; 25267 cs->commands_pending = 0;
25256 cs->cur_at_seq = 0; 25268 cs->cur_at_seq = 0;
@@ -25260,9 +25272,9 @@ diff -urNp linux-2.6.32.14/drivers/isdn/gigaset/common.c linux-2.6.32.14/drivers
25260 cs->dev = NULL; 25272 cs->dev = NULL;
25261 cs->tty = NULL; 25273 cs->tty = NULL;
25262 cs->tty_dev = NULL; 25274 cs->tty_dev = NULL;
25263diff -urNp linux-2.6.32.14/drivers/isdn/gigaset/gigaset.h linux-2.6.32.14/drivers/isdn/gigaset/gigaset.h 25275diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h
25264--- linux-2.6.32.14/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400 25276--- linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400
25265+++ linux-2.6.32.14/drivers/isdn/gigaset/gigaset.h 2010-05-28 21:27:15.600680043 -0400 25277+++ linux-2.6.32.15/drivers/isdn/gigaset/gigaset.h 2010-05-28 21:27:15.600680043 -0400
25266@@ -446,7 +446,7 @@ struct cardstate { 25278@@ -446,7 +446,7 @@ struct cardstate {
25267 spinlock_t cmdlock; 25279 spinlock_t cmdlock;
25268 unsigned curlen, cmdbytes; 25280 unsigned curlen, cmdbytes;
@@ -25272,9 +25284,9 @@ diff -urNp linux-2.6.32.14/drivers/isdn/gigaset/gigaset.h linux-2.6.32.14/driver
25272 struct tty_struct *tty; 25284 struct tty_struct *tty;
25273 struct tasklet_struct if_wake_tasklet; 25285 struct tasklet_struct if_wake_tasklet;
25274 unsigned control_state; 25286 unsigned control_state;
25275diff -urNp linux-2.6.32.14/drivers/isdn/gigaset/interface.c linux-2.6.32.14/drivers/isdn/gigaset/interface.c 25287diff -urNp linux-2.6.32.15/drivers/isdn/gigaset/interface.c linux-2.6.32.15/drivers/isdn/gigaset/interface.c
25276--- linux-2.6.32.14/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400 25288--- linux-2.6.32.15/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400
25277+++ linux-2.6.32.14/drivers/isdn/gigaset/interface.c 2010-05-28 21:27:15.600680043 -0400 25289+++ linux-2.6.32.15/drivers/isdn/gigaset/interface.c 2010-05-28 21:27:15.600680043 -0400
25278@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt 25290@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
25279 return -ERESTARTSYS; // FIXME -EINTR? 25291 return -ERESTARTSYS; // FIXME -EINTR?
25280 tty->driver_data = cs; 25292 tty->driver_data = cs;
@@ -25362,9 +25374,9 @@ diff -urNp linux-2.6.32.14/drivers/isdn/gigaset/interface.c linux-2.6.32.14/driv
25362 dev_warn(cs->dev, "%s: device not opened\n", __func__); 25374 dev_warn(cs->dev, "%s: device not opened\n", __func__);
25363 goto out; 25375 goto out;
25364 } 25376 }
25365diff -urNp linux-2.6.32.14/drivers/isdn/hardware/avm/b1.c linux-2.6.32.14/drivers/isdn/hardware/avm/b1.c 25377diff -urNp linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c
25366--- linux-2.6.32.14/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400 25378--- linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400
25367+++ linux-2.6.32.14/drivers/isdn/hardware/avm/b1.c 2010-05-28 21:27:15.600680043 -0400 25379+++ linux-2.6.32.15/drivers/isdn/hardware/avm/b1.c 2010-05-28 21:27:15.600680043 -0400
25368@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo 25380@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
25369 } 25381 }
25370 if (left) { 25382 if (left) {
@@ -25383,9 +25395,9 @@ diff -urNp linux-2.6.32.14/drivers/isdn/hardware/avm/b1.c linux-2.6.32.14/driver
25383 return -EFAULT; 25395 return -EFAULT;
25384 } else { 25396 } else {
25385 memcpy(buf, dp, left); 25397 memcpy(buf, dp, left);
25386diff -urNp linux-2.6.32.14/drivers/isdn/icn/icn.c linux-2.6.32.14/drivers/isdn/icn/icn.c 25398diff -urNp linux-2.6.32.15/drivers/isdn/icn/icn.c linux-2.6.32.15/drivers/isdn/icn/icn.c
25387--- linux-2.6.32.14/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400 25399--- linux-2.6.32.15/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400
25388+++ linux-2.6.32.14/drivers/isdn/icn/icn.c 2010-05-28 21:27:15.600680043 -0400 25400+++ linux-2.6.32.15/drivers/isdn/icn/icn.c 2010-05-28 21:27:15.600680043 -0400
25389@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len 25401@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
25390 if (count > len) 25402 if (count > len)
25391 count = len; 25403 count = len;
@@ -25395,9 +25407,9 @@ diff -urNp linux-2.6.32.14/drivers/isdn/icn/icn.c linux-2.6.32.14/drivers/isdn/i
25395 return -EFAULT; 25407 return -EFAULT;
25396 } else 25408 } else
25397 memcpy(msg, buf, count); 25409 memcpy(msg, buf, count);
25398diff -urNp linux-2.6.32.14/drivers/lguest/core.c linux-2.6.32.14/drivers/lguest/core.c 25410diff -urNp linux-2.6.32.15/drivers/lguest/core.c linux-2.6.32.15/drivers/lguest/core.c
25399--- linux-2.6.32.14/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400 25411--- linux-2.6.32.15/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400
25400+++ linux-2.6.32.14/drivers/lguest/core.c 2010-05-28 21:27:15.600680043 -0400 25412+++ linux-2.6.32.15/drivers/lguest/core.c 2010-05-28 21:27:15.600680043 -0400
25401@@ -91,9 +91,17 @@ static __init int map_switcher(void) 25413@@ -91,9 +91,17 @@ static __init int map_switcher(void)
25402 * it's worked so far. The end address needs +1 because __get_vm_area 25414 * it's worked so far. The end address needs +1 because __get_vm_area
25403 * allocates an extra guard page, so we need space for that. 25415 * allocates an extra guard page, so we need space for that.
@@ -25416,9 +25428,9 @@ diff -urNp linux-2.6.32.14/drivers/lguest/core.c linux-2.6.32.14/drivers/lguest/
25416 if (!switcher_vma) { 25428 if (!switcher_vma) {
25417 err = -ENOMEM; 25429 err = -ENOMEM;
25418 printk("lguest: could not map switcher pages high\n"); 25430 printk("lguest: could not map switcher pages high\n");
25419diff -urNp linux-2.6.32.14/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.14/drivers/macintosh/via-pmu-backlight.c 25431diff -urNp linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c
25420--- linux-2.6.32.14/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400 25432--- linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400
25421+++ linux-2.6.32.14/drivers/macintosh/via-pmu-backlight.c 2010-05-28 21:27:15.600680043 -0400 25433+++ linux-2.6.32.15/drivers/macintosh/via-pmu-backlight.c 2010-05-28 21:27:15.600680043 -0400
25422@@ -15,7 +15,7 @@ 25434@@ -15,7 +15,7 @@
25423 25435
25424 #define MAX_PMU_LEVEL 0xFF 25436 #define MAX_PMU_LEVEL 0xFF
@@ -25437,9 +25449,9 @@ diff -urNp linux-2.6.32.14/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.14
25437 .get_brightness = pmu_backlight_get_brightness, 25449 .get_brightness = pmu_backlight_get_brightness,
25438 .update_status = pmu_backlight_update_status, 25450 .update_status = pmu_backlight_update_status,
25439 25451
25440diff -urNp linux-2.6.32.14/drivers/macintosh/via-pmu.c linux-2.6.32.14/drivers/macintosh/via-pmu.c 25452diff -urNp linux-2.6.32.15/drivers/macintosh/via-pmu.c linux-2.6.32.15/drivers/macintosh/via-pmu.c
25441--- linux-2.6.32.14/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400 25453--- linux-2.6.32.15/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400
25442+++ linux-2.6.32.14/drivers/macintosh/via-pmu.c 2010-05-28 21:27:15.608683910 -0400 25454+++ linux-2.6.32.15/drivers/macintosh/via-pmu.c 2010-05-28 21:27:15.608683910 -0400
25443@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state 25455@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
25444 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); 25456 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
25445 } 25457 }
@@ -25449,9 +25461,9 @@ diff -urNp linux-2.6.32.14/drivers/macintosh/via-pmu.c linux-2.6.32.14/drivers/m
25449 .enter = powerbook_sleep, 25461 .enter = powerbook_sleep,
25450 .valid = pmu_sleep_valid, 25462 .valid = pmu_sleep_valid,
25451 }; 25463 };
25452diff -urNp linux-2.6.32.14/drivers/md/bitmap.c linux-2.6.32.14/drivers/md/bitmap.c 25464diff -urNp linux-2.6.32.15/drivers/md/bitmap.c linux-2.6.32.15/drivers/md/bitmap.c
25453--- linux-2.6.32.14/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400 25465--- linux-2.6.32.15/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400
25454+++ linux-2.6.32.14/drivers/md/bitmap.c 2010-05-28 21:27:15.608683910 -0400 25466+++ linux-2.6.32.15/drivers/md/bitmap.c 2010-05-28 21:27:15.608683910 -0400
25455@@ -58,7 +58,7 @@ 25467@@ -58,7 +58,7 @@
25456 # if DEBUG > 0 25468 # if DEBUG > 0
25457 # define PRINTK(x...) printk(KERN_DEBUG x) 25469 # define PRINTK(x...) printk(KERN_DEBUG x)
@@ -25461,9 +25473,9 @@ diff -urNp linux-2.6.32.14/drivers/md/bitmap.c linux-2.6.32.14/drivers/md/bitmap
25461 # endif 25473 # endif
25462 #endif 25474 #endif
25463 25475
25464diff -urNp linux-2.6.32.14/drivers/md/dm-sysfs.c linux-2.6.32.14/drivers/md/dm-sysfs.c 25476diff -urNp linux-2.6.32.15/drivers/md/dm-sysfs.c linux-2.6.32.15/drivers/md/dm-sysfs.c
25465--- linux-2.6.32.14/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400 25477--- linux-2.6.32.15/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400
25466+++ linux-2.6.32.14/drivers/md/dm-sysfs.c 2010-05-28 21:27:15.608683910 -0400 25478+++ linux-2.6.32.15/drivers/md/dm-sysfs.c 2010-05-28 21:27:15.608683910 -0400
25467@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { 25479@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
25468 NULL, 25480 NULL,
25469 }; 25481 };
@@ -25473,9 +25485,9 @@ diff -urNp linux-2.6.32.14/drivers/md/dm-sysfs.c linux-2.6.32.14/drivers/md/dm-s
25473 .show = dm_attr_show, 25485 .show = dm_attr_show,
25474 }; 25486 };
25475 25487
25476diff -urNp linux-2.6.32.14/drivers/md/dm-table.c linux-2.6.32.14/drivers/md/dm-table.c 25488diff -urNp linux-2.6.32.15/drivers/md/dm-table.c linux-2.6.32.15/drivers/md/dm-table.c
25477--- linux-2.6.32.14/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400 25489--- linux-2.6.32.15/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400
25478+++ linux-2.6.32.14/drivers/md/dm-table.c 2010-05-28 21:27:15.608683910 -0400 25490+++ linux-2.6.32.15/drivers/md/dm-table.c 2010-05-28 21:27:15.608683910 -0400
25479@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct 25491@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
25480 if (!dev_size) 25492 if (!dev_size)
25481 return 0; 25493 return 0;
@@ -25485,9 +25497,9 @@ diff -urNp linux-2.6.32.14/drivers/md/dm-table.c linux-2.6.32.14/drivers/md/dm-t
25485 DMWARN("%s: %s too small for target: " 25497 DMWARN("%s: %s too small for target: "
25486 "start=%llu, len=%llu, dev_size=%llu", 25498 "start=%llu, len=%llu, dev_size=%llu",
25487 dm_device_name(ti->table->md), bdevname(bdev, b), 25499 dm_device_name(ti->table->md), bdevname(bdev, b),
25488diff -urNp linux-2.6.32.14/drivers/md/md.c linux-2.6.32.14/drivers/md/md.c 25500diff -urNp linux-2.6.32.15/drivers/md/md.c linux-2.6.32.15/drivers/md/md.c
25489--- linux-2.6.32.14/drivers/md/md.c 2010-05-15 13:20:18.542567696 -0400 25501--- linux-2.6.32.15/drivers/md/md.c 2010-05-15 13:20:18.542567696 -0400
25490+++ linux-2.6.32.14/drivers/md/md.c 2010-05-28 21:27:15.608683910 -0400 25502+++ linux-2.6.32.15/drivers/md/md.c 2010-05-28 21:27:15.608683910 -0400
25491@@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko 25503@@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko
25492 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); 25504 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
25493 kfree(rdev); 25505 kfree(rdev);
@@ -25524,9 +25536,9 @@ diff -urNp linux-2.6.32.14/drivers/md/md.c linux-2.6.32.14/drivers/md/md.c
25524 /* sync IO will cause sync_io to increase before the disk_stats 25536 /* sync IO will cause sync_io to increase before the disk_stats
25525 * as sync_io is counted when a request starts, and 25537 * as sync_io is counted when a request starts, and
25526 * disk_stats is counted when it completes. 25538 * disk_stats is counted when it completes.
25527diff -urNp linux-2.6.32.14/drivers/md/md.h linux-2.6.32.14/drivers/md/md.h 25539diff -urNp linux-2.6.32.15/drivers/md/md.h linux-2.6.32.15/drivers/md/md.h
25528--- linux-2.6.32.14/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400 25540--- linux-2.6.32.15/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400
25529+++ linux-2.6.32.14/drivers/md/md.h 2010-05-28 21:27:15.608683910 -0400 25541+++ linux-2.6.32.15/drivers/md/md.h 2010-05-28 21:27:15.608683910 -0400
25530@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ 25542@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
25531 25543
25532 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) 25544 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
@@ -25536,9 +25548,9 @@ diff -urNp linux-2.6.32.14/drivers/md/md.h linux-2.6.32.14/drivers/md/md.h
25536 } 25548 }
25537 25549
25538 struct mdk_personality 25550 struct mdk_personality
25539diff -urNp linux-2.6.32.14/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.14/drivers/media/dvb/dvb-core/dvbdev.c 25551diff -urNp linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c
25540--- linux-2.6.32.14/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400 25552--- linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400
25541+++ linux-2.6.32.14/drivers/media/dvb/dvb-core/dvbdev.c 2010-05-28 21:27:15.616695200 -0400 25553+++ linux-2.6.32.15/drivers/media/dvb/dvb-core/dvbdev.c 2010-05-28 21:27:15.616695200 -0400
25542@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt 25554@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
25543 const struct dvb_device *template, void *priv, int type) 25555 const struct dvb_device *template, void *priv, int type)
25544 { 25556 {
@@ -25547,9 +25559,9 @@ diff -urNp linux-2.6.32.14/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.14/d
25547 struct file_operations *dvbdevfops; 25559 struct file_operations *dvbdevfops;
25548 struct device *clsdev; 25560 struct device *clsdev;
25549 int minor; 25561 int minor;
25550diff -urNp linux-2.6.32.14/drivers/media/radio/radio-cadet.c linux-2.6.32.14/drivers/media/radio/radio-cadet.c 25562diff -urNp linux-2.6.32.15/drivers/media/radio/radio-cadet.c linux-2.6.32.15/drivers/media/radio/radio-cadet.c
25551--- linux-2.6.32.14/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400 25563--- linux-2.6.32.15/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400
25552+++ linux-2.6.32.14/drivers/media/radio/radio-cadet.c 2010-05-28 21:27:15.616695200 -0400 25564+++ linux-2.6.32.15/drivers/media/radio/radio-cadet.c 2010-05-28 21:27:15.616695200 -0400
25553@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f 25565@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
25554 while (i < count && dev->rdsin != dev->rdsout) 25566 while (i < count && dev->rdsin != dev->rdsout)
25555 readbuf[i++] = dev->rdsbuf[dev->rdsout++]; 25567 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
@@ -25559,9 +25571,9 @@ diff -urNp linux-2.6.32.14/drivers/media/radio/radio-cadet.c linux-2.6.32.14/dri
25559 return -EFAULT; 25571 return -EFAULT;
25560 return i; 25572 return i;
25561 } 25573 }
25562diff -urNp linux-2.6.32.14/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.14/drivers/media/video/usbvideo/konicawc.c 25574diff -urNp linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c
25563--- linux-2.6.32.14/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400 25575--- linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400
25564+++ linux-2.6.32.14/drivers/media/video/usbvideo/konicawc.c 2010-05-28 21:27:15.628727154 -0400 25576+++ linux-2.6.32.15/drivers/media/video/usbvideo/konicawc.c 2010-05-28 21:27:15.628727154 -0400
25565@@ -225,7 +225,7 @@ static void konicawc_register_input(stru 25577@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
25566 int error; 25578 int error;
25567 25579
@@ -25571,9 +25583,9 @@ diff -urNp linux-2.6.32.14/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
25571 25583
25572 cam->input = input_dev = input_allocate_device(); 25584 cam->input = input_dev = input_allocate_device();
25573 if (!input_dev) { 25585 if (!input_dev) {
25574diff -urNp linux-2.6.32.14/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.14/drivers/media/video/usbvideo/quickcam_messenger.c 25586diff -urNp linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c
25575--- linux-2.6.32.14/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400 25587--- linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400
25576+++ linux-2.6.32.14/drivers/media/video/usbvideo/quickcam_messenger.c 2010-05-28 21:27:15.630929247 -0400 25588+++ linux-2.6.32.15/drivers/media/video/usbvideo/quickcam_messenger.c 2010-05-28 21:27:15.630929247 -0400
25577@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc 25589@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
25578 int error; 25590 int error;
25579 25591
@@ -25583,9 +25595,9 @@ diff -urNp linux-2.6.32.14/drivers/media/video/usbvideo/quickcam_messenger.c lin
25583 25595
25584 cam->input = input_dev = input_allocate_device(); 25596 cam->input = input_dev = input_allocate_device();
25585 if (!input_dev) { 25597 if (!input_dev) {
25586diff -urNp linux-2.6.32.14/drivers/message/fusion/mptdebug.h linux-2.6.32.14/drivers/message/fusion/mptdebug.h 25598diff -urNp linux-2.6.32.15/drivers/message/fusion/mptdebug.h linux-2.6.32.15/drivers/message/fusion/mptdebug.h
25587--- linux-2.6.32.14/drivers/message/fusion/mptdebug.h 2010-03-15 11:52:04.000000000 -0400 25599--- linux-2.6.32.15/drivers/message/fusion/mptdebug.h 2010-03-15 11:52:04.000000000 -0400
25588+++ linux-2.6.32.14/drivers/message/fusion/mptdebug.h 2010-05-28 21:27:15.630929247 -0400 25600+++ linux-2.6.32.15/drivers/message/fusion/mptdebug.h 2010-05-28 21:27:15.630929247 -0400
25589@@ -71,7 +71,7 @@ 25601@@ -71,7 +71,7 @@
25590 CMD; \ 25602 CMD; \
25591 } 25603 }
@@ -25595,9 +25607,9 @@ diff -urNp linux-2.6.32.14/drivers/message/fusion/mptdebug.h linux-2.6.32.14/dri
25595 #endif 25607 #endif
25596 25608
25597 25609
25598diff -urNp linux-2.6.32.14/drivers/message/fusion/mptsas.c linux-2.6.32.14/drivers/message/fusion/mptsas.c 25610diff -urNp linux-2.6.32.15/drivers/message/fusion/mptsas.c linux-2.6.32.15/drivers/message/fusion/mptsas.c
25599--- linux-2.6.32.14/drivers/message/fusion/mptsas.c 2010-03-15 11:52:04.000000000 -0400 25611--- linux-2.6.32.15/drivers/message/fusion/mptsas.c 2010-03-15 11:52:04.000000000 -0400
25600+++ linux-2.6.32.14/drivers/message/fusion/mptsas.c 2010-05-28 21:27:15.639064560 -0400 25612+++ linux-2.6.32.15/drivers/message/fusion/mptsas.c 2010-05-28 21:27:15.639064560 -0400
25601@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin 25613@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
25602 return 0; 25614 return 0;
25603 } 25615 }
@@ -25646,9 +25658,9 @@ diff -urNp linux-2.6.32.14/drivers/message/fusion/mptsas.c linux-2.6.32.14/drive
25646 static inline struct sas_port * 25658 static inline struct sas_port *
25647 mptsas_get_port(struct mptsas_phyinfo *phy_info) 25659 mptsas_get_port(struct mptsas_phyinfo *phy_info)
25648 { 25660 {
25649diff -urNp linux-2.6.32.14/drivers/message/i2o/i2o_proc.c linux-2.6.32.14/drivers/message/i2o/i2o_proc.c 25661diff -urNp linux-2.6.32.15/drivers/message/i2o/i2o_proc.c linux-2.6.32.15/drivers/message/i2o/i2o_proc.c
25650--- linux-2.6.32.14/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400 25662--- linux-2.6.32.15/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400
25651+++ linux-2.6.32.14/drivers/message/i2o/i2o_proc.c 2010-05-28 21:27:15.639064560 -0400 25663+++ linux-2.6.32.15/drivers/message/i2o/i2o_proc.c 2010-05-28 21:27:15.639064560 -0400
25652@@ -259,13 +259,6 @@ static char *scsi_devices[] = { 25664@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
25653 "Array Controller Device" 25665 "Array Controller Device"
25654 }; 25666 };
@@ -25735,9 +25747,9 @@ diff -urNp linux-2.6.32.14/drivers/message/i2o/i2o_proc.c linux-2.6.32.14/driver
25735 25747
25736 return 0; 25748 return 0;
25737 } 25749 }
25738diff -urNp linux-2.6.32.14/drivers/misc/kgdbts.c linux-2.6.32.14/drivers/misc/kgdbts.c 25750diff -urNp linux-2.6.32.15/drivers/misc/kgdbts.c linux-2.6.32.15/drivers/misc/kgdbts.c
25739--- linux-2.6.32.14/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400 25751--- linux-2.6.32.15/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400
25740+++ linux-2.6.32.14/drivers/misc/kgdbts.c 2010-05-28 21:27:15.650946222 -0400 25752+++ linux-2.6.32.15/drivers/misc/kgdbts.c 2010-05-28 21:27:15.650946222 -0400
25741@@ -118,7 +118,7 @@ 25753@@ -118,7 +118,7 @@
25742 } while (0) 25754 } while (0)
25743 #define MAX_CONFIG_LEN 40 25755 #define MAX_CONFIG_LEN 40
@@ -25756,9 +25768,9 @@ diff -urNp linux-2.6.32.14/drivers/misc/kgdbts.c linux-2.6.32.14/drivers/misc/kg
25756 .name = "kgdbts", 25768 .name = "kgdbts",
25757 .read_char = kgdbts_get_char, 25769 .read_char = kgdbts_get_char,
25758 .write_char = kgdbts_put_char, 25770 .write_char = kgdbts_put_char,
25759diff -urNp linux-2.6.32.14/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.14/drivers/misc/sgi-gru/gruhandles.c 25771diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c
25760--- linux-2.6.32.14/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400 25772--- linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400
25761+++ linux-2.6.32.14/drivers/misc/sgi-gru/gruhandles.c 2010-05-28 21:27:15.650946222 -0400 25773+++ linux-2.6.32.15/drivers/misc/sgi-gru/gruhandles.c 2010-05-28 21:27:15.650946222 -0400
25762@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic 25774@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
25763 25775
25764 static void update_mcs_stats(enum mcs_op op, unsigned long clks) 25776 static void update_mcs_stats(enum mcs_op op, unsigned long clks)
@@ -25770,9 +25782,9 @@ diff -urNp linux-2.6.32.14/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.14/dri
25770 if (mcs_op_statistics[op].max < clks) 25782 if (mcs_op_statistics[op].max < clks)
25771 mcs_op_statistics[op].max = clks; 25783 mcs_op_statistics[op].max = clks;
25772 } 25784 }
25773diff -urNp linux-2.6.32.14/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.14/drivers/misc/sgi-gru/gruprocfs.c 25785diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c
25774--- linux-2.6.32.14/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400 25786--- linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400
25775+++ linux-2.6.32.14/drivers/misc/sgi-gru/gruprocfs.c 2010-05-28 21:27:15.650946222 -0400 25787+++ linux-2.6.32.15/drivers/misc/sgi-gru/gruprocfs.c 2010-05-28 21:27:15.650946222 -0400
25776@@ -32,9 +32,9 @@ 25788@@ -32,9 +32,9 @@
25777 25789
25778 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) 25790 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -25796,9 +25808,9 @@ diff -urNp linux-2.6.32.14/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.14/driv
25796 max = mcs_op_statistics[op].max; 25808 max = mcs_op_statistics[op].max;
25797 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, 25809 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
25798 count ? total / count : 0, max); 25810 count ? total / count : 0, max);
25799diff -urNp linux-2.6.32.14/drivers/misc/sgi-gru/grutables.h linux-2.6.32.14/drivers/misc/sgi-gru/grutables.h 25811diff -urNp linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h
25800--- linux-2.6.32.14/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400 25812--- linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400
25801+++ linux-2.6.32.14/drivers/misc/sgi-gru/grutables.h 2010-05-28 21:27:15.650946222 -0400 25813+++ linux-2.6.32.15/drivers/misc/sgi-gru/grutables.h 2010-05-28 21:27:15.650946222 -0400
25802@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; 25814@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
25803 * GRU statistics. 25815 * GRU statistics.
25804 */ 25816 */
@@ -25982,9 +25994,9 @@ diff -urNp linux-2.6.32.14/drivers/misc/sgi-gru/grutables.h linux-2.6.32.14/driv
25982 } while (0) 25994 } while (0)
25983 25995
25984 #ifdef CONFIG_SGI_GRU_DEBUG 25996 #ifdef CONFIG_SGI_GRU_DEBUG
25985diff -urNp linux-2.6.32.14/drivers/mtd/devices/doc2000.c linux-2.6.32.14/drivers/mtd/devices/doc2000.c 25997diff -urNp linux-2.6.32.15/drivers/mtd/devices/doc2000.c linux-2.6.32.15/drivers/mtd/devices/doc2000.c
25986--- linux-2.6.32.14/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400 25998--- linux-2.6.32.15/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400
25987+++ linux-2.6.32.14/drivers/mtd/devices/doc2000.c 2010-05-28 21:27:15.650946222 -0400 25999+++ linux-2.6.32.15/drivers/mtd/devices/doc2000.c 2010-05-28 21:27:15.650946222 -0400
25988@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt 26000@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
25989 26001
25990 /* The ECC will not be calculated correctly if less than 512 is written */ 26002 /* The ECC will not be calculated correctly if less than 512 is written */
@@ -25994,9 +26006,9 @@ diff -urNp linux-2.6.32.14/drivers/mtd/devices/doc2000.c linux-2.6.32.14/drivers
25994 printk(KERN_WARNING 26006 printk(KERN_WARNING
25995 "ECC needs a full sector write (adr: %lx size %lx)\n", 26007 "ECC needs a full sector write (adr: %lx size %lx)\n",
25996 (long) to, (long) len); 26008 (long) to, (long) len);
25997diff -urNp linux-2.6.32.14/drivers/mtd/devices/doc2001.c linux-2.6.32.14/drivers/mtd/devices/doc2001.c 26009diff -urNp linux-2.6.32.15/drivers/mtd/devices/doc2001.c linux-2.6.32.15/drivers/mtd/devices/doc2001.c
25998--- linux-2.6.32.14/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400 26010--- linux-2.6.32.15/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400
25999+++ linux-2.6.32.14/drivers/mtd/devices/doc2001.c 2010-05-28 21:27:15.650946222 -0400 26011+++ linux-2.6.32.15/drivers/mtd/devices/doc2001.c 2010-05-28 21:27:15.650946222 -0400
26000@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt 26012@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
26001 struct Nand *mychip = &this->chips[from >> (this->chipshift)]; 26013 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
26002 26014
@@ -26006,9 +26018,9 @@ diff -urNp linux-2.6.32.14/drivers/mtd/devices/doc2001.c linux-2.6.32.14/drivers
26006 return -EINVAL; 26018 return -EINVAL;
26007 26019
26008 /* Don't allow a single read to cross a 512-byte block boundary */ 26020 /* Don't allow a single read to cross a 512-byte block boundary */
26009diff -urNp linux-2.6.32.14/drivers/mtd/ubi/build.c linux-2.6.32.14/drivers/mtd/ubi/build.c 26021diff -urNp linux-2.6.32.15/drivers/mtd/ubi/build.c linux-2.6.32.15/drivers/mtd/ubi/build.c
26010--- linux-2.6.32.14/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400 26022--- linux-2.6.32.15/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400
26011+++ linux-2.6.32.14/drivers/mtd/ubi/build.c 2010-05-28 21:27:15.650946222 -0400 26023+++ linux-2.6.32.15/drivers/mtd/ubi/build.c 2010-05-28 21:27:15.650946222 -0400
26012@@ -1255,7 +1255,7 @@ module_exit(ubi_exit); 26024@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
26013 static int __init bytes_str_to_int(const char *str) 26025 static int __init bytes_str_to_int(const char *str)
26014 { 26026 {
@@ -26048,9 +26060,9 @@ diff -urNp linux-2.6.32.14/drivers/mtd/ubi/build.c linux-2.6.32.14/drivers/mtd/u
26048 } 26060 }
26049 26061
26050 /** 26062 /**
26051diff -urNp linux-2.6.32.14/drivers/net/e1000e/82571.c linux-2.6.32.14/drivers/net/e1000e/82571.c 26063diff -urNp linux-2.6.32.15/drivers/net/e1000e/82571.c linux-2.6.32.15/drivers/net/e1000e/82571.c
26052--- linux-2.6.32.14/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400 26064--- linux-2.6.32.15/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400
26053+++ linux-2.6.32.14/drivers/net/e1000e/82571.c 2010-05-28 21:27:15.655178202 -0400 26065+++ linux-2.6.32.15/drivers/net/e1000e/82571.c 2010-05-28 21:27:15.655178202 -0400
26054@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s 26066@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
26055 { 26067 {
26056 struct e1000_hw *hw = &adapter->hw; 26068 struct e1000_hw *hw = &adapter->hw;
@@ -26104,9 +26116,9 @@ diff -urNp linux-2.6.32.14/drivers/net/e1000e/82571.c linux-2.6.32.14/drivers/ne
26104 .acquire_nvm = e1000_acquire_nvm_82571, 26116 .acquire_nvm = e1000_acquire_nvm_82571,
26105 .read_nvm = e1000e_read_nvm_eerd, 26117 .read_nvm = e1000e_read_nvm_eerd,
26106 .release_nvm = e1000_release_nvm_82571, 26118 .release_nvm = e1000_release_nvm_82571,
26107diff -urNp linux-2.6.32.14/drivers/net/e1000e/e1000.h linux-2.6.32.14/drivers/net/e1000e/e1000.h 26119diff -urNp linux-2.6.32.15/drivers/net/e1000e/e1000.h linux-2.6.32.15/drivers/net/e1000e/e1000.h
26108--- linux-2.6.32.14/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400 26120--- linux-2.6.32.15/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400
26109+++ linux-2.6.32.14/drivers/net/e1000e/e1000.h 2010-05-28 21:27:15.655178202 -0400 26121+++ linux-2.6.32.15/drivers/net/e1000e/e1000.h 2010-05-28 21:27:15.655178202 -0400
26110@@ -375,9 +375,9 @@ struct e1000_info { 26122@@ -375,9 +375,9 @@ struct e1000_info {
26111 u32 pba; 26123 u32 pba;
26112 u32 max_hw_frame_size; 26124 u32 max_hw_frame_size;
@@ -26120,9 +26132,9 @@ diff -urNp linux-2.6.32.14/drivers/net/e1000e/e1000.h linux-2.6.32.14/drivers/ne
26120 }; 26132 };
26121 26133
26122 /* hardware capability, feature, and workaround flags */ 26134 /* hardware capability, feature, and workaround flags */
26123diff -urNp linux-2.6.32.14/drivers/net/e1000e/es2lan.c linux-2.6.32.14/drivers/net/e1000e/es2lan.c 26135diff -urNp linux-2.6.32.15/drivers/net/e1000e/es2lan.c linux-2.6.32.15/drivers/net/e1000e/es2lan.c
26124--- linux-2.6.32.14/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400 26136--- linux-2.6.32.15/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400
26125+++ linux-2.6.32.14/drivers/net/e1000e/es2lan.c 2010-05-28 21:27:15.655178202 -0400 26137+++ linux-2.6.32.15/drivers/net/e1000e/es2lan.c 2010-05-28 21:27:15.655178202 -0400
26126@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es 26138@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
26127 { 26139 {
26128 struct e1000_hw *hw = &adapter->hw; 26140 struct e1000_hw *hw = &adapter->hw;
@@ -26158,9 +26170,9 @@ diff -urNp linux-2.6.32.14/drivers/net/e1000e/es2lan.c linux-2.6.32.14/drivers/n
26158 .acquire_nvm = e1000_acquire_nvm_80003es2lan, 26170 .acquire_nvm = e1000_acquire_nvm_80003es2lan,
26159 .read_nvm = e1000e_read_nvm_eerd, 26171 .read_nvm = e1000e_read_nvm_eerd,
26160 .release_nvm = e1000_release_nvm_80003es2lan, 26172 .release_nvm = e1000_release_nvm_80003es2lan,
26161diff -urNp linux-2.6.32.14/drivers/net/e1000e/hw.h linux-2.6.32.14/drivers/net/e1000e/hw.h 26173diff -urNp linux-2.6.32.15/drivers/net/e1000e/hw.h linux-2.6.32.15/drivers/net/e1000e/hw.h
26162--- linux-2.6.32.14/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400 26174--- linux-2.6.32.15/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400
26163+++ linux-2.6.32.14/drivers/net/e1000e/hw.h 2010-05-28 21:27:15.659202304 -0400 26175+++ linux-2.6.32.15/drivers/net/e1000e/hw.h 2010-05-28 21:27:15.659202304 -0400
26164@@ -756,34 +756,34 @@ struct e1000_mac_operations { 26176@@ -756,34 +756,34 @@ struct e1000_mac_operations {
26165 26177
26166 /* Function pointers for the PHY. */ 26178 /* Function pointers for the PHY. */
@@ -26220,9 +26232,9 @@ diff -urNp linux-2.6.32.14/drivers/net/e1000e/hw.h linux-2.6.32.14/drivers/net/e
26220 }; 26232 };
26221 26233
26222 struct e1000_mac_info { 26234 struct e1000_mac_info {
26223diff -urNp linux-2.6.32.14/drivers/net/e1000e/ich8lan.c linux-2.6.32.14/drivers/net/e1000e/ich8lan.c 26235diff -urNp linux-2.6.32.15/drivers/net/e1000e/ich8lan.c linux-2.6.32.15/drivers/net/e1000e/ich8lan.c
26224--- linux-2.6.32.14/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400 26236--- linux-2.6.32.15/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400
26225+++ linux-2.6.32.14/drivers/net/e1000e/ich8lan.c 2010-05-28 21:27:15.659202304 -0400 26237+++ linux-2.6.32.15/drivers/net/e1000e/ich8lan.c 2010-05-28 21:27:15.659202304 -0400
26226@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan 26238@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
26227 } 26239 }
26228 } 26240 }
@@ -26250,9 +26262,9 @@ diff -urNp linux-2.6.32.14/drivers/net/e1000e/ich8lan.c linux-2.6.32.14/drivers/
26250 .acquire_nvm = e1000_acquire_nvm_ich8lan, 26262 .acquire_nvm = e1000_acquire_nvm_ich8lan,
26251 .read_nvm = e1000_read_nvm_ich8lan, 26263 .read_nvm = e1000_read_nvm_ich8lan,
26252 .release_nvm = e1000_release_nvm_ich8lan, 26264 .release_nvm = e1000_release_nvm_ich8lan,
26253diff -urNp linux-2.6.32.14/drivers/net/ibmveth.c linux-2.6.32.14/drivers/net/ibmveth.c 26265diff -urNp linux-2.6.32.15/drivers/net/ibmveth.c linux-2.6.32.15/drivers/net/ibmveth.c
26254--- linux-2.6.32.14/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400 26266--- linux-2.6.32.15/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400
26255+++ linux-2.6.32.14/drivers/net/ibmveth.c 2010-05-28 21:27:15.659202304 -0400 26267+++ linux-2.6.32.15/drivers/net/ibmveth.c 2010-05-28 21:27:15.659202304 -0400
26256@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr 26268@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
26257 NULL, 26269 NULL,
26258 }; 26270 };
@@ -26262,9 +26274,9 @@ diff -urNp linux-2.6.32.14/drivers/net/ibmveth.c linux-2.6.32.14/drivers/net/ibm
26262 .show = veth_pool_show, 26274 .show = veth_pool_show,
26263 .store = veth_pool_store, 26275 .store = veth_pool_store,
26264 }; 26276 };
26265diff -urNp linux-2.6.32.14/drivers/net/igb/e1000_82575.c linux-2.6.32.14/drivers/net/igb/e1000_82575.c 26277diff -urNp linux-2.6.32.15/drivers/net/igb/e1000_82575.c linux-2.6.32.15/drivers/net/igb/e1000_82575.c
26266--- linux-2.6.32.14/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:38.085476187 -0400 26278--- linux-2.6.32.15/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:38.085476187 -0400
26267+++ linux-2.6.32.14/drivers/net/igb/e1000_82575.c 2010-05-28 21:27:15.659202304 -0400 26279+++ linux-2.6.32.15/drivers/net/igb/e1000_82575.c 2010-05-28 21:27:15.659202304 -0400
26268@@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct 26280@@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct
26269 wr32(E1000_VT_CTL, vt_ctl); 26281 wr32(E1000_VT_CTL, vt_ctl);
26270 } 26282 }
@@ -26290,9 +26302,9 @@ diff -urNp linux-2.6.32.14/drivers/net/igb/e1000_82575.c linux-2.6.32.14/drivers
26290 .acquire = igb_acquire_nvm_82575, 26302 .acquire = igb_acquire_nvm_82575,
26291 .read = igb_read_nvm_eerd, 26303 .read = igb_read_nvm_eerd,
26292 .release = igb_release_nvm_82575, 26304 .release = igb_release_nvm_82575,
26293diff -urNp linux-2.6.32.14/drivers/net/igb/e1000_hw.h linux-2.6.32.14/drivers/net/igb/e1000_hw.h 26305diff -urNp linux-2.6.32.15/drivers/net/igb/e1000_hw.h linux-2.6.32.15/drivers/net/igb/e1000_hw.h
26294--- linux-2.6.32.14/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:38.085476187 -0400 26306--- linux-2.6.32.15/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:38.085476187 -0400
26295+++ linux-2.6.32.14/drivers/net/igb/e1000_hw.h 2010-05-28 21:27:15.659202304 -0400 26307+++ linux-2.6.32.15/drivers/net/igb/e1000_hw.h 2010-05-28 21:27:15.659202304 -0400
26296@@ -303,17 +303,17 @@ struct e1000_phy_operations { 26308@@ -303,17 +303,17 @@ struct e1000_phy_operations {
26297 }; 26309 };
26298 26310
@@ -26318,9 +26330,9 @@ diff -urNp linux-2.6.32.14/drivers/net/igb/e1000_hw.h linux-2.6.32.14/drivers/ne
26318 }; 26330 };
26319 26331
26320 extern const struct e1000_info e1000_82575_info; 26332 extern const struct e1000_info e1000_82575_info;
26321diff -urNp linux-2.6.32.14/drivers/net/irda/vlsi_ir.c linux-2.6.32.14/drivers/net/irda/vlsi_ir.c 26333diff -urNp linux-2.6.32.15/drivers/net/irda/vlsi_ir.c linux-2.6.32.15/drivers/net/irda/vlsi_ir.c
26322--- linux-2.6.32.14/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400 26334--- linux-2.6.32.15/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400
26323+++ linux-2.6.32.14/drivers/net/irda/vlsi_ir.c 2010-05-28 21:27:15.662946876 -0400 26335+++ linux-2.6.32.15/drivers/net/irda/vlsi_ir.c 2010-05-28 21:27:15.662946876 -0400
26324@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( 26336@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
26325 /* no race - tx-ring already empty */ 26337 /* no race - tx-ring already empty */
26326 vlsi_set_baud(idev, iobase); 26338 vlsi_set_baud(idev, iobase);
@@ -26337,9 +26349,9 @@ diff -urNp linux-2.6.32.14/drivers/net/irda/vlsi_ir.c linux-2.6.32.14/drivers/ne
26337 spin_unlock_irqrestore(&idev->lock, flags); 26349 spin_unlock_irqrestore(&idev->lock, flags);
26338 dev_kfree_skb_any(skb); 26350 dev_kfree_skb_any(skb);
26339 return NETDEV_TX_OK; 26351 return NETDEV_TX_OK;
26340diff -urNp linux-2.6.32.14/drivers/net/iseries_veth.c linux-2.6.32.14/drivers/net/iseries_veth.c 26352diff -urNp linux-2.6.32.15/drivers/net/iseries_veth.c linux-2.6.32.15/drivers/net/iseries_veth.c
26341--- linux-2.6.32.14/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400 26353--- linux-2.6.32.15/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400
26342+++ linux-2.6.32.14/drivers/net/iseries_veth.c 2010-05-28 21:27:15.662946876 -0400 26354+++ linux-2.6.32.15/drivers/net/iseries_veth.c 2010-05-28 21:27:15.662946876 -0400
26343@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul 26355@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
26344 NULL 26356 NULL
26345 }; 26357 };
@@ -26358,9 +26370,9 @@ diff -urNp linux-2.6.32.14/drivers/net/iseries_veth.c linux-2.6.32.14/drivers/ne
26358 .show = veth_port_attribute_show 26370 .show = veth_port_attribute_show
26359 }; 26371 };
26360 26372
26361diff -urNp linux-2.6.32.14/drivers/net/pcnet32.c linux-2.6.32.14/drivers/net/pcnet32.c 26373diff -urNp linux-2.6.32.15/drivers/net/pcnet32.c linux-2.6.32.15/drivers/net/pcnet32.c
26362--- linux-2.6.32.14/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400 26374--- linux-2.6.32.15/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400
26363+++ linux-2.6.32.14/drivers/net/pcnet32.c 2010-05-28 21:27:15.662946876 -0400 26375+++ linux-2.6.32.15/drivers/net/pcnet32.c 2010-05-28 21:27:15.662946876 -0400
26364@@ -79,7 +79,7 @@ static int cards_found; 26376@@ -79,7 +79,7 @@ static int cards_found;
26365 /* 26377 /*
26366 * VLB I/O addresses 26378 * VLB I/O addresses
@@ -26370,9 +26382,9 @@ diff -urNp linux-2.6.32.14/drivers/net/pcnet32.c linux-2.6.32.14/drivers/net/pcn
26370 { 0x300, 0x320, 0x340, 0x360, 0 }; 26382 { 0x300, 0x320, 0x340, 0x360, 0 };
26371 26383
26372 static int pcnet32_debug = 0; 26384 static int pcnet32_debug = 0;
26373diff -urNp linux-2.6.32.14/drivers/net/tg3.h linux-2.6.32.14/drivers/net/tg3.h 26385diff -urNp linux-2.6.32.15/drivers/net/tg3.h linux-2.6.32.15/drivers/net/tg3.h
26374--- linux-2.6.32.14/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400 26386--- linux-2.6.32.15/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400
26375+++ linux-2.6.32.14/drivers/net/tg3.h 2010-05-28 21:27:15.662946876 -0400 26387+++ linux-2.6.32.15/drivers/net/tg3.h 2010-05-28 21:27:15.662946876 -0400
26376@@ -95,6 +95,7 @@ 26388@@ -95,6 +95,7 @@
26377 #define CHIPREV_ID_5750_A0 0x4000 26389 #define CHIPREV_ID_5750_A0 0x4000
26378 #define CHIPREV_ID_5750_A1 0x4001 26390 #define CHIPREV_ID_5750_A1 0x4001
@@ -26381,9 +26393,9 @@ diff -urNp linux-2.6.32.14/drivers/net/tg3.h linux-2.6.32.14/drivers/net/tg3.h
26381 #define CHIPREV_ID_5750_C2 0x4202 26393 #define CHIPREV_ID_5750_C2 0x4202
26382 #define CHIPREV_ID_5752_A0_HW 0x5000 26394 #define CHIPREV_ID_5752_A0_HW 0x5000
26383 #define CHIPREV_ID_5752_A0 0x6000 26395 #define CHIPREV_ID_5752_A0 0x6000
26384diff -urNp linux-2.6.32.14/drivers/net/tulip/de4x5.c linux-2.6.32.14/drivers/net/tulip/de4x5.c 26396diff -urNp linux-2.6.32.15/drivers/net/tulip/de4x5.c linux-2.6.32.15/drivers/net/tulip/de4x5.c
26385--- linux-2.6.32.14/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400 26397--- linux-2.6.32.15/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400
26386+++ linux-2.6.32.14/drivers/net/tulip/de4x5.c 2010-05-28 21:27:15.696210343 -0400 26398+++ linux-2.6.32.15/drivers/net/tulip/de4x5.c 2010-05-28 21:27:15.696210343 -0400
26387@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru 26399@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
26388 for (i=0; i<ETH_ALEN; i++) { 26400 for (i=0; i<ETH_ALEN; i++) {
26389 tmp.addr[i] = dev->dev_addr[i]; 26401 tmp.addr[i] = dev->dev_addr[i];
@@ -26402,9 +26414,9 @@ diff -urNp linux-2.6.32.14/drivers/net/tulip/de4x5.c linux-2.6.32.14/drivers/net
26402 return -EFAULT; 26414 return -EFAULT;
26403 break; 26415 break;
26404 } 26416 }
26405diff -urNp linux-2.6.32.14/drivers/net/usb/hso.c linux-2.6.32.14/drivers/net/usb/hso.c 26417diff -urNp linux-2.6.32.15/drivers/net/usb/hso.c linux-2.6.32.15/drivers/net/usb/hso.c
26406--- linux-2.6.32.14/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400 26418--- linux-2.6.32.15/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400
26407+++ linux-2.6.32.14/drivers/net/usb/hso.c 2010-05-28 21:27:15.699197955 -0400 26419+++ linux-2.6.32.15/drivers/net/usb/hso.c 2010-05-28 21:27:15.699197955 -0400
26408@@ -258,7 +258,7 @@ struct hso_serial { 26420@@ -258,7 +258,7 @@ struct hso_serial {
26409 26421
26410 /* from usb_serial_port */ 26422 /* from usb_serial_port */
@@ -26483,9 +26495,9 @@ diff -urNp linux-2.6.32.14/drivers/net/usb/hso.c linux-2.6.32.14/drivers/net/usb
26483 result = 26495 result =
26484 hso_start_serial_device(serial_table[i], GFP_NOIO); 26496 hso_start_serial_device(serial_table[i], GFP_NOIO);
26485 hso_kick_transmit(dev2ser(serial_table[i])); 26497 hso_kick_transmit(dev2ser(serial_table[i]));
26486diff -urNp linux-2.6.32.14/drivers/net/wireless/b43/debugfs.c linux-2.6.32.14/drivers/net/wireless/b43/debugfs.c 26498diff -urNp linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c
26487--- linux-2.6.32.14/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400 26499--- linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400
26488+++ linux-2.6.32.14/drivers/net/wireless/b43/debugfs.c 2010-05-28 21:27:15.699197955 -0400 26500+++ linux-2.6.32.15/drivers/net/wireless/b43/debugfs.c 2010-05-28 21:27:15.699197955 -0400
26489@@ -43,7 +43,7 @@ static struct dentry *rootdir; 26501@@ -43,7 +43,7 @@ static struct dentry *rootdir;
26490 struct b43_debugfs_fops { 26502 struct b43_debugfs_fops {
26491 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); 26503 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -26495,9 +26507,9 @@ diff -urNp linux-2.6.32.14/drivers/net/wireless/b43/debugfs.c linux-2.6.32.14/dr
26495 /* Offset of struct b43_dfs_file in struct b43_dfsentry */ 26507 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
26496 size_t file_struct_offset; 26508 size_t file_struct_offset;
26497 }; 26509 };
26498diff -urNp linux-2.6.32.14/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.14/drivers/net/wireless/b43legacy/debugfs.c 26510diff -urNp linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c
26499--- linux-2.6.32.14/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400 26511--- linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400
26500+++ linux-2.6.32.14/drivers/net/wireless/b43legacy/debugfs.c 2010-05-28 21:27:15.699197955 -0400 26512+++ linux-2.6.32.15/drivers/net/wireless/b43legacy/debugfs.c 2010-05-28 21:27:15.699197955 -0400
26501@@ -44,7 +44,7 @@ static struct dentry *rootdir; 26513@@ -44,7 +44,7 @@ static struct dentry *rootdir;
26502 struct b43legacy_debugfs_fops { 26514 struct b43legacy_debugfs_fops {
26503 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); 26515 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -26507,9 +26519,9 @@ diff -urNp linux-2.6.32.14/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32
26507 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ 26519 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
26508 size_t file_struct_offset; 26520 size_t file_struct_offset;
26509 /* Take wl->irq_lock before calling read/write? */ 26521 /* Take wl->irq_lock before calling read/write? */
26510diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-1000.c 26522diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c
26511--- linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400 26523--- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400
26512+++ linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-05-28 21:27:15.699197955 -0400 26524+++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-05-28 21:27:15.699197955 -0400
26513@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = 26525@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
26514 }, 26526 },
26515 }; 26527 };
@@ -26519,9 +26531,9 @@ diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
26519 .ucode = &iwl5000_ucode, 26531 .ucode = &iwl5000_ucode,
26520 .lib = &iwl1000_lib, 26532 .lib = &iwl1000_lib,
26521 .hcmd = &iwl5000_hcmd, 26533 .hcmd = &iwl5000_hcmd,
26522diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-3945.c 26534diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c
26523--- linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400 26535--- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400
26524+++ linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-05-28 21:27:15.707206768 -0400 26536+++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-05-28 21:27:15.707206768 -0400
26525@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 26537@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
26526 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, 26538 .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
26527 }; 26539 };
@@ -26531,9 +26543,9 @@ diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.
26531 .ucode = &iwl3945_ucode, 26543 .ucode = &iwl3945_ucode,
26532 .lib = &iwl3945_lib, 26544 .lib = &iwl3945_lib,
26533 .hcmd = &iwl3945_hcmd, 26545 .hcmd = &iwl3945_hcmd,
26534diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-4965.c 26546diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c
26535--- linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-28 20:16:44.442935997 -0400 26547--- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-28 20:16:44.442935997 -0400
26536+++ linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-28 21:27:15.707206768 -0400 26548+++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-28 21:27:15.707206768 -0400
26537@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = 26549@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib =
26538 }, 26550 },
26539 }; 26551 };
@@ -26543,9 +26555,9 @@ diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.
26543 .ucode = &iwl4965_ucode, 26555 .ucode = &iwl4965_ucode,
26544 .lib = &iwl4965_lib, 26556 .lib = &iwl4965_lib,
26545 .hcmd = &iwl4965_hcmd, 26557 .hcmd = &iwl4965_hcmd,
26546diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-5000.c 26558diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c
26547--- linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-28 20:16:44.446927415 -0400 26559--- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-28 20:16:44.446927415 -0400
26548+++ linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-28 21:27:15.707206768 -0400 26560+++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-28 21:27:15.707206768 -0400
26549@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = 26561@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib =
26550 }, 26562 },
26551 }; 26563 };
@@ -26563,9 +26575,9 @@ diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.
26563 .ucode = &iwl5000_ucode, 26575 .ucode = &iwl5000_ucode,
26564 .lib = &iwl5150_lib, 26576 .lib = &iwl5150_lib,
26565 .hcmd = &iwl5000_hcmd, 26577 .hcmd = &iwl5000_hcmd,
26566diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-6000.c 26578diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c
26567--- linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400 26579--- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400
26568+++ linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-05-28 21:27:15.707206768 -0400 26580+++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-05-28 21:27:15.707206768 -0400
26569@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 26581@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
26570 .calc_rssi = iwl5000_calc_rssi, 26582 .calc_rssi = iwl5000_calc_rssi,
26571 }; 26583 };
@@ -26575,9 +26587,9 @@ diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
26575 .ucode = &iwl5000_ucode, 26587 .ucode = &iwl5000_ucode,
26576 .lib = &iwl6000_lib, 26588 .lib = &iwl6000_lib,
26577 .hcmd = &iwl5000_hcmd, 26589 .hcmd = &iwl5000_hcmd,
26578diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-debug.h 26590diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h
26579--- linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-03-15 11:52:04.000000000 -0400 26591--- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-03-15 11:52:04.000000000 -0400
26580+++ linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-05-28 21:27:15.707206768 -0400 26592+++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-05-28 21:27:15.707206768 -0400
26581@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri 26593@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
26582 #endif 26594 #endif
26583 26595
@@ -26589,9 +26601,9 @@ diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32
26589 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, 26601 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
26590 void *p, u32 len) 26602 void *p, u32 len)
26591 {} 26603 {}
26592diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-dev.h 26604diff -urNp linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h
26593--- linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400 26605--- linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400
26594+++ linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-05-28 21:27:15.707206768 -0400 26606+++ linux-2.6.32.15/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-05-28 21:27:15.707206768 -0400
26595@@ -67,7 +67,7 @@ struct iwl_tx_queue; 26607@@ -67,7 +67,7 @@ struct iwl_tx_queue;
26596 26608
26597 /* shared structures from iwl-5000.c */ 26609 /* shared structures from iwl-5000.c */
@@ -26601,9 +26613,9 @@ diff -urNp linux-2.6.32.14/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.1
26601 extern struct iwl_ucode_ops iwl5000_ucode; 26613 extern struct iwl_ucode_ops iwl5000_ucode;
26602 extern struct iwl_lib_ops iwl5000_lib; 26614 extern struct iwl_lib_ops iwl5000_lib;
26603 extern struct iwl_hcmd_ops iwl5000_hcmd; 26615 extern struct iwl_hcmd_ops iwl5000_hcmd;
26604diff -urNp linux-2.6.32.14/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.14/drivers/net/wireless/libertas/debugfs.c 26616diff -urNp linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c
26605--- linux-2.6.32.14/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400 26617--- linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400
26606+++ linux-2.6.32.14/drivers/net/wireless/libertas/debugfs.c 2010-05-28 21:27:15.715208538 -0400 26618+++ linux-2.6.32.15/drivers/net/wireless/libertas/debugfs.c 2010-05-28 21:27:15.715208538 -0400
26607@@ -708,7 +708,7 @@ out_unlock: 26619@@ -708,7 +708,7 @@ out_unlock:
26608 struct lbs_debugfs_files { 26620 struct lbs_debugfs_files {
26609 const char *name; 26621 const char *name;
@@ -26613,9 +26625,9 @@ diff -urNp linux-2.6.32.14/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
26613 }; 26625 };
26614 26626
26615 static const struct lbs_debugfs_files debugfs_files[] = { 26627 static const struct lbs_debugfs_files debugfs_files[] = {
26616diff -urNp linux-2.6.32.14/drivers/net/wireless/rndis_wlan.c linux-2.6.32.14/drivers/net/wireless/rndis_wlan.c 26628diff -urNp linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c
26617--- linux-2.6.32.14/drivers/net/wireless/rndis_wlan.c 2010-03-15 11:52:04.000000000 -0400 26629--- linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c 2010-03-15 11:52:04.000000000 -0400
26618+++ linux-2.6.32.14/drivers/net/wireless/rndis_wlan.c 2010-05-28 21:27:15.715208538 -0400 26630+++ linux-2.6.32.15/drivers/net/wireless/rndis_wlan.c 2010-05-28 21:27:15.715208538 -0400
26619@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn 26631@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
26620 26632
26621 devdbg(usbdev, "set_rts_threshold %i", rts_threshold); 26633 devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
@@ -26625,9 +26637,9 @@ diff -urNp linux-2.6.32.14/drivers/net/wireless/rndis_wlan.c linux-2.6.32.14/dri
26625 rts_threshold = 2347; 26637 rts_threshold = 2347;
26626 26638
26627 tmp = cpu_to_le32(rts_threshold); 26639 tmp = cpu_to_le32(rts_threshold);
26628diff -urNp linux-2.6.32.14/drivers/oprofile/buffer_sync.c linux-2.6.32.14/drivers/oprofile/buffer_sync.c 26640diff -urNp linux-2.6.32.15/drivers/oprofile/buffer_sync.c linux-2.6.32.15/drivers/oprofile/buffer_sync.c
26629--- linux-2.6.32.14/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400 26641--- linux-2.6.32.15/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400
26630+++ linux-2.6.32.14/drivers/oprofile/buffer_sync.c 2010-05-28 21:27:15.718942362 -0400 26642+++ linux-2.6.32.15/drivers/oprofile/buffer_sync.c 2010-05-28 21:27:15.718942362 -0400
26631@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en 26643@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en
26632 if (cookie == NO_COOKIE) 26644 if (cookie == NO_COOKIE)
26633 offset = pc; 26645 offset = pc;
@@ -26663,9 +26675,9 @@ diff -urNp linux-2.6.32.14/drivers/oprofile/buffer_sync.c linux-2.6.32.14/driver
26663 } 26675 }
26664 } 26676 }
26665 release_mm(mm); 26677 release_mm(mm);
26666diff -urNp linux-2.6.32.14/drivers/oprofile/event_buffer.c linux-2.6.32.14/drivers/oprofile/event_buffer.c 26678diff -urNp linux-2.6.32.15/drivers/oprofile/event_buffer.c linux-2.6.32.15/drivers/oprofile/event_buffer.c
26667--- linux-2.6.32.14/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400 26679--- linux-2.6.32.15/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400
26668+++ linux-2.6.32.14/drivers/oprofile/event_buffer.c 2010-05-28 21:27:15.718942362 -0400 26680+++ linux-2.6.32.15/drivers/oprofile/event_buffer.c 2010-05-28 21:27:15.718942362 -0400
26669@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value 26681@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
26670 } 26682 }
26671 26683
@@ -26675,9 +26687,9 @@ diff -urNp linux-2.6.32.14/drivers/oprofile/event_buffer.c linux-2.6.32.14/drive
26675 return; 26687 return;
26676 } 26688 }
26677 26689
26678diff -urNp linux-2.6.32.14/drivers/oprofile/oprof.c linux-2.6.32.14/drivers/oprofile/oprof.c 26690diff -urNp linux-2.6.32.15/drivers/oprofile/oprof.c linux-2.6.32.15/drivers/oprofile/oprof.c
26679--- linux-2.6.32.14/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400 26691--- linux-2.6.32.15/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400
26680+++ linux-2.6.32.14/drivers/oprofile/oprof.c 2010-05-28 21:27:15.718942362 -0400 26692+++ linux-2.6.32.15/drivers/oprofile/oprof.c 2010-05-28 21:27:15.718942362 -0400
26681@@ -110,7 +110,7 @@ static void switch_worker(struct work_st 26693@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
26682 if (oprofile_ops.switch_events()) 26694 if (oprofile_ops.switch_events())
26683 return; 26695 return;
@@ -26687,9 +26699,9 @@ diff -urNp linux-2.6.32.14/drivers/oprofile/oprof.c linux-2.6.32.14/drivers/opro
26687 start_switch_worker(); 26699 start_switch_worker();
26688 } 26700 }
26689 26701
26690diff -urNp linux-2.6.32.14/drivers/oprofile/oprofilefs.c linux-2.6.32.14/drivers/oprofile/oprofilefs.c 26702diff -urNp linux-2.6.32.15/drivers/oprofile/oprofilefs.c linux-2.6.32.15/drivers/oprofile/oprofilefs.c
26691--- linux-2.6.32.14/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400 26703--- linux-2.6.32.15/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400
26692+++ linux-2.6.32.14/drivers/oprofile/oprofilefs.c 2010-05-28 21:27:15.718942362 -0400 26704+++ linux-2.6.32.15/drivers/oprofile/oprofilefs.c 2010-05-28 21:27:15.718942362 -0400
26693@@ -187,7 +187,7 @@ static const struct file_operations atom 26705@@ -187,7 +187,7 @@ static const struct file_operations atom
26694 26706
26695 26707
@@ -26699,9 +26711,9 @@ diff -urNp linux-2.6.32.14/drivers/oprofile/oprofilefs.c linux-2.6.32.14/drivers
26699 { 26711 {
26700 struct dentry *d = __oprofilefs_create_file(sb, root, name, 26712 struct dentry *d = __oprofilefs_create_file(sb, root, name,
26701 &atomic_ro_fops, 0444); 26713 &atomic_ro_fops, 0444);
26702diff -urNp linux-2.6.32.14/drivers/oprofile/oprofile_stats.c linux-2.6.32.14/drivers/oprofile/oprofile_stats.c 26714diff -urNp linux-2.6.32.15/drivers/oprofile/oprofile_stats.c linux-2.6.32.15/drivers/oprofile/oprofile_stats.c
26703--- linux-2.6.32.14/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400 26715--- linux-2.6.32.15/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400
26704+++ linux-2.6.32.14/drivers/oprofile/oprofile_stats.c 2010-05-28 21:27:15.718942362 -0400 26716+++ linux-2.6.32.15/drivers/oprofile/oprofile_stats.c 2010-05-28 21:27:15.718942362 -0400
26705@@ -30,11 +30,11 @@ void oprofile_reset_stats(void) 26717@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
26706 cpu_buf->sample_invalid_eip = 0; 26718 cpu_buf->sample_invalid_eip = 0;
26707 } 26719 }
@@ -26719,9 +26731,9 @@ diff -urNp linux-2.6.32.14/drivers/oprofile/oprofile_stats.c linux-2.6.32.14/dri
26719 } 26731 }
26720 26732
26721 26733
26722diff -urNp linux-2.6.32.14/drivers/oprofile/oprofile_stats.h linux-2.6.32.14/drivers/oprofile/oprofile_stats.h 26734diff -urNp linux-2.6.32.15/drivers/oprofile/oprofile_stats.h linux-2.6.32.15/drivers/oprofile/oprofile_stats.h
26723--- linux-2.6.32.14/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400 26735--- linux-2.6.32.15/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400
26724+++ linux-2.6.32.14/drivers/oprofile/oprofile_stats.h 2010-05-28 21:27:15.718942362 -0400 26736+++ linux-2.6.32.15/drivers/oprofile/oprofile_stats.h 2010-05-28 21:27:15.718942362 -0400
26725@@ -13,11 +13,11 @@ 26737@@ -13,11 +13,11 @@
26726 #include <asm/atomic.h> 26738 #include <asm/atomic.h>
26727 26739
@@ -26739,9 +26751,9 @@ diff -urNp linux-2.6.32.14/drivers/oprofile/oprofile_stats.h linux-2.6.32.14/dri
26739 }; 26751 };
26740 26752
26741 extern struct oprofile_stat_struct oprofile_stats; 26753 extern struct oprofile_stat_struct oprofile_stats;
26742diff -urNp linux-2.6.32.14/drivers/parisc/pdc_stable.c linux-2.6.32.14/drivers/parisc/pdc_stable.c 26754diff -urNp linux-2.6.32.15/drivers/parisc/pdc_stable.c linux-2.6.32.15/drivers/parisc/pdc_stable.c
26743--- linux-2.6.32.14/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400 26755--- linux-2.6.32.15/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400
26744+++ linux-2.6.32.14/drivers/parisc/pdc_stable.c 2010-05-28 21:27:15.727198333 -0400 26756+++ linux-2.6.32.15/drivers/parisc/pdc_stable.c 2010-05-28 21:27:15.727198333 -0400
26745@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj 26757@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
26746 return ret; 26758 return ret;
26747 } 26759 }
@@ -26751,9 +26763,9 @@ diff -urNp linux-2.6.32.14/drivers/parisc/pdc_stable.c linux-2.6.32.14/drivers/p
26751 .show = pdcspath_attr_show, 26763 .show = pdcspath_attr_show,
26752 .store = pdcspath_attr_store, 26764 .store = pdcspath_attr_store,
26753 }; 26765 };
26754diff -urNp linux-2.6.32.14/drivers/parport/procfs.c linux-2.6.32.14/drivers/parport/procfs.c 26766diff -urNp linux-2.6.32.15/drivers/parport/procfs.c linux-2.6.32.15/drivers/parport/procfs.c
26755--- linux-2.6.32.14/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400 26767--- linux-2.6.32.15/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400
26756+++ linux-2.6.32.14/drivers/parport/procfs.c 2010-05-28 21:27:15.727198333 -0400 26768+++ linux-2.6.32.15/drivers/parport/procfs.c 2010-05-28 21:27:15.727198333 -0400
26757@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t 26769@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
26758 26770
26759 *ppos += len; 26771 *ppos += len;
@@ -26772,9 +26784,9 @@ diff -urNp linux-2.6.32.14/drivers/parport/procfs.c linux-2.6.32.14/drivers/parp
26772 } 26784 }
26773 #endif /* IEEE1284.3 support. */ 26785 #endif /* IEEE1284.3 support. */
26774 26786
26775diff -urNp linux-2.6.32.14/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.14/drivers/pci/hotplug/acpiphp_glue.c 26787diff -urNp linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c
26776--- linux-2.6.32.14/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400 26788--- linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400
26777+++ linux-2.6.32.14/drivers/pci/hotplug/acpiphp_glue.c 2010-05-28 21:27:15.727198333 -0400 26789+++ linux-2.6.32.15/drivers/pci/hotplug/acpiphp_glue.c 2010-05-28 21:27:15.727198333 -0400
26778@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif 26790@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
26779 } 26791 }
26780 26792
@@ -26784,9 +26796,9 @@ diff -urNp linux-2.6.32.14/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.14/dr
26784 .handler = handle_hotplug_event_func, 26796 .handler = handle_hotplug_event_func,
26785 }; 26797 };
26786 26798
26787diff -urNp linux-2.6.32.14/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.14/drivers/pci/hotplug/cpqphp_nvram.c 26799diff -urNp linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c
26788--- linux-2.6.32.14/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400 26800--- linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400
26789+++ linux-2.6.32.14/drivers/pci/hotplug/cpqphp_nvram.c 2010-05-28 21:27:15.727198333 -0400 26801+++ linux-2.6.32.15/drivers/pci/hotplug/cpqphp_nvram.c 2010-05-28 21:27:15.727198333 -0400
26790@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ 26802@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
26791 26803
26792 void compaq_nvram_init (void __iomem *rom_start) 26804 void compaq_nvram_init (void __iomem *rom_start)
@@ -26801,9 +26813,9 @@ diff -urNp linux-2.6.32.14/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.14/dr
26801 dbg("int15 entry = %p\n", compaq_int15_entry_point); 26813 dbg("int15 entry = %p\n", compaq_int15_entry_point);
26802 26814
26803 /* initialize our int15 lock */ 26815 /* initialize our int15 lock */
26804diff -urNp linux-2.6.32.14/drivers/pci/hotplug/fakephp.c linux-2.6.32.14/drivers/pci/hotplug/fakephp.c 26816diff -urNp linux-2.6.32.15/drivers/pci/hotplug/fakephp.c linux-2.6.32.15/drivers/pci/hotplug/fakephp.c
26805--- linux-2.6.32.14/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400 26817--- linux-2.6.32.15/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400
26806+++ linux-2.6.32.14/drivers/pci/hotplug/fakephp.c 2010-05-28 21:27:15.727198333 -0400 26818+++ linux-2.6.32.15/drivers/pci/hotplug/fakephp.c 2010-05-28 21:27:15.727198333 -0400
26807@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec 26819@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
26808 } 26820 }
26809 26821
@@ -26813,9 +26825,9 @@ diff -urNp linux-2.6.32.14/drivers/pci/hotplug/fakephp.c linux-2.6.32.14/drivers
26813 .store = legacy_store, .show = legacy_show 26825 .store = legacy_store, .show = legacy_show
26814 }, 26826 },
26815 .release = &legacy_release, 26827 .release = &legacy_release,
26816diff -urNp linux-2.6.32.14/drivers/pci/intel-iommu.c linux-2.6.32.14/drivers/pci/intel-iommu.c 26828diff -urNp linux-2.6.32.15/drivers/pci/intel-iommu.c linux-2.6.32.15/drivers/pci/intel-iommu.c
26817--- linux-2.6.32.14/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400 26829--- linux-2.6.32.15/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400
26818+++ linux-2.6.32.14/drivers/pci/intel-iommu.c 2010-05-28 21:27:15.730990089 -0400 26830+++ linux-2.6.32.15/drivers/pci/intel-iommu.c 2010-05-28 21:27:15.730990089 -0400
26819@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de 26831@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de
26820 return !dma_addr; 26832 return !dma_addr;
26821 } 26833 }
@@ -26825,9 +26837,9 @@ diff -urNp linux-2.6.32.14/drivers/pci/intel-iommu.c linux-2.6.32.14/drivers/pci
26825 .alloc_coherent = intel_alloc_coherent, 26837 .alloc_coherent = intel_alloc_coherent,
26826 .free_coherent = intel_free_coherent, 26838 .free_coherent = intel_free_coherent,
26827 .map_sg = intel_map_sg, 26839 .map_sg = intel_map_sg,
26828diff -urNp linux-2.6.32.14/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.14/drivers/pci/pcie/portdrv_pci.c 26840diff -urNp linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c
26829--- linux-2.6.32.14/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400 26841--- linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400
26830+++ linux-2.6.32.14/drivers/pci/pcie/portdrv_pci.c 2010-05-28 21:27:15.730990089 -0400 26842+++ linux-2.6.32.15/drivers/pci/pcie/portdrv_pci.c 2010-05-28 21:27:15.730990089 -0400
26831@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru 26843@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru
26832 static const struct pci_device_id port_pci_ids[] = { { 26844 static const struct pci_device_id port_pci_ids[] = { {
26833 /* handle any PCI-Express port */ 26845 /* handle any PCI-Express port */
@@ -26837,9 +26849,9 @@ diff -urNp linux-2.6.32.14/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.14/driver
26837 }; 26849 };
26838 MODULE_DEVICE_TABLE(pci, port_pci_ids); 26850 MODULE_DEVICE_TABLE(pci, port_pci_ids);
26839 26851
26840diff -urNp linux-2.6.32.14/drivers/pci/probe.c linux-2.6.32.14/drivers/pci/probe.c 26852diff -urNp linux-2.6.32.15/drivers/pci/probe.c linux-2.6.32.15/drivers/pci/probe.c
26841--- linux-2.6.32.14/drivers/pci/probe.c 2010-03-15 11:52:04.000000000 -0400 26853--- linux-2.6.32.15/drivers/pci/probe.c 2010-03-15 11:52:04.000000000 -0400
26842+++ linux-2.6.32.14/drivers/pci/probe.c 2010-05-28 21:27:15.739209869 -0400 26854+++ linux-2.6.32.15/drivers/pci/probe.c 2010-05-28 21:27:15.739209869 -0400
26843@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( 26855@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
26844 return ret; 26856 return ret;
26845 } 26857 }
@@ -26857,9 +26869,9 @@ diff -urNp linux-2.6.32.14/drivers/pci/probe.c linux-2.6.32.14/drivers/pci/probe
26857 struct device_attribute *attr, 26869 struct device_attribute *attr,
26858 char *buf) 26870 char *buf)
26859 { 26871 {
26860diff -urNp linux-2.6.32.14/drivers/pci/proc.c linux-2.6.32.14/drivers/pci/proc.c 26872diff -urNp linux-2.6.32.15/drivers/pci/proc.c linux-2.6.32.15/drivers/pci/proc.c
26861--- linux-2.6.32.14/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400 26873--- linux-2.6.32.15/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400
26862+++ linux-2.6.32.14/drivers/pci/proc.c 2010-05-28 21:27:15.739209869 -0400 26874+++ linux-2.6.32.15/drivers/pci/proc.c 2010-05-28 21:27:15.739209869 -0400
26863@@ -480,7 +480,16 @@ static const struct file_operations proc 26875@@ -480,7 +480,16 @@ static const struct file_operations proc
26864 static int __init pci_proc_init(void) 26876 static int __init pci_proc_init(void)
26865 { 26877 {
@@ -26877,9 +26889,9 @@ diff -urNp linux-2.6.32.14/drivers/pci/proc.c linux-2.6.32.14/drivers/pci/proc.c
26877 proc_create("devices", 0, proc_bus_pci_dir, 26889 proc_create("devices", 0, proc_bus_pci_dir,
26878 &proc_bus_pci_dev_operations); 26890 &proc_bus_pci_dev_operations);
26879 proc_initialized = 1; 26891 proc_initialized = 1;
26880diff -urNp linux-2.6.32.14/drivers/pci/slot.c linux-2.6.32.14/drivers/pci/slot.c 26892diff -urNp linux-2.6.32.15/drivers/pci/slot.c linux-2.6.32.15/drivers/pci/slot.c
26881--- linux-2.6.32.14/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400 26893--- linux-2.6.32.15/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400
26882+++ linux-2.6.32.14/drivers/pci/slot.c 2010-05-28 21:27:15.739209869 -0400 26894+++ linux-2.6.32.15/drivers/pci/slot.c 2010-05-28 21:27:15.739209869 -0400
26883@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc 26895@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
26884 return attribute->store ? attribute->store(slot, buf, len) : -EIO; 26896 return attribute->store ? attribute->store(slot, buf, len) : -EIO;
26885 } 26897 }
@@ -26889,9 +26901,9 @@ diff -urNp linux-2.6.32.14/drivers/pci/slot.c linux-2.6.32.14/drivers/pci/slot.c
26889 .show = pci_slot_attr_show, 26901 .show = pci_slot_attr_show,
26890 .store = pci_slot_attr_store, 26902 .store = pci_slot_attr_store,
26891 }; 26903 };
26892diff -urNp linux-2.6.32.14/drivers/pcmcia/ti113x.h linux-2.6.32.14/drivers/pcmcia/ti113x.h 26904diff -urNp linux-2.6.32.15/drivers/pcmcia/ti113x.h linux-2.6.32.15/drivers/pcmcia/ti113x.h
26893--- linux-2.6.32.14/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400 26905--- linux-2.6.32.15/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400
26894+++ linux-2.6.32.14/drivers/pcmcia/ti113x.h 2010-05-28 21:27:15.743188935 -0400 26906+++ linux-2.6.32.15/drivers/pcmcia/ti113x.h 2010-05-28 21:27:15.743188935 -0400
26895@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl 26907@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
26896 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, 26908 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
26897 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), 26909 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
@@ -26901,9 +26913,9 @@ diff -urNp linux-2.6.32.14/drivers/pcmcia/ti113x.h linux-2.6.32.14/drivers/pcmci
26901 }; 26913 };
26902 26914
26903 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) 26915 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
26904diff -urNp linux-2.6.32.14/drivers/pcmcia/yenta_socket.c linux-2.6.32.14/drivers/pcmcia/yenta_socket.c 26916diff -urNp linux-2.6.32.15/drivers/pcmcia/yenta_socket.c linux-2.6.32.15/drivers/pcmcia/yenta_socket.c
26905--- linux-2.6.32.14/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400 26917--- linux-2.6.32.15/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400
26906+++ linux-2.6.32.14/drivers/pcmcia/yenta_socket.c 2010-05-28 21:27:15.751196243 -0400 26918+++ linux-2.6.32.15/drivers/pcmcia/yenta_socket.c 2010-05-28 21:27:15.751196243 -0400
26907@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table 26919@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
26908 26920
26909 /* match any cardbus bridge */ 26921 /* match any cardbus bridge */
@@ -26913,9 +26925,9 @@ diff -urNp linux-2.6.32.14/drivers/pcmcia/yenta_socket.c linux-2.6.32.14/drivers
26913 }; 26925 };
26914 MODULE_DEVICE_TABLE(pci, yenta_table); 26926 MODULE_DEVICE_TABLE(pci, yenta_table);
26915 26927
26916diff -urNp linux-2.6.32.14/drivers/platform/x86/acer-wmi.c linux-2.6.32.14/drivers/platform/x86/acer-wmi.c 26928diff -urNp linux-2.6.32.15/drivers/platform/x86/acer-wmi.c linux-2.6.32.15/drivers/platform/x86/acer-wmi.c
26917--- linux-2.6.32.14/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400 26929--- linux-2.6.32.15/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400
26918+++ linux-2.6.32.14/drivers/platform/x86/acer-wmi.c 2010-05-28 21:27:15.759196972 -0400 26930+++ linux-2.6.32.15/drivers/platform/x86/acer-wmi.c 2010-05-28 21:27:15.759196972 -0400
26919@@ -918,7 +918,7 @@ static int update_bl_status(struct backl 26931@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
26920 return 0; 26932 return 0;
26921 } 26933 }
@@ -26925,9 +26937,9 @@ diff -urNp linux-2.6.32.14/drivers/platform/x86/acer-wmi.c linux-2.6.32.14/drive
26925 .get_brightness = read_brightness, 26937 .get_brightness = read_brightness,
26926 .update_status = update_bl_status, 26938 .update_status = update_bl_status,
26927 }; 26939 };
26928diff -urNp linux-2.6.32.14/drivers/platform/x86/asus_acpi.c linux-2.6.32.14/drivers/platform/x86/asus_acpi.c 26940diff -urNp linux-2.6.32.15/drivers/platform/x86/asus_acpi.c linux-2.6.32.15/drivers/platform/x86/asus_acpi.c
26929--- linux-2.6.32.14/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400 26941--- linux-2.6.32.15/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400
26930+++ linux-2.6.32.14/drivers/platform/x86/asus_acpi.c 2010-05-28 21:27:15.759196972 -0400 26942+++ linux-2.6.32.15/drivers/platform/x86/asus_acpi.c 2010-05-28 21:27:15.759196972 -0400
26931@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ 26943@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
26932 return 0; 26944 return 0;
26933 } 26945 }
@@ -26937,9 +26949,9 @@ diff -urNp linux-2.6.32.14/drivers/platform/x86/asus_acpi.c linux-2.6.32.14/driv
26937 .get_brightness = read_brightness, 26949 .get_brightness = read_brightness,
26938 .update_status = set_brightness_status, 26950 .update_status = set_brightness_status,
26939 }; 26951 };
26940diff -urNp linux-2.6.32.14/drivers/platform/x86/asus-laptop.c linux-2.6.32.14/drivers/platform/x86/asus-laptop.c 26952diff -urNp linux-2.6.32.15/drivers/platform/x86/asus-laptop.c linux-2.6.32.15/drivers/platform/x86/asus-laptop.c
26941--- linux-2.6.32.14/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400 26953--- linux-2.6.32.15/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400
26942+++ linux-2.6.32.14/drivers/platform/x86/asus-laptop.c 2010-05-28 21:27:15.759196972 -0400 26954+++ linux-2.6.32.15/drivers/platform/x86/asus-laptop.c 2010-05-28 21:27:15.759196972 -0400
26943@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac 26955@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
26944 */ 26956 */
26945 static int read_brightness(struct backlight_device *bd); 26957 static int read_brightness(struct backlight_device *bd);
@@ -26949,9 +26961,9 @@ diff -urNp linux-2.6.32.14/drivers/platform/x86/asus-laptop.c linux-2.6.32.14/dr
26949 .get_brightness = read_brightness, 26961 .get_brightness = read_brightness,
26950 .update_status = update_bl_status, 26962 .update_status = update_bl_status,
26951 }; 26963 };
26952diff -urNp linux-2.6.32.14/drivers/platform/x86/compal-laptop.c linux-2.6.32.14/drivers/platform/x86/compal-laptop.c 26964diff -urNp linux-2.6.32.15/drivers/platform/x86/compal-laptop.c linux-2.6.32.15/drivers/platform/x86/compal-laptop.c
26953--- linux-2.6.32.14/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400 26965--- linux-2.6.32.15/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400
26954+++ linux-2.6.32.14/drivers/platform/x86/compal-laptop.c 2010-05-28 21:27:15.759196972 -0400 26966+++ linux-2.6.32.15/drivers/platform/x86/compal-laptop.c 2010-05-28 21:27:15.759196972 -0400
26955@@ -163,7 +163,7 @@ static int bl_update_status(struct backl 26967@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
26956 return set_lcd_level(b->props.brightness); 26968 return set_lcd_level(b->props.brightness);
26957 } 26969 }
@@ -26961,9 +26973,9 @@ diff -urNp linux-2.6.32.14/drivers/platform/x86/compal-laptop.c linux-2.6.32.14/
26961 .get_brightness = bl_get_brightness, 26973 .get_brightness = bl_get_brightness,
26962 .update_status = bl_update_status, 26974 .update_status = bl_update_status,
26963 }; 26975 };
26964diff -urNp linux-2.6.32.14/drivers/platform/x86/dell-laptop.c linux-2.6.32.14/drivers/platform/x86/dell-laptop.c 26976diff -urNp linux-2.6.32.15/drivers/platform/x86/dell-laptop.c linux-2.6.32.15/drivers/platform/x86/dell-laptop.c
26965--- linux-2.6.32.14/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400 26977--- linux-2.6.32.15/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400
26966+++ linux-2.6.32.14/drivers/platform/x86/dell-laptop.c 2010-05-28 21:27:15.759196972 -0400 26978+++ linux-2.6.32.15/drivers/platform/x86/dell-laptop.c 2010-05-28 21:27:15.759196972 -0400
26967@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac 26979@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
26968 return buffer.output[1]; 26980 return buffer.output[1];
26969 } 26981 }
@@ -26973,9 +26985,9 @@ diff -urNp linux-2.6.32.14/drivers/platform/x86/dell-laptop.c linux-2.6.32.14/dr
26973 .get_brightness = dell_get_intensity, 26985 .get_brightness = dell_get_intensity,
26974 .update_status = dell_send_intensity, 26986 .update_status = dell_send_intensity,
26975 }; 26987 };
26976diff -urNp linux-2.6.32.14/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.14/drivers/platform/x86/eeepc-laptop.c 26988diff -urNp linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c
26977--- linux-2.6.32.14/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:38.317493070 -0400 26989--- linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:38.317493070 -0400
26978+++ linux-2.6.32.14/drivers/platform/x86/eeepc-laptop.c 2010-05-28 21:27:15.759196972 -0400 26990+++ linux-2.6.32.15/drivers/platform/x86/eeepc-laptop.c 2010-05-28 21:27:15.759196972 -0400
26979@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device 26991@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
26980 */ 26992 */
26981 static int read_brightness(struct backlight_device *bd); 26993 static int read_brightness(struct backlight_device *bd);
@@ -26985,9 +26997,9 @@ diff -urNp linux-2.6.32.14/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.14/d
26985 .get_brightness = read_brightness, 26997 .get_brightness = read_brightness,
26986 .update_status = update_bl_status, 26998 .update_status = update_bl_status,
26987 }; 26999 };
26988diff -urNp linux-2.6.32.14/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.14/drivers/platform/x86/fujitsu-laptop.c 27000diff -urNp linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c
26989--- linux-2.6.32.14/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400 27001--- linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400
26990+++ linux-2.6.32.14/drivers/platform/x86/fujitsu-laptop.c 2010-05-28 21:27:15.759196972 -0400 27002+++ linux-2.6.32.15/drivers/platform/x86/fujitsu-laptop.c 2010-05-28 21:27:15.759196972 -0400
26991@@ -436,7 +436,7 @@ static int bl_update_status(struct backl 27003@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
26992 return ret; 27004 return ret;
26993 } 27005 }
@@ -26997,9 +27009,9 @@ diff -urNp linux-2.6.32.14/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.14
26997 .get_brightness = bl_get_brightness, 27009 .get_brightness = bl_get_brightness,
26998 .update_status = bl_update_status, 27010 .update_status = bl_update_status,
26999 }; 27011 };
27000diff -urNp linux-2.6.32.14/drivers/platform/x86/msi-laptop.c linux-2.6.32.14/drivers/platform/x86/msi-laptop.c 27012diff -urNp linux-2.6.32.15/drivers/platform/x86/msi-laptop.c linux-2.6.32.15/drivers/platform/x86/msi-laptop.c
27001--- linux-2.6.32.14/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400 27013--- linux-2.6.32.15/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400
27002+++ linux-2.6.32.14/drivers/platform/x86/msi-laptop.c 2010-05-28 21:27:15.759196972 -0400 27014+++ linux-2.6.32.15/drivers/platform/x86/msi-laptop.c 2010-05-28 21:27:15.759196972 -0400
27003@@ -161,7 +161,7 @@ static int bl_update_status(struct backl 27015@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
27004 return set_lcd_level(b->props.brightness); 27016 return set_lcd_level(b->props.brightness);
27005 } 27017 }
@@ -27009,9 +27021,9 @@ diff -urNp linux-2.6.32.14/drivers/platform/x86/msi-laptop.c linux-2.6.32.14/dri
27009 .get_brightness = bl_get_brightness, 27021 .get_brightness = bl_get_brightness,
27010 .update_status = bl_update_status, 27022 .update_status = bl_update_status,
27011 }; 27023 };
27012diff -urNp linux-2.6.32.14/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.14/drivers/platform/x86/panasonic-laptop.c 27024diff -urNp linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c
27013--- linux-2.6.32.14/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400 27025--- linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400
27014+++ linux-2.6.32.14/drivers/platform/x86/panasonic-laptop.c 2010-05-28 21:27:15.759196972 -0400 27026+++ linux-2.6.32.15/drivers/platform/x86/panasonic-laptop.c 2010-05-28 21:27:15.759196972 -0400
27015@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh 27027@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
27016 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); 27028 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
27017 } 27029 }
@@ -27021,9 +27033,9 @@ diff -urNp linux-2.6.32.14/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.
27021 .get_brightness = bl_get, 27033 .get_brightness = bl_get,
27022 .update_status = bl_set_status, 27034 .update_status = bl_set_status,
27023 }; 27035 };
27024diff -urNp linux-2.6.32.14/drivers/platform/x86/sony-laptop.c linux-2.6.32.14/drivers/platform/x86/sony-laptop.c 27036diff -urNp linux-2.6.32.15/drivers/platform/x86/sony-laptop.c linux-2.6.32.15/drivers/platform/x86/sony-laptop.c
27025--- linux-2.6.32.14/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400 27037--- linux-2.6.32.15/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400
27026+++ linux-2.6.32.14/drivers/platform/x86/sony-laptop.c 2010-05-28 21:27:15.759196972 -0400 27038+++ linux-2.6.32.15/drivers/platform/x86/sony-laptop.c 2010-05-28 21:27:15.759196972 -0400
27027@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness 27039@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
27028 } 27040 }
27029 27041
@@ -27033,9 +27045,9 @@ diff -urNp linux-2.6.32.14/drivers/platform/x86/sony-laptop.c linux-2.6.32.14/dr
27033 .update_status = sony_backlight_update_status, 27045 .update_status = sony_backlight_update_status,
27034 .get_brightness = sony_backlight_get_brightness, 27046 .get_brightness = sony_backlight_get_brightness,
27035 }; 27047 };
27036diff -urNp linux-2.6.32.14/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.14/drivers/platform/x86/thinkpad_acpi.c 27048diff -urNp linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c
27037--- linux-2.6.32.14/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 17:49:38.333363657 -0400 27049--- linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 17:49:38.333363657 -0400
27038+++ linux-2.6.32.14/drivers/platform/x86/thinkpad_acpi.c 2010-05-28 21:27:15.763212426 -0400 27050+++ linux-2.6.32.15/drivers/platform/x86/thinkpad_acpi.c 2010-05-28 21:27:15.763212426 -0400
27039@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha 27051@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
27040 BACKLIGHT_UPDATE_HOTKEY); 27052 BACKLIGHT_UPDATE_HOTKEY);
27041 } 27053 }
@@ -27045,9 +27057,9 @@ diff -urNp linux-2.6.32.14/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.14/
27045 .get_brightness = brightness_get, 27057 .get_brightness = brightness_get,
27046 .update_status = brightness_update_status, 27058 .update_status = brightness_update_status,
27047 }; 27059 };
27048diff -urNp linux-2.6.32.14/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.14/drivers/platform/x86/toshiba_acpi.c 27060diff -urNp linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c
27049--- linux-2.6.32.14/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400 27061--- linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400
27050+++ linux-2.6.32.14/drivers/platform/x86/toshiba_acpi.c 2010-05-28 21:27:15.763212426 -0400 27062+++ linux-2.6.32.15/drivers/platform/x86/toshiba_acpi.c 2010-05-28 21:27:15.763212426 -0400
27051@@ -671,7 +671,7 @@ static acpi_status remove_device(void) 27063@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
27052 return AE_OK; 27064 return AE_OK;
27053 } 27065 }
@@ -27057,9 +27069,9 @@ diff -urNp linux-2.6.32.14/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.14/d
27057 .get_brightness = get_lcd, 27069 .get_brightness = get_lcd,
27058 .update_status = set_lcd_status, 27070 .update_status = set_lcd_status,
27059 }; 27071 };
27060diff -urNp linux-2.6.32.14/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.14/drivers/pnp/pnpbios/bioscalls.c 27072diff -urNp linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c
27061--- linux-2.6.32.14/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400 27073--- linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400
27062+++ linux-2.6.32.14/drivers/pnp/pnpbios/bioscalls.c 2010-05-28 21:27:15.763212426 -0400 27074+++ linux-2.6.32.15/drivers/pnp/pnpbios/bioscalls.c 2010-05-28 21:27:15.763212426 -0400
27063@@ -60,7 +60,7 @@ do { \ 27075@@ -60,7 +60,7 @@ do { \
27064 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ 27076 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
27065 } while(0) 27077 } while(0)
@@ -27116,9 +27128,9 @@ diff -urNp linux-2.6.32.14/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.14/drive
27116+ 27128+
27117+ pax_close_kernel(); 27129+ pax_close_kernel();
27118 } 27130 }
27119diff -urNp linux-2.6.32.14/drivers/pnp/quirks.c linux-2.6.32.14/drivers/pnp/quirks.c 27131diff -urNp linux-2.6.32.15/drivers/pnp/quirks.c linux-2.6.32.15/drivers/pnp/quirks.c
27120--- linux-2.6.32.14/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400 27132--- linux-2.6.32.15/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400
27121+++ linux-2.6.32.14/drivers/pnp/quirks.c 2010-05-28 21:27:15.763212426 -0400 27133+++ linux-2.6.32.15/drivers/pnp/quirks.c 2010-05-28 21:27:15.763212426 -0400
27122@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { 27134@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
27123 /* PnP resources that might overlap PCI BARs */ 27135 /* PnP resources that might overlap PCI BARs */
27124 {"PNP0c01", quirk_system_pci_resources}, 27136 {"PNP0c01", quirk_system_pci_resources},
@@ -27128,9 +27140,9 @@ diff -urNp linux-2.6.32.14/drivers/pnp/quirks.c linux-2.6.32.14/drivers/pnp/quir
27128 }; 27140 };
27129 27141
27130 void pnp_fixup_device(struct pnp_dev *dev) 27142 void pnp_fixup_device(struct pnp_dev *dev)
27131diff -urNp linux-2.6.32.14/drivers/pnp/resource.c linux-2.6.32.14/drivers/pnp/resource.c 27143diff -urNp linux-2.6.32.15/drivers/pnp/resource.c linux-2.6.32.15/drivers/pnp/resource.c
27132--- linux-2.6.32.14/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400 27144--- linux-2.6.32.15/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400
27133+++ linux-2.6.32.14/drivers/pnp/resource.c 2010-05-28 21:27:15.763212426 -0400 27145+++ linux-2.6.32.15/drivers/pnp/resource.c 2010-05-28 21:27:15.763212426 -0400
27134@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s 27146@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
27135 return 1; 27147 return 1;
27136 27148
@@ -27149,9 +27161,9 @@ diff -urNp linux-2.6.32.14/drivers/pnp/resource.c linux-2.6.32.14/drivers/pnp/re
27149 return 0; 27161 return 0;
27150 27162
27151 /* check if the resource is reserved */ 27163 /* check if the resource is reserved */
27152diff -urNp linux-2.6.32.14/drivers/s390/cio/qdio_perf.c linux-2.6.32.14/drivers/s390/cio/qdio_perf.c 27164diff -urNp linux-2.6.32.15/drivers/s390/cio/qdio_perf.c linux-2.6.32.15/drivers/s390/cio/qdio_perf.c
27153--- linux-2.6.32.14/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400 27165--- linux-2.6.32.15/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400
27154+++ linux-2.6.32.14/drivers/s390/cio/qdio_perf.c 2010-05-28 21:27:15.763212426 -0400 27166+++ linux-2.6.32.15/drivers/s390/cio/qdio_perf.c 2010-05-28 21:27:15.763212426 -0400
27155@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ 27167@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
27156 static int qdio_perf_proc_show(struct seq_file *m, void *v) 27168 static int qdio_perf_proc_show(struct seq_file *m, void *v)
27157 { 27169 {
@@ -27227,9 +27239,9 @@ diff -urNp linux-2.6.32.14/drivers/s390/cio/qdio_perf.c linux-2.6.32.14/drivers/
27227 seq_printf(m, "\n"); 27239 seq_printf(m, "\n");
27228 return 0; 27240 return 0;
27229 } 27241 }
27230diff -urNp linux-2.6.32.14/drivers/s390/cio/qdio_perf.h linux-2.6.32.14/drivers/s390/cio/qdio_perf.h 27242diff -urNp linux-2.6.32.15/drivers/s390/cio/qdio_perf.h linux-2.6.32.15/drivers/s390/cio/qdio_perf.h
27231--- linux-2.6.32.14/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400 27243--- linux-2.6.32.15/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400
27232+++ linux-2.6.32.14/drivers/s390/cio/qdio_perf.h 2010-05-28 21:27:15.763212426 -0400 27244+++ linux-2.6.32.15/drivers/s390/cio/qdio_perf.h 2010-05-28 21:27:15.763212426 -0400
27233@@ -13,46 +13,46 @@ 27245@@ -13,46 +13,46 @@
27234 27246
27235 struct qdio_perf_stats { 27247 struct qdio_perf_stats {
@@ -27302,9 +27314,9 @@ diff -urNp linux-2.6.32.14/drivers/s390/cio/qdio_perf.h linux-2.6.32.14/drivers/
27302 } 27314 }
27303 27315
27304 int qdio_setup_perf_stats(void); 27316 int qdio_setup_perf_stats(void);
27305diff -urNp linux-2.6.32.14/drivers/scsi/ipr.c linux-2.6.32.14/drivers/scsi/ipr.c 27317diff -urNp linux-2.6.32.15/drivers/scsi/ipr.c linux-2.6.32.15/drivers/scsi/ipr.c
27306--- linux-2.6.32.14/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400 27318--- linux-2.6.32.15/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400
27307+++ linux-2.6.32.14/drivers/scsi/ipr.c 2010-05-28 21:27:15.787650200 -0400 27319+++ linux-2.6.32.15/drivers/scsi/ipr.c 2010-05-28 21:27:15.787650200 -0400
27308@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q 27320@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
27309 return true; 27321 return true;
27310 } 27322 }
@@ -27314,9 +27326,9 @@ diff -urNp linux-2.6.32.14/drivers/scsi/ipr.c linux-2.6.32.14/drivers/scsi/ipr.c
27314 .phy_reset = ipr_ata_phy_reset, 27326 .phy_reset = ipr_ata_phy_reset,
27315 .hardreset = ipr_sata_reset, 27327 .hardreset = ipr_sata_reset,
27316 .post_internal_cmd = ipr_ata_post_internal, 27328 .post_internal_cmd = ipr_ata_post_internal,
27317diff -urNp linux-2.6.32.14/drivers/scsi/libfc/fc_exch.c linux-2.6.32.14/drivers/scsi/libfc/fc_exch.c 27329diff -urNp linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c
27318--- linux-2.6.32.14/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400 27330--- linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400
27319+++ linux-2.6.32.14/drivers/scsi/libfc/fc_exch.c 2010-05-28 21:27:15.795200668 -0400 27331+++ linux-2.6.32.15/drivers/scsi/libfc/fc_exch.c 2010-05-28 21:27:15.795200668 -0400
27320@@ -86,12 +86,12 @@ struct fc_exch_mgr { 27332@@ -86,12 +86,12 @@ struct fc_exch_mgr {
27321 * all together if not used XXX 27333 * all together if not used XXX
27322 */ 27334 */
@@ -27438,9 +27450,9 @@ diff -urNp linux-2.6.32.14/drivers/scsi/libfc/fc_exch.c linux-2.6.32.14/drivers/
27438 27450
27439 fc_frame_free(fp); 27451 fc_frame_free(fp);
27440 } 27452 }
27441diff -urNp linux-2.6.32.14/drivers/scsi/libsas/sas_ata.c linux-2.6.32.14/drivers/scsi/libsas/sas_ata.c 27453diff -urNp linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c
27442--- linux-2.6.32.14/drivers/scsi/libsas/sas_ata.c 2010-05-15 13:20:18.878584179 -0400 27454--- linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c 2010-05-15 13:20:18.878584179 -0400
27443+++ linux-2.6.32.14/drivers/scsi/libsas/sas_ata.c 2010-05-28 21:27:15.803426462 -0400 27455+++ linux-2.6.32.15/drivers/scsi/libsas/sas_ata.c 2010-05-28 21:27:15.803426462 -0400
27444@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l 27456@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
27445 } 27457 }
27446 } 27458 }
@@ -27450,9 +27462,9 @@ diff -urNp linux-2.6.32.14/drivers/scsi/libsas/sas_ata.c linux-2.6.32.14/drivers
27450 .phy_reset = sas_ata_phy_reset, 27462 .phy_reset = sas_ata_phy_reset,
27451 .post_internal_cmd = sas_ata_post_internal, 27463 .post_internal_cmd = sas_ata_post_internal,
27452 .qc_prep = ata_noop_qc_prep, 27464 .qc_prep = ata_noop_qc_prep,
27453diff -urNp linux-2.6.32.14/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.14/drivers/scsi/mpt2sas/mpt2sas_debug.h 27465diff -urNp linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h
27454--- linux-2.6.32.14/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-03-15 11:52:04.000000000 -0400 27466--- linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-03-15 11:52:04.000000000 -0400
27455+++ linux-2.6.32.14/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-05-28 21:27:15.803426462 -0400 27467+++ linux-2.6.32.15/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-05-28 21:27:15.803426462 -0400
27456@@ -79,7 +79,7 @@ 27468@@ -79,7 +79,7 @@
27457 CMD; \ 27469 CMD; \
27458 } 27470 }
@@ -27462,9 +27474,9 @@ diff -urNp linux-2.6.32.14/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.14/
27462 #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ 27474 #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
27463 27475
27464 27476
27465diff -urNp linux-2.6.32.14/drivers/scsi/scsi_logging.h linux-2.6.32.14/drivers/scsi/scsi_logging.h 27477diff -urNp linux-2.6.32.15/drivers/scsi/scsi_logging.h linux-2.6.32.15/drivers/scsi/scsi_logging.h
27466--- linux-2.6.32.14/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400 27478--- linux-2.6.32.15/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400
27467+++ linux-2.6.32.14/drivers/scsi/scsi_logging.h 2010-05-28 21:27:15.803426462 -0400 27479+++ linux-2.6.32.15/drivers/scsi/scsi_logging.h 2010-05-28 21:27:15.803426462 -0400
27468@@ -51,7 +51,7 @@ do { \ 27480@@ -51,7 +51,7 @@ do { \
27469 } while (0); \ 27481 } while (0); \
27470 } while (0) 27482 } while (0)
@@ -27474,9 +27486,9 @@ diff -urNp linux-2.6.32.14/drivers/scsi/scsi_logging.h linux-2.6.32.14/drivers/s
27474 #endif /* CONFIG_SCSI_LOGGING */ 27486 #endif /* CONFIG_SCSI_LOGGING */
27475 27487
27476 /* 27488 /*
27477diff -urNp linux-2.6.32.14/drivers/scsi/sg.c linux-2.6.32.14/drivers/scsi/sg.c 27489diff -urNp linux-2.6.32.15/drivers/scsi/sg.c linux-2.6.32.15/drivers/scsi/sg.c
27478--- linux-2.6.32.14/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400 27490--- linux-2.6.32.15/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400
27479+++ linux-2.6.32.14/drivers/scsi/sg.c 2010-05-28 21:27:15.803426462 -0400 27491+++ linux-2.6.32.15/drivers/scsi/sg.c 2010-05-28 21:27:15.803426462 -0400
27480@@ -2292,7 +2292,7 @@ struct sg_proc_leaf { 27492@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
27481 const struct file_operations * fops; 27493 const struct file_operations * fops;
27482 }; 27494 };
@@ -27495,9 +27507,9 @@ diff -urNp linux-2.6.32.14/drivers/scsi/sg.c linux-2.6.32.14/drivers/scsi/sg.c
27495 27507
27496 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); 27508 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
27497 if (!sg_proc_sgp) 27509 if (!sg_proc_sgp)
27498diff -urNp linux-2.6.32.14/drivers/serial/8250_pci.c linux-2.6.32.14/drivers/serial/8250_pci.c 27510diff -urNp linux-2.6.32.15/drivers/serial/8250_pci.c linux-2.6.32.15/drivers/serial/8250_pci.c
27499--- linux-2.6.32.14/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400 27511--- linux-2.6.32.15/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400
27500+++ linux-2.6.32.14/drivers/serial/8250_pci.c 2010-05-28 21:27:15.803426462 -0400 27512+++ linux-2.6.32.15/drivers/serial/8250_pci.c 2010-05-28 21:27:15.803426462 -0400
27501@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t 27513@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
27502 PCI_ANY_ID, PCI_ANY_ID, 27514 PCI_ANY_ID, PCI_ANY_ID,
27503 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 27515 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
@@ -27507,9 +27519,9 @@ diff -urNp linux-2.6.32.14/drivers/serial/8250_pci.c linux-2.6.32.14/drivers/ser
27507 }; 27519 };
27508 27520
27509 static struct pci_driver serial_pci_driver = { 27521 static struct pci_driver serial_pci_driver = {
27510diff -urNp linux-2.6.32.14/drivers/serial/kgdboc.c linux-2.6.32.14/drivers/serial/kgdboc.c 27522diff -urNp linux-2.6.32.15/drivers/serial/kgdboc.c linux-2.6.32.15/drivers/serial/kgdboc.c
27511--- linux-2.6.32.14/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400 27523--- linux-2.6.32.15/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400
27512+++ linux-2.6.32.14/drivers/serial/kgdboc.c 2010-05-28 21:27:15.803426462 -0400 27524+++ linux-2.6.32.15/drivers/serial/kgdboc.c 2010-05-28 21:27:15.803426462 -0400
27513@@ -18,7 +18,7 @@ 27525@@ -18,7 +18,7 @@
27514 27526
27515 #define MAX_CONFIG_LEN 40 27527 #define MAX_CONFIG_LEN 40
@@ -27528,9 +27540,9 @@ diff -urNp linux-2.6.32.14/drivers/serial/kgdboc.c linux-2.6.32.14/drivers/seria
27528 .name = "kgdboc", 27540 .name = "kgdboc",
27529 .read_char = kgdboc_get_char, 27541 .read_char = kgdboc_get_char,
27530 .write_char = kgdboc_put_char, 27542 .write_char = kgdboc_put_char,
27531diff -urNp linux-2.6.32.14/drivers/staging/android/binder.c linux-2.6.32.14/drivers/staging/android/binder.c 27543diff -urNp linux-2.6.32.15/drivers/staging/android/binder.c linux-2.6.32.15/drivers/staging/android/binder.c
27532--- linux-2.6.32.14/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400 27544--- linux-2.6.32.15/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400
27533+++ linux-2.6.32.14/drivers/staging/android/binder.c 2010-05-28 21:27:15.815152627 -0400 27545+++ linux-2.6.32.15/drivers/staging/android/binder.c 2010-05-28 21:27:15.815152627 -0400
27534@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a 27546@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
27535 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); 27547 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
27536 } 27548 }
@@ -27540,9 +27552,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/android/binder.c linux-2.6.32.14/driv
27540 .open = binder_vma_open, 27552 .open = binder_vma_open,
27541 .close = binder_vma_close, 27553 .close = binder_vma_close,
27542 }; 27554 };
27543diff -urNp linux-2.6.32.14/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.14/drivers/staging/b3dfg/b3dfg.c 27555diff -urNp linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c
27544--- linux-2.6.32.14/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400 27556--- linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400
27545+++ linux-2.6.32.14/drivers/staging/b3dfg/b3dfg.c 2010-05-28 21:27:15.815152627 -0400 27557+++ linux-2.6.32.15/drivers/staging/b3dfg/b3dfg.c 2010-05-28 21:27:15.815152627 -0400
27546@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are 27558@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
27547 return VM_FAULT_NOPAGE; 27559 return VM_FAULT_NOPAGE;
27548 } 27560 }
@@ -27561,9 +27573,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.14/drivers
27561 .owner = THIS_MODULE, 27573 .owner = THIS_MODULE,
27562 .open = b3dfg_open, 27574 .open = b3dfg_open,
27563 .release = b3dfg_release, 27575 .release = b3dfg_release,
27564diff -urNp linux-2.6.32.14/drivers/staging/comedi/comedi_fops.c linux-2.6.32.14/drivers/staging/comedi/comedi_fops.c 27576diff -urNp linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c
27565--- linux-2.6.32.14/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400 27577--- linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400
27566+++ linux-2.6.32.14/drivers/staging/comedi/comedi_fops.c 2010-05-28 21:27:15.815152627 -0400 27578+++ linux-2.6.32.15/drivers/staging/comedi/comedi_fops.c 2010-05-28 21:27:15.815152627 -0400
27567@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct 27579@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
27568 mutex_unlock(&dev->mutex); 27580 mutex_unlock(&dev->mutex);
27569 } 27581 }
@@ -27573,9 +27585,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/comedi/comedi_fops.c linux-2.6.32.14/
27573 .close = comedi_unmap, 27585 .close = comedi_unmap,
27574 }; 27586 };
27575 27587
27576diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.14/drivers/staging/dream/qdsp5/adsp_driver.c 27588diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c
27577--- linux-2.6.32.14/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400 27589--- linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400
27578+++ linux-2.6.32.14/drivers/staging/dream/qdsp5/adsp_driver.c 2010-05-28 21:27:15.815152627 -0400 27590+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/adsp_driver.c 2010-05-28 21:27:15.815152627 -0400
27579@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi 27591@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
27580 static dev_t adsp_devno; 27592 static dev_t adsp_devno;
27581 static struct class *adsp_class; 27593 static struct class *adsp_class;
@@ -27585,9 +27597,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3
27585 .owner = THIS_MODULE, 27597 .owner = THIS_MODULE,
27586 .open = adsp_open, 27598 .open = adsp_open,
27587 .unlocked_ioctl = adsp_ioctl, 27599 .unlocked_ioctl = adsp_ioctl,
27588diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_aac.c 27600diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c
27589--- linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400 27601--- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400
27590+++ linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_aac.c 2010-05-28 21:27:15.819209681 -0400 27602+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_aac.c 2010-05-28 21:27:15.819209681 -0400
27591@@ -1022,7 +1022,7 @@ done: 27603@@ -1022,7 +1022,7 @@ done:
27592 return rc; 27604 return rc;
27593 } 27605 }
@@ -27597,9 +27609,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
27597 .owner = THIS_MODULE, 27609 .owner = THIS_MODULE,
27598 .open = audio_open, 27610 .open = audio_open,
27599 .release = audio_release, 27611 .release = audio_release,
27600diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_amrnb.c 27612diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c
27601--- linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400 27613--- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400
27602+++ linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-05-28 21:27:15.823076824 -0400 27614+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-05-28 21:27:15.823076824 -0400
27603@@ -833,7 +833,7 @@ done: 27615@@ -833,7 +833,7 @@ done:
27604 return rc; 27616 return rc;
27605 } 27617 }
@@ -27609,9 +27621,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
27609 .owner = THIS_MODULE, 27621 .owner = THIS_MODULE,
27610 .open = audamrnb_open, 27622 .open = audamrnb_open,
27611 .release = audamrnb_release, 27623 .release = audamrnb_release,
27612diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_evrc.c 27624diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c
27613--- linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400 27625--- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400
27614+++ linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_evrc.c 2010-05-28 21:27:15.823076824 -0400 27626+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_evrc.c 2010-05-28 21:27:15.823076824 -0400
27615@@ -805,7 +805,7 @@ dma_fail: 27627@@ -805,7 +805,7 @@ dma_fail:
27616 return rc; 27628 return rc;
27617 } 27629 }
@@ -27621,9 +27633,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32
27621 .owner = THIS_MODULE, 27633 .owner = THIS_MODULE,
27622 .open = audevrc_open, 27634 .open = audevrc_open,
27623 .release = audevrc_release, 27635 .release = audevrc_release,
27624diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_in.c 27636diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c
27625--- linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400 27637--- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400
27626+++ linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_in.c 2010-05-28 21:27:15.823076824 -0400 27638+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_in.c 2010-05-28 21:27:15.823076824 -0400
27627@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino 27639@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
27628 return 0; 27640 return 0;
27629 } 27641 }
@@ -27642,9 +27654,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.1
27642 .owner = THIS_MODULE, 27654 .owner = THIS_MODULE,
27643 .open = audpre_open, 27655 .open = audpre_open,
27644 .unlocked_ioctl = audpre_ioctl, 27656 .unlocked_ioctl = audpre_ioctl,
27645diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_mp3.c 27657diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c
27646--- linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400 27658--- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400
27647+++ linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_mp3.c 2010-05-28 21:27:15.823076824 -0400 27659+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_mp3.c 2010-05-28 21:27:15.823076824 -0400
27648@@ -941,7 +941,7 @@ done: 27660@@ -941,7 +941,7 @@ done:
27649 return rc; 27661 return rc;
27650 } 27662 }
@@ -27654,9 +27666,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
27654 .owner = THIS_MODULE, 27666 .owner = THIS_MODULE,
27655 .open = audio_open, 27667 .open = audio_open,
27656 .release = audio_release, 27668 .release = audio_release,
27657diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_out.c 27669diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c
27658--- linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400 27670--- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400
27659+++ linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_out.c 2010-05-28 21:27:15.823076824 -0400 27671+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_out.c 2010-05-28 21:27:15.823076824 -0400
27660@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod 27672@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
27661 return 0; 27673 return 0;
27662 } 27674 }
@@ -27675,9 +27687,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
27675 .owner = THIS_MODULE, 27687 .owner = THIS_MODULE,
27676 .open = audpp_open, 27688 .open = audpp_open,
27677 .unlocked_ioctl = audpp_ioctl, 27689 .unlocked_ioctl = audpp_ioctl,
27678diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_qcelp.c 27690diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c
27679--- linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400 27691--- linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400
27680+++ linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-05-28 21:27:15.841738212 -0400 27692+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-05-28 21:27:15.841738212 -0400
27681@@ -816,7 +816,7 @@ err: 27693@@ -816,7 +816,7 @@ err:
27682 return rc; 27694 return rc;
27683 } 27695 }
@@ -27687,9 +27699,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
27687 .owner = THIS_MODULE, 27699 .owner = THIS_MODULE,
27688 .open = audqcelp_open, 27700 .open = audqcelp_open,
27689 .release = audqcelp_release, 27701 .release = audqcelp_release,
27690diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.14/drivers/staging/dream/qdsp5/snd.c 27702diff -urNp linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c
27691--- linux-2.6.32.14/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400 27703--- linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400
27692+++ linux-2.6.32.14/drivers/staging/dream/qdsp5/snd.c 2010-05-28 21:27:15.841738212 -0400 27704+++ linux-2.6.32.15/drivers/staging/dream/qdsp5/snd.c 2010-05-28 21:27:15.841738212 -0400
27693@@ -242,7 +242,7 @@ err: 27705@@ -242,7 +242,7 @@ err:
27694 return rc; 27706 return rc;
27695 } 27707 }
@@ -27699,9 +27711,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.14/dri
27699 .owner = THIS_MODULE, 27711 .owner = THIS_MODULE,
27700 .open = snd_open, 27712 .open = snd_open,
27701 .release = snd_release, 27713 .release = snd_release,
27702diff -urNp linux-2.6.32.14/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.14/drivers/staging/dream/smd/smd_qmi.c 27714diff -urNp linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c
27703--- linux-2.6.32.14/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400 27715--- linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400
27704+++ linux-2.6.32.14/drivers/staging/dream/smd/smd_qmi.c 2010-05-28 21:27:15.841738212 -0400 27716+++ linux-2.6.32.15/drivers/staging/dream/smd/smd_qmi.c 2010-05-28 21:27:15.841738212 -0400
27705@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, 27717@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
27706 return 0; 27718 return 0;
27707 } 27719 }
@@ -27711,9 +27723,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.14/d
27711 .owner = THIS_MODULE, 27723 .owner = THIS_MODULE,
27712 .read = qmi_read, 27724 .read = qmi_read,
27713 .write = qmi_write, 27725 .write = qmi_write,
27714diff -urNp linux-2.6.32.14/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.14/drivers/staging/dream/smd/smd_rpcrouter_device.c 27726diff -urNp linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c
27715--- linux-2.6.32.14/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400 27727--- linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400
27716+++ linux-2.6.32.14/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-05-28 21:27:15.841738212 -0400 27728+++ linux-2.6.32.15/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-05-28 21:27:15.841738212 -0400
27717@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file 27729@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
27718 return rc; 27730 return rc;
27719 } 27731 }
@@ -27732,9 +27744,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
27732 .owner = THIS_MODULE, 27744 .owner = THIS_MODULE,
27733 .open = rpcrouter_open, 27745 .open = rpcrouter_open,
27734 .release = rpcrouter_release, 27746 .release = rpcrouter_release,
27735diff -urNp linux-2.6.32.14/drivers/staging/dst/dcore.c linux-2.6.32.14/drivers/staging/dst/dcore.c 27747diff -urNp linux-2.6.32.15/drivers/staging/dst/dcore.c linux-2.6.32.15/drivers/staging/dst/dcore.c
27736--- linux-2.6.32.14/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400 27748--- linux-2.6.32.15/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400
27737+++ linux-2.6.32.14/drivers/staging/dst/dcore.c 2010-05-28 21:27:15.841738212 -0400 27749+++ linux-2.6.32.15/drivers/staging/dst/dcore.c 2010-05-28 21:27:15.841738212 -0400
27738@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi 27750@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
27739 return 0; 27751 return 0;
27740 } 27752 }
@@ -27753,9 +27765,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/dst/dcore.c linux-2.6.32.14/drivers/s
27753 snprintf(n->name, sizeof(n->name), "%s", ctl->name); 27765 snprintf(n->name, sizeof(n->name), "%s", ctl->name);
27754 27766
27755 err = dst_node_sysfs_init(n); 27767 err = dst_node_sysfs_init(n);
27756diff -urNp linux-2.6.32.14/drivers/staging/dst/trans.c linux-2.6.32.14/drivers/staging/dst/trans.c 27768diff -urNp linux-2.6.32.15/drivers/staging/dst/trans.c linux-2.6.32.15/drivers/staging/dst/trans.c
27757--- linux-2.6.32.14/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400 27769--- linux-2.6.32.15/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400
27758+++ linux-2.6.32.14/drivers/staging/dst/trans.c 2010-05-28 21:27:15.842942312 -0400 27770+++ linux-2.6.32.15/drivers/staging/dst/trans.c 2010-05-28 21:27:15.842942312 -0400
27759@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, 27771@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
27760 t->error = 0; 27772 t->error = 0;
27761 t->retries = 0; 27773 t->retries = 0;
@@ -27765,9 +27777,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/dst/trans.c linux-2.6.32.14/drivers/s
27765 27777
27766 t->enc = bio_data_dir(bio); 27778 t->enc = bio_data_dir(bio);
27767 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); 27779 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
27768diff -urNp linux-2.6.32.14/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.14/drivers/staging/go7007/go7007-v4l2.c 27780diff -urNp linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c
27769--- linux-2.6.32.14/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400 27781--- linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400
27770+++ linux-2.6.32.14/drivers/staging/go7007/go7007-v4l2.c 2010-05-28 21:27:15.842942312 -0400 27782+++ linux-2.6.32.15/drivers/staging/go7007/go7007-v4l2.c 2010-05-28 21:27:15.842942312 -0400
27771@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are 27783@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
27772 return 0; 27784 return 0;
27773 } 27785 }
@@ -27777,9 +27789,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.14/
27777 .open = go7007_vm_open, 27789 .open = go7007_vm_open,
27778 .close = go7007_vm_close, 27790 .close = go7007_vm_close,
27779 .fault = go7007_vm_fault, 27791 .fault = go7007_vm_fault,
27780diff -urNp linux-2.6.32.14/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.14/drivers/staging/hv/blkvsc_drv.c 27792diff -urNp linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c
27781--- linux-2.6.32.14/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400 27793--- linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400
27782+++ linux-2.6.32.14/drivers/staging/hv/blkvsc_drv.c 2010-05-28 21:27:15.842942312 -0400 27794+++ linux-2.6.32.15/drivers/staging/hv/blkvsc_drv.c 2010-05-28 21:27:15.842942312 -0400
27783@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV 27795@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
27784 /* The one and only one */ 27796 /* The one and only one */
27785 static struct blkvsc_driver_context g_blkvsc_drv; 27797 static struct blkvsc_driver_context g_blkvsc_drv;
@@ -27789,9 +27801,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.14/drive
27789 .owner = THIS_MODULE, 27801 .owner = THIS_MODULE,
27790 .open = blkvsc_open, 27802 .open = blkvsc_open,
27791 .release = blkvsc_release, 27803 .release = blkvsc_release,
27792diff -urNp linux-2.6.32.14/drivers/staging/panel/panel.c linux-2.6.32.14/drivers/staging/panel/panel.c 27804diff -urNp linux-2.6.32.15/drivers/staging/panel/panel.c linux-2.6.32.15/drivers/staging/panel/panel.c
27793--- linux-2.6.32.14/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400 27805--- linux-2.6.32.15/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400
27794+++ linux-2.6.32.14/drivers/staging/panel/panel.c 2010-05-28 21:27:15.842942312 -0400 27806+++ linux-2.6.32.15/drivers/staging/panel/panel.c 2010-05-28 21:27:15.842942312 -0400
27795@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino 27807@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
27796 return 0; 27808 return 0;
27797 } 27809 }
@@ -27810,9 +27822,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/panel/panel.c linux-2.6.32.14/drivers
27810 .read = keypad_read, /* read */ 27822 .read = keypad_read, /* read */
27811 .open = keypad_open, /* open */ 27823 .open = keypad_open, /* open */
27812 .release = keypad_release, /* close */ 27824 .release = keypad_release, /* close */
27813diff -urNp linux-2.6.32.14/drivers/staging/phison/phison.c linux-2.6.32.14/drivers/staging/phison/phison.c 27825diff -urNp linux-2.6.32.15/drivers/staging/phison/phison.c linux-2.6.32.15/drivers/staging/phison/phison.c
27814--- linux-2.6.32.14/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400 27826--- linux-2.6.32.15/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400
27815+++ linux-2.6.32.14/drivers/staging/phison/phison.c 2010-05-28 21:27:15.842942312 -0400 27827+++ linux-2.6.32.15/drivers/staging/phison/phison.c 2010-05-28 21:27:15.842942312 -0400
27816@@ -43,7 +43,7 @@ static struct scsi_host_template phison_ 27828@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
27817 ATA_BMDMA_SHT(DRV_NAME), 27829 ATA_BMDMA_SHT(DRV_NAME),
27818 }; 27830 };
@@ -27822,9 +27834,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/phison/phison.c linux-2.6.32.14/drive
27822 .inherits = &ata_bmdma_port_ops, 27834 .inherits = &ata_bmdma_port_ops,
27823 .prereset = phison_pre_reset, 27835 .prereset = phison_pre_reset,
27824 }; 27836 };
27825diff -urNp linux-2.6.32.14/drivers/staging/poch/poch.c linux-2.6.32.14/drivers/staging/poch/poch.c 27837diff -urNp linux-2.6.32.15/drivers/staging/poch/poch.c linux-2.6.32.15/drivers/staging/poch/poch.c
27826--- linux-2.6.32.14/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400 27838--- linux-2.6.32.15/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400
27827+++ linux-2.6.32.14/drivers/staging/poch/poch.c 2010-05-28 21:27:15.842942312 -0400 27839+++ linux-2.6.32.15/drivers/staging/poch/poch.c 2010-05-28 21:27:15.842942312 -0400
27828@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod 27840@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
27829 return 0; 27841 return 0;
27830 } 27842 }
@@ -27834,9 +27846,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/poch/poch.c linux-2.6.32.14/drivers/s
27834 .owner = THIS_MODULE, 27846 .owner = THIS_MODULE,
27835 .open = poch_open, 27847 .open = poch_open,
27836 .release = poch_release, 27848 .release = poch_release,
27837diff -urNp linux-2.6.32.14/drivers/staging/pohmelfs/inode.c linux-2.6.32.14/drivers/staging/pohmelfs/inode.c 27849diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/inode.c linux-2.6.32.15/drivers/staging/pohmelfs/inode.c
27838--- linux-2.6.32.14/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400 27850--- linux-2.6.32.15/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400
27839+++ linux-2.6.32.14/drivers/staging/pohmelfs/inode.c 2010-05-28 21:27:15.842942312 -0400 27851+++ linux-2.6.32.15/drivers/staging/pohmelfs/inode.c 2010-05-28 21:27:15.842942312 -0400
27840@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su 27852@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
27841 mutex_init(&psb->mcache_lock); 27853 mutex_init(&psb->mcache_lock);
27842 psb->mcache_root = RB_ROOT; 27854 psb->mcache_root = RB_ROOT;
@@ -27846,9 +27858,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/pohmelfs/inode.c linux-2.6.32.14/driv
27846 27858
27847 psb->trans_max_pages = 100; 27859 psb->trans_max_pages = 100;
27848 27860
27849diff -urNp linux-2.6.32.14/drivers/staging/pohmelfs/mcache.c linux-2.6.32.14/drivers/staging/pohmelfs/mcache.c 27861diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c
27850--- linux-2.6.32.14/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400 27862--- linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400
27851+++ linux-2.6.32.14/drivers/staging/pohmelfs/mcache.c 2010-05-28 21:27:15.842942312 -0400 27863+++ linux-2.6.32.15/drivers/staging/pohmelfs/mcache.c 2010-05-28 21:27:15.842942312 -0400
27852@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ 27864@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
27853 m->data = data; 27865 m->data = data;
27854 m->start = start; 27866 m->start = start;
@@ -27858,9 +27870,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/pohmelfs/mcache.c linux-2.6.32.14/dri
27858 27870
27859 mutex_lock(&psb->mcache_lock); 27871 mutex_lock(&psb->mcache_lock);
27860 err = pohmelfs_mcache_insert(psb, m); 27872 err = pohmelfs_mcache_insert(psb, m);
27861diff -urNp linux-2.6.32.14/drivers/staging/pohmelfs/netfs.h linux-2.6.32.14/drivers/staging/pohmelfs/netfs.h 27873diff -urNp linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h
27862--- linux-2.6.32.14/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400 27874--- linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400
27863+++ linux-2.6.32.14/drivers/staging/pohmelfs/netfs.h 2010-05-28 21:27:15.846971345 -0400 27875+++ linux-2.6.32.15/drivers/staging/pohmelfs/netfs.h 2010-05-28 21:27:15.846971345 -0400
27864@@ -570,7 +570,7 @@ struct pohmelfs_config; 27876@@ -570,7 +570,7 @@ struct pohmelfs_config;
27865 struct pohmelfs_sb { 27877 struct pohmelfs_sb {
27866 struct rb_root mcache_root; 27878 struct rb_root mcache_root;
@@ -27870,9 +27882,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/pohmelfs/netfs.h linux-2.6.32.14/driv
27870 unsigned long mcache_timeout; 27882 unsigned long mcache_timeout;
27871 27883
27872 unsigned int idx; 27884 unsigned int idx;
27873diff -urNp linux-2.6.32.14/drivers/staging/sep/sep_driver.c linux-2.6.32.14/drivers/staging/sep/sep_driver.c 27885diff -urNp linux-2.6.32.15/drivers/staging/sep/sep_driver.c linux-2.6.32.15/drivers/staging/sep/sep_driver.c
27874--- linux-2.6.32.14/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400 27886--- linux-2.6.32.15/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400
27875+++ linux-2.6.32.14/drivers/staging/sep/sep_driver.c 2010-05-28 21:27:15.859198868 -0400 27887+++ linux-2.6.32.15/drivers/staging/sep/sep_driver.c 2010-05-28 21:27:15.859198868 -0400
27876@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver 27888@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
27877 static dev_t sep_devno; 27889 static dev_t sep_devno;
27878 27890
@@ -27882,9 +27894,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/sep/sep_driver.c linux-2.6.32.14/driv
27882 .owner = THIS_MODULE, 27894 .owner = THIS_MODULE,
27883 .ioctl = sep_ioctl, 27895 .ioctl = sep_ioctl,
27884 .poll = sep_poll, 27896 .poll = sep_poll,
27885diff -urNp linux-2.6.32.14/drivers/staging/vme/devices/vme_user.c linux-2.6.32.14/drivers/staging/vme/devices/vme_user.c 27897diff -urNp linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c
27886--- linux-2.6.32.14/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400 27898--- linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400
27887+++ linux-2.6.32.14/drivers/staging/vme/devices/vme_user.c 2010-05-28 21:27:15.859198868 -0400 27899+++ linux-2.6.32.15/drivers/staging/vme/devices/vme_user.c 2010-05-28 21:27:15.859198868 -0400
27888@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * 27900@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
27889 static int __init vme_user_probe(struct device *, int, int); 27901 static int __init vme_user_probe(struct device *, int, int);
27890 static int __exit vme_user_remove(struct device *, int, int); 27902 static int __exit vme_user_remove(struct device *, int, int);
@@ -27894,9 +27906,9 @@ diff -urNp linux-2.6.32.14/drivers/staging/vme/devices/vme_user.c linux-2.6.32.1
27894 .open = vme_user_open, 27906 .open = vme_user_open,
27895 .release = vme_user_release, 27907 .release = vme_user_release,
27896 .read = vme_user_read, 27908 .read = vme_user_read,
27897diff -urNp linux-2.6.32.14/drivers/uio/uio.c linux-2.6.32.14/drivers/uio/uio.c 27909diff -urNp linux-2.6.32.15/drivers/uio/uio.c linux-2.6.32.15/drivers/uio/uio.c
27898--- linux-2.6.32.14/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400 27910--- linux-2.6.32.15/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400
27899+++ linux-2.6.32.14/drivers/uio/uio.c 2010-05-28 21:27:15.859198868 -0400 27911+++ linux-2.6.32.15/drivers/uio/uio.c 2010-05-28 21:27:15.859198868 -0400
27900@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj 27912@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
27901 return entry->show(mem, buf); 27913 return entry->show(mem, buf);
27902 } 27914 }
@@ -27915,9 +27927,9 @@ diff -urNp linux-2.6.32.14/drivers/uio/uio.c linux-2.6.32.14/drivers/uio/uio.c
27915 .show = portio_type_show, 27927 .show = portio_type_show,
27916 }; 27928 };
27917 27929
27918diff -urNp linux-2.6.32.14/drivers/usb/atm/usbatm.c linux-2.6.32.14/drivers/usb/atm/usbatm.c 27930diff -urNp linux-2.6.32.15/drivers/usb/atm/usbatm.c linux-2.6.32.15/drivers/usb/atm/usbatm.c
27919--- linux-2.6.32.14/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400 27931--- linux-2.6.32.15/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400
27920+++ linux-2.6.32.14/drivers/usb/atm/usbatm.c 2010-05-28 21:27:15.859198868 -0400 27932+++ linux-2.6.32.15/drivers/usb/atm/usbatm.c 2010-05-28 21:27:15.859198868 -0400
27921@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru 27933@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
27922 if (printk_ratelimit()) 27934 if (printk_ratelimit())
27923 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", 27935 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -27997,9 +28009,9 @@ diff -urNp linux-2.6.32.14/drivers/usb/atm/usbatm.c linux-2.6.32.14/drivers/usb/
27997 28009
27998 if (!left--) { 28010 if (!left--) {
27999 if (instance->disconnected) 28011 if (instance->disconnected)
28000diff -urNp linux-2.6.32.14/drivers/usb/class/cdc-acm.c linux-2.6.32.14/drivers/usb/class/cdc-acm.c 28012diff -urNp linux-2.6.32.15/drivers/usb/class/cdc-acm.c linux-2.6.32.15/drivers/usb/class/cdc-acm.c
28001--- linux-2.6.32.14/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:38.389083173 -0400 28013--- linux-2.6.32.15/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:38.389083173 -0400
28002+++ linux-2.6.32.14/drivers/usb/class/cdc-acm.c 2010-05-28 21:27:15.867210979 -0400 28014+++ linux-2.6.32.15/drivers/usb/class/cdc-acm.c 2010-05-28 21:27:15.867210979 -0400
28003@@ -1535,7 +1535,7 @@ static struct usb_device_id acm_ids[] = 28015@@ -1535,7 +1535,7 @@ static struct usb_device_id acm_ids[] =
28004 USB_CDC_ACM_PROTO_AT_CDMA) }, 28016 USB_CDC_ACM_PROTO_AT_CDMA) },
28005 28017
@@ -28009,9 +28021,9 @@ diff -urNp linux-2.6.32.14/drivers/usb/class/cdc-acm.c linux-2.6.32.14/drivers/u
28009 }; 28021 };
28010 28022
28011 MODULE_DEVICE_TABLE(usb, acm_ids); 28023 MODULE_DEVICE_TABLE(usb, acm_ids);
28012diff -urNp linux-2.6.32.14/drivers/usb/class/usblp.c linux-2.6.32.14/drivers/usb/class/usblp.c 28024diff -urNp linux-2.6.32.15/drivers/usb/class/usblp.c linux-2.6.32.15/drivers/usb/class/usblp.c
28013--- linux-2.6.32.14/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400 28025--- linux-2.6.32.15/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400
28014+++ linux-2.6.32.14/drivers/usb/class/usblp.c 2010-05-28 21:27:15.875212570 -0400 28026+++ linux-2.6.32.15/drivers/usb/class/usblp.c 2010-05-28 21:27:15.875212570 -0400
28015@@ -228,7 +228,7 @@ static const struct quirk_printer_struct 28027@@ -228,7 +228,7 @@ static const struct quirk_printer_struct
28016 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ 28028 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
28017 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ 28029 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
@@ -28030,9 +28042,9 @@ diff -urNp linux-2.6.32.14/drivers/usb/class/usblp.c linux-2.6.32.14/drivers/usb
28030 }; 28042 };
28031 28043
28032 MODULE_DEVICE_TABLE (usb, usblp_ids); 28044 MODULE_DEVICE_TABLE (usb, usblp_ids);
28033diff -urNp linux-2.6.32.14/drivers/usb/core/hcd.c linux-2.6.32.14/drivers/usb/core/hcd.c 28045diff -urNp linux-2.6.32.15/drivers/usb/core/hcd.c linux-2.6.32.15/drivers/usb/core/hcd.c
28034--- linux-2.6.32.14/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400 28046--- linux-2.6.32.15/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400
28035+++ linux-2.6.32.14/drivers/usb/core/hcd.c 2010-05-28 21:27:15.887216714 -0400 28047+++ linux-2.6.32.15/drivers/usb/core/hcd.c 2010-05-28 21:27:15.887216714 -0400
28036@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd 28048@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
28037 28049
28038 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 28050 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -28051,9 +28063,9 @@ diff -urNp linux-2.6.32.14/drivers/usb/core/hcd.c linux-2.6.32.14/drivers/usb/co
28051 { 28063 {
28052 28064
28053 if (mon_ops) 28065 if (mon_ops)
28054diff -urNp linux-2.6.32.14/drivers/usb/core/hcd.h linux-2.6.32.14/drivers/usb/core/hcd.h 28066diff -urNp linux-2.6.32.15/drivers/usb/core/hcd.h linux-2.6.32.15/drivers/usb/core/hcd.h
28055--- linux-2.6.32.14/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400 28067--- linux-2.6.32.15/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400
28056+++ linux-2.6.32.14/drivers/usb/core/hcd.h 2010-05-28 21:27:15.887216714 -0400 28068+++ linux-2.6.32.15/drivers/usb/core/hcd.h 2010-05-28 21:27:15.887216714 -0400
28057@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { 28069@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
28058 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 28070 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
28059 28071
@@ -28081,9 +28093,9 @@ diff -urNp linux-2.6.32.14/drivers/usb/core/hcd.h linux-2.6.32.14/drivers/usb/co
28081 void usb_mon_deregister(void); 28093 void usb_mon_deregister(void);
28082 28094
28083 #else 28095 #else
28084diff -urNp linux-2.6.32.14/drivers/usb/core/hub.c linux-2.6.32.14/drivers/usb/core/hub.c 28096diff -urNp linux-2.6.32.15/drivers/usb/core/hub.c linux-2.6.32.15/drivers/usb/core/hub.c
28085--- linux-2.6.32.14/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400 28097--- linux-2.6.32.15/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400
28086+++ linux-2.6.32.14/drivers/usb/core/hub.c 2010-05-28 21:27:15.887216714 -0400 28098+++ linux-2.6.32.15/drivers/usb/core/hub.c 2010-05-28 21:27:15.887216714 -0400
28087@@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table 28099@@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table
28088 .bDeviceClass = USB_CLASS_HUB}, 28100 .bDeviceClass = USB_CLASS_HUB},
28089 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, 28101 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
@@ -28093,9 +28105,9 @@ diff -urNp linux-2.6.32.14/drivers/usb/core/hub.c linux-2.6.32.14/drivers/usb/co
28093 }; 28105 };
28094 28106
28095 MODULE_DEVICE_TABLE (usb, hub_id_table); 28107 MODULE_DEVICE_TABLE (usb, hub_id_table);
28096diff -urNp linux-2.6.32.14/drivers/usb/core/message.c linux-2.6.32.14/drivers/usb/core/message.c 28108diff -urNp linux-2.6.32.15/drivers/usb/core/message.c linux-2.6.32.15/drivers/usb/core/message.c
28097--- linux-2.6.32.14/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400 28109--- linux-2.6.32.15/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400
28098+++ linux-2.6.32.14/drivers/usb/core/message.c 2010-05-28 21:27:15.898958902 -0400 28110+++ linux-2.6.32.15/drivers/usb/core/message.c 2010-05-28 21:27:15.898958902 -0400
28099@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device 28111@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
28100 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); 28112 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
28101 if (buf) { 28113 if (buf) {
@@ -28107,9 +28119,9 @@ diff -urNp linux-2.6.32.14/drivers/usb/core/message.c linux-2.6.32.14/drivers/us
28107 if (!smallbuf) 28119 if (!smallbuf)
28108 return buf; 28120 return buf;
28109 memcpy(smallbuf, buf, len); 28121 memcpy(smallbuf, buf, len);
28110diff -urNp linux-2.6.32.14/drivers/usb/host/ehci-pci.c linux-2.6.32.14/drivers/usb/host/ehci-pci.c 28122diff -urNp linux-2.6.32.15/drivers/usb/host/ehci-pci.c linux-2.6.32.15/drivers/usb/host/ehci-pci.c
28111--- linux-2.6.32.14/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400 28123--- linux-2.6.32.15/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400
28112+++ linux-2.6.32.14/drivers/usb/host/ehci-pci.c 2010-05-28 21:27:15.898958902 -0400 28124+++ linux-2.6.32.15/drivers/usb/host/ehci-pci.c 2010-05-28 21:27:15.898958902 -0400
28113@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id 28125@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
28114 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), 28126 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
28115 .driver_data = (unsigned long) &ehci_pci_hc_driver, 28127 .driver_data = (unsigned long) &ehci_pci_hc_driver,
@@ -28119,9 +28131,9 @@ diff -urNp linux-2.6.32.14/drivers/usb/host/ehci-pci.c linux-2.6.32.14/drivers/u
28119 }; 28131 };
28120 MODULE_DEVICE_TABLE(pci, pci_ids); 28132 MODULE_DEVICE_TABLE(pci, pci_ids);
28121 28133
28122diff -urNp linux-2.6.32.14/drivers/usb/host/uhci-hcd.c linux-2.6.32.14/drivers/usb/host/uhci-hcd.c 28134diff -urNp linux-2.6.32.15/drivers/usb/host/uhci-hcd.c linux-2.6.32.15/drivers/usb/host/uhci-hcd.c
28123--- linux-2.6.32.14/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400 28135--- linux-2.6.32.15/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400
28124+++ linux-2.6.32.14/drivers/usb/host/uhci-hcd.c 2010-05-28 21:27:15.903225521 -0400 28136+++ linux-2.6.32.15/drivers/usb/host/uhci-hcd.c 2010-05-28 21:27:15.903225521 -0400
28125@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p 28137@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
28126 /* handle any USB UHCI controller */ 28138 /* handle any USB UHCI controller */
28127 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), 28139 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -28131,9 +28143,9 @@ diff -urNp linux-2.6.32.14/drivers/usb/host/uhci-hcd.c linux-2.6.32.14/drivers/u
28131 }; 28143 };
28132 28144
28133 MODULE_DEVICE_TABLE(pci, uhci_pci_ids); 28145 MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
28134diff -urNp linux-2.6.32.14/drivers/usb/misc/appledisplay.c linux-2.6.32.14/drivers/usb/misc/appledisplay.c 28146diff -urNp linux-2.6.32.15/drivers/usb/misc/appledisplay.c linux-2.6.32.15/drivers/usb/misc/appledisplay.c
28135--- linux-2.6.32.14/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400 28147--- linux-2.6.32.15/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400
28136+++ linux-2.6.32.14/drivers/usb/misc/appledisplay.c 2010-05-28 21:27:15.903225521 -0400 28148+++ linux-2.6.32.15/drivers/usb/misc/appledisplay.c 2010-05-28 21:27:15.903225521 -0400
28137@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes 28149@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
28138 return pdata->msgdata[1]; 28150 return pdata->msgdata[1];
28139 } 28151 }
@@ -28143,9 +28155,9 @@ diff -urNp linux-2.6.32.14/drivers/usb/misc/appledisplay.c linux-2.6.32.14/drive
28143 .get_brightness = appledisplay_bl_get_brightness, 28155 .get_brightness = appledisplay_bl_get_brightness,
28144 .update_status = appledisplay_bl_update_status, 28156 .update_status = appledisplay_bl_update_status,
28145 }; 28157 };
28146diff -urNp linux-2.6.32.14/drivers/usb/mon/mon_main.c linux-2.6.32.14/drivers/usb/mon/mon_main.c 28158diff -urNp linux-2.6.32.15/drivers/usb/mon/mon_main.c linux-2.6.32.15/drivers/usb/mon/mon_main.c
28147--- linux-2.6.32.14/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400 28159--- linux-2.6.32.15/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400
28148+++ linux-2.6.32.14/drivers/usb/mon/mon_main.c 2010-05-28 21:27:15.903225521 -0400 28160+++ linux-2.6.32.15/drivers/usb/mon/mon_main.c 2010-05-28 21:27:15.903225521 -0400
28149@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { 28161@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
28150 /* 28162 /*
28151 * Ops 28163 * Ops
@@ -28155,9 +28167,9 @@ diff -urNp linux-2.6.32.14/drivers/usb/mon/mon_main.c linux-2.6.32.14/drivers/us
28155 .urb_submit = mon_submit, 28167 .urb_submit = mon_submit,
28156 .urb_submit_error = mon_submit_error, 28168 .urb_submit_error = mon_submit_error,
28157 .urb_complete = mon_complete, 28169 .urb_complete = mon_complete,
28158diff -urNp linux-2.6.32.14/drivers/usb/storage/debug.h linux-2.6.32.14/drivers/usb/storage/debug.h 28170diff -urNp linux-2.6.32.15/drivers/usb/storage/debug.h linux-2.6.32.15/drivers/usb/storage/debug.h
28159--- linux-2.6.32.14/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400 28171--- linux-2.6.32.15/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400
28160+++ linux-2.6.32.14/drivers/usb/storage/debug.h 2010-05-28 21:27:15.903225521 -0400 28172+++ linux-2.6.32.15/drivers/usb/storage/debug.h 2010-05-28 21:27:15.903225521 -0400
28161@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char 28173@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
28162 #define US_DEBUGPX(x...) printk( x ) 28174 #define US_DEBUGPX(x...) printk( x )
28163 #define US_DEBUG(x) x 28175 #define US_DEBUG(x) x
@@ -28171,9 +28183,9 @@ diff -urNp linux-2.6.32.14/drivers/usb/storage/debug.h linux-2.6.32.14/drivers/u
28171 #endif 28183 #endif
28172 28184
28173 #endif 28185 #endif
28174diff -urNp linux-2.6.32.14/drivers/usb/storage/usb.c linux-2.6.32.14/drivers/usb/storage/usb.c 28186diff -urNp linux-2.6.32.15/drivers/usb/storage/usb.c linux-2.6.32.15/drivers/usb/storage/usb.c
28175--- linux-2.6.32.14/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400 28187--- linux-2.6.32.15/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400
28176+++ linux-2.6.32.14/drivers/usb/storage/usb.c 2010-05-28 21:27:15.915209208 -0400 28188+++ linux-2.6.32.15/drivers/usb/storage/usb.c 2010-05-28 21:27:15.915209208 -0400
28177@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l 28189@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
28178 28190
28179 static struct us_unusual_dev us_unusual_dev_list[] = { 28191 static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -28183,9 +28195,9 @@ diff -urNp linux-2.6.32.14/drivers/usb/storage/usb.c linux-2.6.32.14/drivers/usb
28183 }; 28195 };
28184 28196
28185 #undef UNUSUAL_DEV 28197 #undef UNUSUAL_DEV
28186diff -urNp linux-2.6.32.14/drivers/usb/storage/usual-tables.c linux-2.6.32.14/drivers/usb/storage/usual-tables.c 28198diff -urNp linux-2.6.32.15/drivers/usb/storage/usual-tables.c linux-2.6.32.15/drivers/usb/storage/usual-tables.c
28187--- linux-2.6.32.14/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400 28199--- linux-2.6.32.15/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400
28188+++ linux-2.6.32.14/drivers/usb/storage/usual-tables.c 2010-05-28 21:27:15.915209208 -0400 28200+++ linux-2.6.32.15/drivers/usb/storage/usual-tables.c 2010-05-28 21:27:15.915209208 -0400
28189@@ -48,7 +48,7 @@ 28201@@ -48,7 +48,7 @@
28190 28202
28191 struct usb_device_id usb_storage_usb_ids[] = { 28203 struct usb_device_id usb_storage_usb_ids[] = {
@@ -28195,9 +28207,9 @@ diff -urNp linux-2.6.32.14/drivers/usb/storage/usual-tables.c linux-2.6.32.14/dr
28195 }; 28207 };
28196 EXPORT_SYMBOL_GPL(usb_storage_usb_ids); 28208 EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
28197 28209
28198diff -urNp linux-2.6.32.14/drivers/uwb/wlp/messages.c linux-2.6.32.14/drivers/uwb/wlp/messages.c 28210diff -urNp linux-2.6.32.15/drivers/uwb/wlp/messages.c linux-2.6.32.15/drivers/uwb/wlp/messages.c
28199--- linux-2.6.32.14/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400 28211--- linux-2.6.32.15/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400
28200+++ linux-2.6.32.14/drivers/uwb/wlp/messages.c 2010-05-28 21:27:15.915209208 -0400 28212+++ linux-2.6.32.15/drivers/uwb/wlp/messages.c 2010-05-28 21:27:15.915209208 -0400
28201@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct 28213@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
28202 size_t len = skb->len; 28214 size_t len = skb->len;
28203 size_t used; 28215 size_t used;
@@ -28207,9 +28219,9 @@ diff -urNp linux-2.6.32.14/drivers/uwb/wlp/messages.c linux-2.6.32.14/drivers/uw
28207 enum wlp_assc_error assc_err; 28219 enum wlp_assc_error assc_err;
28208 char enonce_buf[WLP_WSS_NONCE_STRSIZE]; 28220 char enonce_buf[WLP_WSS_NONCE_STRSIZE];
28209 char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; 28221 char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
28210diff -urNp linux-2.6.32.14/drivers/uwb/wlp/sysfs.c linux-2.6.32.14/drivers/uwb/wlp/sysfs.c 28222diff -urNp linux-2.6.32.15/drivers/uwb/wlp/sysfs.c linux-2.6.32.15/drivers/uwb/wlp/sysfs.c
28211--- linux-2.6.32.14/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400 28223--- linux-2.6.32.15/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400
28212+++ linux-2.6.32.14/drivers/uwb/wlp/sysfs.c 2010-05-28 21:27:15.915209208 -0400 28224+++ linux-2.6.32.15/drivers/uwb/wlp/sysfs.c 2010-05-28 21:27:15.915209208 -0400
28213@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec 28225@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
28214 return ret; 28226 return ret;
28215 } 28227 }
@@ -28220,9 +28232,9 @@ diff -urNp linux-2.6.32.14/drivers/uwb/wlp/sysfs.c linux-2.6.32.14/drivers/uwb/w
28220 .show = wlp_wss_attr_show, 28232 .show = wlp_wss_attr_show,
28221 .store = wlp_wss_attr_store, 28233 .store = wlp_wss_attr_store,
28222 }; 28234 };
28223diff -urNp linux-2.6.32.14/drivers/video/atmel_lcdfb.c linux-2.6.32.14/drivers/video/atmel_lcdfb.c 28235diff -urNp linux-2.6.32.15/drivers/video/atmel_lcdfb.c linux-2.6.32.15/drivers/video/atmel_lcdfb.c
28224--- linux-2.6.32.14/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400 28236--- linux-2.6.32.15/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400
28225+++ linux-2.6.32.14/drivers/video/atmel_lcdfb.c 2010-05-28 21:27:15.915209208 -0400 28237+++ linux-2.6.32.15/drivers/video/atmel_lcdfb.c 2010-05-28 21:27:15.915209208 -0400
28226@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc 28238@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
28227 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); 28239 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
28228 } 28240 }
@@ -28232,9 +28244,9 @@ diff -urNp linux-2.6.32.14/drivers/video/atmel_lcdfb.c linux-2.6.32.14/drivers/v
28232 .update_status = atmel_bl_update_status, 28244 .update_status = atmel_bl_update_status,
28233 .get_brightness = atmel_bl_get_brightness, 28245 .get_brightness = atmel_bl_get_brightness,
28234 }; 28246 };
28235diff -urNp linux-2.6.32.14/drivers/video/aty/aty128fb.c linux-2.6.32.14/drivers/video/aty/aty128fb.c 28247diff -urNp linux-2.6.32.15/drivers/video/aty/aty128fb.c linux-2.6.32.15/drivers/video/aty/aty128fb.c
28236--- linux-2.6.32.14/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400 28248--- linux-2.6.32.15/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400
28237+++ linux-2.6.32.14/drivers/video/aty/aty128fb.c 2010-05-28 21:27:15.931199110 -0400 28249+++ linux-2.6.32.15/drivers/video/aty/aty128fb.c 2010-05-28 21:27:15.931199110 -0400
28238@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru 28250@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
28239 return bd->props.brightness; 28251 return bd->props.brightness;
28240 } 28252 }
@@ -28244,9 +28256,9 @@ diff -urNp linux-2.6.32.14/drivers/video/aty/aty128fb.c linux-2.6.32.14/drivers/
28244 .get_brightness = aty128_bl_get_brightness, 28256 .get_brightness = aty128_bl_get_brightness,
28245 .update_status = aty128_bl_update_status, 28257 .update_status = aty128_bl_update_status,
28246 }; 28258 };
28247diff -urNp linux-2.6.32.14/drivers/video/aty/atyfb_base.c linux-2.6.32.14/drivers/video/aty/atyfb_base.c 28259diff -urNp linux-2.6.32.15/drivers/video/aty/atyfb_base.c linux-2.6.32.15/drivers/video/aty/atyfb_base.c
28248--- linux-2.6.32.14/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400 28260--- linux-2.6.32.15/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400
28249+++ linux-2.6.32.14/drivers/video/aty/atyfb_base.c 2010-05-28 21:27:15.939052461 -0400 28261+++ linux-2.6.32.15/drivers/video/aty/atyfb_base.c 2010-05-28 21:27:15.939052461 -0400
28250@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct 28262@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
28251 return bd->props.brightness; 28263 return bd->props.brightness;
28252 } 28264 }
@@ -28256,9 +28268,9 @@ diff -urNp linux-2.6.32.14/drivers/video/aty/atyfb_base.c linux-2.6.32.14/driver
28256 .get_brightness = aty_bl_get_brightness, 28268 .get_brightness = aty_bl_get_brightness,
28257 .update_status = aty_bl_update_status, 28269 .update_status = aty_bl_update_status,
28258 }; 28270 };
28259diff -urNp linux-2.6.32.14/drivers/video/aty/radeon_backlight.c linux-2.6.32.14/drivers/video/aty/radeon_backlight.c 28271diff -urNp linux-2.6.32.15/drivers/video/aty/radeon_backlight.c linux-2.6.32.15/drivers/video/aty/radeon_backlight.c
28260--- linux-2.6.32.14/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400 28272--- linux-2.6.32.15/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400
28261+++ linux-2.6.32.14/drivers/video/aty/radeon_backlight.c 2010-05-28 21:27:15.939052461 -0400 28273+++ linux-2.6.32.15/drivers/video/aty/radeon_backlight.c 2010-05-28 21:27:15.939052461 -0400
28262@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru 28274@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
28263 return bd->props.brightness; 28275 return bd->props.brightness;
28264 } 28276 }
@@ -28268,9 +28280,9 @@ diff -urNp linux-2.6.32.14/drivers/video/aty/radeon_backlight.c linux-2.6.32.14/
28268 .get_brightness = radeon_bl_get_brightness, 28280 .get_brightness = radeon_bl_get_brightness,
28269 .update_status = radeon_bl_update_status, 28281 .update_status = radeon_bl_update_status,
28270 }; 28282 };
28271diff -urNp linux-2.6.32.14/drivers/video/backlight/adp5520_bl.c linux-2.6.32.14/drivers/video/backlight/adp5520_bl.c 28283diff -urNp linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c
28272--- linux-2.6.32.14/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400 28284--- linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400
28273+++ linux-2.6.32.14/drivers/video/backlight/adp5520_bl.c 2010-05-28 21:27:15.939052461 -0400 28285+++ linux-2.6.32.15/drivers/video/backlight/adp5520_bl.c 2010-05-28 21:27:15.939052461 -0400
28274@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str 28286@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
28275 return error ? data->current_brightness : reg_val; 28287 return error ? data->current_brightness : reg_val;
28276 } 28288 }
@@ -28280,9 +28292,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/adp5520_bl.c linux-2.6.32.14/
28280 .update_status = adp5520_bl_update_status, 28292 .update_status = adp5520_bl_update_status,
28281 .get_brightness = adp5520_bl_get_brightness, 28293 .get_brightness = adp5520_bl_get_brightness,
28282 }; 28294 };
28283diff -urNp linux-2.6.32.14/drivers/video/backlight/adx_bl.c linux-2.6.32.14/drivers/video/backlight/adx_bl.c 28295diff -urNp linux-2.6.32.15/drivers/video/backlight/adx_bl.c linux-2.6.32.15/drivers/video/backlight/adx_bl.c
28284--- linux-2.6.32.14/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400 28296--- linux-2.6.32.15/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400
28285+++ linux-2.6.32.14/drivers/video/backlight/adx_bl.c 2010-05-28 21:27:15.939052461 -0400 28297+++ linux-2.6.32.15/drivers/video/backlight/adx_bl.c 2010-05-28 21:27:15.939052461 -0400
28286@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct 28298@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
28287 return 1; 28299 return 1;
28288 } 28300 }
@@ -28292,9 +28304,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/adx_bl.c linux-2.6.32.14/driv
28292 .options = 0, 28304 .options = 0,
28293 .update_status = adx_backlight_update_status, 28305 .update_status = adx_backlight_update_status,
28294 .get_brightness = adx_backlight_get_brightness, 28306 .get_brightness = adx_backlight_get_brightness,
28295diff -urNp linux-2.6.32.14/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.14/drivers/video/backlight/atmel-pwm-bl.c 28307diff -urNp linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c
28296--- linux-2.6.32.14/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400 28308--- linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400
28297+++ linux-2.6.32.14/drivers/video/backlight/atmel-pwm-bl.c 2010-05-28 21:27:15.939052461 -0400 28309+++ linux-2.6.32.15/drivers/video/backlight/atmel-pwm-bl.c 2010-05-28 21:27:15.939052461 -0400
28298@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct 28310@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
28299 return pwm_channel_enable(&pwmbl->pwmc); 28311 return pwm_channel_enable(&pwmbl->pwmc);
28300 } 28312 }
@@ -28304,9 +28316,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.1
28304 .get_brightness = atmel_pwm_bl_get_intensity, 28316 .get_brightness = atmel_pwm_bl_get_intensity,
28305 .update_status = atmel_pwm_bl_set_intensity, 28317 .update_status = atmel_pwm_bl_set_intensity,
28306 }; 28318 };
28307diff -urNp linux-2.6.32.14/drivers/video/backlight/backlight.c linux-2.6.32.14/drivers/video/backlight/backlight.c 28319diff -urNp linux-2.6.32.15/drivers/video/backlight/backlight.c linux-2.6.32.15/drivers/video/backlight/backlight.c
28308--- linux-2.6.32.14/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400 28320--- linux-2.6.32.15/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400
28309+++ linux-2.6.32.14/drivers/video/backlight/backlight.c 2010-05-28 21:27:15.939052461 -0400 28321+++ linux-2.6.32.15/drivers/video/backlight/backlight.c 2010-05-28 21:27:15.939052461 -0400
28310@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); 28322@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
28311 * ERR_PTR() or a pointer to the newly allocated device. 28323 * ERR_PTR() or a pointer to the newly allocated device.
28312 */ 28324 */
@@ -28316,9 +28328,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/backlight.c linux-2.6.32.14/d
28316 { 28328 {
28317 struct backlight_device *new_bd; 28329 struct backlight_device *new_bd;
28318 int rc; 28330 int rc;
28319diff -urNp linux-2.6.32.14/drivers/video/backlight/corgi_lcd.c linux-2.6.32.14/drivers/video/backlight/corgi_lcd.c 28331diff -urNp linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c
28320--- linux-2.6.32.14/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400 28332--- linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400
28321+++ linux-2.6.32.14/drivers/video/backlight/corgi_lcd.c 2010-05-28 21:27:15.939052461 -0400 28333+++ linux-2.6.32.15/drivers/video/backlight/corgi_lcd.c 2010-05-28 21:27:15.939052461 -0400
28322@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit 28334@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
28323 } 28335 }
28324 EXPORT_SYMBOL(corgi_lcd_limit_intensity); 28336 EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -28328,9 +28340,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/corgi_lcd.c linux-2.6.32.14/d
28328 .get_brightness = corgi_bl_get_intensity, 28340 .get_brightness = corgi_bl_get_intensity,
28329 .update_status = corgi_bl_update_status, 28341 .update_status = corgi_bl_update_status,
28330 }; 28342 };
28331diff -urNp linux-2.6.32.14/drivers/video/backlight/cr_bllcd.c linux-2.6.32.14/drivers/video/backlight/cr_bllcd.c 28343diff -urNp linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c
28332--- linux-2.6.32.14/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400 28344--- linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400
28333+++ linux-2.6.32.14/drivers/video/backlight/cr_bllcd.c 2010-05-28 21:27:15.939052461 -0400 28345+++ linux-2.6.32.15/drivers/video/backlight/cr_bllcd.c 2010-05-28 21:27:15.939052461 -0400
28334@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st 28346@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
28335 return intensity; 28347 return intensity;
28336 } 28348 }
@@ -28340,9 +28352,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/cr_bllcd.c linux-2.6.32.14/dr
28340 .get_brightness = cr_backlight_get_intensity, 28352 .get_brightness = cr_backlight_get_intensity,
28341 .update_status = cr_backlight_set_intensity, 28353 .update_status = cr_backlight_set_intensity,
28342 }; 28354 };
28343diff -urNp linux-2.6.32.14/drivers/video/backlight/da903x_bl.c linux-2.6.32.14/drivers/video/backlight/da903x_bl.c 28355diff -urNp linux-2.6.32.15/drivers/video/backlight/da903x_bl.c linux-2.6.32.15/drivers/video/backlight/da903x_bl.c
28344--- linux-2.6.32.14/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400 28356--- linux-2.6.32.15/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400
28345+++ linux-2.6.32.14/drivers/video/backlight/da903x_bl.c 2010-05-28 21:27:15.939052461 -0400 28357+++ linux-2.6.32.15/drivers/video/backlight/da903x_bl.c 2010-05-28 21:27:15.939052461 -0400
28346@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne 28358@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
28347 return data->current_brightness; 28359 return data->current_brightness;
28348 } 28360 }
@@ -28352,9 +28364,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/da903x_bl.c linux-2.6.32.14/d
28352 .update_status = da903x_backlight_update_status, 28364 .update_status = da903x_backlight_update_status,
28353 .get_brightness = da903x_backlight_get_brightness, 28365 .get_brightness = da903x_backlight_get_brightness,
28354 }; 28366 };
28355diff -urNp linux-2.6.32.14/drivers/video/backlight/generic_bl.c linux-2.6.32.14/drivers/video/backlight/generic_bl.c 28367diff -urNp linux-2.6.32.15/drivers/video/backlight/generic_bl.c linux-2.6.32.15/drivers/video/backlight/generic_bl.c
28356--- linux-2.6.32.14/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400 28368--- linux-2.6.32.15/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400
28357+++ linux-2.6.32.14/drivers/video/backlight/generic_bl.c 2010-05-28 21:27:15.939052461 -0400 28369+++ linux-2.6.32.15/drivers/video/backlight/generic_bl.c 2010-05-28 21:27:15.939052461 -0400
28358@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) 28370@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
28359 } 28371 }
28360 EXPORT_SYMBOL(corgibl_limit_intensity); 28372 EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -28364,9 +28376,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/generic_bl.c linux-2.6.32.14/
28364 .options = BL_CORE_SUSPENDRESUME, 28376 .options = BL_CORE_SUSPENDRESUME,
28365 .get_brightness = genericbl_get_intensity, 28377 .get_brightness = genericbl_get_intensity,
28366 .update_status = genericbl_send_intensity, 28378 .update_status = genericbl_send_intensity,
28367diff -urNp linux-2.6.32.14/drivers/video/backlight/hp680_bl.c linux-2.6.32.14/drivers/video/backlight/hp680_bl.c 28379diff -urNp linux-2.6.32.15/drivers/video/backlight/hp680_bl.c linux-2.6.32.15/drivers/video/backlight/hp680_bl.c
28368--- linux-2.6.32.14/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400 28380--- linux-2.6.32.15/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400
28369+++ linux-2.6.32.14/drivers/video/backlight/hp680_bl.c 2010-05-28 21:27:15.939052461 -0400 28381+++ linux-2.6.32.15/drivers/video/backlight/hp680_bl.c 2010-05-28 21:27:15.939052461 -0400
28370@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct 28382@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
28371 return current_intensity; 28383 return current_intensity;
28372 } 28384 }
@@ -28376,9 +28388,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/hp680_bl.c linux-2.6.32.14/dr
28376 .get_brightness = hp680bl_get_intensity, 28388 .get_brightness = hp680bl_get_intensity,
28377 .update_status = hp680bl_set_intensity, 28389 .update_status = hp680bl_set_intensity,
28378 }; 28390 };
28379diff -urNp linux-2.6.32.14/drivers/video/backlight/jornada720_bl.c linux-2.6.32.14/drivers/video/backlight/jornada720_bl.c 28391diff -urNp linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c
28380--- linux-2.6.32.14/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400 28392--- linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400
28381+++ linux-2.6.32.14/drivers/video/backlight/jornada720_bl.c 2010-05-28 21:27:15.943207359 -0400 28393+++ linux-2.6.32.15/drivers/video/backlight/jornada720_bl.c 2010-05-28 21:27:15.943207359 -0400
28382@@ -93,7 +93,7 @@ out: 28394@@ -93,7 +93,7 @@ out:
28383 return ret; 28395 return ret;
28384 } 28396 }
@@ -28388,9 +28400,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/jornada720_bl.c linux-2.6.32.
28388 .get_brightness = jornada_bl_get_brightness, 28400 .get_brightness = jornada_bl_get_brightness,
28389 .update_status = jornada_bl_update_status, 28401 .update_status = jornada_bl_update_status,
28390 .options = BL_CORE_SUSPENDRESUME, 28402 .options = BL_CORE_SUSPENDRESUME,
28391diff -urNp linux-2.6.32.14/drivers/video/backlight/kb3886_bl.c linux-2.6.32.14/drivers/video/backlight/kb3886_bl.c 28403diff -urNp linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c
28392--- linux-2.6.32.14/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400 28404--- linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400
28393+++ linux-2.6.32.14/drivers/video/backlight/kb3886_bl.c 2010-05-28 21:27:15.943207359 -0400 28405+++ linux-2.6.32.15/drivers/video/backlight/kb3886_bl.c 2010-05-28 21:27:15.943207359 -0400
28394@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct 28406@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
28395 return kb3886bl_intensity; 28407 return kb3886bl_intensity;
28396 } 28408 }
@@ -28400,9 +28412,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/kb3886_bl.c linux-2.6.32.14/d
28400 .get_brightness = kb3886bl_get_intensity, 28412 .get_brightness = kb3886bl_get_intensity,
28401 .update_status = kb3886bl_send_intensity, 28413 .update_status = kb3886bl_send_intensity,
28402 }; 28414 };
28403diff -urNp linux-2.6.32.14/drivers/video/backlight/locomolcd.c linux-2.6.32.14/drivers/video/backlight/locomolcd.c 28415diff -urNp linux-2.6.32.15/drivers/video/backlight/locomolcd.c linux-2.6.32.15/drivers/video/backlight/locomolcd.c
28404--- linux-2.6.32.14/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400 28416--- linux-2.6.32.15/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400
28405+++ linux-2.6.32.14/drivers/video/backlight/locomolcd.c 2010-05-28 21:27:15.943207359 -0400 28417+++ linux-2.6.32.15/drivers/video/backlight/locomolcd.c 2010-05-28 21:27:15.943207359 -0400
28406@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc 28418@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
28407 return current_intensity; 28419 return current_intensity;
28408 } 28420 }
@@ -28412,9 +28424,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/locomolcd.c linux-2.6.32.14/d
28412 .get_brightness = locomolcd_get_intensity, 28424 .get_brightness = locomolcd_get_intensity,
28413 .update_status = locomolcd_set_intensity, 28425 .update_status = locomolcd_set_intensity,
28414 }; 28426 };
28415diff -urNp linux-2.6.32.14/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.14/drivers/video/backlight/mbp_nvidia_bl.c 28427diff -urNp linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c
28416--- linux-2.6.32.14/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:38.397382140 -0400 28428--- linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:38.397382140 -0400
28417+++ linux-2.6.32.14/drivers/video/backlight/mbp_nvidia_bl.c 2010-05-28 21:27:15.943207359 -0400 28429+++ linux-2.6.32.15/drivers/video/backlight/mbp_nvidia_bl.c 2010-05-28 21:27:15.943207359 -0400
28418@@ -33,7 +33,7 @@ struct dmi_match_data { 28430@@ -33,7 +33,7 @@ struct dmi_match_data {
28419 unsigned long iostart; 28431 unsigned long iostart;
28420 unsigned long iolen; 28432 unsigned long iolen;
@@ -28424,9 +28436,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
28424 }; 28436 };
28425 28437
28426 /* Module parameters. */ 28438 /* Module parameters. */
28427diff -urNp linux-2.6.32.14/drivers/video/backlight/omap1_bl.c linux-2.6.32.14/drivers/video/backlight/omap1_bl.c 28439diff -urNp linux-2.6.32.15/drivers/video/backlight/omap1_bl.c linux-2.6.32.15/drivers/video/backlight/omap1_bl.c
28428--- linux-2.6.32.14/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400 28440--- linux-2.6.32.15/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400
28429+++ linux-2.6.32.14/drivers/video/backlight/omap1_bl.c 2010-05-28 21:27:15.943207359 -0400 28441+++ linux-2.6.32.15/drivers/video/backlight/omap1_bl.c 2010-05-28 21:27:15.943207359 -0400
28430@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b 28442@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
28431 return bl->current_intensity; 28443 return bl->current_intensity;
28432 } 28444 }
@@ -28436,9 +28448,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/omap1_bl.c linux-2.6.32.14/dr
28436 .get_brightness = omapbl_get_intensity, 28448 .get_brightness = omapbl_get_intensity,
28437 .update_status = omapbl_update_status, 28449 .update_status = omapbl_update_status,
28438 }; 28450 };
28439diff -urNp linux-2.6.32.14/drivers/video/backlight/progear_bl.c linux-2.6.32.14/drivers/video/backlight/progear_bl.c 28451diff -urNp linux-2.6.32.15/drivers/video/backlight/progear_bl.c linux-2.6.32.15/drivers/video/backlight/progear_bl.c
28440--- linux-2.6.32.14/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400 28452--- linux-2.6.32.15/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400
28441+++ linux-2.6.32.14/drivers/video/backlight/progear_bl.c 2010-05-28 21:27:15.943207359 -0400 28453+++ linux-2.6.32.15/drivers/video/backlight/progear_bl.c 2010-05-28 21:27:15.943207359 -0400
28442@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc 28454@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
28443 return intensity - HW_LEVEL_MIN; 28455 return intensity - HW_LEVEL_MIN;
28444 } 28456 }
@@ -28448,9 +28460,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/progear_bl.c linux-2.6.32.14/
28448 .get_brightness = progearbl_get_intensity, 28460 .get_brightness = progearbl_get_intensity,
28449 .update_status = progearbl_set_intensity, 28461 .update_status = progearbl_set_intensity,
28450 }; 28462 };
28451diff -urNp linux-2.6.32.14/drivers/video/backlight/pwm_bl.c linux-2.6.32.14/drivers/video/backlight/pwm_bl.c 28463diff -urNp linux-2.6.32.15/drivers/video/backlight/pwm_bl.c linux-2.6.32.15/drivers/video/backlight/pwm_bl.c
28452--- linux-2.6.32.14/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400 28464--- linux-2.6.32.15/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400
28453+++ linux-2.6.32.14/drivers/video/backlight/pwm_bl.c 2010-05-28 21:27:15.943207359 -0400 28465+++ linux-2.6.32.15/drivers/video/backlight/pwm_bl.c 2010-05-28 21:27:15.943207359 -0400
28454@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( 28466@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
28455 return bl->props.brightness; 28467 return bl->props.brightness;
28456 } 28468 }
@@ -28460,9 +28472,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/pwm_bl.c linux-2.6.32.14/driv
28460 .update_status = pwm_backlight_update_status, 28472 .update_status = pwm_backlight_update_status,
28461 .get_brightness = pwm_backlight_get_brightness, 28473 .get_brightness = pwm_backlight_get_brightness,
28462 }; 28474 };
28463diff -urNp linux-2.6.32.14/drivers/video/backlight/tosa_bl.c linux-2.6.32.14/drivers/video/backlight/tosa_bl.c 28475diff -urNp linux-2.6.32.15/drivers/video/backlight/tosa_bl.c linux-2.6.32.15/drivers/video/backlight/tosa_bl.c
28464--- linux-2.6.32.14/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400 28476--- linux-2.6.32.15/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400
28465+++ linux-2.6.32.14/drivers/video/backlight/tosa_bl.c 2010-05-28 21:27:15.943207359 -0400 28477+++ linux-2.6.32.15/drivers/video/backlight/tosa_bl.c 2010-05-28 21:27:15.943207359 -0400
28466@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct 28478@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
28467 return props->brightness; 28479 return props->brightness;
28468 } 28480 }
@@ -28472,9 +28484,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/tosa_bl.c linux-2.6.32.14/dri
28472 .get_brightness = tosa_bl_get_brightness, 28484 .get_brightness = tosa_bl_get_brightness,
28473 .update_status = tosa_bl_update_status, 28485 .update_status = tosa_bl_update_status,
28474 }; 28486 };
28475diff -urNp linux-2.6.32.14/drivers/video/backlight/wm831x_bl.c linux-2.6.32.14/drivers/video/backlight/wm831x_bl.c 28487diff -urNp linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c
28476--- linux-2.6.32.14/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400 28488--- linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400
28477+++ linux-2.6.32.14/drivers/video/backlight/wm831x_bl.c 2010-05-28 21:27:15.943207359 -0400 28489+++ linux-2.6.32.15/drivers/video/backlight/wm831x_bl.c 2010-05-28 21:27:15.943207359 -0400
28478@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne 28490@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
28479 return data->current_brightness; 28491 return data->current_brightness;
28480 } 28492 }
@@ -28484,9 +28496,9 @@ diff -urNp linux-2.6.32.14/drivers/video/backlight/wm831x_bl.c linux-2.6.32.14/d
28484 .options = BL_CORE_SUSPENDRESUME, 28496 .options = BL_CORE_SUSPENDRESUME,
28485 .update_status = wm831x_backlight_update_status, 28497 .update_status = wm831x_backlight_update_status,
28486 .get_brightness = wm831x_backlight_get_brightness, 28498 .get_brightness = wm831x_backlight_get_brightness,
28487diff -urNp linux-2.6.32.14/drivers/video/bf54x-lq043fb.c linux-2.6.32.14/drivers/video/bf54x-lq043fb.c 28499diff -urNp linux-2.6.32.15/drivers/video/bf54x-lq043fb.c linux-2.6.32.15/drivers/video/bf54x-lq043fb.c
28488--- linux-2.6.32.14/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400 28500--- linux-2.6.32.15/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400
28489+++ linux-2.6.32.14/drivers/video/bf54x-lq043fb.c 2010-05-28 21:27:15.943207359 -0400 28501+++ linux-2.6.32.15/drivers/video/bf54x-lq043fb.c 2010-05-28 21:27:15.943207359 -0400
28490@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back 28502@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
28491 return 0; 28503 return 0;
28492 } 28504 }
@@ -28496,9 +28508,9 @@ diff -urNp linux-2.6.32.14/drivers/video/bf54x-lq043fb.c linux-2.6.32.14/drivers
28496 .get_brightness = bl_get_brightness, 28508 .get_brightness = bl_get_brightness,
28497 }; 28509 };
28498 28510
28499diff -urNp linux-2.6.32.14/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.14/drivers/video/bfin-t350mcqb-fb.c 28511diff -urNp linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c
28500--- linux-2.6.32.14/drivers/video/bfin-t350mcqb-fb.c 2010-05-28 20:16:44.454934408 -0400 28512--- linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c 2010-05-28 20:16:44.454934408 -0400
28501+++ linux-2.6.32.14/drivers/video/bfin-t350mcqb-fb.c 2010-05-28 21:27:15.943207359 -0400 28513+++ linux-2.6.32.15/drivers/video/bfin-t350mcqb-fb.c 2010-05-28 21:27:15.943207359 -0400
28502@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back 28514@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
28503 return 0; 28515 return 0;
28504 } 28516 }
@@ -28508,9 +28520,9 @@ diff -urNp linux-2.6.32.14/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.14/driv
28508 .get_brightness = bl_get_brightness, 28520 .get_brightness = bl_get_brightness,
28509 }; 28521 };
28510 28522
28511diff -urNp linux-2.6.32.14/drivers/video/fbcmap.c linux-2.6.32.14/drivers/video/fbcmap.c 28523diff -urNp linux-2.6.32.15/drivers/video/fbcmap.c linux-2.6.32.15/drivers/video/fbcmap.c
28512--- linux-2.6.32.14/drivers/video/fbcmap.c 2010-03-15 11:52:04.000000000 -0400 28524--- linux-2.6.32.15/drivers/video/fbcmap.c 2010-03-15 11:52:04.000000000 -0400
28513+++ linux-2.6.32.14/drivers/video/fbcmap.c 2010-05-28 21:27:15.943207359 -0400 28525+++ linux-2.6.32.15/drivers/video/fbcmap.c 2010-05-28 21:27:15.943207359 -0400
28514@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user 28526@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
28515 rc = -ENODEV; 28527 rc = -ENODEV;
28516 goto out; 28528 goto out;
@@ -28521,9 +28533,9 @@ diff -urNp linux-2.6.32.14/drivers/video/fbcmap.c linux-2.6.32.14/drivers/video/
28521 rc = -EINVAL; 28533 rc = -EINVAL;
28522 goto out1; 28534 goto out1;
28523 } 28535 }
28524diff -urNp linux-2.6.32.14/drivers/video/fbmem.c linux-2.6.32.14/drivers/video/fbmem.c 28536diff -urNp linux-2.6.32.15/drivers/video/fbmem.c linux-2.6.32.15/drivers/video/fbmem.c
28525--- linux-2.6.32.14/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400 28537--- linux-2.6.32.15/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400
28526+++ linux-2.6.32.14/drivers/video/fbmem.c 2010-05-28 21:27:15.947209363 -0400 28538+++ linux-2.6.32.15/drivers/video/fbmem.c 2010-05-28 21:27:15.947209363 -0400
28527@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in 28539@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
28528 image->dx += image->width + 8; 28540 image->dx += image->width + 8;
28529 } 28541 }
@@ -28551,9 +28563,9 @@ diff -urNp linux-2.6.32.14/drivers/video/fbmem.c linux-2.6.32.14/drivers/video/f
28551 return -EINVAL; 28563 return -EINVAL;
28552 if (!registered_fb[con2fb.framebuffer]) 28564 if (!registered_fb[con2fb.framebuffer])
28553 request_module("fb%d", con2fb.framebuffer); 28565 request_module("fb%d", con2fb.framebuffer);
28554diff -urNp linux-2.6.32.14/drivers/video/fbmon.c linux-2.6.32.14/drivers/video/fbmon.c 28566diff -urNp linux-2.6.32.15/drivers/video/fbmon.c linux-2.6.32.15/drivers/video/fbmon.c
28555--- linux-2.6.32.14/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400 28567--- linux-2.6.32.15/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400
28556+++ linux-2.6.32.14/drivers/video/fbmon.c 2010-05-28 21:27:15.947209363 -0400 28568+++ linux-2.6.32.15/drivers/video/fbmon.c 2010-05-28 21:27:15.947209363 -0400
28557@@ -45,7 +45,7 @@ 28569@@ -45,7 +45,7 @@
28558 #ifdef DEBUG 28570 #ifdef DEBUG
28559 #define DPRINTK(fmt, args...) printk(fmt,## args) 28571 #define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -28563,9 +28575,9 @@ diff -urNp linux-2.6.32.14/drivers/video/fbmon.c linux-2.6.32.14/drivers/video/f
28563 #endif 28575 #endif
28564 28576
28565 #define FBMON_FIX_HEADER 1 28577 #define FBMON_FIX_HEADER 1
28566diff -urNp linux-2.6.32.14/drivers/video/i810/i810_accel.c linux-2.6.32.14/drivers/video/i810/i810_accel.c 28578diff -urNp linux-2.6.32.15/drivers/video/i810/i810_accel.c linux-2.6.32.15/drivers/video/i810/i810_accel.c
28567--- linux-2.6.32.14/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400 28579--- linux-2.6.32.15/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400
28568+++ linux-2.6.32.14/drivers/video/i810/i810_accel.c 2010-05-28 21:27:15.947209363 -0400 28580+++ linux-2.6.32.15/drivers/video/i810/i810_accel.c 2010-05-28 21:27:15.947209363 -0400
28569@@ -73,6 +73,7 @@ static inline int wait_for_space(struct 28581@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
28570 } 28582 }
28571 } 28583 }
@@ -28574,9 +28586,9 @@ diff -urNp linux-2.6.32.14/drivers/video/i810/i810_accel.c linux-2.6.32.14/drive
28574 i810_report_error(mmio); 28586 i810_report_error(mmio);
28575 par->dev_flags |= LOCKUP; 28587 par->dev_flags |= LOCKUP;
28576 info->pixmap.scan_align = 1; 28588 info->pixmap.scan_align = 1;
28577diff -urNp linux-2.6.32.14/drivers/video/i810/i810_main.c linux-2.6.32.14/drivers/video/i810/i810_main.c 28589diff -urNp linux-2.6.32.15/drivers/video/i810/i810_main.c linux-2.6.32.15/drivers/video/i810/i810_main.c
28578--- linux-2.6.32.14/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400 28590--- linux-2.6.32.15/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400
28579+++ linux-2.6.32.14/drivers/video/i810/i810_main.c 2010-05-28 21:27:15.987994154 -0400 28591+++ linux-2.6.32.15/drivers/video/i810/i810_main.c 2010-05-28 21:27:15.987994154 -0400
28580@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t 28592@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
28581 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, 28593 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
28582 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, 28594 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -28586,9 +28598,9 @@ diff -urNp linux-2.6.32.14/drivers/video/i810/i810_main.c linux-2.6.32.14/driver
28586 }; 28598 };
28587 28599
28588 static struct pci_driver i810fb_driver = { 28600 static struct pci_driver i810fb_driver = {
28589diff -urNp linux-2.6.32.14/drivers/video/modedb.c linux-2.6.32.14/drivers/video/modedb.c 28601diff -urNp linux-2.6.32.15/drivers/video/modedb.c linux-2.6.32.15/drivers/video/modedb.c
28590--- linux-2.6.32.14/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400 28602--- linux-2.6.32.15/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400
28591+++ linux-2.6.32.14/drivers/video/modedb.c 2010-05-28 21:27:15.987994154 -0400 28603+++ linux-2.6.32.15/drivers/video/modedb.c 2010-05-28 21:27:15.987994154 -0400
28592@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ 28604@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
28593 { 28605 {
28594 /* 640x400 @ 70 Hz, 31.5 kHz hsync */ 28606 /* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -28889,9 +28901,9 @@ diff -urNp linux-2.6.32.14/drivers/video/modedb.c linux-2.6.32.14/drivers/video/
28889 }, 28901 },
28890 }; 28902 };
28891 28903
28892diff -urNp linux-2.6.32.14/drivers/video/nvidia/nv_backlight.c linux-2.6.32.14/drivers/video/nvidia/nv_backlight.c 28904diff -urNp linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c
28893--- linux-2.6.32.14/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400 28905--- linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400
28894+++ linux-2.6.32.14/drivers/video/nvidia/nv_backlight.c 2010-05-28 21:27:15.987994154 -0400 28906+++ linux-2.6.32.15/drivers/video/nvidia/nv_backlight.c 2010-05-28 21:27:15.987994154 -0400
28895@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru 28907@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
28896 return bd->props.brightness; 28908 return bd->props.brightness;
28897 } 28909 }
@@ -28901,9 +28913,9 @@ diff -urNp linux-2.6.32.14/drivers/video/nvidia/nv_backlight.c linux-2.6.32.14/d
28901 .get_brightness = nvidia_bl_get_brightness, 28913 .get_brightness = nvidia_bl_get_brightness,
28902 .update_status = nvidia_bl_update_status, 28914 .update_status = nvidia_bl_update_status,
28903 }; 28915 };
28904diff -urNp linux-2.6.32.14/drivers/video/riva/fbdev.c linux-2.6.32.14/drivers/video/riva/fbdev.c 28916diff -urNp linux-2.6.32.15/drivers/video/riva/fbdev.c linux-2.6.32.15/drivers/video/riva/fbdev.c
28905--- linux-2.6.32.14/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400 28917--- linux-2.6.32.15/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400
28906+++ linux-2.6.32.14/drivers/video/riva/fbdev.c 2010-05-28 21:27:15.987994154 -0400 28918+++ linux-2.6.32.15/drivers/video/riva/fbdev.c 2010-05-28 21:27:15.987994154 -0400
28907@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct 28919@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
28908 return bd->props.brightness; 28920 return bd->props.brightness;
28909 } 28921 }
@@ -28913,9 +28925,9 @@ diff -urNp linux-2.6.32.14/drivers/video/riva/fbdev.c linux-2.6.32.14/drivers/vi
28913 .get_brightness = riva_bl_get_brightness, 28925 .get_brightness = riva_bl_get_brightness,
28914 .update_status = riva_bl_update_status, 28926 .update_status = riva_bl_update_status,
28915 }; 28927 };
28916diff -urNp linux-2.6.32.14/drivers/video/uvesafb.c linux-2.6.32.14/drivers/video/uvesafb.c 28928diff -urNp linux-2.6.32.15/drivers/video/uvesafb.c linux-2.6.32.15/drivers/video/uvesafb.c
28917--- linux-2.6.32.14/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400 28929--- linux-2.6.32.15/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400
28918+++ linux-2.6.32.14/drivers/video/uvesafb.c 2010-05-28 21:27:15.987994154 -0400 28930+++ linux-2.6.32.15/drivers/video/uvesafb.c 2010-05-28 21:27:15.987994154 -0400
28919@@ -18,6 +18,7 @@ 28931@@ -18,6 +18,7 @@
28920 #include <linux/fb.h> 28932 #include <linux/fb.h>
28921 #include <linux/io.h> 28933 #include <linux/io.h>
@@ -28991,9 +29003,9 @@ diff -urNp linux-2.6.32.14/drivers/video/uvesafb.c linux-2.6.32.14/drivers/video
28991 } 29003 }
28992 29004
28993 framebuffer_release(info); 29005 framebuffer_release(info);
28994diff -urNp linux-2.6.32.14/drivers/video/vesafb.c linux-2.6.32.14/drivers/video/vesafb.c 29006diff -urNp linux-2.6.32.15/drivers/video/vesafb.c linux-2.6.32.15/drivers/video/vesafb.c
28995--- linux-2.6.32.14/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400 29007--- linux-2.6.32.15/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400
28996+++ linux-2.6.32.14/drivers/video/vesafb.c 2010-05-28 21:27:15.987994154 -0400 29008+++ linux-2.6.32.15/drivers/video/vesafb.c 2010-05-28 21:27:15.987994154 -0400
28997@@ -9,6 +9,7 @@ 29009@@ -9,6 +9,7 @@
28998 */ 29010 */
28999 29011
@@ -29097,9 +29109,9 @@ diff -urNp linux-2.6.32.14/drivers/video/vesafb.c linux-2.6.32.14/drivers/video/
29097 if (info->screen_base) 29109 if (info->screen_base)
29098 iounmap(info->screen_base); 29110 iounmap(info->screen_base);
29099 framebuffer_release(info); 29111 framebuffer_release(info);
29100diff -urNp linux-2.6.32.14/drivers/xen/sys-hypervisor.c linux-2.6.32.14/drivers/xen/sys-hypervisor.c 29112diff -urNp linux-2.6.32.15/drivers/xen/sys-hypervisor.c linux-2.6.32.15/drivers/xen/sys-hypervisor.c
29101--- linux-2.6.32.14/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400 29113--- linux-2.6.32.15/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400
29102+++ linux-2.6.32.14/drivers/xen/sys-hypervisor.c 2010-05-28 21:27:15.987994154 -0400 29114+++ linux-2.6.32.15/drivers/xen/sys-hypervisor.c 2010-05-28 21:27:15.987994154 -0400
29103@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko 29115@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
29104 return 0; 29116 return 0;
29105 } 29117 }
@@ -29109,9 +29121,9 @@ diff -urNp linux-2.6.32.14/drivers/xen/sys-hypervisor.c linux-2.6.32.14/drivers/
29109 .show = hyp_sysfs_show, 29121 .show = hyp_sysfs_show,
29110 .store = hyp_sysfs_store, 29122 .store = hyp_sysfs_store,
29111 }; 29123 };
29112diff -urNp linux-2.6.32.14/fs/9p/vfs_inode.c linux-2.6.32.14/fs/9p/vfs_inode.c 29124diff -urNp linux-2.6.32.15/fs/9p/vfs_inode.c linux-2.6.32.15/fs/9p/vfs_inode.c
29113--- linux-2.6.32.14/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400 29125--- linux-2.6.32.15/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400
29114+++ linux-2.6.32.14/fs/9p/vfs_inode.c 2010-05-28 21:27:15.987994154 -0400 29126+++ linux-2.6.32.15/fs/9p/vfs_inode.c 2010-05-28 21:27:15.987994154 -0400
29115@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct 29127@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
29116 static void 29128 static void
29117 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 29129 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -29121,9 +29133,9 @@ diff -urNp linux-2.6.32.14/fs/9p/vfs_inode.c linux-2.6.32.14/fs/9p/vfs_inode.c
29121 29133
29122 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, 29134 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
29123 IS_ERR(s) ? "<error>" : s); 29135 IS_ERR(s) ? "<error>" : s);
29124diff -urNp linux-2.6.32.14/fs/aio.c linux-2.6.32.14/fs/aio.c 29136diff -urNp linux-2.6.32.15/fs/aio.c linux-2.6.32.15/fs/aio.c
29125--- linux-2.6.32.14/fs/aio.c 2010-03-15 11:52:04.000000000 -0400 29137--- linux-2.6.32.15/fs/aio.c 2010-03-15 11:52:04.000000000 -0400
29126+++ linux-2.6.32.14/fs/aio.c 2010-05-28 21:27:15.995209124 -0400 29138+++ linux-2.6.32.15/fs/aio.c 2010-05-28 21:27:15.995209124 -0400
29127@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx 29139@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
29128 size += sizeof(struct io_event) * nr_events; 29140 size += sizeof(struct io_event) * nr_events;
29129 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; 29141 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -29133,9 +29145,9 @@ diff -urNp linux-2.6.32.14/fs/aio.c linux-2.6.32.14/fs/aio.c
29133 return -EINVAL; 29145 return -EINVAL;
29134 29146
29135 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); 29147 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
29136diff -urNp linux-2.6.32.14/fs/attr.c linux-2.6.32.14/fs/attr.c 29148diff -urNp linux-2.6.32.15/fs/attr.c linux-2.6.32.15/fs/attr.c
29137--- linux-2.6.32.14/fs/attr.c 2010-03-15 11:52:04.000000000 -0400 29149--- linux-2.6.32.15/fs/attr.c 2010-03-15 11:52:04.000000000 -0400
29138+++ linux-2.6.32.14/fs/attr.c 2010-05-28 21:27:15.995209124 -0400 29150+++ linux-2.6.32.15/fs/attr.c 2010-05-28 21:27:15.995209124 -0400
29139@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode 29151@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
29140 unsigned long limit; 29152 unsigned long limit;
29141 29153
@@ -29144,9 +29156,9 @@ diff -urNp linux-2.6.32.14/fs/attr.c linux-2.6.32.14/fs/attr.c
29144 if (limit != RLIM_INFINITY && offset > limit) 29156 if (limit != RLIM_INFINITY && offset > limit)
29145 goto out_sig; 29157 goto out_sig;
29146 if (offset > inode->i_sb->s_maxbytes) 29158 if (offset > inode->i_sb->s_maxbytes)
29147diff -urNp linux-2.6.32.14/fs/autofs/root.c linux-2.6.32.14/fs/autofs/root.c 29159diff -urNp linux-2.6.32.15/fs/autofs/root.c linux-2.6.32.15/fs/autofs/root.c
29148--- linux-2.6.32.14/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400 29160--- linux-2.6.32.15/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400
29149+++ linux-2.6.32.14/fs/autofs/root.c 2010-05-28 21:27:15.995209124 -0400 29161+++ linux-2.6.32.15/fs/autofs/root.c 2010-05-28 21:27:15.995209124 -0400
29150@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in 29162@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
29151 set_bit(n,sbi->symlink_bitmap); 29163 set_bit(n,sbi->symlink_bitmap);
29152 sl = &sbi->symlink[n]; 29164 sl = &sbi->symlink[n];
@@ -29157,9 +29169,9 @@ diff -urNp linux-2.6.32.14/fs/autofs/root.c linux-2.6.32.14/fs/autofs/root.c
29157 if (!sl->data) { 29169 if (!sl->data) {
29158 clear_bit(n,sbi->symlink_bitmap); 29170 clear_bit(n,sbi->symlink_bitmap);
29159 unlock_kernel(); 29171 unlock_kernel();
29160diff -urNp linux-2.6.32.14/fs/autofs4/symlink.c linux-2.6.32.14/fs/autofs4/symlink.c 29172diff -urNp linux-2.6.32.15/fs/autofs4/symlink.c linux-2.6.32.15/fs/autofs4/symlink.c
29161--- linux-2.6.32.14/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400 29173--- linux-2.6.32.15/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400
29162+++ linux-2.6.32.14/fs/autofs4/symlink.c 2010-05-28 21:27:15.995209124 -0400 29174+++ linux-2.6.32.15/fs/autofs4/symlink.c 2010-05-28 21:27:15.995209124 -0400
29163@@ -15,7 +15,7 @@ 29175@@ -15,7 +15,7 @@
29164 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) 29176 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
29165 { 29177 {
@@ -29169,9 +29181,9 @@ diff -urNp linux-2.6.32.14/fs/autofs4/symlink.c linux-2.6.32.14/fs/autofs4/symli
29169 return NULL; 29181 return NULL;
29170 } 29182 }
29171 29183
29172diff -urNp linux-2.6.32.14/fs/befs/linuxvfs.c linux-2.6.32.14/fs/befs/linuxvfs.c 29184diff -urNp linux-2.6.32.15/fs/befs/linuxvfs.c linux-2.6.32.15/fs/befs/linuxvfs.c
29173--- linux-2.6.32.14/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400 29185--- linux-2.6.32.15/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400
29174+++ linux-2.6.32.14/fs/befs/linuxvfs.c 2010-05-28 21:27:16.011217374 -0400 29186+++ linux-2.6.32.15/fs/befs/linuxvfs.c 2010-05-28 21:27:16.011217374 -0400
29175@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry 29187@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
29176 { 29188 {
29177 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); 29189 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -29181,9 +29193,9 @@ diff -urNp linux-2.6.32.14/fs/befs/linuxvfs.c linux-2.6.32.14/fs/befs/linuxvfs.c
29181 if (!IS_ERR(link)) 29193 if (!IS_ERR(link))
29182 kfree(link); 29194 kfree(link);
29183 } 29195 }
29184diff -urNp linux-2.6.32.14/fs/binfmt_aout.c linux-2.6.32.14/fs/binfmt_aout.c 29196diff -urNp linux-2.6.32.15/fs/binfmt_aout.c linux-2.6.32.15/fs/binfmt_aout.c
29185--- linux-2.6.32.14/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400 29197--- linux-2.6.32.15/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400
29186+++ linux-2.6.32.14/fs/binfmt_aout.c 2010-05-28 21:27:16.011217374 -0400 29198+++ linux-2.6.32.15/fs/binfmt_aout.c 2010-05-28 21:27:16.011217374 -0400
29187@@ -16,6 +16,7 @@ 29199@@ -16,6 +16,7 @@
29188 #include <linux/string.h> 29200 #include <linux/string.h>
29189 #include <linux/fs.h> 29201 #include <linux/fs.h>
@@ -29251,9 +29263,9 @@ diff -urNp linux-2.6.32.14/fs/binfmt_aout.c linux-2.6.32.14/fs/binfmt_aout.c
29251 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, 29263 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
29252 fd_offset + ex.a_text); 29264 fd_offset + ex.a_text);
29253 up_write(&current->mm->mmap_sem); 29265 up_write(&current->mm->mmap_sem);
29254diff -urNp linux-2.6.32.14/fs/binfmt_elf.c linux-2.6.32.14/fs/binfmt_elf.c 29266diff -urNp linux-2.6.32.15/fs/binfmt_elf.c linux-2.6.32.15/fs/binfmt_elf.c
29255--- linux-2.6.32.14/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 29267--- linux-2.6.32.15/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400
29256+++ linux-2.6.32.14/fs/binfmt_elf.c 2010-05-28 21:27:16.011217374 -0400 29268+++ linux-2.6.32.15/fs/binfmt_elf.c 2010-05-28 21:27:16.011217374 -0400
29257@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str 29269@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
29258 #define elf_core_dump NULL 29270 #define elf_core_dump NULL
29259 #endif 29271 #endif
@@ -29889,9 +29901,9 @@ diff -urNp linux-2.6.32.14/fs/binfmt_elf.c linux-2.6.32.14/fs/binfmt_elf.c
29889 static int __init init_elf_binfmt(void) 29901 static int __init init_elf_binfmt(void)
29890 { 29902 {
29891 return register_binfmt(&elf_format); 29903 return register_binfmt(&elf_format);
29892diff -urNp linux-2.6.32.14/fs/binfmt_flat.c linux-2.6.32.14/fs/binfmt_flat.c 29904diff -urNp linux-2.6.32.15/fs/binfmt_flat.c linux-2.6.32.15/fs/binfmt_flat.c
29893--- linux-2.6.32.14/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400 29905--- linux-2.6.32.15/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400
29894+++ linux-2.6.32.14/fs/binfmt_flat.c 2010-05-28 21:27:16.018905555 -0400 29906+++ linux-2.6.32.15/fs/binfmt_flat.c 2010-05-28 21:27:16.018905555 -0400
29895@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b 29907@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
29896 realdatastart = (unsigned long) -ENOMEM; 29908 realdatastart = (unsigned long) -ENOMEM;
29897 printk("Unable to allocate RAM for process data, errno %d\n", 29909 printk("Unable to allocate RAM for process data, errno %d\n",
@@ -29924,9 +29936,9 @@ diff -urNp linux-2.6.32.14/fs/binfmt_flat.c linux-2.6.32.14/fs/binfmt_flat.c
29924 ret = result; 29936 ret = result;
29925 goto err; 29937 goto err;
29926 } 29938 }
29927diff -urNp linux-2.6.32.14/fs/binfmt_misc.c linux-2.6.32.14/fs/binfmt_misc.c 29939diff -urNp linux-2.6.32.15/fs/binfmt_misc.c linux-2.6.32.15/fs/binfmt_misc.c
29928--- linux-2.6.32.14/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400 29940--- linux-2.6.32.15/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400
29929+++ linux-2.6.32.14/fs/binfmt_misc.c 2010-05-28 21:27:16.018905555 -0400 29941+++ linux-2.6.32.15/fs/binfmt_misc.c 2010-05-28 21:27:16.018905555 -0400
29930@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl 29942@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
29931 static struct tree_descr bm_files[] = { 29943 static struct tree_descr bm_files[] = {
29932 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, 29944 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -29936,9 +29948,9 @@ diff -urNp linux-2.6.32.14/fs/binfmt_misc.c linux-2.6.32.14/fs/binfmt_misc.c
29936 }; 29948 };
29937 int err = simple_fill_super(sb, 0x42494e4d, bm_files); 29949 int err = simple_fill_super(sb, 0x42494e4d, bm_files);
29938 if (!err) 29950 if (!err)
29939diff -urNp linux-2.6.32.14/fs/bio.c linux-2.6.32.14/fs/bio.c 29951diff -urNp linux-2.6.32.15/fs/bio.c linux-2.6.32.15/fs/bio.c
29940--- linux-2.6.32.14/fs/bio.c 2010-03-15 11:52:04.000000000 -0400 29952--- linux-2.6.32.15/fs/bio.c 2010-03-15 11:52:04.000000000 -0400
29941+++ linux-2.6.32.14/fs/bio.c 2010-05-28 21:27:16.018905555 -0400 29953+++ linux-2.6.32.15/fs/bio.c 2010-05-28 21:27:16.018905555 -0400
29942@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr 29954@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
29943 29955
29944 i = 0; 29956 i = 0;
@@ -29957,9 +29969,9 @@ diff -urNp linux-2.6.32.14/fs/bio.c linux-2.6.32.14/fs/bio.c
29957 29969
29958 __bio_for_each_segment(bvec, bio, i, 0) { 29970 __bio_for_each_segment(bvec, bio, i, 0) {
29959 char *addr = page_address(bvec->bv_page); 29971 char *addr = page_address(bvec->bv_page);
29960diff -urNp linux-2.6.32.14/fs/block_dev.c linux-2.6.32.14/fs/block_dev.c 29972diff -urNp linux-2.6.32.15/fs/block_dev.c linux-2.6.32.15/fs/block_dev.c
29961--- linux-2.6.32.14/fs/block_dev.c 2010-04-29 17:49:38.421500081 -0400 29973--- linux-2.6.32.15/fs/block_dev.c 2010-04-29 17:49:38.421500081 -0400
29962+++ linux-2.6.32.14/fs/block_dev.c 2010-05-28 21:27:16.030907926 -0400 29974+++ linux-2.6.32.15/fs/block_dev.c 2010-05-28 21:27:16.030907926 -0400
29963@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, 29975@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev,
29964 else if (bdev->bd_contains == bdev) 29976 else if (bdev->bd_contains == bdev)
29965 res = 0; /* is a whole device which isn't held */ 29977 res = 0; /* is a whole device which isn't held */
@@ -29969,9 +29981,9 @@ diff -urNp linux-2.6.32.14/fs/block_dev.c linux-2.6.32.14/fs/block_dev.c
29969 res = 0; /* is a partition of a device that is being partitioned */ 29981 res = 0; /* is a partition of a device that is being partitioned */
29970 else if (bdev->bd_contains->bd_holder != NULL) 29982 else if (bdev->bd_contains->bd_holder != NULL)
29971 res = -EBUSY; /* is a partition of a held device */ 29983 res = -EBUSY; /* is a partition of a held device */
29972diff -urNp linux-2.6.32.14/fs/btrfs/ctree.c linux-2.6.32.14/fs/btrfs/ctree.c 29984diff -urNp linux-2.6.32.15/fs/btrfs/ctree.c linux-2.6.32.15/fs/btrfs/ctree.c
29973--- linux-2.6.32.14/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400 29985--- linux-2.6.32.15/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400
29974+++ linux-2.6.32.14/fs/btrfs/ctree.c 2010-05-28 21:27:16.047217370 -0400 29986+++ linux-2.6.32.15/fs/btrfs/ctree.c 2010-05-28 21:27:16.047217370 -0400
29975@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran 29987@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran
29976 29988
29977 ret = 0; 29989 ret = 0;
@@ -29980,9 +29992,9 @@ diff -urNp linux-2.6.32.14/fs/btrfs/ctree.c linux-2.6.32.14/fs/btrfs/ctree.c
29980 btrfs_cpu_key_to_disk(&disk_key, cpu_key); 29992 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
29981 ret = fixup_low_keys(trans, root, path, &disk_key, 1); 29993 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
29982 } 29994 }
29983diff -urNp linux-2.6.32.14/fs/btrfs/disk-io.c linux-2.6.32.14/fs/btrfs/disk-io.c 29995diff -urNp linux-2.6.32.15/fs/btrfs/disk-io.c linux-2.6.32.15/fs/btrfs/disk-io.c
29984--- linux-2.6.32.14/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400 29996--- linux-2.6.32.15/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400
29985+++ linux-2.6.32.14/fs/btrfs/disk-io.c 2010-05-28 21:27:16.055226050 -0400 29997+++ linux-2.6.32.15/fs/btrfs/disk-io.c 2010-05-28 21:27:16.055226050 -0400
29986@@ -39,7 +39,7 @@ 29998@@ -39,7 +39,7 @@
29987 #include "tree-log.h" 29999 #include "tree-log.h"
29988 #include "free-space-cache.h" 30000 #include "free-space-cache.h"
@@ -30001,9 +30013,9 @@ diff -urNp linux-2.6.32.14/fs/btrfs/disk-io.c linux-2.6.32.14/fs/btrfs/disk-io.c
30001 .write_cache_pages_lock_hook = btree_lock_page_hook, 30013 .write_cache_pages_lock_hook = btree_lock_page_hook,
30002 .readpage_end_io_hook = btree_readpage_end_io_hook, 30014 .readpage_end_io_hook = btree_readpage_end_io_hook,
30003 .submit_bio_hook = btree_submit_bio_hook, 30015 .submit_bio_hook = btree_submit_bio_hook,
30004diff -urNp linux-2.6.32.14/fs/btrfs/extent_io.h linux-2.6.32.14/fs/btrfs/extent_io.h 30016diff -urNp linux-2.6.32.15/fs/btrfs/extent_io.h linux-2.6.32.15/fs/btrfs/extent_io.h
30005--- linux-2.6.32.14/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400 30017--- linux-2.6.32.15/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400
30006+++ linux-2.6.32.14/fs/btrfs/extent_io.h 2010-05-28 21:27:16.055226050 -0400 30018+++ linux-2.6.32.15/fs/btrfs/extent_io.h 2010-05-28 21:27:16.055226050 -0400
30007@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s 30019@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
30008 struct bio *bio, int mirror_num, 30020 struct bio *bio, int mirror_num,
30009 unsigned long bio_flags); 30021 unsigned long bio_flags);
@@ -30064,9 +30076,9 @@ diff -urNp linux-2.6.32.14/fs/btrfs/extent_io.h linux-2.6.32.14/fs/btrfs/extent_
30064 }; 30076 };
30065 30077
30066 struct extent_state { 30078 struct extent_state {
30067diff -urNp linux-2.6.32.14/fs/btrfs/free-space-cache.c linux-2.6.32.14/fs/btrfs/free-space-cache.c 30079diff -urNp linux-2.6.32.15/fs/btrfs/free-space-cache.c linux-2.6.32.15/fs/btrfs/free-space-cache.c
30068--- linux-2.6.32.14/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400 30080--- linux-2.6.32.15/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400
30069+++ linux-2.6.32.14/fs/btrfs/free-space-cache.c 2010-05-28 21:27:16.067008196 -0400 30081+++ linux-2.6.32.15/fs/btrfs/free-space-cache.c 2010-05-28 21:27:16.067008196 -0400
30070@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf 30082@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
30071 30083
30072 while(1) { 30084 while(1) {
@@ -30085,9 +30097,9 @@ diff -urNp linux-2.6.32.14/fs/btrfs/free-space-cache.c linux-2.6.32.14/fs/btrfs/
30085 30097
30086 if (entry->bitmap && entry->bytes > bytes + empty_size) { 30098 if (entry->bitmap && entry->bytes > bytes + empty_size) {
30087 ret = btrfs_bitmap_cluster(block_group, entry, cluster, 30099 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
30088diff -urNp linux-2.6.32.14/fs/btrfs/inode.c linux-2.6.32.14/fs/btrfs/inode.c 30100diff -urNp linux-2.6.32.15/fs/btrfs/inode.c linux-2.6.32.15/fs/btrfs/inode.c
30089--- linux-2.6.32.14/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400 30101--- linux-2.6.32.15/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400
30090+++ linux-2.6.32.14/fs/btrfs/inode.c 2010-05-28 21:27:16.071504594 -0400 30102+++ linux-2.6.32.15/fs/btrfs/inode.c 2010-05-28 21:27:16.071504594 -0400
30091@@ -63,7 +63,7 @@ static const struct inode_operations btr 30103@@ -63,7 +63,7 @@ static const struct inode_operations btr
30092 static const struct address_space_operations btrfs_aops; 30104 static const struct address_space_operations btrfs_aops;
30093 static const struct address_space_operations btrfs_symlink_aops; 30105 static const struct address_space_operations btrfs_symlink_aops;
@@ -30106,9 +30118,9 @@ diff -urNp linux-2.6.32.14/fs/btrfs/inode.c linux-2.6.32.14/fs/btrfs/inode.c
30106 .fill_delalloc = run_delalloc_range, 30118 .fill_delalloc = run_delalloc_range,
30107 .submit_bio_hook = btrfs_submit_bio_hook, 30119 .submit_bio_hook = btrfs_submit_bio_hook,
30108 .merge_bio_hook = btrfs_merge_bio_hook, 30120 .merge_bio_hook = btrfs_merge_bio_hook,
30109diff -urNp linux-2.6.32.14/fs/btrfs/sysfs.c linux-2.6.32.14/fs/btrfs/sysfs.c 30121diff -urNp linux-2.6.32.15/fs/btrfs/sysfs.c linux-2.6.32.15/fs/btrfs/sysfs.c
30110--- linux-2.6.32.14/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400 30122--- linux-2.6.32.15/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400
30111+++ linux-2.6.32.14/fs/btrfs/sysfs.c 2010-05-28 21:27:16.071504594 -0400 30123+++ linux-2.6.32.15/fs/btrfs/sysfs.c 2010-05-28 21:27:16.071504594 -0400
30112@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko 30124@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
30113 complete(&root->kobj_unregister); 30125 complete(&root->kobj_unregister);
30114 } 30126 }
@@ -30124,9 +30136,9 @@ diff -urNp linux-2.6.32.14/fs/btrfs/sysfs.c linux-2.6.32.14/fs/btrfs/sysfs.c
30124 .show = btrfs_root_attr_show, 30136 .show = btrfs_root_attr_show,
30125 .store = btrfs_root_attr_store, 30137 .store = btrfs_root_attr_store,
30126 }; 30138 };
30127diff -urNp linux-2.6.32.14/fs/buffer.c linux-2.6.32.14/fs/buffer.c 30139diff -urNp linux-2.6.32.15/fs/buffer.c linux-2.6.32.15/fs/buffer.c
30128--- linux-2.6.32.14/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400 30140--- linux-2.6.32.15/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400
30129+++ linux-2.6.32.14/fs/buffer.c 2010-05-28 21:27:16.083222448 -0400 30141+++ linux-2.6.32.15/fs/buffer.c 2010-05-28 21:27:16.083222448 -0400
30130@@ -25,6 +25,7 @@ 30142@@ -25,6 +25,7 @@
30131 #include <linux/percpu.h> 30143 #include <linux/percpu.h>
30132 #include <linux/slab.h> 30144 #include <linux/slab.h>
@@ -30135,9 +30147,9 @@ diff -urNp linux-2.6.32.14/fs/buffer.c linux-2.6.32.14/fs/buffer.c
30135 #include <linux/blkdev.h> 30147 #include <linux/blkdev.h>
30136 #include <linux/file.h> 30148 #include <linux/file.h>
30137 #include <linux/quotaops.h> 30149 #include <linux/quotaops.h>
30138diff -urNp linux-2.6.32.14/fs/cachefiles/bind.c linux-2.6.32.14/fs/cachefiles/bind.c 30150diff -urNp linux-2.6.32.15/fs/cachefiles/bind.c linux-2.6.32.15/fs/cachefiles/bind.c
30139--- linux-2.6.32.14/fs/cachefiles/bind.c 2010-03-15 11:52:04.000000000 -0400 30151--- linux-2.6.32.15/fs/cachefiles/bind.c 2010-03-15 11:52:04.000000000 -0400
30140+++ linux-2.6.32.14/fs/cachefiles/bind.c 2010-05-28 21:27:16.083222448 -0400 30152+++ linux-2.6.32.15/fs/cachefiles/bind.c 2010-05-28 21:27:16.083222448 -0400
30141@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef 30153@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
30142 args); 30154 args);
30143 30155
@@ -30154,9 +30166,9 @@ diff -urNp linux-2.6.32.14/fs/cachefiles/bind.c linux-2.6.32.14/fs/cachefiles/bi
30154 cache->bcull_percent < cache->brun_percent && 30166 cache->bcull_percent < cache->brun_percent &&
30155 cache->brun_percent < 100); 30167 cache->brun_percent < 100);
30156 30168
30157diff -urNp linux-2.6.32.14/fs/cachefiles/daemon.c linux-2.6.32.14/fs/cachefiles/daemon.c 30169diff -urNp linux-2.6.32.15/fs/cachefiles/daemon.c linux-2.6.32.15/fs/cachefiles/daemon.c
30158--- linux-2.6.32.14/fs/cachefiles/daemon.c 2010-03-15 11:52:04.000000000 -0400 30170--- linux-2.6.32.15/fs/cachefiles/daemon.c 2010-03-15 11:52:04.000000000 -0400
30159+++ linux-2.6.32.14/fs/cachefiles/daemon.c 2010-05-28 21:27:16.091216728 -0400 30171+++ linux-2.6.32.15/fs/cachefiles/daemon.c 2010-05-28 21:27:16.091216728 -0400
30160@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s 30172@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
30161 if (test_bit(CACHEFILES_DEAD, &cache->flags)) 30173 if (test_bit(CACHEFILES_DEAD, &cache->flags))
30162 return -EIO; 30174 return -EIO;
@@ -30184,9 +30196,9 @@ diff -urNp linux-2.6.32.14/fs/cachefiles/daemon.c linux-2.6.32.14/fs/cachefiles/
30184 return cachefiles_daemon_range_error(cache, args); 30196 return cachefiles_daemon_range_error(cache, args);
30185 30197
30186 cache->bstop_percent = bstop; 30198 cache->bstop_percent = bstop;
30187diff -urNp linux-2.6.32.14/fs/cachefiles/rdwr.c linux-2.6.32.14/fs/cachefiles/rdwr.c 30199diff -urNp linux-2.6.32.15/fs/cachefiles/rdwr.c linux-2.6.32.15/fs/cachefiles/rdwr.c
30188--- linux-2.6.32.14/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400 30200--- linux-2.6.32.15/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400
30189+++ linux-2.6.32.14/fs/cachefiles/rdwr.c 2010-05-28 21:27:16.091216728 -0400 30201+++ linux-2.6.32.15/fs/cachefiles/rdwr.c 2010-05-28 21:27:16.091216728 -0400
30190@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache 30202@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
30191 old_fs = get_fs(); 30203 old_fs = get_fs();
30192 set_fs(KERNEL_DS); 30204 set_fs(KERNEL_DS);
@@ -30196,9 +30208,9 @@ diff -urNp linux-2.6.32.14/fs/cachefiles/rdwr.c linux-2.6.32.14/fs/cachefiles/rd
30196 set_fs(old_fs); 30208 set_fs(old_fs);
30197 kunmap(page); 30209 kunmap(page);
30198 if (ret != len) 30210 if (ret != len)
30199diff -urNp linux-2.6.32.14/fs/cifs/cifs_uniupr.h linux-2.6.32.14/fs/cifs/cifs_uniupr.h 30211diff -urNp linux-2.6.32.15/fs/cifs/cifs_uniupr.h linux-2.6.32.15/fs/cifs/cifs_uniupr.h
30200--- linux-2.6.32.14/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400 30212--- linux-2.6.32.15/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400
30201+++ linux-2.6.32.14/fs/cifs/cifs_uniupr.h 2010-05-28 21:27:16.091216728 -0400 30213+++ linux-2.6.32.15/fs/cifs/cifs_uniupr.h 2010-05-28 21:27:16.091216728 -0400
30202@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa 30214@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
30203 {0x0490, 0x04cc, UniCaseRangeU0490}, 30215 {0x0490, 0x04cc, UniCaseRangeU0490},
30204 {0x1e00, 0x1ffc, UniCaseRangeU1e00}, 30216 {0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -30208,9 +30220,9 @@ diff -urNp linux-2.6.32.14/fs/cifs/cifs_uniupr.h linux-2.6.32.14/fs/cifs/cifs_un
30208 }; 30220 };
30209 #endif 30221 #endif
30210 30222
30211diff -urNp linux-2.6.32.14/fs/cifs/link.c linux-2.6.32.14/fs/cifs/link.c 30223diff -urNp linux-2.6.32.15/fs/cifs/link.c linux-2.6.32.15/fs/cifs/link.c
30212--- linux-2.6.32.14/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400 30224--- linux-2.6.32.15/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400
30213+++ linux-2.6.32.14/fs/cifs/link.c 2010-05-28 21:27:16.091216728 -0400 30225+++ linux-2.6.32.15/fs/cifs/link.c 2010-05-28 21:27:16.091216728 -0400
30214@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct 30226@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
30215 30227
30216 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) 30228 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -30220,9 +30232,9 @@ diff -urNp linux-2.6.32.14/fs/cifs/link.c linux-2.6.32.14/fs/cifs/link.c
30220 if (!IS_ERR(p)) 30232 if (!IS_ERR(p))
30221 kfree(p); 30233 kfree(p);
30222 } 30234 }
30223diff -urNp linux-2.6.32.14/fs/compat_binfmt_elf.c linux-2.6.32.14/fs/compat_binfmt_elf.c 30235diff -urNp linux-2.6.32.15/fs/compat_binfmt_elf.c linux-2.6.32.15/fs/compat_binfmt_elf.c
30224--- linux-2.6.32.14/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 30236--- linux-2.6.32.15/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400
30225+++ linux-2.6.32.14/fs/compat_binfmt_elf.c 2010-05-28 21:27:16.091216728 -0400 30237+++ linux-2.6.32.15/fs/compat_binfmt_elf.c 2010-05-28 21:27:16.091216728 -0400
30226@@ -29,10 +29,12 @@ 30238@@ -29,10 +29,12 @@
30227 #undef elfhdr 30239 #undef elfhdr
30228 #undef elf_phdr 30240 #undef elf_phdr
@@ -30236,9 +30248,9 @@ diff -urNp linux-2.6.32.14/fs/compat_binfmt_elf.c linux-2.6.32.14/fs/compat_binf
30236 #define elf_addr_t Elf32_Addr 30248 #define elf_addr_t Elf32_Addr
30237 30249
30238 /* 30250 /*
30239diff -urNp linux-2.6.32.14/fs/compat.c linux-2.6.32.14/fs/compat.c 30251diff -urNp linux-2.6.32.15/fs/compat.c linux-2.6.32.15/fs/compat.c
30240--- linux-2.6.32.14/fs/compat.c 2010-05-28 20:16:44.454934408 -0400 30252--- linux-2.6.32.15/fs/compat.c 2010-05-28 20:16:44.454934408 -0400
30241+++ linux-2.6.32.14/fs/compat.c 2010-05-28 21:27:16.095276039 -0400 30253+++ linux-2.6.32.15/fs/compat.c 2010-05-28 21:27:16.095276039 -0400
30242@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, 30254@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc,
30243 if (!kmapped_page || kpos != (pos & PAGE_MASK)) { 30255 if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
30244 struct page *page; 30256 struct page *page;
@@ -30338,9 +30350,9 @@ diff -urNp linux-2.6.32.14/fs/compat.c linux-2.6.32.14/fs/compat.c
30338 out: 30350 out:
30339 if (bprm->mm) 30351 if (bprm->mm)
30340 mmput(bprm->mm); 30352 mmput(bprm->mm);
30341diff -urNp linux-2.6.32.14/fs/compat_ioctl.c linux-2.6.32.14/fs/compat_ioctl.c 30353diff -urNp linux-2.6.32.15/fs/compat_ioctl.c linux-2.6.32.15/fs/compat_ioctl.c
30342--- linux-2.6.32.14/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400 30354--- linux-2.6.32.15/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400
30343+++ linux-2.6.32.14/fs/compat_ioctl.c 2010-05-28 21:27:16.111229439 -0400 30355+++ linux-2.6.32.15/fs/compat_ioctl.c 2010-05-28 21:27:16.111229439 -0400
30344@@ -1827,15 +1827,15 @@ struct ioctl_trans { 30356@@ -1827,15 +1827,15 @@ struct ioctl_trans {
30345 }; 30357 };
30346 30358
@@ -30360,9 +30372,9 @@ diff -urNp linux-2.6.32.14/fs/compat_ioctl.c linux-2.6.32.14/fs/compat_ioctl.c
30360 30372
30361 /* ioctl should not be warned about even if it's not implemented. 30373 /* ioctl should not be warned about even if it's not implemented.
30362 Valid reasons to use this: 30374 Valid reasons to use this:
30363diff -urNp linux-2.6.32.14/fs/debugfs/inode.c linux-2.6.32.14/fs/debugfs/inode.c 30375diff -urNp linux-2.6.32.15/fs/debugfs/inode.c linux-2.6.32.15/fs/debugfs/inode.c
30364--- linux-2.6.32.14/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400 30376--- linux-2.6.32.15/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400
30365+++ linux-2.6.32.14/fs/debugfs/inode.c 2010-05-28 21:27:16.111229439 -0400 30377+++ linux-2.6.32.15/fs/debugfs/inode.c 2010-05-28 21:27:16.111229439 -0400
30366@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc 30378@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
30367 30379
30368 static int debug_fill_super(struct super_block *sb, void *data, int silent) 30380 static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -30372,9 +30384,9 @@ diff -urNp linux-2.6.32.14/fs/debugfs/inode.c linux-2.6.32.14/fs/debugfs/inode.c
30372 30384
30373 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); 30385 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
30374 } 30386 }
30375diff -urNp linux-2.6.32.14/fs/dlm/lockspace.c linux-2.6.32.14/fs/dlm/lockspace.c 30387diff -urNp linux-2.6.32.15/fs/dlm/lockspace.c linux-2.6.32.15/fs/dlm/lockspace.c
30376--- linux-2.6.32.14/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400 30388--- linux-2.6.32.15/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400
30377+++ linux-2.6.32.14/fs/dlm/lockspace.c 2010-05-28 21:27:16.111229439 -0400 30389+++ linux-2.6.32.15/fs/dlm/lockspace.c 2010-05-28 21:27:16.111229439 -0400
30378@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc 30390@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
30379 kfree(ls); 30391 kfree(ls);
30380 } 30392 }
@@ -30384,9 +30396,9 @@ diff -urNp linux-2.6.32.14/fs/dlm/lockspace.c linux-2.6.32.14/fs/dlm/lockspace.c
30384 .show = dlm_attr_show, 30396 .show = dlm_attr_show,
30385 .store = dlm_attr_store, 30397 .store = dlm_attr_store,
30386 }; 30398 };
30387diff -urNp linux-2.6.32.14/fs/ecryptfs/inode.c linux-2.6.32.14/fs/ecryptfs/inode.c 30399diff -urNp linux-2.6.32.15/fs/ecryptfs/inode.c linux-2.6.32.15/fs/ecryptfs/inode.c
30388--- linux-2.6.32.14/fs/ecryptfs/inode.c 2010-04-29 17:49:38.429034237 -0400 30400--- linux-2.6.32.15/fs/ecryptfs/inode.c 2010-04-29 17:49:38.429034237 -0400
30389+++ linux-2.6.32.14/fs/ecryptfs/inode.c 2010-05-28 21:27:16.111229439 -0400 30401+++ linux-2.6.32.15/fs/ecryptfs/inode.c 2010-05-28 21:27:16.111229439 -0400
30390@@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc 30402@@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc
30391 old_fs = get_fs(); 30403 old_fs = get_fs();
30392 set_fs(get_ds()); 30404 set_fs(get_ds());
@@ -30405,9 +30417,9 @@ diff -urNp linux-2.6.32.14/fs/ecryptfs/inode.c linux-2.6.32.14/fs/ecryptfs/inode
30405 set_fs(old_fs); 30417 set_fs(old_fs);
30406 if (rc < 0) 30418 if (rc < 0)
30407 goto out_free; 30419 goto out_free;
30408diff -urNp linux-2.6.32.14/fs/exec.c linux-2.6.32.14/fs/exec.c 30420diff -urNp linux-2.6.32.15/fs/exec.c linux-2.6.32.15/fs/exec.c
30409--- linux-2.6.32.14/fs/exec.c 2010-05-28 20:16:44.454934408 -0400 30421--- linux-2.6.32.15/fs/exec.c 2010-05-28 20:16:44.454934408 -0400
30410+++ linux-2.6.32.14/fs/exec.c 2010-05-28 21:27:16.119217721 -0400 30422+++ linux-2.6.32.15/fs/exec.c 2010-05-28 21:27:16.119217721 -0400
30411@@ -56,12 +56,24 @@ 30423@@ -56,12 +56,24 @@
30412 #include <linux/fsnotify.h> 30424 #include <linux/fsnotify.h>
30413 #include <linux/fs_struct.h> 30425 #include <linux/fs_struct.h>
@@ -30886,9 +30898,9 @@ diff -urNp linux-2.6.32.14/fs/exec.c linux-2.6.32.14/fs/exec.c
30886 /* 30898 /*
30887 * lock_kernel() because format_corename() is controlled by sysctl, which 30899 * lock_kernel() because format_corename() is controlled by sysctl, which
30888 * uses lock_kernel() 30900 * uses lock_kernel()
30889diff -urNp linux-2.6.32.14/fs/ext2/balloc.c linux-2.6.32.14/fs/ext2/balloc.c 30901diff -urNp linux-2.6.32.15/fs/ext2/balloc.c linux-2.6.32.15/fs/ext2/balloc.c
30890--- linux-2.6.32.14/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400 30902--- linux-2.6.32.15/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400
30891+++ linux-2.6.32.14/fs/ext2/balloc.c 2010-05-28 21:27:16.139352882 -0400 30903+++ linux-2.6.32.15/fs/ext2/balloc.c 2010-05-28 21:27:16.139352882 -0400
30892@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e 30904@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
30893 30905
30894 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 30906 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -30898,9 +30910,9 @@ diff -urNp linux-2.6.32.14/fs/ext2/balloc.c linux-2.6.32.14/fs/ext2/balloc.c
30898 sbi->s_resuid != current_fsuid() && 30910 sbi->s_resuid != current_fsuid() &&
30899 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 30911 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
30900 return 0; 30912 return 0;
30901diff -urNp linux-2.6.32.14/fs/ext2/xattr.c linux-2.6.32.14/fs/ext2/xattr.c 30913diff -urNp linux-2.6.32.15/fs/ext2/xattr.c linux-2.6.32.15/fs/ext2/xattr.c
30902--- linux-2.6.32.14/fs/ext2/xattr.c 2010-03-15 11:52:04.000000000 -0400 30914--- linux-2.6.32.15/fs/ext2/xattr.c 2010-03-15 11:52:04.000000000 -0400
30903+++ linux-2.6.32.14/fs/ext2/xattr.c 2010-05-28 21:27:16.139352882 -0400 30915+++ linux-2.6.32.15/fs/ext2/xattr.c 2010-05-28 21:27:16.139352882 -0400
30904@@ -85,8 +85,8 @@ 30916@@ -85,8 +85,8 @@
30905 printk("\n"); \ 30917 printk("\n"); \
30906 } while (0) 30918 } while (0)
@@ -30912,9 +30924,9 @@ diff -urNp linux-2.6.32.14/fs/ext2/xattr.c linux-2.6.32.14/fs/ext2/xattr.c
30912 #endif 30924 #endif
30913 30925
30914 static int ext2_xattr_set2(struct inode *, struct buffer_head *, 30926 static int ext2_xattr_set2(struct inode *, struct buffer_head *,
30915diff -urNp linux-2.6.32.14/fs/ext3/balloc.c linux-2.6.32.14/fs/ext3/balloc.c 30927diff -urNp linux-2.6.32.15/fs/ext3/balloc.c linux-2.6.32.15/fs/ext3/balloc.c
30916--- linux-2.6.32.14/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400 30928--- linux-2.6.32.15/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400
30917+++ linux-2.6.32.14/fs/ext3/balloc.c 2010-05-28 21:27:16.139352882 -0400 30929+++ linux-2.6.32.15/fs/ext3/balloc.c 2010-05-28 21:27:16.139352882 -0400
30918@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e 30930@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
30919 30931
30920 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 30932 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -30924,9 +30936,9 @@ diff -urNp linux-2.6.32.14/fs/ext3/balloc.c linux-2.6.32.14/fs/ext3/balloc.c
30924 sbi->s_resuid != current_fsuid() && 30936 sbi->s_resuid != current_fsuid() &&
30925 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 30937 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
30926 return 0; 30938 return 0;
30927diff -urNp linux-2.6.32.14/fs/ext3/namei.c linux-2.6.32.14/fs/ext3/namei.c 30939diff -urNp linux-2.6.32.15/fs/ext3/namei.c linux-2.6.32.15/fs/ext3/namei.c
30928--- linux-2.6.32.14/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400 30940--- linux-2.6.32.15/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400
30929+++ linux-2.6.32.14/fs/ext3/namei.c 2010-05-28 21:27:16.139352882 -0400 30941+++ linux-2.6.32.15/fs/ext3/namei.c 2010-05-28 21:27:16.139352882 -0400
30930@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split 30942@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
30931 char *data1 = (*bh)->b_data, *data2; 30943 char *data1 = (*bh)->b_data, *data2;
30932 unsigned split, move, size; 30944 unsigned split, move, size;
@@ -30936,9 +30948,9 @@ diff -urNp linux-2.6.32.14/fs/ext3/namei.c linux-2.6.32.14/fs/ext3/namei.c
30936 30948
30937 bh2 = ext3_append (handle, dir, &newblock, &err); 30949 bh2 = ext3_append (handle, dir, &newblock, &err);
30938 if (!(bh2)) { 30950 if (!(bh2)) {
30939diff -urNp linux-2.6.32.14/fs/ext3/xattr.c linux-2.6.32.14/fs/ext3/xattr.c 30951diff -urNp linux-2.6.32.15/fs/ext3/xattr.c linux-2.6.32.15/fs/ext3/xattr.c
30940--- linux-2.6.32.14/fs/ext3/xattr.c 2010-04-29 17:49:38.429034237 -0400 30952--- linux-2.6.32.15/fs/ext3/xattr.c 2010-04-29 17:49:38.429034237 -0400
30941+++ linux-2.6.32.14/fs/ext3/xattr.c 2010-05-28 21:27:16.139352882 -0400 30953+++ linux-2.6.32.15/fs/ext3/xattr.c 2010-05-28 21:27:16.139352882 -0400
30942@@ -89,8 +89,8 @@ 30954@@ -89,8 +89,8 @@
30943 printk("\n"); \ 30955 printk("\n"); \
30944 } while (0) 30956 } while (0)
@@ -30950,9 +30962,9 @@ diff -urNp linux-2.6.32.14/fs/ext3/xattr.c linux-2.6.32.14/fs/ext3/xattr.c
30950 #endif 30962 #endif
30951 30963
30952 static void ext3_xattr_cache_insert(struct buffer_head *); 30964 static void ext3_xattr_cache_insert(struct buffer_head *);
30953diff -urNp linux-2.6.32.14/fs/ext4/balloc.c linux-2.6.32.14/fs/ext4/balloc.c 30965diff -urNp linux-2.6.32.15/fs/ext4/balloc.c linux-2.6.32.15/fs/ext4/balloc.c
30954--- linux-2.6.32.14/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400 30966--- linux-2.6.32.15/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400
30955+++ linux-2.6.32.14/fs/ext4/balloc.c 2010-05-28 21:27:16.143235197 -0400 30967+++ linux-2.6.32.15/fs/ext4/balloc.c 2010-05-28 21:27:16.143235197 -0400
30956@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ 30968@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_
30957 /* Hm, nope. Are (enough) root reserved blocks available? */ 30969 /* Hm, nope. Are (enough) root reserved blocks available? */
30958 if (sbi->s_resuid == current_fsuid() || 30970 if (sbi->s_resuid == current_fsuid() ||
@@ -30962,9 +30974,9 @@ diff -urNp linux-2.6.32.14/fs/ext4/balloc.c linux-2.6.32.14/fs/ext4/balloc.c
30962 if (free_blocks >= (nblocks + dirty_blocks)) 30974 if (free_blocks >= (nblocks + dirty_blocks))
30963 return 1; 30975 return 1;
30964 } 30976 }
30965diff -urNp linux-2.6.32.14/fs/ext4/ioctl.c linux-2.6.32.14/fs/ext4/ioctl.c 30977diff -urNp linux-2.6.32.15/fs/ext4/ioctl.c linux-2.6.32.15/fs/ext4/ioctl.c
30966--- linux-2.6.32.14/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400 30978--- linux-2.6.32.15/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400
30967+++ linux-2.6.32.14/fs/ext4/ioctl.c 2010-05-28 21:27:16.143235197 -0400 30979+++ linux-2.6.32.15/fs/ext4/ioctl.c 2010-05-28 21:27:16.143235197 -0400
30968@@ -221,6 +221,9 @@ setversion_out: 30980@@ -221,6 +221,9 @@ setversion_out:
30969 struct file *donor_filp; 30981 struct file *donor_filp;
30970 int err; 30982 int err;
@@ -30975,9 +30987,9 @@ diff -urNp linux-2.6.32.14/fs/ext4/ioctl.c linux-2.6.32.14/fs/ext4/ioctl.c
30975 if (!(filp->f_mode & FMODE_READ) || 30987 if (!(filp->f_mode & FMODE_READ) ||
30976 !(filp->f_mode & FMODE_WRITE)) 30988 !(filp->f_mode & FMODE_WRITE))
30977 return -EBADF; 30989 return -EBADF;
30978diff -urNp linux-2.6.32.14/fs/ext4/namei.c linux-2.6.32.14/fs/ext4/namei.c 30990diff -urNp linux-2.6.32.15/fs/ext4/namei.c linux-2.6.32.15/fs/ext4/namei.c
30979--- linux-2.6.32.14/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400 30991--- linux-2.6.32.15/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400
30980+++ linux-2.6.32.14/fs/ext4/namei.c 2010-05-28 21:27:16.151243127 -0400 30992+++ linux-2.6.32.15/fs/ext4/namei.c 2010-05-28 21:27:16.151243127 -0400
30981@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split 30993@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
30982 char *data1 = (*bh)->b_data, *data2; 30994 char *data1 = (*bh)->b_data, *data2;
30983 unsigned split, move, size; 30995 unsigned split, move, size;
@@ -30987,9 +30999,9 @@ diff -urNp linux-2.6.32.14/fs/ext4/namei.c linux-2.6.32.14/fs/ext4/namei.c
30987 30999
30988 bh2 = ext4_append (handle, dir, &newblock, &err); 31000 bh2 = ext4_append (handle, dir, &newblock, &err);
30989 if (!(bh2)) { 31001 if (!(bh2)) {
30990diff -urNp linux-2.6.32.14/fs/ext4/super.c linux-2.6.32.14/fs/ext4/super.c 31002diff -urNp linux-2.6.32.15/fs/ext4/super.c linux-2.6.32.15/fs/ext4/super.c
30991--- linux-2.6.32.14/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400 31003--- linux-2.6.32.15/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400
30992+++ linux-2.6.32.14/fs/ext4/super.c 2010-05-28 21:27:16.155228523 -0400 31004+++ linux-2.6.32.15/fs/ext4/super.c 2010-05-28 21:27:16.155228523 -0400
30993@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje 31005@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje
30994 } 31006 }
30995 31007
@@ -30999,9 +31011,9 @@ diff -urNp linux-2.6.32.14/fs/ext4/super.c linux-2.6.32.14/fs/ext4/super.c
30999 .show = ext4_attr_show, 31011 .show = ext4_attr_show,
31000 .store = ext4_attr_store, 31012 .store = ext4_attr_store,
31001 }; 31013 };
31002diff -urNp linux-2.6.32.14/fs/ext4/xattr.c linux-2.6.32.14/fs/ext4/xattr.c 31014diff -urNp linux-2.6.32.15/fs/ext4/xattr.c linux-2.6.32.15/fs/ext4/xattr.c
31003--- linux-2.6.32.14/fs/ext4/xattr.c 2010-03-15 11:52:04.000000000 -0400 31015--- linux-2.6.32.15/fs/ext4/xattr.c 2010-03-15 11:52:04.000000000 -0400
31004+++ linux-2.6.32.14/fs/ext4/xattr.c 2010-05-28 21:27:16.155228523 -0400 31016+++ linux-2.6.32.15/fs/ext4/xattr.c 2010-05-28 21:27:16.155228523 -0400
31005@@ -82,8 +82,8 @@ 31017@@ -82,8 +82,8 @@
31006 printk("\n"); \ 31018 printk("\n"); \
31007 } while (0) 31019 } while (0)
@@ -31013,9 +31025,9 @@ diff -urNp linux-2.6.32.14/fs/ext4/xattr.c linux-2.6.32.14/fs/ext4/xattr.c
31013 #endif 31025 #endif
31014 31026
31015 static void ext4_xattr_cache_insert(struct buffer_head *); 31027 static void ext4_xattr_cache_insert(struct buffer_head *);
31016diff -urNp linux-2.6.32.14/fs/fcntl.c linux-2.6.32.14/fs/fcntl.c 31028diff -urNp linux-2.6.32.15/fs/fcntl.c linux-2.6.32.15/fs/fcntl.c
31017--- linux-2.6.32.14/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400 31029--- linux-2.6.32.15/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400
31018+++ linux-2.6.32.14/fs/fcntl.c 2010-05-28 21:27:16.158915754 -0400 31030+++ linux-2.6.32.15/fs/fcntl.c 2010-05-28 21:27:16.158915754 -0400
31019@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in 31031@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in
31020 switch (cmd) { 31032 switch (cmd) {
31021 case F_DUPFD: 31033 case F_DUPFD:
@@ -31034,9 +31046,9 @@ diff -urNp linux-2.6.32.14/fs/fcntl.c linux-2.6.32.14/fs/fcntl.c
31034 rcu_read_unlock(); 31046 rcu_read_unlock();
31035 return ret; 31047 return ret;
31036 } 31048 }
31037diff -urNp linux-2.6.32.14/fs/fifo.c linux-2.6.32.14/fs/fifo.c 31049diff -urNp linux-2.6.32.15/fs/fifo.c linux-2.6.32.15/fs/fifo.c
31038--- linux-2.6.32.14/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400 31050--- linux-2.6.32.15/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400
31039+++ linux-2.6.32.14/fs/fifo.c 2010-05-28 21:27:16.158915754 -0400 31051+++ linux-2.6.32.15/fs/fifo.c 2010-05-28 21:27:16.158915754 -0400
31040@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode 31052@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
31041 */ 31053 */
31042 filp->f_op = &read_pipefifo_fops; 31054 filp->f_op = &read_pipefifo_fops;
@@ -31107,9 +31119,9 @@ diff -urNp linux-2.6.32.14/fs/fifo.c linux-2.6.32.14/fs/fifo.c
31107 free_pipe_info(inode); 31119 free_pipe_info(inode);
31108 31120
31109 err_nocleanup: 31121 err_nocleanup:
31110diff -urNp linux-2.6.32.14/fs/file.c linux-2.6.32.14/fs/file.c 31122diff -urNp linux-2.6.32.15/fs/file.c linux-2.6.32.15/fs/file.c
31111--- linux-2.6.32.14/fs/file.c 2010-03-15 11:52:04.000000000 -0400 31123--- linux-2.6.32.15/fs/file.c 2010-03-15 11:52:04.000000000 -0400
31112+++ linux-2.6.32.14/fs/file.c 2010-05-28 21:27:16.158915754 -0400 31124+++ linux-2.6.32.15/fs/file.c 2010-05-28 21:27:16.158915754 -0400
31113@@ -14,6 +14,7 @@ 31125@@ -14,6 +14,7 @@
31114 #include <linux/slab.h> 31126 #include <linux/slab.h>
31115 #include <linux/vmalloc.h> 31127 #include <linux/vmalloc.h>
@@ -31127,9 +31139,9 @@ diff -urNp linux-2.6.32.14/fs/file.c linux-2.6.32.14/fs/file.c
31127 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 31139 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
31128 return -EMFILE; 31140 return -EMFILE;
31129 31141
31130diff -urNp linux-2.6.32.14/fs/fs_struct.c linux-2.6.32.14/fs/fs_struct.c 31142diff -urNp linux-2.6.32.15/fs/fs_struct.c linux-2.6.32.15/fs/fs_struct.c
31131--- linux-2.6.32.14/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400 31143--- linux-2.6.32.15/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400
31132+++ linux-2.6.32.14/fs/fs_struct.c 2010-05-28 21:27:16.158915754 -0400 31144+++ linux-2.6.32.15/fs/fs_struct.c 2010-05-28 21:27:16.158915754 -0400
31133@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo 31145@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo
31134 struct task_struct *g, *p; 31146 struct task_struct *g, *p;
31135 struct fs_struct *fs; 31147 struct fs_struct *fs;
@@ -31234,9 +31246,9 @@ diff -urNp linux-2.6.32.14/fs/fs_struct.c linux-2.6.32.14/fs/fs_struct.c
31234 31246
31235 task_unlock(current); 31247 task_unlock(current);
31236 if (kill) 31248 if (kill)
31237diff -urNp linux-2.6.32.14/fs/fuse/control.c linux-2.6.32.14/fs/fuse/control.c 31249diff -urNp linux-2.6.32.15/fs/fuse/control.c linux-2.6.32.15/fs/fuse/control.c
31238--- linux-2.6.32.14/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400 31250--- linux-2.6.32.15/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400
31239+++ linux-2.6.32.14/fs/fuse/control.c 2010-05-28 21:27:16.158915754 -0400 31251+++ linux-2.6.32.15/fs/fuse/control.c 2010-05-28 21:27:16.158915754 -0400
31240@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co 31252@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
31241 31253
31242 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) 31254 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -31246,9 +31258,9 @@ diff -urNp linux-2.6.32.14/fs/fuse/control.c linux-2.6.32.14/fs/fuse/control.c
31246 struct fuse_conn *fc; 31258 struct fuse_conn *fc;
31247 int err; 31259 int err;
31248 31260
31249diff -urNp linux-2.6.32.14/fs/fuse/cuse.c linux-2.6.32.14/fs/fuse/cuse.c 31261diff -urNp linux-2.6.32.15/fs/fuse/cuse.c linux-2.6.32.15/fs/fuse/cuse.c
31250--- linux-2.6.32.14/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400 31262--- linux-2.6.32.15/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400
31251+++ linux-2.6.32.14/fs/fuse/cuse.c 2010-05-28 21:27:16.158915754 -0400 31263+++ linux-2.6.32.15/fs/fuse/cuse.c 2010-05-28 21:27:16.158915754 -0400
31252@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i 31264@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
31253 return rc; 31265 return rc;
31254 } 31266 }
@@ -31283,9 +31295,9 @@ diff -urNp linux-2.6.32.14/fs/fuse/cuse.c linux-2.6.32.14/fs/fuse/cuse.c
31283 cuse_class = class_create(THIS_MODULE, "cuse"); 31295 cuse_class = class_create(THIS_MODULE, "cuse");
31284 if (IS_ERR(cuse_class)) 31296 if (IS_ERR(cuse_class))
31285 return PTR_ERR(cuse_class); 31297 return PTR_ERR(cuse_class);
31286diff -urNp linux-2.6.32.14/fs/fuse/dev.c linux-2.6.32.14/fs/fuse/dev.c 31298diff -urNp linux-2.6.32.15/fs/fuse/dev.c linux-2.6.32.15/fs/fuse/dev.c
31287--- linux-2.6.32.14/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400 31299--- linux-2.6.32.15/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400
31288+++ linux-2.6.32.14/fs/fuse/dev.c 2010-05-28 21:27:16.158915754 -0400 31300+++ linux-2.6.32.15/fs/fuse/dev.c 2010-05-28 21:27:16.158915754 -0400
31289@@ -745,7 +745,7 @@ __releases(&fc->lock) 31301@@ -745,7 +745,7 @@ __releases(&fc->lock)
31290 * request_end(). Otherwise add it to the processing list, and set 31302 * request_end(). Otherwise add it to the processing list, and set
31291 * the 'sent' flag. 31303 * the 'sent' flag.
@@ -31391,9 +31403,9 @@ diff -urNp linux-2.6.32.14/fs/fuse/dev.c linux-2.6.32.14/fs/fuse/dev.c
31391 31403
31392 const struct file_operations fuse_dev_operations = { 31404 const struct file_operations fuse_dev_operations = {
31393 .owner = THIS_MODULE, 31405 .owner = THIS_MODULE,
31394diff -urNp linux-2.6.32.14/fs/fuse/dir.c linux-2.6.32.14/fs/fuse/dir.c 31406diff -urNp linux-2.6.32.15/fs/fuse/dir.c linux-2.6.32.15/fs/fuse/dir.c
31395--- linux-2.6.32.14/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400 31407--- linux-2.6.32.15/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400
31396+++ linux-2.6.32.14/fs/fuse/dir.c 2010-05-28 21:27:16.167243337 -0400 31408+++ linux-2.6.32.15/fs/fuse/dir.c 2010-05-28 21:27:16.167243337 -0400
31397@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de 31409@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
31398 return link; 31410 return link;
31399 } 31411 }
@@ -31403,9 +31415,9 @@ diff -urNp linux-2.6.32.14/fs/fuse/dir.c linux-2.6.32.14/fs/fuse/dir.c
31403 { 31415 {
31404 if (!IS_ERR(link)) 31416 if (!IS_ERR(link))
31405 free_page((unsigned long) link); 31417 free_page((unsigned long) link);
31406diff -urNp linux-2.6.32.14/fs/fuse/fuse_i.h linux-2.6.32.14/fs/fuse/fuse_i.h 31418diff -urNp linux-2.6.32.15/fs/fuse/fuse_i.h linux-2.6.32.15/fs/fuse/fuse_i.h
31407--- linux-2.6.32.14/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400 31419--- linux-2.6.32.15/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400
31408+++ linux-2.6.32.14/fs/fuse/fuse_i.h 2010-05-28 21:27:16.167243337 -0400 31420+++ linux-2.6.32.15/fs/fuse/fuse_i.h 2010-05-28 21:27:16.167243337 -0400
31409@@ -521,6 +521,16 @@ extern const struct file_operations fuse 31421@@ -521,6 +521,16 @@ extern const struct file_operations fuse
31410 31422
31411 extern const struct dentry_operations fuse_dentry_operations; 31423 extern const struct dentry_operations fuse_dentry_operations;
@@ -31423,9 +31435,9 @@ diff -urNp linux-2.6.32.14/fs/fuse/fuse_i.h linux-2.6.32.14/fs/fuse/fuse_i.h
31423 /** 31435 /**
31424 * Inode to nodeid comparison. 31436 * Inode to nodeid comparison.
31425 */ 31437 */
31426diff -urNp linux-2.6.32.14/fs/gfs2/sys.c linux-2.6.32.14/fs/gfs2/sys.c 31438diff -urNp linux-2.6.32.15/fs/gfs2/sys.c linux-2.6.32.15/fs/gfs2/sys.c
31427--- linux-2.6.32.14/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400 31439--- linux-2.6.32.15/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400
31428+++ linux-2.6.32.14/fs/gfs2/sys.c 2010-05-28 21:27:16.167243337 -0400 31440+++ linux-2.6.32.15/fs/gfs2/sys.c 2010-05-28 21:27:16.167243337 -0400
31429@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko 31441@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
31430 return a->store ? a->store(sdp, buf, len) : len; 31442 return a->store ? a->store(sdp, buf, len) : len;
31431 } 31443 }
@@ -31444,9 +31456,9 @@ diff -urNp linux-2.6.32.14/fs/gfs2/sys.c linux-2.6.32.14/fs/gfs2/sys.c
31444 .uevent = gfs2_uevent, 31456 .uevent = gfs2_uevent,
31445 }; 31457 };
31446 31458
31447diff -urNp linux-2.6.32.14/fs/hfs/inode.c linux-2.6.32.14/fs/hfs/inode.c 31459diff -urNp linux-2.6.32.15/fs/hfs/inode.c linux-2.6.32.15/fs/hfs/inode.c
31448--- linux-2.6.32.14/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400 31460--- linux-2.6.32.15/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400
31449+++ linux-2.6.32.14/fs/hfs/inode.c 2010-05-28 21:27:16.171892577 -0400 31461+++ linux-2.6.32.15/fs/hfs/inode.c 2010-05-28 21:27:16.171892577 -0400
31450@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, 31462@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
31451 31463
31452 if (S_ISDIR(main_inode->i_mode)) { 31464 if (S_ISDIR(main_inode->i_mode)) {
@@ -31465,9 +31477,9 @@ diff -urNp linux-2.6.32.14/fs/hfs/inode.c linux-2.6.32.14/fs/hfs/inode.c
31465 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, 31477 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
31466 sizeof(struct hfs_cat_file)); 31478 sizeof(struct hfs_cat_file));
31467 if (rec.type != HFS_CDR_FIL || 31479 if (rec.type != HFS_CDR_FIL ||
31468diff -urNp linux-2.6.32.14/fs/hfsplus/inode.c linux-2.6.32.14/fs/hfsplus/inode.c 31480diff -urNp linux-2.6.32.15/fs/hfsplus/inode.c linux-2.6.32.15/fs/hfsplus/inode.c
31469--- linux-2.6.32.14/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400 31481--- linux-2.6.32.15/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400
31470+++ linux-2.6.32.14/fs/hfsplus/inode.c 2010-05-28 21:27:16.171892577 -0400 31482+++ linux-2.6.32.15/fs/hfsplus/inode.c 2010-05-28 21:27:16.171892577 -0400
31471@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode 31483@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
31472 struct hfsplus_cat_folder *folder = &entry.folder; 31484 struct hfsplus_cat_folder *folder = &entry.folder;
31473 31485
@@ -31504,9 +31516,9 @@ diff -urNp linux-2.6.32.14/fs/hfsplus/inode.c linux-2.6.32.14/fs/hfsplus/inode.c
31504 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, 31516 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
31505 sizeof(struct hfsplus_cat_file)); 31517 sizeof(struct hfsplus_cat_file));
31506 hfsplus_inode_write_fork(inode, &file->data_fork); 31518 hfsplus_inode_write_fork(inode, &file->data_fork);
31507diff -urNp linux-2.6.32.14/fs/hugetlbfs/inode.c linux-2.6.32.14/fs/hugetlbfs/inode.c 31519diff -urNp linux-2.6.32.15/fs/hugetlbfs/inode.c linux-2.6.32.15/fs/hugetlbfs/inode.c
31508--- linux-2.6.32.14/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400 31520--- linux-2.6.32.15/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400
31509+++ linux-2.6.32.14/fs/hugetlbfs/inode.c 2010-05-28 21:27:16.171892577 -0400 31521+++ linux-2.6.32.15/fs/hugetlbfs/inode.c 2010-05-28 21:27:16.171892577 -0400
31510@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs 31522@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
31511 .kill_sb = kill_litter_super, 31523 .kill_sb = kill_litter_super,
31512 }; 31524 };
@@ -31516,9 +31528,9 @@ diff -urNp linux-2.6.32.14/fs/hugetlbfs/inode.c linux-2.6.32.14/fs/hugetlbfs/ino
31516 31528
31517 static int can_do_hugetlb_shm(void) 31529 static int can_do_hugetlb_shm(void)
31518 { 31530 {
31519diff -urNp linux-2.6.32.14/fs/ioctl.c linux-2.6.32.14/fs/ioctl.c 31531diff -urNp linux-2.6.32.15/fs/ioctl.c linux-2.6.32.15/fs/ioctl.c
31520--- linux-2.6.32.14/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400 31532--- linux-2.6.32.15/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400
31521+++ linux-2.6.32.14/fs/ioctl.c 2010-05-28 21:27:16.175116356 -0400 31533+++ linux-2.6.32.15/fs/ioctl.c 2010-05-28 21:27:16.175116356 -0400
31522@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema 31534@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
31523 u64 phys, u64 len, u32 flags) 31535 u64 phys, u64 len, u32 flags)
31524 { 31536 {
@@ -31546,9 +31558,9 @@ diff -urNp linux-2.6.32.14/fs/ioctl.c linux-2.6.32.14/fs/ioctl.c
31546 error = -EFAULT; 31558 error = -EFAULT;
31547 31559
31548 return error; 31560 return error;
31549diff -urNp linux-2.6.32.14/fs/jffs2/debug.h linux-2.6.32.14/fs/jffs2/debug.h 31561diff -urNp linux-2.6.32.15/fs/jffs2/debug.h linux-2.6.32.15/fs/jffs2/debug.h
31550--- linux-2.6.32.14/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400 31562--- linux-2.6.32.15/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400
31551+++ linux-2.6.32.14/fs/jffs2/debug.h 2010-05-28 21:27:16.175116356 -0400 31563+++ linux-2.6.32.15/fs/jffs2/debug.h 2010-05-28 21:27:16.175116356 -0400
31552@@ -52,13 +52,13 @@ 31564@@ -52,13 +52,13 @@
31553 #if CONFIG_JFFS2_FS_DEBUG > 0 31565 #if CONFIG_JFFS2_FS_DEBUG > 0
31554 #define D1(x) x 31566 #define D1(x) x
@@ -31650,9 +31662,9 @@ diff -urNp linux-2.6.32.14/fs/jffs2/debug.h linux-2.6.32.14/fs/jffs2/debug.h
31650 #endif 31662 #endif
31651 31663
31652 /* "Sanity" checks */ 31664 /* "Sanity" checks */
31653diff -urNp linux-2.6.32.14/fs/jffs2/erase.c linux-2.6.32.14/fs/jffs2/erase.c 31665diff -urNp linux-2.6.32.15/fs/jffs2/erase.c linux-2.6.32.15/fs/jffs2/erase.c
31654--- linux-2.6.32.14/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400 31666--- linux-2.6.32.15/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400
31655+++ linux-2.6.32.14/fs/jffs2/erase.c 2010-05-28 21:27:16.175116356 -0400 31667+++ linux-2.6.32.15/fs/jffs2/erase.c 2010-05-28 21:27:16.175116356 -0400
31656@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru 31668@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
31657 struct jffs2_unknown_node marker = { 31669 struct jffs2_unknown_node marker = {
31658 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), 31670 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -31663,9 +31675,9 @@ diff -urNp linux-2.6.32.14/fs/jffs2/erase.c linux-2.6.32.14/fs/jffs2/erase.c
31663 }; 31675 };
31664 31676
31665 jffs2_prealloc_raw_node_refs(c, jeb, 1); 31677 jffs2_prealloc_raw_node_refs(c, jeb, 1);
31666diff -urNp linux-2.6.32.14/fs/jffs2/summary.h linux-2.6.32.14/fs/jffs2/summary.h 31678diff -urNp linux-2.6.32.15/fs/jffs2/summary.h linux-2.6.32.15/fs/jffs2/summary.h
31667--- linux-2.6.32.14/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400 31679--- linux-2.6.32.15/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400
31668+++ linux-2.6.32.14/fs/jffs2/summary.h 2010-05-28 21:27:16.175116356 -0400 31680+++ linux-2.6.32.15/fs/jffs2/summary.h 2010-05-28 21:27:16.175116356 -0400
31669@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ 31681@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
31670 31682
31671 #define jffs2_sum_active() (0) 31683 #define jffs2_sum_active() (0)
@@ -31694,9 +31706,9 @@ diff -urNp linux-2.6.32.14/fs/jffs2/summary.h linux-2.6.32.14/fs/jffs2/summary.h
31694 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) 31706 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
31695 31707
31696 #endif /* CONFIG_JFFS2_SUMMARY */ 31708 #endif /* CONFIG_JFFS2_SUMMARY */
31697diff -urNp linux-2.6.32.14/fs/jffs2/wbuf.c linux-2.6.32.14/fs/jffs2/wbuf.c 31709diff -urNp linux-2.6.32.15/fs/jffs2/wbuf.c linux-2.6.32.15/fs/jffs2/wbuf.c
31698--- linux-2.6.32.14/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400 31710--- linux-2.6.32.15/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400
31699+++ linux-2.6.32.14/fs/jffs2/wbuf.c 2010-05-28 21:27:16.175116356 -0400 31711+++ linux-2.6.32.15/fs/jffs2/wbuf.c 2010-05-28 21:27:16.175116356 -0400
31700@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o 31712@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
31701 { 31713 {
31702 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), 31714 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -31707,9 +31719,9 @@ diff -urNp linux-2.6.32.14/fs/jffs2/wbuf.c linux-2.6.32.14/fs/jffs2/wbuf.c
31707 }; 31719 };
31708 31720
31709 /* 31721 /*
31710diff -urNp linux-2.6.32.14/fs/lockd/svc.c linux-2.6.32.14/fs/lockd/svc.c 31722diff -urNp linux-2.6.32.15/fs/lockd/svc.c linux-2.6.32.15/fs/lockd/svc.c
31711--- linux-2.6.32.14/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400 31723--- linux-2.6.32.15/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400
31712+++ linux-2.6.32.14/fs/lockd/svc.c 2010-05-28 21:27:16.175116356 -0400 31724+++ linux-2.6.32.15/fs/lockd/svc.c 2010-05-28 21:27:16.175116356 -0400
31713@@ -43,7 +43,7 @@ 31725@@ -43,7 +43,7 @@
31714 31726
31715 static struct svc_program nlmsvc_program; 31727 static struct svc_program nlmsvc_program;
@@ -31719,9 +31731,9 @@ diff -urNp linux-2.6.32.14/fs/lockd/svc.c linux-2.6.32.14/fs/lockd/svc.c
31719 EXPORT_SYMBOL_GPL(nlmsvc_ops); 31731 EXPORT_SYMBOL_GPL(nlmsvc_ops);
31720 31732
31721 static DEFINE_MUTEX(nlmsvc_mutex); 31733 static DEFINE_MUTEX(nlmsvc_mutex);
31722diff -urNp linux-2.6.32.14/fs/locks.c linux-2.6.32.14/fs/locks.c 31734diff -urNp linux-2.6.32.15/fs/locks.c linux-2.6.32.15/fs/locks.c
31723--- linux-2.6.32.14/fs/locks.c 2010-03-15 11:52:04.000000000 -0400 31735--- linux-2.6.32.15/fs/locks.c 2010-03-15 11:52:04.000000000 -0400
31724+++ linux-2.6.32.14/fs/locks.c 2010-05-28 21:27:16.191151426 -0400 31736+++ linux-2.6.32.15/fs/locks.c 2010-05-28 21:27:16.191151426 -0400
31725@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil 31737@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
31726 return; 31738 return;
31727 31739
@@ -31743,9 +31755,9 @@ diff -urNp linux-2.6.32.14/fs/locks.c linux-2.6.32.14/fs/locks.c
31743 } 31755 }
31744 31756
31745 lock_kernel(); 31757 lock_kernel();
31746diff -urNp linux-2.6.32.14/fs/namei.c linux-2.6.32.14/fs/namei.c 31758diff -urNp linux-2.6.32.15/fs/namei.c linux-2.6.32.15/fs/namei.c
31747--- linux-2.6.32.14/fs/namei.c 2010-03-15 11:52:04.000000000 -0400 31759--- linux-2.6.32.15/fs/namei.c 2010-03-15 11:52:04.000000000 -0400
31748+++ linux-2.6.32.14/fs/namei.c 2010-05-28 21:27:16.199231859 -0400 31760+++ linux-2.6.32.15/fs/namei.c 2010-05-28 21:27:16.199231859 -0400
31749@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l 31761@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l
31750 cookie = dentry->d_inode->i_op->follow_link(dentry, nd); 31762 cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
31751 error = PTR_ERR(cookie); 31763 error = PTR_ERR(cookie);
@@ -32072,9 +32084,9 @@ diff -urNp linux-2.6.32.14/fs/namei.c linux-2.6.32.14/fs/namei.c
32072 exit6: 32084 exit6:
32073 mnt_drop_write(oldnd.path.mnt); 32085 mnt_drop_write(oldnd.path.mnt);
32074 exit5: 32086 exit5:
32075diff -urNp linux-2.6.32.14/fs/namespace.c linux-2.6.32.14/fs/namespace.c 32087diff -urNp linux-2.6.32.15/fs/namespace.c linux-2.6.32.15/fs/namespace.c
32076--- linux-2.6.32.14/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400 32088--- linux-2.6.32.15/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400
32077+++ linux-2.6.32.14/fs/namespace.c 2010-05-28 21:27:16.199231859 -0400 32089+++ linux-2.6.32.15/fs/namespace.c 2010-05-28 21:27:16.199231859 -0400
32078@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn 32090@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
32079 if (!(sb->s_flags & MS_RDONLY)) 32091 if (!(sb->s_flags & MS_RDONLY))
32080 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); 32092 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -32135,9 +32147,9 @@ diff -urNp linux-2.6.32.14/fs/namespace.c linux-2.6.32.14/fs/namespace.c
32135 read_lock(&current->fs->lock); 32147 read_lock(&current->fs->lock);
32136 root = current->fs->root; 32148 root = current->fs->root;
32137 path_get(&current->fs->root); 32149 path_get(&current->fs->root);
32138diff -urNp linux-2.6.32.14/fs/nfs/inode.c linux-2.6.32.14/fs/nfs/inode.c 32150diff -urNp linux-2.6.32.15/fs/nfs/inode.c linux-2.6.32.15/fs/nfs/inode.c
32139--- linux-2.6.32.14/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400 32151--- linux-2.6.32.15/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400
32140+++ linux-2.6.32.14/fs/nfs/inode.c 2010-05-28 21:27:16.199231859 -0400 32152+++ linux-2.6.32.15/fs/nfs/inode.c 2010-05-28 21:27:16.199231859 -0400
32141@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st 32153@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
32142 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); 32154 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
32143 } 32155 }
@@ -32158,9 +32170,9 @@ diff -urNp linux-2.6.32.14/fs/nfs/inode.c linux-2.6.32.14/fs/nfs/inode.c
32158 } 32170 }
32159 32171
32160 void nfs_fattr_init(struct nfs_fattr *fattr) 32172 void nfs_fattr_init(struct nfs_fattr *fattr)
32161diff -urNp linux-2.6.32.14/fs/nfs/nfs4proc.c linux-2.6.32.14/fs/nfs/nfs4proc.c 32173diff -urNp linux-2.6.32.15/fs/nfs/nfs4proc.c linux-2.6.32.15/fs/nfs/nfs4proc.c
32162--- linux-2.6.32.14/fs/nfs/nfs4proc.c 2010-04-29 17:49:38.445067399 -0400 32174--- linux-2.6.32.15/fs/nfs/nfs4proc.c 2010-04-29 17:49:38.445067399 -0400
32163+++ linux-2.6.32.14/fs/nfs/nfs4proc.c 2010-05-28 21:27:16.210892100 -0400 32175+++ linux-2.6.32.15/fs/nfs/nfs4proc.c 2010-05-28 21:27:16.210892100 -0400
32164@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct 32176@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct
32165 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) 32177 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
32166 { 32178 {
@@ -32431,9 +32443,9 @@ diff -urNp linux-2.6.32.14/fs/nfs/nfs4proc.c linux-2.6.32.14/fs/nfs/nfs4proc.c
32431 int err; 32443 int err;
32432 32444
32433 err = nfs4_set_lock_state(state, fl); 32445 err = nfs4_set_lock_state(state, fl);
32434diff -urNp linux-2.6.32.14/fs/nfsd/lockd.c linux-2.6.32.14/fs/nfsd/lockd.c 32446diff -urNp linux-2.6.32.15/fs/nfsd/lockd.c linux-2.6.32.15/fs/nfsd/lockd.c
32435--- linux-2.6.32.14/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400 32447--- linux-2.6.32.15/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400
32436+++ linux-2.6.32.14/fs/nfsd/lockd.c 2010-05-28 21:27:16.210892100 -0400 32448+++ linux-2.6.32.15/fs/nfsd/lockd.c 2010-05-28 21:27:16.210892100 -0400
32437@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) 32449@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
32438 fput(filp); 32450 fput(filp);
32439 } 32451 }
@@ -32443,9 +32455,9 @@ diff -urNp linux-2.6.32.14/fs/nfsd/lockd.c linux-2.6.32.14/fs/nfsd/lockd.c
32443 .fopen = nlm_fopen, /* open file for locking */ 32455 .fopen = nlm_fopen, /* open file for locking */
32444 .fclose = nlm_fclose, /* close file */ 32456 .fclose = nlm_fclose, /* close file */
32445 }; 32457 };
32446diff -urNp linux-2.6.32.14/fs/nfsd/vfs.c linux-2.6.32.14/fs/nfsd/vfs.c 32458diff -urNp linux-2.6.32.15/fs/nfsd/vfs.c linux-2.6.32.15/fs/nfsd/vfs.c
32447--- linux-2.6.32.14/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400 32459--- linux-2.6.32.15/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400
32448+++ linux-2.6.32.14/fs/nfsd/vfs.c 2010-05-28 21:27:16.218925750 -0400 32460+++ linux-2.6.32.15/fs/nfsd/vfs.c 2010-05-28 21:27:16.218925750 -0400
32449@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st 32461@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
32450 } else { 32462 } else {
32451 oldfs = get_fs(); 32463 oldfs = get_fs();
@@ -32473,9 +32485,9 @@ diff -urNp linux-2.6.32.14/fs/nfsd/vfs.c linux-2.6.32.14/fs/nfsd/vfs.c
32473 set_fs(oldfs); 32485 set_fs(oldfs);
32474 32486
32475 if (host_err < 0) 32487 if (host_err < 0)
32476diff -urNp linux-2.6.32.14/fs/nls/nls_base.c linux-2.6.32.14/fs/nls/nls_base.c 32488diff -urNp linux-2.6.32.15/fs/nls/nls_base.c linux-2.6.32.15/fs/nls/nls_base.c
32477--- linux-2.6.32.14/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400 32489--- linux-2.6.32.15/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400
32478+++ linux-2.6.32.14/fs/nls/nls_base.c 2010-05-28 21:27:16.218925750 -0400 32490+++ linux-2.6.32.15/fs/nls/nls_base.c 2010-05-28 21:27:16.218925750 -0400
32479@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl 32491@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
32480 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, 32492 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
32481 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, 32493 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
@@ -32485,9 +32497,9 @@ diff -urNp linux-2.6.32.14/fs/nls/nls_base.c linux-2.6.32.14/fs/nls/nls_base.c
32485 }; 32497 };
32486 32498
32487 #define UNICODE_MAX 0x0010ffff 32499 #define UNICODE_MAX 0x0010ffff
32488diff -urNp linux-2.6.32.14/fs/ntfs/file.c linux-2.6.32.14/fs/ntfs/file.c 32500diff -urNp linux-2.6.32.15/fs/ntfs/file.c linux-2.6.32.15/fs/ntfs/file.c
32489--- linux-2.6.32.14/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400 32501--- linux-2.6.32.15/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400
32490+++ linux-2.6.32.14/fs/ntfs/file.c 2010-05-28 21:27:16.227248042 -0400 32502+++ linux-2.6.32.15/fs/ntfs/file.c 2010-05-28 21:27:16.227248042 -0400
32491@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ 32503@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
32492 #endif /* NTFS_RW */ 32504 #endif /* NTFS_RW */
32493 }; 32505 };
@@ -32497,9 +32509,9 @@ diff -urNp linux-2.6.32.14/fs/ntfs/file.c linux-2.6.32.14/fs/ntfs/file.c
32497 32509
32498-const struct inode_operations ntfs_empty_inode_ops = {}; 32510-const struct inode_operations ntfs_empty_inode_ops = {};
32499+const struct inode_operations ntfs_empty_inode_ops __read_only; 32511+const struct inode_operations ntfs_empty_inode_ops __read_only;
32500diff -urNp linux-2.6.32.14/fs/ocfs2/cluster/masklog.c linux-2.6.32.14/fs/ocfs2/cluster/masklog.c 32512diff -urNp linux-2.6.32.15/fs/ocfs2/cluster/masklog.c linux-2.6.32.15/fs/ocfs2/cluster/masklog.c
32501--- linux-2.6.32.14/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400 32513--- linux-2.6.32.15/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400
32502+++ linux-2.6.32.14/fs/ocfs2/cluster/masklog.c 2010-05-28 21:27:16.227248042 -0400 32514+++ linux-2.6.32.15/fs/ocfs2/cluster/masklog.c 2010-05-28 21:27:16.227248042 -0400
32503@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject 32515@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
32504 return mlog_mask_store(mlog_attr->mask, buf, count); 32516 return mlog_mask_store(mlog_attr->mask, buf, count);
32505 } 32517 }
@@ -32509,9 +32521,9 @@ diff -urNp linux-2.6.32.14/fs/ocfs2/cluster/masklog.c linux-2.6.32.14/fs/ocfs2/c
32509 .show = mlog_show, 32521 .show = mlog_show,
32510 .store = mlog_store, 32522 .store = mlog_store,
32511 }; 32523 };
32512diff -urNp linux-2.6.32.14/fs/ocfs2/localalloc.c linux-2.6.32.14/fs/ocfs2/localalloc.c 32524diff -urNp linux-2.6.32.15/fs/ocfs2/localalloc.c linux-2.6.32.15/fs/ocfs2/localalloc.c
32513--- linux-2.6.32.14/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400 32525--- linux-2.6.32.15/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400
32514+++ linux-2.6.32.14/fs/ocfs2/localalloc.c 2010-05-28 21:27:16.227248042 -0400 32526+++ linux-2.6.32.15/fs/ocfs2/localalloc.c 2010-05-28 21:27:16.227248042 -0400
32515@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo 32527@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
32516 goto bail; 32528 goto bail;
32517 } 32529 }
@@ -32521,9 +32533,9 @@ diff -urNp linux-2.6.32.14/fs/ocfs2/localalloc.c linux-2.6.32.14/fs/ocfs2/locala
32521 32533
32522 status = 0; 32534 status = 0;
32523 bail: 32535 bail:
32524diff -urNp linux-2.6.32.14/fs/ocfs2/ocfs2.h linux-2.6.32.14/fs/ocfs2/ocfs2.h 32536diff -urNp linux-2.6.32.15/fs/ocfs2/ocfs2.h linux-2.6.32.15/fs/ocfs2/ocfs2.h
32525--- linux-2.6.32.14/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400 32537--- linux-2.6.32.15/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400
32526+++ linux-2.6.32.14/fs/ocfs2/ocfs2.h 2010-05-28 21:27:16.227248042 -0400 32538+++ linux-2.6.32.15/fs/ocfs2/ocfs2.h 2010-05-28 21:27:16.227248042 -0400
32527@@ -217,11 +217,11 @@ enum ocfs2_vol_state 32539@@ -217,11 +217,11 @@ enum ocfs2_vol_state
32528 32540
32529 struct ocfs2_alloc_stats 32541 struct ocfs2_alloc_stats
@@ -32541,9 +32553,9 @@ diff -urNp linux-2.6.32.14/fs/ocfs2/ocfs2.h linux-2.6.32.14/fs/ocfs2/ocfs2.h
32541 }; 32553 };
32542 32554
32543 enum ocfs2_local_alloc_state 32555 enum ocfs2_local_alloc_state
32544diff -urNp linux-2.6.32.14/fs/ocfs2/suballoc.c linux-2.6.32.14/fs/ocfs2/suballoc.c 32556diff -urNp linux-2.6.32.15/fs/ocfs2/suballoc.c linux-2.6.32.15/fs/ocfs2/suballoc.c
32545--- linux-2.6.32.14/fs/ocfs2/suballoc.c 2010-04-29 17:49:38.449086403 -0400 32557--- linux-2.6.32.15/fs/ocfs2/suballoc.c 2010-04-29 17:49:38.449086403 -0400
32546+++ linux-2.6.32.14/fs/ocfs2/suballoc.c 2010-05-28 21:27:16.227248042 -0400 32558+++ linux-2.6.32.15/fs/ocfs2/suballoc.c 2010-05-28 21:27:16.227248042 -0400
32547@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s 32559@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
32548 mlog_errno(status); 32560 mlog_errno(status);
32549 goto bail; 32561 goto bail;
@@ -32589,9 +32601,9 @@ diff -urNp linux-2.6.32.14/fs/ocfs2/suballoc.c linux-2.6.32.14/fs/ocfs2/suballoc
32589 } 32601 }
32590 } 32602 }
32591 if (status < 0) { 32603 if (status < 0) {
32592diff -urNp linux-2.6.32.14/fs/ocfs2/super.c linux-2.6.32.14/fs/ocfs2/super.c 32604diff -urNp linux-2.6.32.15/fs/ocfs2/super.c linux-2.6.32.15/fs/ocfs2/super.c
32593--- linux-2.6.32.14/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400 32605--- linux-2.6.32.15/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400
32594+++ linux-2.6.32.14/fs/ocfs2/super.c 2010-05-28 21:27:16.247317121 -0400 32606+++ linux-2.6.32.15/fs/ocfs2/super.c 2010-05-28 21:27:16.247317121 -0400
32595@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s 32607@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
32596 "%10s => GlobalAllocs: %d LocalAllocs: %d " 32608 "%10s => GlobalAllocs: %d LocalAllocs: %d "
32597 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", 32609 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
@@ -32626,9 +32638,9 @@ diff -urNp linux-2.6.32.14/fs/ocfs2/super.c linux-2.6.32.14/fs/ocfs2/super.c
32626 32638
32627 /* Copy the blockcheck stats from the superblock probe */ 32639 /* Copy the blockcheck stats from the superblock probe */
32628 osb->osb_ecc_stats = *stats; 32640 osb->osb_ecc_stats = *stats;
32629diff -urNp linux-2.6.32.14/fs/open.c linux-2.6.32.14/fs/open.c 32641diff -urNp linux-2.6.32.15/fs/open.c linux-2.6.32.15/fs/open.c
32630--- linux-2.6.32.14/fs/open.c 2010-03-15 11:52:04.000000000 -0400 32642--- linux-2.6.32.15/fs/open.c 2010-03-15 11:52:04.000000000 -0400
32631+++ linux-2.6.32.14/fs/open.c 2010-05-28 21:27:16.247317121 -0400 32643+++ linux-2.6.32.15/fs/open.c 2010-05-28 21:27:16.247317121 -0400
32632@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l 32644@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l
32633 if (length < 0) 32645 if (length < 0)
32634 return -EINVAL; 32646 return -EINVAL;
@@ -32802,9 +32814,9 @@ diff -urNp linux-2.6.32.14/fs/open.c linux-2.6.32.14/fs/open.c
32802 mnt_drop_write(file->f_path.mnt); 32814 mnt_drop_write(file->f_path.mnt);
32803 out_fput: 32815 out_fput:
32804 fput(file); 32816 fput(file);
32805diff -urNp linux-2.6.32.14/fs/pipe.c linux-2.6.32.14/fs/pipe.c 32817diff -urNp linux-2.6.32.15/fs/pipe.c linux-2.6.32.15/fs/pipe.c
32806--- linux-2.6.32.14/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400 32818--- linux-2.6.32.15/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400
32807+++ linux-2.6.32.14/fs/pipe.c 2010-05-28 21:27:16.247317121 -0400 32819+++ linux-2.6.32.15/fs/pipe.c 2010-05-28 21:27:16.247317121 -0400
32808@@ -401,9 +401,9 @@ redo: 32820@@ -401,9 +401,9 @@ redo:
32809 } 32821 }
32810 if (bufs) /* More to do? */ 32822 if (bufs) /* More to do? */
@@ -32928,9 +32940,9 @@ diff -urNp linux-2.6.32.14/fs/pipe.c linux-2.6.32.14/fs/pipe.c
32928 inode->i_fop = &rdwr_pipefifo_fops; 32940 inode->i_fop = &rdwr_pipefifo_fops;
32929 32941
32930 /* 32942 /*
32931diff -urNp linux-2.6.32.14/fs/proc/array.c linux-2.6.32.14/fs/proc/array.c 32943diff -urNp linux-2.6.32.15/fs/proc/array.c linux-2.6.32.15/fs/proc/array.c
32932--- linux-2.6.32.14/fs/proc/array.c 2010-05-28 20:16:44.454934408 -0400 32944--- linux-2.6.32.15/fs/proc/array.c 2010-05-28 20:16:44.454934408 -0400
32933+++ linux-2.6.32.14/fs/proc/array.c 2010-05-28 22:32:01.011402212 -0400 32945+++ linux-2.6.32.15/fs/proc/array.c 2010-05-28 22:32:01.011402212 -0400
32934@@ -321,6 +321,21 @@ static inline void task_context_switch_c 32946@@ -321,6 +321,21 @@ static inline void task_context_switch_c
32935 p->nivcsw); 32947 p->nivcsw);
32936 } 32948 }
@@ -33021,9 +33033,9 @@ diff -urNp linux-2.6.32.14/fs/proc/array.c linux-2.6.32.14/fs/proc/array.c
33021+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); 33033+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
33022+} 33034+}
33023+#endif 33035+#endif
33024diff -urNp linux-2.6.32.14/fs/proc/base.c linux-2.6.32.14/fs/proc/base.c 33036diff -urNp linux-2.6.32.15/fs/proc/base.c linux-2.6.32.15/fs/proc/base.c
33025--- linux-2.6.32.14/fs/proc/base.c 2010-05-15 13:20:19.242597763 -0400 33037--- linux-2.6.32.15/fs/proc/base.c 2010-05-15 13:20:19.242597763 -0400
33026+++ linux-2.6.32.14/fs/proc/base.c 2010-05-28 21:27:16.250934990 -0400 33038+++ linux-2.6.32.15/fs/proc/base.c 2010-05-28 21:27:16.250934990 -0400
33027@@ -102,6 +102,22 @@ struct pid_entry { 33039@@ -102,6 +102,22 @@ struct pid_entry {
33028 union proc_op op; 33040 union proc_op op;
33029 }; 33041 };
@@ -33389,9 +33401,9 @@ diff -urNp linux-2.6.32.14/fs/proc/base.c linux-2.6.32.14/fs/proc/base.c
33389 ONE("stack", S_IRUSR, proc_pid_stack), 33401 ONE("stack", S_IRUSR, proc_pid_stack),
33390 #endif 33402 #endif
33391 #ifdef CONFIG_SCHEDSTATS 33403 #ifdef CONFIG_SCHEDSTATS
33392diff -urNp linux-2.6.32.14/fs/proc/cmdline.c linux-2.6.32.14/fs/proc/cmdline.c 33404diff -urNp linux-2.6.32.15/fs/proc/cmdline.c linux-2.6.32.15/fs/proc/cmdline.c
33393--- linux-2.6.32.14/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400 33405--- linux-2.6.32.15/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400
33394+++ linux-2.6.32.14/fs/proc/cmdline.c 2010-05-28 21:27:16.250934990 -0400 33406+++ linux-2.6.32.15/fs/proc/cmdline.c 2010-05-28 21:27:16.250934990 -0400
33395@@ -23,7 +23,11 @@ static const struct file_operations cmdl 33407@@ -23,7 +23,11 @@ static const struct file_operations cmdl
33396 33408
33397 static int __init proc_cmdline_init(void) 33409 static int __init proc_cmdline_init(void)
@@ -33404,9 +33416,9 @@ diff -urNp linux-2.6.32.14/fs/proc/cmdline.c linux-2.6.32.14/fs/proc/cmdline.c
33404 return 0; 33416 return 0;
33405 } 33417 }
33406 module_init(proc_cmdline_init); 33418 module_init(proc_cmdline_init);
33407diff -urNp linux-2.6.32.14/fs/proc/devices.c linux-2.6.32.14/fs/proc/devices.c 33419diff -urNp linux-2.6.32.15/fs/proc/devices.c linux-2.6.32.15/fs/proc/devices.c
33408--- linux-2.6.32.14/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400 33420--- linux-2.6.32.15/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400
33409+++ linux-2.6.32.14/fs/proc/devices.c 2010-05-28 21:27:16.250934990 -0400 33421+++ linux-2.6.32.15/fs/proc/devices.c 2010-05-28 21:27:16.250934990 -0400
33410@@ -64,7 +64,11 @@ static const struct file_operations proc 33422@@ -64,7 +64,11 @@ static const struct file_operations proc
33411 33423
33412 static int __init proc_devices_init(void) 33424 static int __init proc_devices_init(void)
@@ -33419,9 +33431,9 @@ diff -urNp linux-2.6.32.14/fs/proc/devices.c linux-2.6.32.14/fs/proc/devices.c
33419 return 0; 33431 return 0;
33420 } 33432 }
33421 module_init(proc_devices_init); 33433 module_init(proc_devices_init);
33422diff -urNp linux-2.6.32.14/fs/proc/inode.c linux-2.6.32.14/fs/proc/inode.c 33434diff -urNp linux-2.6.32.15/fs/proc/inode.c linux-2.6.32.15/fs/proc/inode.c
33423--- linux-2.6.32.14/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400 33435--- linux-2.6.32.15/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400
33424+++ linux-2.6.32.14/fs/proc/inode.c 2010-05-28 21:27:16.250934990 -0400 33436+++ linux-2.6.32.15/fs/proc/inode.c 2010-05-28 21:27:16.250934990 -0400
33425@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe 33437@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
33426 if (de->mode) { 33438 if (de->mode) {
33427 inode->i_mode = de->mode; 33439 inode->i_mode = de->mode;
@@ -33434,9 +33446,9 @@ diff -urNp linux-2.6.32.14/fs/proc/inode.c linux-2.6.32.14/fs/proc/inode.c
33434 } 33446 }
33435 if (de->size) 33447 if (de->size)
33436 inode->i_size = de->size; 33448 inode->i_size = de->size;
33437diff -urNp linux-2.6.32.14/fs/proc/internal.h linux-2.6.32.14/fs/proc/internal.h 33449diff -urNp linux-2.6.32.15/fs/proc/internal.h linux-2.6.32.15/fs/proc/internal.h
33438--- linux-2.6.32.14/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400 33450--- linux-2.6.32.15/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400
33439+++ linux-2.6.32.14/fs/proc/internal.h 2010-05-28 21:27:16.250934990 -0400 33451+++ linux-2.6.32.15/fs/proc/internal.h 2010-05-28 21:27:16.250934990 -0400
33440@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi 33452@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
33441 struct pid *pid, struct task_struct *task); 33453 struct pid *pid, struct task_struct *task);
33442 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, 33454 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -33447,9 +33459,9 @@ diff -urNp linux-2.6.32.14/fs/proc/internal.h linux-2.6.32.14/fs/proc/internal.h
33447 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); 33459 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
33448 33460
33449 extern const struct file_operations proc_maps_operations; 33461 extern const struct file_operations proc_maps_operations;
33450diff -urNp linux-2.6.32.14/fs/proc/Kconfig linux-2.6.32.14/fs/proc/Kconfig 33462diff -urNp linux-2.6.32.15/fs/proc/Kconfig linux-2.6.32.15/fs/proc/Kconfig
33451--- linux-2.6.32.14/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400 33463--- linux-2.6.32.15/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400
33452+++ linux-2.6.32.14/fs/proc/Kconfig 2010-05-28 21:27:16.250934990 -0400 33464+++ linux-2.6.32.15/fs/proc/Kconfig 2010-05-28 21:27:16.250934990 -0400
33453@@ -30,12 +30,12 @@ config PROC_FS 33465@@ -30,12 +30,12 @@ config PROC_FS
33454 33466
33455 config PROC_KCORE 33467 config PROC_KCORE
@@ -33477,9 +33489,9 @@ diff -urNp linux-2.6.32.14/fs/proc/Kconfig linux-2.6.32.14/fs/proc/Kconfig
33477 bool "Enable /proc page monitoring" if EMBEDDED 33489 bool "Enable /proc page monitoring" if EMBEDDED
33478 help 33490 help
33479 Various /proc files exist to monitor process memory utilization: 33491 Various /proc files exist to monitor process memory utilization:
33480diff -urNp linux-2.6.32.14/fs/proc/kcore.c linux-2.6.32.14/fs/proc/kcore.c 33492diff -urNp linux-2.6.32.15/fs/proc/kcore.c linux-2.6.32.15/fs/proc/kcore.c
33481--- linux-2.6.32.14/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400 33493--- linux-2.6.32.15/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400
33482+++ linux-2.6.32.14/fs/proc/kcore.c 2010-05-28 21:27:16.250934990 -0400 33494+++ linux-2.6.32.15/fs/proc/kcore.c 2010-05-28 21:27:16.250934990 -0400
33483@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use 33495@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use
33484 33496
33485 static int open_kcore(struct inode *inode, struct file *filp) 33497 static int open_kcore(struct inode *inode, struct file *filp)
@@ -33490,9 +33502,9 @@ diff -urNp linux-2.6.32.14/fs/proc/kcore.c linux-2.6.32.14/fs/proc/kcore.c
33490 if (!capable(CAP_SYS_RAWIO)) 33502 if (!capable(CAP_SYS_RAWIO))
33491 return -EPERM; 33503 return -EPERM;
33492 if (kcore_need_update) 33504 if (kcore_need_update)
33493diff -urNp linux-2.6.32.14/fs/proc/meminfo.c linux-2.6.32.14/fs/proc/meminfo.c 33505diff -urNp linux-2.6.32.15/fs/proc/meminfo.c linux-2.6.32.15/fs/proc/meminfo.c
33494--- linux-2.6.32.14/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400 33506--- linux-2.6.32.15/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400
33495+++ linux-2.6.32.14/fs/proc/meminfo.c 2010-05-28 21:27:16.250934990 -0400 33507+++ linux-2.6.32.15/fs/proc/meminfo.c 2010-05-28 21:27:16.250934990 -0400
33496@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ 33508@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
33497 vmi.used >> 10, 33509 vmi.used >> 10,
33498 vmi.largest_chunk >> 10 33510 vmi.largest_chunk >> 10
@@ -33502,9 +33514,9 @@ diff -urNp linux-2.6.32.14/fs/proc/meminfo.c linux-2.6.32.14/fs/proc/meminfo.c
33502 #endif 33514 #endif
33503 ); 33515 );
33504 33516
33505diff -urNp linux-2.6.32.14/fs/proc/nommu.c linux-2.6.32.14/fs/proc/nommu.c 33517diff -urNp linux-2.6.32.15/fs/proc/nommu.c linux-2.6.32.15/fs/proc/nommu.c
33506--- linux-2.6.32.14/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400 33518--- linux-2.6.32.15/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400
33507+++ linux-2.6.32.14/fs/proc/nommu.c 2010-05-28 21:27:16.250934990 -0400 33519+++ linux-2.6.32.15/fs/proc/nommu.c 2010-05-28 21:27:16.250934990 -0400
33508@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ 33520@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
33509 if (len < 1) 33521 if (len < 1)
33510 len = 1; 33522 len = 1;
@@ -33514,9 +33526,9 @@ diff -urNp linux-2.6.32.14/fs/proc/nommu.c linux-2.6.32.14/fs/proc/nommu.c
33514 } 33526 }
33515 33527
33516 seq_putc(m, '\n'); 33528 seq_putc(m, '\n');
33517diff -urNp linux-2.6.32.14/fs/proc/proc_net.c linux-2.6.32.14/fs/proc/proc_net.c 33529diff -urNp linux-2.6.32.15/fs/proc/proc_net.c linux-2.6.32.15/fs/proc/proc_net.c
33518--- linux-2.6.32.14/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400 33530--- linux-2.6.32.15/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400
33519+++ linux-2.6.32.14/fs/proc/proc_net.c 2010-05-28 21:27:16.250934990 -0400 33531+++ linux-2.6.32.15/fs/proc/proc_net.c 2010-05-28 21:27:16.250934990 -0400
33520@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str 33532@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
33521 struct task_struct *task; 33533 struct task_struct *task;
33522 struct nsproxy *ns; 33534 struct nsproxy *ns;
@@ -33535,9 +33547,9 @@ diff -urNp linux-2.6.32.14/fs/proc/proc_net.c linux-2.6.32.14/fs/proc/proc_net.c
33535 33547
33536 rcu_read_lock(); 33548 rcu_read_lock();
33537 task = pid_task(proc_pid(dir), PIDTYPE_PID); 33549 task = pid_task(proc_pid(dir), PIDTYPE_PID);
33538diff -urNp linux-2.6.32.14/fs/proc/proc_sysctl.c linux-2.6.32.14/fs/proc/proc_sysctl.c 33550diff -urNp linux-2.6.32.15/fs/proc/proc_sysctl.c linux-2.6.32.15/fs/proc/proc_sysctl.c
33539--- linux-2.6.32.14/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 33551--- linux-2.6.32.15/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400
33540+++ linux-2.6.32.14/fs/proc/proc_sysctl.c 2010-05-28 21:27:16.250934990 -0400 33552+++ linux-2.6.32.15/fs/proc/proc_sysctl.c 2010-05-28 21:27:16.250934990 -0400
33541@@ -7,6 +7,8 @@ 33553@@ -7,6 +7,8 @@
33542 #include <linux/security.h> 33554 #include <linux/security.h>
33543 #include "internal.h" 33555 #include "internal.h"
@@ -33577,9 +33589,9 @@ diff -urNp linux-2.6.32.14/fs/proc/proc_sysctl.c linux-2.6.32.14/fs/proc/proc_sy
33577 generic_fillattr(inode, stat); 33589 generic_fillattr(inode, stat);
33578 if (table) 33590 if (table)
33579 stat->mode = (stat->mode & S_IFMT) | table->mode; 33591 stat->mode = (stat->mode & S_IFMT) | table->mode;
33580diff -urNp linux-2.6.32.14/fs/proc/root.c linux-2.6.32.14/fs/proc/root.c 33592diff -urNp linux-2.6.32.15/fs/proc/root.c linux-2.6.32.15/fs/proc/root.c
33581--- linux-2.6.32.14/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400 33593--- linux-2.6.32.15/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400
33582+++ linux-2.6.32.14/fs/proc/root.c 2010-05-28 21:27:16.250934990 -0400 33594+++ linux-2.6.32.15/fs/proc/root.c 2010-05-28 21:27:16.250934990 -0400
33583@@ -134,7 +134,15 @@ void __init proc_root_init(void) 33595@@ -134,7 +134,15 @@ void __init proc_root_init(void)
33584 #ifdef CONFIG_PROC_DEVICETREE 33596 #ifdef CONFIG_PROC_DEVICETREE
33585 proc_device_tree_init(); 33597 proc_device_tree_init();
@@ -33596,9 +33608,9 @@ diff -urNp linux-2.6.32.14/fs/proc/root.c linux-2.6.32.14/fs/proc/root.c
33596 proc_sys_init(); 33608 proc_sys_init();
33597 } 33609 }
33598 33610
33599diff -urNp linux-2.6.32.14/fs/proc/task_mmu.c linux-2.6.32.14/fs/proc/task_mmu.c 33611diff -urNp linux-2.6.32.15/fs/proc/task_mmu.c linux-2.6.32.15/fs/proc/task_mmu.c
33600--- linux-2.6.32.14/fs/proc/task_mmu.c 2010-05-28 20:16:44.454934408 -0400 33612--- linux-2.6.32.15/fs/proc/task_mmu.c 2010-05-28 20:16:44.454934408 -0400
33601+++ linux-2.6.32.14/fs/proc/task_mmu.c 2010-05-28 21:27:16.250934990 -0400 33613+++ linux-2.6.32.15/fs/proc/task_mmu.c 2010-05-28 21:27:16.250934990 -0400
33602@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct 33614@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
33603 "VmStk:\t%8lu kB\n" 33615 "VmStk:\t%8lu kB\n"
33604 "VmExe:\t%8lu kB\n" 33616 "VmExe:\t%8lu kB\n"
@@ -33719,9 +33731,9 @@ diff -urNp linux-2.6.32.14/fs/proc/task_mmu.c linux-2.6.32.14/fs/proc/task_mmu.c
33719 mss.resident >> 10, 33731 mss.resident >> 10,
33720 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), 33732 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
33721 mss.shared_clean >> 10, 33733 mss.shared_clean >> 10,
33722diff -urNp linux-2.6.32.14/fs/proc/task_nommu.c linux-2.6.32.14/fs/proc/task_nommu.c 33734diff -urNp linux-2.6.32.15/fs/proc/task_nommu.c linux-2.6.32.15/fs/proc/task_nommu.c
33723--- linux-2.6.32.14/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400 33735--- linux-2.6.32.15/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400
33724+++ linux-2.6.32.14/fs/proc/task_nommu.c 2010-05-28 21:27:16.250934990 -0400 33736+++ linux-2.6.32.15/fs/proc/task_nommu.c 2010-05-28 21:27:16.250934990 -0400
33725@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct 33737@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
33726 else 33738 else
33727 bytes += kobjsize(mm); 33739 bytes += kobjsize(mm);
@@ -33740,9 +33752,9 @@ diff -urNp linux-2.6.32.14/fs/proc/task_nommu.c linux-2.6.32.14/fs/proc/task_nom
33740 } 33752 }
33741 33753
33742 seq_putc(m, '\n'); 33754 seq_putc(m, '\n');
33743diff -urNp linux-2.6.32.14/fs/readdir.c linux-2.6.32.14/fs/readdir.c 33755diff -urNp linux-2.6.32.15/fs/readdir.c linux-2.6.32.15/fs/readdir.c
33744--- linux-2.6.32.14/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400 33756--- linux-2.6.32.15/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400
33745+++ linux-2.6.32.14/fs/readdir.c 2010-05-28 21:27:16.250934990 -0400 33757+++ linux-2.6.32.15/fs/readdir.c 2010-05-28 21:27:16.250934990 -0400
33746@@ -16,6 +16,7 @@ 33758@@ -16,6 +16,7 @@
33747 #include <linux/security.h> 33759 #include <linux/security.h>
33748 #include <linux/syscalls.h> 33760 #include <linux/syscalls.h>
@@ -33832,9 +33844,9 @@ diff -urNp linux-2.6.32.14/fs/readdir.c linux-2.6.32.14/fs/readdir.c
33832 buf.count = count; 33844 buf.count = count;
33833 buf.error = 0; 33845 buf.error = 0;
33834 33846
33835diff -urNp linux-2.6.32.14/fs/reiserfs/do_balan.c linux-2.6.32.14/fs/reiserfs/do_balan.c 33847diff -urNp linux-2.6.32.15/fs/reiserfs/do_balan.c linux-2.6.32.15/fs/reiserfs/do_balan.c
33836--- linux-2.6.32.14/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400 33848--- linux-2.6.32.15/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400
33837+++ linux-2.6.32.14/fs/reiserfs/do_balan.c 2010-05-28 21:27:16.255227340 -0400 33849+++ linux-2.6.32.15/fs/reiserfs/do_balan.c 2010-05-28 21:27:16.255227340 -0400
33838@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, 33850@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
33839 return; 33851 return;
33840 } 33852 }
@@ -33844,9 +33856,9 @@ diff -urNp linux-2.6.32.14/fs/reiserfs/do_balan.c linux-2.6.32.14/fs/reiserfs/do
33844 do_balance_starts(tb); 33856 do_balance_starts(tb);
33845 33857
33846 /* balance leaf returns 0 except if combining L R and S into 33858 /* balance leaf returns 0 except if combining L R and S into
33847diff -urNp linux-2.6.32.14/fs/reiserfs/item_ops.c linux-2.6.32.14/fs/reiserfs/item_ops.c 33859diff -urNp linux-2.6.32.15/fs/reiserfs/item_ops.c linux-2.6.32.15/fs/reiserfs/item_ops.c
33848--- linux-2.6.32.14/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400 33860--- linux-2.6.32.15/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400
33849+++ linux-2.6.32.14/fs/reiserfs/item_ops.c 2010-05-28 21:27:16.255227340 -0400 33861+++ linux-2.6.32.15/fs/reiserfs/item_ops.c 2010-05-28 21:27:16.255227340 -0400
33850@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i 33862@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
33851 vi->vi_index, vi->vi_type, vi->vi_ih); 33863 vi->vi_index, vi->vi_type, vi->vi_ih);
33852 } 33864 }
@@ -33901,9 +33913,9 @@ diff -urNp linux-2.6.32.14/fs/reiserfs/item_ops.c linux-2.6.32.14/fs/reiserfs/it
33901 &stat_data_ops, 33913 &stat_data_ops,
33902 &indirect_ops, 33914 &indirect_ops,
33903 &direct_ops, 33915 &direct_ops,
33904diff -urNp linux-2.6.32.14/fs/reiserfs/procfs.c linux-2.6.32.14/fs/reiserfs/procfs.c 33916diff -urNp linux-2.6.32.15/fs/reiserfs/procfs.c linux-2.6.32.15/fs/reiserfs/procfs.c
33905--- linux-2.6.32.14/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400 33917--- linux-2.6.32.15/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400
33906+++ linux-2.6.32.14/fs/reiserfs/procfs.c 2010-05-28 21:27:16.255227340 -0400 33918+++ linux-2.6.32.15/fs/reiserfs/procfs.c 2010-05-28 21:27:16.255227340 -0400
33907@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m 33919@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
33908 "SMALL_TAILS " : "NO_TAILS ", 33920 "SMALL_TAILS " : "NO_TAILS ",
33909 replay_only(sb) ? "REPLAY_ONLY " : "", 33921 replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -33913,9 +33925,9 @@ diff -urNp linux-2.6.32.14/fs/reiserfs/procfs.c linux-2.6.32.14/fs/reiserfs/proc
33913 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), 33925 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
33914 SF(s_do_balance), SF(s_unneeded_left_neighbor), 33926 SF(s_do_balance), SF(s_unneeded_left_neighbor),
33915 SF(s_good_search_by_key_reada), SF(s_bmaps), 33927 SF(s_good_search_by_key_reada), SF(s_bmaps),
33916diff -urNp linux-2.6.32.14/fs/select.c linux-2.6.32.14/fs/select.c 33928diff -urNp linux-2.6.32.15/fs/select.c linux-2.6.32.15/fs/select.c
33917--- linux-2.6.32.14/fs/select.c 2010-03-15 11:52:04.000000000 -0400 33929--- linux-2.6.32.15/fs/select.c 2010-03-15 11:52:04.000000000 -0400
33918+++ linux-2.6.32.14/fs/select.c 2010-05-28 21:27:16.263231213 -0400 33930+++ linux-2.6.32.15/fs/select.c 2010-05-28 21:27:16.263231213 -0400
33919@@ -20,6 +20,7 @@ 33931@@ -20,6 +20,7 @@
33920 #include <linux/module.h> 33932 #include <linux/module.h>
33921 #include <linux/slab.h> 33933 #include <linux/slab.h>
@@ -33932,9 +33944,9 @@ diff -urNp linux-2.6.32.14/fs/select.c linux-2.6.32.14/fs/select.c
33932 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 33944 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
33933 return -EINVAL; 33945 return -EINVAL;
33934 33946
33935diff -urNp linux-2.6.32.14/fs/seq_file.c linux-2.6.32.14/fs/seq_file.c 33947diff -urNp linux-2.6.32.15/fs/seq_file.c linux-2.6.32.15/fs/seq_file.c
33936--- linux-2.6.32.14/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400 33948--- linux-2.6.32.15/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400
33937+++ linux-2.6.32.14/fs/seq_file.c 2010-05-28 21:27:16.267126788 -0400 33949+++ linux-2.6.32.15/fs/seq_file.c 2010-05-28 21:27:16.267126788 -0400
33938@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 33950@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
33939 return 0; 33951 return 0;
33940 } 33952 }
@@ -33975,9 +33987,9 @@ diff -urNp linux-2.6.32.14/fs/seq_file.c linux-2.6.32.14/fs/seq_file.c
33975 if (!m->buf) 33987 if (!m->buf)
33976 goto Enomem; 33988 goto Enomem;
33977 m->count = 0; 33989 m->count = 0;
33978diff -urNp linux-2.6.32.14/fs/smbfs/symlink.c linux-2.6.32.14/fs/smbfs/symlink.c 33990diff -urNp linux-2.6.32.15/fs/smbfs/symlink.c linux-2.6.32.15/fs/smbfs/symlink.c
33979--- linux-2.6.32.14/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 33991--- linux-2.6.32.15/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400
33980+++ linux-2.6.32.14/fs/smbfs/symlink.c 2010-05-28 21:27:16.267126788 -0400 33992+++ linux-2.6.32.15/fs/smbfs/symlink.c 2010-05-28 21:27:16.267126788 -0400
33981@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent 33993@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
33982 33994
33983 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 33995 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -33987,9 +33999,9 @@ diff -urNp linux-2.6.32.14/fs/smbfs/symlink.c linux-2.6.32.14/fs/smbfs/symlink.c
33987 if (!IS_ERR(s)) 33999 if (!IS_ERR(s))
33988 __putname(s); 34000 __putname(s);
33989 } 34001 }
33990diff -urNp linux-2.6.32.14/fs/splice.c linux-2.6.32.14/fs/splice.c 34002diff -urNp linux-2.6.32.15/fs/splice.c linux-2.6.32.15/fs/splice.c
33991--- linux-2.6.32.14/fs/splice.c 2010-03-15 11:52:04.000000000 -0400 34003--- linux-2.6.32.15/fs/splice.c 2010-03-15 11:52:04.000000000 -0400
33992+++ linux-2.6.32.14/fs/splice.c 2010-05-28 21:27:16.267126788 -0400 34004+++ linux-2.6.32.15/fs/splice.c 2010-05-28 21:27:16.267126788 -0400
33993@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode 34005@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
33994 pipe_lock(pipe); 34006 pipe_lock(pipe);
33995 34007
@@ -34128,9 +34140,9 @@ diff -urNp linux-2.6.32.14/fs/splice.c linux-2.6.32.14/fs/splice.c
34128 ret = -EAGAIN; 34140 ret = -EAGAIN;
34129 34141
34130 pipe_unlock(ipipe); 34142 pipe_unlock(ipipe);
34131diff -urNp linux-2.6.32.14/fs/sysfs/file.c linux-2.6.32.14/fs/sysfs/file.c 34143diff -urNp linux-2.6.32.15/fs/sysfs/file.c linux-2.6.32.15/fs/sysfs/file.c
34132--- linux-2.6.32.14/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400 34144--- linux-2.6.32.15/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400
34133+++ linux-2.6.32.14/fs/sysfs/file.c 2010-05-28 21:27:16.267126788 -0400 34145+++ linux-2.6.32.15/fs/sysfs/file.c 2010-05-28 21:27:16.267126788 -0400
34134@@ -53,7 +53,7 @@ struct sysfs_buffer { 34146@@ -53,7 +53,7 @@ struct sysfs_buffer {
34135 size_t count; 34147 size_t count;
34136 loff_t pos; 34148 loff_t pos;
@@ -34167,9 +34179,9 @@ diff -urNp linux-2.6.32.14/fs/sysfs/file.c linux-2.6.32.14/fs/sysfs/file.c
34167 int error = -EACCES; 34179 int error = -EACCES;
34168 char *p; 34180 char *p;
34169 34181
34170diff -urNp linux-2.6.32.14/fs/sysfs/symlink.c linux-2.6.32.14/fs/sysfs/symlink.c 34182diff -urNp linux-2.6.32.15/fs/sysfs/symlink.c linux-2.6.32.15/fs/sysfs/symlink.c
34171--- linux-2.6.32.14/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 34183--- linux-2.6.32.15/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400
34172+++ linux-2.6.32.14/fs/sysfs/symlink.c 2010-05-28 21:27:16.267126788 -0400 34184+++ linux-2.6.32.15/fs/sysfs/symlink.c 2010-05-28 21:27:16.267126788 -0400
34173@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de 34185@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
34174 34186
34175 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) 34187 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -34179,9 +34191,9 @@ diff -urNp linux-2.6.32.14/fs/sysfs/symlink.c linux-2.6.32.14/fs/sysfs/symlink.c
34179 if (!IS_ERR(page)) 34191 if (!IS_ERR(page))
34180 free_page((unsigned long)page); 34192 free_page((unsigned long)page);
34181 } 34193 }
34182diff -urNp linux-2.6.32.14/fs/udf/balloc.c linux-2.6.32.14/fs/udf/balloc.c 34194diff -urNp linux-2.6.32.15/fs/udf/balloc.c linux-2.6.32.15/fs/udf/balloc.c
34183--- linux-2.6.32.14/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400 34195--- linux-2.6.32.15/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400
34184+++ linux-2.6.32.14/fs/udf/balloc.c 2010-05-28 21:27:16.267126788 -0400 34196+++ linux-2.6.32.15/fs/udf/balloc.c 2010-05-28 21:27:16.267126788 -0400
34185@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc 34197@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
34186 34198
34187 mutex_lock(&sbi->s_alloc_mutex); 34199 mutex_lock(&sbi->s_alloc_mutex);
@@ -34204,9 +34216,9 @@ diff -urNp linux-2.6.32.14/fs/udf/balloc.c linux-2.6.32.14/fs/udf/balloc.c
34204 udf_debug("%d < %d || %d + %d > %d\n", 34216 udf_debug("%d < %d || %d + %d > %d\n",
34205 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, 34217 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
34206 partmap->s_partition_len); 34218 partmap->s_partition_len);
34207diff -urNp linux-2.6.32.14/fs/udf/misc.c linux-2.6.32.14/fs/udf/misc.c 34219diff -urNp linux-2.6.32.15/fs/udf/misc.c linux-2.6.32.15/fs/udf/misc.c
34208--- linux-2.6.32.14/fs/udf/misc.c 2010-03-15 11:52:04.000000000 -0400 34220--- linux-2.6.32.15/fs/udf/misc.c 2010-03-15 11:52:04.000000000 -0400
34209+++ linux-2.6.32.14/fs/udf/misc.c 2010-05-28 21:27:16.271177364 -0400 34221+++ linux-2.6.32.15/fs/udf/misc.c 2010-05-28 21:27:16.271177364 -0400
34210@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat 34222@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
34211 iinfo->i_lenEAttr += size; 34223 iinfo->i_lenEAttr += size;
34212 return (struct genericFormat *)&ea[offset]; 34224 return (struct genericFormat *)&ea[offset];
@@ -34218,9 +34230,9 @@ diff -urNp linux-2.6.32.14/fs/udf/misc.c linux-2.6.32.14/fs/udf/misc.c
34218 34230
34219 return NULL; 34231 return NULL;
34220 } 34232 }
34221diff -urNp linux-2.6.32.14/fs/udf/udfdecl.h linux-2.6.32.14/fs/udf/udfdecl.h 34233diff -urNp linux-2.6.32.15/fs/udf/udfdecl.h linux-2.6.32.15/fs/udf/udfdecl.h
34222--- linux-2.6.32.14/fs/udf/udfdecl.h 2010-03-15 11:52:04.000000000 -0400 34234--- linux-2.6.32.15/fs/udf/udfdecl.h 2010-03-15 11:52:04.000000000 -0400
34223+++ linux-2.6.32.14/fs/udf/udfdecl.h 2010-05-28 21:27:16.271177364 -0400 34235+++ linux-2.6.32.15/fs/udf/udfdecl.h 2010-05-28 21:27:16.271177364 -0400
34224@@ -26,7 +26,7 @@ do { \ 34236@@ -26,7 +26,7 @@ do { \
34225 printk(f, ##a); \ 34237 printk(f, ##a); \
34226 } while (0) 34238 } while (0)
@@ -34230,9 +34242,9 @@ diff -urNp linux-2.6.32.14/fs/udf/udfdecl.h linux-2.6.32.14/fs/udf/udfdecl.h
34230 #endif 34242 #endif
34231 34243
34232 #define udf_info(f, a...) \ 34244 #define udf_info(f, a...) \
34233diff -urNp linux-2.6.32.14/fs/utimes.c linux-2.6.32.14/fs/utimes.c 34245diff -urNp linux-2.6.32.15/fs/utimes.c linux-2.6.32.15/fs/utimes.c
34234--- linux-2.6.32.14/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400 34246--- linux-2.6.32.15/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400
34235+++ linux-2.6.32.14/fs/utimes.c 2010-05-28 21:27:16.271177364 -0400 34247+++ linux-2.6.32.15/fs/utimes.c 2010-05-28 21:27:16.271177364 -0400
34236@@ -1,6 +1,7 @@ 34248@@ -1,6 +1,7 @@
34237 #include <linux/compiler.h> 34249 #include <linux/compiler.h>
34238 #include <linux/file.h> 34250 #include <linux/file.h>
@@ -34254,9 +34266,9 @@ diff -urNp linux-2.6.32.14/fs/utimes.c linux-2.6.32.14/fs/utimes.c
34254 mutex_lock(&inode->i_mutex); 34266 mutex_lock(&inode->i_mutex);
34255 error = notify_change(path->dentry, &newattrs); 34267 error = notify_change(path->dentry, &newattrs);
34256 mutex_unlock(&inode->i_mutex); 34268 mutex_unlock(&inode->i_mutex);
34257diff -urNp linux-2.6.32.14/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.14/fs/xfs/linux-2.6/xfs_ioctl.c 34269diff -urNp linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c
34258--- linux-2.6.32.14/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400 34270--- linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400
34259+++ linux-2.6.32.14/fs/xfs/linux-2.6/xfs_ioctl.c 2010-05-28 21:27:16.275231809 -0400 34271+++ linux-2.6.32.15/fs/xfs/linux-2.6/xfs_ioctl.c 2010-05-28 21:27:16.275231809 -0400
34260@@ -134,7 +134,7 @@ xfs_find_handle( 34272@@ -134,7 +134,7 @@ xfs_find_handle(
34261 } 34273 }
34262 34274
@@ -34266,9 +34278,9 @@ diff -urNp linux-2.6.32.14/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.14/fs/xfs/l
34266 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) 34278 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
34267 goto out_put; 34279 goto out_put;
34268 34280
34269diff -urNp linux-2.6.32.14/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.14/fs/xfs/linux-2.6/xfs_iops.c 34281diff -urNp linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c
34270--- linux-2.6.32.14/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:38.453075413 -0400 34282--- linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:38.453075413 -0400
34271+++ linux-2.6.32.14/fs/xfs/linux-2.6/xfs_iops.c 2010-05-28 21:27:16.279036027 -0400 34283+++ linux-2.6.32.15/fs/xfs/linux-2.6/xfs_iops.c 2010-05-28 21:27:16.279036027 -0400
34272@@ -468,7 +468,7 @@ xfs_vn_put_link( 34284@@ -468,7 +468,7 @@ xfs_vn_put_link(
34273 struct nameidata *nd, 34285 struct nameidata *nd,
34274 void *p) 34286 void *p)
@@ -34278,9 +34290,9 @@ diff -urNp linux-2.6.32.14/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.14/fs/xfs/li
34278 34290
34279 if (!IS_ERR(s)) 34291 if (!IS_ERR(s))
34280 kfree(s); 34292 kfree(s);
34281diff -urNp linux-2.6.32.14/fs/xfs/xfs_bmap.c linux-2.6.32.14/fs/xfs/xfs_bmap.c 34293diff -urNp linux-2.6.32.15/fs/xfs/xfs_bmap.c linux-2.6.32.15/fs/xfs/xfs_bmap.c
34282--- linux-2.6.32.14/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400 34294--- linux-2.6.32.15/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400
34283+++ linux-2.6.32.14/fs/xfs/xfs_bmap.c 2010-05-28 21:27:16.327077893 -0400 34295+++ linux-2.6.32.15/fs/xfs/xfs_bmap.c 2010-05-28 21:27:16.327077893 -0400
34284@@ -360,7 +360,7 @@ xfs_bmap_validate_ret( 34296@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
34285 int nmap, 34297 int nmap,
34286 int ret_nmap); 34298 int ret_nmap);
@@ -34290,9 +34302,9 @@ diff -urNp linux-2.6.32.14/fs/xfs/xfs_bmap.c linux-2.6.32.14/fs/xfs/xfs_bmap.c
34290 #endif /* DEBUG */ 34302 #endif /* DEBUG */
34291 34303
34292 #if defined(XFS_RW_TRACE) 34304 #if defined(XFS_RW_TRACE)
34293diff -urNp linux-2.6.32.14/grsecurity/gracl_alloc.c linux-2.6.32.14/grsecurity/gracl_alloc.c 34305diff -urNp linux-2.6.32.15/grsecurity/gracl_alloc.c linux-2.6.32.15/grsecurity/gracl_alloc.c
34294--- linux-2.6.32.14/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 34306--- linux-2.6.32.15/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
34295+++ linux-2.6.32.14/grsecurity/gracl_alloc.c 2010-05-28 21:27:16.327077893 -0400 34307+++ linux-2.6.32.15/grsecurity/gracl_alloc.c 2010-05-28 21:27:16.327077893 -0400
34296@@ -0,0 +1,105 @@ 34308@@ -0,0 +1,105 @@
34297+#include <linux/kernel.h> 34309+#include <linux/kernel.h>
34298+#include <linux/mm.h> 34310+#include <linux/mm.h>
@@ -34399,9 +34411,9 @@ diff -urNp linux-2.6.32.14/grsecurity/gracl_alloc.c linux-2.6.32.14/grsecurity/g
34399+ else 34411+ else
34400+ return 1; 34412+ return 1;
34401+} 34413+}
34402diff -urNp linux-2.6.32.14/grsecurity/gracl.c linux-2.6.32.14/grsecurity/gracl.c 34414diff -urNp linux-2.6.32.15/grsecurity/gracl.c linux-2.6.32.15/grsecurity/gracl.c
34403--- linux-2.6.32.14/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 34415--- linux-2.6.32.15/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
34404+++ linux-2.6.32.14/grsecurity/gracl.c 2010-05-28 21:27:16.327077893 -0400 34416+++ linux-2.6.32.15/grsecurity/gracl.c 2010-05-28 21:27:16.327077893 -0400
34405@@ -0,0 +1,3897 @@ 34417@@ -0,0 +1,3897 @@
34406+#include <linux/kernel.h> 34418+#include <linux/kernel.h>
34407+#include <linux/module.h> 34419+#include <linux/module.h>
@@ -38300,9 +38312,9 @@ diff -urNp linux-2.6.32.14/grsecurity/gracl.c linux-2.6.32.14/grsecurity/gracl.c
38300+EXPORT_SYMBOL(gr_check_group_change); 38312+EXPORT_SYMBOL(gr_check_group_change);
38301+#endif 38313+#endif
38302+ 38314+
38303diff -urNp linux-2.6.32.14/grsecurity/gracl_cap.c linux-2.6.32.14/grsecurity/gracl_cap.c 38315diff -urNp linux-2.6.32.15/grsecurity/gracl_cap.c linux-2.6.32.15/grsecurity/gracl_cap.c
38304--- linux-2.6.32.14/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 38316--- linux-2.6.32.15/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
38305+++ linux-2.6.32.14/grsecurity/gracl_cap.c 2010-05-28 21:27:16.327077893 -0400 38317+++ linux-2.6.32.15/grsecurity/gracl_cap.c 2010-05-28 21:27:16.327077893 -0400
38306@@ -0,0 +1,131 @@ 38318@@ -0,0 +1,131 @@
38307+#include <linux/kernel.h> 38319+#include <linux/kernel.h>
38308+#include <linux/module.h> 38320+#include <linux/module.h>
@@ -38435,9 +38447,9 @@ diff -urNp linux-2.6.32.14/grsecurity/gracl_cap.c linux-2.6.32.14/grsecurity/gra
38435+ return 0; 38447+ return 0;
38436+} 38448+}
38437+ 38449+
38438diff -urNp linux-2.6.32.14/grsecurity/gracl_fs.c linux-2.6.32.14/grsecurity/gracl_fs.c 38450diff -urNp linux-2.6.32.15/grsecurity/gracl_fs.c linux-2.6.32.15/grsecurity/gracl_fs.c
38439--- linux-2.6.32.14/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 38451--- linux-2.6.32.15/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
38440+++ linux-2.6.32.14/grsecurity/gracl_fs.c 2010-05-28 21:27:16.327077893 -0400 38452+++ linux-2.6.32.15/grsecurity/gracl_fs.c 2010-05-28 21:27:16.327077893 -0400
38441@@ -0,0 +1,424 @@ 38453@@ -0,0 +1,424 @@
38442+#include <linux/kernel.h> 38454+#include <linux/kernel.h>
38443+#include <linux/sched.h> 38455+#include <linux/sched.h>
@@ -38863,9 +38875,9 @@ diff -urNp linux-2.6.32.14/grsecurity/gracl_fs.c linux-2.6.32.14/grsecurity/grac
38863+ 38875+
38864+ return 0; 38876+ return 0;
38865+} 38877+}
38866diff -urNp linux-2.6.32.14/grsecurity/gracl_ip.c linux-2.6.32.14/grsecurity/gracl_ip.c 38878diff -urNp linux-2.6.32.15/grsecurity/gracl_ip.c linux-2.6.32.15/grsecurity/gracl_ip.c
38867--- linux-2.6.32.14/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 38879--- linux-2.6.32.15/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
38868+++ linux-2.6.32.14/grsecurity/gracl_ip.c 2010-05-28 21:27:16.327077893 -0400 38880+++ linux-2.6.32.15/grsecurity/gracl_ip.c 2010-05-28 21:27:16.327077893 -0400
38869@@ -0,0 +1,339 @@ 38881@@ -0,0 +1,339 @@
38870+#include <linux/kernel.h> 38882+#include <linux/kernel.h>
38871+#include <asm/uaccess.h> 38883+#include <asm/uaccess.h>
@@ -39206,9 +39218,9 @@ diff -urNp linux-2.6.32.14/grsecurity/gracl_ip.c linux-2.6.32.14/grsecurity/grac
39206+ 39218+
39207+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); 39219+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
39208+} 39220+}
39209diff -urNp linux-2.6.32.14/grsecurity/gracl_learn.c linux-2.6.32.14/grsecurity/gracl_learn.c 39221diff -urNp linux-2.6.32.15/grsecurity/gracl_learn.c linux-2.6.32.15/grsecurity/gracl_learn.c
39210--- linux-2.6.32.14/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 39222--- linux-2.6.32.15/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
39211+++ linux-2.6.32.14/grsecurity/gracl_learn.c 2010-05-28 21:27:16.327077893 -0400 39223+++ linux-2.6.32.15/grsecurity/gracl_learn.c 2010-05-28 21:27:16.327077893 -0400
39212@@ -0,0 +1,211 @@ 39224@@ -0,0 +1,211 @@
39213+#include <linux/kernel.h> 39225+#include <linux/kernel.h>
39214+#include <linux/mm.h> 39226+#include <linux/mm.h>
@@ -39421,9 +39433,9 @@ diff -urNp linux-2.6.32.14/grsecurity/gracl_learn.c linux-2.6.32.14/grsecurity/g
39421+ .release = close_learn, 39433+ .release = close_learn,
39422+ .poll = poll_learn, 39434+ .poll = poll_learn,
39423+}; 39435+};
39424diff -urNp linux-2.6.32.14/grsecurity/gracl_res.c linux-2.6.32.14/grsecurity/gracl_res.c 39436diff -urNp linux-2.6.32.15/grsecurity/gracl_res.c linux-2.6.32.15/grsecurity/gracl_res.c
39425--- linux-2.6.32.14/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 39437--- linux-2.6.32.15/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
39426+++ linux-2.6.32.14/grsecurity/gracl_res.c 2010-05-28 21:27:16.331240103 -0400 39438+++ linux-2.6.32.15/grsecurity/gracl_res.c 2010-05-28 21:27:16.331240103 -0400
39427@@ -0,0 +1,65 @@ 39439@@ -0,0 +1,65 @@
39428+#include <linux/kernel.h> 39440+#include <linux/kernel.h>
39429+#include <linux/sched.h> 39441+#include <linux/sched.h>
@@ -39490,9 +39502,9 @@ diff -urNp linux-2.6.32.14/grsecurity/gracl_res.c linux-2.6.32.14/grsecurity/gra
39490+ rcu_read_unlock(); 39502+ rcu_read_unlock();
39491+ return; 39503+ return;
39492+} 39504+}
39493diff -urNp linux-2.6.32.14/grsecurity/gracl_segv.c linux-2.6.32.14/grsecurity/gracl_segv.c 39505diff -urNp linux-2.6.32.15/grsecurity/gracl_segv.c linux-2.6.32.15/grsecurity/gracl_segv.c
39494--- linux-2.6.32.14/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 39506--- linux-2.6.32.15/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
39495+++ linux-2.6.32.14/grsecurity/gracl_segv.c 2010-05-28 21:27:16.331240103 -0400 39507+++ linux-2.6.32.15/grsecurity/gracl_segv.c 2010-05-28 21:27:16.331240103 -0400
39496@@ -0,0 +1,310 @@ 39508@@ -0,0 +1,310 @@
39497+#include <linux/kernel.h> 39509+#include <linux/kernel.h>
39498+#include <linux/mm.h> 39510+#include <linux/mm.h>
@@ -39804,9 +39816,9 @@ diff -urNp linux-2.6.32.14/grsecurity/gracl_segv.c linux-2.6.32.14/grsecurity/gr
39804+ 39816+
39805+ return; 39817+ return;
39806+} 39818+}
39807diff -urNp linux-2.6.32.14/grsecurity/gracl_shm.c linux-2.6.32.14/grsecurity/gracl_shm.c 39819diff -urNp linux-2.6.32.15/grsecurity/gracl_shm.c linux-2.6.32.15/grsecurity/gracl_shm.c
39808--- linux-2.6.32.14/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 39820--- linux-2.6.32.15/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
39809+++ linux-2.6.32.14/grsecurity/gracl_shm.c 2010-05-28 21:27:16.331240103 -0400 39821+++ linux-2.6.32.15/grsecurity/gracl_shm.c 2010-05-28 21:27:16.331240103 -0400
39810@@ -0,0 +1,37 @@ 39822@@ -0,0 +1,37 @@
39811+#include <linux/kernel.h> 39823+#include <linux/kernel.h>
39812+#include <linux/mm.h> 39824+#include <linux/mm.h>
@@ -39845,9 +39857,9 @@ diff -urNp linux-2.6.32.14/grsecurity/gracl_shm.c linux-2.6.32.14/grsecurity/gra
39845+ 39857+
39846+ return 1; 39858+ return 1;
39847+} 39859+}
39848diff -urNp linux-2.6.32.14/grsecurity/grsec_chdir.c linux-2.6.32.14/grsecurity/grsec_chdir.c 39860diff -urNp linux-2.6.32.15/grsecurity/grsec_chdir.c linux-2.6.32.15/grsecurity/grsec_chdir.c
39849--- linux-2.6.32.14/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 39861--- linux-2.6.32.15/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
39850+++ linux-2.6.32.14/grsecurity/grsec_chdir.c 2010-05-28 21:27:16.331240103 -0400 39862+++ linux-2.6.32.15/grsecurity/grsec_chdir.c 2010-05-28 21:27:16.331240103 -0400
39851@@ -0,0 +1,19 @@ 39863@@ -0,0 +1,19 @@
39852+#include <linux/kernel.h> 39864+#include <linux/kernel.h>
39853+#include <linux/sched.h> 39865+#include <linux/sched.h>
@@ -39868,9 +39880,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_chdir.c linux-2.6.32.14/grsecurity/g
39868+#endif 39880+#endif
39869+ return; 39881+ return;
39870+} 39882+}
39871diff -urNp linux-2.6.32.14/grsecurity/grsec_chroot.c linux-2.6.32.14/grsecurity/grsec_chroot.c 39883diff -urNp linux-2.6.32.15/grsecurity/grsec_chroot.c linux-2.6.32.15/grsecurity/grsec_chroot.c
39872--- linux-2.6.32.14/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 39884--- linux-2.6.32.15/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
39873+++ linux-2.6.32.14/grsecurity/grsec_chroot.c 2010-05-28 21:27:16.331240103 -0400 39885+++ linux-2.6.32.15/grsecurity/grsec_chroot.c 2010-05-28 21:27:16.331240103 -0400
39874@@ -0,0 +1,348 @@ 39886@@ -0,0 +1,348 @@
39875+#include <linux/kernel.h> 39887+#include <linux/kernel.h>
39876+#include <linux/module.h> 39888+#include <linux/module.h>
@@ -40220,9 +40232,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_chroot.c linux-2.6.32.14/grsecurity/
40220+#ifdef CONFIG_SECURITY 40232+#ifdef CONFIG_SECURITY
40221+EXPORT_SYMBOL(gr_handle_chroot_caps); 40233+EXPORT_SYMBOL(gr_handle_chroot_caps);
40222+#endif 40234+#endif
40223diff -urNp linux-2.6.32.14/grsecurity/grsec_disabled.c linux-2.6.32.14/grsecurity/grsec_disabled.c 40235diff -urNp linux-2.6.32.15/grsecurity/grsec_disabled.c linux-2.6.32.15/grsecurity/grsec_disabled.c
40224--- linux-2.6.32.14/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 40236--- linux-2.6.32.15/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
40225+++ linux-2.6.32.14/grsecurity/grsec_disabled.c 2010-05-28 21:27:16.331240103 -0400 40237+++ linux-2.6.32.15/grsecurity/grsec_disabled.c 2010-05-28 21:27:16.331240103 -0400
40226@@ -0,0 +1,426 @@ 40238@@ -0,0 +1,426 @@
40227+#include <linux/kernel.h> 40239+#include <linux/kernel.h>
40228+#include <linux/module.h> 40240+#include <linux/module.h>
@@ -40650,9 +40662,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_disabled.c linux-2.6.32.14/grsecurit
40650+EXPORT_SYMBOL(gr_check_user_change); 40662+EXPORT_SYMBOL(gr_check_user_change);
40651+EXPORT_SYMBOL(gr_check_group_change); 40663+EXPORT_SYMBOL(gr_check_group_change);
40652+#endif 40664+#endif
40653diff -urNp linux-2.6.32.14/grsecurity/grsec_exec.c linux-2.6.32.14/grsecurity/grsec_exec.c 40665diff -urNp linux-2.6.32.15/grsecurity/grsec_exec.c linux-2.6.32.15/grsecurity/grsec_exec.c
40654--- linux-2.6.32.14/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 40666--- linux-2.6.32.15/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
40655+++ linux-2.6.32.14/grsecurity/grsec_exec.c 2010-05-28 21:27:16.331240103 -0400 40667+++ linux-2.6.32.15/grsecurity/grsec_exec.c 2010-05-28 21:27:16.331240103 -0400
40656@@ -0,0 +1,89 @@ 40668@@ -0,0 +1,89 @@
40657+#include <linux/kernel.h> 40669+#include <linux/kernel.h>
40658+#include <linux/sched.h> 40670+#include <linux/sched.h>
@@ -40743,9 +40755,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_exec.c linux-2.6.32.14/grsecurity/gr
40743+#endif 40755+#endif
40744+ return; 40756+ return;
40745+} 40757+}
40746diff -urNp linux-2.6.32.14/grsecurity/grsec_fifo.c linux-2.6.32.14/grsecurity/grsec_fifo.c 40758diff -urNp linux-2.6.32.15/grsecurity/grsec_fifo.c linux-2.6.32.15/grsecurity/grsec_fifo.c
40747--- linux-2.6.32.14/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 40759--- linux-2.6.32.15/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
40748+++ linux-2.6.32.14/grsecurity/grsec_fifo.c 2010-05-28 21:27:16.331240103 -0400 40760+++ linux-2.6.32.15/grsecurity/grsec_fifo.c 2010-05-28 21:27:16.331240103 -0400
40749@@ -0,0 +1,24 @@ 40761@@ -0,0 +1,24 @@
40750+#include <linux/kernel.h> 40762+#include <linux/kernel.h>
40751+#include <linux/sched.h> 40763+#include <linux/sched.h>
@@ -40771,9 +40783,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_fifo.c linux-2.6.32.14/grsecurity/gr
40771+#endif 40783+#endif
40772+ return 0; 40784+ return 0;
40773+} 40785+}
40774diff -urNp linux-2.6.32.14/grsecurity/grsec_fork.c linux-2.6.32.14/grsecurity/grsec_fork.c 40786diff -urNp linux-2.6.32.15/grsecurity/grsec_fork.c linux-2.6.32.15/grsecurity/grsec_fork.c
40775--- linux-2.6.32.14/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 40787--- linux-2.6.32.15/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
40776+++ linux-2.6.32.14/grsecurity/grsec_fork.c 2010-05-28 21:27:16.331240103 -0400 40788+++ linux-2.6.32.15/grsecurity/grsec_fork.c 2010-05-28 21:27:16.331240103 -0400
40777@@ -0,0 +1,15 @@ 40789@@ -0,0 +1,15 @@
40778+#include <linux/kernel.h> 40790+#include <linux/kernel.h>
40779+#include <linux/sched.h> 40791+#include <linux/sched.h>
@@ -40790,9 +40802,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_fork.c linux-2.6.32.14/grsecurity/gr
40790+#endif 40802+#endif
40791+ return; 40803+ return;
40792+} 40804+}
40793diff -urNp linux-2.6.32.14/grsecurity/grsec_init.c linux-2.6.32.14/grsecurity/grsec_init.c 40805diff -urNp linux-2.6.32.15/grsecurity/grsec_init.c linux-2.6.32.15/grsecurity/grsec_init.c
40794--- linux-2.6.32.14/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 40806--- linux-2.6.32.15/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
40795+++ linux-2.6.32.14/grsecurity/grsec_init.c 2010-05-28 21:27:16.331240103 -0400 40807+++ linux-2.6.32.15/grsecurity/grsec_init.c 2010-05-28 21:27:16.331240103 -0400
40796@@ -0,0 +1,241 @@ 40808@@ -0,0 +1,241 @@
40797+#include <linux/kernel.h> 40809+#include <linux/kernel.h>
40798+#include <linux/sched.h> 40810+#include <linux/sched.h>
@@ -41035,9 +41047,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_init.c linux-2.6.32.14/grsecurity/gr
41035+ 41047+
41036+ return; 41048+ return;
41037+} 41049+}
41038diff -urNp linux-2.6.32.14/grsecurity/grsec_link.c linux-2.6.32.14/grsecurity/grsec_link.c 41050diff -urNp linux-2.6.32.15/grsecurity/grsec_link.c linux-2.6.32.15/grsecurity/grsec_link.c
41039--- linux-2.6.32.14/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 41051--- linux-2.6.32.15/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
41040+++ linux-2.6.32.14/grsecurity/grsec_link.c 2010-05-28 21:27:16.331240103 -0400 41052+++ linux-2.6.32.15/grsecurity/grsec_link.c 2010-05-28 21:27:16.331240103 -0400
41041@@ -0,0 +1,43 @@ 41053@@ -0,0 +1,43 @@
41042+#include <linux/kernel.h> 41054+#include <linux/kernel.h>
41043+#include <linux/sched.h> 41055+#include <linux/sched.h>
@@ -41082,9 +41094,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_link.c linux-2.6.32.14/grsecurity/gr
41082+#endif 41094+#endif
41083+ return 0; 41095+ return 0;
41084+} 41096+}
41085diff -urNp linux-2.6.32.14/grsecurity/grsec_log.c linux-2.6.32.14/grsecurity/grsec_log.c 41097diff -urNp linux-2.6.32.15/grsecurity/grsec_log.c linux-2.6.32.15/grsecurity/grsec_log.c
41086--- linux-2.6.32.14/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 41098--- linux-2.6.32.15/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
41087+++ linux-2.6.32.14/grsecurity/grsec_log.c 2010-05-28 21:27:16.331240103 -0400 41099+++ linux-2.6.32.15/grsecurity/grsec_log.c 2010-05-28 21:27:16.331240103 -0400
41088@@ -0,0 +1,296 @@ 41100@@ -0,0 +1,296 @@
41089+#include <linux/kernel.h> 41101+#include <linux/kernel.h>
41090+#include <linux/sched.h> 41102+#include <linux/sched.h>
@@ -41382,9 +41394,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_log.c linux-2.6.32.14/grsecurity/grs
41382+ gr_log_end(audit); 41394+ gr_log_end(audit);
41383+ END_LOCKS(audit); 41395+ END_LOCKS(audit);
41384+} 41396+}
41385diff -urNp linux-2.6.32.14/grsecurity/grsec_mem.c linux-2.6.32.14/grsecurity/grsec_mem.c 41397diff -urNp linux-2.6.32.15/grsecurity/grsec_mem.c linux-2.6.32.15/grsecurity/grsec_mem.c
41386--- linux-2.6.32.14/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 41398--- linux-2.6.32.15/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
41387+++ linux-2.6.32.14/grsecurity/grsec_mem.c 2010-05-28 21:27:16.331240103 -0400 41399+++ linux-2.6.32.15/grsecurity/grsec_mem.c 2010-05-28 21:27:16.331240103 -0400
41388@@ -0,0 +1,85 @@ 41400@@ -0,0 +1,85 @@
41389+#include <linux/kernel.h> 41401+#include <linux/kernel.h>
41390+#include <linux/sched.h> 41402+#include <linux/sched.h>
@@ -41471,9 +41483,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_mem.c linux-2.6.32.14/grsecurity/grs
41471+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); 41483+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
41472+ return; 41484+ return;
41473+} 41485+}
41474diff -urNp linux-2.6.32.14/grsecurity/grsec_mount.c linux-2.6.32.14/grsecurity/grsec_mount.c 41486diff -urNp linux-2.6.32.15/grsecurity/grsec_mount.c linux-2.6.32.15/grsecurity/grsec_mount.c
41475--- linux-2.6.32.14/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 41487--- linux-2.6.32.15/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
41476+++ linux-2.6.32.14/grsecurity/grsec_mount.c 2010-05-28 21:27:16.331240103 -0400 41488+++ linux-2.6.32.15/grsecurity/grsec_mount.c 2010-05-28 21:27:16.331240103 -0400
41477@@ -0,0 +1,62 @@ 41489@@ -0,0 +1,62 @@
41478+#include <linux/kernel.h> 41490+#include <linux/kernel.h>
41479+#include <linux/sched.h> 41491+#include <linux/sched.h>
@@ -41537,9 +41549,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_mount.c linux-2.6.32.14/grsecurity/g
41537+#endif 41549+#endif
41538+ return 0; 41550+ return 0;
41539+} 41551+}
41540diff -urNp linux-2.6.32.14/grsecurity/grsec_ptrace.c linux-2.6.32.14/grsecurity/grsec_ptrace.c 41552diff -urNp linux-2.6.32.15/grsecurity/grsec_ptrace.c linux-2.6.32.15/grsecurity/grsec_ptrace.c
41541--- linux-2.6.32.14/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 41553--- linux-2.6.32.15/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
41542+++ linux-2.6.32.14/grsecurity/grsec_ptrace.c 2010-05-28 21:27:16.331240103 -0400 41554+++ linux-2.6.32.15/grsecurity/grsec_ptrace.c 2010-05-28 21:27:16.331240103 -0400
41543@@ -0,0 +1,14 @@ 41555@@ -0,0 +1,14 @@
41544+#include <linux/kernel.h> 41556+#include <linux/kernel.h>
41545+#include <linux/sched.h> 41557+#include <linux/sched.h>
@@ -41555,9 +41567,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_ptrace.c linux-2.6.32.14/grsecurity/
41555+#endif 41567+#endif
41556+ return; 41568+ return;
41557+} 41569+}
41558diff -urNp linux-2.6.32.14/grsecurity/grsec_sig.c linux-2.6.32.14/grsecurity/grsec_sig.c 41570diff -urNp linux-2.6.32.15/grsecurity/grsec_sig.c linux-2.6.32.15/grsecurity/grsec_sig.c
41559--- linux-2.6.32.14/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 41571--- linux-2.6.32.15/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
41560+++ linux-2.6.32.14/grsecurity/grsec_sig.c 2010-05-28 21:27:16.331240103 -0400 41572+++ linux-2.6.32.15/grsecurity/grsec_sig.c 2010-05-28 21:27:16.331240103 -0400
41561@@ -0,0 +1,65 @@ 41573@@ -0,0 +1,65 @@
41562+#include <linux/kernel.h> 41574+#include <linux/kernel.h>
41563+#include <linux/sched.h> 41575+#include <linux/sched.h>
@@ -41624,9 +41636,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_sig.c linux-2.6.32.14/grsecurity/grs
41624+ return; 41636+ return;
41625+} 41637+}
41626+ 41638+
41627diff -urNp linux-2.6.32.14/grsecurity/grsec_sock.c linux-2.6.32.14/grsecurity/grsec_sock.c 41639diff -urNp linux-2.6.32.15/grsecurity/grsec_sock.c linux-2.6.32.15/grsecurity/grsec_sock.c
41628--- linux-2.6.32.14/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 41640--- linux-2.6.32.15/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
41629+++ linux-2.6.32.14/grsecurity/grsec_sock.c 2010-05-28 21:27:16.331240103 -0400 41641+++ linux-2.6.32.15/grsecurity/grsec_sock.c 2010-05-28 21:27:16.331240103 -0400
41630@@ -0,0 +1,271 @@ 41642@@ -0,0 +1,271 @@
41631+#include <linux/kernel.h> 41643+#include <linux/kernel.h>
41632+#include <linux/module.h> 41644+#include <linux/module.h>
@@ -41899,9 +41911,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_sock.c linux-2.6.32.14/grsecurity/gr
41899+ return current_cap(); 41911+ return current_cap();
41900+#endif 41912+#endif
41901+} 41913+}
41902diff -urNp linux-2.6.32.14/grsecurity/grsec_sysctl.c linux-2.6.32.14/grsecurity/grsec_sysctl.c 41914diff -urNp linux-2.6.32.15/grsecurity/grsec_sysctl.c linux-2.6.32.15/grsecurity/grsec_sysctl.c
41903--- linux-2.6.32.14/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 41915--- linux-2.6.32.15/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
41904+++ linux-2.6.32.14/grsecurity/grsec_sysctl.c 2010-05-28 21:27:16.331240103 -0400 41916+++ linux-2.6.32.15/grsecurity/grsec_sysctl.c 2010-05-28 21:27:16.331240103 -0400
41905@@ -0,0 +1,447 @@ 41917@@ -0,0 +1,447 @@
41906+#include <linux/kernel.h> 41918+#include <linux/kernel.h>
41907+#include <linux/sched.h> 41919+#include <linux/sched.h>
@@ -42350,9 +42362,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_sysctl.c linux-2.6.32.14/grsecurity/
42350+ { .ctl_name = 0 } 42362+ { .ctl_name = 0 }
42351+}; 42363+};
42352+#endif 42364+#endif
42353diff -urNp linux-2.6.32.14/grsecurity/grsec_textrel.c linux-2.6.32.14/grsecurity/grsec_textrel.c 42365diff -urNp linux-2.6.32.15/grsecurity/grsec_textrel.c linux-2.6.32.15/grsecurity/grsec_textrel.c
42354--- linux-2.6.32.14/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 42366--- linux-2.6.32.15/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
42355+++ linux-2.6.32.14/grsecurity/grsec_textrel.c 2010-05-28 21:27:16.331240103 -0400 42367+++ linux-2.6.32.15/grsecurity/grsec_textrel.c 2010-05-28 21:27:16.331240103 -0400
42356@@ -0,0 +1,16 @@ 42368@@ -0,0 +1,16 @@
42357+#include <linux/kernel.h> 42369+#include <linux/kernel.h>
42358+#include <linux/sched.h> 42370+#include <linux/sched.h>
@@ -42370,9 +42382,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_textrel.c linux-2.6.32.14/grsecurity
42370+#endif 42382+#endif
42371+ return; 42383+ return;
42372+} 42384+}
42373diff -urNp linux-2.6.32.14/grsecurity/grsec_time.c linux-2.6.32.14/grsecurity/grsec_time.c 42385diff -urNp linux-2.6.32.15/grsecurity/grsec_time.c linux-2.6.32.15/grsecurity/grsec_time.c
42374--- linux-2.6.32.14/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 42386--- linux-2.6.32.15/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
42375+++ linux-2.6.32.14/grsecurity/grsec_time.c 2010-05-28 21:27:16.331240103 -0400 42387+++ linux-2.6.32.15/grsecurity/grsec_time.c 2010-05-28 21:27:16.331240103 -0400
42376@@ -0,0 +1,13 @@ 42388@@ -0,0 +1,13 @@
42377+#include <linux/kernel.h> 42389+#include <linux/kernel.h>
42378+#include <linux/sched.h> 42390+#include <linux/sched.h>
@@ -42387,9 +42399,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_time.c linux-2.6.32.14/grsecurity/gr
42387+#endif 42399+#endif
42388+ return; 42400+ return;
42389+} 42401+}
42390diff -urNp linux-2.6.32.14/grsecurity/grsec_tpe.c linux-2.6.32.14/grsecurity/grsec_tpe.c 42402diff -urNp linux-2.6.32.15/grsecurity/grsec_tpe.c linux-2.6.32.15/grsecurity/grsec_tpe.c
42391--- linux-2.6.32.14/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 42403--- linux-2.6.32.15/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
42392+++ linux-2.6.32.14/grsecurity/grsec_tpe.c 2010-05-28 21:27:16.331240103 -0400 42404+++ linux-2.6.32.15/grsecurity/grsec_tpe.c 2010-05-28 21:27:16.331240103 -0400
42393@@ -0,0 +1,38 @@ 42405@@ -0,0 +1,38 @@
42394+#include <linux/kernel.h> 42406+#include <linux/kernel.h>
42395+#include <linux/sched.h> 42407+#include <linux/sched.h>
@@ -42429,9 +42441,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsec_tpe.c linux-2.6.32.14/grsecurity/grs
42429+#endif 42441+#endif
42430+ return 1; 42442+ return 1;
42431+} 42443+}
42432diff -urNp linux-2.6.32.14/grsecurity/grsum.c linux-2.6.32.14/grsecurity/grsum.c 42444diff -urNp linux-2.6.32.15/grsecurity/grsum.c linux-2.6.32.15/grsecurity/grsum.c
42433--- linux-2.6.32.14/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 42445--- linux-2.6.32.15/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
42434+++ linux-2.6.32.14/grsecurity/grsum.c 2010-05-28 21:27:16.331240103 -0400 42446+++ linux-2.6.32.15/grsecurity/grsum.c 2010-05-28 21:27:16.331240103 -0400
42435@@ -0,0 +1,59 @@ 42447@@ -0,0 +1,59 @@
42436+#include <linux/err.h> 42448+#include <linux/err.h>
42437+#include <linux/kernel.h> 42449+#include <linux/kernel.h>
@@ -42492,9 +42504,9 @@ diff -urNp linux-2.6.32.14/grsecurity/grsum.c linux-2.6.32.14/grsecurity/grsum.c
42492+ 42504+
42493+ return retval; 42505+ return retval;
42494+} 42506+}
42495diff -urNp linux-2.6.32.14/grsecurity/Kconfig linux-2.6.32.14/grsecurity/Kconfig 42507diff -urNp linux-2.6.32.15/grsecurity/Kconfig linux-2.6.32.15/grsecurity/Kconfig
42496--- linux-2.6.32.14/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 42508--- linux-2.6.32.15/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
42497+++ linux-2.6.32.14/grsecurity/Kconfig 2010-05-28 21:27:16.331240103 -0400 42509+++ linux-2.6.32.15/grsecurity/Kconfig 2010-05-28 21:27:16.331240103 -0400
42498@@ -0,0 +1,965 @@ 42510@@ -0,0 +1,965 @@
42499+# 42511+#
42500+# grecurity configuration 42512+# grecurity configuration
@@ -43461,9 +43473,9 @@ diff -urNp linux-2.6.32.14/grsecurity/Kconfig linux-2.6.32.14/grsecurity/Kconfig
43461+endmenu 43473+endmenu
43462+ 43474+
43463+endmenu 43475+endmenu
43464diff -urNp linux-2.6.32.14/grsecurity/Makefile linux-2.6.32.14/grsecurity/Makefile 43476diff -urNp linux-2.6.32.15/grsecurity/Makefile linux-2.6.32.15/grsecurity/Makefile
43465--- linux-2.6.32.14/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 43477--- linux-2.6.32.15/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
43466+++ linux-2.6.32.14/grsecurity/Makefile 2010-05-28 21:27:16.331240103 -0400 43478+++ linux-2.6.32.15/grsecurity/Makefile 2010-05-28 21:27:16.331240103 -0400
43467@@ -0,0 +1,29 @@ 43479@@ -0,0 +1,29 @@
43468+# grsecurity's ACL system was originally written in 2001 by Michael Dalton 43480+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
43469+# during 2001-2009 it has been completely redesigned by Brad Spengler 43481+# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -43494,9 +43506,9 @@ diff -urNp linux-2.6.32.14/grsecurity/Makefile linux-2.6.32.14/grsecurity/Makefi
43494+ @-chmod -f 700 . 43506+ @-chmod -f 700 .
43495+ @echo ' grsec: protected kernel image paths' 43507+ @echo ' grsec: protected kernel image paths'
43496+endif 43508+endif
43497diff -urNp linux-2.6.32.14/include/acpi/acoutput.h linux-2.6.32.14/include/acpi/acoutput.h 43509diff -urNp linux-2.6.32.15/include/acpi/acoutput.h linux-2.6.32.15/include/acpi/acoutput.h
43498--- linux-2.6.32.14/include/acpi/acoutput.h 2010-03-15 11:52:04.000000000 -0400 43510--- linux-2.6.32.15/include/acpi/acoutput.h 2010-03-15 11:52:04.000000000 -0400
43499+++ linux-2.6.32.14/include/acpi/acoutput.h 2010-05-28 21:27:16.336579957 -0400 43511+++ linux-2.6.32.15/include/acpi/acoutput.h 2010-05-28 21:27:16.336579957 -0400
43500@@ -264,8 +264,8 @@ 43512@@ -264,8 +264,8 @@
43501 * leaving no executable debug code! 43513 * leaving no executable debug code!
43502 */ 43514 */
@@ -43508,9 +43520,9 @@ diff -urNp linux-2.6.32.14/include/acpi/acoutput.h linux-2.6.32.14/include/acpi/
43508 43520
43509 #endif /* ACPI_DEBUG_OUTPUT */ 43521 #endif /* ACPI_DEBUG_OUTPUT */
43510 43522
43511diff -urNp linux-2.6.32.14/include/acpi/acpi_drivers.h linux-2.6.32.14/include/acpi/acpi_drivers.h 43523diff -urNp linux-2.6.32.15/include/acpi/acpi_drivers.h linux-2.6.32.15/include/acpi/acpi_drivers.h
43512--- linux-2.6.32.14/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400 43524--- linux-2.6.32.15/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400
43513+++ linux-2.6.32.14/include/acpi/acpi_drivers.h 2010-05-28 21:27:16.336579957 -0400 43525+++ linux-2.6.32.15/include/acpi/acpi_drivers.h 2010-05-28 21:27:16.336579957 -0400
43514@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp 43526@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
43515 Dock Station 43527 Dock Station
43516 -------------------------------------------------------------------------- */ 43528 -------------------------------------------------------------------------- */
@@ -43540,9 +43552,9 @@ diff -urNp linux-2.6.32.14/include/acpi/acpi_drivers.h linux-2.6.32.14/include/a
43540 void *context) 43552 void *context)
43541 { 43553 {
43542 return -ENODEV; 43554 return -ENODEV;
43543diff -urNp linux-2.6.32.14/include/asm-generic/atomic-long.h linux-2.6.32.14/include/asm-generic/atomic-long.h 43555diff -urNp linux-2.6.32.15/include/asm-generic/atomic-long.h linux-2.6.32.15/include/asm-generic/atomic-long.h
43544--- linux-2.6.32.14/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400 43556--- linux-2.6.32.15/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400
43545+++ linux-2.6.32.14/include/asm-generic/atomic-long.h 2010-05-28 21:27:16.339120729 -0400 43557+++ linux-2.6.32.15/include/asm-generic/atomic-long.h 2010-05-28 21:27:16.339120729 -0400
43546@@ -22,6 +22,12 @@ 43558@@ -22,6 +22,12 @@
43547 43559
43548 typedef atomic64_t atomic_long_t; 43560 typedef atomic64_t atomic_long_t;
@@ -43763,9 +43775,9 @@ diff -urNp linux-2.6.32.14/include/asm-generic/atomic-long.h linux-2.6.32.14/inc
43763+#endif 43775+#endif
43764+ 43776+
43765 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ 43777 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
43766diff -urNp linux-2.6.32.14/include/asm-generic/dma-mapping-common.h linux-2.6.32.14/include/asm-generic/dma-mapping-common.h 43778diff -urNp linux-2.6.32.15/include/asm-generic/dma-mapping-common.h linux-2.6.32.15/include/asm-generic/dma-mapping-common.h
43767--- linux-2.6.32.14/include/asm-generic/dma-mapping-common.h 2010-05-28 20:16:44.458924952 -0400 43779--- linux-2.6.32.15/include/asm-generic/dma-mapping-common.h 2010-05-28 20:16:44.458924952 -0400
43768+++ linux-2.6.32.14/include/asm-generic/dma-mapping-common.h 2010-05-28 21:27:16.339120729 -0400 43780+++ linux-2.6.32.15/include/asm-generic/dma-mapping-common.h 2010-05-28 21:27:16.339120729 -0400
43769@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ 43781@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
43770 enum dma_data_direction dir, 43782 enum dma_data_direction dir,
43771 struct dma_attrs *attrs) 43783 struct dma_attrs *attrs)
@@ -43874,9 +43886,9 @@ diff -urNp linux-2.6.32.14/include/asm-generic/dma-mapping-common.h linux-2.6.32
43874 43886
43875 BUG_ON(!valid_dma_direction(dir)); 43887 BUG_ON(!valid_dma_direction(dir));
43876 if (ops->sync_sg_for_device) 43888 if (ops->sync_sg_for_device)
43877diff -urNp linux-2.6.32.14/include/asm-generic/futex.h linux-2.6.32.14/include/asm-generic/futex.h 43889diff -urNp linux-2.6.32.15/include/asm-generic/futex.h linux-2.6.32.15/include/asm-generic/futex.h
43878--- linux-2.6.32.14/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400 43890--- linux-2.6.32.15/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400
43879+++ linux-2.6.32.14/include/asm-generic/futex.h 2010-05-28 21:27:16.343246556 -0400 43891+++ linux-2.6.32.15/include/asm-generic/futex.h 2010-05-28 21:27:16.343246556 -0400
43880@@ -6,7 +6,7 @@ 43892@@ -6,7 +6,7 @@
43881 #include <asm/errno.h> 43893 #include <asm/errno.h>
43882 43894
@@ -43895,9 +43907,9 @@ diff -urNp linux-2.6.32.14/include/asm-generic/futex.h linux-2.6.32.14/include/a
43895 { 43907 {
43896 return -ENOSYS; 43908 return -ENOSYS;
43897 } 43909 }
43898diff -urNp linux-2.6.32.14/include/asm-generic/int-l64.h linux-2.6.32.14/include/asm-generic/int-l64.h 43910diff -urNp linux-2.6.32.15/include/asm-generic/int-l64.h linux-2.6.32.15/include/asm-generic/int-l64.h
43899--- linux-2.6.32.14/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400 43911--- linux-2.6.32.15/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400
43900+++ linux-2.6.32.14/include/asm-generic/int-l64.h 2010-05-28 21:27:16.343246556 -0400 43912+++ linux-2.6.32.15/include/asm-generic/int-l64.h 2010-05-28 21:27:16.343246556 -0400
43901@@ -46,6 +46,8 @@ typedef unsigned int u32; 43913@@ -46,6 +46,8 @@ typedef unsigned int u32;
43902 typedef signed long s64; 43914 typedef signed long s64;
43903 typedef unsigned long u64; 43915 typedef unsigned long u64;
@@ -43907,9 +43919,9 @@ diff -urNp linux-2.6.32.14/include/asm-generic/int-l64.h linux-2.6.32.14/include
43907 #define S8_C(x) x 43919 #define S8_C(x) x
43908 #define U8_C(x) x ## U 43920 #define U8_C(x) x ## U
43909 #define S16_C(x) x 43921 #define S16_C(x) x
43910diff -urNp linux-2.6.32.14/include/asm-generic/int-ll64.h linux-2.6.32.14/include/asm-generic/int-ll64.h 43922diff -urNp linux-2.6.32.15/include/asm-generic/int-ll64.h linux-2.6.32.15/include/asm-generic/int-ll64.h
43911--- linux-2.6.32.14/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400 43923--- linux-2.6.32.15/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400
43912+++ linux-2.6.32.14/include/asm-generic/int-ll64.h 2010-05-28 21:27:16.343246556 -0400 43924+++ linux-2.6.32.15/include/asm-generic/int-ll64.h 2010-05-28 21:27:16.343246556 -0400
43913@@ -51,6 +51,8 @@ typedef unsigned int u32; 43925@@ -51,6 +51,8 @@ typedef unsigned int u32;
43914 typedef signed long long s64; 43926 typedef signed long long s64;
43915 typedef unsigned long long u64; 43927 typedef unsigned long long u64;
@@ -43919,9 +43931,9 @@ diff -urNp linux-2.6.32.14/include/asm-generic/int-ll64.h linux-2.6.32.14/includ
43919 #define S8_C(x) x 43931 #define S8_C(x) x
43920 #define U8_C(x) x ## U 43932 #define U8_C(x) x ## U
43921 #define S16_C(x) x 43933 #define S16_C(x) x
43922diff -urNp linux-2.6.32.14/include/asm-generic/kmap_types.h linux-2.6.32.14/include/asm-generic/kmap_types.h 43934diff -urNp linux-2.6.32.15/include/asm-generic/kmap_types.h linux-2.6.32.15/include/asm-generic/kmap_types.h
43923--- linux-2.6.32.14/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 43935--- linux-2.6.32.15/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
43924+++ linux-2.6.32.14/include/asm-generic/kmap_types.h 2010-05-28 21:27:16.343246556 -0400 43936+++ linux-2.6.32.15/include/asm-generic/kmap_types.h 2010-05-28 21:27:16.343246556 -0400
43925@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, 43937@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
43926 KMAP_D(16) KM_IRQ_PTE, 43938 KMAP_D(16) KM_IRQ_PTE,
43927 KMAP_D(17) KM_NMI, 43939 KMAP_D(17) KM_NMI,
@@ -43932,9 +43944,9 @@ diff -urNp linux-2.6.32.14/include/asm-generic/kmap_types.h linux-2.6.32.14/incl
43932 }; 43944 };
43933 43945
43934 #undef KMAP_D 43946 #undef KMAP_D
43935diff -urNp linux-2.6.32.14/include/asm-generic/pgtable.h linux-2.6.32.14/include/asm-generic/pgtable.h 43947diff -urNp linux-2.6.32.15/include/asm-generic/pgtable.h linux-2.6.32.15/include/asm-generic/pgtable.h
43936--- linux-2.6.32.14/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400 43948--- linux-2.6.32.15/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400
43937+++ linux-2.6.32.14/include/asm-generic/pgtable.h 2010-05-28 21:27:16.343246556 -0400 43949+++ linux-2.6.32.15/include/asm-generic/pgtable.h 2010-05-28 21:27:16.343246556 -0400
43938@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar 43950@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
43939 unsigned long size); 43951 unsigned long size);
43940 #endif 43952 #endif
@@ -43950,9 +43962,9 @@ diff -urNp linux-2.6.32.14/include/asm-generic/pgtable.h linux-2.6.32.14/include
43950 #endif /* !__ASSEMBLY__ */ 43962 #endif /* !__ASSEMBLY__ */
43951 43963
43952 #endif /* _ASM_GENERIC_PGTABLE_H */ 43964 #endif /* _ASM_GENERIC_PGTABLE_H */
43953diff -urNp linux-2.6.32.14/include/asm-generic/vmlinux.lds.h linux-2.6.32.14/include/asm-generic/vmlinux.lds.h 43965diff -urNp linux-2.6.32.15/include/asm-generic/vmlinux.lds.h linux-2.6.32.15/include/asm-generic/vmlinux.lds.h
43954--- linux-2.6.32.14/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400 43966--- linux-2.6.32.15/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400
43955+++ linux-2.6.32.14/include/asm-generic/vmlinux.lds.h 2010-05-28 21:27:16.343246556 -0400 43967+++ linux-2.6.32.15/include/asm-generic/vmlinux.lds.h 2010-05-28 21:27:16.343246556 -0400
43956@@ -199,6 +199,7 @@ 43968@@ -199,6 +199,7 @@
43957 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ 43969 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
43958 VMLINUX_SYMBOL(__start_rodata) = .; \ 43970 VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -43991,9 +44003,9 @@ diff -urNp linux-2.6.32.14/include/asm-generic/vmlinux.lds.h linux-2.6.32.14/inc
43991 44003
43992 /** 44004 /**
43993 * PERCPU - define output section for percpu area, simple version 44005 * PERCPU - define output section for percpu area, simple version
43994diff -urNp linux-2.6.32.14/include/drm/drm_pciids.h linux-2.6.32.14/include/drm/drm_pciids.h 44006diff -urNp linux-2.6.32.15/include/drm/drm_pciids.h linux-2.6.32.15/include/drm/drm_pciids.h
43995--- linux-2.6.32.14/include/drm/drm_pciids.h 2010-04-29 17:49:38.529851956 -0400 44007--- linux-2.6.32.15/include/drm/drm_pciids.h 2010-04-29 17:49:38.529851956 -0400
43996+++ linux-2.6.32.14/include/drm/drm_pciids.h 2010-05-28 21:27:16.343246556 -0400 44008+++ linux-2.6.32.15/include/drm/drm_pciids.h 2010-05-28 21:27:16.343246556 -0400
43997@@ -377,7 +377,7 @@ 44009@@ -377,7 +377,7 @@
43998 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 44010 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
43999 {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 44011 {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -44097,9 +44109,9 @@ diff -urNp linux-2.6.32.14/include/drm/drm_pciids.h linux-2.6.32.14/include/drm/
44097 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 44109 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
44098- {0, 0, 0} 44110- {0, 0, 0}
44099+ {0, 0, 0, 0, 0, 0} 44111+ {0, 0, 0, 0, 0, 0}
44100diff -urNp linux-2.6.32.14/include/drm/drmP.h linux-2.6.32.14/include/drm/drmP.h 44112diff -urNp linux-2.6.32.15/include/drm/drmP.h linux-2.6.32.15/include/drm/drmP.h
44101--- linux-2.6.32.14/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400 44113--- linux-2.6.32.15/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400
44102+++ linux-2.6.32.14/include/drm/drmP.h 2010-05-28 21:27:16.343246556 -0400 44114+++ linux-2.6.32.15/include/drm/drmP.h 2010-05-28 21:27:16.343246556 -0400
44103@@ -814,7 +814,7 @@ struct drm_driver { 44115@@ -814,7 +814,7 @@ struct drm_driver {
44104 void (*vgaarb_irq)(struct drm_device *dev, bool state); 44116 void (*vgaarb_irq)(struct drm_device *dev, bool state);
44105 44117
@@ -44127,9 +44139,9 @@ diff -urNp linux-2.6.32.14/include/drm/drmP.h linux-2.6.32.14/include/drm/drmP.h
44127 /*@} */ 44139 /*@} */
44128 44140
44129 struct list_head filelist; 44141 struct list_head filelist;
44130diff -urNp linux-2.6.32.14/include/linux/a.out.h linux-2.6.32.14/include/linux/a.out.h 44142diff -urNp linux-2.6.32.15/include/linux/a.out.h linux-2.6.32.15/include/linux/a.out.h
44131--- linux-2.6.32.14/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400 44143--- linux-2.6.32.15/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400
44132+++ linux-2.6.32.14/include/linux/a.out.h 2010-05-28 21:27:16.343246556 -0400 44144+++ linux-2.6.32.15/include/linux/a.out.h 2010-05-28 21:27:16.343246556 -0400
44133@@ -39,6 +39,14 @@ enum machine_type { 44145@@ -39,6 +39,14 @@ enum machine_type {
44134 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ 44146 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
44135 }; 44147 };
@@ -44145,9 +44157,9 @@ diff -urNp linux-2.6.32.14/include/linux/a.out.h linux-2.6.32.14/include/linux/a
44145 #if !defined (N_MAGIC) 44157 #if !defined (N_MAGIC)
44146 #define N_MAGIC(exec) ((exec).a_info & 0xffff) 44158 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
44147 #endif 44159 #endif
44148diff -urNp linux-2.6.32.14/include/linux/atmdev.h linux-2.6.32.14/include/linux/atmdev.h 44160diff -urNp linux-2.6.32.15/include/linux/atmdev.h linux-2.6.32.15/include/linux/atmdev.h
44149--- linux-2.6.32.14/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400 44161--- linux-2.6.32.15/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400
44150+++ linux-2.6.32.14/include/linux/atmdev.h 2010-05-28 21:27:16.343246556 -0400 44162+++ linux-2.6.32.15/include/linux/atmdev.h 2010-05-28 21:27:16.343246556 -0400
44151@@ -237,7 +237,7 @@ struct compat_atm_iobuf { 44163@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
44152 #endif 44164 #endif
44153 44165
@@ -44157,9 +44169,9 @@ diff -urNp linux-2.6.32.14/include/linux/atmdev.h linux-2.6.32.14/include/linux/
44157 __AAL_STAT_ITEMS 44169 __AAL_STAT_ITEMS
44158 #undef __HANDLE_ITEM 44170 #undef __HANDLE_ITEM
44159 }; 44171 };
44160diff -urNp linux-2.6.32.14/include/linux/backlight.h linux-2.6.32.14/include/linux/backlight.h 44172diff -urNp linux-2.6.32.15/include/linux/backlight.h linux-2.6.32.15/include/linux/backlight.h
44161--- linux-2.6.32.14/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400 44173--- linux-2.6.32.15/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400
44162+++ linux-2.6.32.14/include/linux/backlight.h 2010-05-28 21:27:16.343246556 -0400 44174+++ linux-2.6.32.15/include/linux/backlight.h 2010-05-28 21:27:16.343246556 -0400
44163@@ -36,18 +36,18 @@ struct backlight_device; 44175@@ -36,18 +36,18 @@ struct backlight_device;
44164 struct fb_info; 44176 struct fb_info;
44165 44177
@@ -44201,9 +44213,9 @@ diff -urNp linux-2.6.32.14/include/linux/backlight.h linux-2.6.32.14/include/lin
44201 extern void backlight_device_unregister(struct backlight_device *bd); 44213 extern void backlight_device_unregister(struct backlight_device *bd);
44202 extern void backlight_force_update(struct backlight_device *bd, 44214 extern void backlight_force_update(struct backlight_device *bd,
44203 enum backlight_update_reason reason); 44215 enum backlight_update_reason reason);
44204diff -urNp linux-2.6.32.14/include/linux/binfmts.h linux-2.6.32.14/include/linux/binfmts.h 44216diff -urNp linux-2.6.32.15/include/linux/binfmts.h linux-2.6.32.15/include/linux/binfmts.h
44205--- linux-2.6.32.14/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400 44217--- linux-2.6.32.15/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400
44206+++ linux-2.6.32.14/include/linux/binfmts.h 2010-05-28 21:27:16.343246556 -0400 44218+++ linux-2.6.32.15/include/linux/binfmts.h 2010-05-28 21:27:16.343246556 -0400
44207@@ -78,6 +78,7 @@ struct linux_binfmt { 44219@@ -78,6 +78,7 @@ struct linux_binfmt {
44208 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); 44220 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
44209 int (*load_shlib)(struct file *); 44221 int (*load_shlib)(struct file *);
@@ -44212,9 +44224,9 @@ diff -urNp linux-2.6.32.14/include/linux/binfmts.h linux-2.6.32.14/include/linux
44212 unsigned long min_coredump; /* minimal dump size */ 44224 unsigned long min_coredump; /* minimal dump size */
44213 int hasvdso; 44225 int hasvdso;
44214 }; 44226 };
44215diff -urNp linux-2.6.32.14/include/linux/blkdev.h linux-2.6.32.14/include/linux/blkdev.h 44227diff -urNp linux-2.6.32.15/include/linux/blkdev.h linux-2.6.32.15/include/linux/blkdev.h
44216--- linux-2.6.32.14/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400 44228--- linux-2.6.32.15/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400
44217+++ linux-2.6.32.14/include/linux/blkdev.h 2010-05-28 21:27:16.347237122 -0400 44229+++ linux-2.6.32.15/include/linux/blkdev.h 2010-05-28 21:27:16.347237122 -0400
44218@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc 44230@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc
44219 #endif /* CONFIG_BLK_DEV_INTEGRITY */ 44231 #endif /* CONFIG_BLK_DEV_INTEGRITY */
44220 44232
@@ -44246,9 +44258,9 @@ diff -urNp linux-2.6.32.14/include/linux/blkdev.h linux-2.6.32.14/include/linux/
44246 }; 44258 };
44247 44259
44248 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, 44260 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
44249diff -urNp linux-2.6.32.14/include/linux/cache.h linux-2.6.32.14/include/linux/cache.h 44261diff -urNp linux-2.6.32.15/include/linux/cache.h linux-2.6.32.15/include/linux/cache.h
44250--- linux-2.6.32.14/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400 44262--- linux-2.6.32.15/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400
44251+++ linux-2.6.32.14/include/linux/cache.h 2010-05-28 21:27:16.347237122 -0400 44263+++ linux-2.6.32.15/include/linux/cache.h 2010-05-28 21:27:16.347237122 -0400
44252@@ -16,6 +16,10 @@ 44264@@ -16,6 +16,10 @@
44253 #define __read_mostly 44265 #define __read_mostly
44254 #endif 44266 #endif
@@ -44260,9 +44272,9 @@ diff -urNp linux-2.6.32.14/include/linux/cache.h linux-2.6.32.14/include/linux/c
44260 #ifndef ____cacheline_aligned 44272 #ifndef ____cacheline_aligned
44261 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) 44273 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
44262 #endif 44274 #endif
44263diff -urNp linux-2.6.32.14/include/linux/capability.h linux-2.6.32.14/include/linux/capability.h 44275diff -urNp linux-2.6.32.15/include/linux/capability.h linux-2.6.32.15/include/linux/capability.h
44264--- linux-2.6.32.14/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400 44276--- linux-2.6.32.15/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400
44265+++ linux-2.6.32.14/include/linux/capability.h 2010-05-28 21:27:16.347237122 -0400 44277+++ linux-2.6.32.15/include/linux/capability.h 2010-05-28 21:27:16.347237122 -0400
44266@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff 44278@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
44267 (security_real_capable_noaudit((t), (cap)) == 0) 44279 (security_real_capable_noaudit((t), (cap)) == 0)
44268 44280
@@ -44271,9 +44283,9 @@ diff -urNp linux-2.6.32.14/include/linux/capability.h linux-2.6.32.14/include/li
44271 44283
44272 /* audit system wants to get cap info from files as well */ 44284 /* audit system wants to get cap info from files as well */
44273 struct dentry; 44285 struct dentry;
44274diff -urNp linux-2.6.32.14/include/linux/compiler-gcc4.h linux-2.6.32.14/include/linux/compiler-gcc4.h 44286diff -urNp linux-2.6.32.15/include/linux/compiler-gcc4.h linux-2.6.32.15/include/linux/compiler-gcc4.h
44275--- linux-2.6.32.14/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400 44287--- linux-2.6.32.15/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400
44276+++ linux-2.6.32.14/include/linux/compiler-gcc4.h 2010-05-28 21:27:16.347237122 -0400 44288+++ linux-2.6.32.15/include/linux/compiler-gcc4.h 2010-05-28 21:27:16.347237122 -0400
44277@@ -36,4 +36,8 @@ 44289@@ -36,4 +36,8 @@
44278 the kernel context */ 44290 the kernel context */
44279 #define __cold __attribute__((__cold__)) 44291 #define __cold __attribute__((__cold__))
@@ -44283,9 +44295,9 @@ diff -urNp linux-2.6.32.14/include/linux/compiler-gcc4.h linux-2.6.32.14/include
44283+#define __bos0(ptr) __bos((ptr), 0) 44295+#define __bos0(ptr) __bos((ptr), 0)
44284+#define __bos1(ptr) __bos((ptr), 1) 44296+#define __bos1(ptr) __bos((ptr), 1)
44285 #endif 44297 #endif
44286diff -urNp linux-2.6.32.14/include/linux/compiler.h linux-2.6.32.14/include/linux/compiler.h 44298diff -urNp linux-2.6.32.15/include/linux/compiler.h linux-2.6.32.15/include/linux/compiler.h
44287--- linux-2.6.32.14/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400 44299--- linux-2.6.32.15/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400
44288+++ linux-2.6.32.14/include/linux/compiler.h 2010-05-28 21:27:16.347237122 -0400 44300+++ linux-2.6.32.15/include/linux/compiler.h 2010-05-28 21:27:16.347237122 -0400
44289@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ 44301@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
44290 #define __cold 44302 #define __cold
44291 #endif 44303 #endif
@@ -44309,9 +44321,9 @@ diff -urNp linux-2.6.32.14/include/linux/compiler.h linux-2.6.32.14/include/linu
44309 /* Simple shorthand for a section definition */ 44321 /* Simple shorthand for a section definition */
44310 #ifndef __section 44322 #ifndef __section
44311 # define __section(S) __attribute__ ((__section__(#S))) 44323 # define __section(S) __attribute__ ((__section__(#S)))
44312diff -urNp linux-2.6.32.14/include/linux/decompress/mm.h linux-2.6.32.14/include/linux/decompress/mm.h 44324diff -urNp linux-2.6.32.15/include/linux/decompress/mm.h linux-2.6.32.15/include/linux/decompress/mm.h
44313--- linux-2.6.32.14/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400 44325--- linux-2.6.32.15/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400
44314+++ linux-2.6.32.14/include/linux/decompress/mm.h 2010-05-28 21:27:16.347237122 -0400 44326+++ linux-2.6.32.15/include/linux/decompress/mm.h 2010-05-28 21:27:16.347237122 -0400
44315@@ -78,7 +78,7 @@ static void free(void *where) 44327@@ -78,7 +78,7 @@ static void free(void *where)
44316 * warnings when not needed (indeed large_malloc / large_free are not 44328 * warnings when not needed (indeed large_malloc / large_free are not
44317 * needed by inflate */ 44329 * needed by inflate */
@@ -44321,9 +44333,9 @@ diff -urNp linux-2.6.32.14/include/linux/decompress/mm.h linux-2.6.32.14/include
44321 #define free(a) kfree(a) 44333 #define free(a) kfree(a)
44322 44334
44323 #define large_malloc(a) vmalloc(a) 44335 #define large_malloc(a) vmalloc(a)
44324diff -urNp linux-2.6.32.14/include/linux/dma-mapping.h linux-2.6.32.14/include/linux/dma-mapping.h 44336diff -urNp linux-2.6.32.15/include/linux/dma-mapping.h linux-2.6.32.15/include/linux/dma-mapping.h
44325--- linux-2.6.32.14/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 44337--- linux-2.6.32.15/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
44326+++ linux-2.6.32.14/include/linux/dma-mapping.h 2010-05-28 21:27:16.347237122 -0400 44338+++ linux-2.6.32.15/include/linux/dma-mapping.h 2010-05-28 21:27:16.347237122 -0400
44327@@ -16,50 +16,50 @@ enum dma_data_direction { 44339@@ -16,50 +16,50 @@ enum dma_data_direction {
44328 }; 44340 };
44329 44341
@@ -44390,9 +44402,9 @@ diff -urNp linux-2.6.32.14/include/linux/dma-mapping.h linux-2.6.32.14/include/l
44390 }; 44402 };
44391 44403
44392 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) 44404 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
44393diff -urNp linux-2.6.32.14/include/linux/dst.h linux-2.6.32.14/include/linux/dst.h 44405diff -urNp linux-2.6.32.15/include/linux/dst.h linux-2.6.32.15/include/linux/dst.h
44394--- linux-2.6.32.14/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400 44406--- linux-2.6.32.15/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400
44395+++ linux-2.6.32.14/include/linux/dst.h 2010-05-28 21:27:16.347237122 -0400 44407+++ linux-2.6.32.15/include/linux/dst.h 2010-05-28 21:27:16.347237122 -0400
44396@@ -380,7 +380,7 @@ struct dst_node 44408@@ -380,7 +380,7 @@ struct dst_node
44397 struct thread_pool *pool; 44409 struct thread_pool *pool;
44398 44410
@@ -44402,9 +44414,9 @@ diff -urNp linux-2.6.32.14/include/linux/dst.h linux-2.6.32.14/include/linux/dst
44402 44414
44403 /* 44415 /*
44404 * How frequently and how many times transaction 44416 * How frequently and how many times transaction
44405diff -urNp linux-2.6.32.14/include/linux/elf.h linux-2.6.32.14/include/linux/elf.h 44417diff -urNp linux-2.6.32.15/include/linux/elf.h linux-2.6.32.15/include/linux/elf.h
44406--- linux-2.6.32.14/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400 44418--- linux-2.6.32.15/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400
44407+++ linux-2.6.32.14/include/linux/elf.h 2010-05-28 21:27:16.347237122 -0400 44419+++ linux-2.6.32.15/include/linux/elf.h 2010-05-28 21:27:16.347237122 -0400
44408@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; 44420@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
44409 #define PT_GNU_EH_FRAME 0x6474e550 44421 #define PT_GNU_EH_FRAME 0x6474e550
44410 44422
@@ -44477,9 +44489,9 @@ diff -urNp linux-2.6.32.14/include/linux/elf.h linux-2.6.32.14/include/linux/elf
44477 44489
44478 #endif 44490 #endif
44479 44491
44480diff -urNp linux-2.6.32.14/include/linux/fs.h linux-2.6.32.14/include/linux/fs.h 44492diff -urNp linux-2.6.32.15/include/linux/fs.h linux-2.6.32.15/include/linux/fs.h
44481--- linux-2.6.32.14/include/linux/fs.h 2010-04-29 17:49:38.529851956 -0400 44493--- linux-2.6.32.15/include/linux/fs.h 2010-04-29 17:49:38.529851956 -0400
44482+++ linux-2.6.32.14/include/linux/fs.h 2010-05-28 21:27:16.347237122 -0400 44494+++ linux-2.6.32.15/include/linux/fs.h 2010-05-28 21:27:16.347237122 -0400
44483@@ -90,6 +90,11 @@ struct inodes_stat_t { 44495@@ -90,6 +90,11 @@ struct inodes_stat_t {
44484 /* Expect random access pattern */ 44496 /* Expect random access pattern */
44485 #define FMODE_RANDOM ((__force fmode_t)4096) 44497 #define FMODE_RANDOM ((__force fmode_t)4096)
@@ -44641,9 +44653,9 @@ diff -urNp linux-2.6.32.14/include/linux/fs.h linux-2.6.32.14/include/linux/fs.h
44641 }; 44653 };
44642 44654
44643 /* 44655 /*
44644diff -urNp linux-2.6.32.14/include/linux/fs_struct.h linux-2.6.32.14/include/linux/fs_struct.h 44656diff -urNp linux-2.6.32.15/include/linux/fs_struct.h linux-2.6.32.15/include/linux/fs_struct.h
44645--- linux-2.6.32.14/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400 44657--- linux-2.6.32.15/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400
44646+++ linux-2.6.32.14/include/linux/fs_struct.h 2010-05-28 21:27:16.347237122 -0400 44658+++ linux-2.6.32.15/include/linux/fs_struct.h 2010-05-28 21:27:16.347237122 -0400
44647@@ -4,7 +4,7 @@ 44659@@ -4,7 +4,7 @@
44648 #include <linux/path.h> 44660 #include <linux/path.h>
44649 44661
@@ -44653,9 +44665,9 @@ diff -urNp linux-2.6.32.14/include/linux/fs_struct.h linux-2.6.32.14/include/lin
44653 rwlock_t lock; 44665 rwlock_t lock;
44654 int umask; 44666 int umask;
44655 int in_exec; 44667 int in_exec;
44656diff -urNp linux-2.6.32.14/include/linux/genhd.h linux-2.6.32.14/include/linux/genhd.h 44668diff -urNp linux-2.6.32.15/include/linux/genhd.h linux-2.6.32.15/include/linux/genhd.h
44657--- linux-2.6.32.14/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400 44669--- linux-2.6.32.15/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400
44658+++ linux-2.6.32.14/include/linux/genhd.h 2010-05-28 21:27:16.355225759 -0400 44670+++ linux-2.6.32.15/include/linux/genhd.h 2010-05-28 21:27:16.355225759 -0400
44659@@ -161,7 +161,7 @@ struct gendisk { 44671@@ -161,7 +161,7 @@ struct gendisk {
44660 44672
44661 struct timer_rand_state *random; 44673 struct timer_rand_state *random;
@@ -44665,9 +44677,9 @@ diff -urNp linux-2.6.32.14/include/linux/genhd.h linux-2.6.32.14/include/linux/g
44665 struct work_struct async_notify; 44677 struct work_struct async_notify;
44666 #ifdef CONFIG_BLK_DEV_INTEGRITY 44678 #ifdef CONFIG_BLK_DEV_INTEGRITY
44667 struct blk_integrity *integrity; 44679 struct blk_integrity *integrity;
44668diff -urNp linux-2.6.32.14/include/linux/gracl.h linux-2.6.32.14/include/linux/gracl.h 44680diff -urNp linux-2.6.32.15/include/linux/gracl.h linux-2.6.32.15/include/linux/gracl.h
44669--- linux-2.6.32.14/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 44681--- linux-2.6.32.15/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
44670+++ linux-2.6.32.14/include/linux/gracl.h 2010-05-28 21:27:16.355225759 -0400 44682+++ linux-2.6.32.15/include/linux/gracl.h 2010-05-28 21:27:16.355225759 -0400
44671@@ -0,0 +1,309 @@ 44683@@ -0,0 +1,309 @@
44672+#ifndef GR_ACL_H 44684+#ifndef GR_ACL_H
44673+#define GR_ACL_H 44685+#define GR_ACL_H
@@ -44978,9 +44990,9 @@ diff -urNp linux-2.6.32.14/include/linux/gracl.h linux-2.6.32.14/include/linux/g
44978+ 44990+
44979+#endif 44991+#endif
44980+ 44992+
44981diff -urNp linux-2.6.32.14/include/linux/gralloc.h linux-2.6.32.14/include/linux/gralloc.h 44993diff -urNp linux-2.6.32.15/include/linux/gralloc.h linux-2.6.32.15/include/linux/gralloc.h
44982--- linux-2.6.32.14/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 44994--- linux-2.6.32.15/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
44983+++ linux-2.6.32.14/include/linux/gralloc.h 2010-05-28 21:27:16.355225759 -0400 44995+++ linux-2.6.32.15/include/linux/gralloc.h 2010-05-28 21:27:16.355225759 -0400
44984@@ -0,0 +1,9 @@ 44996@@ -0,0 +1,9 @@
44985+#ifndef __GRALLOC_H 44997+#ifndef __GRALLOC_H
44986+#define __GRALLOC_H 44998+#define __GRALLOC_H
@@ -44991,9 +45003,9 @@ diff -urNp linux-2.6.32.14/include/linux/gralloc.h linux-2.6.32.14/include/linux
44991+void *acl_alloc_num(unsigned long num, unsigned long len); 45003+void *acl_alloc_num(unsigned long num, unsigned long len);
44992+ 45004+
44993+#endif 45005+#endif
44994diff -urNp linux-2.6.32.14/include/linux/grdefs.h linux-2.6.32.14/include/linux/grdefs.h 45006diff -urNp linux-2.6.32.15/include/linux/grdefs.h linux-2.6.32.15/include/linux/grdefs.h
44995--- linux-2.6.32.14/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 45007--- linux-2.6.32.15/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
44996+++ linux-2.6.32.14/include/linux/grdefs.h 2010-05-28 21:27:16.355225759 -0400 45008+++ linux-2.6.32.15/include/linux/grdefs.h 2010-05-28 21:27:16.355225759 -0400
44997@@ -0,0 +1,136 @@ 45009@@ -0,0 +1,136 @@
44998+#ifndef GRDEFS_H 45010+#ifndef GRDEFS_H
44999+#define GRDEFS_H 45011+#define GRDEFS_H
@@ -45131,9 +45143,9 @@ diff -urNp linux-2.6.32.14/include/linux/grdefs.h linux-2.6.32.14/include/linux/
45131+}; 45143+};
45132+ 45144+
45133+#endif 45145+#endif
45134diff -urNp linux-2.6.32.14/include/linux/grinternal.h linux-2.6.32.14/include/linux/grinternal.h 45146diff -urNp linux-2.6.32.15/include/linux/grinternal.h linux-2.6.32.15/include/linux/grinternal.h
45135--- linux-2.6.32.14/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 45147--- linux-2.6.32.15/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
45136+++ linux-2.6.32.14/include/linux/grinternal.h 2010-05-28 21:27:16.355225759 -0400 45148+++ linux-2.6.32.15/include/linux/grinternal.h 2010-05-28 21:27:16.355225759 -0400
45137@@ -0,0 +1,215 @@ 45149@@ -0,0 +1,215 @@
45138+#ifndef __GRINTERNAL_H 45150+#ifndef __GRINTERNAL_H
45139+#define __GRINTERNAL_H 45151+#define __GRINTERNAL_H
@@ -45350,9 +45362,9 @@ diff -urNp linux-2.6.32.14/include/linux/grinternal.h linux-2.6.32.14/include/li
45350+#endif 45362+#endif
45351+ 45363+
45352+#endif 45364+#endif
45353diff -urNp linux-2.6.32.14/include/linux/grmsg.h linux-2.6.32.14/include/linux/grmsg.h 45365diff -urNp linux-2.6.32.15/include/linux/grmsg.h linux-2.6.32.15/include/linux/grmsg.h
45354--- linux-2.6.32.14/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 45366--- linux-2.6.32.15/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
45355+++ linux-2.6.32.14/include/linux/grmsg.h 2010-05-28 21:27:16.355225759 -0400 45367+++ linux-2.6.32.15/include/linux/grmsg.h 2010-05-28 21:27:16.355225759 -0400
45356@@ -0,0 +1,107 @@ 45368@@ -0,0 +1,107 @@
45357+#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" 45369+#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"
45358+#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" 45370+#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"
@@ -45461,9 +45473,9 @@ diff -urNp linux-2.6.32.14/include/linux/grmsg.h linux-2.6.32.14/include/linux/g
45461+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " 45473+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
45462+#define GR_VM86_MSG "denied use of vm86 by " 45474+#define GR_VM86_MSG "denied use of vm86 by "
45463+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " 45475+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
45464diff -urNp linux-2.6.32.14/include/linux/grsecurity.h linux-2.6.32.14/include/linux/grsecurity.h 45476diff -urNp linux-2.6.32.15/include/linux/grsecurity.h linux-2.6.32.15/include/linux/grsecurity.h
45465--- linux-2.6.32.14/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 45477--- linux-2.6.32.15/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
45466+++ linux-2.6.32.14/include/linux/grsecurity.h 2010-05-28 21:27:16.355225759 -0400 45478+++ linux-2.6.32.15/include/linux/grsecurity.h 2010-05-28 21:27:16.355225759 -0400
45467@@ -0,0 +1,199 @@ 45479@@ -0,0 +1,199 @@
45468+#ifndef GR_SECURITY_H 45480+#ifndef GR_SECURITY_H
45469+#define GR_SECURITY_H 45481+#define GR_SECURITY_H
@@ -45664,9 +45676,9 @@ diff -urNp linux-2.6.32.14/include/linux/grsecurity.h linux-2.6.32.14/include/li
45664+#endif 45676+#endif
45665+ 45677+
45666+#endif 45678+#endif
45667diff -urNp linux-2.6.32.14/include/linux/hdpu_features.h linux-2.6.32.14/include/linux/hdpu_features.h 45679diff -urNp linux-2.6.32.15/include/linux/hdpu_features.h linux-2.6.32.15/include/linux/hdpu_features.h
45668--- linux-2.6.32.14/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400 45680--- linux-2.6.32.15/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400
45669+++ linux-2.6.32.14/include/linux/hdpu_features.h 2010-05-28 21:27:16.355225759 -0400 45681+++ linux-2.6.32.15/include/linux/hdpu_features.h 2010-05-28 21:27:16.355225759 -0400
45670@@ -3,7 +3,7 @@ 45682@@ -3,7 +3,7 @@
45671 struct cpustate_t { 45683 struct cpustate_t {
45672 spinlock_t lock; 45684 spinlock_t lock;
@@ -45676,9 +45688,9 @@ diff -urNp linux-2.6.32.14/include/linux/hdpu_features.h linux-2.6.32.14/include
45676 unsigned char cached_val; 45688 unsigned char cached_val;
45677 int inited; 45689 int inited;
45678 unsigned long *set_addr; 45690 unsigned long *set_addr;
45679diff -urNp linux-2.6.32.14/include/linux/highmem.h linux-2.6.32.14/include/linux/highmem.h 45691diff -urNp linux-2.6.32.15/include/linux/highmem.h linux-2.6.32.15/include/linux/highmem.h
45680--- linux-2.6.32.14/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400 45692--- linux-2.6.32.15/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400
45681+++ linux-2.6.32.14/include/linux/highmem.h 2010-05-28 21:27:16.372277939 -0400 45693+++ linux-2.6.32.15/include/linux/highmem.h 2010-05-28 21:27:16.372277939 -0400
45682@@ -137,6 +137,18 @@ static inline void clear_highpage(struct 45694@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
45683 kunmap_atomic(kaddr, KM_USER0); 45695 kunmap_atomic(kaddr, KM_USER0);
45684 } 45696 }
@@ -45698,9 +45710,9 @@ diff -urNp linux-2.6.32.14/include/linux/highmem.h linux-2.6.32.14/include/linux
45698 static inline void zero_user_segments(struct page *page, 45710 static inline void zero_user_segments(struct page *page,
45699 unsigned start1, unsigned end1, 45711 unsigned start1, unsigned end1,
45700 unsigned start2, unsigned end2) 45712 unsigned start2, unsigned end2)
45701diff -urNp linux-2.6.32.14/include/linux/init_task.h linux-2.6.32.14/include/linux/init_task.h 45713diff -urNp linux-2.6.32.15/include/linux/init_task.h linux-2.6.32.15/include/linux/init_task.h
45702--- linux-2.6.32.14/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400 45714--- linux-2.6.32.15/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400
45703+++ linux-2.6.32.14/include/linux/init_task.h 2010-05-28 21:27:16.377048812 -0400 45715+++ linux-2.6.32.15/include/linux/init_task.h 2010-05-28 21:27:16.377048812 -0400
45704@@ -115,6 +115,13 @@ extern struct cred init_cred; 45716@@ -115,6 +115,13 @@ extern struct cred init_cred;
45705 # define INIT_PERF_EVENTS(tsk) 45717 # define INIT_PERF_EVENTS(tsk)
45706 #endif 45718 #endif
@@ -45723,9 +45735,9 @@ diff -urNp linux-2.6.32.14/include/linux/init_task.h linux-2.6.32.14/include/lin
45723 } 45735 }
45724 45736
45725 45737
45726diff -urNp linux-2.6.32.14/include/linux/interrupt.h linux-2.6.32.14/include/linux/interrupt.h 45738diff -urNp linux-2.6.32.15/include/linux/interrupt.h linux-2.6.32.15/include/linux/interrupt.h
45727--- linux-2.6.32.14/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400 45739--- linux-2.6.32.15/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400
45728+++ linux-2.6.32.14/include/linux/interrupt.h 2010-05-28 21:27:16.377048812 -0400 45740+++ linux-2.6.32.15/include/linux/interrupt.h 2010-05-28 21:27:16.377048812 -0400
45729@@ -357,7 +357,7 @@ enum 45741@@ -357,7 +357,7 @@ enum
45730 /* map softirq index to softirq name. update 'softirq_to_name' in 45742 /* map softirq index to softirq name. update 'softirq_to_name' in
45731 * kernel/softirq.c when adding a new softirq. 45743 * kernel/softirq.c when adding a new softirq.
@@ -45750,9 +45762,9 @@ diff -urNp linux-2.6.32.14/include/linux/interrupt.h linux-2.6.32.14/include/lin
45750 extern void softirq_init(void); 45762 extern void softirq_init(void);
45751 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) 45763 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
45752 extern void raise_softirq_irqoff(unsigned int nr); 45764 extern void raise_softirq_irqoff(unsigned int nr);
45753diff -urNp linux-2.6.32.14/include/linux/jbd2.h linux-2.6.32.14/include/linux/jbd2.h 45765diff -urNp linux-2.6.32.15/include/linux/jbd2.h linux-2.6.32.15/include/linux/jbd2.h
45754--- linux-2.6.32.14/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400 45766--- linux-2.6.32.15/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400
45755+++ linux-2.6.32.14/include/linux/jbd2.h 2010-05-28 21:27:16.377048812 -0400 45767+++ linux-2.6.32.15/include/linux/jbd2.h 2010-05-28 21:27:16.377048812 -0400
45756@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; 45768@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
45757 } \ 45769 } \
45758 } while (0) 45770 } while (0)
@@ -45762,9 +45774,9 @@ diff -urNp linux-2.6.32.14/include/linux/jbd2.h linux-2.6.32.14/include/linux/jb
45762 #endif 45774 #endif
45763 45775
45764 static inline void *jbd2_alloc(size_t size, gfp_t flags) 45776 static inline void *jbd2_alloc(size_t size, gfp_t flags)
45765diff -urNp linux-2.6.32.14/include/linux/jbd.h linux-2.6.32.14/include/linux/jbd.h 45777diff -urNp linux-2.6.32.15/include/linux/jbd.h linux-2.6.32.15/include/linux/jbd.h
45766--- linux-2.6.32.14/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400 45778--- linux-2.6.32.15/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400
45767+++ linux-2.6.32.14/include/linux/jbd.h 2010-05-28 21:27:16.377048812 -0400 45779+++ linux-2.6.32.15/include/linux/jbd.h 2010-05-28 21:27:16.377048812 -0400
45768@@ -66,7 +66,7 @@ extern u8 journal_enable_debug; 45780@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
45769 } \ 45781 } \
45770 } while (0) 45782 } while (0)
@@ -45774,9 +45786,9 @@ diff -urNp linux-2.6.32.14/include/linux/jbd.h linux-2.6.32.14/include/linux/jbd
45774 #endif 45786 #endif
45775 45787
45776 static inline void *jbd_alloc(size_t size, gfp_t flags) 45788 static inline void *jbd_alloc(size_t size, gfp_t flags)
45777diff -urNp linux-2.6.32.14/include/linux/kallsyms.h linux-2.6.32.14/include/linux/kallsyms.h 45789diff -urNp linux-2.6.32.15/include/linux/kallsyms.h linux-2.6.32.15/include/linux/kallsyms.h
45778--- linux-2.6.32.14/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400 45790--- linux-2.6.32.15/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400
45779+++ linux-2.6.32.14/include/linux/kallsyms.h 2010-05-28 21:27:16.377048812 -0400 45791+++ linux-2.6.32.15/include/linux/kallsyms.h 2010-05-28 21:27:16.377048812 -0400
45780@@ -15,7 +15,8 @@ 45792@@ -15,7 +15,8 @@
45781 45793
45782 struct module; 45794 struct module;
@@ -45797,9 +45809,9 @@ diff -urNp linux-2.6.32.14/include/linux/kallsyms.h linux-2.6.32.14/include/linu
45797 45809
45798 /* This macro allows us to keep printk typechecking */ 45810 /* This macro allows us to keep printk typechecking */
45799 static void __check_printsym_format(const char *fmt, ...) 45811 static void __check_printsym_format(const char *fmt, ...)
45800diff -urNp linux-2.6.32.14/include/linux/kgdb.h linux-2.6.32.14/include/linux/kgdb.h 45812diff -urNp linux-2.6.32.15/include/linux/kgdb.h linux-2.6.32.15/include/linux/kgdb.h
45801--- linux-2.6.32.14/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400 45813--- linux-2.6.32.15/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400
45802+++ linux-2.6.32.14/include/linux/kgdb.h 2010-05-28 21:27:16.379237094 -0400 45814+++ linux-2.6.32.15/include/linux/kgdb.h 2010-05-28 21:27:16.379237094 -0400
45803@@ -251,20 +251,20 @@ struct kgdb_arch { 45815@@ -251,20 +251,20 @@ struct kgdb_arch {
45804 */ 45816 */
45805 struct kgdb_io { 45817 struct kgdb_io {
@@ -45830,9 +45842,9 @@ diff -urNp linux-2.6.32.14/include/linux/kgdb.h linux-2.6.32.14/include/linux/kg
45830 45842
45831 extern int kgdb_hex2long(char **ptr, unsigned long *long_val); 45843 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
45832 extern int kgdb_mem2hex(char *mem, char *buf, int count); 45844 extern int kgdb_mem2hex(char *mem, char *buf, int count);
45833diff -urNp linux-2.6.32.14/include/linux/kobject.h linux-2.6.32.14/include/linux/kobject.h 45845diff -urNp linux-2.6.32.15/include/linux/kobject.h linux-2.6.32.15/include/linux/kobject.h
45834--- linux-2.6.32.14/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400 45846--- linux-2.6.32.15/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400
45835+++ linux-2.6.32.14/include/linux/kobject.h 2010-05-28 21:27:16.379237094 -0400 45847+++ linux-2.6.32.15/include/linux/kobject.h 2010-05-28 21:27:16.379237094 -0400
45836@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob 45848@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
45837 45849
45838 struct kobj_type { 45850 struct kobj_type {
@@ -45881,9 +45893,9 @@ diff -urNp linux-2.6.32.14/include/linux/kobject.h linux-2.6.32.14/include/linux
45881 struct kobject *parent_kobj); 45893 struct kobject *parent_kobj);
45882 45894
45883 static inline struct kset *to_kset(struct kobject *kobj) 45895 static inline struct kset *to_kset(struct kobject *kobj)
45884diff -urNp linux-2.6.32.14/include/linux/kvm_host.h linux-2.6.32.14/include/linux/kvm_host.h 45896diff -urNp linux-2.6.32.15/include/linux/kvm_host.h linux-2.6.32.15/include/linux/kvm_host.h
45885--- linux-2.6.32.14/include/linux/kvm_host.h 2010-04-29 17:49:38.529851956 -0400 45897--- linux-2.6.32.15/include/linux/kvm_host.h 2010-04-29 17:49:38.529851956 -0400
45886+++ linux-2.6.32.14/include/linux/kvm_host.h 2010-05-28 21:27:16.379237094 -0400 45898+++ linux-2.6.32.15/include/linux/kvm_host.h 2010-05-28 21:27:16.379237094 -0400
45887@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc 45899@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
45888 void vcpu_load(struct kvm_vcpu *vcpu); 45900 void vcpu_load(struct kvm_vcpu *vcpu);
45889 void vcpu_put(struct kvm_vcpu *vcpu); 45901 void vcpu_put(struct kvm_vcpu *vcpu);
@@ -45902,9 +45914,9 @@ diff -urNp linux-2.6.32.14/include/linux/kvm_host.h linux-2.6.32.14/include/linu
45902 void kvm_arch_exit(void); 45914 void kvm_arch_exit(void);
45903 45915
45904 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); 45916 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
45905diff -urNp linux-2.6.32.14/include/linux/libata.h linux-2.6.32.14/include/linux/libata.h 45917diff -urNp linux-2.6.32.15/include/linux/libata.h linux-2.6.32.15/include/linux/libata.h
45906--- linux-2.6.32.14/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400 45918--- linux-2.6.32.15/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400
45907+++ linux-2.6.32.14/include/linux/libata.h 2010-05-28 21:27:16.391248013 -0400 45919+++ linux-2.6.32.15/include/linux/libata.h 2010-05-28 21:27:16.391248013 -0400
45908@@ -64,11 +64,11 @@ 45920@@ -64,11 +64,11 @@
45909 #ifdef ATA_VERBOSE_DEBUG 45921 #ifdef ATA_VERBOSE_DEBUG
45910 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) 45922 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -45970,9 +45982,9 @@ diff -urNp linux-2.6.32.14/include/linux/libata.h linux-2.6.32.14/include/linux/
45970 extern int ata_scsi_detect(struct scsi_host_template *sht); 45982 extern int ata_scsi_detect(struct scsi_host_template *sht);
45971 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); 45983 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
45972 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); 45984 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
45973diff -urNp linux-2.6.32.14/include/linux/lockd/bind.h linux-2.6.32.14/include/linux/lockd/bind.h 45985diff -urNp linux-2.6.32.15/include/linux/lockd/bind.h linux-2.6.32.15/include/linux/lockd/bind.h
45974--- linux-2.6.32.14/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400 45986--- linux-2.6.32.15/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400
45975+++ linux-2.6.32.14/include/linux/lockd/bind.h 2010-05-28 21:27:16.391248013 -0400 45987+++ linux-2.6.32.15/include/linux/lockd/bind.h 2010-05-28 21:27:16.391248013 -0400
45976@@ -23,13 +23,13 @@ struct svc_rqst; 45988@@ -23,13 +23,13 @@ struct svc_rqst;
45977 * This is the set of functions for lockd->nfsd communication 45989 * This is the set of functions for lockd->nfsd communication
45978 */ 45990 */
@@ -45990,21 +46002,25 @@ diff -urNp linux-2.6.32.14/include/linux/lockd/bind.h linux-2.6.32.14/include/li
45990 46002
45991 /* 46003 /*
45992 * Similar to nfs_client_initdata, but without the NFS-specific 46004 * Similar to nfs_client_initdata, but without the NFS-specific
45993diff -urNp linux-2.6.32.14/include/linux/mm.h linux-2.6.32.14/include/linux/mm.h 46005diff -urNp linux-2.6.32.15/include/linux/mm.h linux-2.6.32.15/include/linux/mm.h
45994--- linux-2.6.32.14/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400 46006--- linux-2.6.32.15/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400
45995+++ linux-2.6.32.14/include/linux/mm.h 2010-05-28 21:27:16.391248013 -0400 46007+++ linux-2.6.32.15/include/linux/mm.h 2010-05-31 11:15:44.592892079 -0400
45996@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void 46008@@ -102,7 +102,14 @@ extern unsigned int kobjsize(const void
45997 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
45998 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
45999 46009
46000+#ifdef CONFIG_PAX_PAGEEXEC 46010 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
46001+#define VM_PAGEEXEC 0x80000000 /* vma->vm_page_prot needs special handling */ 46011 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
46012+
46013+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
46014+#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */
46015+#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */
46016+#else
46017 #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
46002+#endif 46018+#endif
46003+ 46019+
46004 #ifndef VM_STACK_DEFAULT_FLAGS /* arch can override this */ 46020 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
46005 #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS 46021 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
46006 #endif 46022
46007@@ -880,6 +884,8 @@ struct shrinker { 46023@@ -880,6 +887,8 @@ struct shrinker {
46008 extern void register_shrinker(struct shrinker *); 46024 extern void register_shrinker(struct shrinker *);
46009 extern void unregister_shrinker(struct shrinker *); 46025 extern void unregister_shrinker(struct shrinker *);
46010 46026
@@ -46013,7 +46029,7 @@ diff -urNp linux-2.6.32.14/include/linux/mm.h linux-2.6.32.14/include/linux/mm.h
46013 int vma_wants_writenotify(struct vm_area_struct *vma); 46029 int vma_wants_writenotify(struct vm_area_struct *vma);
46014 46030
46015 extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl); 46031 extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl);
46016@@ -1152,6 +1158,7 @@ out: 46032@@ -1152,6 +1161,7 @@ out:
46017 } 46033 }
46018 46034
46019 extern int do_munmap(struct mm_struct *, unsigned long, size_t); 46035 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
@@ -46021,7 +46037,7 @@ diff -urNp linux-2.6.32.14/include/linux/mm.h linux-2.6.32.14/include/linux/mm.h
46021 46037
46022 extern unsigned long do_brk(unsigned long, unsigned long); 46038 extern unsigned long do_brk(unsigned long, unsigned long);
46023 46039
46024@@ -1206,6 +1213,10 @@ extern struct vm_area_struct * find_vma( 46040@@ -1206,6 +1216,10 @@ extern struct vm_area_struct * find_vma(
46025 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr, 46041 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
46026 struct vm_area_struct **pprev); 46042 struct vm_area_struct **pprev);
46027 46043
@@ -46032,7 +46048,7 @@ diff -urNp linux-2.6.32.14/include/linux/mm.h linux-2.6.32.14/include/linux/mm.h
46032 /* Look up the first VMA which intersects the interval start_addr..end_addr-1, 46048 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
46033 NULL if none. Assume start_addr < end_addr. */ 46049 NULL if none. Assume start_addr < end_addr. */
46034 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr) 46050 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
46035@@ -1222,7 +1233,6 @@ static inline unsigned long vma_pages(st 46051@@ -1222,7 +1236,6 @@ static inline unsigned long vma_pages(st
46036 return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; 46052 return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
46037 } 46053 }
46038 46054
@@ -46040,7 +46056,7 @@ diff -urNp linux-2.6.32.14/include/linux/mm.h linux-2.6.32.14/include/linux/mm.h
46040 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr); 46056 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
46041 int remap_pfn_range(struct vm_area_struct *, unsigned long addr, 46057 int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
46042 unsigned long pfn, unsigned long size, pgprot_t); 46058 unsigned long pfn, unsigned long size, pgprot_t);
46043@@ -1320,7 +1330,13 @@ extern void memory_failure(unsigned long 46059@@ -1320,7 +1333,13 @@ extern void memory_failure(unsigned long
46044 extern int __memory_failure(unsigned long pfn, int trapno, int ref); 46060 extern int __memory_failure(unsigned long pfn, int trapno, int ref);
46045 extern int sysctl_memory_failure_early_kill; 46061 extern int sysctl_memory_failure_early_kill;
46046 extern int sysctl_memory_failure_recovery; 46062 extern int sysctl_memory_failure_recovery;
@@ -46055,9 +46071,9 @@ diff -urNp linux-2.6.32.14/include/linux/mm.h linux-2.6.32.14/include/linux/mm.h
46055 46071
46056 #endif /* __KERNEL__ */ 46072 #endif /* __KERNEL__ */
46057 #endif /* _LINUX_MM_H */ 46073 #endif /* _LINUX_MM_H */
46058diff -urNp linux-2.6.32.14/include/linux/mm_types.h linux-2.6.32.14/include/linux/mm_types.h 46074diff -urNp linux-2.6.32.15/include/linux/mm_types.h linux-2.6.32.15/include/linux/mm_types.h
46059--- linux-2.6.32.14/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400 46075--- linux-2.6.32.15/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400
46060+++ linux-2.6.32.14/include/linux/mm_types.h 2010-05-28 21:27:16.391248013 -0400 46076+++ linux-2.6.32.15/include/linux/mm_types.h 2010-05-28 21:27:16.391248013 -0400
46061@@ -186,6 +186,8 @@ struct vm_area_struct { 46077@@ -186,6 +186,8 @@ struct vm_area_struct {
46062 #ifdef CONFIG_NUMA 46078 #ifdef CONFIG_NUMA
46063 struct mempolicy *vm_policy; /* NUMA policy for the VMA */ 46079 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -46092,9 +46108,9 @@ diff -urNp linux-2.6.32.14/include/linux/mm_types.h linux-2.6.32.14/include/linu
46092 }; 46108 };
46093 46109
46094 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ 46110 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
46095diff -urNp linux-2.6.32.14/include/linux/mmu_notifier.h linux-2.6.32.14/include/linux/mmu_notifier.h 46111diff -urNp linux-2.6.32.15/include/linux/mmu_notifier.h linux-2.6.32.15/include/linux/mmu_notifier.h
46096--- linux-2.6.32.14/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400 46112--- linux-2.6.32.15/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400
46097+++ linux-2.6.32.14/include/linux/mmu_notifier.h 2010-05-28 21:27:16.391248013 -0400 46113+++ linux-2.6.32.15/include/linux/mmu_notifier.h 2010-05-28 21:27:16.391248013 -0400
46098@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr 46114@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
46099 */ 46115 */
46100 #define ptep_clear_flush_notify(__vma, __address, __ptep) \ 46116 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -46111,9 +46127,9 @@ diff -urNp linux-2.6.32.14/include/linux/mmu_notifier.h linux-2.6.32.14/include/
46111 }) 46127 })
46112 46128
46113 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ 46129 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
46114diff -urNp linux-2.6.32.14/include/linux/mod_devicetable.h linux-2.6.32.14/include/linux/mod_devicetable.h 46130diff -urNp linux-2.6.32.15/include/linux/mod_devicetable.h linux-2.6.32.15/include/linux/mod_devicetable.h
46115--- linux-2.6.32.14/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400 46131--- linux-2.6.32.15/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400
46116+++ linux-2.6.32.14/include/linux/mod_devicetable.h 2010-05-28 21:27:16.391248013 -0400 46132+++ linux-2.6.32.15/include/linux/mod_devicetable.h 2010-05-28 21:27:16.391248013 -0400
46117@@ -12,7 +12,7 @@ 46133@@ -12,7 +12,7 @@
46118 typedef unsigned long kernel_ulong_t; 46134 typedef unsigned long kernel_ulong_t;
46119 #endif 46135 #endif
@@ -46132,9 +46148,9 @@ diff -urNp linux-2.6.32.14/include/linux/mod_devicetable.h linux-2.6.32.14/inclu
46132 46148
46133 struct hid_device_id { 46149 struct hid_device_id {
46134 __u16 bus; 46150 __u16 bus;
46135diff -urNp linux-2.6.32.14/include/linux/module.h linux-2.6.32.14/include/linux/module.h 46151diff -urNp linux-2.6.32.15/include/linux/module.h linux-2.6.32.15/include/linux/module.h
46136--- linux-2.6.32.14/include/linux/module.h 2010-05-28 20:16:44.458924952 -0400 46152--- linux-2.6.32.15/include/linux/module.h 2010-05-28 20:16:44.458924952 -0400
46137+++ linux-2.6.32.14/include/linux/module.h 2010-05-28 21:27:16.391248013 -0400 46153+++ linux-2.6.32.15/include/linux/module.h 2010-05-28 21:27:16.391248013 -0400
46138@@ -287,16 +287,16 @@ struct module 46154@@ -287,16 +287,16 @@ struct module
46139 int (*init)(void); 46155 int (*init)(void);
46140 46156
@@ -46207,9 +46223,9 @@ diff -urNp linux-2.6.32.14/include/linux/module.h linux-2.6.32.14/include/linux/
46207 } 46223 }
46208 46224
46209 /* Search for module by name: must hold module_mutex. */ 46225 /* Search for module by name: must hold module_mutex. */
46210diff -urNp linux-2.6.32.14/include/linux/moduleloader.h linux-2.6.32.14/include/linux/moduleloader.h 46226diff -urNp linux-2.6.32.15/include/linux/moduleloader.h linux-2.6.32.15/include/linux/moduleloader.h
46211--- linux-2.6.32.14/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400 46227--- linux-2.6.32.15/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400
46212+++ linux-2.6.32.14/include/linux/moduleloader.h 2010-05-28 21:27:16.391248013 -0400 46228+++ linux-2.6.32.15/include/linux/moduleloader.h 2010-05-28 21:27:16.391248013 -0400
46213@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st 46229@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
46214 sections. Returns NULL on failure. */ 46230 sections. Returns NULL on failure. */
46215 void *module_alloc(unsigned long size); 46231 void *module_alloc(unsigned long size);
@@ -46232,9 +46248,9 @@ diff -urNp linux-2.6.32.14/include/linux/moduleloader.h linux-2.6.32.14/include/
46232 /* Apply the given relocation to the (simplified) ELF. Return -error 46248 /* Apply the given relocation to the (simplified) ELF. Return -error
46233 or 0. */ 46249 or 0. */
46234 int apply_relocate(Elf_Shdr *sechdrs, 46250 int apply_relocate(Elf_Shdr *sechdrs,
46235diff -urNp linux-2.6.32.14/include/linux/namei.h linux-2.6.32.14/include/linux/namei.h 46251diff -urNp linux-2.6.32.15/include/linux/namei.h linux-2.6.32.15/include/linux/namei.h
46236--- linux-2.6.32.14/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400 46252--- linux-2.6.32.15/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400
46237+++ linux-2.6.32.14/include/linux/namei.h 2010-05-28 21:27:16.394947878 -0400 46253+++ linux-2.6.32.15/include/linux/namei.h 2010-05-28 21:27:16.394947878 -0400
46238@@ -22,7 +22,7 @@ struct nameidata { 46254@@ -22,7 +22,7 @@ struct nameidata {
46239 unsigned int flags; 46255 unsigned int flags;
46240 int last_type; 46256 int last_type;
@@ -46259,9 +46275,9 @@ diff -urNp linux-2.6.32.14/include/linux/namei.h linux-2.6.32.14/include/linux/n
46259 { 46275 {
46260 return nd->saved_names[nd->depth]; 46276 return nd->saved_names[nd->depth];
46261 } 46277 }
46262diff -urNp linux-2.6.32.14/include/linux/nodemask.h linux-2.6.32.14/include/linux/nodemask.h 46278diff -urNp linux-2.6.32.15/include/linux/nodemask.h linux-2.6.32.15/include/linux/nodemask.h
46263--- linux-2.6.32.14/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400 46279--- linux-2.6.32.15/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400
46264+++ linux-2.6.32.14/include/linux/nodemask.h 2010-05-28 21:27:16.394947878 -0400 46280+++ linux-2.6.32.15/include/linux/nodemask.h 2010-05-28 21:27:16.394947878 -0400
46265@@ -464,11 +464,11 @@ static inline int num_node_state(enum no 46281@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
46266 46282
46267 #define any_online_node(mask) \ 46283 #define any_online_node(mask) \
@@ -46278,9 +46294,9 @@ diff -urNp linux-2.6.32.14/include/linux/nodemask.h linux-2.6.32.14/include/linu
46278 }) 46294 })
46279 46295
46280 #define num_online_nodes() num_node_state(N_ONLINE) 46296 #define num_online_nodes() num_node_state(N_ONLINE)
46281diff -urNp linux-2.6.32.14/include/linux/oprofile.h linux-2.6.32.14/include/linux/oprofile.h 46297diff -urNp linux-2.6.32.15/include/linux/oprofile.h linux-2.6.32.15/include/linux/oprofile.h
46282--- linux-2.6.32.14/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400 46298--- linux-2.6.32.15/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400
46283+++ linux-2.6.32.14/include/linux/oprofile.h 2010-05-28 21:27:16.394947878 -0400 46299+++ linux-2.6.32.15/include/linux/oprofile.h 2010-05-28 21:27:16.394947878 -0400
46284@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super 46300@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
46285 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, 46301 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
46286 char const * name, ulong * val); 46302 char const * name, ulong * val);
@@ -46293,9 +46309,9 @@ diff -urNp linux-2.6.32.14/include/linux/oprofile.h linux-2.6.32.14/include/linu
46293 46309
46294 /** create a directory */ 46310 /** create a directory */
46295 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, 46311 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
46296diff -urNp linux-2.6.32.14/include/linux/pipe_fs_i.h linux-2.6.32.14/include/linux/pipe_fs_i.h 46312diff -urNp linux-2.6.32.15/include/linux/pipe_fs_i.h linux-2.6.32.15/include/linux/pipe_fs_i.h
46297--- linux-2.6.32.14/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400 46313--- linux-2.6.32.15/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400
46298+++ linux-2.6.32.14/include/linux/pipe_fs_i.h 2010-05-28 21:27:16.394947878 -0400 46314+++ linux-2.6.32.15/include/linux/pipe_fs_i.h 2010-05-28 21:27:16.394947878 -0400
46299@@ -46,9 +46,9 @@ struct pipe_inode_info { 46315@@ -46,9 +46,9 @@ struct pipe_inode_info {
46300 wait_queue_head_t wait; 46316 wait_queue_head_t wait;
46301 unsigned int nrbufs, curbuf; 46317 unsigned int nrbufs, curbuf;
@@ -46309,9 +46325,9 @@ diff -urNp linux-2.6.32.14/include/linux/pipe_fs_i.h linux-2.6.32.14/include/lin
46309 unsigned int r_counter; 46325 unsigned int r_counter;
46310 unsigned int w_counter; 46326 unsigned int w_counter;
46311 struct fasync_struct *fasync_readers; 46327 struct fasync_struct *fasync_readers;
46312diff -urNp linux-2.6.32.14/include/linux/poison.h linux-2.6.32.14/include/linux/poison.h 46328diff -urNp linux-2.6.32.15/include/linux/poison.h linux-2.6.32.15/include/linux/poison.h
46313--- linux-2.6.32.14/include/linux/poison.h 2010-05-15 13:20:19.331913169 -0400 46329--- linux-2.6.32.15/include/linux/poison.h 2010-05-15 13:20:19.331913169 -0400
46314+++ linux-2.6.32.14/include/linux/poison.h 2010-05-28 21:27:16.394947878 -0400 46330+++ linux-2.6.32.15/include/linux/poison.h 2010-05-28 21:27:16.394947878 -0400
46315@@ -19,8 +19,8 @@ 46331@@ -19,8 +19,8 @@
46316 * under normal circumstances, used to verify that nobody uses 46332 * under normal circumstances, used to verify that nobody uses
46317 * non-initialized list entries. 46333 * non-initialized list entries.
@@ -46323,9 +46339,9 @@ diff -urNp linux-2.6.32.14/include/linux/poison.h linux-2.6.32.14/include/linux/
46323 46339
46324 /********** include/linux/timer.h **********/ 46340 /********** include/linux/timer.h **********/
46325 /* 46341 /*
46326diff -urNp linux-2.6.32.14/include/linux/proc_fs.h linux-2.6.32.14/include/linux/proc_fs.h 46342diff -urNp linux-2.6.32.15/include/linux/proc_fs.h linux-2.6.32.15/include/linux/proc_fs.h
46327--- linux-2.6.32.14/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400 46343--- linux-2.6.32.15/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400
46328+++ linux-2.6.32.14/include/linux/proc_fs.h 2010-05-28 21:27:16.394947878 -0400 46344+++ linux-2.6.32.15/include/linux/proc_fs.h 2010-05-28 21:27:16.394947878 -0400
46329@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro 46345@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
46330 return proc_create_data(name, mode, parent, proc_fops, NULL); 46346 return proc_create_data(name, mode, parent, proc_fops, NULL);
46331 } 46347 }
@@ -46346,9 +46362,9 @@ diff -urNp linux-2.6.32.14/include/linux/proc_fs.h linux-2.6.32.14/include/linux
46346 static inline struct proc_dir_entry *create_proc_read_entry(const char *name, 46362 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
46347 mode_t mode, struct proc_dir_entry *base, 46363 mode_t mode, struct proc_dir_entry *base,
46348 read_proc_t *read_proc, void * data) 46364 read_proc_t *read_proc, void * data)
46349diff -urNp linux-2.6.32.14/include/linux/random.h linux-2.6.32.14/include/linux/random.h 46365diff -urNp linux-2.6.32.15/include/linux/random.h linux-2.6.32.15/include/linux/random.h
46350--- linux-2.6.32.14/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400 46366--- linux-2.6.32.15/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400
46351+++ linux-2.6.32.14/include/linux/random.h 2010-05-28 21:27:16.394947878 -0400 46367+++ linux-2.6.32.15/include/linux/random.h 2010-05-28 21:27:16.394947878 -0400
46352@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l 46368@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
46353 u32 random32(void); 46369 u32 random32(void);
46354 void srandom32(u32 seed); 46370 void srandom32(u32 seed);
@@ -46361,9 +46377,9 @@ diff -urNp linux-2.6.32.14/include/linux/random.h linux-2.6.32.14/include/linux/
46361 #endif /* __KERNEL___ */ 46377 #endif /* __KERNEL___ */
46362 46378
46363 #endif /* _LINUX_RANDOM_H */ 46379 #endif /* _LINUX_RANDOM_H */
46364diff -urNp linux-2.6.32.14/include/linux/reiserfs_fs.h linux-2.6.32.14/include/linux/reiserfs_fs.h 46380diff -urNp linux-2.6.32.15/include/linux/reiserfs_fs.h linux-2.6.32.15/include/linux/reiserfs_fs.h
46365--- linux-2.6.32.14/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400 46381--- linux-2.6.32.15/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400
46366+++ linux-2.6.32.14/include/linux/reiserfs_fs.h 2010-05-28 21:27:16.394947878 -0400 46382+++ linux-2.6.32.15/include/linux/reiserfs_fs.h 2010-05-28 21:27:16.394947878 -0400
46367@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset 46383@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
46368 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ 46384 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
46369 46385
@@ -46410,9 +46426,9 @@ diff -urNp linux-2.6.32.14/include/linux/reiserfs_fs.h linux-2.6.32.14/include/l
46410 46426
46411 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) 46427 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
46412 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) 46428 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
46413diff -urNp linux-2.6.32.14/include/linux/reiserfs_fs_sb.h linux-2.6.32.14/include/linux/reiserfs_fs_sb.h 46429diff -urNp linux-2.6.32.15/include/linux/reiserfs_fs_sb.h linux-2.6.32.15/include/linux/reiserfs_fs_sb.h
46414--- linux-2.6.32.14/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400 46430--- linux-2.6.32.15/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400
46415+++ linux-2.6.32.14/include/linux/reiserfs_fs_sb.h 2010-05-28 21:27:16.394947878 -0400 46431+++ linux-2.6.32.15/include/linux/reiserfs_fs_sb.h 2010-05-28 21:27:16.394947878 -0400
46416@@ -377,7 +377,7 @@ struct reiserfs_sb_info { 46432@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
46417 /* Comment? -Hans */ 46433 /* Comment? -Hans */
46418 wait_queue_head_t s_wait; 46434 wait_queue_head_t s_wait;
@@ -46422,9 +46438,9 @@ diff -urNp linux-2.6.32.14/include/linux/reiserfs_fs_sb.h linux-2.6.32.14/includ
46422 // tree gets re-balanced 46438 // tree gets re-balanced
46423 unsigned long s_properties; /* File system properties. Currently holds 46439 unsigned long s_properties; /* File system properties. Currently holds
46424 on-disk FS format */ 46440 on-disk FS format */
46425diff -urNp linux-2.6.32.14/include/linux/sched.h linux-2.6.32.14/include/linux/sched.h 46441diff -urNp linux-2.6.32.15/include/linux/sched.h linux-2.6.32.15/include/linux/sched.h
46426--- linux-2.6.32.14/include/linux/sched.h 2010-05-28 20:16:44.458924952 -0400 46442--- linux-2.6.32.15/include/linux/sched.h 2010-05-28 20:16:44.458924952 -0400
46427+++ linux-2.6.32.14/include/linux/sched.h 2010-05-28 21:27:16.403248422 -0400 46443+++ linux-2.6.32.15/include/linux/sched.h 2010-05-28 21:27:16.403248422 -0400
46428@@ -101,6 +101,7 @@ struct bio; 46444@@ -101,6 +101,7 @@ struct bio;
46429 struct fs_struct; 46445 struct fs_struct;
46430 struct bts_context; 46446 struct bts_context;
@@ -46673,9 +46689,9 @@ diff -urNp linux-2.6.32.14/include/linux/sched.h linux-2.6.32.14/include/linux/s
46673 extern void thread_info_cache_init(void); 46689 extern void thread_info_cache_init(void);
46674 46690
46675 #ifdef CONFIG_DEBUG_STACK_USAGE 46691 #ifdef CONFIG_DEBUG_STACK_USAGE
46676diff -urNp linux-2.6.32.14/include/linux/screen_info.h linux-2.6.32.14/include/linux/screen_info.h 46692diff -urNp linux-2.6.32.15/include/linux/screen_info.h linux-2.6.32.15/include/linux/screen_info.h
46677--- linux-2.6.32.14/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400 46693--- linux-2.6.32.15/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400
46678+++ linux-2.6.32.14/include/linux/screen_info.h 2010-05-28 21:27:16.403248422 -0400 46694+++ linux-2.6.32.15/include/linux/screen_info.h 2010-05-28 21:27:16.403248422 -0400
46679@@ -42,7 +42,8 @@ struct screen_info { 46695@@ -42,7 +42,8 @@ struct screen_info {
46680 __u16 pages; /* 0x32 */ 46696 __u16 pages; /* 0x32 */
46681 __u16 vesa_attributes; /* 0x34 */ 46697 __u16 vesa_attributes; /* 0x34 */
@@ -46686,9 +46702,9 @@ diff -urNp linux-2.6.32.14/include/linux/screen_info.h linux-2.6.32.14/include/l
46686 } __attribute__((packed)); 46702 } __attribute__((packed));
46687 46703
46688 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ 46704 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
46689diff -urNp linux-2.6.32.14/include/linux/security.h linux-2.6.32.14/include/linux/security.h 46705diff -urNp linux-2.6.32.15/include/linux/security.h linux-2.6.32.15/include/linux/security.h
46690--- linux-2.6.32.14/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400 46706--- linux-2.6.32.15/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400
46691+++ linux-2.6.32.14/include/linux/security.h 2010-05-28 21:27:16.403248422 -0400 46707+++ linux-2.6.32.15/include/linux/security.h 2010-05-28 21:27:16.403248422 -0400
46692@@ -34,6 +34,7 @@ 46708@@ -34,6 +34,7 @@
46693 #include <linux/key.h> 46709 #include <linux/key.h>
46694 #include <linux/xfrm.h> 46710 #include <linux/xfrm.h>
@@ -46697,9 +46713,9 @@ diff -urNp linux-2.6.32.14/include/linux/security.h linux-2.6.32.14/include/linu
46697 #include <net/flow.h> 46713 #include <net/flow.h>
46698 46714
46699 /* Maximum number of letters for an LSM name string */ 46715 /* Maximum number of letters for an LSM name string */
46700diff -urNp linux-2.6.32.14/include/linux/shm.h linux-2.6.32.14/include/linux/shm.h 46716diff -urNp linux-2.6.32.15/include/linux/shm.h linux-2.6.32.15/include/linux/shm.h
46701--- linux-2.6.32.14/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400 46717--- linux-2.6.32.15/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400
46702+++ linux-2.6.32.14/include/linux/shm.h 2010-05-28 21:27:16.403248422 -0400 46718+++ linux-2.6.32.15/include/linux/shm.h 2010-05-28 21:27:16.403248422 -0400
46703@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke 46719@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
46704 pid_t shm_cprid; 46720 pid_t shm_cprid;
46705 pid_t shm_lprid; 46721 pid_t shm_lprid;
@@ -46711,9 +46727,9 @@ diff -urNp linux-2.6.32.14/include/linux/shm.h linux-2.6.32.14/include/linux/shm
46711 }; 46727 };
46712 46728
46713 /* shm_mode upper byte flags */ 46729 /* shm_mode upper byte flags */
46714diff -urNp linux-2.6.32.14/include/linux/slab.h linux-2.6.32.14/include/linux/slab.h 46730diff -urNp linux-2.6.32.15/include/linux/slab.h linux-2.6.32.15/include/linux/slab.h
46715--- linux-2.6.32.14/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400 46731--- linux-2.6.32.15/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400
46716+++ linux-2.6.32.14/include/linux/slab.h 2010-05-28 21:27:16.407250185 -0400 46732+++ linux-2.6.32.15/include/linux/slab.h 2010-05-28 21:27:16.407250185 -0400
46717@@ -11,6 +11,7 @@ 46733@@ -11,6 +11,7 @@
46718 46734
46719 #include <linux/gfp.h> 46735 #include <linux/gfp.h>
@@ -46785,9 +46801,9 @@ diff -urNp linux-2.6.32.14/include/linux/slab.h linux-2.6.32.14/include/linux/sl
46785+}) 46801+})
46786+ 46802+
46787 #endif /* _LINUX_SLAB_H */ 46803 #endif /* _LINUX_SLAB_H */
46788diff -urNp linux-2.6.32.14/include/linux/slub_def.h linux-2.6.32.14/include/linux/slub_def.h 46804diff -urNp linux-2.6.32.15/include/linux/slub_def.h linux-2.6.32.15/include/linux/slub_def.h
46789--- linux-2.6.32.14/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400 46805--- linux-2.6.32.15/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400
46790+++ linux-2.6.32.14/include/linux/slub_def.h 2010-05-28 21:27:16.407250185 -0400 46806+++ linux-2.6.32.15/include/linux/slub_def.h 2010-05-28 21:27:16.407250185 -0400
46791@@ -86,7 +86,7 @@ struct kmem_cache { 46807@@ -86,7 +86,7 @@ struct kmem_cache {
46792 struct kmem_cache_order_objects max; 46808 struct kmem_cache_order_objects max;
46793 struct kmem_cache_order_objects min; 46809 struct kmem_cache_order_objects min;
@@ -46797,9 +46813,9 @@ diff -urNp linux-2.6.32.14/include/linux/slub_def.h linux-2.6.32.14/include/linu
46797 void (*ctor)(void *); 46813 void (*ctor)(void *);
46798 int inuse; /* Offset to metadata */ 46814 int inuse; /* Offset to metadata */
46799 int align; /* Alignment */ 46815 int align; /* Alignment */
46800diff -urNp linux-2.6.32.14/include/linux/sonet.h linux-2.6.32.14/include/linux/sonet.h 46816diff -urNp linux-2.6.32.15/include/linux/sonet.h linux-2.6.32.15/include/linux/sonet.h
46801--- linux-2.6.32.14/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400 46817--- linux-2.6.32.15/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400
46802+++ linux-2.6.32.14/include/linux/sonet.h 2010-05-28 21:27:16.407250185 -0400 46818+++ linux-2.6.32.15/include/linux/sonet.h 2010-05-28 21:27:16.407250185 -0400
46803@@ -61,7 +61,7 @@ struct sonet_stats { 46819@@ -61,7 +61,7 @@ struct sonet_stats {
46804 #include <asm/atomic.h> 46820 #include <asm/atomic.h>
46805 46821
@@ -46809,9 +46825,9 @@ diff -urNp linux-2.6.32.14/include/linux/sonet.h linux-2.6.32.14/include/linux/s
46809 __SONET_ITEMS 46825 __SONET_ITEMS
46810 #undef __HANDLE_ITEM 46826 #undef __HANDLE_ITEM
46811 }; 46827 };
46812diff -urNp linux-2.6.32.14/include/linux/suspend.h linux-2.6.32.14/include/linux/suspend.h 46828diff -urNp linux-2.6.32.15/include/linux/suspend.h linux-2.6.32.15/include/linux/suspend.h
46813--- linux-2.6.32.14/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400 46829--- linux-2.6.32.15/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400
46814+++ linux-2.6.32.14/include/linux/suspend.h 2010-05-28 21:27:16.407250185 -0400 46830+++ linux-2.6.32.15/include/linux/suspend.h 2010-05-28 21:27:16.407250185 -0400
46815@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; 46831@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
46816 * which require special recovery actions in that situation. 46832 * which require special recovery actions in that situation.
46817 */ 46833 */
@@ -46900,9 +46916,9 @@ diff -urNp linux-2.6.32.14/include/linux/suspend.h linux-2.6.32.14/include/linux
46900 static inline int hibernate(void) { return -ENOSYS; } 46916 static inline int hibernate(void) { return -ENOSYS; }
46901 static inline bool system_entering_hibernation(void) { return false; } 46917 static inline bool system_entering_hibernation(void) { return false; }
46902 #endif /* CONFIG_HIBERNATION */ 46918 #endif /* CONFIG_HIBERNATION */
46903diff -urNp linux-2.6.32.14/include/linux/sysctl.h linux-2.6.32.14/include/linux/sysctl.h 46919diff -urNp linux-2.6.32.15/include/linux/sysctl.h linux-2.6.32.15/include/linux/sysctl.h
46904--- linux-2.6.32.14/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400 46920--- linux-2.6.32.15/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400
46905+++ linux-2.6.32.14/include/linux/sysctl.h 2010-05-28 21:27:16.423734148 -0400 46921+++ linux-2.6.32.15/include/linux/sysctl.h 2010-05-28 21:27:16.423734148 -0400
46906@@ -164,7 +164,11 @@ enum 46922@@ -164,7 +164,11 @@ enum
46907 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ 46923 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
46908 }; 46924 };
@@ -46916,9 +46932,9 @@ diff -urNp linux-2.6.32.14/include/linux/sysctl.h linux-2.6.32.14/include/linux/
46916 46932
46917 /* CTL_VM names: */ 46933 /* CTL_VM names: */
46918 enum 46934 enum
46919diff -urNp linux-2.6.32.14/include/linux/sysfs.h linux-2.6.32.14/include/linux/sysfs.h 46935diff -urNp linux-2.6.32.15/include/linux/sysfs.h linux-2.6.32.15/include/linux/sysfs.h
46920--- linux-2.6.32.14/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400 46936--- linux-2.6.32.15/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400
46921+++ linux-2.6.32.14/include/linux/sysfs.h 2010-05-28 21:27:16.423734148 -0400 46937+++ linux-2.6.32.15/include/linux/sysfs.h 2010-05-28 21:27:16.423734148 -0400
46922@@ -75,8 +75,8 @@ struct bin_attribute { 46938@@ -75,8 +75,8 @@ struct bin_attribute {
46923 }; 46939 };
46924 46940
@@ -46930,9 +46946,9 @@ diff -urNp linux-2.6.32.14/include/linux/sysfs.h linux-2.6.32.14/include/linux/s
46930 }; 46946 };
46931 46947
46932 struct sysfs_dirent; 46948 struct sysfs_dirent;
46933diff -urNp linux-2.6.32.14/include/linux/thread_info.h linux-2.6.32.14/include/linux/thread_info.h 46949diff -urNp linux-2.6.32.15/include/linux/thread_info.h linux-2.6.32.15/include/linux/thread_info.h
46934--- linux-2.6.32.14/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400 46950--- linux-2.6.32.15/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400
46935+++ linux-2.6.32.14/include/linux/thread_info.h 2010-05-28 21:27:16.423734148 -0400 46951+++ linux-2.6.32.15/include/linux/thread_info.h 2010-05-28 21:27:16.423734148 -0400
46936@@ -23,7 +23,7 @@ struct restart_block { 46952@@ -23,7 +23,7 @@ struct restart_block {
46937 }; 46953 };
46938 /* For futex_wait and futex_wait_requeue_pi */ 46954 /* For futex_wait and futex_wait_requeue_pi */
@@ -46942,9 +46958,9 @@ diff -urNp linux-2.6.32.14/include/linux/thread_info.h linux-2.6.32.14/include/l
46942 u32 val; 46958 u32 val;
46943 u32 flags; 46959 u32 flags;
46944 u32 bitset; 46960 u32 bitset;
46945diff -urNp linux-2.6.32.14/include/linux/tty.h linux-2.6.32.14/include/linux/tty.h 46961diff -urNp linux-2.6.32.15/include/linux/tty.h linux-2.6.32.15/include/linux/tty.h
46946--- linux-2.6.32.14/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400 46962--- linux-2.6.32.15/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400
46947+++ linux-2.6.32.14/include/linux/tty.h 2010-05-28 21:27:16.423734148 -0400 46963+++ linux-2.6.32.15/include/linux/tty.h 2010-05-28 21:27:16.423734148 -0400
46948@@ -13,6 +13,7 @@ 46964@@ -13,6 +13,7 @@
46949 #include <linux/tty_driver.h> 46965 #include <linux/tty_driver.h>
46950 #include <linux/tty_ldisc.h> 46966 #include <linux/tty_ldisc.h>
@@ -46980,9 +46996,9 @@ diff -urNp linux-2.6.32.14/include/linux/tty.h linux-2.6.32.14/include/linux/tty
46980 46996
46981 /* n_tty.c */ 46997 /* n_tty.c */
46982 extern struct tty_ldisc_ops tty_ldisc_N_TTY; 46998 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
46983diff -urNp linux-2.6.32.14/include/linux/tty_ldisc.h linux-2.6.32.14/include/linux/tty_ldisc.h 46999diff -urNp linux-2.6.32.15/include/linux/tty_ldisc.h linux-2.6.32.15/include/linux/tty_ldisc.h
46984--- linux-2.6.32.14/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400 47000--- linux-2.6.32.15/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400
46985+++ linux-2.6.32.14/include/linux/tty_ldisc.h 2010-05-28 21:27:16.423734148 -0400 47001+++ linux-2.6.32.15/include/linux/tty_ldisc.h 2010-05-28 21:27:16.423734148 -0400
46986@@ -139,7 +139,7 @@ struct tty_ldisc_ops { 47002@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
46987 47003
46988 struct module *owner; 47004 struct module *owner;
@@ -46992,9 +47008,9 @@ diff -urNp linux-2.6.32.14/include/linux/tty_ldisc.h linux-2.6.32.14/include/lin
46992 }; 47008 };
46993 47009
46994 struct tty_ldisc { 47010 struct tty_ldisc {
46995diff -urNp linux-2.6.32.14/include/linux/types.h linux-2.6.32.14/include/linux/types.h 47011diff -urNp linux-2.6.32.15/include/linux/types.h linux-2.6.32.15/include/linux/types.h
46996--- linux-2.6.32.14/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400 47012--- linux-2.6.32.15/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400
46997+++ linux-2.6.32.14/include/linux/types.h 2010-05-28 21:27:16.427051097 -0400 47013+++ linux-2.6.32.15/include/linux/types.h 2010-05-28 21:27:16.427051097 -0400
46998@@ -191,10 +191,26 @@ typedef struct { 47014@@ -191,10 +191,26 @@ typedef struct {
46999 volatile int counter; 47015 volatile int counter;
47000 } atomic_t; 47016 } atomic_t;
@@ -47022,9 +47038,9 @@ diff -urNp linux-2.6.32.14/include/linux/types.h linux-2.6.32.14/include/linux/t
47022 #endif 47038 #endif
47023 47039
47024 struct ustat { 47040 struct ustat {
47025diff -urNp linux-2.6.32.14/include/linux/uaccess.h linux-2.6.32.14/include/linux/uaccess.h 47041diff -urNp linux-2.6.32.15/include/linux/uaccess.h linux-2.6.32.15/include/linux/uaccess.h
47026--- linux-2.6.32.14/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400 47042--- linux-2.6.32.15/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400
47027+++ linux-2.6.32.14/include/linux/uaccess.h 2010-05-28 21:27:16.427051097 -0400 47043+++ linux-2.6.32.15/include/linux/uaccess.h 2010-05-28 21:27:16.427051097 -0400
47028@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ 47044@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
47029 long ret; \ 47045 long ret; \
47030 mm_segment_t old_fs = get_fs(); \ 47046 mm_segment_t old_fs = get_fs(); \
@@ -47056,9 +47072,9 @@ diff -urNp linux-2.6.32.14/include/linux/uaccess.h linux-2.6.32.14/include/linux
47056+extern long probe_kernel_write(void *dst, const void *src, size_t size); 47072+extern long probe_kernel_write(void *dst, const void *src, size_t size);
47057 47073
47058 #endif /* __LINUX_UACCESS_H__ */ 47074 #endif /* __LINUX_UACCESS_H__ */
47059diff -urNp linux-2.6.32.14/include/linux/vmalloc.h linux-2.6.32.14/include/linux/vmalloc.h 47075diff -urNp linux-2.6.32.15/include/linux/vmalloc.h linux-2.6.32.15/include/linux/vmalloc.h
47060--- linux-2.6.32.14/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400 47076--- linux-2.6.32.15/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400
47061+++ linux-2.6.32.14/include/linux/vmalloc.h 2010-05-28 21:27:16.427051097 -0400 47077+++ linux-2.6.32.15/include/linux/vmalloc.h 2010-05-28 21:27:16.427051097 -0400
47062@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining 47078@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
47063 #define VM_MAP 0x00000004 /* vmap()ed pages */ 47079 #define VM_MAP 0x00000004 /* vmap()ed pages */
47064 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ 47080 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
@@ -47153,9 +47169,9 @@ diff -urNp linux-2.6.32.14/include/linux/vmalloc.h linux-2.6.32.14/include/linux
47153+}) 47169+})
47154+ 47170+
47155 #endif /* _LINUX_VMALLOC_H */ 47171 #endif /* _LINUX_VMALLOC_H */
47156diff -urNp linux-2.6.32.14/include/net/irda/ircomm_tty.h linux-2.6.32.14/include/net/irda/ircomm_tty.h 47172diff -urNp linux-2.6.32.15/include/net/irda/ircomm_tty.h linux-2.6.32.15/include/net/irda/ircomm_tty.h
47157--- linux-2.6.32.14/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400 47173--- linux-2.6.32.15/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400
47158+++ linux-2.6.32.14/include/net/irda/ircomm_tty.h 2010-05-28 21:27:16.427051097 -0400 47174+++ linux-2.6.32.15/include/net/irda/ircomm_tty.h 2010-05-28 21:27:16.427051097 -0400
47159@@ -105,8 +105,8 @@ struct ircomm_tty_cb { 47175@@ -105,8 +105,8 @@ struct ircomm_tty_cb {
47160 unsigned short close_delay; 47176 unsigned short close_delay;
47161 unsigned short closing_wait; /* time to wait before closing */ 47177 unsigned short closing_wait; /* time to wait before closing */
@@ -47167,9 +47183,9 @@ diff -urNp linux-2.6.32.14/include/net/irda/ircomm_tty.h linux-2.6.32.14/include
47167 47183
47168 /* Protect concurent access to : 47184 /* Protect concurent access to :
47169 * o self->open_count 47185 * o self->open_count
47170diff -urNp linux-2.6.32.14/include/net/neighbour.h linux-2.6.32.14/include/net/neighbour.h 47186diff -urNp linux-2.6.32.15/include/net/neighbour.h linux-2.6.32.15/include/net/neighbour.h
47171--- linux-2.6.32.14/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400 47187--- linux-2.6.32.15/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400
47172+++ linux-2.6.32.14/include/net/neighbour.h 2010-05-28 21:27:16.427051097 -0400 47188+++ linux-2.6.32.15/include/net/neighbour.h 2010-05-28 21:27:16.427051097 -0400
47173@@ -125,12 +125,12 @@ struct neighbour 47189@@ -125,12 +125,12 @@ struct neighbour
47174 struct neigh_ops 47190 struct neigh_ops
47175 { 47191 {
@@ -47189,9 +47205,9 @@ diff -urNp linux-2.6.32.14/include/net/neighbour.h linux-2.6.32.14/include/net/n
47189 }; 47205 };
47190 47206
47191 struct pneigh_entry 47207 struct pneigh_entry
47192diff -urNp linux-2.6.32.14/include/net/sctp/sctp.h linux-2.6.32.14/include/net/sctp/sctp.h 47208diff -urNp linux-2.6.32.15/include/net/sctp/sctp.h linux-2.6.32.15/include/net/sctp/sctp.h
47193--- linux-2.6.32.14/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400 47209--- linux-2.6.32.15/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400
47194+++ linux-2.6.32.14/include/net/sctp/sctp.h 2010-05-28 21:27:16.427051097 -0400 47210+++ linux-2.6.32.15/include/net/sctp/sctp.h 2010-05-28 21:27:16.427051097 -0400
47195@@ -305,8 +305,8 @@ extern int sctp_debug_flag; 47211@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
47196 47212
47197 #else /* SCTP_DEBUG */ 47213 #else /* SCTP_DEBUG */
@@ -47203,9 +47219,9 @@ diff -urNp linux-2.6.32.14/include/net/sctp/sctp.h linux-2.6.32.14/include/net/s
47203 #define SCTP_ENABLE_DEBUG 47219 #define SCTP_ENABLE_DEBUG
47204 #define SCTP_DISABLE_DEBUG 47220 #define SCTP_DISABLE_DEBUG
47205 #define SCTP_ASSERT(expr, str, func) 47221 #define SCTP_ASSERT(expr, str, func)
47206diff -urNp linux-2.6.32.14/include/net/tcp.h linux-2.6.32.14/include/net/tcp.h 47222diff -urNp linux-2.6.32.15/include/net/tcp.h linux-2.6.32.15/include/net/tcp.h
47207--- linux-2.6.32.14/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400 47223--- linux-2.6.32.15/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400
47208+++ linux-2.6.32.14/include/net/tcp.h 2010-05-28 21:27:16.427051097 -0400 47224+++ linux-2.6.32.15/include/net/tcp.h 2010-05-28 21:27:16.427051097 -0400
47209@@ -1420,6 +1420,7 @@ enum tcp_seq_states { 47225@@ -1420,6 +1420,7 @@ enum tcp_seq_states {
47210 struct tcp_seq_afinfo { 47226 struct tcp_seq_afinfo {
47211 char *name; 47227 char *name;
@@ -47214,9 +47230,9 @@ diff -urNp linux-2.6.32.14/include/net/tcp.h linux-2.6.32.14/include/net/tcp.h
47214 struct file_operations seq_fops; 47230 struct file_operations seq_fops;
47215 struct seq_operations seq_ops; 47231 struct seq_operations seq_ops;
47216 }; 47232 };
47217diff -urNp linux-2.6.32.14/include/net/udp.h linux-2.6.32.14/include/net/udp.h 47233diff -urNp linux-2.6.32.15/include/net/udp.h linux-2.6.32.15/include/net/udp.h
47218--- linux-2.6.32.14/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400 47234--- linux-2.6.32.15/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400
47219+++ linux-2.6.32.14/include/net/udp.h 2010-05-28 21:27:16.427051097 -0400 47235+++ linux-2.6.32.15/include/net/udp.h 2010-05-28 21:27:16.427051097 -0400
47220@@ -187,6 +187,7 @@ struct udp_seq_afinfo { 47236@@ -187,6 +187,7 @@ struct udp_seq_afinfo {
47221 char *name; 47237 char *name;
47222 sa_family_t family; 47238 sa_family_t family;
@@ -47225,9 +47241,9 @@ diff -urNp linux-2.6.32.14/include/net/udp.h linux-2.6.32.14/include/net/udp.h
47225 struct file_operations seq_fops; 47241 struct file_operations seq_fops;
47226 struct seq_operations seq_ops; 47242 struct seq_operations seq_ops;
47227 }; 47243 };
47228diff -urNp linux-2.6.32.14/include/sound/ac97_codec.h linux-2.6.32.14/include/sound/ac97_codec.h 47244diff -urNp linux-2.6.32.15/include/sound/ac97_codec.h linux-2.6.32.15/include/sound/ac97_codec.h
47229--- linux-2.6.32.14/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400 47245--- linux-2.6.32.15/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400
47230+++ linux-2.6.32.14/include/sound/ac97_codec.h 2010-05-28 21:27:16.427051097 -0400 47246+++ linux-2.6.32.15/include/sound/ac97_codec.h 2010-05-28 21:27:16.427051097 -0400
47231@@ -419,15 +419,15 @@ 47247@@ -419,15 +419,15 @@
47232 struct snd_ac97; 47248 struct snd_ac97;
47233 47249
@@ -47260,9 +47276,9 @@ diff -urNp linux-2.6.32.14/include/sound/ac97_codec.h linux-2.6.32.14/include/so
47260 void *private_data; 47276 void *private_data;
47261 void (*private_free) (struct snd_ac97 *ac97); 47277 void (*private_free) (struct snd_ac97 *ac97);
47262 /* --- */ 47278 /* --- */
47263diff -urNp linux-2.6.32.14/include/trace/events/irq.h linux-2.6.32.14/include/trace/events/irq.h 47279diff -urNp linux-2.6.32.15/include/trace/events/irq.h linux-2.6.32.15/include/trace/events/irq.h
47264--- linux-2.6.32.14/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400 47280--- linux-2.6.32.15/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400
47265+++ linux-2.6.32.14/include/trace/events/irq.h 2010-05-28 21:27:16.427051097 -0400 47281+++ linux-2.6.32.15/include/trace/events/irq.h 2010-05-28 21:27:16.427051097 -0400
47266@@ -34,7 +34,7 @@ 47282@@ -34,7 +34,7 @@
47267 */ 47283 */
47268 TRACE_EVENT(irq_handler_entry, 47284 TRACE_EVENT(irq_handler_entry,
@@ -47299,9 +47315,9 @@ diff -urNp linux-2.6.32.14/include/trace/events/irq.h linux-2.6.32.14/include/tr
47299 47315
47300 TP_ARGS(h, vec), 47316 TP_ARGS(h, vec),
47301 47317
47302diff -urNp linux-2.6.32.14/include/video/uvesafb.h linux-2.6.32.14/include/video/uvesafb.h 47318diff -urNp linux-2.6.32.15/include/video/uvesafb.h linux-2.6.32.15/include/video/uvesafb.h
47303--- linux-2.6.32.14/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400 47319--- linux-2.6.32.15/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400
47304+++ linux-2.6.32.14/include/video/uvesafb.h 2010-05-28 21:27:16.427051097 -0400 47320+++ linux-2.6.32.15/include/video/uvesafb.h 2010-05-28 21:27:16.427051097 -0400
47305@@ -177,6 +177,7 @@ struct uvesafb_par { 47321@@ -177,6 +177,7 @@ struct uvesafb_par {
47306 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ 47322 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
47307 u8 pmi_setpal; /* PMI for palette changes */ 47323 u8 pmi_setpal; /* PMI for palette changes */
@@ -47310,9 +47326,9 @@ diff -urNp linux-2.6.32.14/include/video/uvesafb.h linux-2.6.32.14/include/video
47310 void *pmi_start; 47326 void *pmi_start;
47311 void *pmi_pal; 47327 void *pmi_pal;
47312 u8 *vbe_state_orig; /* 47328 u8 *vbe_state_orig; /*
47313diff -urNp linux-2.6.32.14/init/do_mounts.c linux-2.6.32.14/init/do_mounts.c 47329diff -urNp linux-2.6.32.15/init/do_mounts.c linux-2.6.32.15/init/do_mounts.c
47314--- linux-2.6.32.14/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400 47330--- linux-2.6.32.15/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400
47315+++ linux-2.6.32.14/init/do_mounts.c 2010-05-28 21:27:16.427051097 -0400 47331+++ linux-2.6.32.15/init/do_mounts.c 2010-05-28 21:27:16.427051097 -0400
47316@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa 47332@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
47317 47333
47318 static int __init do_mount_root(char *name, char *fs, int flags, void *data) 47334 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -47358,9 +47374,9 @@ diff -urNp linux-2.6.32.14/init/do_mounts.c linux-2.6.32.14/init/do_mounts.c
47358+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); 47374+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
47359+ sys_chroot((__force char __user *)"."); 47375+ sys_chroot((__force char __user *)".");
47360 } 47376 }
47361diff -urNp linux-2.6.32.14/init/do_mounts.h linux-2.6.32.14/init/do_mounts.h 47377diff -urNp linux-2.6.32.15/init/do_mounts.h linux-2.6.32.15/init/do_mounts.h
47362--- linux-2.6.32.14/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400 47378--- linux-2.6.32.15/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400
47363+++ linux-2.6.32.14/init/do_mounts.h 2010-05-28 21:27:16.427051097 -0400 47379+++ linux-2.6.32.15/init/do_mounts.h 2010-05-28 21:27:16.427051097 -0400
47364@@ -15,15 +15,15 @@ extern int root_mountflags; 47380@@ -15,15 +15,15 @@ extern int root_mountflags;
47365 47381
47366 static inline int create_dev(char *name, dev_t dev) 47382 static inline int create_dev(char *name, dev_t dev)
@@ -47380,9 +47396,9 @@ diff -urNp linux-2.6.32.14/init/do_mounts.h linux-2.6.32.14/init/do_mounts.h
47380 return 0; 47396 return 0;
47381 if (!S_ISBLK(stat.st_mode)) 47397 if (!S_ISBLK(stat.st_mode))
47382 return 0; 47398 return 0;
47383diff -urNp linux-2.6.32.14/init/do_mounts_initrd.c linux-2.6.32.14/init/do_mounts_initrd.c 47399diff -urNp linux-2.6.32.15/init/do_mounts_initrd.c linux-2.6.32.15/init/do_mounts_initrd.c
47384--- linux-2.6.32.14/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400 47400--- linux-2.6.32.15/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400
47385+++ linux-2.6.32.14/init/do_mounts_initrd.c 2010-05-28 21:27:16.427051097 -0400 47401+++ linux-2.6.32.15/init/do_mounts_initrd.c 2010-05-28 21:27:16.427051097 -0400
47386@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel 47402@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
47387 sys_close(old_fd);sys_close(root_fd); 47403 sys_close(old_fd);sys_close(root_fd);
47388 sys_close(0);sys_close(1);sys_close(2); 47404 sys_close(0);sys_close(1);sys_close(2);
@@ -47466,9 +47482,9 @@ diff -urNp linux-2.6.32.14/init/do_mounts_initrd.c linux-2.6.32.14/init/do_mount
47466+ sys_unlink((__force const char __user *)"/initrd.image"); 47482+ sys_unlink((__force const char __user *)"/initrd.image");
47467 return 0; 47483 return 0;
47468 } 47484 }
47469diff -urNp linux-2.6.32.14/init/do_mounts_md.c linux-2.6.32.14/init/do_mounts_md.c 47485diff -urNp linux-2.6.32.15/init/do_mounts_md.c linux-2.6.32.15/init/do_mounts_md.c
47470--- linux-2.6.32.14/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400 47486--- linux-2.6.32.15/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400
47471+++ linux-2.6.32.14/init/do_mounts_md.c 2010-05-28 21:27:16.427051097 -0400 47487+++ linux-2.6.32.15/init/do_mounts_md.c 2010-05-28 21:27:16.427051097 -0400
47472@@ -170,7 +170,7 @@ static void __init md_setup_drive(void) 47488@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
47473 partitioned ? "_d" : "", minor, 47489 partitioned ? "_d" : "", minor,
47474 md_setup_args[ent].device_names); 47490 md_setup_args[ent].device_names);
@@ -47496,9 +47512,9 @@ diff -urNp linux-2.6.32.14/init/do_mounts_md.c linux-2.6.32.14/init/do_mounts_md
47496 if (fd >= 0) { 47512 if (fd >= 0) {
47497 sys_ioctl(fd, RAID_AUTORUN, raid_autopart); 47513 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
47498 sys_close(fd); 47514 sys_close(fd);
47499diff -urNp linux-2.6.32.14/init/initramfs.c linux-2.6.32.14/init/initramfs.c 47515diff -urNp linux-2.6.32.15/init/initramfs.c linux-2.6.32.15/init/initramfs.c
47500--- linux-2.6.32.14/init/initramfs.c 2010-05-15 13:20:19.362999772 -0400 47516--- linux-2.6.32.15/init/initramfs.c 2010-05-15 13:20:19.362999772 -0400
47501+++ linux-2.6.32.14/init/initramfs.c 2010-05-28 21:27:16.427051097 -0400 47517+++ linux-2.6.32.15/init/initramfs.c 2010-05-28 21:27:16.427051097 -0400
47502@@ -74,7 +74,7 @@ static void __init free_hash(void) 47518@@ -74,7 +74,7 @@ static void __init free_hash(void)
47503 } 47519 }
47504 } 47520 }
@@ -47607,9 +47623,9 @@ diff -urNp linux-2.6.32.14/init/initramfs.c linux-2.6.32.14/init/initramfs.c
47607 state = SkipIt; 47623 state = SkipIt;
47608 next_state = Reset; 47624 next_state = Reset;
47609 return 0; 47625 return 0;
47610diff -urNp linux-2.6.32.14/init/Kconfig linux-2.6.32.14/init/Kconfig 47626diff -urNp linux-2.6.32.15/init/Kconfig linux-2.6.32.15/init/Kconfig
47611--- linux-2.6.32.14/init/Kconfig 2010-03-15 11:52:04.000000000 -0400 47627--- linux-2.6.32.15/init/Kconfig 2010-03-15 11:52:04.000000000 -0400
47612+++ linux-2.6.32.14/init/Kconfig 2010-05-29 16:35:52.581909467 -0400 47628+++ linux-2.6.32.15/init/Kconfig 2010-05-29 16:35:52.581909467 -0400
47613@@ -1026,7 +1026,7 @@ config SLUB_DEBUG 47629@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
47614 47630
47615 config COMPAT_BRK 47631 config COMPAT_BRK
@@ -47619,9 +47635,9 @@ diff -urNp linux-2.6.32.14/init/Kconfig linux-2.6.32.14/init/Kconfig
47619 help 47635 help
47620 Randomizing heap placement makes heap exploits harder, but it 47636 Randomizing heap placement makes heap exploits harder, but it
47621 also breaks ancient binaries (including anything libc5 based). 47637 also breaks ancient binaries (including anything libc5 based).
47622diff -urNp linux-2.6.32.14/init/main.c linux-2.6.32.14/init/main.c 47638diff -urNp linux-2.6.32.15/init/main.c linux-2.6.32.15/init/main.c
47623--- linux-2.6.32.14/init/main.c 2010-04-04 20:41:50.060586306 -0400 47639--- linux-2.6.32.15/init/main.c 2010-04-04 20:41:50.060586306 -0400
47624+++ linux-2.6.32.14/init/main.c 2010-05-28 21:27:16.427051097 -0400 47640+++ linux-2.6.32.15/init/main.c 2010-05-28 21:27:16.427051097 -0400
47625@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) 47641@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
47626 #ifdef CONFIG_TC 47642 #ifdef CONFIG_TC
47627 extern void tc_init(void); 47643 extern void tc_init(void);
@@ -47766,9 +47782,9 @@ diff -urNp linux-2.6.32.14/init/main.c linux-2.6.32.14/init/main.c
47766 /* 47782 /*
47767 * Ok, we have completed the initial bootup, and 47783 * Ok, we have completed the initial bootup, and
47768 * we're essentially up and running. Get rid of the 47784 * we're essentially up and running. Get rid of the
47769diff -urNp linux-2.6.32.14/init/noinitramfs.c linux-2.6.32.14/init/noinitramfs.c 47785diff -urNp linux-2.6.32.15/init/noinitramfs.c linux-2.6.32.15/init/noinitramfs.c
47770--- linux-2.6.32.14/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400 47786--- linux-2.6.32.15/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400
47771+++ linux-2.6.32.14/init/noinitramfs.c 2010-05-28 21:27:16.427051097 -0400 47787+++ linux-2.6.32.15/init/noinitramfs.c 2010-05-28 21:27:16.427051097 -0400
47772@@ -29,7 +29,7 @@ static int __init default_rootfs(void) 47788@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
47773 { 47789 {
47774 int err; 47790 int err;
@@ -47787,9 +47803,9 @@ diff -urNp linux-2.6.32.14/init/noinitramfs.c linux-2.6.32.14/init/noinitramfs.c
47787 if (err < 0) 47803 if (err < 0)
47788 goto out; 47804 goto out;
47789 47805
47790diff -urNp linux-2.6.32.14/ipc/ipc_sysctl.c linux-2.6.32.14/ipc/ipc_sysctl.c 47806diff -urNp linux-2.6.32.15/ipc/ipc_sysctl.c linux-2.6.32.15/ipc/ipc_sysctl.c
47791--- linux-2.6.32.14/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 47807--- linux-2.6.32.15/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400
47792+++ linux-2.6.32.14/ipc/ipc_sysctl.c 2010-05-28 21:27:16.427051097 -0400 47808+++ linux-2.6.32.15/ipc/ipc_sysctl.c 2010-05-28 21:27:16.427051097 -0400
47793@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] 47809@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
47794 .extra1 = &zero, 47810 .extra1 = &zero,
47795 .extra2 = &one, 47811 .extra2 = &one,
@@ -47808,9 +47824,9 @@ diff -urNp linux-2.6.32.14/ipc/ipc_sysctl.c linux-2.6.32.14/ipc/ipc_sysctl.c
47808 }; 47824 };
47809 47825
47810 static int __init ipc_sysctl_init(void) 47826 static int __init ipc_sysctl_init(void)
47811diff -urNp linux-2.6.32.14/ipc/mqueue.c linux-2.6.32.14/ipc/mqueue.c 47827diff -urNp linux-2.6.32.15/ipc/mqueue.c linux-2.6.32.15/ipc/mqueue.c
47812--- linux-2.6.32.14/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400 47828--- linux-2.6.32.15/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400
47813+++ linux-2.6.32.14/ipc/mqueue.c 2010-05-28 21:27:16.431938706 -0400 47829+++ linux-2.6.32.15/ipc/mqueue.c 2010-05-28 21:27:16.431938706 -0400
47814@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st 47830@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
47815 mq_bytes = (mq_msg_tblsz + 47831 mq_bytes = (mq_msg_tblsz +
47816 (info->attr.mq_maxmsg * info->attr.mq_msgsize)); 47832 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -47819,9 +47835,9 @@ diff -urNp linux-2.6.32.14/ipc/mqueue.c linux-2.6.32.14/ipc/mqueue.c
47819 spin_lock(&mq_lock); 47835 spin_lock(&mq_lock);
47820 if (u->mq_bytes + mq_bytes < u->mq_bytes || 47836 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
47821 u->mq_bytes + mq_bytes > 47837 u->mq_bytes + mq_bytes >
47822diff -urNp linux-2.6.32.14/ipc/shm.c linux-2.6.32.14/ipc/shm.c 47838diff -urNp linux-2.6.32.15/ipc/shm.c linux-2.6.32.15/ipc/shm.c
47823--- linux-2.6.32.14/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400 47839--- linux-2.6.32.15/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400
47824+++ linux-2.6.32.14/ipc/shm.c 2010-05-28 21:27:16.431938706 -0400 47840+++ linux-2.6.32.15/ipc/shm.c 2010-05-28 21:27:16.431938706 -0400
47825@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name 47841@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
47826 static int sysvipc_shm_proc_show(struct seq_file *s, void *it); 47842 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
47827 #endif 47843 #endif
@@ -47874,9 +47890,9 @@ diff -urNp linux-2.6.32.14/ipc/shm.c linux-2.6.32.14/ipc/shm.c
47874 size = i_size_read(path.dentry->d_inode); 47890 size = i_size_read(path.dentry->d_inode);
47875 shm_unlock(shp); 47891 shm_unlock(shp);
47876 47892
47877diff -urNp linux-2.6.32.14/kernel/acct.c linux-2.6.32.14/kernel/acct.c 47893diff -urNp linux-2.6.32.15/kernel/acct.c linux-2.6.32.15/kernel/acct.c
47878--- linux-2.6.32.14/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400 47894--- linux-2.6.32.15/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400
47879+++ linux-2.6.32.14/kernel/acct.c 2010-05-28 21:27:16.431938706 -0400 47895+++ linux-2.6.32.15/kernel/acct.c 2010-05-28 21:27:16.431938706 -0400
47880@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a 47896@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
47881 */ 47897 */
47882 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; 47898 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -47886,9 +47902,9 @@ diff -urNp linux-2.6.32.14/kernel/acct.c linux-2.6.32.14/kernel/acct.c
47886 sizeof(acct_t), &file->f_pos); 47902 sizeof(acct_t), &file->f_pos);
47887 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; 47903 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
47888 set_fs(fs); 47904 set_fs(fs);
47889diff -urNp linux-2.6.32.14/kernel/capability.c linux-2.6.32.14/kernel/capability.c 47905diff -urNp linux-2.6.32.15/kernel/capability.c linux-2.6.32.15/kernel/capability.c
47890--- linux-2.6.32.14/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400 47906--- linux-2.6.32.15/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400
47891+++ linux-2.6.32.14/kernel/capability.c 2010-05-28 21:27:16.431938706 -0400 47907+++ linux-2.6.32.15/kernel/capability.c 2010-05-28 21:27:16.431938706 -0400
47892@@ -306,10 +306,21 @@ int capable(int cap) 47908@@ -306,10 +306,21 @@ int capable(int cap)
47893 BUG(); 47909 BUG();
47894 } 47910 }
@@ -47912,9 +47928,9 @@ diff -urNp linux-2.6.32.14/kernel/capability.c linux-2.6.32.14/kernel/capability
47912+ 47928+
47913 EXPORT_SYMBOL(capable); 47929 EXPORT_SYMBOL(capable);
47914+EXPORT_SYMBOL(capable_nolog); 47930+EXPORT_SYMBOL(capable_nolog);
47915diff -urNp linux-2.6.32.14/kernel/configs.c linux-2.6.32.14/kernel/configs.c 47931diff -urNp linux-2.6.32.15/kernel/configs.c linux-2.6.32.15/kernel/configs.c
47916--- linux-2.6.32.14/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400 47932--- linux-2.6.32.15/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400
47917+++ linux-2.6.32.14/kernel/configs.c 2010-05-28 21:27:16.431938706 -0400 47933+++ linux-2.6.32.15/kernel/configs.c 2010-05-28 21:27:16.431938706 -0400
47918@@ -73,8 +73,19 @@ static int __init ikconfig_init(void) 47934@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
47919 struct proc_dir_entry *entry; 47935 struct proc_dir_entry *entry;
47920 47936
@@ -47935,9 +47951,9 @@ diff -urNp linux-2.6.32.14/kernel/configs.c linux-2.6.32.14/kernel/configs.c
47935 if (!entry) 47951 if (!entry)
47936 return -ENOMEM; 47952 return -ENOMEM;
47937 47953
47938diff -urNp linux-2.6.32.14/kernel/cpu.c linux-2.6.32.14/kernel/cpu.c 47954diff -urNp linux-2.6.32.15/kernel/cpu.c linux-2.6.32.15/kernel/cpu.c
47939--- linux-2.6.32.14/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400 47955--- linux-2.6.32.15/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400
47940+++ linux-2.6.32.14/kernel/cpu.c 2010-05-28 21:27:16.431938706 -0400 47956+++ linux-2.6.32.15/kernel/cpu.c 2010-05-28 21:27:16.431938706 -0400
47941@@ -19,7 +19,7 @@ 47957@@ -19,7 +19,7 @@
47942 /* Serializes the updates to cpu_online_mask, cpu_present_mask */ 47958 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
47943 static DEFINE_MUTEX(cpu_add_remove_lock); 47959 static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -47947,9 +47963,9 @@ diff -urNp linux-2.6.32.14/kernel/cpu.c linux-2.6.32.14/kernel/cpu.c
47947 47963
47948 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. 47964 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
47949 * Should always be manipulated under cpu_add_remove_lock 47965 * Should always be manipulated under cpu_add_remove_lock
47950diff -urNp linux-2.6.32.14/kernel/cred.c linux-2.6.32.14/kernel/cred.c 47966diff -urNp linux-2.6.32.15/kernel/cred.c linux-2.6.32.15/kernel/cred.c
47951--- linux-2.6.32.14/kernel/cred.c 2010-05-15 13:20:19.362999772 -0400 47967--- linux-2.6.32.15/kernel/cred.c 2010-05-15 13:20:19.362999772 -0400
47952+++ linux-2.6.32.14/kernel/cred.c 2010-05-28 21:27:16.431938706 -0400 47968+++ linux-2.6.32.15/kernel/cred.c 2010-05-28 21:27:16.431938706 -0400
47953@@ -520,6 +520,8 @@ int commit_creds(struct cred *new) 47969@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
47954 47970
47955 get_cred(new); /* we will require a ref for the subj creds too */ 47971 get_cred(new); /* we will require a ref for the subj creds too */
@@ -47959,9 +47975,9 @@ diff -urNp linux-2.6.32.14/kernel/cred.c linux-2.6.32.14/kernel/cred.c
47959 /* dumpability changes */ 47975 /* dumpability changes */
47960 if (old->euid != new->euid || 47976 if (old->euid != new->euid ||
47961 old->egid != new->egid || 47977 old->egid != new->egid ||
47962diff -urNp linux-2.6.32.14/kernel/exit.c linux-2.6.32.14/kernel/exit.c 47978diff -urNp linux-2.6.32.15/kernel/exit.c linux-2.6.32.15/kernel/exit.c
47963--- linux-2.6.32.14/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400 47979--- linux-2.6.32.15/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400
47964+++ linux-2.6.32.14/kernel/exit.c 2010-05-28 21:27:16.431938706 -0400 47980+++ linux-2.6.32.15/kernel/exit.c 2010-05-28 21:27:16.431938706 -0400
47965@@ -56,6 +56,10 @@ 47981@@ -56,6 +56,10 @@
47966 #include <asm/mmu_context.h> 47982 #include <asm/mmu_context.h>
47967 #include "cred-internals.h" 47983 #include "cred-internals.h"
@@ -48051,9 +48067,9 @@ diff -urNp linux-2.6.32.14/kernel/exit.c linux-2.6.32.14/kernel/exit.c
48051 48067
48052 get_task_struct(p); 48068 get_task_struct(p);
48053 read_unlock(&tasklist_lock); 48069 read_unlock(&tasklist_lock);
48054diff -urNp linux-2.6.32.14/kernel/fork.c linux-2.6.32.14/kernel/fork.c 48070diff -urNp linux-2.6.32.15/kernel/fork.c linux-2.6.32.15/kernel/fork.c
48055--- linux-2.6.32.14/kernel/fork.c 2010-05-28 20:16:44.458924952 -0400 48071--- linux-2.6.32.15/kernel/fork.c 2010-05-28 20:16:44.458924952 -0400
48056+++ linux-2.6.32.14/kernel/fork.c 2010-05-28 21:27:16.436716677 -0400 48072+++ linux-2.6.32.15/kernel/fork.c 2010-05-28 21:27:16.436716677 -0400
48057@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru 48073@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
48058 *stackend = STACK_END_MAGIC; /* for overflow detection */ 48074 *stackend = STACK_END_MAGIC; /* for overflow detection */
48059 48075
@@ -48206,9 +48222,9 @@ diff -urNp linux-2.6.32.14/kernel/fork.c linux-2.6.32.14/kernel/fork.c
48206 } 48222 }
48207 48223
48208 if (new_mm) { 48224 if (new_mm) {
48209diff -urNp linux-2.6.32.14/kernel/futex.c linux-2.6.32.14/kernel/futex.c 48225diff -urNp linux-2.6.32.15/kernel/futex.c linux-2.6.32.15/kernel/futex.c
48210--- linux-2.6.32.14/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400 48226--- linux-2.6.32.15/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400
48211+++ linux-2.6.32.14/kernel/futex.c 2010-05-28 21:27:16.439128347 -0400 48227+++ linux-2.6.32.15/kernel/futex.c 2010-05-28 21:27:16.439128347 -0400
48212@@ -54,6 +54,7 @@ 48228@@ -54,6 +54,7 @@
48213 #include <linux/mount.h> 48229 #include <linux/mount.h>
48214 #include <linux/pagemap.h> 48230 #include <linux/pagemap.h>
@@ -48276,9 +48292,9 @@ diff -urNp linux-2.6.32.14/kernel/futex.c linux-2.6.32.14/kernel/futex.c
48276 { 48292 {
48277 unsigned long uentry; 48293 unsigned long uentry;
48278 48294
48279diff -urNp linux-2.6.32.14/kernel/futex_compat.c linux-2.6.32.14/kernel/futex_compat.c 48295diff -urNp linux-2.6.32.15/kernel/futex_compat.c linux-2.6.32.15/kernel/futex_compat.c
48280--- linux-2.6.32.14/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400 48296--- linux-2.6.32.15/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400
48281+++ linux-2.6.32.14/kernel/futex_compat.c 2010-05-28 21:27:16.439128347 -0400 48297+++ linux-2.6.32.15/kernel/futex_compat.c 2010-05-28 21:27:16.439128347 -0400
48282@@ -10,6 +10,7 @@ 48298@@ -10,6 +10,7 @@
48283 #include <linux/compat.h> 48299 #include <linux/compat.h>
48284 #include <linux/nsproxy.h> 48300 #include <linux/nsproxy.h>
@@ -48316,9 +48332,9 @@ diff -urNp linux-2.6.32.14/kernel/futex_compat.c linux-2.6.32.14/kernel/futex_co
48316 head = p->compat_robust_list; 48332 head = p->compat_robust_list;
48317 read_unlock(&tasklist_lock); 48333 read_unlock(&tasklist_lock);
48318 } 48334 }
48319diff -urNp linux-2.6.32.14/kernel/gcov/base.c linux-2.6.32.14/kernel/gcov/base.c 48335diff -urNp linux-2.6.32.15/kernel/gcov/base.c linux-2.6.32.15/kernel/gcov/base.c
48320--- linux-2.6.32.14/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400 48336--- linux-2.6.32.15/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400
48321+++ linux-2.6.32.14/kernel/gcov/base.c 2010-05-28 21:27:16.439128347 -0400 48337+++ linux-2.6.32.15/kernel/gcov/base.c 2010-05-28 21:27:16.439128347 -0400
48322@@ -102,11 +102,6 @@ void gcov_enable_events(void) 48338@@ -102,11 +102,6 @@ void gcov_enable_events(void)
48323 } 48339 }
48324 48340
@@ -48340,9 +48356,9 @@ diff -urNp linux-2.6.32.14/kernel/gcov/base.c linux-2.6.32.14/kernel/gcov/base.c
48340 if (prev) 48356 if (prev)
48341 prev->next = info->next; 48357 prev->next = info->next;
48342 else 48358 else
48343diff -urNp linux-2.6.32.14/kernel/hrtimer.c linux-2.6.32.14/kernel/hrtimer.c 48359diff -urNp linux-2.6.32.15/kernel/hrtimer.c linux-2.6.32.15/kernel/hrtimer.c
48344--- linux-2.6.32.14/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400 48360--- linux-2.6.32.15/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400
48345+++ linux-2.6.32.14/kernel/hrtimer.c 2010-05-28 21:27:16.439128347 -0400 48361+++ linux-2.6.32.15/kernel/hrtimer.c 2010-05-28 21:27:16.439128347 -0400
48346@@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void) 48362@@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void)
48347 local_irq_restore(flags); 48363 local_irq_restore(flags);
48348 } 48364 }
@@ -48352,9 +48368,9 @@ diff -urNp linux-2.6.32.14/kernel/hrtimer.c linux-2.6.32.14/kernel/hrtimer.c
48352 { 48368 {
48353 hrtimer_peek_ahead_timers(); 48369 hrtimer_peek_ahead_timers();
48354 } 48370 }
48355diff -urNp linux-2.6.32.14/kernel/kallsyms.c linux-2.6.32.14/kernel/kallsyms.c 48371diff -urNp linux-2.6.32.15/kernel/kallsyms.c linux-2.6.32.15/kernel/kallsyms.c
48356--- linux-2.6.32.14/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 48372--- linux-2.6.32.15/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400
48357+++ linux-2.6.32.14/kernel/kallsyms.c 2010-05-28 21:27:16.439128347 -0400 48373+++ linux-2.6.32.15/kernel/kallsyms.c 2010-05-28 21:27:16.439128347 -0400
48358@@ -11,6 +11,9 @@ 48374@@ -11,6 +11,9 @@
48359 * Changed the compression method from stem compression to "table lookup" 48375 * Changed the compression method from stem compression to "table lookup"
48360 * compression (see scripts/kallsyms.c for a more complete description) 48376 * compression (see scripts/kallsyms.c for a more complete description)
@@ -48431,9 +48447,9 @@ diff -urNp linux-2.6.32.14/kernel/kallsyms.c linux-2.6.32.14/kernel/kallsyms.c
48431 if (!iter) 48447 if (!iter)
48432 return -ENOMEM; 48448 return -ENOMEM;
48433 reset_iter(iter, 0); 48449 reset_iter(iter, 0);
48434diff -urNp linux-2.6.32.14/kernel/kgdb.c linux-2.6.32.14/kernel/kgdb.c 48450diff -urNp linux-2.6.32.15/kernel/kgdb.c linux-2.6.32.15/kernel/kgdb.c
48435--- linux-2.6.32.14/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 48451--- linux-2.6.32.15/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
48436+++ linux-2.6.32.14/kernel/kgdb.c 2010-05-28 21:27:16.439128347 -0400 48452+++ linux-2.6.32.15/kernel/kgdb.c 2010-05-28 21:27:16.439128347 -0400
48437@@ -86,7 +86,7 @@ static int kgdb_io_module_registered; 48453@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
48438 /* Guard for recursive entry */ 48454 /* Guard for recursive entry */
48439 static int exception_level; 48455 static int exception_level;
@@ -48461,9 +48477,9 @@ diff -urNp linux-2.6.32.14/kernel/kgdb.c linux-2.6.32.14/kernel/kgdb.c
48461 { 48477 {
48462 BUG_ON(kgdb_connected); 48478 BUG_ON(kgdb_connected);
48463 48479
48464diff -urNp linux-2.6.32.14/kernel/kmod.c linux-2.6.32.14/kernel/kmod.c 48480diff -urNp linux-2.6.32.15/kernel/kmod.c linux-2.6.32.15/kernel/kmod.c
48465--- linux-2.6.32.14/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400 48481--- linux-2.6.32.15/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400
48466+++ linux-2.6.32.14/kernel/kmod.c 2010-05-28 21:27:16.439128347 -0400 48482+++ linux-2.6.32.15/kernel/kmod.c 2010-05-28 21:27:16.439128347 -0400
48467@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch 48483@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
48468 if (ret >= MODULE_NAME_LEN) 48484 if (ret >= MODULE_NAME_LEN)
48469 return -ENAMETOOLONG; 48485 return -ENAMETOOLONG;
@@ -48483,9 +48499,9 @@ diff -urNp linux-2.6.32.14/kernel/kmod.c linux-2.6.32.14/kernel/kmod.c
48483 /* If modprobe needs a service that is in a module, we get a recursive 48499 /* If modprobe needs a service that is in a module, we get a recursive
48484 * loop. Limit the number of running kmod threads to max_threads/2 or 48500 * loop. Limit the number of running kmod threads to max_threads/2 or
48485 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method 48501 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
48486diff -urNp linux-2.6.32.14/kernel/kprobes.c linux-2.6.32.14/kernel/kprobes.c 48502diff -urNp linux-2.6.32.15/kernel/kprobes.c linux-2.6.32.15/kernel/kprobes.c
48487--- linux-2.6.32.14/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 48503--- linux-2.6.32.15/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400
48488+++ linux-2.6.32.14/kernel/kprobes.c 2010-05-28 21:27:16.439128347 -0400 48504+++ linux-2.6.32.15/kernel/kprobes.c 2010-05-28 21:27:16.439128347 -0400
48489@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ 48505@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
48490 * kernel image and loaded module images reside. This is required 48506 * kernel image and loaded module images reside. This is required
48491 * so x86_64 can correctly handle the %rip-relative fixups. 48507 * so x86_64 can correctly handle the %rip-relative fixups.
@@ -48522,9 +48538,9 @@ diff -urNp linux-2.6.32.14/kernel/kprobes.c linux-2.6.32.14/kernel/kprobes.c
48522 48538
48523 head = &kprobe_table[i]; 48539 head = &kprobe_table[i];
48524 preempt_disable(); 48540 preempt_disable();
48525diff -urNp linux-2.6.32.14/kernel/lockdep.c linux-2.6.32.14/kernel/lockdep.c 48541diff -urNp linux-2.6.32.15/kernel/lockdep.c linux-2.6.32.15/kernel/lockdep.c
48526--- linux-2.6.32.14/kernel/lockdep.c 2010-04-29 17:49:38.578001941 -0400 48542--- linux-2.6.32.15/kernel/lockdep.c 2010-06-01 15:02:53.017540947 -0400
48527+++ linux-2.6.32.14/kernel/lockdep.c 2010-05-28 21:27:16.439128347 -0400 48543+++ linux-2.6.32.15/kernel/lockdep.c 2010-06-01 15:06:14.633871339 -0400
48528@@ -577,6 +577,10 @@ static int static_obj(void *obj) 48544@@ -577,6 +577,10 @@ static int static_obj(void *obj)
48529 int i; 48545 int i;
48530 #endif 48546 #endif
@@ -48539,9 +48555,9 @@ diff -urNp linux-2.6.32.14/kernel/lockdep.c linux-2.6.32.14/kernel/lockdep.c
48539@@ -592,8 +596,7 @@ static int static_obj(void *obj) 48555@@ -592,8 +596,7 @@ static int static_obj(void *obj)
48540 */ 48556 */
48541 for_each_possible_cpu(i) { 48557 for_each_possible_cpu(i) {
48542 start = (unsigned long) per_cpu_ptr(&__per_cpu_start, i); 48558 start = (unsigned long) &__per_cpu_start + per_cpu_offset(i);
48543- end = (unsigned long) per_cpu_ptr(&__per_cpu_start, i) 48559- end = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM
48544- + PERCPU_ENOUGH_ROOM; 48560- + per_cpu_offset(i);
48545+ end = start + PERCPU_ENOUGH_ROOM; 48561+ end = start + PERCPU_ENOUGH_ROOM;
48546 48562
48547 if ((addr >= start) && (addr < end)) 48563 if ((addr >= start) && (addr < end))
@@ -48554,9 +48570,9 @@ diff -urNp linux-2.6.32.14/kernel/lockdep.c linux-2.6.32.14/kernel/lockdep.c
48554 printk("the code is fine but needs lockdep annotation.\n"); 48570 printk("the code is fine but needs lockdep annotation.\n");
48555 printk("turning off the locking correctness validator.\n"); 48571 printk("turning off the locking correctness validator.\n");
48556 dump_stack(); 48572 dump_stack();
48557diff -urNp linux-2.6.32.14/kernel/lockdep_proc.c linux-2.6.32.14/kernel/lockdep_proc.c 48573diff -urNp linux-2.6.32.15/kernel/lockdep_proc.c linux-2.6.32.15/kernel/lockdep_proc.c
48558--- linux-2.6.32.14/kernel/lockdep_proc.c 2010-03-15 11:52:04.000000000 -0400 48574--- linux-2.6.32.15/kernel/lockdep_proc.c 2010-03-15 11:52:04.000000000 -0400
48559+++ linux-2.6.32.14/kernel/lockdep_proc.c 2010-05-28 21:27:16.439128347 -0400 48575+++ linux-2.6.32.15/kernel/lockdep_proc.c 2010-05-28 21:27:16.439128347 -0400
48560@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v 48576@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
48561 48577
48562 static void print_name(struct seq_file *m, struct lock_class *class) 48578 static void print_name(struct seq_file *m, struct lock_class *class)
@@ -48566,9 +48582,9 @@ diff -urNp linux-2.6.32.14/kernel/lockdep_proc.c linux-2.6.32.14/kernel/lockdep_
48566 const char *name = class->name; 48582 const char *name = class->name;
48567 48583
48568 if (!name) { 48584 if (!name) {
48569diff -urNp linux-2.6.32.14/kernel/module.c linux-2.6.32.14/kernel/module.c 48585diff -urNp linux-2.6.32.15/kernel/module.c linux-2.6.32.15/kernel/module.c
48570--- linux-2.6.32.14/kernel/module.c 2010-04-29 17:49:38.586002480 -0400 48586--- linux-2.6.32.15/kernel/module.c 2010-06-01 15:02:53.053672396 -0400
48571+++ linux-2.6.32.14/kernel/module.c 2010-05-28 21:27:16.439128347 -0400 48587+++ linux-2.6.32.15/kernel/module.c 2010-06-01 15:03:15.410128488 -0400
48572@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq 48588@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
48573 static BLOCKING_NOTIFIER_HEAD(module_notify_list); 48589 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
48574 48590
@@ -49108,9 +49124,9 @@ diff -urNp linux-2.6.32.14/kernel/module.c linux-2.6.32.14/kernel/module.c
49108 mod = NULL; 49124 mod = NULL;
49109 } 49125 }
49110 return mod; 49126 return mod;
49111diff -urNp linux-2.6.32.14/kernel/panic.c linux-2.6.32.14/kernel/panic.c 49127diff -urNp linux-2.6.32.15/kernel/panic.c linux-2.6.32.15/kernel/panic.c
49112--- linux-2.6.32.14/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400 49128--- linux-2.6.32.15/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400
49113+++ linux-2.6.32.14/kernel/panic.c 2010-05-28 21:27:16.442904432 -0400 49129+++ linux-2.6.32.15/kernel/panic.c 2010-05-28 21:27:16.442904432 -0400
49114@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); 49130@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
49115 */ 49131 */
49116 void __stack_chk_fail(void) 49132 void __stack_chk_fail(void)
@@ -49121,9 +49137,9 @@ diff -urNp linux-2.6.32.14/kernel/panic.c linux-2.6.32.14/kernel/panic.c
49121 __builtin_return_address(0)); 49137 __builtin_return_address(0));
49122 } 49138 }
49123 EXPORT_SYMBOL(__stack_chk_fail); 49139 EXPORT_SYMBOL(__stack_chk_fail);
49124diff -urNp linux-2.6.32.14/kernel/params.c linux-2.6.32.14/kernel/params.c 49140diff -urNp linux-2.6.32.15/kernel/params.c linux-2.6.32.15/kernel/params.c
49125--- linux-2.6.32.14/kernel/params.c 2010-03-15 11:52:04.000000000 -0400 49141--- linux-2.6.32.15/kernel/params.c 2010-03-15 11:52:04.000000000 -0400
49126+++ linux-2.6.32.14/kernel/params.c 2010-05-28 21:27:16.442904432 -0400 49142+++ linux-2.6.32.15/kernel/params.c 2010-05-28 21:27:16.442904432 -0400
49127@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct 49143@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
49128 return ret; 49144 return ret;
49129 } 49145 }
@@ -49142,9 +49158,9 @@ diff -urNp linux-2.6.32.14/kernel/params.c linux-2.6.32.14/kernel/params.c
49142 .filter = uevent_filter, 49158 .filter = uevent_filter,
49143 }; 49159 };
49144 49160
49145diff -urNp linux-2.6.32.14/kernel/pid.c linux-2.6.32.14/kernel/pid.c 49161diff -urNp linux-2.6.32.15/kernel/pid.c linux-2.6.32.15/kernel/pid.c
49146--- linux-2.6.32.14/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400 49162--- linux-2.6.32.15/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400
49147+++ linux-2.6.32.14/kernel/pid.c 2010-05-28 21:27:16.442904432 -0400 49163+++ linux-2.6.32.15/kernel/pid.c 2010-05-28 21:27:16.442904432 -0400
49148@@ -33,6 +33,7 @@ 49164@@ -33,6 +33,7 @@
49149 #include <linux/rculist.h> 49165 #include <linux/rculist.h>
49150 #include <linux/bootmem.h> 49166 #include <linux/bootmem.h>
@@ -49178,9 +49194,9 @@ diff -urNp linux-2.6.32.14/kernel/pid.c linux-2.6.32.14/kernel/pid.c
49178 } 49194 }
49179 49195
49180 struct task_struct *find_task_by_vpid(pid_t vnr) 49196 struct task_struct *find_task_by_vpid(pid_t vnr)
49181diff -urNp linux-2.6.32.14/kernel/posix-cpu-timers.c linux-2.6.32.14/kernel/posix-cpu-timers.c 49197diff -urNp linux-2.6.32.15/kernel/posix-cpu-timers.c linux-2.6.32.15/kernel/posix-cpu-timers.c
49182--- linux-2.6.32.14/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400 49198--- linux-2.6.32.15/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400
49183+++ linux-2.6.32.14/kernel/posix-cpu-timers.c 2010-05-28 21:27:16.442904432 -0400 49199+++ linux-2.6.32.15/kernel/posix-cpu-timers.c 2010-05-28 21:27:16.442904432 -0400
49184@@ -6,6 +6,7 @@ 49200@@ -6,6 +6,7 @@
49185 #include <linux/posix-timers.h> 49201 #include <linux/posix-timers.h>
49186 #include <linux/errno.h> 49202 #include <linux/errno.h>
@@ -49205,9 +49221,9 @@ diff -urNp linux-2.6.32.14/kernel/posix-cpu-timers.c linux-2.6.32.14/kernel/posi
49205 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { 49221 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) {
49206 /* 49222 /*
49207 * At the soft limit, send a SIGXCPU every second. 49223 * At the soft limit, send a SIGXCPU every second.
49208diff -urNp linux-2.6.32.14/kernel/power/hibernate.c linux-2.6.32.14/kernel/power/hibernate.c 49224diff -urNp linux-2.6.32.15/kernel/power/hibernate.c linux-2.6.32.15/kernel/power/hibernate.c
49209--- linux-2.6.32.14/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400 49225--- linux-2.6.32.15/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400
49210+++ linux-2.6.32.14/kernel/power/hibernate.c 2010-05-28 21:27:16.442904432 -0400 49226+++ linux-2.6.32.15/kernel/power/hibernate.c 2010-05-28 21:27:16.442904432 -0400
49211@@ -48,14 +48,14 @@ enum { 49227@@ -48,14 +48,14 @@ enum {
49212 49228
49213 static int hibernation_mode = HIBERNATION_SHUTDOWN; 49229 static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -49225,9 +49241,9 @@ diff -urNp linux-2.6.32.14/kernel/power/hibernate.c linux-2.6.32.14/kernel/power
49225 { 49241 {
49226 if (ops && !(ops->begin && ops->end && ops->pre_snapshot 49242 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
49227 && ops->prepare && ops->finish && ops->enter && ops->pre_restore 49243 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
49228diff -urNp linux-2.6.32.14/kernel/power/poweroff.c linux-2.6.32.14/kernel/power/poweroff.c 49244diff -urNp linux-2.6.32.15/kernel/power/poweroff.c linux-2.6.32.15/kernel/power/poweroff.c
49229--- linux-2.6.32.14/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400 49245--- linux-2.6.32.15/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400
49230+++ linux-2.6.32.14/kernel/power/poweroff.c 2010-05-28 21:27:16.442904432 -0400 49246+++ linux-2.6.32.15/kernel/power/poweroff.c 2010-05-28 21:27:16.442904432 -0400
49231@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof 49247@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
49232 .enable_mask = SYSRQ_ENABLE_BOOT, 49248 .enable_mask = SYSRQ_ENABLE_BOOT,
49233 }; 49249 };
@@ -49237,9 +49253,9 @@ diff -urNp linux-2.6.32.14/kernel/power/poweroff.c linux-2.6.32.14/kernel/power/
49237 { 49253 {
49238 register_sysrq_key('o', &sysrq_poweroff_op); 49254 register_sysrq_key('o', &sysrq_poweroff_op);
49239 return 0; 49255 return 0;
49240diff -urNp linux-2.6.32.14/kernel/power/process.c linux-2.6.32.14/kernel/power/process.c 49256diff -urNp linux-2.6.32.15/kernel/power/process.c linux-2.6.32.15/kernel/power/process.c
49241--- linux-2.6.32.14/kernel/power/process.c 2010-04-29 17:49:38.590000225 -0400 49257--- linux-2.6.32.15/kernel/power/process.c 2010-04-29 17:49:38.590000225 -0400
49242+++ linux-2.6.32.14/kernel/power/process.c 2010-05-28 21:27:16.442904432 -0400 49258+++ linux-2.6.32.15/kernel/power/process.c 2010-05-28 21:27:16.442904432 -0400
49243@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ 49259@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
49244 struct timeval start, end; 49260 struct timeval start, end;
49245 u64 elapsed_csecs64; 49261 u64 elapsed_csecs64;
@@ -49279,9 +49295,9 @@ diff -urNp linux-2.6.32.14/kernel/power/process.c linux-2.6.32.14/kernel/power/p
49279 49295
49280 do_gettimeofday(&end); 49296 do_gettimeofday(&end);
49281 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); 49297 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
49282diff -urNp linux-2.6.32.14/kernel/power/suspend.c linux-2.6.32.14/kernel/power/suspend.c 49298diff -urNp linux-2.6.32.15/kernel/power/suspend.c linux-2.6.32.15/kernel/power/suspend.c
49283--- linux-2.6.32.14/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400 49299--- linux-2.6.32.15/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400
49284+++ linux-2.6.32.14/kernel/power/suspend.c 2010-05-28 21:27:16.442904432 -0400 49300+++ linux-2.6.32.15/kernel/power/suspend.c 2010-05-28 21:27:16.442904432 -0400
49285@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M 49301@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
49286 [PM_SUSPEND_MEM] = "mem", 49302 [PM_SUSPEND_MEM] = "mem",
49287 }; 49303 };
@@ -49298,9 +49314,9 @@ diff -urNp linux-2.6.32.14/kernel/power/suspend.c linux-2.6.32.14/kernel/power/s
49298 { 49314 {
49299 mutex_lock(&pm_mutex); 49315 mutex_lock(&pm_mutex);
49300 suspend_ops = ops; 49316 suspend_ops = ops;
49301diff -urNp linux-2.6.32.14/kernel/printk.c linux-2.6.32.14/kernel/printk.c 49317diff -urNp linux-2.6.32.15/kernel/printk.c linux-2.6.32.15/kernel/printk.c
49302--- linux-2.6.32.14/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400 49318--- linux-2.6.32.15/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400
49303+++ linux-2.6.32.14/kernel/printk.c 2010-05-28 21:27:16.442904432 -0400 49319+++ linux-2.6.32.15/kernel/printk.c 2010-05-28 21:27:16.442904432 -0400
49304@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf 49320@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
49305 char c; 49321 char c;
49306 int error = 0; 49322 int error = 0;
@@ -49313,9 +49329,9 @@ diff -urNp linux-2.6.32.14/kernel/printk.c linux-2.6.32.14/kernel/printk.c
49313 error = security_syslog(type); 49329 error = security_syslog(type);
49314 if (error) 49330 if (error)
49315 return error; 49331 return error;
49316diff -urNp linux-2.6.32.14/kernel/ptrace.c linux-2.6.32.14/kernel/ptrace.c 49332diff -urNp linux-2.6.32.15/kernel/ptrace.c linux-2.6.32.15/kernel/ptrace.c
49317--- linux-2.6.32.14/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 49333--- linux-2.6.32.15/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400
49318+++ linux-2.6.32.14/kernel/ptrace.c 2010-05-28 21:27:16.442904432 -0400 49334+++ linux-2.6.32.15/kernel/ptrace.c 2010-05-28 21:27:16.442904432 -0400
49319@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru 49335@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
49320 cred->gid != tcred->egid || 49336 cred->gid != tcred->egid ||
49321 cred->gid != tcred->sgid || 49337 cred->gid != tcred->sgid ||
@@ -49397,9 +49413,9 @@ diff -urNp linux-2.6.32.14/kernel/ptrace.c linux-2.6.32.14/kernel/ptrace.c
49397 } 49413 }
49398 49414
49399 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) 49415 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
49400diff -urNp linux-2.6.32.14/kernel/rcutree.c linux-2.6.32.14/kernel/rcutree.c 49416diff -urNp linux-2.6.32.15/kernel/rcutree.c linux-2.6.32.15/kernel/rcutree.c
49401--- linux-2.6.32.14/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400 49417--- linux-2.6.32.15/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400
49402+++ linux-2.6.32.14/kernel/rcutree.c 2010-05-28 21:27:16.442904432 -0400 49418+++ linux-2.6.32.15/kernel/rcutree.c 2010-05-28 21:27:16.442904432 -0400
49403@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state 49419@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
49404 /* 49420 /*
49405 * Do softirq processing for the current CPU. 49421 * Do softirq processing for the current CPU.
@@ -49409,9 +49425,9 @@ diff -urNp linux-2.6.32.14/kernel/rcutree.c linux-2.6.32.14/kernel/rcutree.c
49409 { 49425 {
49410 /* 49426 /*
49411 * Memory references from any prior RCU read-side critical sections 49427 * Memory references from any prior RCU read-side critical sections
49412diff -urNp linux-2.6.32.14/kernel/relay.c linux-2.6.32.14/kernel/relay.c 49428diff -urNp linux-2.6.32.15/kernel/relay.c linux-2.6.32.15/kernel/relay.c
49413--- linux-2.6.32.14/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400 49429--- linux-2.6.32.15/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400
49414+++ linux-2.6.32.14/kernel/relay.c 2010-05-28 21:27:16.442904432 -0400 49430+++ linux-2.6.32.15/kernel/relay.c 2010-05-28 21:27:16.442904432 -0400
49415@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi 49431@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi
49416 return 0; 49432 return 0;
49417 49433
@@ -49421,9 +49437,9 @@ diff -urNp linux-2.6.32.14/kernel/relay.c linux-2.6.32.14/kernel/relay.c
49421 return ret; 49437 return ret;
49422 49438
49423 if (read_start + ret == nonpad_end) 49439 if (read_start + ret == nonpad_end)
49424diff -urNp linux-2.6.32.14/kernel/resource.c linux-2.6.32.14/kernel/resource.c 49440diff -urNp linux-2.6.32.15/kernel/resource.c linux-2.6.32.15/kernel/resource.c
49425--- linux-2.6.32.14/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400 49441--- linux-2.6.32.15/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400
49426+++ linux-2.6.32.14/kernel/resource.c 2010-05-28 21:27:16.442904432 -0400 49442+++ linux-2.6.32.15/kernel/resource.c 2010-05-28 21:27:16.442904432 -0400
49427@@ -132,8 +132,18 @@ static const struct file_operations proc 49443@@ -132,8 +132,18 @@ static const struct file_operations proc
49428 49444
49429 static int __init ioresources_init(void) 49445 static int __init ioresources_init(void)
@@ -49443,9 +49459,9 @@ diff -urNp linux-2.6.32.14/kernel/resource.c linux-2.6.32.14/kernel/resource.c
49443 return 0; 49459 return 0;
49444 } 49460 }
49445 __initcall(ioresources_init); 49461 __initcall(ioresources_init);
49446diff -urNp linux-2.6.32.14/kernel/sched.c linux-2.6.32.14/kernel/sched.c 49462diff -urNp linux-2.6.32.15/kernel/sched.c linux-2.6.32.15/kernel/sched.c
49447--- linux-2.6.32.14/kernel/sched.c 2010-04-29 17:49:38.609495328 -0400 49463--- linux-2.6.32.15/kernel/sched.c 2010-04-29 17:49:38.609495328 -0400
49448+++ linux-2.6.32.14/kernel/sched.c 2010-05-28 21:27:16.447114196 -0400 49464+++ linux-2.6.32.15/kernel/sched.c 2010-05-28 21:27:16.447114196 -0400
49449@@ -4841,7 +4841,7 @@ out: 49465@@ -4841,7 +4841,7 @@ out:
49450 * In CONFIG_NO_HZ case, the idle load balance owner will do the 49466 * In CONFIG_NO_HZ case, the idle load balance owner will do the
49451 * rebalancing for all the cpus for whom scheduler ticks are stopped. 49467 * rebalancing for all the cpus for whom scheduler ticks are stopped.
@@ -49501,9 +49517,9 @@ diff -urNp linux-2.6.32.14/kernel/sched.c linux-2.6.32.14/kernel/sched.c
49501 }; 49517 };
49502 49518
49503 static struct ctl_table *sd_alloc_ctl_entry(int n) 49519 static struct ctl_table *sd_alloc_ctl_entry(int n)
49504diff -urNp linux-2.6.32.14/kernel/signal.c linux-2.6.32.14/kernel/signal.c 49520diff -urNp linux-2.6.32.15/kernel/signal.c linux-2.6.32.15/kernel/signal.c
49505--- linux-2.6.32.14/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 49521--- linux-2.6.32.15/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400
49506+++ linux-2.6.32.14/kernel/signal.c 2010-05-28 21:27:16.447114196 -0400 49522+++ linux-2.6.32.15/kernel/signal.c 2010-05-28 21:27:16.447114196 -0400
49507@@ -41,12 +41,12 @@ 49523@@ -41,12 +41,12 @@
49508 49524
49509 static struct kmem_cache *sigqueue_cachep; 49525 static struct kmem_cache *sigqueue_cachep;
@@ -49589,9 +49605,9 @@ diff -urNp linux-2.6.32.14/kernel/signal.c linux-2.6.32.14/kernel/signal.c
49589 49605
49590 return ret; 49606 return ret;
49591 } 49607 }
49592diff -urNp linux-2.6.32.14/kernel/smp.c linux-2.6.32.14/kernel/smp.c 49608diff -urNp linux-2.6.32.15/kernel/smp.c linux-2.6.32.15/kernel/smp.c
49593--- linux-2.6.32.14/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400 49609--- linux-2.6.32.15/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400
49594+++ linux-2.6.32.14/kernel/smp.c 2010-05-28 21:27:16.447114196 -0400 49610+++ linux-2.6.32.15/kernel/smp.c 2010-05-28 21:27:16.447114196 -0400
49595@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void 49611@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void
49596 } 49612 }
49597 EXPORT_SYMBOL(smp_call_function); 49613 EXPORT_SYMBOL(smp_call_function);
@@ -49619,9 +49635,9 @@ diff -urNp linux-2.6.32.14/kernel/smp.c linux-2.6.32.14/kernel/smp.c
49619 { 49635 {
49620 spin_unlock_irq(&call_function.lock); 49636 spin_unlock_irq(&call_function.lock);
49621 } 49637 }
49622diff -urNp linux-2.6.32.14/kernel/softirq.c linux-2.6.32.14/kernel/softirq.c 49638diff -urNp linux-2.6.32.15/kernel/softirq.c linux-2.6.32.15/kernel/softirq.c
49623--- linux-2.6.32.14/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400 49639--- linux-2.6.32.15/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400
49624+++ linux-2.6.32.14/kernel/softirq.c 2010-05-28 21:27:16.447114196 -0400 49640+++ linux-2.6.32.15/kernel/softirq.c 2010-05-28 21:27:16.447114196 -0400
49625@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec 49641@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
49626 49642
49627 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); 49643 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -49676,9 +49692,9 @@ diff -urNp linux-2.6.32.14/kernel/softirq.c linux-2.6.32.14/kernel/softirq.c
49676 { 49692 {
49677 struct tasklet_struct *list; 49693 struct tasklet_struct *list;
49678 49694
49679diff -urNp linux-2.6.32.14/kernel/sys.c linux-2.6.32.14/kernel/sys.c 49695diff -urNp linux-2.6.32.15/kernel/sys.c linux-2.6.32.15/kernel/sys.c
49680--- linux-2.6.32.14/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400 49696--- linux-2.6.32.15/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400
49681+++ linux-2.6.32.14/kernel/sys.c 2010-05-28 21:27:16.447114196 -0400 49697+++ linux-2.6.32.15/kernel/sys.c 2010-05-28 21:27:16.447114196 -0400
49682@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru 49698@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
49683 error = -EACCES; 49699 error = -EACCES;
49684 goto out; 49700 goto out;
@@ -49814,9 +49830,9 @@ diff -urNp linux-2.6.32.14/kernel/sys.c linux-2.6.32.14/kernel/sys.c
49814 error = -EINVAL; 49830 error = -EINVAL;
49815 break; 49831 break;
49816 } 49832 }
49817diff -urNp linux-2.6.32.14/kernel/sysctl.c linux-2.6.32.14/kernel/sysctl.c 49833diff -urNp linux-2.6.32.15/kernel/sysctl.c linux-2.6.32.15/kernel/sysctl.c
49818--- linux-2.6.32.14/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400 49834--- linux-2.6.32.15/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400
49819+++ linux-2.6.32.14/kernel/sysctl.c 2010-05-28 21:27:16.447114196 -0400 49835+++ linux-2.6.32.15/kernel/sysctl.c 2010-05-28 21:27:16.447114196 -0400
49820@@ -63,6 +63,13 @@ 49836@@ -63,6 +63,13 @@
49821 static int deprecated_sysctl_warning(struct __sysctl_args *args); 49837 static int deprecated_sysctl_warning(struct __sysctl_args *args);
49822 49838
@@ -49938,9 +49954,9 @@ diff -urNp linux-2.6.32.14/kernel/sysctl.c linux-2.6.32.14/kernel/sysctl.c
49938 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); 49954 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
49939 if (error) 49955 if (error)
49940 return error; 49956 return error;
49941diff -urNp linux-2.6.32.14/kernel/taskstats.c linux-2.6.32.14/kernel/taskstats.c 49957diff -urNp linux-2.6.32.15/kernel/taskstats.c linux-2.6.32.15/kernel/taskstats.c
49942--- linux-2.6.32.14/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400 49958--- linux-2.6.32.15/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400
49943+++ linux-2.6.32.14/kernel/taskstats.c 2010-05-28 21:27:16.447114196 -0400 49959+++ linux-2.6.32.15/kernel/taskstats.c 2010-05-28 21:27:16.447114196 -0400
49944@@ -26,9 +26,12 @@ 49960@@ -26,9 +26,12 @@
49945 #include <linux/cgroup.h> 49961 #include <linux/cgroup.h>
49946 #include <linux/fs.h> 49962 #include <linux/fs.h>
@@ -49964,9 +49980,9 @@ diff -urNp linux-2.6.32.14/kernel/taskstats.c linux-2.6.32.14/kernel/taskstats.c
49964 if (!alloc_cpumask_var(&mask, GFP_KERNEL)) 49980 if (!alloc_cpumask_var(&mask, GFP_KERNEL))
49965 return -ENOMEM; 49981 return -ENOMEM;
49966 49982
49967diff -urNp linux-2.6.32.14/kernel/time/tick-broadcast.c linux-2.6.32.14/kernel/time/tick-broadcast.c 49983diff -urNp linux-2.6.32.15/kernel/time/tick-broadcast.c linux-2.6.32.15/kernel/time/tick-broadcast.c
49968--- linux-2.6.32.14/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400 49984--- linux-2.6.32.15/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400
49969+++ linux-2.6.32.14/kernel/time/tick-broadcast.c 2010-05-28 21:27:16.447114196 -0400 49985+++ linux-2.6.32.15/kernel/time/tick-broadcast.c 2010-05-28 21:27:16.447114196 -0400
49970@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl 49986@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
49971 * then clear the broadcast bit. 49987 * then clear the broadcast bit.
49972 */ 49988 */
@@ -49976,9 +49992,9 @@ diff -urNp linux-2.6.32.14/kernel/time/tick-broadcast.c linux-2.6.32.14/kernel/t
49976 49992
49977 cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); 49993 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
49978 tick_broadcast_clear_oneshot(cpu); 49994 tick_broadcast_clear_oneshot(cpu);
49979diff -urNp linux-2.6.32.14/kernel/time.c linux-2.6.32.14/kernel/time.c 49995diff -urNp linux-2.6.32.15/kernel/time.c linux-2.6.32.15/kernel/time.c
49980--- linux-2.6.32.14/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 49996--- linux-2.6.32.15/kernel/time.c 2010-03-15 11:52:04.000000000 -0400
49981+++ linux-2.6.32.14/kernel/time.c 2010-05-28 21:27:16.451020026 -0400 49997+++ linux-2.6.32.15/kernel/time.c 2010-05-28 21:27:16.451020026 -0400
49982@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, 49998@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *,
49983 return err; 49999 return err;
49984 50000
@@ -50016,9 +50032,9 @@ diff -urNp linux-2.6.32.14/kernel/time.c linux-2.6.32.14/kernel/time.c
50016 { 50032 {
50017 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) 50033 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
50018 return (USEC_PER_SEC / HZ) * j; 50034 return (USEC_PER_SEC / HZ) * j;
50019diff -urNp linux-2.6.32.14/kernel/timer.c linux-2.6.32.14/kernel/timer.c 50035diff -urNp linux-2.6.32.15/kernel/timer.c linux-2.6.32.15/kernel/timer.c
50020--- linux-2.6.32.14/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400 50036--- linux-2.6.32.15/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400
50021+++ linux-2.6.32.14/kernel/timer.c 2010-05-28 21:27:16.451020026 -0400 50037+++ linux-2.6.32.15/kernel/timer.c 2010-05-28 21:27:16.451020026 -0400
50022@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) 50038@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick)
50023 /* 50039 /*
50024 * This function runs timers and the timer-tq in bottom half context. 50040 * This function runs timers and the timer-tq in bottom half context.
@@ -50028,9 +50044,9 @@ diff -urNp linux-2.6.32.14/kernel/timer.c linux-2.6.32.14/kernel/timer.c
50028 { 50044 {
50029 struct tvec_base *base = __get_cpu_var(tvec_bases); 50045 struct tvec_base *base = __get_cpu_var(tvec_bases);
50030 50046
50031diff -urNp linux-2.6.32.14/kernel/trace/ftrace.c linux-2.6.32.14/kernel/trace/ftrace.c 50047diff -urNp linux-2.6.32.15/kernel/trace/ftrace.c linux-2.6.32.15/kernel/trace/ftrace.c
50032--- linux-2.6.32.14/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400 50048--- linux-2.6.32.15/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400
50033+++ linux-2.6.32.14/kernel/trace/ftrace.c 2010-05-28 21:27:16.451020026 -0400 50049+++ linux-2.6.32.15/kernel/trace/ftrace.c 2010-05-28 21:27:16.451020026 -0400
50034@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, 50050@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod,
50035 50051
50036 ip = rec->ip; 50052 ip = rec->ip;
@@ -50052,9 +50068,9 @@ diff -urNp linux-2.6.32.14/kernel/trace/ftrace.c linux-2.6.32.14/kernel/trace/ft
50052 } 50068 }
50053 50069
50054 /* 50070 /*
50055diff -urNp linux-2.6.32.14/kernel/trace/Kconfig linux-2.6.32.14/kernel/trace/Kconfig 50071diff -urNp linux-2.6.32.15/kernel/trace/Kconfig linux-2.6.32.15/kernel/trace/Kconfig
50056--- linux-2.6.32.14/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400 50072--- linux-2.6.32.15/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400
50057+++ linux-2.6.32.14/kernel/trace/Kconfig 2010-05-28 21:27:16.451020026 -0400 50073+++ linux-2.6.32.15/kernel/trace/Kconfig 2010-05-28 21:27:16.451020026 -0400
50058@@ -126,6 +126,7 @@ if FTRACE 50074@@ -126,6 +126,7 @@ if FTRACE
50059 config FUNCTION_TRACER 50075 config FUNCTION_TRACER
50060 bool "Kernel Function Tracer" 50076 bool "Kernel Function Tracer"
@@ -50071,9 +50087,9 @@ diff -urNp linux-2.6.32.14/kernel/trace/Kconfig linux-2.6.32.14/kernel/trace/Kco
50071 select FUNCTION_TRACER 50087 select FUNCTION_TRACER
50072 select STACKTRACE 50088 select STACKTRACE
50073 select KALLSYMS 50089 select KALLSYMS
50074diff -urNp linux-2.6.32.14/kernel/trace/ring_buffer.c linux-2.6.32.14/kernel/trace/ring_buffer.c 50090diff -urNp linux-2.6.32.15/kernel/trace/ring_buffer.c linux-2.6.32.15/kernel/trace/ring_buffer.c
50075--- linux-2.6.32.14/kernel/trace/ring_buffer.c 2010-04-04 20:41:50.072525146 -0400 50091--- linux-2.6.32.15/kernel/trace/ring_buffer.c 2010-04-04 20:41:50.072525146 -0400
50076+++ linux-2.6.32.14/kernel/trace/ring_buffer.c 2010-05-28 21:27:16.451020026 -0400 50092+++ linux-2.6.32.15/kernel/trace/ring_buffer.c 2010-05-28 21:27:16.451020026 -0400
50077@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st 50093@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st
50078 * the reader page). But if the next page is a header page, 50094 * the reader page). But if the next page is a header page,
50079 * its flags will be non zero. 50095 * its flags will be non zero.
@@ -50083,9 +50099,9 @@ diff -urNp linux-2.6.32.14/kernel/trace/ring_buffer.c linux-2.6.32.14/kernel/tra
50083 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, 50099 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
50084 struct buffer_page *page, struct list_head *list) 50100 struct buffer_page *page, struct list_head *list)
50085 { 50101 {
50086diff -urNp linux-2.6.32.14/kernel/trace/trace.c linux-2.6.32.14/kernel/trace/trace.c 50102diff -urNp linux-2.6.32.15/kernel/trace/trace.c linux-2.6.32.15/kernel/trace/trace.c
50087--- linux-2.6.32.14/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400 50103--- linux-2.6.32.15/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400
50088+++ linux-2.6.32.14/kernel/trace/trace.c 2010-05-28 21:27:16.451020026 -0400 50104+++ linux-2.6.32.15/kernel/trace/trace.c 2010-05-28 21:27:16.451020026 -0400
50089@@ -3808,10 +3808,9 @@ static const struct file_operations trac 50105@@ -3808,10 +3808,9 @@ static const struct file_operations trac
50090 }; 50106 };
50091 #endif 50107 #endif
@@ -50110,9 +50126,9 @@ diff -urNp linux-2.6.32.14/kernel/trace/trace.c linux-2.6.32.14/kernel/trace/tra
50110 static int once; 50126 static int once;
50111 struct dentry *d_tracer; 50127 struct dentry *d_tracer;
50112 50128
50113diff -urNp linux-2.6.32.14/kernel/trace/trace_events.c linux-2.6.32.14/kernel/trace/trace_events.c 50129diff -urNp linux-2.6.32.15/kernel/trace/trace_events.c linux-2.6.32.15/kernel/trace/trace_events.c
50114--- linux-2.6.32.14/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400 50130--- linux-2.6.32.15/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400
50115+++ linux-2.6.32.14/kernel/trace/trace_events.c 2010-05-28 21:27:16.451020026 -0400 50131+++ linux-2.6.32.15/kernel/trace/trace_events.c 2010-05-28 21:27:16.451020026 -0400
50116@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list 50132@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
50117 * Modules must own their file_operations to keep up with 50133 * Modules must own their file_operations to keep up with
50118 * reference counting. 50134 * reference counting.
@@ -50122,9 +50138,9 @@ diff -urNp linux-2.6.32.14/kernel/trace/trace_events.c linux-2.6.32.14/kernel/tr
50122 struct ftrace_module_file_ops { 50138 struct ftrace_module_file_ops {
50123 struct list_head list; 50139 struct list_head list;
50124 struct module *mod; 50140 struct module *mod;
50125diff -urNp linux-2.6.32.14/kernel/trace/trace_output.c linux-2.6.32.14/kernel/trace/trace_output.c 50141diff -urNp linux-2.6.32.15/kernel/trace/trace_output.c linux-2.6.32.15/kernel/trace/trace_output.c
50126--- linux-2.6.32.14/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400 50142--- linux-2.6.32.15/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400
50127+++ linux-2.6.32.14/kernel/trace/trace_output.c 2010-05-28 21:27:16.451020026 -0400 50143+++ linux-2.6.32.15/kernel/trace/trace_output.c 2010-05-28 21:27:16.451020026 -0400
50128@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, 50144@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
50129 return 0; 50145 return 0;
50130 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); 50146 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -50134,9 +50150,9 @@ diff -urNp linux-2.6.32.14/kernel/trace/trace_output.c linux-2.6.32.14/kernel/tr
50134 if (p) { 50150 if (p) {
50135 s->len = p - s->buffer; 50151 s->len = p - s->buffer;
50136 return 1; 50152 return 1;
50137diff -urNp linux-2.6.32.14/kernel/trace/trace_stack.c linux-2.6.32.14/kernel/trace/trace_stack.c 50153diff -urNp linux-2.6.32.15/kernel/trace/trace_stack.c linux-2.6.32.15/kernel/trace/trace_stack.c
50138--- linux-2.6.32.14/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400 50154--- linux-2.6.32.15/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400
50139+++ linux-2.6.32.14/kernel/trace/trace_stack.c 2010-05-28 21:27:16.451020026 -0400 50155+++ linux-2.6.32.15/kernel/trace/trace_stack.c 2010-05-28 21:27:16.451020026 -0400
50140@@ -50,7 +50,7 @@ static inline void check_stack(void) 50156@@ -50,7 +50,7 @@ static inline void check_stack(void)
50141 return; 50157 return;
50142 50158
@@ -50146,9 +50162,9 @@ diff -urNp linux-2.6.32.14/kernel/trace/trace_stack.c linux-2.6.32.14/kernel/tra
50146 return; 50162 return;
50147 50163
50148 local_irq_save(flags); 50164 local_irq_save(flags);
50149diff -urNp linux-2.6.32.14/kernel/utsname_sysctl.c linux-2.6.32.14/kernel/utsname_sysctl.c 50165diff -urNp linux-2.6.32.15/kernel/utsname_sysctl.c linux-2.6.32.15/kernel/utsname_sysctl.c
50150--- linux-2.6.32.14/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400 50166--- linux-2.6.32.15/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400
50151+++ linux-2.6.32.14/kernel/utsname_sysctl.c 2010-05-28 21:27:16.451020026 -0400 50167+++ linux-2.6.32.15/kernel/utsname_sysctl.c 2010-05-28 21:27:16.451020026 -0400
50152@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] 50168@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
50153 .proc_handler = proc_do_uts_string, 50169 .proc_handler = proc_do_uts_string,
50154 .strategy = sysctl_uts_string, 50170 .strategy = sysctl_uts_string,
@@ -50167,9 +50183,9 @@ diff -urNp linux-2.6.32.14/kernel/utsname_sysctl.c linux-2.6.32.14/kernel/utsnam
50167 }; 50183 };
50168 50184
50169 static int __init utsname_sysctl_init(void) 50185 static int __init utsname_sysctl_init(void)
50170diff -urNp linux-2.6.32.14/lib/bug.c linux-2.6.32.14/lib/bug.c 50186diff -urNp linux-2.6.32.15/lib/bug.c linux-2.6.32.15/lib/bug.c
50171--- linux-2.6.32.14/lib/bug.c 2010-03-15 11:52:04.000000000 -0400 50187--- linux-2.6.32.15/lib/bug.c 2010-03-15 11:52:04.000000000 -0400
50172+++ linux-2.6.32.14/lib/bug.c 2010-05-28 21:27:16.451020026 -0400 50188+++ linux-2.6.32.15/lib/bug.c 2010-05-28 21:27:16.451020026 -0400
50173@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l 50189@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
50174 return BUG_TRAP_TYPE_NONE; 50190 return BUG_TRAP_TYPE_NONE;
50175 50191
@@ -50179,9 +50195,9 @@ diff -urNp linux-2.6.32.14/lib/bug.c linux-2.6.32.14/lib/bug.c
50179 50195
50180 printk(KERN_EMERG "------------[ cut here ]------------\n"); 50196 printk(KERN_EMERG "------------[ cut here ]------------\n");
50181 50197
50182diff -urNp linux-2.6.32.14/lib/debugobjects.c linux-2.6.32.14/lib/debugobjects.c 50198diff -urNp linux-2.6.32.15/lib/debugobjects.c linux-2.6.32.15/lib/debugobjects.c
50183--- linux-2.6.32.14/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400 50199--- linux-2.6.32.15/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400
50184+++ linux-2.6.32.14/lib/debugobjects.c 2010-05-28 21:27:16.455065280 -0400 50200+++ linux-2.6.32.15/lib/debugobjects.c 2010-05-28 21:27:16.455065280 -0400
50185@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi 50201@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
50186 if (limit > 4) 50202 if (limit > 4)
50187 return; 50203 return;
@@ -50191,9 +50207,9 @@ diff -urNp linux-2.6.32.14/lib/debugobjects.c linux-2.6.32.14/lib/debugobjects.c
50191 if (is_on_stack == onstack) 50207 if (is_on_stack == onstack)
50192 return; 50208 return;
50193 50209
50194diff -urNp linux-2.6.32.14/lib/dma-debug.c linux-2.6.32.14/lib/dma-debug.c 50210diff -urNp linux-2.6.32.15/lib/dma-debug.c linux-2.6.32.15/lib/dma-debug.c
50195--- linux-2.6.32.14/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400 50211--- linux-2.6.32.15/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400
50196+++ linux-2.6.32.14/lib/dma-debug.c 2010-05-28 21:27:16.463242745 -0400 50212+++ linux-2.6.32.15/lib/dma-debug.c 2010-05-28 21:27:16.463242745 -0400
50197@@ -861,7 +861,7 @@ out: 50213@@ -861,7 +861,7 @@ out:
50198 50214
50199 static void check_for_stack(struct device *dev, void *addr) 50215 static void check_for_stack(struct device *dev, void *addr)
@@ -50203,9 +50219,9 @@ diff -urNp linux-2.6.32.14/lib/dma-debug.c linux-2.6.32.14/lib/dma-debug.c
50203 err_printk(dev, NULL, "DMA-API: device driver maps memory from" 50219 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
50204 "stack [addr=%p]\n", addr); 50220 "stack [addr=%p]\n", addr);
50205 } 50221 }
50206diff -urNp linux-2.6.32.14/lib/idr.c linux-2.6.32.14/lib/idr.c 50222diff -urNp linux-2.6.32.15/lib/idr.c linux-2.6.32.15/lib/idr.c
50207--- linux-2.6.32.14/lib/idr.c 2010-03-15 11:52:04.000000000 -0400 50223--- linux-2.6.32.15/lib/idr.c 2010-03-15 11:52:04.000000000 -0400
50208+++ linux-2.6.32.14/lib/idr.c 2010-05-28 21:27:16.463242745 -0400 50224+++ linux-2.6.32.15/lib/idr.c 2010-05-28 21:27:16.463242745 -0400
50209@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in 50225@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
50210 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; 50226 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
50211 50227
@@ -50215,9 +50231,9 @@ diff -urNp linux-2.6.32.14/lib/idr.c linux-2.6.32.14/lib/idr.c
50215 *starting_id = id; 50231 *starting_id = id;
50216 return IDR_NEED_TO_GROW; 50232 return IDR_NEED_TO_GROW;
50217 } 50233 }
50218diff -urNp linux-2.6.32.14/lib/inflate.c linux-2.6.32.14/lib/inflate.c 50234diff -urNp linux-2.6.32.15/lib/inflate.c linux-2.6.32.15/lib/inflate.c
50219--- linux-2.6.32.14/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400 50235--- linux-2.6.32.15/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400
50220+++ linux-2.6.32.14/lib/inflate.c 2010-05-28 21:27:16.463242745 -0400 50236+++ linux-2.6.32.15/lib/inflate.c 2010-05-28 21:27:16.463242745 -0400
50221@@ -266,7 +266,7 @@ static void free(void *where) 50237@@ -266,7 +266,7 @@ static void free(void *where)
50222 malloc_ptr = free_mem_ptr; 50238 malloc_ptr = free_mem_ptr;
50223 } 50239 }
@@ -50227,9 +50243,9 @@ diff -urNp linux-2.6.32.14/lib/inflate.c linux-2.6.32.14/lib/inflate.c
50227 #define free(a) kfree(a) 50243 #define free(a) kfree(a)
50228 #endif 50244 #endif
50229 50245
50230diff -urNp linux-2.6.32.14/lib/Kconfig.debug linux-2.6.32.14/lib/Kconfig.debug 50246diff -urNp linux-2.6.32.15/lib/Kconfig.debug linux-2.6.32.15/lib/Kconfig.debug
50231--- linux-2.6.32.14/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 50247--- linux-2.6.32.15/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400
50232+++ linux-2.6.32.14/lib/Kconfig.debug 2010-05-28 21:27:16.463242745 -0400 50248+++ linux-2.6.32.15/lib/Kconfig.debug 2010-05-28 21:27:16.463242745 -0400
50233@@ -905,7 +905,7 @@ config LATENCYTOP 50249@@ -905,7 +905,7 @@ config LATENCYTOP
50234 select STACKTRACE 50250 select STACKTRACE
50235 select SCHEDSTATS 50251 select SCHEDSTATS
@@ -50239,9 +50255,9 @@ diff -urNp linux-2.6.32.14/lib/Kconfig.debug linux-2.6.32.14/lib/Kconfig.debug
50239 help 50255 help
50240 Enable this option if you want to use the LatencyTOP tool 50256 Enable this option if you want to use the LatencyTOP tool
50241 to find out which userspace is blocking on what kernel operations. 50257 to find out which userspace is blocking on what kernel operations.
50242diff -urNp linux-2.6.32.14/lib/kobject.c linux-2.6.32.14/lib/kobject.c 50258diff -urNp linux-2.6.32.15/lib/kobject.c linux-2.6.32.15/lib/kobject.c
50243--- linux-2.6.32.14/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400 50259--- linux-2.6.32.15/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400
50244+++ linux-2.6.32.14/lib/kobject.c 2010-05-28 21:27:16.463242745 -0400 50260+++ linux-2.6.32.15/lib/kobject.c 2010-05-28 21:27:16.463242745 -0400
50245@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko 50261@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
50246 return ret; 50262 return ret;
50247 } 50263 }
@@ -50269,9 +50285,9 @@ diff -urNp linux-2.6.32.14/lib/kobject.c linux-2.6.32.14/lib/kobject.c
50269 struct kobject *parent_kobj) 50285 struct kobject *parent_kobj)
50270 { 50286 {
50271 struct kset *kset; 50287 struct kset *kset;
50272diff -urNp linux-2.6.32.14/lib/kobject_uevent.c linux-2.6.32.14/lib/kobject_uevent.c 50288diff -urNp linux-2.6.32.15/lib/kobject_uevent.c linux-2.6.32.15/lib/kobject_uevent.c
50273--- linux-2.6.32.14/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400 50289--- linux-2.6.32.15/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400
50274+++ linux-2.6.32.14/lib/kobject_uevent.c 2010-05-28 21:27:16.463242745 -0400 50290+++ linux-2.6.32.15/lib/kobject_uevent.c 2010-05-28 21:27:16.463242745 -0400
50275@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k 50291@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
50276 const char *subsystem; 50292 const char *subsystem;
50277 struct kobject *top_kobj; 50293 struct kobject *top_kobj;
@@ -50281,9 +50297,9 @@ diff -urNp linux-2.6.32.14/lib/kobject_uevent.c linux-2.6.32.14/lib/kobject_ueve
50281 u64 seq; 50297 u64 seq;
50282 int i = 0; 50298 int i = 0;
50283 int retval = 0; 50299 int retval = 0;
50284diff -urNp linux-2.6.32.14/lib/parser.c linux-2.6.32.14/lib/parser.c 50300diff -urNp linux-2.6.32.15/lib/parser.c linux-2.6.32.15/lib/parser.c
50285--- linux-2.6.32.14/lib/parser.c 2010-03-15 11:52:04.000000000 -0400 50301--- linux-2.6.32.15/lib/parser.c 2010-03-15 11:52:04.000000000 -0400
50286+++ linux-2.6.32.14/lib/parser.c 2010-05-28 21:27:16.463242745 -0400 50302+++ linux-2.6.32.15/lib/parser.c 2010-05-28 21:27:16.463242745 -0400
50287@@ -126,7 +126,7 @@ static int match_number(substring_t *s, 50303@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
50288 char *buf; 50304 char *buf;
50289 int ret; 50305 int ret;
@@ -50293,9 +50309,9 @@ diff -urNp linux-2.6.32.14/lib/parser.c linux-2.6.32.14/lib/parser.c
50293 if (!buf) 50309 if (!buf)
50294 return -ENOMEM; 50310 return -ENOMEM;
50295 memcpy(buf, s->from, s->to - s->from); 50311 memcpy(buf, s->from, s->to - s->from);
50296diff -urNp linux-2.6.32.14/lib/radix-tree.c linux-2.6.32.14/lib/radix-tree.c 50312diff -urNp linux-2.6.32.15/lib/radix-tree.c linux-2.6.32.15/lib/radix-tree.c
50297--- linux-2.6.32.14/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400 50313--- linux-2.6.32.15/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400
50298+++ linux-2.6.32.14/lib/radix-tree.c 2010-05-28 21:27:16.471246042 -0400 50314+++ linux-2.6.32.15/lib/radix-tree.c 2010-05-28 21:27:16.471246042 -0400
50299@@ -81,7 +81,7 @@ struct radix_tree_preload { 50315@@ -81,7 +81,7 @@ struct radix_tree_preload {
50300 int nr; 50316 int nr;
50301 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; 50317 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -50305,9 +50321,9 @@ diff -urNp linux-2.6.32.14/lib/radix-tree.c linux-2.6.32.14/lib/radix-tree.c
50305 50321
50306 static inline gfp_t root_gfp_mask(struct radix_tree_root *root) 50322 static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
50307 { 50323 {
50308diff -urNp linux-2.6.32.14/lib/random32.c linux-2.6.32.14/lib/random32.c 50324diff -urNp linux-2.6.32.15/lib/random32.c linux-2.6.32.15/lib/random32.c
50309--- linux-2.6.32.14/lib/random32.c 2010-03-15 11:52:04.000000000 -0400 50325--- linux-2.6.32.15/lib/random32.c 2010-03-15 11:52:04.000000000 -0400
50310+++ linux-2.6.32.14/lib/random32.c 2010-05-28 21:27:16.471246042 -0400 50326+++ linux-2.6.32.15/lib/random32.c 2010-05-28 21:27:16.471246042 -0400
50311@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * 50327@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
50312 */ 50328 */
50313 static inline u32 __seed(u32 x, u32 m) 50329 static inline u32 __seed(u32 x, u32 m)
@@ -50317,14 +50333,14 @@ diff -urNp linux-2.6.32.14/lib/random32.c linux-2.6.32.14/lib/random32.c
50317 } 50333 }
50318 50334
50319 /** 50335 /**
50320diff -urNp linux-2.6.32.14/localversion-grsec linux-2.6.32.14/localversion-grsec 50336diff -urNp linux-2.6.32.15/localversion-grsec linux-2.6.32.15/localversion-grsec
50321--- linux-2.6.32.14/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 50337--- linux-2.6.32.15/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
50322+++ linux-2.6.32.14/localversion-grsec 2010-05-28 21:27:16.471246042 -0400 50338+++ linux-2.6.32.15/localversion-grsec 2010-05-28 21:27:16.471246042 -0400
50323@@ -0,0 +1 @@ 50339@@ -0,0 +1 @@
50324+-grsec 50340+-grsec
50325diff -urNp linux-2.6.32.14/Makefile linux-2.6.32.14/Makefile 50341diff -urNp linux-2.6.32.15/Makefile linux-2.6.32.15/Makefile
50326--- linux-2.6.32.14/Makefile 2010-05-28 20:16:44.396488303 -0400 50342--- linux-2.6.32.15/Makefile 2010-06-01 15:02:53.005442437 -0400
50327+++ linux-2.6.32.14/Makefile 2010-05-28 21:27:16.474989604 -0400 50343+++ linux-2.6.32.15/Makefile 2010-06-01 15:03:15.405630699 -0400
50328@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" 50344@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
50329 50345
50330 HOSTCC = gcc 50346 HOSTCC = gcc
@@ -50345,9 +50361,9 @@ diff -urNp linux-2.6.32.14/Makefile linux-2.6.32.14/Makefile
50345 50361
50346 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ 50362 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
50347 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ 50363 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
50348diff -urNp linux-2.6.32.14/mm/filemap.c linux-2.6.32.14/mm/filemap.c 50364diff -urNp linux-2.6.32.15/mm/filemap.c linux-2.6.32.15/mm/filemap.c
50349--- linux-2.6.32.14/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400 50365--- linux-2.6.32.15/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400
50350+++ linux-2.6.32.14/mm/filemap.c 2010-05-28 21:27:16.479250347 -0400 50366+++ linux-2.6.32.15/mm/filemap.c 2010-05-28 21:27:16.479250347 -0400
50351@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file 50367@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file
50352 struct address_space *mapping = file->f_mapping; 50368 struct address_space *mapping = file->f_mapping;
50353 50369
@@ -50365,9 +50381,9 @@ diff -urNp linux-2.6.32.14/mm/filemap.c linux-2.6.32.14/mm/filemap.c
50365 if (*pos >= limit) { 50381 if (*pos >= limit) {
50366 send_sig(SIGXFSZ, current, 0); 50382 send_sig(SIGXFSZ, current, 0);
50367 return -EFBIG; 50383 return -EFBIG;
50368diff -urNp linux-2.6.32.14/mm/fremap.c linux-2.6.32.14/mm/fremap.c 50384diff -urNp linux-2.6.32.15/mm/fremap.c linux-2.6.32.15/mm/fremap.c
50369--- linux-2.6.32.14/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400 50385--- linux-2.6.32.15/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400
50370+++ linux-2.6.32.14/mm/fremap.c 2010-05-28 21:27:16.487251224 -0400 50386+++ linux-2.6.32.15/mm/fremap.c 2010-05-28 21:27:16.487251224 -0400
50371@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign 50387@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
50372 retry: 50388 retry:
50373 vma = find_vma(mm, start); 50389 vma = find_vma(mm, start);
@@ -50380,9 +50396,9 @@ diff -urNp linux-2.6.32.14/mm/fremap.c linux-2.6.32.14/mm/fremap.c
50380 /* 50396 /*
50381 * Make sure the vma is shared, that it supports prefaulting, 50397 * Make sure the vma is shared, that it supports prefaulting,
50382 * and that the remapped range is valid and fully within 50398 * and that the remapped range is valid and fully within
50383diff -urNp linux-2.6.32.14/mm/highmem.c linux-2.6.32.14/mm/highmem.c 50399diff -urNp linux-2.6.32.15/mm/highmem.c linux-2.6.32.15/mm/highmem.c
50384--- linux-2.6.32.14/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400 50400--- linux-2.6.32.15/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400
50385+++ linux-2.6.32.14/mm/highmem.c 2010-05-28 21:27:16.487251224 -0400 50401+++ linux-2.6.32.15/mm/highmem.c 2010-05-28 21:27:16.487251224 -0400
50386@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) 50402@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
50387 * So no dangers, even with speculative execution. 50403 * So no dangers, even with speculative execution.
50388 */ 50404 */
@@ -50408,9 +50424,9 @@ diff -urNp linux-2.6.32.14/mm/highmem.c linux-2.6.32.14/mm/highmem.c
50408 pkmap_count[last_pkmap_nr] = 1; 50424 pkmap_count[last_pkmap_nr] = 1;
50409 set_page_address(page, (void *)vaddr); 50425 set_page_address(page, (void *)vaddr);
50410 50426
50411diff -urNp linux-2.6.32.14/mm/hugetlb.c linux-2.6.32.14/mm/hugetlb.c 50427diff -urNp linux-2.6.32.15/mm/hugetlb.c linux-2.6.32.15/mm/hugetlb.c
50412--- linux-2.6.32.14/mm/hugetlb.c 2010-05-28 20:16:44.458924952 -0400 50428--- linux-2.6.32.15/mm/hugetlb.c 2010-05-28 20:16:44.458924952 -0400
50413+++ linux-2.6.32.14/mm/hugetlb.c 2010-05-28 21:27:16.487251224 -0400 50429+++ linux-2.6.32.15/mm/hugetlb.c 2010-05-28 21:27:16.487251224 -0400
50414@@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s 50430@@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s
50415 return 1; 50431 return 1;
50416 } 50432 }
@@ -50490,9 +50506,9 @@ diff -urNp linux-2.6.32.14/mm/hugetlb.c linux-2.6.32.14/mm/hugetlb.c
50490 ptep = huge_pte_alloc(mm, address, huge_page_size(h)); 50506 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
50491 if (!ptep) 50507 if (!ptep)
50492 return VM_FAULT_OOM; 50508 return VM_FAULT_OOM;
50493diff -urNp linux-2.6.32.14/mm/Kconfig linux-2.6.32.14/mm/Kconfig 50509diff -urNp linux-2.6.32.15/mm/Kconfig linux-2.6.32.15/mm/Kconfig
50494--- linux-2.6.32.14/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400 50510--- linux-2.6.32.15/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400
50495+++ linux-2.6.32.14/mm/Kconfig 2010-05-28 21:27:16.487251224 -0400 50511+++ linux-2.6.32.15/mm/Kconfig 2010-05-28 21:27:16.487251224 -0400
50496@@ -228,7 +228,7 @@ config KSM 50512@@ -228,7 +228,7 @@ config KSM
50497 config DEFAULT_MMAP_MIN_ADDR 50513 config DEFAULT_MMAP_MIN_ADDR
50498 int "Low address space to protect from user allocation" 50514 int "Low address space to protect from user allocation"
@@ -50502,9 +50518,9 @@ diff -urNp linux-2.6.32.14/mm/Kconfig linux-2.6.32.14/mm/Kconfig
50502 help 50518 help
50503 This is the portion of low virtual memory which should be protected 50519 This is the portion of low virtual memory which should be protected
50504 from userspace allocation. Keeping a user from writing to low pages 50520 from userspace allocation. Keeping a user from writing to low pages
50505diff -urNp linux-2.6.32.14/mm/maccess.c linux-2.6.32.14/mm/maccess.c 50521diff -urNp linux-2.6.32.15/mm/maccess.c linux-2.6.32.15/mm/maccess.c
50506--- linux-2.6.32.14/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400 50522--- linux-2.6.32.15/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400
50507+++ linux-2.6.32.14/mm/maccess.c 2010-05-28 21:27:16.487251224 -0400 50523+++ linux-2.6.32.15/mm/maccess.c 2010-05-28 21:27:16.487251224 -0400
50508@@ -14,7 +14,7 @@ 50524@@ -14,7 +14,7 @@
50509 * Safely read from address @src to the buffer at @dst. If a kernel fault 50525 * Safely read from address @src to the buffer at @dst. If a kernel fault
50510 * happens, handle that and return -EFAULT. 50526 * happens, handle that and return -EFAULT.
@@ -50523,9 +50539,9 @@ diff -urNp linux-2.6.32.14/mm/maccess.c linux-2.6.32.14/mm/maccess.c
50523 { 50539 {
50524 long ret; 50540 long ret;
50525 mm_segment_t old_fs = get_fs(); 50541 mm_segment_t old_fs = get_fs();
50526diff -urNp linux-2.6.32.14/mm/madvise.c linux-2.6.32.14/mm/madvise.c 50542diff -urNp linux-2.6.32.15/mm/madvise.c linux-2.6.32.15/mm/madvise.c
50527--- linux-2.6.32.14/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400 50543--- linux-2.6.32.15/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400
50528+++ linux-2.6.32.14/mm/madvise.c 2010-05-28 21:27:16.487251224 -0400 50544+++ linux-2.6.32.15/mm/madvise.c 2010-05-28 21:27:16.487251224 -0400
50529@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a 50545@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
50530 pgoff_t pgoff; 50546 pgoff_t pgoff;
50531 unsigned long new_flags = vma->vm_flags; 50547 unsigned long new_flags = vma->vm_flags;
@@ -50602,9 +50618,9 @@ diff -urNp linux-2.6.32.14/mm/madvise.c linux-2.6.32.14/mm/madvise.c
50602 error = 0; 50618 error = 0;
50603 if (end == start) 50619 if (end == start)
50604 goto out; 50620 goto out;
50605diff -urNp linux-2.6.32.14/mm/memory.c linux-2.6.32.14/mm/memory.c 50621diff -urNp linux-2.6.32.15/mm/memory.c linux-2.6.32.15/mm/memory.c
50606--- linux-2.6.32.14/mm/memory.c 2010-03-15 11:52:04.000000000 -0400 50622--- linux-2.6.32.15/mm/memory.c 2010-03-15 11:52:04.000000000 -0400
50607+++ linux-2.6.32.14/mm/memory.c 2010-05-28 21:27:16.487251224 -0400 50623+++ linux-2.6.32.15/mm/memory.c 2010-05-28 21:27:16.487251224 -0400
50608@@ -48,6 +48,7 @@ 50624@@ -48,6 +48,7 @@
50609 #include <linux/ksm.h> 50625 #include <linux/ksm.h>
50610 #include <linux/rmap.h> 50626 #include <linux/rmap.h>
@@ -51009,9 +51025,9 @@ diff -urNp linux-2.6.32.14/mm/memory.c linux-2.6.32.14/mm/memory.c
51009 /* 51025 /*
51010 * Make sure the vDSO gets into every core dump. 51026 * Make sure the vDSO gets into every core dump.
51011 * Dumping its contents makes post-mortem fully interpretable later 51027 * Dumping its contents makes post-mortem fully interpretable later
51012diff -urNp linux-2.6.32.14/mm/memory-failure.c linux-2.6.32.14/mm/memory-failure.c 51028diff -urNp linux-2.6.32.15/mm/memory-failure.c linux-2.6.32.15/mm/memory-failure.c
51013--- linux-2.6.32.14/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400 51029--- linux-2.6.32.15/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400
51014+++ linux-2.6.32.14/mm/memory-failure.c 2010-05-28 21:27:16.487251224 -0400 51030+++ linux-2.6.32.15/mm/memory-failure.c 2010-05-28 21:27:16.487251224 -0400
51015@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r 51031@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
51016 51032
51017 int sysctl_memory_failure_recovery __read_mostly = 1; 51033 int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -51030,9 +51046,9 @@ diff -urNp linux-2.6.32.14/mm/memory-failure.c linux-2.6.32.14/mm/memory-failure
51030 51046
51031 /* 51047 /*
51032 * We need/can do nothing about count=0 pages. 51048 * We need/can do nothing about count=0 pages.
51033diff -urNp linux-2.6.32.14/mm/mempolicy.c linux-2.6.32.14/mm/mempolicy.c 51049diff -urNp linux-2.6.32.15/mm/mempolicy.c linux-2.6.32.15/mm/mempolicy.c
51034--- linux-2.6.32.14/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400 51050--- linux-2.6.32.15/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400
51035+++ linux-2.6.32.14/mm/mempolicy.c 2010-05-28 21:27:16.487251224 -0400 51051+++ linux-2.6.32.15/mm/mempolicy.c 2010-05-28 21:27:16.487251224 -0400
51036@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st 51052@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
51037 struct vm_area_struct *next; 51053 struct vm_area_struct *next;
51038 int err; 51054 int err;
@@ -51113,9 +51129,9 @@ diff -urNp linux-2.6.32.14/mm/mempolicy.c linux-2.6.32.14/mm/mempolicy.c
51113 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { 51129 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
51114 seq_printf(m, " heap"); 51130 seq_printf(m, " heap");
51115 } else if (vma->vm_start <= mm->start_stack && 51131 } else if (vma->vm_start <= mm->start_stack &&
51116diff -urNp linux-2.6.32.14/mm/migrate.c linux-2.6.32.14/mm/migrate.c 51132diff -urNp linux-2.6.32.15/mm/migrate.c linux-2.6.32.15/mm/migrate.c
51117--- linux-2.6.32.14/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400 51133--- linux-2.6.32.15/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400
51118+++ linux-2.6.32.14/mm/migrate.c 2010-05-28 21:27:16.491098771 -0400 51134+++ linux-2.6.32.15/mm/migrate.c 2010-05-28 21:27:16.491098771 -0400
51119@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 51135@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
51120 if (!mm) 51136 if (!mm)
51121 return -EINVAL; 51137 return -EINVAL;
@@ -51141,9 +51157,9 @@ diff -urNp linux-2.6.32.14/mm/migrate.c linux-2.6.32.14/mm/migrate.c
51141 rcu_read_unlock(); 51157 rcu_read_unlock();
51142 err = -EPERM; 51158 err = -EPERM;
51143 goto out; 51159 goto out;
51144diff -urNp linux-2.6.32.14/mm/mlock.c linux-2.6.32.14/mm/mlock.c 51160diff -urNp linux-2.6.32.15/mm/mlock.c linux-2.6.32.15/mm/mlock.c
51145--- linux-2.6.32.14/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400 51161--- linux-2.6.32.15/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400
51146+++ linux-2.6.32.14/mm/mlock.c 2010-05-28 21:27:16.499256346 -0400 51162+++ linux-2.6.32.15/mm/mlock.c 2010-05-28 21:27:16.499256346 -0400
51147@@ -13,6 +13,7 @@ 51163@@ -13,6 +13,7 @@
51148 #include <linux/pagemap.h> 51164 #include <linux/pagemap.h>
51149 #include <linux/mempolicy.h> 51165 #include <linux/mempolicy.h>
@@ -51212,9 +51228,9 @@ diff -urNp linux-2.6.32.14/mm/mlock.c linux-2.6.32.14/mm/mlock.c
51212 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || 51228 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
51213 capable(CAP_IPC_LOCK)) 51229 capable(CAP_IPC_LOCK))
51214 ret = do_mlockall(flags); 51230 ret = do_mlockall(flags);
51215diff -urNp linux-2.6.32.14/mm/mmap.c linux-2.6.32.14/mm/mmap.c 51231diff -urNp linux-2.6.32.15/mm/mmap.c linux-2.6.32.15/mm/mmap.c
51216--- linux-2.6.32.14/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 51232--- linux-2.6.32.15/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
51217+++ linux-2.6.32.14/mm/mmap.c 2010-05-28 21:27:16.502950026 -0400 51233+++ linux-2.6.32.15/mm/mmap.c 2010-05-28 21:27:16.502950026 -0400
51218@@ -45,6 +45,16 @@ 51234@@ -45,6 +45,16 @@
51219 #define arch_rebalance_pgtables(addr, len) (addr) 51235 #define arch_rebalance_pgtables(addr, len) (addr)
51220 #endif 51236 #endif
@@ -52303,9 +52319,9 @@ diff -urNp linux-2.6.32.14/mm/mmap.c linux-2.6.32.14/mm/mmap.c
52303 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; 52319 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
52304 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 52320 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
52305 52321
52306diff -urNp linux-2.6.32.14/mm/mprotect.c linux-2.6.32.14/mm/mprotect.c 52322diff -urNp linux-2.6.32.15/mm/mprotect.c linux-2.6.32.15/mm/mprotect.c
52307--- linux-2.6.32.14/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400 52323--- linux-2.6.32.15/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400
52308+++ linux-2.6.32.14/mm/mprotect.c 2010-05-28 21:27:16.502950026 -0400 52324+++ linux-2.6.32.15/mm/mprotect.c 2010-05-28 21:27:16.502950026 -0400
52309@@ -24,10 +24,16 @@ 52325@@ -24,10 +24,16 @@
52310 #include <linux/mmu_notifier.h> 52326 #include <linux/mmu_notifier.h>
52311 #include <linux/migrate.h> 52327 #include <linux/migrate.h>
@@ -52503,9 +52519,9 @@ diff -urNp linux-2.6.32.14/mm/mprotect.c linux-2.6.32.14/mm/mprotect.c
52503 nstart = tmp; 52519 nstart = tmp;
52504 52520
52505 if (nstart < prev->vm_end) 52521 if (nstart < prev->vm_end)
52506diff -urNp linux-2.6.32.14/mm/mremap.c linux-2.6.32.14/mm/mremap.c 52522diff -urNp linux-2.6.32.15/mm/mremap.c linux-2.6.32.15/mm/mremap.c
52507--- linux-2.6.32.14/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400 52523--- linux-2.6.32.15/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400
52508+++ linux-2.6.32.14/mm/mremap.c 2010-05-28 21:27:16.502950026 -0400 52524+++ linux-2.6.32.15/mm/mremap.c 2010-05-28 21:27:16.502950026 -0400
52509@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str 52525@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
52510 continue; 52526 continue;
52511 pte = ptep_clear_flush(vma, old_addr, old_pte); 52527 pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -52606,9 +52622,9 @@ diff -urNp linux-2.6.32.14/mm/mremap.c linux-2.6.32.14/mm/mremap.c
52606 } 52622 }
52607 out: 52623 out:
52608 if (ret & ~PAGE_MASK) 52624 if (ret & ~PAGE_MASK)
52609diff -urNp linux-2.6.32.14/mm/nommu.c linux-2.6.32.14/mm/nommu.c 52625diff -urNp linux-2.6.32.15/mm/nommu.c linux-2.6.32.15/mm/nommu.c
52610--- linux-2.6.32.14/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400 52626--- linux-2.6.32.15/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400
52611+++ linux-2.6.32.14/mm/nommu.c 2010-05-28 21:27:16.502950026 -0400 52627+++ linux-2.6.32.15/mm/nommu.c 2010-05-28 21:27:16.502950026 -0400
52612@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m 52628@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m
52613 EXPORT_SYMBOL(find_vma); 52629 EXPORT_SYMBOL(find_vma);
52614 52630
@@ -52625,9 +52641,9 @@ diff -urNp linux-2.6.32.14/mm/nommu.c linux-2.6.32.14/mm/nommu.c
52625 * expand a stack to a given address 52641 * expand a stack to a given address
52626 * - not supported under NOMMU conditions 52642 * - not supported under NOMMU conditions
52627 */ 52643 */
52628diff -urNp linux-2.6.32.14/mm/page_alloc.c linux-2.6.32.14/mm/page_alloc.c 52644diff -urNp linux-2.6.32.15/mm/page_alloc.c linux-2.6.32.15/mm/page_alloc.c
52629--- linux-2.6.32.14/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400 52645--- linux-2.6.32.15/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400
52630+++ linux-2.6.32.14/mm/page_alloc.c 2010-05-28 21:27:16.530961628 -0400 52646+++ linux-2.6.32.15/mm/page_alloc.c 2010-05-28 21:27:16.530961628 -0400
52631@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page 52647@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page
52632 int bad = 0; 52648 int bad = 0;
52633 int wasMlocked = __TestClearPageMlocked(page); 52649 int wasMlocked = __TestClearPageMlocked(page);
@@ -52684,9 +52700,9 @@ diff -urNp linux-2.6.32.14/mm/page_alloc.c linux-2.6.32.14/mm/page_alloc.c
52684 struct zone *zone, unsigned long zonesize) {} 52700 struct zone *zone, unsigned long zonesize) {}
52685 #endif /* CONFIG_SPARSEMEM */ 52701 #endif /* CONFIG_SPARSEMEM */
52686 52702
52687diff -urNp linux-2.6.32.14/mm/percpu.c linux-2.6.32.14/mm/percpu.c 52703diff -urNp linux-2.6.32.15/mm/percpu.c linux-2.6.32.15/mm/percpu.c
52688--- linux-2.6.32.14/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400 52704--- linux-2.6.32.15/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400
52689+++ linux-2.6.32.14/mm/percpu.c 2010-05-28 21:27:16.530961628 -0400 52705+++ linux-2.6.32.15/mm/percpu.c 2010-05-28 21:27:16.530961628 -0400
52690@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu 52706@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
52691 static unsigned int pcpu_last_unit_cpu __read_mostly; 52707 static unsigned int pcpu_last_unit_cpu __read_mostly;
52692 52708
@@ -52696,9 +52712,9 @@ diff -urNp linux-2.6.32.14/mm/percpu.c linux-2.6.32.14/mm/percpu.c
52696 EXPORT_SYMBOL_GPL(pcpu_base_addr); 52712 EXPORT_SYMBOL_GPL(pcpu_base_addr);
52697 52713
52698 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ 52714 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
52699diff -urNp linux-2.6.32.14/mm/rmap.c linux-2.6.32.14/mm/rmap.c 52715diff -urNp linux-2.6.32.15/mm/rmap.c linux-2.6.32.15/mm/rmap.c
52700--- linux-2.6.32.14/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400 52716--- linux-2.6.32.15/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400
52701+++ linux-2.6.32.14/mm/rmap.c 2010-05-28 21:27:16.539259032 -0400 52717+++ linux-2.6.32.15/mm/rmap.c 2010-05-28 21:27:16.539259032 -0400
52702@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru 52718@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru
52703 struct mm_struct *mm = vma->vm_mm; 52719 struct mm_struct *mm = vma->vm_mm;
52704 struct anon_vma *allocated; 52720 struct anon_vma *allocated;
@@ -52727,9 +52743,9 @@ diff -urNp linux-2.6.32.14/mm/rmap.c linux-2.6.32.14/mm/rmap.c
52727 vma->anon_vma = anon_vma; 52743 vma->anon_vma = anon_vma;
52728 list_add_tail(&vma->anon_vma_node, &anon_vma->head); 52744 list_add_tail(&vma->anon_vma_node, &anon_vma->head);
52729 allocated = NULL; 52745 allocated = NULL;
52730diff -urNp linux-2.6.32.14/mm/shmem.c linux-2.6.32.14/mm/shmem.c 52746diff -urNp linux-2.6.32.15/mm/shmem.c linux-2.6.32.15/mm/shmem.c
52731--- linux-2.6.32.14/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400 52747--- linux-2.6.32.15/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400
52732+++ linux-2.6.32.14/mm/shmem.c 2010-05-28 21:27:16.543245570 -0400 52748+++ linux-2.6.32.15/mm/shmem.c 2010-05-28 21:27:16.543245570 -0400
52733@@ -31,7 +31,7 @@ 52749@@ -31,7 +31,7 @@
52734 #include <linux/swap.h> 52750 #include <linux/swap.h>
52735 #include <linux/ima.h> 52751 #include <linux/ima.h>
@@ -52739,9 +52755,9 @@ diff -urNp linux-2.6.32.14/mm/shmem.c linux-2.6.32.14/mm/shmem.c
52739 52755
52740 #ifdef CONFIG_SHMEM 52756 #ifdef CONFIG_SHMEM
52741 /* 52757 /*
52742diff -urNp linux-2.6.32.14/mm/slab.c linux-2.6.32.14/mm/slab.c 52758diff -urNp linux-2.6.32.15/mm/slab.c linux-2.6.32.15/mm/slab.c
52743--- linux-2.6.32.14/mm/slab.c 2010-03-15 11:52:04.000000000 -0400 52759--- linux-2.6.32.15/mm/slab.c 2010-03-15 11:52:04.000000000 -0400
52744+++ linux-2.6.32.14/mm/slab.c 2010-05-29 17:19:33.609046968 -0400 52760+++ linux-2.6.32.15/mm/slab.c 2010-05-31 11:16:00.657200601 -0400
52745@@ -308,7 +308,7 @@ struct kmem_list3 { 52761@@ -308,7 +308,7 @@ struct kmem_list3 {
52746 * Need this for bootstrapping a per node allocator. 52762 * Need this for bootstrapping a per node allocator.
52747 */ 52763 */
@@ -52778,7 +52794,7 @@ diff -urNp linux-2.6.32.14/mm/slab.c linux-2.6.32.14/mm/slab.c
52778 52794
52779 /* internal cache of cache description objs */ 52795 /* internal cache of cache description objs */
52780 static struct kmem_cache cache_cache = { 52796 static struct kmem_cache cache_cache = {
52781@@ -4471,15 +4471,63 @@ static const struct file_operations proc 52797@@ -4471,15 +4471,66 @@ static const struct file_operations proc
52782 52798
52783 static int __init slab_proc_init(void) 52799 static int __init slab_proc_init(void)
52784 { 52800 {
@@ -52809,7 +52825,10 @@ diff -urNp linux-2.6.32.14/mm/slab.c linux-2.6.32.14/mm/slab.c
52809+ unsigned int objnr; 52825+ unsigned int objnr;
52810+ unsigned long offset; 52826+ unsigned long offset;
52811+ 52827+
52812+ if (ZERO_OR_NULL_PTR(ptr) && n) 52828+ if (!n)
52829+ return;
52830+
52831+ if (ZERO_OR_NULL_PTR(ptr))
52813+ goto report; 52832+ goto report;
52814+ 52833+
52815+ if (!virt_addr_valid(ptr)) 52834+ if (!virt_addr_valid(ptr))
@@ -52844,9 +52863,9 @@ diff -urNp linux-2.6.32.14/mm/slab.c linux-2.6.32.14/mm/slab.c
52844 /** 52863 /**
52845 * ksize - get the actual amount of memory allocated for a given object 52864 * ksize - get the actual amount of memory allocated for a given object
52846 * @objp: Pointer to the object 52865 * @objp: Pointer to the object
52847diff -urNp linux-2.6.32.14/mm/slob.c linux-2.6.32.14/mm/slob.c 52866diff -urNp linux-2.6.32.15/mm/slob.c linux-2.6.32.15/mm/slob.c
52848--- linux-2.6.32.14/mm/slob.c 2010-03-15 11:52:04.000000000 -0400 52867--- linux-2.6.32.15/mm/slob.c 2010-03-15 11:52:04.000000000 -0400
52849+++ linux-2.6.32.14/mm/slob.c 2010-05-29 17:20:26.289194269 -0400 52868+++ linux-2.6.32.15/mm/slob.c 2010-05-31 11:16:35.308884479 -0400
52850@@ -29,7 +29,7 @@ 52869@@ -29,7 +29,7 @@
52851 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls 52870 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
52852 * alloc_pages() directly, allocating compound pages so the page order 52871 * alloc_pages() directly, allocating compound pages so the page order
@@ -52992,7 +53011,7 @@ diff -urNp linux-2.6.32.14/mm/slob.c linux-2.6.32.14/mm/slob.c
52992 EXPORT_SYMBOL(__kmalloc_node); 53011 EXPORT_SYMBOL(__kmalloc_node);
52993 53012
52994 void kfree(const void *block) 53013 void kfree(const void *block)
52995@@ -528,13 +540,81 @@ void kfree(const void *block) 53014@@ -528,13 +540,84 @@ void kfree(const void *block)
52996 sp = slob_page(block); 53015 sp = slob_page(block);
52997 if (is_slob_page(sp)) { 53016 if (is_slob_page(sp)) {
52998 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); 53017 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
@@ -53018,7 +53037,10 @@ diff -urNp linux-2.6.32.14/mm/slob.c linux-2.6.32.14/mm/slob.c
53018+ const slob_t *free; 53037+ const slob_t *free;
53019+ const void *base; 53038+ const void *base;
53020+ 53039+
53021+ if (ZERO_OR_NULL_PTR(ptr) && n) 53040+ if (!n)
53041+ return;
53042+
53043+ if (ZERO_OR_NULL_PTR(ptr))
53022+ goto report; 53044+ goto report;
53023+ 53045+
53024+ if (!virt_addr_valid(ptr)) 53046+ if (!virt_addr_valid(ptr))
@@ -53077,7 +53099,7 @@ diff -urNp linux-2.6.32.14/mm/slob.c linux-2.6.32.14/mm/slob.c
53077 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */ 53099 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
53078 size_t ksize(const void *block) 53100 size_t ksize(const void *block)
53079 { 53101 {
53080@@ -547,10 +627,10 @@ size_t ksize(const void *block) 53102@@ -547,10 +630,10 @@ size_t ksize(const void *block)
53081 sp = slob_page(block); 53103 sp = slob_page(block);
53082 if (is_slob_page(sp)) { 53104 if (is_slob_page(sp)) {
53083 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); 53105 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
@@ -53091,7 +53113,7 @@ diff -urNp linux-2.6.32.14/mm/slob.c linux-2.6.32.14/mm/slob.c
53091 } 53113 }
53092 EXPORT_SYMBOL(ksize); 53114 EXPORT_SYMBOL(ksize);
53093 53115
53094@@ -605,17 +685,25 @@ void *kmem_cache_alloc_node(struct kmem_ 53116@@ -605,17 +688,25 @@ void *kmem_cache_alloc_node(struct kmem_
53095 { 53117 {
53096 void *b; 53118 void *b;
53097 53119
@@ -53117,7 +53139,7 @@ diff -urNp linux-2.6.32.14/mm/slob.c linux-2.6.32.14/mm/slob.c
53117 53139
53118 if (c->ctor) 53140 if (c->ctor)
53119 c->ctor(b); 53141 c->ctor(b);
53120@@ -627,10 +715,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node); 53142@@ -627,10 +718,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
53121 53143
53122 static void __kmem_cache_free(void *b, int size) 53144 static void __kmem_cache_free(void *b, int size)
53123 { 53145 {
@@ -53136,7 +53158,7 @@ diff -urNp linux-2.6.32.14/mm/slob.c linux-2.6.32.14/mm/slob.c
53136 } 53158 }
53137 53159
53138 static void kmem_rcu_free(struct rcu_head *head) 53160 static void kmem_rcu_free(struct rcu_head *head)
53139@@ -643,15 +737,24 @@ static void kmem_rcu_free(struct rcu_hea 53161@@ -643,15 +740,24 @@ static void kmem_rcu_free(struct rcu_hea
53140 53162
53141 void kmem_cache_free(struct kmem_cache *c, void *b) 53163 void kmem_cache_free(struct kmem_cache *c, void *b)
53142 { 53164 {
@@ -53164,9 +53186,9 @@ diff -urNp linux-2.6.32.14/mm/slob.c linux-2.6.32.14/mm/slob.c
53164 } 53186 }
53165 53187
53166 trace_kmem_cache_free(_RET_IP_, b); 53188 trace_kmem_cache_free(_RET_IP_, b);
53167diff -urNp linux-2.6.32.14/mm/slub.c linux-2.6.32.14/mm/slub.c 53189diff -urNp linux-2.6.32.15/mm/slub.c linux-2.6.32.15/mm/slub.c
53168--- linux-2.6.32.14/mm/slub.c 2010-03-15 11:52:04.000000000 -0400 53190--- linux-2.6.32.15/mm/slub.c 2010-03-15 11:52:04.000000000 -0400
53169+++ linux-2.6.32.14/mm/slub.c 2010-05-29 17:20:09.189015611 -0400 53191+++ linux-2.6.32.15/mm/slub.c 2010-05-31 11:16:21.137686742 -0400
53170@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * 53192@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *
53171 53193
53172 page = virt_to_head_page(x); 53194 page = virt_to_head_page(x);
@@ -53204,7 +53226,7 @@ diff -urNp linux-2.6.32.14/mm/slub.c linux-2.6.32.14/mm/slub.c
53204 list_del(&s->list); 53226 list_del(&s->list);
53205 up_write(&slub_lock); 53227 up_write(&slub_lock);
53206 if (kmem_cache_close(s)) { 53228 if (kmem_cache_close(s)) {
53207@@ -2915,6 +2916,43 @@ void *__kmalloc_node(size_t size, gfp_t 53229@@ -2915,6 +2916,46 @@ void *__kmalloc_node(size_t size, gfp_t
53208 EXPORT_SYMBOL(__kmalloc_node); 53230 EXPORT_SYMBOL(__kmalloc_node);
53209 #endif 53231 #endif
53210 53232
@@ -53216,7 +53238,10 @@ diff -urNp linux-2.6.32.14/mm/slub.c linux-2.6.32.14/mm/slub.c
53216+ struct kmem_cache *s; 53238+ struct kmem_cache *s;
53217+ unsigned long offset; 53239+ unsigned long offset;
53218+ 53240+
53219+ if (ZERO_OR_NULL_PTR(ptr) && n) 53241+ if (!n)
53242+ return;
53243+
53244+ if (ZERO_OR_NULL_PTR(ptr))
53220+ goto report; 53245+ goto report;
53221+ 53246+
53222+ if (!virt_addr_valid(ptr)) 53247+ if (!virt_addr_valid(ptr))
@@ -53248,7 +53273,7 @@ diff -urNp linux-2.6.32.14/mm/slub.c linux-2.6.32.14/mm/slub.c
53248 size_t ksize(const void *object) 53273 size_t ksize(const void *object)
53249 { 53274 {
53250 struct page *page; 53275 struct page *page;
53251@@ -3186,7 +3224,7 @@ void __init kmem_cache_init(void) 53276@@ -3186,7 +3227,7 @@ void __init kmem_cache_init(void)
53252 */ 53277 */
53253 create_kmalloc_cache(&kmalloc_caches[0], "kmem_cache_node", 53278 create_kmalloc_cache(&kmalloc_caches[0], "kmem_cache_node",
53254 sizeof(struct kmem_cache_node), GFP_NOWAIT); 53279 sizeof(struct kmem_cache_node), GFP_NOWAIT);
@@ -53257,7 +53282,7 @@ diff -urNp linux-2.6.32.14/mm/slub.c linux-2.6.32.14/mm/slub.c
53257 caches++; 53282 caches++;
53258 53283
53259 hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI); 53284 hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);
53260@@ -3293,7 +3331,7 @@ static int slab_unmergeable(struct kmem_ 53285@@ -3293,7 +3334,7 @@ static int slab_unmergeable(struct kmem_
53261 /* 53286 /*
53262 * We may have set a slab to be unmergeable during bootstrap. 53287 * We may have set a slab to be unmergeable during bootstrap.
53263 */ 53288 */
@@ -53266,7 +53291,7 @@ diff -urNp linux-2.6.32.14/mm/slub.c linux-2.6.32.14/mm/slub.c
53266 return 1; 53291 return 1;
53267 53292
53268 return 0; 53293 return 0;
53269@@ -3353,7 +3391,7 @@ struct kmem_cache *kmem_cache_create(con 53294@@ -3353,7 +3394,7 @@ struct kmem_cache *kmem_cache_create(con
53270 if (s) { 53295 if (s) {
53271 int cpu; 53296 int cpu;
53272 53297
@@ -53275,7 +53300,7 @@ diff -urNp linux-2.6.32.14/mm/slub.c linux-2.6.32.14/mm/slub.c
53275 /* 53300 /*
53276 * Adjust the object sizes so that we clear 53301 * Adjust the object sizes so that we clear
53277 * the complete object on kzalloc. 53302 * the complete object on kzalloc.
53278@@ -3372,7 +3410,7 @@ struct kmem_cache *kmem_cache_create(con 53303@@ -3372,7 +3413,7 @@ struct kmem_cache *kmem_cache_create(con
53279 53304
53280 if (sysfs_slab_alias(s, name)) { 53305 if (sysfs_slab_alias(s, name)) {
53281 down_write(&slub_lock); 53306 down_write(&slub_lock);
@@ -53284,7 +53309,7 @@ diff -urNp linux-2.6.32.14/mm/slub.c linux-2.6.32.14/mm/slub.c
53284 up_write(&slub_lock); 53309 up_write(&slub_lock);
53285 goto err; 53310 goto err;
53286 } 53311 }
53287@@ -4101,7 +4139,7 @@ SLAB_ATTR_RO(ctor); 53312@@ -4101,7 +4142,7 @@ SLAB_ATTR_RO(ctor);
53288 53313
53289 static ssize_t aliases_show(struct kmem_cache *s, char *buf) 53314 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
53290 { 53315 {
@@ -53293,7 +53318,7 @@ diff -urNp linux-2.6.32.14/mm/slub.c linux-2.6.32.14/mm/slub.c
53293 } 53318 }
53294 SLAB_ATTR_RO(aliases); 53319 SLAB_ATTR_RO(aliases);
53295 53320
53296@@ -4503,7 +4541,7 @@ static void kmem_cache_release(struct ko 53321@@ -4503,7 +4544,7 @@ static void kmem_cache_release(struct ko
53297 kfree(s); 53322 kfree(s);
53298 } 53323 }
53299 53324
@@ -53302,7 +53327,7 @@ diff -urNp linux-2.6.32.14/mm/slub.c linux-2.6.32.14/mm/slub.c
53302 .show = slab_attr_show, 53327 .show = slab_attr_show,
53303 .store = slab_attr_store, 53328 .store = slab_attr_store,
53304 }; 53329 };
53305@@ -4522,7 +4560,7 @@ static int uevent_filter(struct kset *ks 53330@@ -4522,7 +4563,7 @@ static int uevent_filter(struct kset *ks
53306 return 0; 53331 return 0;
53307 } 53332 }
53308 53333
@@ -53311,7 +53336,7 @@ diff -urNp linux-2.6.32.14/mm/slub.c linux-2.6.32.14/mm/slub.c
53311 .filter = uevent_filter, 53336 .filter = uevent_filter,
53312 }; 53337 };
53313 53338
53314@@ -4785,7 +4823,13 @@ static const struct file_operations proc 53339@@ -4785,7 +4826,13 @@ static const struct file_operations proc
53315 53340
53316 static int __init slab_proc_init(void) 53341 static int __init slab_proc_init(void)
53317 { 53342 {
@@ -53326,9 +53351,9 @@ diff -urNp linux-2.6.32.14/mm/slub.c linux-2.6.32.14/mm/slub.c
53326 return 0; 53351 return 0;
53327 } 53352 }
53328 module_init(slab_proc_init); 53353 module_init(slab_proc_init);
53329diff -urNp linux-2.6.32.14/mm/util.c linux-2.6.32.14/mm/util.c 53354diff -urNp linux-2.6.32.15/mm/util.c linux-2.6.32.15/mm/util.c
53330--- linux-2.6.32.14/mm/util.c 2010-03-15 11:52:04.000000000 -0400 53355--- linux-2.6.32.15/mm/util.c 2010-03-15 11:52:04.000000000 -0400
53331+++ linux-2.6.32.14/mm/util.c 2010-05-28 21:27:16.563017088 -0400 53356+++ linux-2.6.32.15/mm/util.c 2010-05-28 21:27:16.563017088 -0400
53332@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); 53357@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
53333 void arch_pick_mmap_layout(struct mm_struct *mm) 53358 void arch_pick_mmap_layout(struct mm_struct *mm)
53334 { 53359 {
@@ -53342,9 +53367,9 @@ diff -urNp linux-2.6.32.14/mm/util.c linux-2.6.32.14/mm/util.c
53342 mm->get_unmapped_area = arch_get_unmapped_area; 53367 mm->get_unmapped_area = arch_get_unmapped_area;
53343 mm->unmap_area = arch_unmap_area; 53368 mm->unmap_area = arch_unmap_area;
53344 } 53369 }
53345diff -urNp linux-2.6.32.14/mm/vmalloc.c linux-2.6.32.14/mm/vmalloc.c 53370diff -urNp linux-2.6.32.15/mm/vmalloc.c linux-2.6.32.15/mm/vmalloc.c
53346--- linux-2.6.32.14/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400 53371--- linux-2.6.32.15/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400
53347+++ linux-2.6.32.14/mm/vmalloc.c 2010-05-28 21:27:16.567244417 -0400 53372+++ linux-2.6.32.15/mm/vmalloc.c 2010-05-28 21:27:16.567244417 -0400
53348@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, 53373@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
53349 53374
53350 pte = pte_offset_kernel(pmd, addr); 53375 pte = pte_offset_kernel(pmd, addr);
@@ -53555,9 +53580,9 @@ diff -urNp linux-2.6.32.14/mm/vmalloc.c linux-2.6.32.14/mm/vmalloc.c
53555 void *vmalloc_32_user(unsigned long size) 53580 void *vmalloc_32_user(unsigned long size)
53556 { 53581 {
53557 struct vm_struct *area; 53582 struct vm_struct *area;
53558diff -urNp linux-2.6.32.14/net/8021q/vlan.c linux-2.6.32.14/net/8021q/vlan.c 53583diff -urNp linux-2.6.32.15/net/8021q/vlan.c linux-2.6.32.15/net/8021q/vlan.c
53559--- linux-2.6.32.14/net/8021q/vlan.c 2010-03-15 11:52:04.000000000 -0400 53584--- linux-2.6.32.15/net/8021q/vlan.c 2010-03-15 11:52:04.000000000 -0400
53560+++ linux-2.6.32.14/net/8021q/vlan.c 2010-05-28 21:27:16.567244417 -0400 53585+++ linux-2.6.32.15/net/8021q/vlan.c 2010-05-28 21:27:16.567244417 -0400
53561@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net 53586@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
53562 err = -EPERM; 53587 err = -EPERM;
53563 if (!capable(CAP_NET_ADMIN)) 53588 if (!capable(CAP_NET_ADMIN))
@@ -53568,9 +53593,9 @@ diff -urNp linux-2.6.32.14/net/8021q/vlan.c linux-2.6.32.14/net/8021q/vlan.c
53568 struct vlan_net *vn; 53593 struct vlan_net *vn;
53569 53594
53570 vn = net_generic(net, vlan_net_id); 53595 vn = net_generic(net, vlan_net_id);
53571diff -urNp linux-2.6.32.14/net/atm/atm_misc.c linux-2.6.32.14/net/atm/atm_misc.c 53596diff -urNp linux-2.6.32.15/net/atm/atm_misc.c linux-2.6.32.15/net/atm/atm_misc.c
53572--- linux-2.6.32.14/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400 53597--- linux-2.6.32.15/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400
53573+++ linux-2.6.32.14/net/atm/atm_misc.c 2010-05-28 21:27:16.567244417 -0400 53598+++ linux-2.6.32.15/net/atm/atm_misc.c 2010-05-28 21:27:16.567244417 -0400
53574@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t 53599@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
53575 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) 53600 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
53576 return 1; 53601 return 1;
@@ -53607,9 +53632,9 @@ diff -urNp linux-2.6.32.14/net/atm/atm_misc.c linux-2.6.32.14/net/atm/atm_misc.c
53607 __SONET_ITEMS 53632 __SONET_ITEMS
53608 #undef __HANDLE_ITEM 53633 #undef __HANDLE_ITEM
53609 } 53634 }
53610diff -urNp linux-2.6.32.14/net/atm/proc.c linux-2.6.32.14/net/atm/proc.c 53635diff -urNp linux-2.6.32.15/net/atm/proc.c linux-2.6.32.15/net/atm/proc.c
53611--- linux-2.6.32.14/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400 53636--- linux-2.6.32.15/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400
53612+++ linux-2.6.32.14/net/atm/proc.c 2010-05-28 21:27:16.567244417 -0400 53637+++ linux-2.6.32.15/net/atm/proc.c 2010-05-28 21:27:16.567244417 -0400
53613@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s 53638@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
53614 const struct k_atm_aal_stats *stats) 53639 const struct k_atm_aal_stats *stats)
53615 { 53640 {
@@ -53623,9 +53648,9 @@ diff -urNp linux-2.6.32.14/net/atm/proc.c linux-2.6.32.14/net/atm/proc.c
53623 } 53648 }
53624 53649
53625 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) 53650 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
53626diff -urNp linux-2.6.32.14/net/atm/resources.c linux-2.6.32.14/net/atm/resources.c 53651diff -urNp linux-2.6.32.15/net/atm/resources.c linux-2.6.32.15/net/atm/resources.c
53627--- linux-2.6.32.14/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400 53652--- linux-2.6.32.15/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400
53628+++ linux-2.6.32.14/net/atm/resources.c 2010-05-28 21:27:16.579274907 -0400 53653+++ linux-2.6.32.15/net/atm/resources.c 2010-05-28 21:27:16.579274907 -0400
53629@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * 53654@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
53630 static void copy_aal_stats(struct k_atm_aal_stats *from, 53655 static void copy_aal_stats(struct k_atm_aal_stats *from,
53631 struct atm_aal_stats *to) 53656 struct atm_aal_stats *to)
@@ -53644,9 +53669,9 @@ diff -urNp linux-2.6.32.14/net/atm/resources.c linux-2.6.32.14/net/atm/resources
53644 __AAL_STAT_ITEMS 53669 __AAL_STAT_ITEMS
53645 #undef __HANDLE_ITEM 53670 #undef __HANDLE_ITEM
53646 } 53671 }
53647diff -urNp linux-2.6.32.14/net/bridge/br_private.h linux-2.6.32.14/net/bridge/br_private.h 53672diff -urNp linux-2.6.32.15/net/bridge/br_private.h linux-2.6.32.15/net/bridge/br_private.h
53648--- linux-2.6.32.14/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400 53673--- linux-2.6.32.15/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400
53649+++ linux-2.6.32.14/net/bridge/br_private.h 2010-05-28 21:27:16.579274907 -0400 53674+++ linux-2.6.32.15/net/bridge/br_private.h 2010-05-28 21:27:16.579274907 -0400
53650@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, 53675@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
53651 53676
53652 #ifdef CONFIG_SYSFS 53677 #ifdef CONFIG_SYSFS
@@ -53656,9 +53681,9 @@ diff -urNp linux-2.6.32.14/net/bridge/br_private.h linux-2.6.32.14/net/bridge/br
53656 extern int br_sysfs_addif(struct net_bridge_port *p); 53681 extern int br_sysfs_addif(struct net_bridge_port *p);
53657 53682
53658 /* br_sysfs_br.c */ 53683 /* br_sysfs_br.c */
53659diff -urNp linux-2.6.32.14/net/bridge/br_stp_if.c linux-2.6.32.14/net/bridge/br_stp_if.c 53684diff -urNp linux-2.6.32.15/net/bridge/br_stp_if.c linux-2.6.32.15/net/bridge/br_stp_if.c
53660--- linux-2.6.32.14/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400 53685--- linux-2.6.32.15/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400
53661+++ linux-2.6.32.14/net/bridge/br_stp_if.c 2010-05-28 21:27:16.579274907 -0400 53686+++ linux-2.6.32.15/net/bridge/br_stp_if.c 2010-05-28 21:27:16.579274907 -0400
53662@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg 53687@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
53663 char *envp[] = { NULL }; 53688 char *envp[] = { NULL };
53664 53689
@@ -53668,9 +53693,9 @@ diff -urNp linux-2.6.32.14/net/bridge/br_stp_if.c linux-2.6.32.14/net/bridge/br_
53668 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", 53693 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
53669 br->dev->name, r); 53694 br->dev->name, r);
53670 53695
53671diff -urNp linux-2.6.32.14/net/bridge/br_sysfs_if.c linux-2.6.32.14/net/bridge/br_sysfs_if.c 53696diff -urNp linux-2.6.32.15/net/bridge/br_sysfs_if.c linux-2.6.32.15/net/bridge/br_sysfs_if.c
53672--- linux-2.6.32.14/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400 53697--- linux-2.6.32.15/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400
53673+++ linux-2.6.32.14/net/bridge/br_sysfs_if.c 2010-05-28 21:27:16.579274907 -0400 53698+++ linux-2.6.32.15/net/bridge/br_sysfs_if.c 2010-05-28 21:27:16.579274907 -0400
53674@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje 53699@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
53675 return ret; 53700 return ret;
53676 } 53701 }
@@ -53680,9 +53705,9 @@ diff -urNp linux-2.6.32.14/net/bridge/br_sysfs_if.c linux-2.6.32.14/net/bridge/b
53680 .show = brport_show, 53705 .show = brport_show,
53681 .store = brport_store, 53706 .store = brport_store,
53682 }; 53707 };
53683diff -urNp linux-2.6.32.14/net/core/dev.c linux-2.6.32.14/net/core/dev.c 53708diff -urNp linux-2.6.32.15/net/core/dev.c linux-2.6.32.15/net/core/dev.c
53684--- linux-2.6.32.14/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400 53709--- linux-2.6.32.15/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400
53685+++ linux-2.6.32.14/net/core/dev.c 2010-05-28 21:27:16.595266161 -0400 53710+++ linux-2.6.32.15/net/core/dev.c 2010-05-28 21:27:16.595266161 -0400
53686@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) 53711@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb)
53687 } 53712 }
53688 EXPORT_SYMBOL(netif_rx_ni); 53713 EXPORT_SYMBOL(netif_rx_ni);
@@ -53701,9 +53726,9 @@ diff -urNp linux-2.6.32.14/net/core/dev.c linux-2.6.32.14/net/core/dev.c
53701 { 53726 {
53702 struct list_head *list = &__get_cpu_var(softnet_data).poll_list; 53727 struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
53703 unsigned long time_limit = jiffies + 2; 53728 unsigned long time_limit = jiffies + 2;
53704diff -urNp linux-2.6.32.14/net/core/flow.c linux-2.6.32.14/net/core/flow.c 53729diff -urNp linux-2.6.32.15/net/core/flow.c linux-2.6.32.15/net/core/flow.c
53705--- linux-2.6.32.14/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400 53730--- linux-2.6.32.15/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400
53706+++ linux-2.6.32.14/net/core/flow.c 2010-05-28 21:27:16.595266161 -0400 53731+++ linux-2.6.32.15/net/core/flow.c 2010-05-28 21:27:16.595266161 -0400
53707@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( 53732@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
53708 53733
53709 static u32 flow_hash_shift; 53734 static u32 flow_hash_shift;
@@ -53731,9 +53756,9 @@ diff -urNp linux-2.6.32.14/net/core/flow.c linux-2.6.32.14/net/core/flow.c
53731 53756
53732 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) 53757 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
53733 53758
53734diff -urNp linux-2.6.32.14/net/dccp/ccids/ccid3.c linux-2.6.32.14/net/dccp/ccids/ccid3.c 53759diff -urNp linux-2.6.32.15/net/dccp/ccids/ccid3.c linux-2.6.32.15/net/dccp/ccids/ccid3.c
53735--- linux-2.6.32.14/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400 53760--- linux-2.6.32.15/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400
53736+++ linux-2.6.32.14/net/dccp/ccids/ccid3.c 2010-05-28 21:27:16.595266161 -0400 53761+++ linux-2.6.32.15/net/dccp/ccids/ccid3.c 2010-05-28 21:27:16.595266161 -0400
53737@@ -41,7 +41,7 @@ 53762@@ -41,7 +41,7 @@
53738 static int ccid3_debug; 53763 static int ccid3_debug;
53739 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) 53764 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -53743,9 +53768,9 @@ diff -urNp linux-2.6.32.14/net/dccp/ccids/ccid3.c linux-2.6.32.14/net/dccp/ccids
53743 #endif 53768 #endif
53744 53769
53745 /* 53770 /*
53746diff -urNp linux-2.6.32.14/net/dccp/dccp.h linux-2.6.32.14/net/dccp/dccp.h 53771diff -urNp linux-2.6.32.15/net/dccp/dccp.h linux-2.6.32.15/net/dccp/dccp.h
53747--- linux-2.6.32.14/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400 53772--- linux-2.6.32.15/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400
53748+++ linux-2.6.32.14/net/dccp/dccp.h 2010-05-28 21:27:16.595266161 -0400 53773+++ linux-2.6.32.15/net/dccp/dccp.h 2010-05-28 21:27:16.595266161 -0400
53749@@ -44,9 +44,9 @@ extern int dccp_debug; 53774@@ -44,9 +44,9 @@ extern int dccp_debug;
53750 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) 53775 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
53751 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) 53776 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -53759,9 +53784,9 @@ diff -urNp linux-2.6.32.14/net/dccp/dccp.h linux-2.6.32.14/net/dccp/dccp.h
53759 #endif 53784 #endif
53760 53785
53761 extern struct inet_hashinfo dccp_hashinfo; 53786 extern struct inet_hashinfo dccp_hashinfo;
53762diff -urNp linux-2.6.32.14/net/decnet/sysctl_net_decnet.c linux-2.6.32.14/net/decnet/sysctl_net_decnet.c 53787diff -urNp linux-2.6.32.15/net/decnet/sysctl_net_decnet.c linux-2.6.32.15/net/decnet/sysctl_net_decnet.c
53763--- linux-2.6.32.14/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400 53788--- linux-2.6.32.15/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400
53764+++ linux-2.6.32.14/net/decnet/sysctl_net_decnet.c 2010-05-28 21:27:16.595266161 -0400 53789+++ linux-2.6.32.15/net/decnet/sysctl_net_decnet.c 2010-05-28 21:27:16.595266161 -0400
53765@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t 53790@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
53766 53791
53767 if (len > *lenp) len = *lenp; 53792 if (len > *lenp) len = *lenp;
@@ -53780,9 +53805,9 @@ diff -urNp linux-2.6.32.14/net/decnet/sysctl_net_decnet.c linux-2.6.32.14/net/de
53780 return -EFAULT; 53805 return -EFAULT;
53781 53806
53782 *lenp = len; 53807 *lenp = len;
53783diff -urNp linux-2.6.32.14/net/ipv4/inet_hashtables.c linux-2.6.32.14/net/ipv4/inet_hashtables.c 53808diff -urNp linux-2.6.32.15/net/ipv4/inet_hashtables.c linux-2.6.32.15/net/ipv4/inet_hashtables.c
53784--- linux-2.6.32.14/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400 53809--- linux-2.6.32.15/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400
53785+++ linux-2.6.32.14/net/ipv4/inet_hashtables.c 2010-05-28 21:27:16.600259316 -0400 53810+++ linux-2.6.32.15/net/ipv4/inet_hashtables.c 2010-05-28 21:27:16.600259316 -0400
53786@@ -18,11 +18,14 @@ 53811@@ -18,11 +18,14 @@
53787 #include <linux/sched.h> 53812 #include <linux/sched.h>
53788 #include <linux/slab.h> 53813 #include <linux/slab.h>
@@ -53807,9 +53832,9 @@ diff -urNp linux-2.6.32.14/net/ipv4/inet_hashtables.c linux-2.6.32.14/net/ipv4/i
53807 if (tw) { 53832 if (tw) {
53808 inet_twsk_deschedule(tw, death_row); 53833 inet_twsk_deschedule(tw, death_row);
53809 inet_twsk_put(tw); 53834 inet_twsk_put(tw);
53810diff -urNp linux-2.6.32.14/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.14/net/ipv4/netfilter/nf_nat_snmp_basic.c 53835diff -urNp linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c
53811--- linux-2.6.32.14/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400 53836--- linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400
53812+++ linux-2.6.32.14/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-05-28 21:27:16.600259316 -0400 53837+++ linux-2.6.32.15/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-05-28 21:27:16.600259316 -0400
53813@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( 53838@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
53814 53839
53815 *len = 0; 53840 *len = 0;
@@ -53819,9 +53844,9 @@ diff -urNp linux-2.6.32.14/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.1
53819 if (*octets == NULL) { 53844 if (*octets == NULL) {
53820 if (net_ratelimit()) 53845 if (net_ratelimit())
53821 printk("OOM in bsalg (%d)\n", __LINE__); 53846 printk("OOM in bsalg (%d)\n", __LINE__);
53822diff -urNp linux-2.6.32.14/net/ipv4/tcp_ipv4.c linux-2.6.32.14/net/ipv4/tcp_ipv4.c 53847diff -urNp linux-2.6.32.15/net/ipv4/tcp_ipv4.c linux-2.6.32.15/net/ipv4/tcp_ipv4.c
53823--- linux-2.6.32.14/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400 53848--- linux-2.6.32.15/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400
53824+++ linux-2.6.32.14/net/ipv4/tcp_ipv4.c 2010-05-28 21:27:16.600259316 -0400 53849+++ linux-2.6.32.15/net/ipv4/tcp_ipv4.c 2010-05-28 21:27:16.600259316 -0400
53825@@ -84,6 +84,9 @@ 53850@@ -84,6 +84,9 @@
53826 int sysctl_tcp_tw_reuse __read_mostly; 53851 int sysctl_tcp_tw_reuse __read_mostly;
53827 int sysctl_tcp_low_latency __read_mostly; 53852 int sysctl_tcp_low_latency __read_mostly;
@@ -53866,9 +53891,9 @@ diff -urNp linux-2.6.32.14/net/ipv4/tcp_ipv4.c linux-2.6.32.14/net/ipv4/tcp_ipv4
53866 tcp_v4_send_reset(NULL, skb); 53891 tcp_v4_send_reset(NULL, skb);
53867 } 53892 }
53868 53893
53869diff -urNp linux-2.6.32.14/net/ipv4/tcp_minisocks.c linux-2.6.32.14/net/ipv4/tcp_minisocks.c 53894diff -urNp linux-2.6.32.15/net/ipv4/tcp_minisocks.c linux-2.6.32.15/net/ipv4/tcp_minisocks.c
53870--- linux-2.6.32.14/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400 53895--- linux-2.6.32.15/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400
53871+++ linux-2.6.32.14/net/ipv4/tcp_minisocks.c 2010-05-28 21:27:16.600259316 -0400 53896+++ linux-2.6.32.15/net/ipv4/tcp_minisocks.c 2010-05-28 21:27:16.600259316 -0400
53872@@ -26,6 +26,10 @@ 53897@@ -26,6 +26,10 @@
53873 #include <net/inet_common.h> 53898 #include <net/inet_common.h>
53874 #include <net/xfrm.h> 53899 #include <net/xfrm.h>
@@ -53891,9 +53916,9 @@ diff -urNp linux-2.6.32.14/net/ipv4/tcp_minisocks.c linux-2.6.32.14/net/ipv4/tcp
53891 if (!(flg & TCP_FLAG_RST)) 53916 if (!(flg & TCP_FLAG_RST))
53892 req->rsk_ops->send_reset(sk, skb); 53917 req->rsk_ops->send_reset(sk, skb);
53893 53918
53894diff -urNp linux-2.6.32.14/net/ipv4/tcp_probe.c linux-2.6.32.14/net/ipv4/tcp_probe.c 53919diff -urNp linux-2.6.32.15/net/ipv4/tcp_probe.c linux-2.6.32.15/net/ipv4/tcp_probe.c
53895--- linux-2.6.32.14/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400 53920--- linux-2.6.32.15/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400
53896+++ linux-2.6.32.14/net/ipv4/tcp_probe.c 2010-05-28 21:27:16.600259316 -0400 53921+++ linux-2.6.32.15/net/ipv4/tcp_probe.c 2010-05-28 21:27:16.600259316 -0400
53897@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file 53922@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
53898 if (cnt + width >= len) 53923 if (cnt + width >= len)
53899 break; 53924 break;
@@ -53903,9 +53928,9 @@ diff -urNp linux-2.6.32.14/net/ipv4/tcp_probe.c linux-2.6.32.14/net/ipv4/tcp_pro
53903 return -EFAULT; 53928 return -EFAULT;
53904 cnt += width; 53929 cnt += width;
53905 } 53930 }
53906diff -urNp linux-2.6.32.14/net/ipv4/tcp_timer.c linux-2.6.32.14/net/ipv4/tcp_timer.c 53931diff -urNp linux-2.6.32.15/net/ipv4/tcp_timer.c linux-2.6.32.15/net/ipv4/tcp_timer.c
53907--- linux-2.6.32.14/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400 53932--- linux-2.6.32.15/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400
53908+++ linux-2.6.32.14/net/ipv4/tcp_timer.c 2010-05-28 21:27:16.600259316 -0400 53933+++ linux-2.6.32.15/net/ipv4/tcp_timer.c 2010-05-28 21:27:16.600259316 -0400
53909@@ -21,6 +21,10 @@ 53934@@ -21,6 +21,10 @@
53910 #include <linux/module.h> 53935 #include <linux/module.h>
53911 #include <net/tcp.h> 53936 #include <net/tcp.h>
@@ -53931,9 +53956,9 @@ diff -urNp linux-2.6.32.14/net/ipv4/tcp_timer.c linux-2.6.32.14/net/ipv4/tcp_tim
53931 if (retransmits_timed_out(sk, retry_until)) { 53956 if (retransmits_timed_out(sk, retry_until)) {
53932 /* Has it gone just too far? */ 53957 /* Has it gone just too far? */
53933 tcp_write_err(sk); 53958 tcp_write_err(sk);
53934diff -urNp linux-2.6.32.14/net/ipv4/udp.c linux-2.6.32.14/net/ipv4/udp.c 53959diff -urNp linux-2.6.32.15/net/ipv4/udp.c linux-2.6.32.15/net/ipv4/udp.c
53935--- linux-2.6.32.14/net/ipv4/udp.c 2010-05-28 20:16:44.458924952 -0400 53960--- linux-2.6.32.15/net/ipv4/udp.c 2010-05-28 20:16:44.458924952 -0400
53936+++ linux-2.6.32.14/net/ipv4/udp.c 2010-05-28 21:27:16.624385427 -0400 53961+++ linux-2.6.32.15/net/ipv4/udp.c 2010-05-28 21:27:16.624385427 -0400
53937@@ -86,6 +86,7 @@ 53962@@ -86,6 +86,7 @@
53938 #include <linux/types.h> 53963 #include <linux/types.h>
53939 #include <linux/fcntl.h> 53964 #include <linux/fcntl.h>
@@ -54003,9 +54028,9 @@ diff -urNp linux-2.6.32.14/net/ipv4/udp.c linux-2.6.32.14/net/ipv4/udp.c
54003 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); 54028 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
54004 54029
54005 /* 54030 /*
54006diff -urNp linux-2.6.32.14/net/ipv6/exthdrs.c linux-2.6.32.14/net/ipv6/exthdrs.c 54031diff -urNp linux-2.6.32.15/net/ipv6/exthdrs.c linux-2.6.32.15/net/ipv6/exthdrs.c
54007--- linux-2.6.32.14/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400 54032--- linux-2.6.32.15/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400
54008+++ linux-2.6.32.14/net/ipv6/exthdrs.c 2010-05-28 21:27:16.624385427 -0400 54033+++ linux-2.6.32.15/net/ipv6/exthdrs.c 2010-05-28 21:27:16.624385427 -0400
54009@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt 54034@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
54010 .type = IPV6_TLV_JUMBO, 54035 .type = IPV6_TLV_JUMBO,
54011 .func = ipv6_hop_jumbo, 54036 .func = ipv6_hop_jumbo,
@@ -54015,9 +54040,9 @@ diff -urNp linux-2.6.32.14/net/ipv6/exthdrs.c linux-2.6.32.14/net/ipv6/exthdrs.c
54015 }; 54040 };
54016 54041
54017 int ipv6_parse_hopopts(struct sk_buff *skb) 54042 int ipv6_parse_hopopts(struct sk_buff *skb)
54018diff -urNp linux-2.6.32.14/net/ipv6/raw.c linux-2.6.32.14/net/ipv6/raw.c 54043diff -urNp linux-2.6.32.15/net/ipv6/raw.c linux-2.6.32.15/net/ipv6/raw.c
54019--- linux-2.6.32.14/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400 54044--- linux-2.6.32.15/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400
54020+++ linux-2.6.32.14/net/ipv6/raw.c 2010-05-28 21:27:16.624385427 -0400 54045+++ linux-2.6.32.15/net/ipv6/raw.c 2010-05-28 21:27:16.624385427 -0400
54021@@ -600,7 +600,7 @@ out: 54046@@ -600,7 +600,7 @@ out:
54022 return err; 54047 return err;
54023 } 54048 }
@@ -54027,9 +54052,9 @@ diff -urNp linux-2.6.32.14/net/ipv6/raw.c linux-2.6.32.14/net/ipv6/raw.c
54027 struct flowi *fl, struct rt6_info *rt, 54052 struct flowi *fl, struct rt6_info *rt,
54028 unsigned int flags) 54053 unsigned int flags)
54029 { 54054 {
54030diff -urNp linux-2.6.32.14/net/ipv6/tcp_ipv6.c linux-2.6.32.14/net/ipv6/tcp_ipv6.c 54055diff -urNp linux-2.6.32.15/net/ipv6/tcp_ipv6.c linux-2.6.32.15/net/ipv6/tcp_ipv6.c
54031--- linux-2.6.32.14/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400 54056--- linux-2.6.32.15/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400
54032+++ linux-2.6.32.14/net/ipv6/tcp_ipv6.c 2010-05-28 21:27:16.624385427 -0400 54057+++ linux-2.6.32.15/net/ipv6/tcp_ipv6.c 2010-05-28 21:27:16.624385427 -0400
54033@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk 54058@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk
54034 return 0; 54059 return 0;
54035 54060
@@ -54050,9 +54075,9 @@ diff -urNp linux-2.6.32.14/net/ipv6/tcp_ipv6.c linux-2.6.32.14/net/ipv6/tcp_ipv6
54050 tcp_v6_send_reset(NULL, skb); 54075 tcp_v6_send_reset(NULL, skb);
54051 } 54076 }
54052 54077
54053diff -urNp linux-2.6.32.14/net/ipv6/udp.c linux-2.6.32.14/net/ipv6/udp.c 54078diff -urNp linux-2.6.32.15/net/ipv6/udp.c linux-2.6.32.15/net/ipv6/udp.c
54054--- linux-2.6.32.14/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400 54079--- linux-2.6.32.15/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400
54055+++ linux-2.6.32.14/net/ipv6/udp.c 2010-05-28 21:27:16.631258014 -0400 54080+++ linux-2.6.32.15/net/ipv6/udp.c 2010-05-28 21:27:16.631258014 -0400
54056@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, 54081@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb,
54057 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, 54082 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
54058 proto == IPPROTO_UDPLITE); 54083 proto == IPPROTO_UDPLITE);
@@ -54063,9 +54088,9 @@ diff -urNp linux-2.6.32.14/net/ipv6/udp.c linux-2.6.32.14/net/ipv6/udp.c
54063 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); 54088 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
54064 54089
54065 kfree_skb(skb); 54090 kfree_skb(skb);
54066diff -urNp linux-2.6.32.14/net/irda/ircomm/ircomm_tty.c linux-2.6.32.14/net/irda/ircomm/ircomm_tty.c 54091diff -urNp linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c
54067--- linux-2.6.32.14/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400 54092--- linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400
54068+++ linux-2.6.32.14/net/irda/ircomm/ircomm_tty.c 2010-05-28 21:27:16.634961077 -0400 54093+++ linux-2.6.32.15/net/irda/ircomm/ircomm_tty.c 2010-05-28 21:27:16.634961077 -0400
54069@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st 54094@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
54070 add_wait_queue(&self->open_wait, &wait); 54095 add_wait_queue(&self->open_wait, &wait);
54071 54096
@@ -54188,9 +54213,9 @@ diff -urNp linux-2.6.32.14/net/irda/ircomm/ircomm_tty.c linux-2.6.32.14/net/irda
54188 seq_printf(m, "Max data size: %d\n", self->max_data_size); 54213 seq_printf(m, "Max data size: %d\n", self->max_data_size);
54189 seq_printf(m, "Max header size: %d\n", self->max_header_size); 54214 seq_printf(m, "Max header size: %d\n", self->max_header_size);
54190 54215
54191diff -urNp linux-2.6.32.14/net/mac80211/ieee80211_i.h linux-2.6.32.14/net/mac80211/ieee80211_i.h 54216diff -urNp linux-2.6.32.15/net/mac80211/ieee80211_i.h linux-2.6.32.15/net/mac80211/ieee80211_i.h
54192--- linux-2.6.32.14/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400 54217--- linux-2.6.32.15/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400
54193+++ linux-2.6.32.14/net/mac80211/ieee80211_i.h 2010-05-28 21:27:16.639255900 -0400 54218+++ linux-2.6.32.15/net/mac80211/ieee80211_i.h 2010-05-28 21:27:16.639255900 -0400
54194@@ -635,7 +635,7 @@ struct ieee80211_local { 54219@@ -635,7 +635,7 @@ struct ieee80211_local {
54195 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ 54220 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
54196 spinlock_t queue_stop_reason_lock; 54221 spinlock_t queue_stop_reason_lock;
@@ -54200,9 +54225,9 @@ diff -urNp linux-2.6.32.14/net/mac80211/ieee80211_i.h linux-2.6.32.14/net/mac802
54200 int monitors, cooked_mntrs; 54225 int monitors, cooked_mntrs;
54201 /* number of interfaces with corresponding FIF_ flags */ 54226 /* number of interfaces with corresponding FIF_ flags */
54202 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; 54227 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
54203diff -urNp linux-2.6.32.14/net/mac80211/iface.c linux-2.6.32.14/net/mac80211/iface.c 54228diff -urNp linux-2.6.32.15/net/mac80211/iface.c linux-2.6.32.15/net/mac80211/iface.c
54204--- linux-2.6.32.14/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400 54229--- linux-2.6.32.15/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400
54205+++ linux-2.6.32.14/net/mac80211/iface.c 2010-05-28 21:27:16.650898496 -0400 54230+++ linux-2.6.32.15/net/mac80211/iface.c 2010-05-28 21:27:16.650898496 -0400
54206@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev 54231@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
54207 break; 54232 break;
54208 } 54233 }
@@ -54257,9 +54282,9 @@ diff -urNp linux-2.6.32.14/net/mac80211/iface.c linux-2.6.32.14/net/mac80211/ifa
54257 ieee80211_clear_tx_pending(local); 54282 ieee80211_clear_tx_pending(local);
54258 ieee80211_stop_device(local); 54283 ieee80211_stop_device(local);
54259 54284
54260diff -urNp linux-2.6.32.14/net/mac80211/main.c linux-2.6.32.14/net/mac80211/main.c 54285diff -urNp linux-2.6.32.15/net/mac80211/main.c linux-2.6.32.15/net/mac80211/main.c
54261--- linux-2.6.32.14/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400 54286--- linux-2.6.32.15/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400
54262+++ linux-2.6.32.14/net/mac80211/main.c 2010-05-28 21:27:16.650898496 -0400 54287+++ linux-2.6.32.15/net/mac80211/main.c 2010-05-28 21:27:16.650898496 -0400
54263@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 54288@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
54264 local->hw.conf.power_level = power; 54289 local->hw.conf.power_level = power;
54265 } 54290 }
@@ -54269,9 +54294,9 @@ diff -urNp linux-2.6.32.14/net/mac80211/main.c linux-2.6.32.14/net/mac80211/main
54269 ret = drv_config(local, changed); 54294 ret = drv_config(local, changed);
54270 /* 54295 /*
54271 * Goal: 54296 * Goal:
54272diff -urNp linux-2.6.32.14/net/mac80211/pm.c linux-2.6.32.14/net/mac80211/pm.c 54297diff -urNp linux-2.6.32.15/net/mac80211/pm.c linux-2.6.32.15/net/mac80211/pm.c
54273--- linux-2.6.32.14/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400 54298--- linux-2.6.32.15/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400
54274+++ linux-2.6.32.14/net/mac80211/pm.c 2010-05-28 21:27:16.650898496 -0400 54299+++ linux-2.6.32.15/net/mac80211/pm.c 2010-05-28 21:27:16.650898496 -0400
54275@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 54300@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
54276 } 54301 }
54277 54302
@@ -54281,9 +54306,9 @@ diff -urNp linux-2.6.32.14/net/mac80211/pm.c linux-2.6.32.14/net/mac80211/pm.c
54281 ieee80211_stop_device(local); 54306 ieee80211_stop_device(local);
54282 54307
54283 local->suspended = true; 54308 local->suspended = true;
54284diff -urNp linux-2.6.32.14/net/mac80211/rate.c linux-2.6.32.14/net/mac80211/rate.c 54309diff -urNp linux-2.6.32.15/net/mac80211/rate.c linux-2.6.32.15/net/mac80211/rate.c
54285--- linux-2.6.32.14/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400 54310--- linux-2.6.32.15/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400
54286+++ linux-2.6.32.14/net/mac80211/rate.c 2010-05-28 21:27:16.650898496 -0400 54311+++ linux-2.6.32.15/net/mac80211/rate.c 2010-05-28 21:27:16.650898496 -0400
54287@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct 54312@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
54288 struct rate_control_ref *ref, *old; 54313 struct rate_control_ref *ref, *old;
54289 54314
@@ -54293,9 +54318,9 @@ diff -urNp linux-2.6.32.14/net/mac80211/rate.c linux-2.6.32.14/net/mac80211/rate
54293 return -EBUSY; 54318 return -EBUSY;
54294 54319
54295 ref = rate_control_alloc(name, local); 54320 ref = rate_control_alloc(name, local);
54296diff -urNp linux-2.6.32.14/net/mac80211/tx.c linux-2.6.32.14/net/mac80211/tx.c 54321diff -urNp linux-2.6.32.15/net/mac80211/tx.c linux-2.6.32.15/net/mac80211/tx.c
54297--- linux-2.6.32.14/net/mac80211/tx.c 2010-04-29 17:49:38.690617032 -0400 54322--- linux-2.6.32.15/net/mac80211/tx.c 2010-04-29 17:49:38.690617032 -0400
54298+++ linux-2.6.32.14/net/mac80211/tx.c 2010-05-28 21:27:16.655282610 -0400 54323+++ linux-2.6.32.15/net/mac80211/tx.c 2010-05-28 21:27:16.655282610 -0400
54299@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct 54324@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
54300 return cpu_to_le16(dur); 54325 return cpu_to_le16(dur);
54301 } 54326 }
@@ -54305,9 +54330,9 @@ diff -urNp linux-2.6.32.14/net/mac80211/tx.c linux-2.6.32.14/net/mac80211/tx.c
54305 struct net_device *dev) 54330 struct net_device *dev)
54306 { 54331 {
54307 return local == wdev_priv(dev->ieee80211_ptr); 54332 return local == wdev_priv(dev->ieee80211_ptr);
54308diff -urNp linux-2.6.32.14/net/mac80211/util.c linux-2.6.32.14/net/mac80211/util.c 54333diff -urNp linux-2.6.32.15/net/mac80211/util.c linux-2.6.32.15/net/mac80211/util.c
54309--- linux-2.6.32.14/net/mac80211/util.c 2010-04-29 17:49:38.690617032 -0400 54334--- linux-2.6.32.15/net/mac80211/util.c 2010-04-29 17:49:38.690617032 -0400
54310+++ linux-2.6.32.14/net/mac80211/util.c 2010-05-28 21:27:16.655282610 -0400 54335+++ linux-2.6.32.15/net/mac80211/util.c 2010-05-28 21:27:16.655282610 -0400
54311@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ 54336@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_
54312 local->resuming = true; 54337 local->resuming = true;
54313 54338
@@ -54325,9 +54350,9 @@ diff -urNp linux-2.6.32.14/net/mac80211/util.c linux-2.6.32.14/net/mac80211/util
54325 if (res) { 54350 if (res) {
54326 WARN(local->suspended, "Harware became unavailable " 54351 WARN(local->suspended, "Harware became unavailable "
54327 "upon resume. This is could be a software issue" 54352 "upon resume. This is could be a software issue"
54328diff -urNp linux-2.6.32.14/net/sctp/socket.c linux-2.6.32.14/net/sctp/socket.c 54353diff -urNp linux-2.6.32.15/net/sctp/socket.c linux-2.6.32.15/net/sctp/socket.c
54329--- linux-2.6.32.14/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400 54354--- linux-2.6.32.15/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400
54330+++ linux-2.6.32.14/net/sctp/socket.c 2010-05-28 21:27:16.667233121 -0400 54355+++ linux-2.6.32.15/net/sctp/socket.c 2010-05-28 21:27:16.667233121 -0400
54331@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc 54356@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
54332 struct sctp_sndrcvinfo *sinfo; 54357 struct sctp_sndrcvinfo *sinfo;
54333 struct sctp_initmsg *sinit; 54358 struct sctp_initmsg *sinit;
@@ -54345,9 +54370,9 @@ diff -urNp linux-2.6.32.14/net/sctp/socket.c linux-2.6.32.14/net/sctp/socket.c
54345 54370
54346 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); 54371 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
54347 if (pp->fastreuse && sk->sk_reuse && 54372 if (pp->fastreuse && sk->sk_reuse &&
54348diff -urNp linux-2.6.32.14/net/socket.c linux-2.6.32.14/net/socket.c 54373diff -urNp linux-2.6.32.15/net/socket.c linux-2.6.32.15/net/socket.c
54349--- linux-2.6.32.14/net/socket.c 2010-03-15 11:52:04.000000000 -0400 54374--- linux-2.6.32.15/net/socket.c 2010-03-15 11:52:04.000000000 -0400
54350+++ linux-2.6.32.14/net/socket.c 2010-05-28 21:27:16.671255671 -0400 54375+++ linux-2.6.32.15/net/socket.c 2010-05-28 21:27:16.671255671 -0400
54351@@ -87,6 +87,7 @@ 54376@@ -87,6 +87,7 @@
54352 #include <linux/wireless.h> 54377 #include <linux/wireless.h>
54353 #include <linux/nsproxy.h> 54378 #include <linux/nsproxy.h>
@@ -54502,9 +54527,9 @@ diff -urNp linux-2.6.32.14/net/socket.c linux-2.6.32.14/net/socket.c
54502 err = 54527 err =
54503 security_socket_connect(sock, (struct sockaddr *)&address, addrlen); 54528 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
54504 if (err) 54529 if (err)
54505diff -urNp linux-2.6.32.14/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.14/net/sunrpc/xprtrdma/svc_rdma.c 54530diff -urNp linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c
54506--- linux-2.6.32.14/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400 54531--- linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400
54507+++ linux-2.6.32.14/net/sunrpc/xprtrdma/svc_rdma.c 2010-05-28 21:27:16.671255671 -0400 54532+++ linux-2.6.32.15/net/sunrpc/xprtrdma/svc_rdma.c 2010-05-28 21:27:16.671255671 -0400
54508@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta 54533@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
54509 len -= *ppos; 54534 len -= *ppos;
54510 if (len > *lenp) 54535 if (len > *lenp)
@@ -54514,9 +54539,9 @@ diff -urNp linux-2.6.32.14/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.14/net/su
54514 return -EFAULT; 54539 return -EFAULT;
54515 *lenp = len; 54540 *lenp = len;
54516 *ppos += len; 54541 *ppos += len;
54517diff -urNp linux-2.6.32.14/net/sysctl_net.c linux-2.6.32.14/net/sysctl_net.c 54542diff -urNp linux-2.6.32.15/net/sysctl_net.c linux-2.6.32.15/net/sysctl_net.c
54518--- linux-2.6.32.14/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400 54543--- linux-2.6.32.15/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400
54519+++ linux-2.6.32.14/net/sysctl_net.c 2010-05-28 21:27:16.674940896 -0400 54544+++ linux-2.6.32.15/net/sysctl_net.c 2010-05-28 21:27:16.674940896 -0400
54520@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct 54545@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
54521 struct ctl_table *table) 54546 struct ctl_table *table)
54522 { 54547 {
@@ -54526,9 +54551,9 @@ diff -urNp linux-2.6.32.14/net/sysctl_net.c linux-2.6.32.14/net/sysctl_net.c
54526 int mode = (table->mode >> 6) & 7; 54551 int mode = (table->mode >> 6) & 7;
54527 return (mode << 6) | (mode << 3) | mode; 54552 return (mode << 6) | (mode << 3) | mode;
54528 } 54553 }
54529diff -urNp linux-2.6.32.14/net/tipc/socket.c linux-2.6.32.14/net/tipc/socket.c 54554diff -urNp linux-2.6.32.15/net/tipc/socket.c linux-2.6.32.15/net/tipc/socket.c
54530--- linux-2.6.32.14/net/tipc/socket.c 2010-03-15 11:52:04.000000000 -0400 54555--- linux-2.6.32.15/net/tipc/socket.c 2010-03-15 11:52:04.000000000 -0400
54531+++ linux-2.6.32.14/net/tipc/socket.c 2010-05-28 21:27:16.683249187 -0400 54556+++ linux-2.6.32.15/net/tipc/socket.c 2010-05-28 21:27:16.683249187 -0400
54532@@ -1449,8 +1449,9 @@ static int connect(struct socket *sock, 54557@@ -1449,8 +1449,9 @@ static int connect(struct socket *sock,
54533 } else { 54558 } else {
54534 if (res == 0) 54559 if (res == 0)
@@ -54541,9 +54566,9 @@ diff -urNp linux-2.6.32.14/net/tipc/socket.c linux-2.6.32.14/net/tipc/socket.c
54541 sock->state = SS_DISCONNECTING; 54566 sock->state = SS_DISCONNECTING;
54542 } 54567 }
54543 54568
54544diff -urNp linux-2.6.32.14/net/unix/af_unix.c linux-2.6.32.14/net/unix/af_unix.c 54569diff -urNp linux-2.6.32.15/net/unix/af_unix.c linux-2.6.32.15/net/unix/af_unix.c
54545--- linux-2.6.32.14/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400 54570--- linux-2.6.32.15/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400
54546+++ linux-2.6.32.14/net/unix/af_unix.c 2010-05-28 21:27:16.686916709 -0400 54571+++ linux-2.6.32.15/net/unix/af_unix.c 2010-05-28 21:27:16.686916709 -0400
54547@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru 54572@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru
54548 err = -ECONNREFUSED; 54573 err = -ECONNREFUSED;
54549 if (!S_ISSOCK(inode->i_mode)) 54574 if (!S_ISSOCK(inode->i_mode))
@@ -54601,9 +54626,9 @@ diff -urNp linux-2.6.32.14/net/unix/af_unix.c linux-2.6.32.14/net/unix/af_unix.c
54601 list = &unix_socket_table[addr->hash]; 54626 list = &unix_socket_table[addr->hash];
54602 } else { 54627 } else {
54603 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; 54628 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
54604diff -urNp linux-2.6.32.14/net/wireless/wext.c linux-2.6.32.14/net/wireless/wext.c 54629diff -urNp linux-2.6.32.15/net/wireless/wext.c linux-2.6.32.15/net/wireless/wext.c
54605--- linux-2.6.32.14/net/wireless/wext.c 2010-03-15 11:52:04.000000000 -0400 54630--- linux-2.6.32.15/net/wireless/wext.c 2010-03-15 11:52:04.000000000 -0400
54606+++ linux-2.6.32.14/net/wireless/wext.c 2010-05-28 21:27:16.686916709 -0400 54631+++ linux-2.6.32.15/net/wireless/wext.c 2010-05-28 21:27:16.686916709 -0400
54607@@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc 54632@@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc
54608 */ 54633 */
54609 54634
@@ -54614,9 +54639,9 @@ diff -urNp linux-2.6.32.14/net/wireless/wext.c linux-2.6.32.14/net/wireless/wext
54614 /* Allow userspace to GET more than max so 54639 /* Allow userspace to GET more than max so
54615 * we can support any size GET requests. 54640 * we can support any size GET requests.
54616 * There is still a limit : -ENOMEM. 54641 * There is still a limit : -ENOMEM.
54617diff -urNp linux-2.6.32.14/net/xfrm/xfrm_policy.c linux-2.6.32.14/net/xfrm/xfrm_policy.c 54642diff -urNp linux-2.6.32.15/net/xfrm/xfrm_policy.c linux-2.6.32.15/net/xfrm/xfrm_policy.c
54618--- linux-2.6.32.14/net/xfrm/xfrm_policy.c 2010-03-15 11:52:04.000000000 -0400 54643--- linux-2.6.32.15/net/xfrm/xfrm_policy.c 2010-03-15 11:52:04.000000000 -0400
54619+++ linux-2.6.32.14/net/xfrm/xfrm_policy.c 2010-05-28 21:27:16.686916709 -0400 54644+++ linux-2.6.32.15/net/xfrm/xfrm_policy.c 2010-05-28 21:27:16.686916709 -0400
54620@@ -1477,7 +1477,7 @@ free_dst: 54645@@ -1477,7 +1477,7 @@ free_dst:
54621 goto out; 54646 goto out;
54622 } 54647 }
@@ -54644,9 +54669,9 @@ diff -urNp linux-2.6.32.14/net/xfrm/xfrm_policy.c linux-2.6.32.14/net/xfrm/xfrm_
54644 xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) 54669 xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
54645 { 54670 {
54646 #ifdef CONFIG_XFRM_SUB_POLICY 54671 #ifdef CONFIG_XFRM_SUB_POLICY
54647diff -urNp linux-2.6.32.14/samples/kobject/kset-example.c linux-2.6.32.14/samples/kobject/kset-example.c 54672diff -urNp linux-2.6.32.15/samples/kobject/kset-example.c linux-2.6.32.15/samples/kobject/kset-example.c
54648--- linux-2.6.32.14/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400 54673--- linux-2.6.32.15/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400
54649+++ linux-2.6.32.14/samples/kobject/kset-example.c 2010-05-28 21:27:16.686916709 -0400 54674+++ linux-2.6.32.15/samples/kobject/kset-example.c 2010-05-28 21:27:16.686916709 -0400
54650@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob 54675@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
54651 } 54676 }
54652 54677
@@ -54656,9 +54681,9 @@ diff -urNp linux-2.6.32.14/samples/kobject/kset-example.c linux-2.6.32.14/sample
54656 .show = foo_attr_show, 54681 .show = foo_attr_show,
54657 .store = foo_attr_store, 54682 .store = foo_attr_store,
54658 }; 54683 };
54659diff -urNp linux-2.6.32.14/scripts/basic/fixdep.c linux-2.6.32.14/scripts/basic/fixdep.c 54684diff -urNp linux-2.6.32.15/scripts/basic/fixdep.c linux-2.6.32.15/scripts/basic/fixdep.c
54660--- linux-2.6.32.14/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400 54685--- linux-2.6.32.15/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400
54661+++ linux-2.6.32.14/scripts/basic/fixdep.c 2010-05-28 21:27:16.686916709 -0400 54686+++ linux-2.6.32.15/scripts/basic/fixdep.c 2010-05-28 21:27:16.686916709 -0400
54662@@ -222,9 +222,9 @@ static void use_config(char *m, int slen 54687@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
54663 54688
54664 static void parse_config_file(char *map, size_t len) 54689 static void parse_config_file(char *map, size_t len)
@@ -54680,9 +54705,9 @@ diff -urNp linux-2.6.32.14/scripts/basic/fixdep.c linux-2.6.32.14/scripts/basic/
54680 54705
54681 if (*p != INT_CONF) { 54706 if (*p != INT_CONF) {
54682 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", 54707 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
54683diff -urNp linux-2.6.32.14/scripts/kallsyms.c linux-2.6.32.14/scripts/kallsyms.c 54708diff -urNp linux-2.6.32.15/scripts/kallsyms.c linux-2.6.32.15/scripts/kallsyms.c
54684--- linux-2.6.32.14/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 54709--- linux-2.6.32.15/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400
54685+++ linux-2.6.32.14/scripts/kallsyms.c 2010-05-28 21:27:16.686916709 -0400 54710+++ linux-2.6.32.15/scripts/kallsyms.c 2010-05-28 21:27:16.686916709 -0400
54686@@ -43,10 +43,10 @@ struct text_range { 54711@@ -43,10 +43,10 @@ struct text_range {
54687 54712
54688 static unsigned long long _text; 54713 static unsigned long long _text;
@@ -54698,9 +54723,9 @@ diff -urNp linux-2.6.32.14/scripts/kallsyms.c linux-2.6.32.14/scripts/kallsyms.c
54698 }; 54723 };
54699 #define text_range_text (&text_ranges[0]) 54724 #define text_range_text (&text_ranges[0])
54700 #define text_range_inittext (&text_ranges[1]) 54725 #define text_range_inittext (&text_ranges[1])
54701diff -urNp linux-2.6.32.14/scripts/mod/file2alias.c linux-2.6.32.14/scripts/mod/file2alias.c 54726diff -urNp linux-2.6.32.15/scripts/mod/file2alias.c linux-2.6.32.15/scripts/mod/file2alias.c
54702--- linux-2.6.32.14/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400 54727--- linux-2.6.32.15/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400
54703+++ linux-2.6.32.14/scripts/mod/file2alias.c 2010-05-28 21:27:16.686916709 -0400 54728+++ linux-2.6.32.15/scripts/mod/file2alias.c 2010-05-28 21:27:16.686916709 -0400
54704@@ -72,7 +72,7 @@ static void device_id_check(const char * 54729@@ -72,7 +72,7 @@ static void device_id_check(const char *
54705 unsigned long size, unsigned long id_size, 54730 unsigned long size, unsigned long id_size,
54706 void *symval) 54731 void *symval)
@@ -54755,9 +54780,9 @@ diff -urNp linux-2.6.32.14/scripts/mod/file2alias.c linux-2.6.32.14/scripts/mod/
54755 54780
54756 sprintf(alias, "dmi*"); 54781 sprintf(alias, "dmi*");
54757 54782
54758diff -urNp linux-2.6.32.14/scripts/mod/modpost.c linux-2.6.32.14/scripts/mod/modpost.c 54783diff -urNp linux-2.6.32.15/scripts/mod/modpost.c linux-2.6.32.15/scripts/mod/modpost.c
54759--- linux-2.6.32.14/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400 54784--- linux-2.6.32.15/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400
54760+++ linux-2.6.32.14/scripts/mod/modpost.c 2010-05-28 21:27:16.694974041 -0400 54785+++ linux-2.6.32.15/scripts/mod/modpost.c 2010-05-28 21:27:16.694974041 -0400
54761@@ -835,6 +835,7 @@ enum mismatch { 54786@@ -835,6 +835,7 @@ enum mismatch {
54762 INIT_TO_EXIT, 54787 INIT_TO_EXIT,
54763 EXIT_TO_INIT, 54788 EXIT_TO_INIT,
@@ -54825,9 +54850,9 @@ diff -urNp linux-2.6.32.14/scripts/mod/modpost.c linux-2.6.32.14/scripts/mod/mod
54825 goto close_write; 54850 goto close_write;
54826 54851
54827 tmp = NOFAIL(malloc(b->pos)); 54852 tmp = NOFAIL(malloc(b->pos));
54828diff -urNp linux-2.6.32.14/scripts/mod/modpost.h linux-2.6.32.14/scripts/mod/modpost.h 54853diff -urNp linux-2.6.32.15/scripts/mod/modpost.h linux-2.6.32.15/scripts/mod/modpost.h
54829--- linux-2.6.32.14/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400 54854--- linux-2.6.32.15/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400
54830+++ linux-2.6.32.14/scripts/mod/modpost.h 2010-05-28 21:27:16.694974041 -0400 54855+++ linux-2.6.32.15/scripts/mod/modpost.h 2010-05-28 21:27:16.694974041 -0400
54831@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e 54856@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
54832 54857
54833 struct buffer { 54858 struct buffer {
@@ -54847,9 +54872,9 @@ diff -urNp linux-2.6.32.14/scripts/mod/modpost.h linux-2.6.32.14/scripts/mod/mod
54847 54872
54848 struct module { 54873 struct module {
54849 struct module *next; 54874 struct module *next;
54850diff -urNp linux-2.6.32.14/scripts/mod/sumversion.c linux-2.6.32.14/scripts/mod/sumversion.c 54875diff -urNp linux-2.6.32.15/scripts/mod/sumversion.c linux-2.6.32.15/scripts/mod/sumversion.c
54851--- linux-2.6.32.14/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400 54876--- linux-2.6.32.15/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400
54852+++ linux-2.6.32.14/scripts/mod/sumversion.c 2010-05-28 21:27:16.694974041 -0400 54877+++ linux-2.6.32.15/scripts/mod/sumversion.c 2010-05-28 21:27:16.694974041 -0400
54853@@ -455,7 +455,7 @@ static void write_version(const char *fi 54878@@ -455,7 +455,7 @@ static void write_version(const char *fi
54854 goto out; 54879 goto out;
54855 } 54880 }
@@ -54859,9 +54884,9 @@ diff -urNp linux-2.6.32.14/scripts/mod/sumversion.c linux-2.6.32.14/scripts/mod/
54859 warn("writing sum in %s failed: %s\n", 54884 warn("writing sum in %s failed: %s\n",
54860 filename, strerror(errno)); 54885 filename, strerror(errno));
54861 goto out; 54886 goto out;
54862diff -urNp linux-2.6.32.14/scripts/pnmtologo.c linux-2.6.32.14/scripts/pnmtologo.c 54887diff -urNp linux-2.6.32.15/scripts/pnmtologo.c linux-2.6.32.15/scripts/pnmtologo.c
54863--- linux-2.6.32.14/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400 54888--- linux-2.6.32.15/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400
54864+++ linux-2.6.32.14/scripts/pnmtologo.c 2010-05-28 21:27:16.694974041 -0400 54889+++ linux-2.6.32.15/scripts/pnmtologo.c 2010-05-28 21:27:16.694974041 -0400
54865@@ -237,14 +237,14 @@ static void write_header(void) 54890@@ -237,14 +237,14 @@ static void write_header(void)
54866 fprintf(out, " * Linux logo %s\n", logoname); 54891 fprintf(out, " * Linux logo %s\n", logoname);
54867 fputs(" */\n\n", out); 54892 fputs(" */\n\n", out);
@@ -54888,9 +54913,9 @@ diff -urNp linux-2.6.32.14/scripts/pnmtologo.c linux-2.6.32.14/scripts/pnmtologo
54888 logoname); 54913 logoname);
54889 write_hex_cnt = 0; 54914 write_hex_cnt = 0;
54890 for (i = 0; i < logo_clutsize; i++) { 54915 for (i = 0; i < logo_clutsize; i++) {
54891diff -urNp linux-2.6.32.14/security/commoncap.c linux-2.6.32.14/security/commoncap.c 54916diff -urNp linux-2.6.32.15/security/commoncap.c linux-2.6.32.15/security/commoncap.c
54892--- linux-2.6.32.14/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400 54917--- linux-2.6.32.15/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400
54893+++ linux-2.6.32.14/security/commoncap.c 2010-05-28 21:27:16.694974041 -0400 54918+++ linux-2.6.32.15/security/commoncap.c 2010-05-28 21:27:16.694974041 -0400
54894@@ -27,7 +27,7 @@ 54919@@ -27,7 +27,7 @@
54895 #include <linux/sched.h> 54920 #include <linux/sched.h>
54896 #include <linux/prctl.h> 54921 #include <linux/prctl.h>
@@ -54913,9 +54938,9 @@ diff -urNp linux-2.6.32.14/security/commoncap.c linux-2.6.32.14/security/commonc
54913 return 0; 54938 return 0;
54914 } 54939 }
54915 54940
54916diff -urNp linux-2.6.32.14/security/integrity/ima/ima_api.c linux-2.6.32.14/security/integrity/ima/ima_api.c 54941diff -urNp linux-2.6.32.15/security/integrity/ima/ima_api.c linux-2.6.32.15/security/integrity/ima/ima_api.c
54917--- linux-2.6.32.14/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400 54942--- linux-2.6.32.15/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400
54918+++ linux-2.6.32.14/security/integrity/ima/ima_api.c 2010-05-28 21:27:16.694974041 -0400 54943+++ linux-2.6.32.15/security/integrity/ima/ima_api.c 2010-05-28 21:27:16.694974041 -0400
54919@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino 54944@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
54920 int result; 54945 int result;
54921 54946
@@ -54925,9 +54950,9 @@ diff -urNp linux-2.6.32.14/security/integrity/ima/ima_api.c linux-2.6.32.14/secu
54925 54950
54926 entry = kmalloc(sizeof(*entry), GFP_KERNEL); 54951 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
54927 if (!entry) { 54952 if (!entry) {
54928diff -urNp linux-2.6.32.14/security/integrity/ima/ima_fs.c linux-2.6.32.14/security/integrity/ima/ima_fs.c 54953diff -urNp linux-2.6.32.15/security/integrity/ima/ima_fs.c linux-2.6.32.15/security/integrity/ima/ima_fs.c
54929--- linux-2.6.32.14/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400 54954--- linux-2.6.32.15/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400
54930+++ linux-2.6.32.14/security/integrity/ima/ima_fs.c 2010-05-28 21:27:16.694974041 -0400 54955+++ linux-2.6.32.15/security/integrity/ima/ima_fs.c 2010-05-28 21:27:16.694974041 -0400
54931@@ -27,12 +27,12 @@ 54956@@ -27,12 +27,12 @@
54932 static int valid_policy = 1; 54957 static int valid_policy = 1;
54933 #define TMPBUFLEN 12 54958 #define TMPBUFLEN 12
@@ -54943,9 +54968,9 @@ diff -urNp linux-2.6.32.14/security/integrity/ima/ima_fs.c linux-2.6.32.14/secur
54943 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); 54968 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
54944 } 54969 }
54945 54970
54946diff -urNp linux-2.6.32.14/security/integrity/ima/ima.h linux-2.6.32.14/security/integrity/ima/ima.h 54971diff -urNp linux-2.6.32.15/security/integrity/ima/ima.h linux-2.6.32.15/security/integrity/ima/ima.h
54947--- linux-2.6.32.14/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400 54972--- linux-2.6.32.15/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400
54948+++ linux-2.6.32.14/security/integrity/ima/ima.h 2010-05-28 21:27:16.694974041 -0400 54973+++ linux-2.6.32.15/security/integrity/ima/ima.h 2010-05-28 21:27:16.694974041 -0400
54949@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino 54974@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
54950 extern spinlock_t ima_queue_lock; 54975 extern spinlock_t ima_queue_lock;
54951 54976
@@ -54957,9 +54982,9 @@ diff -urNp linux-2.6.32.14/security/integrity/ima/ima.h linux-2.6.32.14/security
54957 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; 54982 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
54958 }; 54983 };
54959 extern struct ima_h_table ima_htable; 54984 extern struct ima_h_table ima_htable;
54960diff -urNp linux-2.6.32.14/security/integrity/ima/ima_queue.c linux-2.6.32.14/security/integrity/ima/ima_queue.c 54985diff -urNp linux-2.6.32.15/security/integrity/ima/ima_queue.c linux-2.6.32.15/security/integrity/ima/ima_queue.c
54961--- linux-2.6.32.14/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400 54986--- linux-2.6.32.15/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400
54962+++ linux-2.6.32.14/security/integrity/ima/ima_queue.c 2010-05-28 21:27:16.694974041 -0400 54987+++ linux-2.6.32.15/security/integrity/ima/ima_queue.c 2010-05-28 21:27:16.694974041 -0400
54963@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i 54988@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
54964 INIT_LIST_HEAD(&qe->later); 54989 INIT_LIST_HEAD(&qe->later);
54965 list_add_tail_rcu(&qe->later, &ima_measurements); 54990 list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -54969,9 +54994,9 @@ diff -urNp linux-2.6.32.14/security/integrity/ima/ima_queue.c linux-2.6.32.14/se
54969 key = ima_hash_key(entry->digest); 54994 key = ima_hash_key(entry->digest);
54970 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); 54995 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
54971 return 0; 54996 return 0;
54972diff -urNp linux-2.6.32.14/security/Kconfig linux-2.6.32.14/security/Kconfig 54997diff -urNp linux-2.6.32.15/security/Kconfig linux-2.6.32.15/security/Kconfig
54973--- linux-2.6.32.14/security/Kconfig 2010-03-15 11:52:04.000000000 -0400 54998--- linux-2.6.32.15/security/Kconfig 2010-03-15 11:52:04.000000000 -0400
54974+++ linux-2.6.32.14/security/Kconfig 2010-05-28 21:27:16.694974041 -0400 54999+++ linux-2.6.32.15/security/Kconfig 2010-05-28 21:27:16.694974041 -0400
54975@@ -4,6 +4,499 @@ 55000@@ -4,6 +4,499 @@
54976 55001
54977 menu "Security options" 55002 menu "Security options"
@@ -55274,7 +55299,7 @@ diff -urNp linux-2.6.32.14/security/Kconfig linux-2.6.32.14/security/Kconfig
55274+config PAX_KERNEXEC 55299+config PAX_KERNEXEC
55275+ bool "Enforce non-executable kernel pages" 55300+ bool "Enforce non-executable kernel pages"
55276+ depends on PAX_NOEXEC && (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN 55301+ depends on PAX_NOEXEC && (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN
55277+ select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE) 55302+ select PAX_PER_CPU_PGD if X86_64
55278+ help 55303+ help
55279+ This is the kernel land equivalent of PAGEEXEC and MPROTECT, 55304+ This is the kernel land equivalent of PAGEEXEC and MPROTECT,
55280+ that is, enabling this option will make it harder to inject 55305+ that is, enabling this option will make it harder to inject
@@ -55481,9 +55506,9 @@ diff -urNp linux-2.6.32.14/security/Kconfig linux-2.6.32.14/security/Kconfig
55481 help 55506 help
55482 This is the portion of low virtual memory which should be protected 55507 This is the portion of low virtual memory which should be protected
55483 from userspace allocation. Keeping a user from writing to low pages 55508 from userspace allocation. Keeping a user from writing to low pages
55484diff -urNp linux-2.6.32.14/security/min_addr.c linux-2.6.32.14/security/min_addr.c 55509diff -urNp linux-2.6.32.15/security/min_addr.c linux-2.6.32.15/security/min_addr.c
55485--- linux-2.6.32.14/security/min_addr.c 2010-05-28 20:16:44.458924952 -0400 55510--- linux-2.6.32.15/security/min_addr.c 2010-05-28 20:16:44.458924952 -0400
55486+++ linux-2.6.32.14/security/min_addr.c 2010-05-28 21:27:16.694974041 -0400 55511+++ linux-2.6.32.15/security/min_addr.c 2010-05-28 21:27:16.694974041 -0400
55487@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG 55512@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
55488 */ 55513 */
55489 static void update_mmap_min_addr(void) 55514 static void update_mmap_min_addr(void)
@@ -55500,9 +55525,9 @@ diff -urNp linux-2.6.32.14/security/min_addr.c linux-2.6.32.14/security/min_addr
55500 } 55525 }
55501 55526
55502 /* 55527 /*
55503diff -urNp linux-2.6.32.14/sound/aoa/codecs/onyx.c linux-2.6.32.14/sound/aoa/codecs/onyx.c 55528diff -urNp linux-2.6.32.15/sound/aoa/codecs/onyx.c linux-2.6.32.15/sound/aoa/codecs/onyx.c
55504--- linux-2.6.32.14/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400 55529--- linux-2.6.32.15/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400
55505+++ linux-2.6.32.14/sound/aoa/codecs/onyx.c 2010-05-28 21:27:16.694974041 -0400 55530+++ linux-2.6.32.15/sound/aoa/codecs/onyx.c 2010-05-28 21:27:16.694974041 -0400
55506@@ -53,7 +53,7 @@ struct onyx { 55531@@ -53,7 +53,7 @@ struct onyx {
55507 spdif_locked:1, 55532 spdif_locked:1,
55508 analog_locked:1, 55533 analog_locked:1,
@@ -55531,9 +55556,9 @@ diff -urNp linux-2.6.32.14/sound/aoa/codecs/onyx.c linux-2.6.32.14/sound/aoa/cod
55531 onyx->spdif_locked = onyx->analog_locked = 0; 55556 onyx->spdif_locked = onyx->analog_locked = 0;
55532 mutex_unlock(&onyx->mutex); 55557 mutex_unlock(&onyx->mutex);
55533 55558
55534diff -urNp linux-2.6.32.14/sound/core/oss/pcm_oss.c linux-2.6.32.14/sound/core/oss/pcm_oss.c 55559diff -urNp linux-2.6.32.15/sound/core/oss/pcm_oss.c linux-2.6.32.15/sound/core/oss/pcm_oss.c
55535--- linux-2.6.32.14/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400 55560--- linux-2.6.32.15/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400
55536+++ linux-2.6.32.14/sound/core/oss/pcm_oss.c 2010-05-28 21:27:16.698950213 -0400 55561+++ linux-2.6.32.15/sound/core/oss/pcm_oss.c 2010-05-28 21:27:16.698950213 -0400
55537@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct 55562@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
55538 } 55563 }
55539 } 55564 }
@@ -55545,9 +55570,9 @@ diff -urNp linux-2.6.32.14/sound/core/oss/pcm_oss.c linux-2.6.32.14/sound/core/o
55545 #endif /* CONFIG_SND_VERBOSE_PROCFS */ 55570 #endif /* CONFIG_SND_VERBOSE_PROCFS */
55546 55571
55547 /* 55572 /*
55548diff -urNp linux-2.6.32.14/sound/core/seq/seq_lock.h linux-2.6.32.14/sound/core/seq/seq_lock.h 55573diff -urNp linux-2.6.32.15/sound/core/seq/seq_lock.h linux-2.6.32.15/sound/core/seq/seq_lock.h
55549--- linux-2.6.32.14/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400 55574--- linux-2.6.32.15/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400
55550+++ linux-2.6.32.14/sound/core/seq/seq_lock.h 2010-05-28 21:27:16.698950213 -0400 55575+++ linux-2.6.32.15/sound/core/seq/seq_lock.h 2010-05-28 21:27:16.698950213 -0400
55551@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo 55576@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
55552 #else /* SMP || CONFIG_SND_DEBUG */ 55577 #else /* SMP || CONFIG_SND_DEBUG */
55553 55578
@@ -55563,9 +55588,9 @@ diff -urNp linux-2.6.32.14/sound/core/seq/seq_lock.h linux-2.6.32.14/sound/core/
55563 55588
55564 #endif /* SMP || CONFIG_SND_DEBUG */ 55589 #endif /* SMP || CONFIG_SND_DEBUG */
55565 55590
55566diff -urNp linux-2.6.32.14/sound/drivers/mts64.c linux-2.6.32.14/sound/drivers/mts64.c 55591diff -urNp linux-2.6.32.15/sound/drivers/mts64.c linux-2.6.32.15/sound/drivers/mts64.c
55567--- linux-2.6.32.14/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400 55592--- linux-2.6.32.15/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400
55568+++ linux-2.6.32.14/sound/drivers/mts64.c 2010-05-28 21:27:16.698950213 -0400 55593+++ linux-2.6.32.15/sound/drivers/mts64.c 2010-05-28 21:27:16.698950213 -0400
55569@@ -65,7 +65,7 @@ struct mts64 { 55594@@ -65,7 +65,7 @@ struct mts64 {
55570 struct pardevice *pardev; 55595 struct pardevice *pardev;
55571 int pardev_claimed; 55596 int pardev_claimed;
@@ -55614,9 +55639,9 @@ diff -urNp linux-2.6.32.14/sound/drivers/mts64.c linux-2.6.32.14/sound/drivers/m
55614 55639
55615 return 0; 55640 return 0;
55616 } 55641 }
55617diff -urNp linux-2.6.32.14/sound/drivers/portman2x4.c linux-2.6.32.14/sound/drivers/portman2x4.c 55642diff -urNp linux-2.6.32.15/sound/drivers/portman2x4.c linux-2.6.32.15/sound/drivers/portman2x4.c
55618--- linux-2.6.32.14/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400 55643--- linux-2.6.32.15/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400
55619+++ linux-2.6.32.14/sound/drivers/portman2x4.c 2010-05-28 21:27:16.698950213 -0400 55644+++ linux-2.6.32.15/sound/drivers/portman2x4.c 2010-05-28 21:27:16.698950213 -0400
55620@@ -83,7 +83,7 @@ struct portman { 55645@@ -83,7 +83,7 @@ struct portman {
55621 struct pardevice *pardev; 55646 struct pardevice *pardev;
55622 int pardev_claimed; 55647 int pardev_claimed;
@@ -55626,9 +55651,9 @@ diff -urNp linux-2.6.32.14/sound/drivers/portman2x4.c linux-2.6.32.14/sound/driv
55626 int mode[PORTMAN_NUM_INPUT_PORTS]; 55651 int mode[PORTMAN_NUM_INPUT_PORTS];
55627 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; 55652 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
55628 }; 55653 };
55629diff -urNp linux-2.6.32.14/sound/oss/sb_audio.c linux-2.6.32.14/sound/oss/sb_audio.c 55654diff -urNp linux-2.6.32.15/sound/oss/sb_audio.c linux-2.6.32.15/sound/oss/sb_audio.c
55630--- linux-2.6.32.14/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400 55655--- linux-2.6.32.15/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400
55631+++ linux-2.6.32.14/sound/oss/sb_audio.c 2010-05-28 21:27:16.698950213 -0400 55656+++ linux-2.6.32.15/sound/oss/sb_audio.c 2010-05-28 21:27:16.698950213 -0400
55632@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, 55657@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
55633 buf16 = (signed short *)(localbuf + localoffs); 55658 buf16 = (signed short *)(localbuf + localoffs);
55634 while (c) 55659 while (c)
@@ -55638,9 +55663,9 @@ diff -urNp linux-2.6.32.14/sound/oss/sb_audio.c linux-2.6.32.14/sound/oss/sb_aud
55638 if (copy_from_user(lbuf8, 55663 if (copy_from_user(lbuf8,
55639 userbuf+useroffs + p, 55664 userbuf+useroffs + p,
55640 locallen)) 55665 locallen))
55641diff -urNp linux-2.6.32.14/sound/pci/ac97/ac97_codec.c linux-2.6.32.14/sound/pci/ac97/ac97_codec.c 55666diff -urNp linux-2.6.32.15/sound/pci/ac97/ac97_codec.c linux-2.6.32.15/sound/pci/ac97/ac97_codec.c
55642--- linux-2.6.32.14/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400 55667--- linux-2.6.32.15/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400
55643+++ linux-2.6.32.14/sound/pci/ac97/ac97_codec.c 2010-05-28 21:27:16.698950213 -0400 55668+++ linux-2.6.32.15/sound/pci/ac97/ac97_codec.c 2010-05-28 21:27:16.698950213 -0400
55644@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc 55669@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
55645 } 55670 }
55646 55671
@@ -55650,9 +55675,9 @@ diff -urNp linux-2.6.32.14/sound/pci/ac97/ac97_codec.c linux-2.6.32.14/sound/pci
55650 55675
55651 #ifdef CONFIG_SND_AC97_POWER_SAVE 55676 #ifdef CONFIG_SND_AC97_POWER_SAVE
55652 static void do_update_power(struct work_struct *work) 55677 static void do_update_power(struct work_struct *work)
55653diff -urNp linux-2.6.32.14/sound/pci/ac97/ac97_patch.c linux-2.6.32.14/sound/pci/ac97/ac97_patch.c 55678diff -urNp linux-2.6.32.15/sound/pci/ac97/ac97_patch.c linux-2.6.32.15/sound/pci/ac97/ac97_patch.c
55654--- linux-2.6.32.14/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400 55679--- linux-2.6.32.15/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400
55655+++ linux-2.6.32.14/sound/pci/ac97/ac97_patch.c 2010-05-28 21:27:16.698950213 -0400 55680+++ linux-2.6.32.15/sound/pci/ac97/ac97_patch.c 2010-05-28 21:27:16.698950213 -0400
55656@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd 55681@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
55657 return 0; 55682 return 0;
55658 } 55683 }
@@ -55959,9 +55984,9 @@ diff -urNp linux-2.6.32.14/sound/pci/ac97/ac97_patch.c linux-2.6.32.14/sound/pci
55959 .build_specific = patch_ucb1400_specific, 55984 .build_specific = patch_ucb1400_specific,
55960 }; 55985 };
55961 55986
55962diff -urNp linux-2.6.32.14/sound/pci/ens1370.c linux-2.6.32.14/sound/pci/ens1370.c 55987diff -urNp linux-2.6.32.15/sound/pci/ens1370.c linux-2.6.32.15/sound/pci/ens1370.c
55963--- linux-2.6.32.14/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400 55988--- linux-2.6.32.15/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400
55964+++ linux-2.6.32.14/sound/pci/ens1370.c 2010-05-28 21:27:16.698950213 -0400 55989+++ linux-2.6.32.15/sound/pci/ens1370.c 2010-05-28 21:27:16.698950213 -0400
55965@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci 55990@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
55966 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ 55991 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
55967 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ 55992 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
@@ -55971,9 +55996,9 @@ diff -urNp linux-2.6.32.14/sound/pci/ens1370.c linux-2.6.32.14/sound/pci/ens1370
55971 }; 55996 };
55972 55997
55973 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); 55998 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
55974diff -urNp linux-2.6.32.14/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.14/sound/pci/hda/patch_intelhdmi.c 55999diff -urNp linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c
55975--- linux-2.6.32.14/sound/pci/hda/patch_intelhdmi.c 2010-03-15 11:52:04.000000000 -0400 56000--- linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c 2010-03-15 11:52:04.000000000 -0400
55976+++ linux-2.6.32.14/sound/pci/hda/patch_intelhdmi.c 2010-05-28 21:27:16.698950213 -0400 56001+++ linux-2.6.32.15/sound/pci/hda/patch_intelhdmi.c 2010-05-28 21:27:16.698950213 -0400
55977@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str 56002@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
55978 cp_ready); 56003 cp_ready);
55979 56004
@@ -55989,9 +56014,9 @@ diff -urNp linux-2.6.32.14/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.14/sound
55989 } 56014 }
55990 56015
55991 56016
55992diff -urNp linux-2.6.32.14/sound/pci/intel8x0.c linux-2.6.32.14/sound/pci/intel8x0.c 56017diff -urNp linux-2.6.32.15/sound/pci/intel8x0.c linux-2.6.32.15/sound/pci/intel8x0.c
55993--- linux-2.6.32.14/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400 56018--- linux-2.6.32.15/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400
55994+++ linux-2.6.32.14/sound/pci/intel8x0.c 2010-05-28 21:27:16.698950213 -0400 56019+++ linux-2.6.32.15/sound/pci/intel8x0.c 2010-05-28 21:27:16.698950213 -0400
55995@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 56020@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
55996 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 56021 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
55997 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ 56022 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
@@ -56010,9 +56035,9 @@ diff -urNp linux-2.6.32.14/sound/pci/intel8x0.c linux-2.6.32.14/sound/pci/intel8
56010 }; 56035 };
56011 56036
56012 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, 56037 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
56013diff -urNp linux-2.6.32.14/sound/pci/intel8x0m.c linux-2.6.32.14/sound/pci/intel8x0m.c 56038diff -urNp linux-2.6.32.15/sound/pci/intel8x0m.c linux-2.6.32.15/sound/pci/intel8x0m.c
56014--- linux-2.6.32.14/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400 56039--- linux-2.6.32.15/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400
56015+++ linux-2.6.32.14/sound/pci/intel8x0m.c 2010-05-28 21:27:16.703208428 -0400 56040+++ linux-2.6.32.15/sound/pci/intel8x0m.c 2010-05-28 21:27:16.703208428 -0400
56016@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 56041@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
56017 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 56042 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
56018 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ 56043 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
@@ -56031,9 +56056,9 @@ diff -urNp linux-2.6.32.14/sound/pci/intel8x0m.c linux-2.6.32.14/sound/pci/intel
56031 }; 56056 };
56032 56057
56033 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, 56058 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
56034diff -urNp linux-2.6.32.14/usr/gen_init_cpio.c linux-2.6.32.14/usr/gen_init_cpio.c 56059diff -urNp linux-2.6.32.15/usr/gen_init_cpio.c linux-2.6.32.15/usr/gen_init_cpio.c
56035--- linux-2.6.32.14/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400 56060--- linux-2.6.32.15/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400
56036+++ linux-2.6.32.14/usr/gen_init_cpio.c 2010-05-28 21:27:16.703208428 -0400 56061+++ linux-2.6.32.15/usr/gen_init_cpio.c 2010-05-28 21:27:16.703208428 -0400
56037@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, 56062@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
56038 int retval; 56063 int retval;
56039 int rc = -1; 56064 int rc = -1;
@@ -56056,9 +56081,9 @@ diff -urNp linux-2.6.32.14/usr/gen_init_cpio.c linux-2.6.32.14/usr/gen_init_cpio
56056 } else 56081 } else
56057 break; 56082 break;
56058 } 56083 }
56059diff -urNp linux-2.6.32.14/virt/kvm/kvm_main.c linux-2.6.32.14/virt/kvm/kvm_main.c 56084diff -urNp linux-2.6.32.15/virt/kvm/kvm_main.c linux-2.6.32.15/virt/kvm/kvm_main.c
56060--- linux-2.6.32.14/virt/kvm/kvm_main.c 2010-04-29 17:49:38.869035092 -0400 56085--- linux-2.6.32.15/virt/kvm/kvm_main.c 2010-04-29 17:49:38.869035092 -0400
56061+++ linux-2.6.32.14/virt/kvm/kvm_main.c 2010-05-28 21:27:16.731271133 -0400 56086+++ linux-2.6.32.15/virt/kvm/kvm_main.c 2010-05-28 21:27:16.731271133 -0400
56062@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode 56087@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode
56063 return 0; 56088 return 0;
56064 } 56089 }
© 2015 Mike Crute