aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-05-24 12:36:03 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-05-26 14:49:36 +0000
commitbfc41472411a9fc29a7d149b4cfc1c5cc7dbda24 (patch)
tree751fb0be6d33687725d3cbd5dbf372002d277d23
parent049665fd6611b487a6430d3d5bcf75e0864e2a8c (diff)
downloadalpine_aports-bfc41472411a9fc29a7d149b4cfc1c5cc7dbda24.tar.bz2
alpine_aports-bfc41472411a9fc29a7d149b4cfc1c5cc7dbda24.tar.xz
alpine_aports-bfc41472411a9fc29a7d149b4cfc1c5cc7dbda24.zip
main/linux-grsec: upgrade to 2.1.14-2.6.32.13-201005151340
(cherry picked from commit bbdc5310e9b64b577ed7e9a42aef342056ea7e91)
Diffstat
-rw-r--r--main/linux-grsec/APKBUILD12
-rw-r--r--main/linux-grsec/grsecurity-2.1.14-2.6.32.13-201005151340.patch (renamed from main/linux-grsec/grsecurity-2.1.14-2.6.32.12-201004292005.patch)7127
2 files changed, 3652 insertions, 3487 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 5228ecc02e..02edf0be3f 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.12 5pkgver=2.6.32.13
6_kernver=2.6.32 6_kernver=2.6.32
7pkgrel=5 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,12 +14,11 @@ _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.12-201004292005.patch 17 grsecurity-2.1.14-2.6.32.13-201005151340.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
21 0004-arp-flush-arp-cache-on-device-change.patch 21 0004-arp-flush-arp-cache-on-device-change.patch
22 0005-r8169-fix-broken-register-writes.patch
23 0007-r8169-Fix-rtl8169_rx_interrupt.patch 22 0007-r8169-Fix-rtl8169_rx_interrupt.patch
24 0009-ipsec-Fix-bogus-bundle-flowi.patch 23 0009-ipsec-Fix-bogus-bundle-flowi.patch
25 0010-xfrm-Remove-xfrm_state_genid.patch 24 0010-xfrm-Remove-xfrm_state_genid.patch
@@ -138,13 +137,12 @@ firmware() {
138} 137}
139 138
140md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 139md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
1419d097d34648a1734b1a7f97c5d000f03 patch-2.6.32.12.bz2 140ba6abb1ffee513a1d4f831599ddae490 patch-2.6.32.13.bz2
1426c360e4ba40b91137f6ab8b5996e9b1f grsecurity-2.1.14-2.6.32.12-201004292005.patch 14100a61e28da8869669171ab12480513e1 grsecurity-2.1.14-2.6.32.13-201005151340.patch
1431d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch 1421d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch
144437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch 143437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch
145151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch 144151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
146776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch 145776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch
147afa06334c81f21c20571286a83d3d928 0005-r8169-fix-broken-register-writes.patch
1485f8b9a76d95319c5b1aa26b54a42e6b5 0007-r8169-Fix-rtl8169_rx_interrupt.patch 1465f8b9a76d95319c5b1aa26b54a42e6b5 0007-r8169-Fix-rtl8169_rx_interrupt.patch
149cf168620efa63479a6e03da78906e32f 0009-ipsec-Fix-bogus-bundle-flowi.patch 147cf168620efa63479a6e03da78906e32f 0009-ipsec-Fix-bogus-bundle-flowi.patch
1503af4b5ae1afae3278b0070f585b874e3 0010-xfrm-Remove-xfrm_state_genid.patch 1483af4b5ae1afae3278b0070f585b874e3 0010-xfrm-Remove-xfrm_state_genid.patch
diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.32.12-201004292005.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.32.13-201005151340.patch
index e491c2581d..84b90626b7 100644
--- a/main/linux-grsec/grsecurity-2.1.14-2.6.32.12-201004292005.patch
+++ b/main/linux-grsec/grsecurity-2.1.14-2.6.32.13-201005151340.patch
@@ -1,6 +1,6 @@
1diff -urNp linux-2.6.32.12/arch/alpha/include/asm/elf.h linux-2.6.32.12/arch/alpha/include/asm/elf.h 1diff -urNp linux-2.6.32.13/arch/alpha/include/asm/elf.h linux-2.6.32.13/arch/alpha/include/asm/elf.h
2--- linux-2.6.32.12/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 2--- linux-2.6.32.13/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
3+++ linux-2.6.32.12/arch/alpha/include/asm/elf.h 2010-04-04 20:46:41.472784147 -0400 3+++ linux-2.6.32.13/arch/alpha/include/asm/elf.h 2010-05-15 13:21:13.518878295 -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.12/arch/alpha/include/asm/elf.h linux-2.6.32.12/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.12/arch/alpha/include/asm/pgtable.h linux-2.6.32.12/arch/alpha/include/asm/pgtable.h 18diff -urNp linux-2.6.32.13/arch/alpha/include/asm/pgtable.h linux-2.6.32.13/arch/alpha/include/asm/pgtable.h
19--- linux-2.6.32.12/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 19--- linux-2.6.32.13/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
20+++ linux-2.6.32.12/arch/alpha/include/asm/pgtable.h 2010-04-04 20:46:41.472784147 -0400 20+++ linux-2.6.32.13/arch/alpha/include/asm/pgtable.h 2010-05-15 13:21:13.518878295 -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.12/arch/alpha/include/asm/pgtable.h linux-2.6.32.12/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.12/arch/alpha/kernel/module.c linux-2.6.32.12/arch/alpha/kernel/module.c 39diff -urNp linux-2.6.32.13/arch/alpha/kernel/module.c linux-2.6.32.13/arch/alpha/kernel/module.c
40--- linux-2.6.32.12/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 40--- linux-2.6.32.13/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
41+++ linux-2.6.32.12/arch/alpha/kernel/module.c 2010-04-04 20:46:41.472784147 -0400 41+++ linux-2.6.32.13/arch/alpha/kernel/module.c 2010-05-15 13:21:13.518878295 -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.12/arch/alpha/kernel/module.c linux-2.6.32.12/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.12/arch/alpha/kernel/osf_sys.c linux-2.6.32.12/arch/alpha/kernel/osf_sys.c 51diff -urNp linux-2.6.32.13/arch/alpha/kernel/osf_sys.c linux-2.6.32.13/arch/alpha/kernel/osf_sys.c
52--- linux-2.6.32.12/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400 52--- linux-2.6.32.13/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400
53+++ linux-2.6.32.12/arch/alpha/kernel/osf_sys.c 2010-04-04 20:46:41.472784147 -0400 53+++ linux-2.6.32.13/arch/alpha/kernel/osf_sys.c 2010-05-15 13:21:13.518878295 -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.12/arch/alpha/kernel/osf_sys.c linux-2.6.32.12/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.12/arch/alpha/mm/fault.c linux-2.6.32.12/arch/alpha/mm/fault.c 76diff -urNp linux-2.6.32.13/arch/alpha/mm/fault.c linux-2.6.32.13/arch/alpha/mm/fault.c
77--- linux-2.6.32.12/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 77--- linux-2.6.32.13/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
78+++ linux-2.6.32.12/arch/alpha/mm/fault.c 2010-04-04 20:46:41.472784147 -0400 78+++ linux-2.6.32.13/arch/alpha/mm/fault.c 2010-05-15 13:21:13.518878295 -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.12/arch/alpha/mm/fault.c linux-2.6.32.12/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.12/arch/arm/include/asm/elf.h linux-2.6.32.12/arch/arm/include/asm/elf.h 235diff -urNp linux-2.6.32.13/arch/arm/include/asm/elf.h linux-2.6.32.13/arch/arm/include/asm/elf.h
236--- linux-2.6.32.12/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 236--- linux-2.6.32.13/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
237+++ linux-2.6.32.12/arch/arm/include/asm/elf.h 2010-04-04 20:46:41.472784147 -0400 237+++ linux-2.6.32.13/arch/arm/include/asm/elf.h 2010-05-15 13:21:13.518878295 -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.12/arch/arm/include/asm/elf.h linux-2.6.32.12/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.12/arch/arm/include/asm/kmap_types.h linux-2.6.32.12/arch/arm/include/asm/kmap_types.h 254diff -urNp linux-2.6.32.13/arch/arm/include/asm/kmap_types.h linux-2.6.32.13/arch/arm/include/asm/kmap_types.h
255--- linux-2.6.32.12/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 255--- linux-2.6.32.13/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
256+++ linux-2.6.32.12/arch/arm/include/asm/kmap_types.h 2010-04-04 20:46:41.472784147 -0400 256+++ linux-2.6.32.13/arch/arm/include/asm/kmap_types.h 2010-05-15 13:21:13.518878295 -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.12/arch/arm/include/asm/kmap_types.h linux-2.6.32.12/arc
262 KM_TYPE_NR 262 KM_TYPE_NR
263 }; 263 };
264 264
265diff -urNp linux-2.6.32.12/arch/arm/include/asm/uaccess.h linux-2.6.32.12/arch/arm/include/asm/uaccess.h 265diff -urNp linux-2.6.32.13/arch/arm/include/asm/uaccess.h linux-2.6.32.13/arch/arm/include/asm/uaccess.h
266--- linux-2.6.32.12/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 266--- linux-2.6.32.13/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
267+++ linux-2.6.32.12/arch/arm/include/asm/uaccess.h 2010-04-04 20:46:41.472784147 -0400 267+++ linux-2.6.32.13/arch/arm/include/asm/uaccess.h 2010-05-15 13:21:13.518878295 -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.12/arch/arm/include/asm/uaccess.h linux-2.6.32.12/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.12/arch/arm/kernel/kgdb.c linux-2.6.32.12/arch/arm/kernel/kgdb.c 288diff -urNp linux-2.6.32.13/arch/arm/kernel/kgdb.c linux-2.6.32.13/arch/arm/kernel/kgdb.c
289--- linux-2.6.32.12/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 289--- linux-2.6.32.13/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
290+++ linux-2.6.32.12/arch/arm/kernel/kgdb.c 2010-04-04 20:46:41.472784147 -0400 290+++ linux-2.6.32.13/arch/arm/kernel/kgdb.c 2010-05-15 13:21:13.518878295 -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.12/arch/arm/kernel/kgdb.c linux-2.6.32.12/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.12/arch/arm/mach-at91/pm.c linux-2.6.32.12/arch/arm/mach-at91/pm.c 300diff -urNp linux-2.6.32.13/arch/arm/mach-at91/pm.c linux-2.6.32.13/arch/arm/mach-at91/pm.c
301--- linux-2.6.32.12/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400 301--- linux-2.6.32.13/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400
302+++ linux-2.6.32.12/arch/arm/mach-at91/pm.c 2010-04-04 20:46:41.472784147 -0400 302+++ linux-2.6.32.13/arch/arm/mach-at91/pm.c 2010-05-15 13:21:13.518878295 -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.12/arch/arm/mach-at91/pm.c linux-2.6.32.12/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.12/arch/arm/mach-omap1/pm.c linux-2.6.32.12/arch/arm/mach-omap1/pm.c 312diff -urNp linux-2.6.32.13/arch/arm/mach-omap1/pm.c linux-2.6.32.13/arch/arm/mach-omap1/pm.c
313--- linux-2.6.32.12/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400 313--- linux-2.6.32.13/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400
314+++ linux-2.6.32.12/arch/arm/mach-omap1/pm.c 2010-04-04 20:46:41.472784147 -0400 314+++ linux-2.6.32.13/arch/arm/mach-omap1/pm.c 2010-05-15 13:21:13.518878295 -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.12/arch/arm/mach-omap1/pm.c linux-2.6.32.12/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.12/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.12/arch/arm/mach-omap2/pm24xx.c 324diff -urNp linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c
325--- linux-2.6.32.12/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400 325--- linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400
326+++ linux-2.6.32.12/arch/arm/mach-omap2/pm24xx.c 2010-04-04 20:46:41.472784147 -0400 326+++ linux-2.6.32.13/arch/arm/mach-omap2/pm24xx.c 2010-05-15 13:21:13.518878295 -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.12/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.12/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.12/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.12/arch/arm/mach-omap2/pm34xx.c 336diff -urNp linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c
337--- linux-2.6.32.12/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400 337--- linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400
338+++ linux-2.6.32.12/arch/arm/mach-omap2/pm34xx.c 2010-04-04 20:46:41.472784147 -0400 338+++ linux-2.6.32.13/arch/arm/mach-omap2/pm34xx.c 2010-05-15 13:21:13.518878295 -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.12/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.12/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.12/arch/arm/mach-pnx4008/pm.c linux-2.6.32.12/arch/arm/mach-pnx4008/pm.c 348diff -urNp linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c
349--- linux-2.6.32.12/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400 349--- linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400
350+++ linux-2.6.32.12/arch/arm/mach-pnx4008/pm.c 2010-04-04 20:46:41.476773136 -0400 350+++ linux-2.6.32.13/arch/arm/mach-pnx4008/pm.c 2010-05-15 13:21:13.518878295 -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.12/arch/arm/mach-pnx4008/pm.c linux-2.6.32.12/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.12/arch/arm/mach-pxa/pm.c linux-2.6.32.12/arch/arm/mach-pxa/pm.c 360diff -urNp linux-2.6.32.13/arch/arm/mach-pxa/pm.c linux-2.6.32.13/arch/arm/mach-pxa/pm.c
361--- linux-2.6.32.12/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400 361--- linux-2.6.32.13/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400
362+++ linux-2.6.32.12/arch/arm/mach-pxa/pm.c 2010-04-04 20:46:41.476773136 -0400 362+++ linux-2.6.32.13/arch/arm/mach-pxa/pm.c 2010-05-15 13:21:13.518878295 -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.12/arch/arm/mach-pxa/pm.c linux-2.6.32.12/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.12/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.12/arch/arm/mach-pxa/sharpsl_pm.c 372diff -urNp linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c
373--- linux-2.6.32.12/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400 373--- linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400
374+++ linux-2.6.32.12/arch/arm/mach-pxa/sharpsl_pm.c 2010-04-04 20:46:41.476773136 -0400 374+++ linux-2.6.32.13/arch/arm/mach-pxa/sharpsl_pm.c 2010-05-15 13:21:13.531870735 -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.12/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.12/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.12/arch/arm/mach-sa1100/pm.c linux-2.6.32.12/arch/arm/mach-sa1100/pm.c 384diff -urNp linux-2.6.32.13/arch/arm/mach-sa1100/pm.c linux-2.6.32.13/arch/arm/mach-sa1100/pm.c
385--- linux-2.6.32.12/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400 385--- linux-2.6.32.13/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400
386+++ linux-2.6.32.12/arch/arm/mach-sa1100/pm.c 2010-04-04 20:46:41.476773136 -0400 386+++ linux-2.6.32.13/arch/arm/mach-sa1100/pm.c 2010-05-15 13:21:13.531870735 -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.12/arch/arm/mach-sa1100/pm.c linux-2.6.32.12/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.12/arch/arm/mm/fault.c linux-2.6.32.12/arch/arm/mm/fault.c 396diff -urNp linux-2.6.32.13/arch/arm/mm/fault.c linux-2.6.32.13/arch/arm/mm/fault.c
397--- linux-2.6.32.12/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 397--- linux-2.6.32.13/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
398+++ linux-2.6.32.12/arch/arm/mm/fault.c 2010-04-04 20:46:41.476773136 -0400 398+++ linux-2.6.32.13/arch/arm/mm/fault.c 2010-05-15 13:21:13.542880278 -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.12/arch/arm/mm/fault.c linux-2.6.32.12/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.12/arch/arm/mm/mmap.c linux-2.6.32.12/arch/arm/mm/mmap.c 447diff -urNp linux-2.6.32.13/arch/arm/mm/mmap.c linux-2.6.32.13/arch/arm/mm/mmap.c
448--- linux-2.6.32.12/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 448--- linux-2.6.32.13/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
449+++ linux-2.6.32.12/arch/arm/mm/mmap.c 2010-04-04 20:46:41.476773136 -0400 449+++ linux-2.6.32.13/arch/arm/mm/mmap.c 2010-05-15 13:21:13.546915063 -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.12/arch/arm/mm/mmap.c linux-2.6.32.12/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.12/arch/arm/plat-s3c/pm.c linux-2.6.32.12/arch/arm/plat-s3c/pm.c 486diff -urNp linux-2.6.32.13/arch/arm/plat-s3c/pm.c linux-2.6.32.13/arch/arm/plat-s3c/pm.c
487--- linux-2.6.32.12/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400 487--- linux-2.6.32.13/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400
488+++ linux-2.6.32.12/arch/arm/plat-s3c/pm.c 2010-04-04 20:46:41.476773136 -0400 488+++ linux-2.6.32.13/arch/arm/plat-s3c/pm.c 2010-05-15 13:21:13.546915063 -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.12/arch/arm/plat-s3c/pm.c linux-2.6.32.12/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.12/arch/avr32/include/asm/elf.h linux-2.6.32.12/arch/avr32/include/asm/elf.h 498diff -urNp linux-2.6.32.13/arch/avr32/include/asm/elf.h linux-2.6.32.13/arch/avr32/include/asm/elf.h
499--- linux-2.6.32.12/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 499--- linux-2.6.32.13/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
500+++ linux-2.6.32.12/arch/avr32/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400 500+++ linux-2.6.32.13/arch/avr32/include/asm/elf.h 2010-05-15 13:21:13.546915063 -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.12/arch/avr32/include/asm/elf.h linux-2.6.32.12/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.12/arch/avr32/include/asm/kmap_types.h linux-2.6.32.12/arch/avr32/include/asm/kmap_types.h 517diff -urNp linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h
518--- linux-2.6.32.12/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 518--- linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
519+++ linux-2.6.32.12/arch/avr32/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400 519+++ linux-2.6.32.13/arch/avr32/include/asm/kmap_types.h 2010-05-15 13:21:13.546915063 -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.12/arch/avr32/include/asm/kmap_types.h linux-2.6.32.12/a
527 }; 527 };
528 528
529 #undef D 529 #undef D
530diff -urNp linux-2.6.32.12/arch/avr32/mach-at32ap/pm.c linux-2.6.32.12/arch/avr32/mach-at32ap/pm.c 530diff -urNp linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c
531--- linux-2.6.32.12/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400 531--- linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400
532+++ linux-2.6.32.12/arch/avr32/mach-at32ap/pm.c 2010-04-04 20:46:41.476773136 -0400 532+++ linux-2.6.32.13/arch/avr32/mach-at32ap/pm.c 2010-05-15 13:21:13.546915063 -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.12/arch/avr32/mach-at32ap/pm.c linux-2.6.32.12/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.12/arch/avr32/mm/fault.c linux-2.6.32.12/arch/avr32/mm/fault.c 542diff -urNp linux-2.6.32.13/arch/avr32/mm/fault.c linux-2.6.32.13/arch/avr32/mm/fault.c
543--- linux-2.6.32.12/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 543--- linux-2.6.32.13/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
544+++ linux-2.6.32.12/arch/avr32/mm/fault.c 2010-04-04 20:46:41.476773136 -0400 544+++ linux-2.6.32.13/arch/avr32/mm/fault.c 2010-05-15 13:21:13.546915063 -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.12/arch/avr32/mm/fault.c linux-2.6.32.12/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.12/arch/blackfin/kernel/kgdb.c linux-2.6.32.12/arch/blackfin/kernel/kgdb.c 586diff -urNp linux-2.6.32.13/arch/blackfin/kernel/kgdb.c linux-2.6.32.13/arch/blackfin/kernel/kgdb.c
587--- linux-2.6.32.12/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 587--- linux-2.6.32.13/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
588+++ linux-2.6.32.12/arch/blackfin/kernel/kgdb.c 2010-04-04 20:46:41.476773136 -0400 588+++ linux-2.6.32.13/arch/blackfin/kernel/kgdb.c 2010-05-15 13:21:13.568389913 -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.12/arch/blackfin/kernel/kgdb.c linux-2.6.32.12/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.12/arch/blackfin/mach-common/pm.c linux-2.6.32.12/arch/blackfin/mach-common/pm.c 598diff -urNp linux-2.6.32.13/arch/blackfin/mach-common/pm.c linux-2.6.32.13/arch/blackfin/mach-common/pm.c
599--- linux-2.6.32.12/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400 599--- linux-2.6.32.13/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400
600+++ linux-2.6.32.12/arch/blackfin/mach-common/pm.c 2010-04-04 20:46:41.476773136 -0400 600+++ linux-2.6.32.13/arch/blackfin/mach-common/pm.c 2010-05-15 13:21:13.568389913 -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.12/arch/blackfin/mach-common/pm.c linux-2.6.32.12/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.12/arch/frv/include/asm/kmap_types.h linux-2.6.32.12/arch/frv/include/asm/kmap_types.h 610diff -urNp linux-2.6.32.13/arch/frv/include/asm/kmap_types.h linux-2.6.32.13/arch/frv/include/asm/kmap_types.h
611--- linux-2.6.32.12/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 611--- linux-2.6.32.13/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
612+++ linux-2.6.32.12/arch/frv/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400 612+++ linux-2.6.32.13/arch/frv/include/asm/kmap_types.h 2010-05-15 13:21:13.568389913 -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.12/arch/frv/include/asm/kmap_types.h linux-2.6.32.12/arc
618 KM_TYPE_NR 618 KM_TYPE_NR
619 }; 619 };
620 620
621diff -urNp linux-2.6.32.12/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.12/arch/ia64/hp/common/hwsw_iommu.c 621diff -urNp linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c
622--- linux-2.6.32.12/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400 622--- linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400
623+++ linux-2.6.32.12/arch/ia64/hp/common/hwsw_iommu.c 2010-04-04 20:46:41.476773136 -0400 623+++ linux-2.6.32.13/arch/ia64/hp/common/hwsw_iommu.c 2010-05-15 13:21:13.584352190 -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.12/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.12/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.12/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.12/arch/ia64/hp/common/sba_iommu.c 642diff -urNp linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c
643--- linux-2.6.32.12/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400 643--- linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400
644+++ linux-2.6.32.12/arch/ia64/hp/common/sba_iommu.c 2010-04-04 20:46:41.476773136 -0400 644+++ linux-2.6.32.13/arch/ia64/hp/common/sba_iommu.c 2010-05-15 13:21:13.614291139 -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.12/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.12/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.12/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.12/arch/ia64/ia32/binfmt_elf32.c 663diff -urNp linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c
664--- linux-2.6.32.12/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400 664--- linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400
665+++ linux-2.6.32.12/arch/ia64/ia32/binfmt_elf32.c 2010-04-04 20:46:41.476773136 -0400 665+++ linux-2.6.32.13/arch/ia64/ia32/binfmt_elf32.c 2010-05-15 13:21:13.614854679 -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.12/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.12/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.12/arch/ia64/ia32/ia32priv.h linux-2.6.32.12/arch/ia64/ia32/ia32priv.h 680diff -urNp linux-2.6.32.13/arch/ia64/ia32/ia32priv.h linux-2.6.32.13/arch/ia64/ia32/ia32priv.h
681--- linux-2.6.32.12/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400 681--- linux-2.6.32.13/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400
682+++ linux-2.6.32.12/arch/ia64/ia32/ia32priv.h 2010-04-04 20:46:41.476773136 -0400 682+++ linux-2.6.32.13/arch/ia64/ia32/ia32priv.h 2010-05-15 13:21:13.614854679 -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.12/arch/ia64/ia32/ia32priv.h linux-2.6.32.12/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.12/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.12/arch/ia64/include/asm/dma-mapping.h 699diff -urNp linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h
700--- linux-2.6.32.12/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 700--- linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
701+++ linux-2.6.32.12/arch/ia64/include/asm/dma-mapping.h 2010-04-04 20:46:41.476773136 -0400 701+++ linux-2.6.32.13/arch/ia64/include/asm/dma-mapping.h 2010-05-15 13:21:13.614854679 -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.12/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.12/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.12/arch/ia64/include/asm/elf.h linux-2.6.32.12/arch/ia64/include/asm/elf.h 745diff -urNp linux-2.6.32.13/arch/ia64/include/asm/elf.h linux-2.6.32.13/arch/ia64/include/asm/elf.h
746--- linux-2.6.32.12/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 746--- linux-2.6.32.13/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
747+++ linux-2.6.32.12/arch/ia64/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400 747+++ linux-2.6.32.13/arch/ia64/include/asm/elf.h 2010-05-15 13:21:13.614854679 -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.12/arch/ia64/include/asm/elf.h linux-2.6.32.12/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.12/arch/ia64/include/asm/machvec.h linux-2.6.32.12/arch/ia64/include/asm/machvec.h 762diff -urNp linux-2.6.32.13/arch/ia64/include/asm/machvec.h linux-2.6.32.13/arch/ia64/include/asm/machvec.h
763--- linux-2.6.32.12/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400 763--- linux-2.6.32.13/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400
764+++ linux-2.6.32.12/arch/ia64/include/asm/machvec.h 2010-04-04 20:46:41.476773136 -0400 764+++ linux-2.6.32.13/arch/ia64/include/asm/machvec.h 2010-05-15 13:21:13.614854679 -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.12/arch/ia64/include/asm/machvec.h linux-2.6.32.12/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.12/arch/ia64/include/asm/pgtable.h linux-2.6.32.12/arch/ia64/include/asm/pgtable.h 783diff -urNp linux-2.6.32.13/arch/ia64/include/asm/pgtable.h linux-2.6.32.13/arch/ia64/include/asm/pgtable.h
784--- linux-2.6.32.12/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 784--- linux-2.6.32.13/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
785+++ linux-2.6.32.12/arch/ia64/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400 785+++ linux-2.6.32.13/arch/ia64/include/asm/pgtable.h 2010-05-15 13:21:13.618628456 -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.12/arch/ia64/include/asm/pgtable.h linux-2.6.32.12/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.12/arch/ia64/include/asm/uaccess.h linux-2.6.32.12/arch/ia64/include/asm/uaccess.h 804diff -urNp linux-2.6.32.13/arch/ia64/include/asm/uaccess.h linux-2.6.32.13/arch/ia64/include/asm/uaccess.h
805--- linux-2.6.32.12/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 805--- linux-2.6.32.13/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
806+++ linux-2.6.32.12/arch/ia64/include/asm/uaccess.h 2010-04-04 20:46:41.480470677 -0400 806+++ linux-2.6.32.13/arch/ia64/include/asm/uaccess.h 2010-05-15 13:21:13.626873619 -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.12/arch/ia64/include/asm/uaccess.h linux-2.6.32.12/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.12/arch/ia64/kernel/dma-mapping.c linux-2.6.32.12/arch/ia64/kernel/dma-mapping.c 825diff -urNp linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c
826--- linux-2.6.32.12/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400 826--- linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400
827+++ linux-2.6.32.12/arch/ia64/kernel/dma-mapping.c 2010-04-04 20:46:41.480470677 -0400 827+++ linux-2.6.32.13/arch/ia64/kernel/dma-mapping.c 2010-05-15 13:21:13.626873619 -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.12/arch/ia64/kernel/dma-mapping.c linux-2.6.32.12/arch/i
843 { 843 {
844 return dma_ops; 844 return dma_ops;
845 } 845 }
846diff -urNp linux-2.6.32.12/arch/ia64/kernel/module.c linux-2.6.32.12/arch/ia64/kernel/module.c 846diff -urNp linux-2.6.32.13/arch/ia64/kernel/module.c linux-2.6.32.13/arch/ia64/kernel/module.c
847--- linux-2.6.32.12/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 847--- linux-2.6.32.13/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
848+++ linux-2.6.32.12/arch/ia64/kernel/module.c 2010-04-04 20:46:41.480470677 -0400 848+++ linux-2.6.32.13/arch/ia64/kernel/module.c 2010-05-15 13:21:13.626873619 -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.12/arch/ia64/kernel/module.c linux-2.6.32.12/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.12/arch/ia64/kernel/pci-dma.c linux-2.6.32.12/arch/ia64/kernel/pci-dma.c 937diff -urNp linux-2.6.32.13/arch/ia64/kernel/pci-dma.c linux-2.6.32.13/arch/ia64/kernel/pci-dma.c
938--- linux-2.6.32.12/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 938--- linux-2.6.32.13/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
939+++ linux-2.6.32.12/arch/ia64/kernel/pci-dma.c 2010-04-04 20:46:41.480470677 -0400 939+++ linux-2.6.32.13/arch/ia64/kernel/pci-dma.c 2010-05-15 13:21:13.626873619 -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.12/arch/ia64/kernel/pci-dma.c linux-2.6.32.12/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.12/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.12/arch/ia64/kernel/pci-swiotlb.c 949diff -urNp linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c
950--- linux-2.6.32.12/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 950--- linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
951+++ linux-2.6.32.12/arch/ia64/kernel/pci-swiotlb.c 2010-04-04 20:46:41.480470677 -0400 951+++ linux-2.6.32.13/arch/ia64/kernel/pci-swiotlb.c 2010-05-15 13:21:13.626873619 -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.12/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.12/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.12/arch/ia64/kernel/sys_ia64.c linux-2.6.32.12/arch/ia64/kernel/sys_ia64.c 961diff -urNp linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c
962--- linux-2.6.32.12/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400 962--- linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400
963+++ linux-2.6.32.12/arch/ia64/kernel/sys_ia64.c 2010-04-04 20:46:41.480470677 -0400 963+++ linux-2.6.32.13/arch/ia64/kernel/sys_ia64.c 2010-05-15 13:21:13.626873619 -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.12/arch/ia64/kernel/sys_ia64.c linux-2.6.32.12/arch/ia64
987 goto full_search; 987 goto full_search;
988 } 988 }
989 return -ENOMEM; 989 return -ENOMEM;
990diff -urNp linux-2.6.32.12/arch/ia64/kernel/topology.c linux-2.6.32.12/arch/ia64/kernel/topology.c 990diff -urNp linux-2.6.32.13/arch/ia64/kernel/topology.c linux-2.6.32.13/arch/ia64/kernel/topology.c
991--- linux-2.6.32.12/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400 991--- linux-2.6.32.13/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400
992+++ linux-2.6.32.12/arch/ia64/kernel/topology.c 2010-04-04 20:46:41.480470677 -0400 992+++ linux-2.6.32.13/arch/ia64/kernel/topology.c 2010-05-15 13:21:13.626873619 -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.12/arch/ia64/kernel/topology.c linux-2.6.32.12/arch/ia64
999 .show = cache_show 999 .show = cache_show
1000 }; 1000 };
1001 1001
1002diff -urNp linux-2.6.32.12/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.12/arch/ia64/kernel/vmlinux.lds.S 1002diff -urNp linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S
1003--- linux-2.6.32.12/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 1003--- linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
1004+++ linux-2.6.32.12/arch/ia64/kernel/vmlinux.lds.S 2010-04-04 20:46:41.480470677 -0400 1004+++ linux-2.6.32.13/arch/ia64/kernel/vmlinux.lds.S 2010-05-15 13:21:13.626873619 -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.12/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.12/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.12/arch/ia64/mm/fault.c linux-2.6.32.12/arch/ia64/mm/fault.c 1014diff -urNp linux-2.6.32.13/arch/ia64/mm/fault.c linux-2.6.32.13/arch/ia64/mm/fault.c
1015--- linux-2.6.32.12/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 1015--- linux-2.6.32.13/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1016+++ linux-2.6.32.12/arch/ia64/mm/fault.c 2010-04-04 20:46:41.480470677 -0400 1016+++ linux-2.6.32.13/arch/ia64/mm/fault.c 2010-05-15 13:21:13.626873619 -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.12/arch/ia64/mm/fault.c linux-2.6.32.12/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.12/arch/ia64/mm/init.c linux-2.6.32.12/arch/ia64/mm/init.c 1066diff -urNp linux-2.6.32.13/arch/ia64/mm/init.c linux-2.6.32.13/arch/ia64/mm/init.c
1067--- linux-2.6.32.12/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400 1067--- linux-2.6.32.13/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400
1068+++ linux-2.6.32.12/arch/ia64/mm/init.c 2010-04-04 20:46:41.480470677 -0400 1068+++ linux-2.6.32.13/arch/ia64/mm/init.c 2010-05-15 13:21:13.626873619 -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.12/arch/ia64/mm/init.c linux-2.6.32.12/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.12/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.12/arch/ia64/sn/pci/pci_dma.c 1089diff -urNp linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c
1090--- linux-2.6.32.12/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400 1090--- linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400
1091+++ linux-2.6.32.12/arch/ia64/sn/pci/pci_dma.c 2010-04-04 20:46:41.480470677 -0400 1091+++ linux-2.6.32.13/arch/ia64/sn/pci/pci_dma.c 2010-05-15 13:21:13.626873619 -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.12/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.12/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.12/arch/m32r/lib/usercopy.c linux-2.6.32.12/arch/m32r/lib/usercopy.c 1101diff -urNp linux-2.6.32.13/arch/m32r/lib/usercopy.c linux-2.6.32.13/arch/m32r/lib/usercopy.c
1102--- linux-2.6.32.12/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400 1102--- linux-2.6.32.13/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400
1103+++ linux-2.6.32.12/arch/m32r/lib/usercopy.c 2010-04-04 20:46:41.480470677 -0400 1103+++ linux-2.6.32.13/arch/m32r/lib/usercopy.c 2010-05-15 13:21:13.630645180 -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.12/arch/m32r/lib/usercopy.c linux-2.6.32.12/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.12/arch/mips/alchemy/devboards/pm.c linux-2.6.32.12/arch/mips/alchemy/devboards/pm.c 1124diff -urNp linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c
1125--- linux-2.6.32.12/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400 1125--- linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400
1126+++ linux-2.6.32.12/arch/mips/alchemy/devboards/pm.c 2010-04-04 20:46:41.480470677 -0400 1126+++ linux-2.6.32.13/arch/mips/alchemy/devboards/pm.c 2010-05-15 13:21:13.630645180 -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.12/arch/mips/alchemy/devboards/pm.c linux-2.6.32.12/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.12/arch/mips/include/asm/elf.h linux-2.6.32.12/arch/mips/include/asm/elf.h 1136diff -urNp linux-2.6.32.13/arch/mips/include/asm/elf.h linux-2.6.32.13/arch/mips/include/asm/elf.h
1137--- linux-2.6.32.12/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 1137--- linux-2.6.32.13/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1138+++ linux-2.6.32.12/arch/mips/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400 1138+++ linux-2.6.32.13/arch/mips/include/asm/elf.h 2010-05-15 13:21:13.630645180 -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.12/arch/mips/include/asm/elf.h linux-2.6.32.12/arch/mips
1148+#endif 1148+#endif
1149+ 1149+
1150 #endif /* _ASM_ELF_H */ 1150 #endif /* _ASM_ELF_H */
1151diff -urNp linux-2.6.32.12/arch/mips/include/asm/page.h linux-2.6.32.12/arch/mips/include/asm/page.h 1151diff -urNp linux-2.6.32.13/arch/mips/include/asm/page.h linux-2.6.32.13/arch/mips/include/asm/page.h
1152--- linux-2.6.32.12/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 1152--- linux-2.6.32.13/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
1153+++ linux-2.6.32.12/arch/mips/include/asm/page.h 2010-04-04 20:46:41.480470677 -0400 1153+++ linux-2.6.32.13/arch/mips/include/asm/page.h 2010-05-15 13:21:13.630645180 -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.12/arch/mips/include/asm/page.h linux-2.6.32.12/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.12/arch/mips/include/asm/system.h linux-2.6.32.12/arch/mips/include/asm/system.h 1163diff -urNp linux-2.6.32.13/arch/mips/include/asm/system.h linux-2.6.32.13/arch/mips/include/asm/system.h
1164--- linux-2.6.32.12/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 1164--- linux-2.6.32.13/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
1165+++ linux-2.6.32.12/arch/mips/include/asm/system.h 2010-04-04 20:46:41.480470677 -0400 1165+++ linux-2.6.32.13/arch/mips/include/asm/system.h 2010-05-15 13:21:13.630645180 -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.12/arch/mips/include/asm/system.h linux-2.6.32.12/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.12/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.12/arch/mips/kernel/binfmt_elfn32.c 1174diff -urNp linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c
1175--- linux-2.6.32.12/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400 1175--- linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400
1176+++ linux-2.6.32.12/arch/mips/kernel/binfmt_elfn32.c 2010-04-04 20:46:41.480470677 -0400 1176+++ linux-2.6.32.13/arch/mips/kernel/binfmt_elfn32.c 2010-05-15 13:21:13.630645180 -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.12/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.12/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.12/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.12/arch/mips/kernel/binfmt_elfo32.c 1191diff -urNp linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c
1192--- linux-2.6.32.12/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400 1192--- linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400
1193+++ linux-2.6.32.12/arch/mips/kernel/binfmt_elfo32.c 2010-04-04 20:46:41.480470677 -0400 1193+++ linux-2.6.32.13/arch/mips/kernel/binfmt_elfo32.c 2010-05-15 13:21:13.630645180 -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.12/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.12/arch
1205 #include <asm/processor.h> 1205 #include <asm/processor.h>
1206 1206
1207 /* 1207 /*
1208diff -urNp linux-2.6.32.12/arch/mips/kernel/kgdb.c linux-2.6.32.12/arch/mips/kernel/kgdb.c 1208diff -urNp linux-2.6.32.13/arch/mips/kernel/kgdb.c linux-2.6.32.13/arch/mips/kernel/kgdb.c
1209--- linux-2.6.32.12/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 1209--- linux-2.6.32.13/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
1210+++ linux-2.6.32.12/arch/mips/kernel/kgdb.c 2010-04-04 20:46:41.480470677 -0400 1210+++ linux-2.6.32.13/arch/mips/kernel/kgdb.c 2010-05-15 13:21:13.630645180 -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.12/arch/mips/kernel/kgdb.c linux-2.6.32.12/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.12/arch/mips/kernel/process.c linux-2.6.32.12/arch/mips/kernel/process.c 1219diff -urNp linux-2.6.32.13/arch/mips/kernel/process.c linux-2.6.32.13/arch/mips/kernel/process.c
1220--- linux-2.6.32.12/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 1220--- linux-2.6.32.13/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
1221+++ linux-2.6.32.12/arch/mips/kernel/process.c 2010-04-04 20:46:41.480470677 -0400 1221+++ linux-2.6.32.13/arch/mips/kernel/process.c 2010-05-15 13:21:13.630645180 -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.12/arch/mips/kernel/process.c linux-2.6.32.12/arch/mips/
1235- 1235-
1236- return sp & ALMASK; 1236- return sp & ALMASK;
1237-} 1237-}
1238diff -urNp linux-2.6.32.12/arch/mips/kernel/syscall.c linux-2.6.32.12/arch/mips/kernel/syscall.c 1238diff -urNp linux-2.6.32.13/arch/mips/kernel/syscall.c linux-2.6.32.13/arch/mips/kernel/syscall.c
1239--- linux-2.6.32.12/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400 1239--- linux-2.6.32.13/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400
1240+++ linux-2.6.32.12/arch/mips/kernel/syscall.c 2010-04-04 20:46:41.480470677 -0400 1240+++ linux-2.6.32.13/arch/mips/kernel/syscall.c 2010-05-15 13:21:13.630645180 -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.12/arch/mips/kernel/syscall.c linux-2.6.32.12/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.12/arch/mips/mm/fault.c linux-2.6.32.12/arch/mips/mm/fault.c 1262diff -urNp linux-2.6.32.13/arch/mips/mm/fault.c linux-2.6.32.13/arch/mips/mm/fault.c
1263--- linux-2.6.32.12/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 1263--- linux-2.6.32.13/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1264+++ linux-2.6.32.12/arch/mips/mm/fault.c 2010-04-04 20:46:41.480470677 -0400 1264+++ linux-2.6.32.13/arch/mips/mm/fault.c 2010-05-15 13:21:13.630645180 -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.12/arch/mips/mm/fault.c linux-2.6.32.12/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.12/arch/parisc/include/asm/elf.h linux-2.6.32.12/arch/parisc/include/asm/elf.h 1289diff -urNp linux-2.6.32.13/arch/parisc/include/asm/elf.h linux-2.6.32.13/arch/parisc/include/asm/elf.h
1290--- linux-2.6.32.12/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 1290--- linux-2.6.32.13/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1291+++ linux-2.6.32.12/arch/parisc/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400 1291+++ linux-2.6.32.13/arch/parisc/include/asm/elf.h 2010-05-15 13:21:13.630645180 -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.12/arch/parisc/include/asm/elf.h linux-2.6.32.12/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.12/arch/parisc/include/asm/pgtable.h linux-2.6.32.12/arch/parisc/include/asm/pgtable.h 1306diff -urNp linux-2.6.32.13/arch/parisc/include/asm/pgtable.h linux-2.6.32.13/arch/parisc/include/asm/pgtable.h
1307--- linux-2.6.32.12/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 1307--- linux-2.6.32.13/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
1308+++ linux-2.6.32.12/arch/parisc/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400 1308+++ linux-2.6.32.13/arch/parisc/include/asm/pgtable.h 2010-05-15 13:21:13.630645180 -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.12/arch/parisc/include/asm/pgtable.h linux-2.6.32.12/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.12/arch/parisc/kernel/module.c linux-2.6.32.12/arch/parisc/kernel/module.c 1327diff -urNp linux-2.6.32.13/arch/parisc/kernel/module.c linux-2.6.32.13/arch/parisc/kernel/module.c
1328--- linux-2.6.32.12/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 1328--- linux-2.6.32.13/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
1329+++ linux-2.6.32.12/arch/parisc/kernel/module.c 2010-04-04 20:46:41.480470677 -0400 1329+++ linux-2.6.32.13/arch/parisc/kernel/module.c 2010-05-15 13:21:13.630645180 -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.12/arch/parisc/kernel/module.c linux-2.6.32.12/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.12/arch/parisc/kernel/sys_parisc.c linux-2.6.32.12/arch/parisc/kernel/sys_parisc.c 1430diff -urNp linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c
1431--- linux-2.6.32.12/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400 1431--- linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400
1432+++ linux-2.6.32.12/arch/parisc/kernel/sys_parisc.c 2010-04-04 20:46:41.480470677 -0400 1432+++ linux-2.6.32.13/arch/parisc/kernel/sys_parisc.c 2010-05-15 13:21:13.630645180 -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.12/arch/parisc/kernel/sys_parisc.c linux-2.6.32.12/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.12/arch/parisc/kernel/traps.c linux-2.6.32.12/arch/parisc/kernel/traps.c 1442diff -urNp linux-2.6.32.13/arch/parisc/kernel/traps.c linux-2.6.32.13/arch/parisc/kernel/traps.c
1443--- linux-2.6.32.12/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 1443--- linux-2.6.32.13/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
1444+++ linux-2.6.32.12/arch/parisc/kernel/traps.c 2010-04-04 20:46:41.480470677 -0400 1444+++ linux-2.6.32.13/arch/parisc/kernel/traps.c 2010-05-15 13:21:13.630645180 -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.12/arch/parisc/kernel/traps.c linux-2.6.32.12/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.12/arch/parisc/mm/fault.c linux-2.6.32.12/arch/parisc/mm/fault.c 1456diff -urNp linux-2.6.32.13/arch/parisc/mm/fault.c linux-2.6.32.13/arch/parisc/mm/fault.c
1457--- linux-2.6.32.12/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 1457--- linux-2.6.32.13/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1458+++ linux-2.6.32.12/arch/parisc/mm/fault.c 2010-04-04 20:46:41.480470677 -0400 1458+++ linux-2.6.32.13/arch/parisc/mm/fault.c 2010-05-15 13:21:13.630645180 -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.12/arch/parisc/mm/fault.c linux-2.6.32.12/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.12/arch/powerpc/include/asm/device.h linux-2.6.32.12/arch/powerpc/include/asm/device.h 1628diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/device.h linux-2.6.32.13/arch/powerpc/include/asm/device.h
1629--- linux-2.6.32.12/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 1629--- linux-2.6.32.13/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
1630+++ linux-2.6.32.12/arch/powerpc/include/asm/device.h 2010-04-04 20:46:41.485273950 -0400 1630+++ linux-2.6.32.13/arch/powerpc/include/asm/device.h 2010-05-15 13:21:13.630645180 -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.12/arch/powerpc/include/asm/device.h linux-2.6.32.12/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.12/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.12/arch/powerpc/include/asm/dma-mapping.h 1640diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h
1641--- linux-2.6.32.12/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 1641--- linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
1642+++ linux-2.6.32.12/arch/powerpc/include/asm/dma-mapping.h 2010-04-04 20:46:41.485273950 -0400 1642+++ linux-2.6.32.13/arch/powerpc/include/asm/dma-mapping.h 2010-05-15 13:21:13.630645180 -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.12/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.12/arch/powerpc/include/asm/elf.h linux-2.6.32.12/arch/powerpc/include/asm/elf.h 1709diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/elf.h linux-2.6.32.13/arch/powerpc/include/asm/elf.h
1710--- linux-2.6.32.12/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 1710--- linux-2.6.32.13/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1711+++ linux-2.6.32.12/arch/powerpc/include/asm/elf.h 2010-04-04 20:46:41.485273950 -0400 1711+++ linux-2.6.32.13/arch/powerpc/include/asm/elf.h 2010-05-15 13:21:13.643322255 -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.12/arch/powerpc/include/asm/elf.h linux-2.6.32.12/arch/p
1741 #endif /* __KERNEL__ */ 1741 #endif /* __KERNEL__ */
1742 1742
1743 /* 1743 /*
1744diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/iommu.h linux-2.6.32.12/arch/powerpc/include/asm/iommu.h 1744diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/iommu.h linux-2.6.32.13/arch/powerpc/include/asm/iommu.h
1745--- linux-2.6.32.12/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 1745--- linux-2.6.32.13/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
1746+++ linux-2.6.32.12/arch/powerpc/include/asm/iommu.h 2010-04-04 20:46:41.485273950 -0400 1746+++ linux-2.6.32.13/arch/powerpc/include/asm/iommu.h 2010-05-15 13:21:13.643322255 -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.12/arch/powerpc/include/asm/iommu.h linux-2.6.32.12/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.12/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.12/arch/powerpc/include/asm/kmap_types.h 1757diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h
1758--- linux-2.6.32.12/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 1758--- linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
1759+++ linux-2.6.32.12/arch/powerpc/include/asm/kmap_types.h 2010-04-04 20:46:41.485273950 -0400 1759+++ linux-2.6.32.13/arch/powerpc/include/asm/kmap_types.h 2010-05-15 13:21:13.643322255 -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.12/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.12
1765 KM_TYPE_NR 1765 KM_TYPE_NR
1766 }; 1766 };
1767 1767
1768diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/page_64.h linux-2.6.32.12/arch/powerpc/include/asm/page_64.h 1768diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/page_64.h linux-2.6.32.13/arch/powerpc/include/asm/page_64.h
1769--- linux-2.6.32.12/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400 1769--- linux-2.6.32.13/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400
1770+++ linux-2.6.32.12/arch/powerpc/include/asm/page_64.h 2010-04-04 20:46:41.485273950 -0400 1770+++ linux-2.6.32.13/arch/powerpc/include/asm/page_64.h 2010-05-15 13:21:13.643322255 -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.12/arch/powerpc/include/asm/page_64.h linux-2.6.32.12/ar
1789 1789
1790 #include <asm-generic/getorder.h> 1790 #include <asm-generic/getorder.h>
1791 1791
1792diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/page.h linux-2.6.32.12/arch/powerpc/include/asm/page.h 1792diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/page.h linux-2.6.32.13/arch/powerpc/include/asm/page.h
1793--- linux-2.6.32.12/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 1793--- linux-2.6.32.13/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
1794+++ linux-2.6.32.12/arch/powerpc/include/asm/page.h 2010-04-04 20:46:41.485273950 -0400 1794+++ linux-2.6.32.13/arch/powerpc/include/asm/page.h 2010-05-15 13:21:13.643322255 -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.12/arch/powerpc/include/asm/page.h linux-2.6.32.12/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.12/arch/powerpc/include/asm/pci.h linux-2.6.32.12/arch/powerpc/include/asm/pci.h 1817diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/pci.h linux-2.6.32.13/arch/powerpc/include/asm/pci.h
1818--- linux-2.6.32.12/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400 1818--- linux-2.6.32.13/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400
1819+++ linux-2.6.32.12/arch/powerpc/include/asm/pci.h 2010-04-04 20:46:41.485273950 -0400 1819+++ linux-2.6.32.13/arch/powerpc/include/asm/pci.h 2010-05-15 13:21:13.643322255 -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.12/arch/powerpc/include/asm/pci.h linux-2.6.32.12/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.12/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.12/arch/powerpc/include/asm/pte-hash32.h 1831diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h
1832--- linux-2.6.32.12/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400 1832--- linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400
1833+++ linux-2.6.32.12/arch/powerpc/include/asm/pte-hash32.h 2010-04-04 20:46:41.485273950 -0400 1833+++ linux-2.6.32.13/arch/powerpc/include/asm/pte-hash32.h 2010-05-15 13:21:13.643322255 -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.12/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.12
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.12/arch/powerpc/include/asm/reg.h linux-2.6.32.12/arch/powerpc/include/asm/reg.h 1842diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/reg.h linux-2.6.32.13/arch/powerpc/include/asm/reg.h
1843--- linux-2.6.32.12/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400 1843--- linux-2.6.32.13/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400
1844+++ linux-2.6.32.12/arch/powerpc/include/asm/reg.h 2010-04-04 20:46:41.485273950 -0400 1844+++ linux-2.6.32.13/arch/powerpc/include/asm/reg.h 2010-05-15 13:21:13.643322255 -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.12/arch/powerpc/include/asm/reg.h linux-2.6.32.12/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.12/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.12/arch/powerpc/include/asm/swiotlb.h 1853diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h
1854--- linux-2.6.32.12/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400 1854--- linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400
1855+++ linux-2.6.32.12/arch/powerpc/include/asm/swiotlb.h 2010-04-04 20:46:41.485273950 -0400 1855+++ linux-2.6.32.13/arch/powerpc/include/asm/swiotlb.h 2010-05-15 13:21:13.643322255 -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.12/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.12/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.12/arch/powerpc/include/asm/uaccess.h linux-2.6.32.12/arch/powerpc/include/asm/uaccess.h 1865diff -urNp linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h
1866--- linux-2.6.32.12/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 1866--- linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
1867+++ linux-2.6.32.12/arch/powerpc/include/asm/uaccess.h 2010-04-04 20:46:41.485273950 -0400 1867+++ linux-2.6.32.13/arch/powerpc/include/asm/uaccess.h 2010-05-15 13:21:13.643322255 -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.12/arch/powerpc/include/asm/uaccess.h linux-2.6.32.12/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.12/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.12/arch/powerpc/kernel/cacheinfo.c 2036diff -urNp linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c
2037--- linux-2.6.32.12/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 2037--- linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400
2038+++ linux-2.6.32.12/arch/powerpc/kernel/cacheinfo.c 2010-04-04 20:46:41.485273950 -0400 2038+++ linux-2.6.32.13/arch/powerpc/kernel/cacheinfo.c 2010-05-15 13:21:13.643322255 -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.12/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.12/arch/
2045 .show = cache_index_show, 2045 .show = cache_index_show,
2046 }; 2046 };
2047 2047
2048diff -urNp linux-2.6.32.12/arch/powerpc/kernel/dma.c linux-2.6.32.12/arch/powerpc/kernel/dma.c 2048diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma.c linux-2.6.32.13/arch/powerpc/kernel/dma.c
2049--- linux-2.6.32.12/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400 2049--- linux-2.6.32.13/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400
2050+++ linux-2.6.32.12/arch/powerpc/kernel/dma.c 2010-04-04 20:46:41.485273950 -0400 2050+++ linux-2.6.32.13/arch/powerpc/kernel/dma.c 2010-05-15 13:21:13.643322255 -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.12/arch/powerpc/kernel/dma.c linux-2.6.32.12/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.12/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.12/arch/powerpc/kernel/dma-iommu.c 2060diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c
2061--- linux-2.6.32.12/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400 2061--- linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400
2062+++ linux-2.6.32.12/arch/powerpc/kernel/dma-iommu.c 2010-04-04 20:46:41.485273950 -0400 2062+++ linux-2.6.32.13/arch/powerpc/kernel/dma-iommu.c 2010-05-15 13:21:13.643322255 -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.12/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.12/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.12/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.12/arch/powerpc/kernel/dma-swiotlb.c 2072diff -urNp linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c
2073--- linux-2.6.32.12/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 2073--- linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
2074+++ linux-2.6.32.12/arch/powerpc/kernel/dma-swiotlb.c 2010-04-04 20:46:41.485273950 -0400 2074+++ linux-2.6.32.13/arch/powerpc/kernel/dma-swiotlb.c 2010-05-15 13:21:13.646883281 -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.12/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.12/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.12/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.12/arch/powerpc/kernel/exceptions-64e.S 2084diff -urNp linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S
2085--- linux-2.6.32.12/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400 2085--- linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400
2086+++ linux-2.6.32.12/arch/powerpc/kernel/exceptions-64e.S 2010-04-04 20:46:41.485273950 -0400 2086+++ linux-2.6.32.13/arch/powerpc/kernel/exceptions-64e.S 2010-05-15 13:21:13.646883281 -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.12/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.12/
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.12/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.12/arch/powerpc/kernel/exceptions-64s.S 2105diff -urNp linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S
2106--- linux-2.6.32.12/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400 2106--- linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400
2107+++ linux-2.6.32.12/arch/powerpc/kernel/exceptions-64s.S 2010-04-04 20:46:41.485273950 -0400 2107+++ linux-2.6.32.13/arch/powerpc/kernel/exceptions-64s.S 2010-05-15 13:21:13.646883281 -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.12/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.12/
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.12/arch/powerpc/kernel/ibmebus.c linux-2.6.32.12/arch/powerpc/kernel/ibmebus.c 2120diff -urNp linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c
2121--- linux-2.6.32.12/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400 2121--- linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400
2122+++ linux-2.6.32.12/arch/powerpc/kernel/ibmebus.c 2010-04-04 20:46:41.485273950 -0400 2122+++ linux-2.6.32.13/arch/powerpc/kernel/ibmebus.c 2010-05-15 13:21:13.646883281 -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.12/arch/powerpc/kernel/ibmebus.c linux-2.6.32.12/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.12/arch/powerpc/kernel/kgdb.c linux-2.6.32.12/arch/powerpc/kernel/kgdb.c 2132diff -urNp linux-2.6.32.13/arch/powerpc/kernel/kgdb.c linux-2.6.32.13/arch/powerpc/kernel/kgdb.c
2133--- linux-2.6.32.12/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 2133--- linux-2.6.32.13/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
2134+++ linux-2.6.32.12/arch/powerpc/kernel/kgdb.c 2010-04-04 20:46:41.485273950 -0400 2134+++ linux-2.6.32.13/arch/powerpc/kernel/kgdb.c 2010-05-15 13:21:13.658890137 -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.12/arch/powerpc/kernel/kgdb.c linux-2.6.32.12/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.12/arch/powerpc/kernel/module_32.c linux-2.6.32.12/arch/powerpc/kernel/module_32.c 2153diff -urNp linux-2.6.32.13/arch/powerpc/kernel/module_32.c linux-2.6.32.13/arch/powerpc/kernel/module_32.c
2154--- linux-2.6.32.12/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400 2154--- linux-2.6.32.13/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400
2155+++ linux-2.6.32.12/arch/powerpc/kernel/module_32.c 2010-04-04 20:46:41.485273950 -0400 2155+++ linux-2.6.32.13/arch/powerpc/kernel/module_32.c 2010-05-15 13:21:13.658890137 -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.12/arch/powerpc/kernel/module_32.c linux-2.6.32.12/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.12/arch/powerpc/kernel/module.c linux-2.6.32.12/arch/powerpc/kernel/module.c 2185diff -urNp linux-2.6.32.13/arch/powerpc/kernel/module.c linux-2.6.32.13/arch/powerpc/kernel/module.c
2186--- linux-2.6.32.12/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 2186--- linux-2.6.32.13/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
2187+++ linux-2.6.32.12/arch/powerpc/kernel/module.c 2010-04-04 20:46:41.485273950 -0400 2187+++ linux-2.6.32.13/arch/powerpc/kernel/module.c 2010-05-15 13:21:13.658890137 -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.12/arch/powerpc/kernel/module.c linux-2.6.32.12/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.12/arch/powerpc/kernel/pci-common.c linux-2.6.32.12/arch/powerpc/kernel/pci-common.c 2227diff -urNp linux-2.6.32.13/arch/powerpc/kernel/pci-common.c linux-2.6.32.13/arch/powerpc/kernel/pci-common.c
2228--- linux-2.6.32.12/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400 2228--- linux-2.6.32.13/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400
2229+++ linux-2.6.32.12/arch/powerpc/kernel/pci-common.c 2010-04-04 20:46:41.485273950 -0400 2229+++ linux-2.6.32.13/arch/powerpc/kernel/pci-common.c 2010-05-15 13:21:13.678895652 -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.12/arch/powerpc/kernel/pci-common.c linux-2.6.32.12/arch
2245 { 2245 {
2246 return pci_dma_ops; 2246 return pci_dma_ops;
2247 } 2247 }
2248diff -urNp linux-2.6.32.12/arch/powerpc/kernel/process.c linux-2.6.32.12/arch/powerpc/kernel/process.c 2248diff -urNp linux-2.6.32.13/arch/powerpc/kernel/process.c linux-2.6.32.13/arch/powerpc/kernel/process.c
2249--- linux-2.6.32.12/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 2249--- linux-2.6.32.13/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
2250+++ linux-2.6.32.12/arch/powerpc/kernel/process.c 2010-04-04 20:46:41.485273950 -0400 2250+++ linux-2.6.32.13/arch/powerpc/kernel/process.c 2010-05-15 13:21:13.678895652 -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.12/arch/powerpc/kernel/process.c linux-2.6.32.12/arch/po
2300- 2300-
2301- return ret; 2301- return ret;
2302-} 2302-}
2303diff -urNp linux-2.6.32.12/arch/powerpc/kernel/signal_32.c linux-2.6.32.12/arch/powerpc/kernel/signal_32.c 2303diff -urNp linux-2.6.32.13/arch/powerpc/kernel/signal_32.c linux-2.6.32.13/arch/powerpc/kernel/signal_32.c
2304--- linux-2.6.32.12/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400 2304--- linux-2.6.32.13/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400
2305+++ linux-2.6.32.12/arch/powerpc/kernel/signal_32.c 2010-04-04 20:46:41.489273754 -0400 2305+++ linux-2.6.32.13/arch/powerpc/kernel/signal_32.c 2010-05-15 13:21:13.686885851 -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.12/arch/powerpc/kernel/signal_32.c linux-2.6.32.12/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.12/arch/powerpc/kernel/signal_64.c linux-2.6.32.12/arch/powerpc/kernel/signal_64.c 2315diff -urNp linux-2.6.32.13/arch/powerpc/kernel/signal_64.c linux-2.6.32.13/arch/powerpc/kernel/signal_64.c
2316--- linux-2.6.32.12/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400 2316--- linux-2.6.32.13/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400
2317+++ linux-2.6.32.12/arch/powerpc/kernel/signal_64.c 2010-04-04 20:46:41.489273754 -0400 2317+++ linux-2.6.32.13/arch/powerpc/kernel/signal_64.c 2010-05-15 13:21:13.686885851 -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.12/arch/powerpc/kernel/signal_64.c linux-2.6.32.12/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.12/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.12/arch/powerpc/kernel/sys_ppc32.c 2327diff -urNp linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c
2328--- linux-2.6.32.12/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400 2328--- linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400
2329+++ linux-2.6.32.12/arch/powerpc/kernel/sys_ppc32.c 2010-04-04 20:46:41.489273754 -0400 2329+++ linux-2.6.32.13/arch/powerpc/kernel/sys_ppc32.c 2010-05-15 13:21:13.686885851 -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.12/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.12/arch/
2340 } 2340 }
2341 return error; 2341 return error;
2342 } 2342 }
2343diff -urNp linux-2.6.32.12/arch/powerpc/kernel/vdso.c linux-2.6.32.12/arch/powerpc/kernel/vdso.c 2343diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vdso.c linux-2.6.32.13/arch/powerpc/kernel/vdso.c
2344--- linux-2.6.32.12/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400 2344--- linux-2.6.32.13/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400
2345+++ linux-2.6.32.12/arch/powerpc/kernel/vdso.c 2010-04-04 20:46:41.489273754 -0400 2345+++ linux-2.6.32.13/arch/powerpc/kernel/vdso.c 2010-05-15 13:21:13.686885851 -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.12/arch/powerpc/kernel/vdso.c linux-2.6.32.12/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.12/arch/powerpc/kernel/vio.c linux-2.6.32.12/arch/powerpc/kernel/vio.c 2372diff -urNp linux-2.6.32.13/arch/powerpc/kernel/vio.c linux-2.6.32.13/arch/powerpc/kernel/vio.c
2373--- linux-2.6.32.12/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400 2373--- linux-2.6.32.13/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400
2374+++ linux-2.6.32.12/arch/powerpc/kernel/vio.c 2010-04-04 20:46:41.489273754 -0400 2374+++ linux-2.6.32.13/arch/powerpc/kernel/vio.c 2010-05-15 13:21:13.690884467 -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.12/arch/powerpc/kernel/vio.c linux-2.6.32.12/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.12/arch/powerpc/lib/usercopy_64.c linux-2.6.32.12/arch/powerpc/lib/usercopy_64.c 2397diff -urNp linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c
2398--- linux-2.6.32.12/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 2398--- linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
2399+++ linux-2.6.32.12/arch/powerpc/lib/usercopy_64.c 2010-04-04 20:46:41.489273754 -0400 2399+++ linux-2.6.32.13/arch/powerpc/lib/usercopy_64.c 2010-05-15 13:21:13.690884467 -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.12/arch/powerpc/lib/usercopy_64.c linux-2.6.32.12/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.12/arch/powerpc/mm/fault.c linux-2.6.32.12/arch/powerpc/mm/fault.c 2431diff -urNp linux-2.6.32.13/arch/powerpc/mm/fault.c linux-2.6.32.13/arch/powerpc/mm/fault.c
2432--- linux-2.6.32.12/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 2432--- linux-2.6.32.13/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
2433+++ linux-2.6.32.12/arch/powerpc/mm/fault.c 2010-04-04 20:46:41.489273754 -0400 2433+++ linux-2.6.32.13/arch/powerpc/mm/fault.c 2010-05-15 13:21:13.690884467 -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.12/arch/powerpc/mm/fault.c linux-2.6.32.12/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.12/arch/powerpc/mm/mmap_64.c linux-2.6.32.12/arch/powerpc/mm/mmap_64.c 2538diff -urNp linux-2.6.32.13/arch/powerpc/mm/mmap_64.c linux-2.6.32.13/arch/powerpc/mm/mmap_64.c
2539--- linux-2.6.32.12/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400 2539--- linux-2.6.32.13/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400
2540+++ linux-2.6.32.12/arch/powerpc/mm/mmap_64.c 2010-04-04 20:46:41.489273754 -0400 2540+++ linux-2.6.32.13/arch/powerpc/mm/mmap_64.c 2010-05-15 13:21:13.694737832 -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.12/arch/powerpc/mm/mmap_64.c linux-2.6.32.12/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.12/arch/powerpc/mm/slice.c linux-2.6.32.12/arch/powerpc/mm/slice.c 2564diff -urNp linux-2.6.32.13/arch/powerpc/mm/slice.c linux-2.6.32.13/arch/powerpc/mm/slice.c
2565--- linux-2.6.32.12/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400 2565--- linux-2.6.32.13/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400
2566+++ linux-2.6.32.12/arch/powerpc/mm/slice.c 2010-04-04 20:46:41.489273754 -0400 2566+++ linux-2.6.32.13/arch/powerpc/mm/slice.c 2010-05-15 13:21:13.702894969 -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.12/arch/powerpc/mm/slice.c linux-2.6.32.12/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.12/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.12/arch/powerpc/platforms/52xx/lite5200_pm.c 2579diff -urNp linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c
2580--- linux-2.6.32.12/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400 2580--- linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400
2581+++ linux-2.6.32.12/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-04-04 20:46:41.489273754 -0400 2581+++ linux-2.6.32.13/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-05-15 13:21:13.702894969 -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.12/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.12/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.12/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2591diff -urNp linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c
2592--- linux-2.6.32.12/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400 2592--- linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400
2593+++ linux-2.6.32.12/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-04-04 20:46:41.489273754 -0400 2593+++ linux-2.6.32.13/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-05-15 13:21:13.706882202 -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.12/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.12/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.12/arch/powerpc/platforms/83xx/suspend.c 2603diff -urNp linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c
2604--- linux-2.6.32.12/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400 2604--- linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400
2605+++ linux-2.6.32.12/arch/powerpc/platforms/83xx/suspend.c 2010-04-04 20:46:41.489273754 -0400 2605+++ linux-2.6.32.13/arch/powerpc/platforms/83xx/suspend.c 2010-05-15 13:21:13.714896740 -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.12/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.12
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.12/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.12/arch/powerpc/platforms/cell/iommu.c 2615diff -urNp linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c
2616--- linux-2.6.32.12/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400 2616--- linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400
2617+++ linux-2.6.32.12/arch/powerpc/platforms/cell/iommu.c 2010-04-04 20:46:41.489273754 -0400 2617+++ linux-2.6.32.13/arch/powerpc/platforms/cell/iommu.c 2010-05-15 13:21:13.726905139 -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.12/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.12/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.12/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.12/arch/powerpc/platforms/ps3/system-bus.c 2627diff -urNp linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c
2628--- linux-2.6.32.12/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400 2628--- linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400
2629+++ linux-2.6.32.12/arch/powerpc/platforms/ps3/system-bus.c 2010-04-04 20:46:41.489273754 -0400 2629+++ linux-2.6.32.13/arch/powerpc/platforms/ps3/system-bus.c 2010-05-15 13:21:13.726905139 -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.12/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.12/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.12/arch/powerpc/platforms/pseries/Kconfig 2648diff -urNp linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig
2649--- linux-2.6.32.12/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400 2649--- linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400
2650+++ linux-2.6.32.12/arch/powerpc/platforms/pseries/Kconfig 2010-04-04 20:46:41.489273754 -0400 2650+++ linux-2.6.32.13/arch/powerpc/platforms/pseries/Kconfig 2010-05-15 13:21:13.726905139 -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.12/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.12/arch/s390/include/asm/elf.h linux-2.6.32.12/arch/s390/include/asm/elf.h 2660diff -urNp linux-2.6.32.13/arch/s390/include/asm/elf.h linux-2.6.32.13/arch/s390/include/asm/elf.h
2661--- linux-2.6.32.12/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 2661--- linux-2.6.32.13/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
2662+++ linux-2.6.32.12/arch/s390/include/asm/elf.h 2010-04-04 20:46:41.489273754 -0400 2662+++ linux-2.6.32.13/arch/s390/include/asm/elf.h 2010-05-15 13:21:13.745465180 -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.12/arch/s390/include/asm/elf.h linux-2.6.32.12/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.12/arch/s390/include/asm/setup.h linux-2.6.32.12/arch/s390/include/asm/setup.h 2677diff -urNp linux-2.6.32.13/arch/s390/include/asm/setup.h linux-2.6.32.13/arch/s390/include/asm/setup.h
2678--- linux-2.6.32.12/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400 2678--- linux-2.6.32.13/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400
2679+++ linux-2.6.32.12/arch/s390/include/asm/setup.h 2010-04-04 20:46:41.489273754 -0400 2679+++ linux-2.6.32.13/arch/s390/include/asm/setup.h 2010-05-15 13:21:13.746887701 -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.12/arch/s390/include/asm/setup.h linux-2.6.32.12/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.12/arch/s390/include/asm/uaccess.h linux-2.6.32.12/arch/s390/include/asm/uaccess.h 2696diff -urNp linux-2.6.32.13/arch/s390/include/asm/uaccess.h linux-2.6.32.13/arch/s390/include/asm/uaccess.h
2697--- linux-2.6.32.12/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 2697--- linux-2.6.32.13/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
2698+++ linux-2.6.32.12/arch/s390/include/asm/uaccess.h 2010-04-04 20:46:41.489273754 -0400 2698+++ linux-2.6.32.13/arch/s390/include/asm/uaccess.h 2010-05-15 13:21:13.746887701 -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.12/arch/s390/include/asm/uaccess.h linux-2.6.32.12/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.12/arch/s390/Kconfig linux-2.6.32.12/arch/s390/Kconfig 2731diff -urNp linux-2.6.32.13/arch/s390/Kconfig linux-2.6.32.13/arch/s390/Kconfig
2732--- linux-2.6.32.12/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400 2732--- linux-2.6.32.13/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400
2733+++ linux-2.6.32.12/arch/s390/Kconfig 2010-04-04 20:46:41.489273754 -0400 2733+++ linux-2.6.32.13/arch/s390/Kconfig 2010-05-15 13:21:13.754899687 -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.12/arch/s390/Kconfig linux-2.6.32.12/arch/s390/Kconfig
2768 2768
2769 comment "Code generation options" 2769 comment "Code generation options"
2770 2770
2771diff -urNp linux-2.6.32.12/arch/s390/kernel/module.c linux-2.6.32.12/arch/s390/kernel/module.c 2771diff -urNp linux-2.6.32.13/arch/s390/kernel/module.c linux-2.6.32.13/arch/s390/kernel/module.c
2772--- linux-2.6.32.12/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 2772--- linux-2.6.32.13/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
2773+++ linux-2.6.32.12/arch/s390/kernel/module.c 2010-04-04 20:46:41.492578989 -0400 2773+++ linux-2.6.32.13/arch/s390/kernel/module.c 2010-05-15 13:21:13.754899687 -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.12/arch/s390/kernel/module.c linux-2.6.32.12/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.12/arch/s390/kernel/setup.c linux-2.6.32.12/arch/s390/kernel/setup.c 2845diff -urNp linux-2.6.32.13/arch/s390/kernel/setup.c linux-2.6.32.13/arch/s390/kernel/setup.c
2846--- linux-2.6.32.12/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 2846--- linux-2.6.32.13/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
2847+++ linux-2.6.32.12/arch/s390/kernel/setup.c 2010-04-04 20:46:41.492578989 -0400 2847+++ linux-2.6.32.13/arch/s390/kernel/setup.c 2010-05-15 13:21:13.754899687 -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.12/arch/s390/kernel/setup.c linux-2.6.32.12/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.12/arch/s390/mm/mmap.c linux-2.6.32.12/arch/s390/mm/mmap.c 2901diff -urNp linux-2.6.32.13/arch/s390/mm/mmap.c linux-2.6.32.13/arch/s390/mm/mmap.c
2902--- linux-2.6.32.12/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 2902--- linux-2.6.32.13/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
2903+++ linux-2.6.32.12/arch/s390/mm/mmap.c 2010-04-04 20:46:41.492578989 -0400 2903+++ linux-2.6.32.13/arch/s390/mm/mmap.c 2010-05-15 13:21:13.770895237 -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.12/arch/s390/mm/mmap.c linux-2.6.32.12/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.12/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.12/arch/sh/boards/mach-hp6xx/pm.c 2950diff -urNp linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c
2951--- linux-2.6.32.12/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400 2951--- linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400
2952+++ linux-2.6.32.12/arch/sh/boards/mach-hp6xx/pm.c 2010-04-04 20:46:41.492578989 -0400 2952+++ linux-2.6.32.13/arch/sh/boards/mach-hp6xx/pm.c 2010-05-15 13:21:13.770895237 -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.12/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.12/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.12/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.12/arch/sh/kernel/cpu/sh4/sq.c 2962diff -urNp linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c
2963--- linux-2.6.32.12/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400 2963--- linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400
2964+++ linux-2.6.32.12/arch/sh/kernel/cpu/sh4/sq.c 2010-04-04 20:46:41.492578989 -0400 2964+++ linux-2.6.32.13/arch/sh/kernel/cpu/sh4/sq.c 2010-05-15 13:21:13.782909212 -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.12/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.12/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.12/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.12/arch/sh/kernel/cpu/shmobile/pm.c 2974diff -urNp linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c
2975--- linux-2.6.32.12/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400 2975--- linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400
2976+++ linux-2.6.32.12/arch/sh/kernel/cpu/shmobile/pm.c 2010-04-04 20:46:41.492578989 -0400 2976+++ linux-2.6.32.13/arch/sh/kernel/cpu/shmobile/pm.c 2010-05-15 13:21:13.782909212 -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.12/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.12/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.12/arch/sh/kernel/kgdb.c linux-2.6.32.12/arch/sh/kernel/kgdb.c 2986diff -urNp linux-2.6.32.13/arch/sh/kernel/kgdb.c linux-2.6.32.13/arch/sh/kernel/kgdb.c
2987--- linux-2.6.32.12/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 2987--- linux-2.6.32.13/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
2988+++ linux-2.6.32.12/arch/sh/kernel/kgdb.c 2010-04-04 20:46:41.492578989 -0400 2988+++ linux-2.6.32.13/arch/sh/kernel/kgdb.c 2010-05-15 13:21:13.782909212 -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.12/arch/sh/kernel/kgdb.c linux-2.6.32.12/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.12/arch/sparc/include/asm/atomic_64.h linux-2.6.32.12/arch/sparc/include/asm/atomic_64.h 2998diff -urNp linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h
2999--- linux-2.6.32.12/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 2999--- linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
3000+++ linux-2.6.32.12/arch/sparc/include/asm/atomic_64.h 2010-04-04 20:46:41.492578989 -0400 3000+++ linux-2.6.32.13/arch/sparc/include/asm/atomic_64.h 2010-05-15 13:21:13.782909212 -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.12/arch/sparc/include/asm/atomic_64.h linux-2.6.32.12/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.12/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.12/arch/sparc/include/asm/dma-mapping.h 3130diff -urNp linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h
3131--- linux-2.6.32.12/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 3131--- linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
3132+++ linux-2.6.32.12/arch/sparc/include/asm/dma-mapping.h 2010-04-04 20:46:41.492578989 -0400 3132+++ linux-2.6.32.13/arch/sparc/include/asm/dma-mapping.h 2010-05-15 13:21:13.782909212 -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.12/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.12/
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.12/arch/sparc/include/asm/elf_32.h linux-2.6.32.12/arch/sparc/include/asm/elf_32.h 3164diff -urNp linux-2.6.32.13/arch/sparc/include/asm/elf_32.h linux-2.6.32.13/arch/sparc/include/asm/elf_32.h
3165--- linux-2.6.32.12/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400 3165--- linux-2.6.32.13/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400
3166+++ linux-2.6.32.12/arch/sparc/include/asm/elf_32.h 2010-04-04 20:46:41.492578989 -0400 3166+++ linux-2.6.32.13/arch/sparc/include/asm/elf_32.h 2010-05-15 13:21:13.782909212 -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.12/arch/sparc/include/asm/elf_32.h linux-2.6.32.12/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.12/arch/sparc/include/asm/elf_64.h linux-2.6.32.12/arch/sparc/include/asm/elf_64.h 3181diff -urNp linux-2.6.32.13/arch/sparc/include/asm/elf_64.h linux-2.6.32.13/arch/sparc/include/asm/elf_64.h
3182--- linux-2.6.32.12/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400 3182--- linux-2.6.32.13/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400
3183+++ linux-2.6.32.12/arch/sparc/include/asm/elf_64.h 2010-04-04 20:46:41.492578989 -0400 3183+++ linux-2.6.32.13/arch/sparc/include/asm/elf_64.h 2010-05-15 13:21:13.788083684 -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.12/arch/sparc/include/asm/elf_64.h linux-2.6.32.12/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.12/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.12/arch/sparc/include/asm/pgtable_32.h 3197diff -urNp linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h
3198--- linux-2.6.32.12/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 3198--- linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
3199+++ linux-2.6.32.12/arch/sparc/include/asm/pgtable_32.h 2010-04-04 20:46:41.492578989 -0400 3199+++ linux-2.6.32.13/arch/sparc/include/asm/pgtable_32.h 2010-05-15 13:21:13.788083684 -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.12/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.12/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.12/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.12/arch/sparc/include/asm/pgtsrmmu.h 3231diff -urNp linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h
3232--- linux-2.6.32.12/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400 3232--- linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400
3233+++ linux-2.6.32.12/arch/sparc/include/asm/pgtsrmmu.h 2010-04-04 20:46:41.492578989 -0400 3233+++ linux-2.6.32.13/arch/sparc/include/asm/pgtsrmmu.h 2010-05-15 13:21:13.788083684 -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.12/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.12/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.12/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.12/arch/sparc/include/asm/spinlock_64.h 3248diff -urNp linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h
3249--- linux-2.6.32.12/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400 3249--- linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400
3250+++ linux-2.6.32.12/arch/sparc/include/asm/spinlock_64.h 2010-04-04 20:46:41.492578989 -0400 3250+++ linux-2.6.32.13/arch/sparc/include/asm/spinlock_64.h 2010-05-15 13:21:13.798894063 -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.12/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.12/
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.12/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.12/arch/sparc/include/asm/uaccess_32.h 3302diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h
3303--- linux-2.6.32.12/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 3303--- linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
3304+++ linux-2.6.32.12/arch/sparc/include/asm/uaccess_32.h 2010-04-04 20:46:41.492578989 -0400 3304+++ linux-2.6.32.13/arch/sparc/include/asm/uaccess_32.h 2010-05-15 13:21:13.798894063 -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.12/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.12/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.12/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.12/arch/sparc/include/asm/uaccess_64.h 3356diff -urNp linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h
3357--- linux-2.6.32.12/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 3357--- linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
3358+++ linux-2.6.32.12/arch/sparc/include/asm/uaccess_64.h 2010-04-04 20:46:41.492578989 -0400 3358+++ linux-2.6.32.13/arch/sparc/include/asm/uaccess_64.h 2010-05-15 13:21:13.798894063 -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.12/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.12/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.12/arch/sparc/kernel/iommu.c linux-2.6.32.12/arch/sparc/kernel/iommu.c 3409diff -urNp linux-2.6.32.13/arch/sparc/kernel/iommu.c linux-2.6.32.13/arch/sparc/kernel/iommu.c
3410--- linux-2.6.32.12/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400 3410--- linux-2.6.32.13/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400
3411+++ linux-2.6.32.12/arch/sparc/kernel/iommu.c 2010-04-04 20:46:41.492578989 -0400 3411+++ linux-2.6.32.13/arch/sparc/kernel/iommu.c 2010-05-15 13:21:13.798894063 -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.12/arch/sparc/kernel/iommu.c linux-2.6.32.12/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.12/arch/sparc/kernel/ioport.c linux-2.6.32.12/arch/sparc/kernel/ioport.c 3430diff -urNp linux-2.6.32.13/arch/sparc/kernel/ioport.c linux-2.6.32.13/arch/sparc/kernel/ioport.c
3431--- linux-2.6.32.12/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 3431--- linux-2.6.32.13/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
3432+++ linux-2.6.32.12/arch/sparc/kernel/ioport.c 2010-04-04 20:46:41.492578989 -0400 3432+++ linux-2.6.32.13/arch/sparc/kernel/ioport.c 2010-05-15 13:21:13.798894063 -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.12/arch/sparc/kernel/ioport.c linux-2.6.32.12/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.12/arch/sparc/kernel/kgdb_32.c linux-2.6.32.12/arch/sparc/kernel/kgdb_32.c 3460diff -urNp linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c
3461--- linux-2.6.32.12/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400 3461--- linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400
3462+++ linux-2.6.32.12/arch/sparc/kernel/kgdb_32.c 2010-04-04 20:46:41.492578989 -0400 3462+++ linux-2.6.32.13/arch/sparc/kernel/kgdb_32.c 2010-05-15 13:21:13.810880669 -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.12/arch/sparc/kernel/kgdb_32.c linux-2.6.32.12/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.12/arch/sparc/kernel/kgdb_64.c linux-2.6.32.12/arch/sparc/kernel/kgdb_64.c 3472diff -urNp linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c
3473--- linux-2.6.32.12/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400 3473--- linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400
3474+++ linux-2.6.32.12/arch/sparc/kernel/kgdb_64.c 2010-04-04 20:46:41.492578989 -0400 3474+++ linux-2.6.32.13/arch/sparc/kernel/kgdb_64.c 2010-05-15 13:21:13.810880669 -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.12/arch/sparc/kernel/kgdb_64.c linux-2.6.32.12/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.12/arch/sparc/kernel/Makefile linux-2.6.32.12/arch/sparc/kernel/Makefile 3484diff -urNp linux-2.6.32.13/arch/sparc/kernel/Makefile linux-2.6.32.13/arch/sparc/kernel/Makefile
3485--- linux-2.6.32.12/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400 3485--- linux-2.6.32.13/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400
3486+++ linux-2.6.32.12/arch/sparc/kernel/Makefile 2010-04-04 20:46:41.492578989 -0400 3486+++ linux-2.6.32.13/arch/sparc/kernel/Makefile 2010-05-15 13:21:13.810880669 -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.12/arch/sparc/kernel/Makefile linux-2.6.32.12/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.12/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.12/arch/sparc/kernel/pci_sun4v.c 3496diff -urNp linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c
3497--- linux-2.6.32.12/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400 3497--- linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400
3498+++ linux-2.6.32.12/arch/sparc/kernel/pci_sun4v.c 2010-04-04 20:46:41.492578989 -0400 3498+++ linux-2.6.32.13/arch/sparc/kernel/pci_sun4v.c 2010-05-15 13:21:13.810880669 -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.12/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.12/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.12/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.12/arch/sparc/kernel/sys_sparc_32.c 3508diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c
3509--- linux-2.6.32.12/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400 3509--- linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400
3510+++ linux-2.6.32.12/arch/sparc/kernel/sys_sparc_32.c 2010-04-04 20:46:41.492578989 -0400 3510+++ linux-2.6.32.13/arch/sparc/kernel/sys_sparc_32.c 2010-05-15 13:21:13.810880669 -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.12/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.12/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.12/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.12/arch/sparc/kernel/sys_sparc_64.c 3520diff -urNp linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c
3521--- linux-2.6.32.12/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400 3521--- linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400
3522+++ linux-2.6.32.12/arch/sparc/kernel/sys_sparc_64.c 2010-04-04 20:46:41.492578989 -0400 3522+++ linux-2.6.32.13/arch/sparc/kernel/sys_sparc_64.c 2010-05-15 13:21:13.810880669 -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.12/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.12/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.12/arch/sparc/kernel/traps_64.c linux-2.6.32.12/arch/sparc/kernel/traps_64.c 3601diff -urNp linux-2.6.32.13/arch/sparc/kernel/traps_64.c linux-2.6.32.13/arch/sparc/kernel/traps_64.c
3602--- linux-2.6.32.12/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400 3602--- linux-2.6.32.13/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400
3603+++ linux-2.6.32.12/arch/sparc/kernel/traps_64.c 2010-04-04 20:46:41.496772577 -0400 3603+++ linux-2.6.32.13/arch/sparc/kernel/traps_64.c 2010-05-15 13:21:13.836227385 -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.12/arch/sparc/kernel/traps_64.c linux-2.6.32.12/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.12/arch/sparc/lib/atomic_64.S linux-2.6.32.12/arch/sparc/lib/atomic_64.S 3635diff -urNp linux-2.6.32.13/arch/sparc/lib/atomic_64.S linux-2.6.32.13/arch/sparc/lib/atomic_64.S
3636--- linux-2.6.32.12/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400 3636--- linux-2.6.32.13/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400
3637+++ linux-2.6.32.12/arch/sparc/lib/atomic_64.S 2010-04-04 20:46:41.496772577 -0400 3637+++ linux-2.6.32.13/arch/sparc/lib/atomic_64.S 2010-05-15 13:21:13.836227385 -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.12/arch/sparc/lib/atomic_64.S linux-2.6.32.12/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.12/arch/sparc/lib/ksyms.c linux-2.6.32.12/arch/sparc/lib/ksyms.c 3831diff -urNp linux-2.6.32.13/arch/sparc/lib/ksyms.c linux-2.6.32.13/arch/sparc/lib/ksyms.c
3832--- linux-2.6.32.12/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400 3832--- linux-2.6.32.13/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400
3833+++ linux-2.6.32.12/arch/sparc/lib/ksyms.c 2010-04-04 20:46:41.496772577 -0400 3833+++ linux-2.6.32.13/arch/sparc/lib/ksyms.c 2010-05-15 13:21:13.836227385 -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.12/arch/sparc/lib/ksyms.c linux-2.6.32.12/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.12/arch/sparc/lib/rwsem_64.S linux-2.6.32.12/arch/sparc/lib/rwsem_64.S 3845diff -urNp linux-2.6.32.13/arch/sparc/lib/rwsem_64.S linux-2.6.32.13/arch/sparc/lib/rwsem_64.S
3846--- linux-2.6.32.12/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400 3846--- linux-2.6.32.13/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400
3847+++ linux-2.6.32.12/arch/sparc/lib/rwsem_64.S 2010-04-04 20:46:41.496772577 -0400 3847+++ linux-2.6.32.13/arch/sparc/lib/rwsem_64.S 2010-05-15 13:21:13.836227385 -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.12/arch/sparc/lib/rwsem_64.S linux-2.6.32.12/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.12/arch/sparc/Makefile linux-2.6.32.12/arch/sparc/Makefile 3946diff -urNp linux-2.6.32.13/arch/sparc/Makefile linux-2.6.32.13/arch/sparc/Makefile
3947--- linux-2.6.32.12/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400 3947--- linux-2.6.32.13/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400
3948+++ linux-2.6.32.12/arch/sparc/Makefile 2010-04-04 20:46:41.496772577 -0400 3948+++ linux-2.6.32.13/arch/sparc/Makefile 2010-05-15 13:21:13.836227385 -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.12/arch/sparc/Makefile linux-2.6.32.12/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.12/arch/sparc/mm/fault_32.c linux-2.6.32.12/arch/sparc/mm/fault_32.c 3958diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_32.c linux-2.6.32.13/arch/sparc/mm/fault_32.c
3959--- linux-2.6.32.12/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400 3959--- linux-2.6.32.13/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400
3960+++ linux-2.6.32.12/arch/sparc/mm/fault_32.c 2010-04-04 20:46:41.496772577 -0400 3960+++ linux-2.6.32.13/arch/sparc/mm/fault_32.c 2010-05-15 13:21:13.836227385 -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.12/arch/sparc/mm/fault_32.c linux-2.6.32.12/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.12/arch/sparc/mm/fault_64.c linux-2.6.32.12/arch/sparc/mm/fault_64.c 4264diff -urNp linux-2.6.32.13/arch/sparc/mm/fault_64.c linux-2.6.32.13/arch/sparc/mm/fault_64.c
4265--- linux-2.6.32.12/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400 4265--- linux-2.6.32.13/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400
4266+++ linux-2.6.32.12/arch/sparc/mm/fault_64.c 2010-04-04 20:46:41.496772577 -0400 4266+++ linux-2.6.32.13/arch/sparc/mm/fault_64.c 2010-05-15 13:21:13.842890995 -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.12/arch/sparc/mm/fault_64.c linux-2.6.32.12/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.12/arch/sparc/mm/init_32.c linux-2.6.32.12/arch/sparc/mm/init_32.c 4764diff -urNp linux-2.6.32.13/arch/sparc/mm/init_32.c linux-2.6.32.13/arch/sparc/mm/init_32.c
4765--- linux-2.6.32.12/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 4765--- linux-2.6.32.13/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
4766+++ linux-2.6.32.12/arch/sparc/mm/init_32.c 2010-04-04 20:46:41.496772577 -0400 4766+++ linux-2.6.32.13/arch/sparc/mm/init_32.c 2010-05-15 13:21:13.842890995 -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.12/arch/sparc/mm/init_32.c linux-2.6.32.12/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.12/arch/sparc/mm/Makefile linux-2.6.32.12/arch/sparc/mm/Makefile 4801diff -urNp linux-2.6.32.13/arch/sparc/mm/Makefile linux-2.6.32.13/arch/sparc/mm/Makefile
4802--- linux-2.6.32.12/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400 4802--- linux-2.6.32.13/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400
4803+++ linux-2.6.32.12/arch/sparc/mm/Makefile 2010-04-04 20:46:41.496772577 -0400 4803+++ linux-2.6.32.13/arch/sparc/mm/Makefile 2010-05-15 13:21:13.842890995 -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.12/arch/sparc/mm/Makefile linux-2.6.32.12/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.12/arch/sparc/mm/srmmu.c linux-2.6.32.12/arch/sparc/mm/srmmu.c 4813diff -urNp linux-2.6.32.13/arch/sparc/mm/srmmu.c linux-2.6.32.13/arch/sparc/mm/srmmu.c
4814--- linux-2.6.32.12/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400 4814--- linux-2.6.32.13/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400
4815+++ linux-2.6.32.12/arch/sparc/mm/srmmu.c 2010-04-04 20:46:41.496772577 -0400 4815+++ linux-2.6.32.13/arch/sparc/mm/srmmu.c 2010-05-15 13:21:13.854885513 -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.12/arch/sparc/mm/srmmu.c linux-2.6.32.12/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.12/arch/um/include/asm/kmap_types.h linux-2.6.32.12/arch/um/include/asm/kmap_types.h 4830diff -urNp linux-2.6.32.13/arch/um/include/asm/kmap_types.h linux-2.6.32.13/arch/um/include/asm/kmap_types.h
4831--- linux-2.6.32.12/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 4831--- linux-2.6.32.13/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
4832+++ linux-2.6.32.12/arch/um/include/asm/kmap_types.h 2010-04-04 20:46:41.496772577 -0400 4832+++ linux-2.6.32.13/arch/um/include/asm/kmap_types.h 2010-05-15 13:21:13.854885513 -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.12/arch/um/include/asm/kmap_types.h linux-2.6.32.12/arch
4838 KM_TYPE_NR 4838 KM_TYPE_NR
4839 }; 4839 };
4840 4840
4841diff -urNp linux-2.6.32.12/arch/um/include/asm/page.h linux-2.6.32.12/arch/um/include/asm/page.h 4841diff -urNp linux-2.6.32.13/arch/um/include/asm/page.h linux-2.6.32.13/arch/um/include/asm/page.h
4842--- linux-2.6.32.12/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 4842--- linux-2.6.32.13/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
4843+++ linux-2.6.32.12/arch/um/include/asm/page.h 2010-04-04 20:46:41.496772577 -0400 4843+++ linux-2.6.32.13/arch/um/include/asm/page.h 2010-05-15 13:21:13.854885513 -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.12/arch/um/include/asm/page.h linux-2.6.32.12/arch/um/in
4851 #ifndef __ASSEMBLY__ 4851 #ifndef __ASSEMBLY__
4852 4852
4853 struct page; 4853 struct page;
4854diff -urNp linux-2.6.32.12/arch/um/sys-i386/syscalls.c linux-2.6.32.12/arch/um/sys-i386/syscalls.c 4854diff -urNp linux-2.6.32.13/arch/um/sys-i386/syscalls.c linux-2.6.32.13/arch/um/sys-i386/syscalls.c
4855--- linux-2.6.32.12/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400 4855--- linux-2.6.32.13/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400
4856+++ linux-2.6.32.12/arch/um/sys-i386/syscalls.c 2010-04-04 20:46:41.496772577 -0400 4856+++ linux-2.6.32.13/arch/um/sys-i386/syscalls.c 2010-05-15 13:21:13.862896966 -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.12/arch/um/sys-i386/syscalls.c linux-2.6.32.12/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.12/arch/x86/boot/bitops.h linux-2.6.32.12/arch/x86/boot/bitops.h 4879diff -urNp linux-2.6.32.13/arch/x86/boot/bitops.h linux-2.6.32.13/arch/x86/boot/bitops.h
4880--- linux-2.6.32.12/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400 4880--- linux-2.6.32.13/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400
4881+++ linux-2.6.32.12/arch/x86/boot/bitops.h 2010-04-04 20:46:41.496772577 -0400 4881+++ linux-2.6.32.13/arch/x86/boot/bitops.h 2010-05-15 13:21:13.862896966 -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.12/arch/x86/boot/bitops.h linux-2.6.32.12/arch/x86/boot/
4897 } 4897 }
4898 4898
4899 #endif /* BOOT_BITOPS_H */ 4899 #endif /* BOOT_BITOPS_H */
4900diff -urNp linux-2.6.32.12/arch/x86/boot/boot.h linux-2.6.32.12/arch/x86/boot/boot.h 4900diff -urNp linux-2.6.32.13/arch/x86/boot/boot.h linux-2.6.32.13/arch/x86/boot/boot.h
4901--- linux-2.6.32.12/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400 4901--- linux-2.6.32.13/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400
4902+++ linux-2.6.32.12/arch/x86/boot/boot.h 2010-04-04 20:46:41.496772577 -0400 4902+++ linux-2.6.32.13/arch/x86/boot/boot.h 2010-05-15 13:21:13.862896966 -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.12/arch/x86/boot/boot.h linux-2.6.32.12/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.12/arch/x86/boot/compressed/head_32.S linux-2.6.32.12/arch/x86/boot/compressed/head_32.S 4921diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_32.S linux-2.6.32.13/arch/x86/boot/compressed/head_32.S
4922--- linux-2.6.32.12/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400 4922--- linux-2.6.32.13/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400
4923+++ linux-2.6.32.12/arch/x86/boot/compressed/head_32.S 2010-04-04 20:46:41.496772577 -0400 4923+++ linux-2.6.32.13/arch/x86/boot/compressed/head_32.S 2010-05-15 13:21:13.862896966 -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.12/arch/x86/boot/compressed/head_32.S linux-2.6.32.12/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.12/arch/x86/boot/compressed/head_64.S linux-2.6.32.12/arch/x86/boot/compressed/head_64.S 4952diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/head_64.S linux-2.6.32.13/arch/x86/boot/compressed/head_64.S
4953--- linux-2.6.32.12/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400 4953--- linux-2.6.32.13/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400
4954+++ linux-2.6.32.12/arch/x86/boot/compressed/head_64.S 2010-04-04 20:46:41.496772577 -0400 4954+++ linux-2.6.32.13/arch/x86/boot/compressed/head_64.S 2010-05-15 13:21:13.862896966 -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.12/arch/x86/boot/compressed/head_64.S linux-2.6.32.12/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.12/arch/x86/boot/compressed/misc.c linux-2.6.32.12/arch/x86/boot/compressed/misc.c 4973diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/misc.c linux-2.6.32.13/arch/x86/boot/compressed/misc.c
4974--- linux-2.6.32.12/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400 4974--- linux-2.6.32.13/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400
4975+++ linux-2.6.32.12/arch/x86/boot/compressed/misc.c 2010-04-04 20:46:41.496772577 -0400 4975+++ linux-2.6.32.13/arch/x86/boot/compressed/misc.c 2010-05-15 13:21:13.866567010 -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.12/arch/x86/boot/compressed/misc.c linux-2.6.32.12/arch/
4991 error("Wrong destination address"); 4991 error("Wrong destination address");
4992 #endif 4992 #endif
4993 4993
4994diff -urNp linux-2.6.32.12/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.12/arch/x86/boot/compressed/mkpiggy.c 4994diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c
4995--- linux-2.6.32.12/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400 4995--- linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400
4996+++ linux-2.6.32.12/arch/x86/boot/compressed/mkpiggy.c 2010-04-04 20:46:41.496772577 -0400 4996+++ linux-2.6.32.13/arch/x86/boot/compressed/mkpiggy.c 2010-05-15 13:21:13.866567010 -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.12/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.12/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.12/arch/x86/boot/compressed/relocs.c linux-2.6.32.12/arch/x86/boot/compressed/relocs.c 5006diff -urNp linux-2.6.32.13/arch/x86/boot/compressed/relocs.c linux-2.6.32.13/arch/x86/boot/compressed/relocs.c
5007--- linux-2.6.32.12/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400 5007--- linux-2.6.32.13/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400
5008+++ linux-2.6.32.12/arch/x86/boot/compressed/relocs.c 2010-04-04 20:46:41.500459645 -0400 5008+++ linux-2.6.32.13/arch/x86/boot/compressed/relocs.c 2010-05-15 13:21:13.866567010 -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.12/arch/x86/boot/compressed/relocs.c linux-2.6.32.12/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.12/arch/x86/boot/cpucheck.c linux-2.6.32.12/arch/x86/boot/cpucheck.c 5209diff -urNp linux-2.6.32.13/arch/x86/boot/cpucheck.c linux-2.6.32.13/arch/x86/boot/cpucheck.c
5210--- linux-2.6.32.12/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400 5210--- linux-2.6.32.13/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400
5211+++ linux-2.6.32.12/arch/x86/boot/cpucheck.c 2010-04-04 20:46:41.500459645 -0400 5211+++ linux-2.6.32.13/arch/x86/boot/cpucheck.c 2010-05-15 13:21:13.878594921 -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.12/arch/x86/boot/cpucheck.c linux-2.6.32.12/arch/x86/boo
5304 5304
5305 err = check_flags(); 5305 err = check_flags();
5306 } 5306 }
5307diff -urNp linux-2.6.32.12/arch/x86/boot/header.S linux-2.6.32.12/arch/x86/boot/header.S 5307diff -urNp linux-2.6.32.13/arch/x86/boot/header.S linux-2.6.32.13/arch/x86/boot/header.S
5308--- linux-2.6.32.12/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400 5308--- linux-2.6.32.13/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400
5309+++ linux-2.6.32.12/arch/x86/boot/header.S 2010-04-04 20:46:41.500459645 -0400 5309+++ linux-2.6.32.13/arch/x86/boot/header.S 2010-05-15 13:21:13.878594921 -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.12/arch/x86/boot/header.S linux-2.6.32.12/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.12/arch/x86/boot/memory.c linux-2.6.32.12/arch/x86/boot/memory.c 5319diff -urNp linux-2.6.32.13/arch/x86/boot/memory.c linux-2.6.32.13/arch/x86/boot/memory.c
5320--- linux-2.6.32.12/arch/x86/boot/memory.c 2010-03-15 11:52:04.000000000 -0400 5320--- linux-2.6.32.13/arch/x86/boot/memory.c 2010-03-15 11:52:04.000000000 -0400
5321+++ linux-2.6.32.12/arch/x86/boot/memory.c 2010-04-29 17:46:37.065247062 -0400 5321+++ linux-2.6.32.13/arch/x86/boot/memory.c 2010-05-15 13:21:13.878594921 -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.12/arch/x86/boot/memory.c linux-2.6.32.12/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.12/arch/x86/boot/video.c linux-2.6.32.12/arch/x86/boot/video.c 5331diff -urNp linux-2.6.32.13/arch/x86/boot/video.c linux-2.6.32.13/arch/x86/boot/video.c
5332--- linux-2.6.32.12/arch/x86/boot/video.c 2010-03-15 11:52:04.000000000 -0400 5332--- linux-2.6.32.13/arch/x86/boot/video.c 2010-03-15 11:52:04.000000000 -0400
5333+++ linux-2.6.32.12/arch/x86/boot/video.c 2010-04-29 17:46:37.069058404 -0400 5333+++ linux-2.6.32.13/arch/x86/boot/video.c 2010-05-15 13:21:13.878594921 -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.12/arch/x86/boot/video.c linux-2.6.32.12/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.12/arch/x86/boot/video-vesa.c linux-2.6.32.12/arch/x86/boot/video-vesa.c 5343diff -urNp linux-2.6.32.13/arch/x86/boot/video-vesa.c linux-2.6.32.13/arch/x86/boot/video-vesa.c
5344--- linux-2.6.32.12/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400 5344--- linux-2.6.32.13/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400
5345+++ linux-2.6.32.12/arch/x86/boot/video-vesa.c 2010-04-04 20:46:41.500459645 -0400 5345+++ linux-2.6.32.13/arch/x86/boot/video-vesa.c 2010-05-15 13:21:13.878594921 -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.12/arch/x86/boot/video-vesa.c linux-2.6.32.12/arch/x86/b
5351 } 5351 }
5352 5352
5353 /* 5353 /*
5354diff -urNp linux-2.6.32.12/arch/x86/ia32/ia32entry.S linux-2.6.32.12/arch/x86/ia32/ia32entry.S 5354diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32entry.S linux-2.6.32.13/arch/x86/ia32/ia32entry.S
5355--- linux-2.6.32.12/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400 5355--- linux-2.6.32.13/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400
5356+++ linux-2.6.32.12/arch/x86/ia32/ia32entry.S 2010-04-04 20:58:33.225084964 -0400 5356+++ linux-2.6.32.13/arch/x86/ia32/ia32entry.S 2010-05-15 13:21:13.878594921 -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.12/arch/x86/ia32/ia32entry.S linux-2.6.32.12/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.12/arch/x86/ia32/ia32_signal.c linux-2.6.32.12/arch/x86/ia32/ia32_signal.c 5451diff -urNp linux-2.6.32.13/arch/x86/ia32/ia32_signal.c linux-2.6.32.13/arch/x86/ia32/ia32_signal.c
5452--- linux-2.6.32.12/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400 5452--- linux-2.6.32.13/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400
5453+++ linux-2.6.32.12/arch/x86/ia32/ia32_signal.c 2010-04-04 20:46:41.500459645 -0400 5453+++ linux-2.6.32.13/arch/x86/ia32/ia32_signal.c 2010-05-15 13:21:13.878594921 -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.12/arch/x86/ia32/ia32_signal.c linux-2.6.32.12/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.12/arch/x86/include/asm/alternative.h linux-2.6.32.12/arch/x86/include/asm/alternative.h 5472diff -urNp linux-2.6.32.13/arch/x86/include/asm/alternative.h linux-2.6.32.13/arch/x86/include/asm/alternative.h
5473--- linux-2.6.32.12/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400 5473--- linux-2.6.32.13/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400
5474+++ linux-2.6.32.12/arch/x86/include/asm/alternative.h 2010-04-04 20:46:41.500459645 -0400 5474+++ linux-2.6.32.13/arch/x86/include/asm/alternative.h 2010-05-15 13:21:13.878594921 -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.12/arch/x86/include/asm/alternative.h linux-2.6.32.12/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.12/arch/x86/include/asm/apm.h linux-2.6.32.12/arch/x86/include/asm/apm.h 5484diff -urNp linux-2.6.32.13/arch/x86/include/asm/apm.h linux-2.6.32.13/arch/x86/include/asm/apm.h
5485--- linux-2.6.32.12/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400 5485--- linux-2.6.32.13/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400
5486+++ linux-2.6.32.12/arch/x86/include/asm/apm.h 2010-04-04 20:46:41.500459645 -0400 5486+++ linux-2.6.32.13/arch/x86/include/asm/apm.h 2010-05-15 13:21:13.878594921 -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.12/arch/x86/include/asm/apm.h linux-2.6.32.12/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.12/arch/x86/include/asm/atomic_32.h linux-2.6.32.12/arch/x86/include/asm/atomic_32.h 5505diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_32.h linux-2.6.32.13/arch/x86/include/asm/atomic_32.h
5506--- linux-2.6.32.12/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400 5506--- linux-2.6.32.13/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400
5507+++ linux-2.6.32.12/arch/x86/include/asm/atomic_32.h 2010-04-04 20:46:41.500459645 -0400 5507+++ linux-2.6.32.13/arch/x86/include/asm/atomic_32.h 2010-05-15 13:21:13.878594921 -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.12/arch/x86/include/asm/atomic_32.h linux-2.6.32.12/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.12/arch/x86/include/asm/atomic_64.h linux-2.6.32.12/arch/x86/include/asm/atomic_64.h 5838diff -urNp linux-2.6.32.13/arch/x86/include/asm/atomic_64.h linux-2.6.32.13/arch/x86/include/asm/atomic_64.h
5839--- linux-2.6.32.12/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 5839--- linux-2.6.32.13/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
5840+++ linux-2.6.32.12/arch/x86/include/asm/atomic_64.h 2010-04-04 20:46:41.500459645 -0400 5840+++ linux-2.6.32.13/arch/x86/include/asm/atomic_64.h 2010-05-15 13:21:13.878594921 -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.12/arch/x86/include/asm/atomic_64.h linux-2.6.32.12/arch
6415 } 6415 }
6416 6416
6417 /** 6417 /**
6418diff -urNp linux-2.6.32.12/arch/x86/include/asm/boot.h linux-2.6.32.12/arch/x86/include/asm/boot.h 6418diff -urNp linux-2.6.32.13/arch/x86/include/asm/boot.h linux-2.6.32.13/arch/x86/include/asm/boot.h
6419--- linux-2.6.32.12/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400 6419--- linux-2.6.32.13/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400
6420+++ linux-2.6.32.12/arch/x86/include/asm/boot.h 2010-04-04 20:46:41.500459645 -0400 6420+++ linux-2.6.32.13/arch/x86/include/asm/boot.h 2010-05-15 13:21:13.878594921 -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.12/arch/x86/include/asm/boot.h linux-2.6.32.12/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.12/arch/x86/include/asm/cacheflush.h linux-2.6.32.12/arch/x86/include/asm/cacheflush.h 6438diff -urNp linux-2.6.32.13/arch/x86/include/asm/cacheflush.h linux-2.6.32.13/arch/x86/include/asm/cacheflush.h
6439--- linux-2.6.32.12/arch/x86/include/asm/cacheflush.h 2010-03-15 11:52:04.000000000 -0400 6439--- linux-2.6.32.13/arch/x86/include/asm/cacheflush.h 2010-03-15 11:52:04.000000000 -0400
6440+++ linux-2.6.32.12/arch/x86/include/asm/cacheflush.h 2010-04-29 17:46:37.069058404 -0400 6440+++ linux-2.6.32.13/arch/x86/include/asm/cacheflush.h 2010-05-15 13:21:13.878594921 -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.12/arch/x86/include/asm/cacheflush.h linux-2.6.32.12/arc
6456 ClearPageUncached(pg); 6456 ClearPageUncached(pg);
6457 ClearPageWC(pg); 6457 ClearPageWC(pg);
6458 break; 6458 break;
6459diff -urNp linux-2.6.32.12/arch/x86/include/asm/cache.h linux-2.6.32.12/arch/x86/include/asm/cache.h 6459diff -urNp linux-2.6.32.13/arch/x86/include/asm/cache.h linux-2.6.32.13/arch/x86/include/asm/cache.h
6460--- linux-2.6.32.12/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400 6460--- linux-2.6.32.13/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400
6461+++ linux-2.6.32.12/arch/x86/include/asm/cache.h 2010-04-04 20:46:41.500459645 -0400 6461+++ linux-2.6.32.13/arch/x86/include/asm/cache.h 2010-05-15 13:21:13.878594921 -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.12/arch/x86/include/asm/cache.h linux-2.6.32.12/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.12/arch/x86/include/asm/checksum_32.h linux-2.6.32.12/arch/x86/include/asm/checksum_32.h 6470diff -urNp linux-2.6.32.13/arch/x86/include/asm/checksum_32.h linux-2.6.32.13/arch/x86/include/asm/checksum_32.h
6471--- linux-2.6.32.12/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400 6471--- linux-2.6.32.13/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400
6472+++ linux-2.6.32.12/arch/x86/include/asm/checksum_32.h 2010-04-04 20:46:41.500459645 -0400 6472+++ linux-2.6.32.13/arch/x86/include/asm/checksum_32.h 2010-05-15 13:21:13.878594921 -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.12/arch/x86/include/asm/checksum_32.h linux-2.6.32.12/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.12/arch/x86/include/asm/desc.h linux-2.6.32.12/arch/x86/include/asm/desc.h 6506diff -urNp linux-2.6.32.13/arch/x86/include/asm/desc.h linux-2.6.32.13/arch/x86/include/asm/desc.h
6507--- linux-2.6.32.12/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400 6507--- linux-2.6.32.13/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400
6508+++ linux-2.6.32.12/arch/x86/include/asm/desc.h 2010-04-29 17:46:36.819981711 -0400 6508+++ linux-2.6.32.13/arch/x86/include/asm/desc.h 2010-05-15 13:21:13.882891085 -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.12/arch/x86/include/asm/desc.h linux-2.6.32.12/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.12/arch/x86/include/asm/device.h linux-2.6.32.12/arch/x86/include/asm/device.h 6678diff -urNp linux-2.6.32.13/arch/x86/include/asm/device.h linux-2.6.32.13/arch/x86/include/asm/device.h
6679--- linux-2.6.32.12/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 6679--- linux-2.6.32.13/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
6680+++ linux-2.6.32.12/arch/x86/include/asm/device.h 2010-04-04 20:46:41.500459645 -0400 6680+++ linux-2.6.32.13/arch/x86/include/asm/device.h 2010-05-15 13:21:13.882891085 -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.12/arch/x86/include/asm/device.h linux-2.6.32.12/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.12/arch/x86/include/asm/dma-mapping.h linux-2.6.32.12/arch/x86/include/asm/dma-mapping.h 6690diff -urNp linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h
6691--- linux-2.6.32.12/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 6691--- linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
6692+++ linux-2.6.32.12/arch/x86/include/asm/dma-mapping.h 2010-04-04 20:46:41.500459645 -0400 6692+++ linux-2.6.32.13/arch/x86/include/asm/dma-mapping.h 2010-05-15 13:21:13.882891085 -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.12/arch/x86/include/asm/dma-mapping.h linux-2.6.32.12/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.12/arch/x86/include/asm/e820.h linux-2.6.32.12/arch/x86/include/asm/e820.h 6732diff -urNp linux-2.6.32.13/arch/x86/include/asm/e820.h linux-2.6.32.13/arch/x86/include/asm/e820.h
6733--- linux-2.6.32.12/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400 6733--- linux-2.6.32.13/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400
6734+++ linux-2.6.32.12/arch/x86/include/asm/e820.h 2010-04-04 20:46:41.500459645 -0400 6734+++ linux-2.6.32.13/arch/x86/include/asm/e820.h 2010-05-15 13:21:13.882891085 -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.12/arch/x86/include/asm/e820.h linux-2.6.32.12/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.12/arch/x86/include/asm/elf.h linux-2.6.32.12/arch/x86/include/asm/elf.h 6744diff -urNp linux-2.6.32.13/arch/x86/include/asm/elf.h linux-2.6.32.13/arch/x86/include/asm/elf.h
6745--- linux-2.6.32.12/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 6745--- linux-2.6.32.13/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
6746+++ linux-2.6.32.12/arch/x86/include/asm/elf.h 2010-04-04 20:58:33.220592413 -0400 6746+++ linux-2.6.32.13/arch/x86/include/asm/elf.h 2010-05-15 13:21:13.882891085 -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.12/arch/x86/include/asm/elf.h linux-2.6.32.12/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.12/arch/x86/include/asm/futex.h linux-2.6.32.12/arch/x86/include/asm/futex.h 6800diff -urNp linux-2.6.32.13/arch/x86/include/asm/futex.h linux-2.6.32.13/arch/x86/include/asm/futex.h
6801--- linux-2.6.32.12/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400 6801--- linux-2.6.32.13/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400
6802+++ linux-2.6.32.12/arch/x86/include/asm/futex.h 2010-04-04 20:58:33.220592413 -0400 6802+++ linux-2.6.32.13/arch/x86/include/asm/futex.h 2010-05-15 13:21:13.882891085 -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.12/arch/x86/include/asm/futex.h linux-2.6.32.12/arch/x86
6936 : "memory" 6936 : "memory"
6937 ); 6937 );
6938 6938
6939diff -urNp linux-2.6.32.12/arch/x86/include/asm/i387.h linux-2.6.32.12/arch/x86/include/asm/i387.h 6939diff -urNp linux-2.6.32.13/arch/x86/include/asm/i387.h linux-2.6.32.13/arch/x86/include/asm/i387.h
6940--- linux-2.6.32.12/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400 6940--- linux-2.6.32.13/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400
6941+++ linux-2.6.32.12/arch/x86/include/asm/i387.h 2010-04-04 20:58:33.220592413 -0400 6941+++ linux-2.6.32.13/arch/x86/include/asm/i387.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/i387.h linux-2.6.32.12/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.12/arch/x86/include/asm/io_64.h linux-2.6.32.12/arch/x86/include/asm/io_64.h 6982diff -urNp linux-2.6.32.13/arch/x86/include/asm/io_64.h linux-2.6.32.13/arch/x86/include/asm/io_64.h
6983--- linux-2.6.32.12/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400 6983--- linux-2.6.32.13/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400
6984+++ linux-2.6.32.12/arch/x86/include/asm/io_64.h 2010-04-04 20:46:41.500459645 -0400 6984+++ linux-2.6.32.13/arch/x86/include/asm/io_64.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/io_64.h linux-2.6.32.12/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.12/arch/x86/include/asm/iommu.h linux-2.6.32.12/arch/x86/include/asm/iommu.h 7003diff -urNp linux-2.6.32.13/arch/x86/include/asm/iommu.h linux-2.6.32.13/arch/x86/include/asm/iommu.h
7004--- linux-2.6.32.12/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 7004--- linux-2.6.32.13/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
7005+++ linux-2.6.32.12/arch/x86/include/asm/iommu.h 2010-04-04 20:46:41.500459645 -0400 7005+++ linux-2.6.32.13/arch/x86/include/asm/iommu.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/iommu.h linux-2.6.32.12/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.12/arch/x86/include/asm/irqflags.h linux-2.6.32.12/arch/x86/include/asm/irqflags.h 7015diff -urNp linux-2.6.32.13/arch/x86/include/asm/irqflags.h linux-2.6.32.13/arch/x86/include/asm/irqflags.h
7016--- linux-2.6.32.12/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400 7016--- linux-2.6.32.13/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400
7017+++ linux-2.6.32.12/arch/x86/include/asm/irqflags.h 2010-04-07 19:33:06.601891934 -0400 7017+++ linux-2.6.32.13/arch/x86/include/asm/irqflags.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/irqflags.h linux-2.6.32.12/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.12/arch/x86/include/asm/kvm_host.h linux-2.6.32.12/arch/x86/include/asm/kvm_host.h 7030diff -urNp linux-2.6.32.13/arch/x86/include/asm/kvm_host.h linux-2.6.32.13/arch/x86/include/asm/kvm_host.h
7031--- linux-2.6.32.12/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:37.497949072 -0400 7031--- linux-2.6.32.13/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:37.497949072 -0400
7032+++ linux-2.6.32.12/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:57.941485514 -0400 7032+++ linux-2.6.32.13/arch/x86/include/asm/kvm_host.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/kvm_host.h linux-2.6.32.12/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.12/arch/x86/include/asm/local.h linux-2.6.32.12/arch/x86/include/asm/local.h 7042diff -urNp linux-2.6.32.13/arch/x86/include/asm/local.h linux-2.6.32.13/arch/x86/include/asm/local.h
7043--- linux-2.6.32.12/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400 7043--- linux-2.6.32.13/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400
7044+++ linux-2.6.32.12/arch/x86/include/asm/local.h 2010-04-04 20:46:41.500459645 -0400 7044+++ linux-2.6.32.13/arch/x86/include/asm/local.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/local.h linux-2.6.32.12/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.12/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.12/arch/x86/include/asm/mc146818rtc.h 7269diff -urNp linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h
7270--- linux-2.6.32.12/arch/x86/include/asm/mc146818rtc.h 2010-03-15 11:52:04.000000000 -0400 7270--- linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h 2010-03-15 11:52:04.000000000 -0400
7271+++ linux-2.6.32.12/arch/x86/include/asm/mc146818rtc.h 2010-04-29 17:46:37.069058404 -0400 7271+++ linux-2.6.32.13/arch/x86/include/asm/mc146818rtc.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.12/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.12/arch/x86/include/asm/microcode.h linux-2.6.32.12/arch/x86/include/asm/microcode.h 7283diff -urNp linux-2.6.32.13/arch/x86/include/asm/microcode.h linux-2.6.32.13/arch/x86/include/asm/microcode.h
7284--- linux-2.6.32.12/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400 7284--- linux-2.6.32.13/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400
7285+++ linux-2.6.32.12/arch/x86/include/asm/microcode.h 2010-04-04 20:46:41.500459645 -0400 7285+++ linux-2.6.32.13/arch/x86/include/asm/microcode.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/microcode.h linux-2.6.32.12/arch
7323 { 7323 {
7324 return NULL; 7324 return NULL;
7325 } 7325 }
7326diff -urNp linux-2.6.32.12/arch/x86/include/asm/mman.h linux-2.6.32.12/arch/x86/include/asm/mman.h 7326diff -urNp linux-2.6.32.13/arch/x86/include/asm/mman.h linux-2.6.32.13/arch/x86/include/asm/mman.h
7327--- linux-2.6.32.12/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400 7327--- linux-2.6.32.13/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400
7328+++ linux-2.6.32.12/arch/x86/include/asm/mman.h 2010-04-04 20:46:41.500459645 -0400 7328+++ linux-2.6.32.13/arch/x86/include/asm/mman.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/mman.h linux-2.6.32.12/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.12/arch/x86/include/asm/mmu_context.h linux-2.6.32.12/arch/x86/include/asm/mmu_context.h 7344diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu_context.h linux-2.6.32.13/arch/x86/include/asm/mmu_context.h
7345--- linux-2.6.32.12/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400 7345--- linux-2.6.32.13/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400
7346+++ linux-2.6.32.12/arch/x86/include/asm/mmu_context.h 2010-04-29 17:46:36.829235058 -0400 7346+++ linux-2.6.32.13/arch/x86/include/asm/mmu_context.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/mmu_context.h linux-2.6.32.12/ar
7468 } 7468 }
7469 7469
7470 #define activate_mm(prev, next) \ 7470 #define activate_mm(prev, next) \
7471diff -urNp linux-2.6.32.12/arch/x86/include/asm/mmu.h linux-2.6.32.12/arch/x86/include/asm/mmu.h 7471diff -urNp linux-2.6.32.13/arch/x86/include/asm/mmu.h linux-2.6.32.13/arch/x86/include/asm/mmu.h
7472--- linux-2.6.32.12/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400 7472--- linux-2.6.32.13/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400
7473+++ linux-2.6.32.12/arch/x86/include/asm/mmu.h 2010-04-04 20:46:41.500459645 -0400 7473+++ linux-2.6.32.13/arch/x86/include/asm/mmu.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/mmu.h linux-2.6.32.12/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.12/arch/x86/include/asm/module.h linux-2.6.32.12/arch/x86/include/asm/module.h 7500diff -urNp linux-2.6.32.13/arch/x86/include/asm/module.h linux-2.6.32.13/arch/x86/include/asm/module.h
7501--- linux-2.6.32.12/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400 7501--- linux-2.6.32.13/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400
7502+++ linux-2.6.32.12/arch/x86/include/asm/module.h 2010-04-04 21:01:05.305858196 -0400 7502+++ linux-2.6.32.13/arch/x86/include/asm/module.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/module.h linux-2.6.32.12/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.12/arch/x86/include/asm/page_32_types.h linux-2.6.32.12/arch/x86/include/asm/page_32_types.h 7536diff -urNp linux-2.6.32.13/arch/x86/include/asm/page_32_types.h linux-2.6.32.13/arch/x86/include/asm/page_32_types.h
7537--- linux-2.6.32.12/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400 7537--- linux-2.6.32.13/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400
7538+++ linux-2.6.32.12/arch/x86/include/asm/page_32_types.h 2010-04-04 20:46:41.505526780 -0400 7538+++ linux-2.6.32.13/arch/x86/include/asm/page_32_types.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/page_32_types.h linux-2.6.32.12/
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.12/arch/x86/include/asm/page_64_types.h linux-2.6.32.12/arch/x86/include/asm/page_64_types.h 7550diff -urNp linux-2.6.32.13/arch/x86/include/asm/page_64_types.h linux-2.6.32.13/arch/x86/include/asm/page_64_types.h
7551--- linux-2.6.32.12/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400 7551--- linux-2.6.32.13/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400
7552+++ linux-2.6.32.12/arch/x86/include/asm/page_64_types.h 2010-04-04 20:46:41.505526780 -0400 7552+++ linux-2.6.32.13/arch/x86/include/asm/page_64_types.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/page_64_types.h linux-2.6.32.12/
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.12/arch/x86/include/asm/paravirt.h linux-2.6.32.12/arch/x86/include/asm/paravirt.h 7563diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt.h linux-2.6.32.13/arch/x86/include/asm/paravirt.h
7564--- linux-2.6.32.12/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400 7564--- linux-2.6.32.13/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400
7565+++ linux-2.6.32.12/arch/x86/include/asm/paravirt.h 2010-04-07 16:58:23.343008831 -0400 7565+++ linux-2.6.32.13/arch/x86/include/asm/paravirt.h 2010-05-15 13:21:13.886644440 -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.12/arch/x86/include/asm/paravirt.h linux-2.6.32.12/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.12/arch/x86/include/asm/paravirt_types.h linux-2.6.32.12/arch/x86/include/asm/paravirt_types.h 7619diff -urNp linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h
7620--- linux-2.6.32.12/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400 7620--- linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400
7621+++ linux-2.6.32.12/arch/x86/include/asm/paravirt_types.h 2010-04-04 20:46:41.505526780 -0400 7621+++ linux-2.6.32.13/arch/x86/include/asm/paravirt_types.h 2010-05-15 13:21:13.902905019 -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.12/arch/x86/include/asm/paravirt_types.h linux-2.6.32.12
7632 }; 7632 };
7633 7633
7634 struct raw_spinlock; 7634 struct raw_spinlock;
7635diff -urNp linux-2.6.32.12/arch/x86/include/asm/pci_x86.h linux-2.6.32.12/arch/x86/include/asm/pci_x86.h 7635diff -urNp linux-2.6.32.13/arch/x86/include/asm/pci_x86.h linux-2.6.32.13/arch/x86/include/asm/pci_x86.h
7636--- linux-2.6.32.12/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400 7636--- linux-2.6.32.13/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400
7637+++ linux-2.6.32.12/arch/x86/include/asm/pci_x86.h 2010-04-04 20:46:41.505526780 -0400 7637+++ linux-2.6.32.13/arch/x86/include/asm/pci_x86.h 2010-05-15 13:21:13.902905019 -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.12/arch/x86/include/asm/pci_x86.h linux-2.6.32.12/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.12/arch/x86/include/asm/pgalloc.h linux-2.6.32.12/arch/x86/include/asm/pgalloc.h 7660diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgalloc.h linux-2.6.32.13/arch/x86/include/asm/pgalloc.h
7661--- linux-2.6.32.12/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400 7661--- linux-2.6.32.13/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400
7662+++ linux-2.6.32.12/arch/x86/include/asm/pgalloc.h 2010-04-04 20:46:41.505526780 -0400 7662+++ linux-2.6.32.13/arch/x86/include/asm/pgalloc.h 2010-05-15 13:21:13.902905019 -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.12/arch/x86/include/asm/pgalloc.h linux-2.6.32.12/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.12/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.12/arch/x86/include/asm/pgtable-2level.h 7677diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h
7678--- linux-2.6.32.12/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400 7678--- linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400
7679+++ linux-2.6.32.12/arch/x86/include/asm/pgtable-2level.h 2010-04-04 20:46:41.505526780 -0400 7679+++ linux-2.6.32.13/arch/x86/include/asm/pgtable-2level.h 2010-05-15 13:21:13.902905019 -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.12/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.12
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.12/arch/x86/include/asm/pgtable_32.h linux-2.6.32.12/arch/x86/include/asm/pgtable_32.h 7690diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h
7691--- linux-2.6.32.12/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 7691--- linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
7692+++ linux-2.6.32.12/arch/x86/include/asm/pgtable_32.h 2010-04-04 20:46:41.505526780 -0400 7692+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_32.h 2010-05-15 13:21:13.902905019 -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.12/arch/x86/include/asm/pgtable_32.h linux-2.6.32.12/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.12/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.12/arch/x86/include/asm/pgtable_32_types.h 7734diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h
7735--- linux-2.6.32.12/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400 7735--- linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400
7736+++ linux-2.6.32.12/arch/x86/include/asm/pgtable_32_types.h 2010-04-04 20:46:41.505526780 -0400 7736+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_32_types.h 2010-05-15 13:21:13.902905019 -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.12/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.12/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.12/arch/x86/include/asm/pgtable-3level.h 7766diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h
7767--- linux-2.6.32.12/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400 7767--- linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400
7768+++ linux-2.6.32.12/arch/x86/include/asm/pgtable-3level.h 2010-04-04 20:46:41.505526780 -0400 7768+++ linux-2.6.32.13/arch/x86/include/asm/pgtable-3level.h 2010-05-15 13:21:13.902905019 -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.12/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.12
7783 } 7783 }
7784 7784
7785 /* 7785 /*
7786diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgtable_64.h linux-2.6.32.12/arch/x86/include/asm/pgtable_64.h 7786diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h
7787--- linux-2.6.32.12/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400 7787--- linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400
7788+++ linux-2.6.32.12/arch/x86/include/asm/pgtable_64.h 2010-04-04 20:58:33.220592413 -0400 7788+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_64.h 2010-05-15 13:21:13.906812769 -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,20 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgtable_64.h linux-2.6.32.12/arc
7831 } 7831 }
7832 7832
7833 /* 7833 /*
7834diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgtable.h linux-2.6.32.12/arch/x86/include/asm/pgtable.h 7834diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h
7835--- linux-2.6.32.12/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 7835--- linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h 2010-03-15 11:52:04.000000000 -0400
7836+++ linux-2.6.32.12/arch/x86/include/asm/pgtable.h 2010-04-04 20:58:33.220592413 -0400 7836+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_64_types.h 2010-05-15 13:23:38.946686210 -0400
7837@@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t;
7838 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
7839 #define MODULES_END _AC(0xffffffffff000000, UL)
7840 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
7841+#define MODULES_EXEC_VADDR MODULES_VADDR
7842+#define MODULES_EXEC_END MODULES_END
7843
7844 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
7845diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable.h linux-2.6.32.13/arch/x86/include/asm/pgtable.h
7846--- linux-2.6.32.13/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
7847+++ linux-2.6.32.13/arch/x86/include/asm/pgtable.h 2010-05-15 13:21:13.906812769 -0400
7837@@ -74,12 +74,51 @@ extern struct list_head pgd_list; 7848@@ -74,12 +74,51 @@ extern struct list_head pgd_list;
7838 7849
7839 #define arch_end_context_switch(prev) do {} while(0) 7850 #define arch_end_context_switch(prev) do {} while(0)
@@ -7998,9 +8009,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgtable.h linux-2.6.32.12/arch/x
7998 8009
7999 #include <asm-generic/pgtable.h> 8010 #include <asm-generic/pgtable.h>
8000 #endif /* __ASSEMBLY__ */ 8011 #endif /* __ASSEMBLY__ */
8001diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgtable_types.h linux-2.6.32.12/arch/x86/include/asm/pgtable_types.h 8012diff -urNp linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h
8002--- linux-2.6.32.12/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400 8013--- linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400
8003+++ linux-2.6.32.12/arch/x86/include/asm/pgtable_types.h 2010-04-04 20:46:41.505526780 -0400 8014+++ linux-2.6.32.13/arch/x86/include/asm/pgtable_types.h 2010-05-15 13:21:13.906812769 -0400
8004@@ -16,12 +16,11 @@ 8015@@ -16,12 +16,11 @@
8005 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ 8016 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
8006 #define _PAGE_BIT_PAT 7 /* on 4KB pages */ 8017 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -8085,9 +8096,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgtable_types.h linux-2.6.32.12/
8085 8096
8086 #define pgprot_writecombine pgprot_writecombine 8097 #define pgprot_writecombine pgprot_writecombine
8087 extern pgprot_t pgprot_writecombine(pgprot_t prot); 8098 extern pgprot_t pgprot_writecombine(pgprot_t prot);
8088diff -urNp linux-2.6.32.12/arch/x86/include/asm/processor.h linux-2.6.32.12/arch/x86/include/asm/processor.h 8099diff -urNp linux-2.6.32.13/arch/x86/include/asm/processor.h linux-2.6.32.13/arch/x86/include/asm/processor.h
8089--- linux-2.6.32.12/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400 8100--- linux-2.6.32.13/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400
8090+++ linux-2.6.32.12/arch/x86/include/asm/processor.h 2010-04-04 20:58:33.220592413 -0400 8101+++ linux-2.6.32.13/arch/x86/include/asm/processor.h 2010-05-15 13:21:13.906812769 -0400
8091@@ -272,7 +272,7 @@ struct tss_struct { 8102@@ -272,7 +272,7 @@ struct tss_struct {
8092 8103
8093 } ____cacheline_aligned; 8104 } ____cacheline_aligned;
@@ -8172,9 +8183,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/processor.h linux-2.6.32.12/arch
8172 #define KSTK_EIP(task) (task_pt_regs(task)->ip) 8183 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
8173 8184
8174 /* Get/set a process' ability to use the timestamp counter instruction */ 8185 /* Get/set a process' ability to use the timestamp counter instruction */
8175diff -urNp linux-2.6.32.12/arch/x86/include/asm/ptrace.h linux-2.6.32.12/arch/x86/include/asm/ptrace.h 8186diff -urNp linux-2.6.32.13/arch/x86/include/asm/ptrace.h linux-2.6.32.13/arch/x86/include/asm/ptrace.h
8176--- linux-2.6.32.12/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400 8187--- linux-2.6.32.13/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400
8177+++ linux-2.6.32.12/arch/x86/include/asm/ptrace.h 2010-04-04 20:46:41.505526780 -0400 8188+++ linux-2.6.32.13/arch/x86/include/asm/ptrace.h 2010-05-15 13:21:13.906812769 -0400
8178@@ -151,28 +151,29 @@ static inline unsigned long regs_return_ 8189@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
8179 } 8190 }
8180 8191
@@ -8211,9 +8222,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/ptrace.h linux-2.6.32.12/arch/x8
8211 #endif 8222 #endif
8212 } 8223 }
8213 8224
8214diff -urNp linux-2.6.32.12/arch/x86/include/asm/reboot.h linux-2.6.32.12/arch/x86/include/asm/reboot.h 8225diff -urNp linux-2.6.32.13/arch/x86/include/asm/reboot.h linux-2.6.32.13/arch/x86/include/asm/reboot.h
8215--- linux-2.6.32.12/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400 8226--- linux-2.6.32.13/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400
8216+++ linux-2.6.32.12/arch/x86/include/asm/reboot.h 2010-04-04 20:46:41.505526780 -0400 8227+++ linux-2.6.32.13/arch/x86/include/asm/reboot.h 2010-05-15 13:21:13.906812769 -0400
8217@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; 8228@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
8218 8229
8219 void native_machine_crash_shutdown(struct pt_regs *regs); 8230 void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -8223,9 +8234,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/reboot.h linux-2.6.32.12/arch/x8
8223 8234
8224 typedef void (*nmi_shootdown_cb)(int, struct die_args*); 8235 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
8225 void nmi_shootdown_cpus(nmi_shootdown_cb callback); 8236 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
8226diff -urNp linux-2.6.32.12/arch/x86/include/asm/rwsem.h linux-2.6.32.12/arch/x86/include/asm/rwsem.h 8237diff -urNp linux-2.6.32.13/arch/x86/include/asm/rwsem.h linux-2.6.32.13/arch/x86/include/asm/rwsem.h
8227--- linux-2.6.32.12/arch/x86/include/asm/rwsem.h 2010-04-29 17:49:37.501451369 -0400 8238--- linux-2.6.32.13/arch/x86/include/asm/rwsem.h 2010-04-29 17:49:37.501451369 -0400
8228+++ linux-2.6.32.12/arch/x86/include/asm/rwsem.h 2010-04-29 20:01:51.893191958 -0400 8239+++ linux-2.6.32.13/arch/x86/include/asm/rwsem.h 2010-05-15 13:21:13.906812769 -0400
8229@@ -118,10 +118,26 @@ static inline void __down_read(struct rw 8240@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
8230 { 8241 {
8231 asm volatile("# beginning down_read\n\t" 8242 asm volatile("# beginning down_read\n\t"
@@ -8461,9 +8472,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/rwsem.h linux-2.6.32.12/arch/x86
8461 : "+r" (tmp), "+m" (sem->count) 8472 : "+r" (tmp), "+m" (sem->count)
8462 : : "memory"); 8473 : : "memory");
8463 8474
8464diff -urNp linux-2.6.32.12/arch/x86/include/asm/segment.h linux-2.6.32.12/arch/x86/include/asm/segment.h 8475diff -urNp linux-2.6.32.13/arch/x86/include/asm/segment.h linux-2.6.32.13/arch/x86/include/asm/segment.h
8465--- linux-2.6.32.12/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400 8476--- linux-2.6.32.13/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400
8466+++ linux-2.6.32.12/arch/x86/include/asm/segment.h 2010-04-04 20:46:41.505526780 -0400 8477+++ linux-2.6.32.13/arch/x86/include/asm/segment.h 2010-05-15 13:21:13.906812769 -0400
8467@@ -62,8 +62,8 @@ 8478@@ -62,8 +62,8 @@
8468 * 26 - ESPFIX small SS 8479 * 26 - ESPFIX small SS
8469 * 27 - per-cpu [ offset to per-cpu data area ] 8480 * 27 - per-cpu [ offset to per-cpu data area ]
@@ -8532,9 +8543,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/segment.h linux-2.6.32.12/arch/x
8532 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) 8543 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
8533 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) 8544 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
8534 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) 8545 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
8535diff -urNp linux-2.6.32.12/arch/x86/include/asm/spinlock.h linux-2.6.32.12/arch/x86/include/asm/spinlock.h 8546diff -urNp linux-2.6.32.13/arch/x86/include/asm/spinlock.h linux-2.6.32.13/arch/x86/include/asm/spinlock.h
8536--- linux-2.6.32.12/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400 8547--- linux-2.6.32.13/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400
8537+++ linux-2.6.32.12/arch/x86/include/asm/spinlock.h 2010-04-04 20:46:41.505526780 -0400 8548+++ linux-2.6.32.13/arch/x86/include/asm/spinlock.h 2010-05-15 13:21:13.906812769 -0400
8538@@ -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
8539 static inline void __raw_read_lock(raw_rwlock_t *rw) 8550 static inline void __raw_read_lock(raw_rwlock_t *rw)
8540 { 8551 {
@@ -8638,9 +8649,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/spinlock.h linux-2.6.32.12/arch/
8638 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); 8649 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
8639 } 8650 }
8640 8651
8641diff -urNp linux-2.6.32.12/arch/x86/include/asm/system.h linux-2.6.32.12/arch/x86/include/asm/system.h 8652diff -urNp linux-2.6.32.13/arch/x86/include/asm/system.h linux-2.6.32.13/arch/x86/include/asm/system.h
8642--- linux-2.6.32.12/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 8653--- linux-2.6.32.13/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
8643+++ linux-2.6.32.12/arch/x86/include/asm/system.h 2010-04-04 20:46:41.505526780 -0400 8654+++ linux-2.6.32.13/arch/x86/include/asm/system.h 2010-05-15 13:21:13.906812769 -0400
8644@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un 8655@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
8645 { 8656 {
8646 unsigned long __limit; 8657 unsigned long __limit;
@@ -8659,9 +8670,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/system.h linux-2.6.32.12/arch/x8
8659 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);
8660 8671
8661 void default_idle(void); 8672 void default_idle(void);
8662diff -urNp linux-2.6.32.12/arch/x86/include/asm/uaccess_32.h linux-2.6.32.12/arch/x86/include/asm/uaccess_32.h 8673diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h
8663--- linux-2.6.32.12/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 8674--- linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
8664+++ linux-2.6.32.12/arch/x86/include/asm/uaccess_32.h 2010-04-04 20:46:41.505526780 -0400 8675+++ linux-2.6.32.13/arch/x86/include/asm/uaccess_32.h 2010-05-15 13:21:13.906812769 -0400
8665@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u 8676@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
8666 static __always_inline unsigned long __must_check 8677 static __always_inline unsigned long __must_check
8667 __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)
@@ -8791,9 +8802,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/uaccess_32.h linux-2.6.32.12/arc
8791 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,
8792 long count); 8803 long count);
8793 long __must_check __strncpy_from_user(char *dst, 8804 long __must_check __strncpy_from_user(char *dst,
8794diff -urNp linux-2.6.32.12/arch/x86/include/asm/uaccess_64.h linux-2.6.32.12/arch/x86/include/asm/uaccess_64.h 8805diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h
8795--- linux-2.6.32.12/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 8806--- linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
8796+++ linux-2.6.32.12/arch/x86/include/asm/uaccess_64.h 2010-04-04 20:58:33.220592413 -0400 8807+++ linux-2.6.32.13/arch/x86/include/asm/uaccess_64.h 2010-05-15 13:21:13.906812769 -0400
8797@@ -9,6 +9,9 @@ 8808@@ -9,6 +9,9 @@
8798 #include <linux/prefetch.h> 8809 #include <linux/prefetch.h>
8799 #include <linux/lockdep.h> 8810 #include <linux/lockdep.h>
@@ -8985,9 +8996,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/uaccess_64.h linux-2.6.32.12/arc
8985 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);
8986 8997
8987 #endif /* _ASM_X86_UACCESS_64_H */ 8998 #endif /* _ASM_X86_UACCESS_64_H */
8988diff -urNp linux-2.6.32.12/arch/x86/include/asm/uaccess.h linux-2.6.32.12/arch/x86/include/asm/uaccess.h 8999diff -urNp linux-2.6.32.13/arch/x86/include/asm/uaccess.h linux-2.6.32.13/arch/x86/include/asm/uaccess.h
8989--- linux-2.6.32.12/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 9000--- linux-2.6.32.13/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
8990+++ linux-2.6.32.12/arch/x86/include/asm/uaccess.h 2010-04-04 20:58:33.220592413 -0400 9001+++ linux-2.6.32.13/arch/x86/include/asm/uaccess.h 2010-05-15 13:21:13.906812769 -0400
8991@@ -8,8 +8,11 @@ 9002@@ -8,8 +8,11 @@
8992 #include <linux/thread_info.h> 9003 #include <linux/thread_info.h>
8993 #include <linux/prefetch.h> 9004 #include <linux/prefetch.h>
@@ -9208,9 +9219,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/uaccess.h linux-2.6.32.12/arch/x
9208 #ifdef CONFIG_X86_32 9219 #ifdef CONFIG_X86_32
9209 # include "uaccess_32.h" 9220 # include "uaccess_32.h"
9210 #else 9221 #else
9211diff -urNp linux-2.6.32.12/arch/x86/include/asm/vgtod.h linux-2.6.32.12/arch/x86/include/asm/vgtod.h 9222diff -urNp linux-2.6.32.13/arch/x86/include/asm/vgtod.h linux-2.6.32.13/arch/x86/include/asm/vgtod.h
9212--- linux-2.6.32.12/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400 9223--- linux-2.6.32.13/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400
9213+++ linux-2.6.32.12/arch/x86/include/asm/vgtod.h 2010-04-04 20:46:41.509696869 -0400 9224+++ linux-2.6.32.13/arch/x86/include/asm/vgtod.h 2010-05-15 13:21:13.906812769 -0400
9214@@ -14,6 +14,7 @@ struct vsyscall_gtod_data { 9225@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
9215 int sysctl_enabled; 9226 int sysctl_enabled;
9216 struct timezone sys_tz; 9227 struct timezone sys_tz;
@@ -9219,9 +9230,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/vgtod.h linux-2.6.32.12/arch/x86
9219 cycle_t (*vread)(void); 9230 cycle_t (*vread)(void);
9220 cycle_t cycle_last; 9231 cycle_t cycle_last;
9221 cycle_t mask; 9232 cycle_t mask;
9222diff -urNp linux-2.6.32.12/arch/x86/include/asm/vmi.h linux-2.6.32.12/arch/x86/include/asm/vmi.h 9233diff -urNp linux-2.6.32.13/arch/x86/include/asm/vmi.h linux-2.6.32.13/arch/x86/include/asm/vmi.h
9223--- linux-2.6.32.12/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400 9234--- linux-2.6.32.13/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400
9224+++ linux-2.6.32.12/arch/x86/include/asm/vmi.h 2010-04-04 20:46:41.509696869 -0400 9235+++ linux-2.6.32.13/arch/x86/include/asm/vmi.h 2010-05-15 13:21:13.928275178 -0400
9225@@ -191,6 +191,7 @@ struct vrom_header { 9236@@ -191,6 +191,7 @@ struct vrom_header {
9226 u8 reserved[96]; /* Reserved for headers */ 9237 u8 reserved[96]; /* Reserved for headers */
9227 char vmi_init[8]; /* VMI_Init jump point */ 9238 char vmi_init[8]; /* VMI_Init jump point */
@@ -9230,9 +9241,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/vmi.h linux-2.6.32.12/arch/x86/i
9230 } __attribute__((packed)); 9241 } __attribute__((packed));
9231 9242
9232 struct pnp_header { 9243 struct pnp_header {
9233diff -urNp linux-2.6.32.12/arch/x86/include/asm/vsyscall.h linux-2.6.32.12/arch/x86/include/asm/vsyscall.h 9244diff -urNp linux-2.6.32.13/arch/x86/include/asm/vsyscall.h linux-2.6.32.13/arch/x86/include/asm/vsyscall.h
9234--- linux-2.6.32.12/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400 9245--- linux-2.6.32.13/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400
9235+++ linux-2.6.32.12/arch/x86/include/asm/vsyscall.h 2010-04-04 20:46:41.509696869 -0400 9246+++ linux-2.6.32.13/arch/x86/include/asm/vsyscall.h 2010-05-15 13:21:13.928275178 -0400
9236@@ -15,9 +15,10 @@ enum vsyscall_num { 9247@@ -15,9 +15,10 @@ enum vsyscall_num {
9237 9248
9238 #ifdef __KERNEL__ 9249 #ifdef __KERNEL__
@@ -9263,9 +9274,9 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/vsyscall.h linux-2.6.32.12/arch/
9263 #endif /* __KERNEL__ */ 9274 #endif /* __KERNEL__ */
9264 9275
9265 #endif /* _ASM_X86_VSYSCALL_H */ 9276 #endif /* _ASM_X86_VSYSCALL_H */
9266diff -urNp linux-2.6.32.12/arch/x86/include/asm/xsave.h linux-2.6.32.12/arch/x86/include/asm/xsave.h 9277diff -urNp linux-2.6.32.13/arch/x86/include/asm/xsave.h linux-2.6.32.13/arch/x86/include/asm/xsave.h
9267--- linux-2.6.32.12/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400 9278--- linux-2.6.32.13/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400
9268+++ linux-2.6.32.12/arch/x86/include/asm/xsave.h 2010-04-04 20:58:33.225084964 -0400 9279+++ linux-2.6.32.13/arch/x86/include/asm/xsave.h 2010-05-15 13:21:13.928275178 -0400
9269@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct 9280@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
9270 static inline int xsave_user(struct xsave_struct __user *buf) 9281 static inline int xsave_user(struct xsave_struct __user *buf)
9271 { 9282 {
@@ -9291,10 +9302,18 @@ diff -urNp linux-2.6.32.12/arch/x86/include/asm/xsave.h linux-2.6.32.12/arch/x86
9291 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" 9302 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
9292 "2:\n" 9303 "2:\n"
9293 ".section .fixup,\"ax\"\n" 9304 ".section .fixup,\"ax\"\n"
9294diff -urNp linux-2.6.32.12/arch/x86/Kconfig linux-2.6.32.12/arch/x86/Kconfig 9305diff -urNp linux-2.6.32.13/arch/x86/Kconfig linux-2.6.32.13/arch/x86/Kconfig
9295--- linux-2.6.32.12/arch/x86/Kconfig 2010-03-15 11:52:04.000000000 -0400 9306--- linux-2.6.32.13/arch/x86/Kconfig 2010-05-15 13:20:18.407099662 -0400
9296+++ linux-2.6.32.12/arch/x86/Kconfig 2010-04-04 20:46:41.509696869 -0400 9307+++ linux-2.6.32.13/arch/x86/Kconfig 2010-05-15 13:40:23.896554812 -0400
9297@@ -1083,7 +1083,7 @@ config PAGE_OFFSET 9308@@ -531,6 +531,7 @@ source "arch/x86/lguest/Kconfig"
9309
9310 config PARAVIRT
9311 bool "Enable paravirtualization code"
9312+ depends on !PAX_PER_CPU_PGD
9313 ---help---
9314 This changes the kernel so it can modify itself when it is run
9315 under a hypervisor, potentially improving performance significantly
9316@@ -1083,7 +1084,7 @@ config PAGE_OFFSET
9298 hex 9317 hex
9299 default 0xB0000000 if VMSPLIT_3G_OPT 9318 default 0xB0000000 if VMSPLIT_3G_OPT
9300 default 0x80000000 if VMSPLIT_2G 9319 default 0x80000000 if VMSPLIT_2G
@@ -9303,7 +9322,7 @@ diff -urNp linux-2.6.32.12/arch/x86/Kconfig linux-2.6.32.12/arch/x86/Kconfig
9303 default 0x40000000 if VMSPLIT_1G 9322 default 0x40000000 if VMSPLIT_1G
9304 default 0xC0000000 9323 default 0xC0000000
9305 depends on X86_32 9324 depends on X86_32
9306@@ -1409,7 +1409,7 @@ config ARCH_USES_PG_UNCACHED 9325@@ -1414,7 +1415,7 @@ config ARCH_USES_PG_UNCACHED
9307 9326
9308 config EFI 9327 config EFI
9309 bool "EFI runtime service support" 9328 bool "EFI runtime service support"
@@ -9312,7 +9331,7 @@ diff -urNp linux-2.6.32.12/arch/x86/Kconfig linux-2.6.32.12/arch/x86/Kconfig
9312 ---help--- 9331 ---help---
9313 This enables the kernel to use EFI runtime services that are 9332 This enables the kernel to use EFI runtime services that are
9314 available (such as the EFI variable services). 9333 available (such as the EFI variable services).
9315@@ -1496,6 +1496,7 @@ config KEXEC_JUMP 9334@@ -1501,6 +1502,7 @@ config KEXEC_JUMP
9316 config PHYSICAL_START 9335 config PHYSICAL_START
9317 hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP) 9336 hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
9318 default "0x1000000" 9337 default "0x1000000"
@@ -9320,7 +9339,7 @@ diff -urNp linux-2.6.32.12/arch/x86/Kconfig linux-2.6.32.12/arch/x86/Kconfig
9320 ---help--- 9339 ---help---
9321 This gives the physical address where the kernel is loaded. 9340 This gives the physical address where the kernel is loaded.
9322 9341
9323@@ -1560,6 +1561,7 @@ config PHYSICAL_ALIGN 9342@@ -1565,6 +1567,7 @@ config PHYSICAL_ALIGN
9324 hex 9343 hex
9325 prompt "Alignment value to which kernel should be aligned" if X86_32 9344 prompt "Alignment value to which kernel should be aligned" if X86_32
9326 default "0x1000000" 9345 default "0x1000000"
@@ -9328,7 +9347,7 @@ diff -urNp linux-2.6.32.12/arch/x86/Kconfig linux-2.6.32.12/arch/x86/Kconfig
9328 range 0x2000 0x1000000 9347 range 0x2000 0x1000000
9329 ---help--- 9348 ---help---
9330 This value puts the alignment restrictions on physical address 9349 This value puts the alignment restrictions on physical address
9331@@ -1591,9 +1593,10 @@ config HOTPLUG_CPU 9350@@ -1596,9 +1599,10 @@ config HOTPLUG_CPU
9332 Say N if you want to disable CPU hotplug. 9351 Say N if you want to disable CPU hotplug.
9333 9352
9334 config COMPAT_VDSO 9353 config COMPAT_VDSO
@@ -9340,9 +9359,9 @@ diff -urNp linux-2.6.32.12/arch/x86/Kconfig linux-2.6.32.12/arch/x86/Kconfig
9340 ---help--- 9359 ---help---
9341 Map the 32-bit VDSO to the predictable old-style address too. 9360 Map the 32-bit VDSO to the predictable old-style address too.
9342 ---help--- 9361 ---help---
9343diff -urNp linux-2.6.32.12/arch/x86/Kconfig.cpu linux-2.6.32.12/arch/x86/Kconfig.cpu 9362diff -urNp linux-2.6.32.13/arch/x86/Kconfig.cpu linux-2.6.32.13/arch/x86/Kconfig.cpu
9344--- linux-2.6.32.12/arch/x86/Kconfig.cpu 2010-04-29 17:49:37.481119841 -0400 9363--- linux-2.6.32.13/arch/x86/Kconfig.cpu 2010-04-29 17:49:37.481119841 -0400
9345+++ linux-2.6.32.12/arch/x86/Kconfig.cpu 2010-04-29 17:49:57.921493895 -0400 9364+++ linux-2.6.32.13/arch/x86/Kconfig.cpu 2010-05-15 13:21:13.930870481 -0400
9346@@ -340,7 +340,7 @@ config X86_PPRO_FENCE 9365@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
9347 9366
9348 config X86_F00F_BUG 9367 config X86_F00F_BUG
@@ -9370,9 +9389,9 @@ diff -urNp linux-2.6.32.12/arch/x86/Kconfig.cpu linux-2.6.32.12/arch/x86/Kconfig
9370 9389
9371 config X86_MINIMUM_CPU_FAMILY 9390 config X86_MINIMUM_CPU_FAMILY
9372 int 9391 int
9373diff -urNp linux-2.6.32.12/arch/x86/Kconfig.debug linux-2.6.32.12/arch/x86/Kconfig.debug 9392diff -urNp linux-2.6.32.13/arch/x86/Kconfig.debug linux-2.6.32.13/arch/x86/Kconfig.debug
9374--- linux-2.6.32.12/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 9393--- linux-2.6.32.13/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400
9375+++ linux-2.6.32.12/arch/x86/Kconfig.debug 2010-04-04 20:46:41.509696869 -0400 9394+++ linux-2.6.32.13/arch/x86/Kconfig.debug 2010-05-15 13:21:13.942893840 -0400
9376@@ -99,7 +99,7 @@ config X86_PTDUMP 9395@@ -99,7 +99,7 @@ config X86_PTDUMP
9377 config DEBUG_RODATA 9396 config DEBUG_RODATA
9378 bool "Write protect kernel read-only data structures" 9397 bool "Write protect kernel read-only data structures"
@@ -9382,9 +9401,9 @@ diff -urNp linux-2.6.32.12/arch/x86/Kconfig.debug linux-2.6.32.12/arch/x86/Kconf
9382 ---help--- 9401 ---help---
9383 Mark the kernel read-only data as write-protected in the pagetables, 9402 Mark the kernel read-only data as write-protected in the pagetables,
9384 in order to catch accidental (and incorrect) writes to such const 9403 in order to catch accidental (and incorrect) writes to such const
9385diff -urNp linux-2.6.32.12/arch/x86/kernel/acpi/boot.c linux-2.6.32.12/arch/x86/kernel/acpi/boot.c 9404diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/boot.c linux-2.6.32.13/arch/x86/kernel/acpi/boot.c
9386--- linux-2.6.32.12/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400 9405--- linux-2.6.32.13/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400
9387+++ linux-2.6.32.12/arch/x86/kernel/acpi/boot.c 2010-04-04 20:46:41.509696869 -0400 9406+++ linux-2.6.32.13/arch/x86/kernel/acpi/boot.c 2010-05-15 13:21:13.954911113 -0400
9388@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a 9407@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a
9389 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), 9408 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
9390 }, 9409 },
@@ -9394,9 +9413,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/acpi/boot.c linux-2.6.32.12/arch/x86/
9394 }; 9413 };
9395 9414
9396 /* 9415 /*
9397diff -urNp linux-2.6.32.12/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.12/arch/x86/kernel/acpi/realmode/wakeup.S 9416diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S
9398--- linux-2.6.32.12/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400 9417--- linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400
9399+++ linux-2.6.32.12/arch/x86/kernel/acpi/realmode/wakeup.S 2010-04-04 20:46:41.509696869 -0400 9418+++ linux-2.6.32.13/arch/x86/kernel/acpi/realmode/wakeup.S 2010-05-15 13:21:13.954911113 -0400
9400@@ -104,7 +104,7 @@ _start: 9419@@ -104,7 +104,7 @@ _start:
9401 movl %eax, %ecx 9420 movl %eax, %ecx
9402 orl %edx, %ecx 9421 orl %edx, %ecx
@@ -9406,9 +9425,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.1
9406 wrmsr 9425 wrmsr
9407 1: 9426 1:
9408 9427
9409diff -urNp linux-2.6.32.12/arch/x86/kernel/acpi/sleep.c linux-2.6.32.12/arch/x86/kernel/acpi/sleep.c 9428diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c
9410--- linux-2.6.32.12/arch/x86/kernel/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400 9429--- linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c 2010-05-15 13:20:18.407099662 -0400
9411+++ linux-2.6.32.12/arch/x86/kernel/acpi/sleep.c 2010-04-04 20:46:41.509696869 -0400 9430+++ linux-2.6.32.13/arch/x86/kernel/acpi/sleep.c 2010-05-15 13:21:13.954911113 -0400
9412@@ -11,11 +11,12 @@ 9431@@ -11,11 +11,12 @@
9413 #include <linux/cpumask.h> 9432 #include <linux/cpumask.h>
9414 #include <asm/segment.h> 9433 #include <asm/segment.h>
@@ -9453,9 +9472,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/acpi/sleep.c linux-2.6.32.12/arch/x86
9453 } 9472 }
9454 9473
9455 9474
9456diff -urNp linux-2.6.32.12/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.12/arch/x86/kernel/acpi/wakeup_32.S 9475diff -urNp linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S
9457--- linux-2.6.32.12/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400 9476--- linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400
9458+++ linux-2.6.32.12/arch/x86/kernel/acpi/wakeup_32.S 2010-04-04 20:46:41.509696869 -0400 9477+++ linux-2.6.32.13/arch/x86/kernel/acpi/wakeup_32.S 2010-05-15 13:21:13.954911113 -0400
9459@@ -30,13 +30,11 @@ wakeup_pmode_return: 9478@@ -30,13 +30,11 @@ wakeup_pmode_return:
9460 # and restore the stack ... but you need gdt for this to work 9479 # and restore the stack ... but you need gdt for this to work
9461 movl saved_context_esp, %esp 9480 movl saved_context_esp, %esp
@@ -9472,9 +9491,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.12/arch
9472 9491
9473 bogus_magic: 9492 bogus_magic:
9474 jmp bogus_magic 9493 jmp bogus_magic
9475diff -urNp linux-2.6.32.12/arch/x86/kernel/alternative.c linux-2.6.32.12/arch/x86/kernel/alternative.c 9494diff -urNp linux-2.6.32.13/arch/x86/kernel/alternative.c linux-2.6.32.13/arch/x86/kernel/alternative.c
9476--- linux-2.6.32.12/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400 9495--- linux-2.6.32.13/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400
9477+++ linux-2.6.32.12/arch/x86/kernel/alternative.c 2010-04-04 20:46:41.509696869 -0400 9496+++ linux-2.6.32.13/arch/x86/kernel/alternative.c 2010-05-15 13:21:13.962912884 -0400
9478@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str 9497@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
9479 9498
9480 BUG_ON(p->len > MAX_PATCH_LEN); 9499 BUG_ON(p->len > MAX_PATCH_LEN);
@@ -9547,9 +9566,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/alternative.c linux-2.6.32.12/arch/x8
9547+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); 9566+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]);
9548 return addr; 9567 return addr;
9549 } 9568 }
9550diff -urNp linux-2.6.32.12/arch/x86/kernel/amd_iommu.c linux-2.6.32.12/arch/x86/kernel/amd_iommu.c 9569diff -urNp linux-2.6.32.13/arch/x86/kernel/amd_iommu.c linux-2.6.32.13/arch/x86/kernel/amd_iommu.c
9551--- linux-2.6.32.12/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:37.521943068 -0400 9570--- linux-2.6.32.13/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:37.521943068 -0400
9552+++ linux-2.6.32.12/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:57.953503497 -0400 9571+++ linux-2.6.32.13/arch/x86/kernel/amd_iommu.c 2010-05-15 13:21:13.968009761 -0400
9553@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( 9572@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains(
9554 } 9573 }
9555 } 9574 }
@@ -9559,9 +9578,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/amd_iommu.c linux-2.6.32.12/arch/x86/
9559 .alloc_coherent = alloc_coherent, 9578 .alloc_coherent = alloc_coherent,
9560 .free_coherent = free_coherent, 9579 .free_coherent = free_coherent,
9561 .map_page = map_page, 9580 .map_page = map_page,
9562diff -urNp linux-2.6.32.12/arch/x86/kernel/apic/io_apic.c linux-2.6.32.12/arch/x86/kernel/apic/io_apic.c 9581diff -urNp linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c
9563--- linux-2.6.32.12/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400 9582--- linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400
9564+++ linux-2.6.32.12/arch/x86/kernel/apic/io_apic.c 2010-04-04 20:46:41.509696869 -0400 9583+++ linux-2.6.32.13/arch/x86/kernel/apic/io_apic.c 2010-05-15 13:21:13.979712258 -0400
9565@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi 9584@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi
9566 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, 9585 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
9567 GFP_ATOMIC); 9586 GFP_ATOMIC);
@@ -9598,9 +9617,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/apic/io_apic.c linux-2.6.32.12/arch/x
9598 { 9617 {
9599 spin_unlock(&vector_lock); 9618 spin_unlock(&vector_lock);
9600 } 9619 }
9601diff -urNp linux-2.6.32.12/arch/x86/kernel/apm_32.c linux-2.6.32.12/arch/x86/kernel/apm_32.c 9620diff -urNp linux-2.6.32.13/arch/x86/kernel/apm_32.c linux-2.6.32.13/arch/x86/kernel/apm_32.c
9602--- linux-2.6.32.12/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400 9621--- linux-2.6.32.13/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400
9603+++ linux-2.6.32.12/arch/x86/kernel/apm_32.c 2010-04-04 20:46:41.513555986 -0400 9622+++ linux-2.6.32.13/arch/x86/kernel/apm_32.c 2010-05-15 13:21:14.011066799 -0400
9604@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); 9623@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
9605 * This is for buggy BIOS's that refer to (real mode) segment 0x40 9624 * This is for buggy BIOS's that refer to (real mode) segment 0x40
9606 * even though they are called in protected mode. 9625 * even though they are called in protected mode.
@@ -9702,9 +9721,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/apm_32.c linux-2.6.32.12/arch/x86/ker
9702 9721
9703 proc_create("apm", 0, NULL, &apm_file_ops); 9722 proc_create("apm", 0, NULL, &apm_file_ops);
9704 9723
9705diff -urNp linux-2.6.32.12/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.12/arch/x86/kernel/asm-offsets_32.c 9724diff -urNp linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c
9706--- linux-2.6.32.12/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400 9725--- linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400
9707+++ linux-2.6.32.12/arch/x86/kernel/asm-offsets_32.c 2010-04-04 20:46:41.513555986 -0400 9726+++ linux-2.6.32.13/arch/x86/kernel/asm-offsets_32.c 2010-05-15 13:21:14.011066799 -0400
9708@@ -115,6 +115,11 @@ void foo(void) 9727@@ -115,6 +115,11 @@ void foo(void)
9709 OFFSET(PV_CPU_iret, pv_cpu_ops, iret); 9728 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
9710 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 9729 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
@@ -9717,9 +9736,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.12/arch
9717 #endif 9736 #endif
9718 9737
9719 #ifdef CONFIG_XEN 9738 #ifdef CONFIG_XEN
9720diff -urNp linux-2.6.32.12/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.12/arch/x86/kernel/asm-offsets_64.c 9739diff -urNp linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c
9721--- linux-2.6.32.12/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400 9740--- linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400
9722+++ linux-2.6.32.12/arch/x86/kernel/asm-offsets_64.c 2010-04-04 20:58:33.220592413 -0400 9741+++ linux-2.6.32.13/arch/x86/kernel/asm-offsets_64.c 2010-05-15 13:21:14.011066799 -0400
9723@@ -63,6 +63,18 @@ int main(void) 9742@@ -63,6 +63,18 @@ int main(void)
9724 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 9743 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
9725 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); 9744 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
@@ -9747,9 +9766,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.12/arch
9747 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); 9766 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
9748 BLANK(); 9767 BLANK();
9749 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); 9768 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
9750diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/common.c linux-2.6.32.12/arch/x86/kernel/cpu/common.c 9769diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/common.c linux-2.6.32.13/arch/x86/kernel/cpu/common.c
9751--- linux-2.6.32.12/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400 9770--- linux-2.6.32.13/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400
9752+++ linux-2.6.32.12/arch/x86/kernel/cpu/common.c 2010-04-04 20:47:28.952733264 -0400 9771+++ linux-2.6.32.13/arch/x86/kernel/cpu/common.c 2010-05-15 13:21:14.011066799 -0400
9753@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon 9772@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
9754 9773
9755 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; 9774 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -9858,9 +9877,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/common.c linux-2.6.32.12/arch/x86
9858 struct thread_struct *thread = &curr->thread; 9877 struct thread_struct *thread = &curr->thread;
9859 9878
9860 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { 9879 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
9861diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 9880diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
9862--- linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400 9881--- linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400
9863+++ linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-04-04 20:46:41.513555986 -0400 9882+++ linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-05-15 13:21:14.043267946 -0400
9864@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any 9883@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
9865 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), 9884 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
9866 }, 9885 },
@@ -9870,9 +9889,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.
9870 }; 9889 };
9871 9890
9872 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) 9891 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
9873diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 9892diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
9874--- linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400 9893--- linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400
9875+++ linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-04-04 20:46:41.513555986 -0400 9894+++ linux-2.6.32.13/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-05-15 13:21:14.043267946 -0400
9876@@ -225,7 +225,7 @@ static struct cpu_model models[] = 9895@@ -225,7 +225,7 @@ static struct cpu_model models[] =
9877 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, 9896 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
9878 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, 9897 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
@@ -9882,10 +9901,10 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu
9882 }; 9901 };
9883 #undef _BANIAS 9902 #undef _BANIAS
9884 #undef BANIAS 9903 #undef BANIAS
9885diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/intel.c linux-2.6.32.12/arch/x86/kernel/cpu/intel.c 9904diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/intel.c linux-2.6.32.13/arch/x86/kernel/cpu/intel.c
9886--- linux-2.6.32.12/arch/x86/kernel/cpu/intel.c 2010-04-04 20:41:49.916475305 -0400 9905--- linux-2.6.32.13/arch/x86/kernel/cpu/intel.c 2010-05-15 13:20:18.427075180 -0400
9887+++ linux-2.6.32.12/arch/x86/kernel/cpu/intel.c 2010-04-04 20:46:41.513555986 -0400 9906+++ linux-2.6.32.13/arch/x86/kernel/cpu/intel.c 2010-05-15 13:21:14.043267946 -0400
9888@@ -140,7 +140,7 @@ static void __cpuinit trap_init_f00f_bug 9907@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug
9889 * Update the IDT descriptor and reload the IDT so that 9908 * Update the IDT descriptor and reload the IDT so that
9890 * it uses the read-only mapped virtual address. 9909 * it uses the read-only mapped virtual address.
9891 */ 9910 */
@@ -9894,10 +9913,10 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/intel.c linux-2.6.32.12/arch/x86/
9894 load_idt(&idt_descr); 9913 load_idt(&idt_descr);
9895 } 9914 }
9896 #endif 9915 #endif
9897diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.12/arch/x86/kernel/cpu/intel_cacheinfo.c 9916diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c
9898--- linux-2.6.32.12/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-04-29 17:49:37.537108997 -0400 9917--- linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-15 13:20:18.427075180 -0400
9899+++ linux-2.6.32.12/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-04-29 17:49:57.985196208 -0400 9918+++ linux-2.6.32.13/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-05-15 13:21:14.043267946 -0400
9900@@ -916,7 +916,7 @@ static ssize_t store(struct kobject *kob 9919@@ -917,7 +917,7 @@ static ssize_t store(struct kobject *kob
9901 return ret; 9920 return ret;
9902 } 9921 }
9903 9922
@@ -9906,9 +9925,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.12
9906 .show = show, 9925 .show = show,
9907 .store = store, 9926 .store = store,
9908 }; 9927 };
9909diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/Makefile linux-2.6.32.12/arch/x86/kernel/cpu/Makefile 9928diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/Makefile linux-2.6.32.13/arch/x86/kernel/cpu/Makefile
9910--- linux-2.6.32.12/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400 9929--- linux-2.6.32.13/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400
9911+++ linux-2.6.32.12/arch/x86/kernel/cpu/Makefile 2010-04-04 20:46:41.513555986 -0400 9930+++ linux-2.6.32.13/arch/x86/kernel/cpu/Makefile 2010-05-15 13:21:14.043267946 -0400
9912@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER 9931@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
9913 CFLAGS_REMOVE_common.o = -pg 9932 CFLAGS_REMOVE_common.o = -pg
9914 endif 9933 endif
@@ -9920,9 +9939,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/Makefile linux-2.6.32.12/arch/x86
9920 obj-y := intel_cacheinfo.o addon_cpuid_features.o 9939 obj-y := intel_cacheinfo.o addon_cpuid_features.o
9921 obj-y += proc.o capflags.o powerflags.o common.o 9940 obj-y += proc.o capflags.o powerflags.o common.o
9922 obj-y += vmware.o hypervisor.o sched.o 9941 obj-y += vmware.o hypervisor.o sched.o
9923diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce_amd.c 9942diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c
9924--- linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400 9943--- linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400
9925+++ linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-04-04 20:46:41.513555986 -0400 9944+++ linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-05-15 13:21:14.043267946 -0400
9926@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob 9945@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob
9927 return ret; 9946 return ret;
9928 } 9947 }
@@ -9932,9 +9951,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.12/
9932 .show = show, 9951 .show = show,
9933 .store = store, 9952 .store = store,
9934 }; 9953 };
9935diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce.c 9954diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c
9936--- linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400 9955--- linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400
9937+++ linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce.c 2010-04-04 20:46:41.513555986 -0400 9956+++ linux-2.6.32.13/arch/x86/kernel/cpu/mcheck/mce.c 2010-05-15 13:21:14.043267946 -0400
9938@@ -187,7 +187,7 @@ static void print_mce(struct mce *m) 9957@@ -187,7 +187,7 @@ static void print_mce(struct mce *m)
9939 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", 9958 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
9940 m->cs, m->ip); 9959 m->cs, m->ip);
@@ -9987,9 +10006,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.12/arch
9987 }; 10006 };
9988 10007
9989 /* 10008 /*
9990diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/amd.c 10009diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c
9991--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400 10010--- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400
9992+++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/amd.c 2010-04-04 20:46:41.513555986 -0400 10011+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/amd.c 2010-05-15 13:21:14.043267946 -0400
9993@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base 10012@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
9994 return 0; 10013 return 0;
9995 } 10014 }
@@ -9999,9 +10018,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.12/arch/x
9999 .vendor = X86_VENDOR_AMD, 10018 .vendor = X86_VENDOR_AMD,
10000 .set = amd_set_mtrr, 10019 .set = amd_set_mtrr,
10001 .get = amd_get_mtrr, 10020 .get = amd_get_mtrr,
10002diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/centaur.c 10021diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c
10003--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400 10022--- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400
10004+++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/centaur.c 2010-04-04 20:46:41.513555986 -0400 10023+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/centaur.c 2010-05-15 13:21:14.043267946 -0400
10005@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long 10024@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
10006 return 0; 10025 return 0;
10007 } 10026 }
@@ -10011,9 +10030,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.12/ar
10011 .vendor = X86_VENDOR_CENTAUR, 10030 .vendor = X86_VENDOR_CENTAUR,
10012 .set = centaur_set_mcr, 10031 .set = centaur_set_mcr,
10013 .get = centaur_get_mcr, 10032 .get = centaur_get_mcr,
10014diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/cyrix.c 10033diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c
10015--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400 10034--- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400
10016+++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-04-04 20:46:41.513555986 -0400 10035+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-05-15 13:21:14.043267946 -0400
10017@@ -265,7 +265,7 @@ static void cyrix_set_all(void) 10036@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
10018 post_set(); 10037 post_set();
10019 } 10038 }
@@ -10023,9 +10042,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.12/arch
10023 .vendor = X86_VENDOR_CYRIX, 10042 .vendor = X86_VENDOR_CYRIX,
10024 .set_all = cyrix_set_all, 10043 .set_all = cyrix_set_all,
10025 .set = cyrix_set_arr, 10044 .set = cyrix_set_arr,
10026diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/generic.c 10045diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c
10027--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400 10046--- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400
10028+++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/generic.c 2010-04-04 20:46:41.513555986 -0400 10047+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/generic.c 2010-05-15 13:21:14.043267946 -0400
10029@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra 10048@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
10030 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ 10049 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
10031 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ 10050 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
@@ -10044,9 +10063,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.12/ar
10044 .use_intel_if = 1, 10063 .use_intel_if = 1,
10045 .set_all = generic_set_all, 10064 .set_all = generic_set_all,
10046 .get = generic_get_mtrr, 10065 .get = generic_get_mtrr,
10047diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/main.c 10066diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c
10048--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400 10067--- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400
10049+++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/main.c 2010-04-04 20:46:41.513555986 -0400 10068+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/main.c 2010-05-15 13:21:14.043267946 -0400
10050@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); 10069@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
10051 u64 size_or_mask, size_and_mask; 10070 u64 size_or_mask, size_and_mask;
10052 static bool mtrr_aps_delayed_init; 10071 static bool mtrr_aps_delayed_init;
@@ -10065,9 +10084,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.12/arch/
10065 { 10084 {
10066 if (ops->vendor && ops->vendor < X86_VENDOR_NUM) 10085 if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
10067 mtrr_ops[ops->vendor] = ops; 10086 mtrr_ops[ops->vendor] = ops;
10068diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/mtrr.h 10087diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h
10069--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400 10088--- linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400
10070+++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-04-04 20:46:41.517551870 -0400 10089+++ linux-2.6.32.13/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-05-15 13:21:14.043267946 -0400
10071@@ -12,19 +12,19 @@ 10090@@ -12,19 +12,19 @@
10072 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; 10091 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
10073 10092
@@ -10118,9 +10137,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.12/arch/
10118 10137
10119 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) 10138 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
10120 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) 10139 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
10121diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.12/arch/x86/kernel/cpu/perfctr-watchdog.c 10140diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c
10122--- linux-2.6.32.12/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400 10141--- linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400
10123+++ linux-2.6.32.12/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-04-04 20:46:41.517551870 -0400 10142+++ linux-2.6.32.13/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-05-15 13:21:14.043267946 -0400
10124@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { 10143@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
10125 10144
10126 /* Interface defining a CPU specific perfctr watchdog */ 10145 /* Interface defining a CPU specific perfctr watchdog */
@@ -10154,9 +10173,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.1
10154 static struct wd_ops intel_arch_wd_ops __read_mostly = { 10173 static struct wd_ops intel_arch_wd_ops __read_mostly = {
10155 .reserve = single_msr_reserve, 10174 .reserve = single_msr_reserve,
10156 .unreserve = single_msr_unreserve, 10175 .unreserve = single_msr_unreserve,
10157diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.12/arch/x86/kernel/cpu/perf_event.c 10176diff -urNp linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c
10158--- linux-2.6.32.12/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:37.537108997 -0400 10177--- linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:37.537108997 -0400
10159+++ linux-2.6.32.12/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:57.989487280 -0400 10178+++ linux-2.6.32.13/arch/x86/kernel/cpu/perf_event.c 2010-05-15 13:21:14.046723916 -0400
10160@@ -2354,7 +2354,7 @@ perf_callchain_user(struct pt_regs *regs 10179@@ -2354,7 +2354,7 @@ perf_callchain_user(struct pt_regs *regs
10161 break; 10180 break;
10162 10181
@@ -10166,9 +10185,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.12/arch
10166 } 10185 }
10167 } 10186 }
10168 10187
10169diff -urNp linux-2.6.32.12/arch/x86/kernel/crash.c linux-2.6.32.12/arch/x86/kernel/crash.c 10188diff -urNp linux-2.6.32.13/arch/x86/kernel/crash.c linux-2.6.32.13/arch/x86/kernel/crash.c
10170--- linux-2.6.32.12/arch/x86/kernel/crash.c 2010-04-29 17:49:37.537108997 -0400 10189--- linux-2.6.32.13/arch/x86/kernel/crash.c 2010-04-29 17:49:37.537108997 -0400
10171+++ linux-2.6.32.12/arch/x86/kernel/crash.c 2010-04-29 17:49:57.989487280 -0400 10190+++ linux-2.6.32.13/arch/x86/kernel/crash.c 2010-05-15 13:21:14.046723916 -0400
10172@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, 10191@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,
10173 regs = args->regs; 10192 regs = args->regs;
10174 10193
@@ -10178,9 +10197,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/crash.c linux-2.6.32.12/arch/x86/kern
10178 crash_fixup_ss_esp(&fixed_regs, regs); 10197 crash_fixup_ss_esp(&fixed_regs, regs);
10179 regs = &fixed_regs; 10198 regs = &fixed_regs;
10180 } 10199 }
10181diff -urNp linux-2.6.32.12/arch/x86/kernel/doublefault_32.c linux-2.6.32.12/arch/x86/kernel/doublefault_32.c 10200diff -urNp linux-2.6.32.13/arch/x86/kernel/doublefault_32.c linux-2.6.32.13/arch/x86/kernel/doublefault_32.c
10182--- linux-2.6.32.12/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400 10201--- linux-2.6.32.13/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400
10183+++ linux-2.6.32.12/arch/x86/kernel/doublefault_32.c 2010-04-04 20:46:41.517551870 -0400 10202+++ linux-2.6.32.13/arch/x86/kernel/doublefault_32.c 2010-05-15 13:21:14.046723916 -0400
10184@@ -11,7 +11,7 @@ 10203@@ -11,7 +11,7 @@
10185 10204
10186 #define DOUBLEFAULT_STACKSIZE (1024) 10205 #define DOUBLEFAULT_STACKSIZE (1024)
@@ -10212,9 +10231,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/doublefault_32.c linux-2.6.32.12/arch
10212 .fs = __KERNEL_PERCPU, 10231 .fs = __KERNEL_PERCPU,
10213 10232
10214 .__cr3 = __pa_nodebug(swapper_pg_dir), 10233 .__cr3 = __pa_nodebug(swapper_pg_dir),
10215diff -urNp linux-2.6.32.12/arch/x86/kernel/dumpstack_32.c linux-2.6.32.12/arch/x86/kernel/dumpstack_32.c 10234diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c
10216--- linux-2.6.32.12/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400 10235--- linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400
10217+++ linux-2.6.32.12/arch/x86/kernel/dumpstack_32.c 2010-04-04 20:46:41.517551870 -0400 10236+++ linux-2.6.32.13/arch/x86/kernel/dumpstack_32.c 2010-05-15 13:21:14.068544431 -0400
10218@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs 10237@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
10219 * When in-kernel, we also print out the stack and code at the 10238 * When in-kernel, we also print out the stack and code at the
10220 * time of the fault.. 10239 * time of the fault..
@@ -10259,9 +10278,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/dumpstack_32.c linux-2.6.32.12/arch/x
10259 if (ip < PAGE_OFFSET) 10278 if (ip < PAGE_OFFSET)
10260 return 0; 10279 return 0;
10261 if (probe_kernel_address((unsigned short *)ip, ud2)) 10280 if (probe_kernel_address((unsigned short *)ip, ud2))
10262diff -urNp linux-2.6.32.12/arch/x86/kernel/dumpstack.c linux-2.6.32.12/arch/x86/kernel/dumpstack.c 10281diff -urNp linux-2.6.32.13/arch/x86/kernel/dumpstack.c linux-2.6.32.13/arch/x86/kernel/dumpstack.c
10263--- linux-2.6.32.12/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400 10282--- linux-2.6.32.13/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400
10264+++ linux-2.6.32.12/arch/x86/kernel/dumpstack.c 2010-04-04 20:46:41.517551870 -0400 10283+++ linux-2.6.32.13/arch/x86/kernel/dumpstack.c 2010-05-15 13:21:14.068544431 -0400
10265@@ -180,7 +180,7 @@ void dump_stack(void) 10284@@ -180,7 +180,7 @@ void dump_stack(void)
10266 #endif 10285 #endif
10267 10286
@@ -10289,9 +10308,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/dumpstack.c linux-2.6.32.12/arch/x86/
10289 report_bug(regs->ip, regs); 10308 report_bug(regs->ip, regs);
10290 10309
10291 if (__die(str, regs, err)) 10310 if (__die(str, regs, err))
10292diff -urNp linux-2.6.32.12/arch/x86/kernel/e820.c linux-2.6.32.12/arch/x86/kernel/e820.c 10311diff -urNp linux-2.6.32.13/arch/x86/kernel/e820.c linux-2.6.32.13/arch/x86/kernel/e820.c
10293--- linux-2.6.32.12/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400 10312--- linux-2.6.32.13/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400
10294+++ linux-2.6.32.12/arch/x86/kernel/e820.c 2010-04-04 20:46:41.517551870 -0400 10313+++ linux-2.6.32.13/arch/x86/kernel/e820.c 2010-05-15 13:21:14.068544431 -0400
10295@@ -733,7 +733,7 @@ struct early_res { 10314@@ -733,7 +733,7 @@ struct early_res {
10296 }; 10315 };
10297 static struct early_res early_res[MAX_EARLY_RES] __initdata = { 10316 static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -10301,9 +10320,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/e820.c linux-2.6.32.12/arch/x86/kerne
10301 }; 10320 };
10302 10321
10303 static int __init find_overlapped_early(u64 start, u64 end) 10322 static int __init find_overlapped_early(u64 start, u64 end)
10304diff -urNp linux-2.6.32.12/arch/x86/kernel/efi_32.c linux-2.6.32.12/arch/x86/kernel/efi_32.c 10323diff -urNp linux-2.6.32.13/arch/x86/kernel/efi_32.c linux-2.6.32.13/arch/x86/kernel/efi_32.c
10305--- linux-2.6.32.12/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400 10324--- linux-2.6.32.13/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400
10306+++ linux-2.6.32.12/arch/x86/kernel/efi_32.c 2010-04-04 20:46:41.517551870 -0400 10325+++ linux-2.6.32.13/arch/x86/kernel/efi_32.c 2010-05-15 13:21:14.068544431 -0400
10307@@ -38,70 +38,38 @@ 10326@@ -38,70 +38,38 @@
10308 */ 10327 */
10309 10328
@@ -10384,9 +10403,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/efi_32.c linux-2.6.32.12/arch/x86/ker
10384 10403
10385 /* 10404 /*
10386 * After the lock is released, the original page table is restored. 10405 * After the lock is released, the original page table is restored.
10387diff -urNp linux-2.6.32.12/arch/x86/kernel/efi_stub_32.S linux-2.6.32.12/arch/x86/kernel/efi_stub_32.S 10406diff -urNp linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S
10388--- linux-2.6.32.12/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400 10407--- linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400
10389+++ linux-2.6.32.12/arch/x86/kernel/efi_stub_32.S 2010-04-04 20:46:41.517551870 -0400 10408+++ linux-2.6.32.13/arch/x86/kernel/efi_stub_32.S 2010-05-15 13:21:14.068544431 -0400
10390@@ -6,6 +6,7 @@ 10409@@ -6,6 +6,7 @@
10391 */ 10410 */
10392 10411
@@ -10485,9 +10504,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/efi_stub_32.S linux-2.6.32.12/arch/x8
10485 saved_return_addr: 10504 saved_return_addr:
10486 .long 0 10505 .long 0
10487 efi_rt_function_ptr: 10506 efi_rt_function_ptr:
10488diff -urNp linux-2.6.32.12/arch/x86/kernel/entry_32.S linux-2.6.32.12/arch/x86/kernel/entry_32.S 10507diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_32.S linux-2.6.32.13/arch/x86/kernel/entry_32.S
10489--- linux-2.6.32.12/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400 10508--- linux-2.6.32.13/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400
10490+++ linux-2.6.32.12/arch/x86/kernel/entry_32.S 2010-04-04 20:47:28.952733264 -0400 10509+++ linux-2.6.32.13/arch/x86/kernel/entry_32.S 2010-05-15 13:21:14.068544431 -0400
10491@@ -191,7 +191,67 @@ 10510@@ -191,7 +191,67 @@
10492 10511
10493 #endif /* CONFIG_X86_32_LAZY_GS */ 10512 #endif /* CONFIG_X86_32_LAZY_GS */
@@ -10801,9 +10820,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/entry_32.S linux-2.6.32.12/arch/x86/k
10801 RESTORE_REGS 10820 RESTORE_REGS
10802 lss 12+4(%esp), %esp # back to espfix stack 10821 lss 12+4(%esp), %esp # back to espfix stack
10803 CFI_ADJUST_CFA_OFFSET -24 10822 CFI_ADJUST_CFA_OFFSET -24
10804diff -urNp linux-2.6.32.12/arch/x86/kernel/entry_64.S linux-2.6.32.12/arch/x86/kernel/entry_64.S 10823diff -urNp linux-2.6.32.13/arch/x86/kernel/entry_64.S linux-2.6.32.13/arch/x86/kernel/entry_64.S
10805--- linux-2.6.32.12/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400 10824--- linux-2.6.32.13/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400
10806+++ linux-2.6.32.12/arch/x86/kernel/entry_64.S 2010-04-07 16:58:23.343008831 -0400 10825+++ linux-2.6.32.13/arch/x86/kernel/entry_64.S 2010-05-15 13:23:38.934774262 -0400
10807@@ -53,6 +53,7 @@ 10826@@ -53,6 +53,7 @@
10808 #include <asm/paravirt.h> 10827 #include <asm/paravirt.h>
10809 #include <asm/ftrace.h> 10828 #include <asm/ftrace.h>
@@ -11002,6 +11021,24 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/entry_64.S linux-2.6.32.12/arch/x86/k
11002 11021
11003 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET 11022 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
11004 #ifdef CONFIG_TRACE_IRQFLAGS 11023 #ifdef CONFIG_TRACE_IRQFLAGS
11024@@ -317,7 +501,7 @@ ENTRY(save_args)
11025 leaq -ARGOFFSET+16(%rsp),%rdi /* arg1 for handler */
11026 movq_cfi rbp, 8 /* push %rbp */
11027 leaq 8(%rsp), %rbp /* mov %rsp, %ebp */
11028- testl $3, CS(%rdi)
11029+ testb $3, CS(%rdi)
11030 je 1f
11031 SWAPGS
11032 /*
11033@@ -409,7 +593,7 @@ ENTRY(ret_from_fork)
11034
11035 RESTORE_REST
11036
11037- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
11038+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
11039 je int_ret_from_sys_call
11040
11041 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
11005@@ -468,6 +652,11 @@ ENTRY(system_call_after_swapgs) 11042@@ -468,6 +652,11 @@ ENTRY(system_call_after_swapgs)
11006 11043
11007 movq %rsp,PER_CPU_VAR(old_rsp) 11044 movq %rsp,PER_CPU_VAR(old_rsp)
@@ -11026,25 +11063,42 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/entry_64.S linux-2.6.32.12/arch/x86/k
11026 /* 11063 /*
11027 * sysretq will re-enable interrupts: 11064 * sysretq will re-enable interrupts:
11028 */ 11065 */
11029@@ -800,7 +994,16 @@ END(interrupt) 11066@@ -613,7 +807,7 @@ tracesys:
11067 GLOBAL(int_ret_from_sys_call)
11068 DISABLE_INTERRUPTS(CLBR_NONE)
11069 TRACE_IRQS_OFF
11070- testl $3,CS-ARGOFFSET(%rsp)
11071+ testb $3,CS-ARGOFFSET(%rsp)
11072 je retint_restore_args
11073 movl $_TIF_ALLWORK_MASK,%edi
11074 /* edi: mask to check */
11075@@ -800,6 +994,16 @@ END(interrupt)
11030 CFI_ADJUST_CFA_OFFSET 10*8 11076 CFI_ADJUST_CFA_OFFSET 10*8
11031 call save_args 11077 call save_args
11032 PARTIAL_FRAME 0 11078 PARTIAL_FRAME 0
11033- call \func
11034+#ifdef CONFIG_PAX_MEMORY_UDEREF 11079+#ifdef CONFIG_PAX_MEMORY_UDEREF
11035+ testl $3, CS(%rdi) 11080+ testb $3, CS(%rdi)
11036+ jnz 1f 11081+ jnz 1f
11037+ call pax_enter_kernel 11082+ call pax_enter_kernel
11038+ jmp 2f 11083+ jmp 2f
11039+1: call pax_enter_kernel_user 11084+1: call pax_enter_kernel_user
11085+2:
11040+#else 11086+#else
11041+ call pax_enter_kernel 11087+ call pax_enter_kernel
11042+#endif 11088+#endif
11043+2: call \func 11089 call \func
11044 .endm 11090 .endm
11045 11091
11046 /* 11092@@ -822,7 +1026,7 @@ ret_from_intr:
11047@@ -844,12 +1047,18 @@ retint_swapgs: /* return to user-space 11093 CFI_ADJUST_CFA_OFFSET -8
11094 exit_intr:
11095 GET_THREAD_INFO(%rcx)
11096- testl $3,CS-ARGOFFSET(%rsp)
11097+ testb $3,CS-ARGOFFSET(%rsp)
11098 je retint_kernel
11099
11100 /* Interrupt came from user space */
11101@@ -844,12 +1048,18 @@ retint_swapgs: /* return to user-space
11048 * The iretq could re-enable interrupts: 11102 * The iretq could re-enable interrupts:
11049 */ 11103 */
11050 DISABLE_INTERRUPTS(CLBR_ANY) 11104 DISABLE_INTERRUPTS(CLBR_ANY)
@@ -11063,57 +11117,55 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/entry_64.S linux-2.6.32.12/arch/x86/k
11063 /* 11117 /*
11064 * The iretq could re-enable interrupts: 11118 * The iretq could re-enable interrupts:
11065 */ 11119 */
11066@@ -1032,7 +1241,16 @@ ENTRY(\sym) 11120@@ -1032,6 +1242,16 @@ ENTRY(\sym)
11067 CFI_ADJUST_CFA_OFFSET 15*8 11121 CFI_ADJUST_CFA_OFFSET 15*8
11068 call error_entry 11122 call error_entry
11069 DEFAULT_FRAME 0 11123 DEFAULT_FRAME 0
11070- movq %rsp,%rdi /* pt_regs pointer */
11071+#ifdef CONFIG_PAX_MEMORY_UDEREF 11124+#ifdef CONFIG_PAX_MEMORY_UDEREF
11072+ testl $3, CS(%rsp) 11125+ testb $3, CS(%rsp)
11073+ jnz 1f 11126+ jnz 1f
11074+ call pax_enter_kernel 11127+ call pax_enter_kernel
11075+ jmp 2f 11128+ jmp 2f
11076+1: call pax_enter_kernel_user 11129+1: call pax_enter_kernel_user
11130+2:
11077+#else 11131+#else
11078+ call pax_enter_kernel 11132+ call pax_enter_kernel
11079+#endif 11133+#endif
11080+2: movq %rsp,%rdi /* pt_regs pointer */ 11134 movq %rsp,%rdi /* pt_regs pointer */
11081 xorl %esi,%esi /* no error code */ 11135 xorl %esi,%esi /* no error code */
11082 call \do_sym 11136 call \do_sym
11083 jmp error_exit /* %ebx: no swapgs flag */ 11137@@ -1049,6 +1269,16 @@ ENTRY(\sym)
11084@@ -1049,7 +1267,16 @@ ENTRY(\sym)
11085 subq $15*8, %rsp 11138 subq $15*8, %rsp
11086 call save_paranoid 11139 call save_paranoid
11087 TRACE_IRQS_OFF 11140 TRACE_IRQS_OFF
11088- movq %rsp,%rdi /* pt_regs pointer */
11089+#ifdef CONFIG_PAX_MEMORY_UDEREF 11141+#ifdef CONFIG_PAX_MEMORY_UDEREF
11090+ testl $3, CS(%rsp) 11142+ testb $3, CS(%rsp)
11091+ jnz 1f 11143+ jnz 1f
11092+ call pax_enter_kernel 11144+ call pax_enter_kernel
11093+ jmp 2f 11145+ jmp 2f
11094+1: call pax_enter_kernel_user 11146+1: call pax_enter_kernel_user
11147+2:
11095+#else 11148+#else
11096+ call pax_enter_kernel 11149+ call pax_enter_kernel
11097+#endif 11150+#endif
11098+2: movq %rsp,%rdi /* pt_regs pointer */ 11151 movq %rsp,%rdi /* pt_regs pointer */
11099 xorl %esi,%esi /* no error code */ 11152 xorl %esi,%esi /* no error code */
11100 call \do_sym 11153 call \do_sym
11101 jmp paranoid_exit /* %ebx: no swapgs flag */ 11154@@ -1066,9 +1296,24 @@ ENTRY(\sym)
11102@@ -1066,9 +1293,23 @@ ENTRY(\sym)
11103 subq $15*8, %rsp 11155 subq $15*8, %rsp
11104 call save_paranoid 11156 call save_paranoid
11105 TRACE_IRQS_OFF 11157 TRACE_IRQS_OFF
11106- movq %rsp,%rdi /* pt_regs pointer */
11107+#ifdef CONFIG_PAX_MEMORY_UDEREF 11158+#ifdef CONFIG_PAX_MEMORY_UDEREF
11108+ testl $3, CS(%rsp) 11159+ testb $3, CS(%rsp)
11109+ jnz 1f 11160+ jnz 1f
11110+ call pax_enter_kernel 11161+ call pax_enter_kernel
11111+ jmp 2f 11162+ jmp 2f
11112+1: call pax_enter_kernel_user 11163+1: call pax_enter_kernel_user
11164+2:
11113+#else 11165+#else
11114+ call pax_enter_kernel 11166+ call pax_enter_kernel
11115+#endif 11167+#endif
11116+2: movq %rsp,%rdi /* pt_regs pointer */ 11168 movq %rsp,%rdi /* pt_regs pointer */
11117 xorl %esi,%esi /* no error code */ 11169 xorl %esi,%esi /* no error code */
11118- PER_CPU(init_tss, %rbp) 11170- PER_CPU(init_tss, %rbp)
11119+#ifdef CONFIG_SMP 11171+#ifdef CONFIG_SMP
@@ -11125,47 +11177,60 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/entry_64.S linux-2.6.32.12/arch/x86/k
11125 subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) 11177 subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
11126 call \do_sym 11178 call \do_sym
11127 addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) 11179 addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
11128@@ -1085,7 +1326,16 @@ ENTRY(\sym) 11180@@ -1085,6 +1330,16 @@ ENTRY(\sym)
11129 CFI_ADJUST_CFA_OFFSET 15*8 11181 CFI_ADJUST_CFA_OFFSET 15*8
11130 call error_entry 11182 call error_entry
11131 DEFAULT_FRAME 0 11183 DEFAULT_FRAME 0
11132- movq %rsp,%rdi /* pt_regs pointer */
11133+#ifdef CONFIG_PAX_MEMORY_UDEREF 11184+#ifdef CONFIG_PAX_MEMORY_UDEREF
11134+ testl $3, CS(%rsp) 11185+ testb $3, CS(%rsp)
11135+ jnz 1f 11186+ jnz 1f
11136+ call pax_enter_kernel 11187+ call pax_enter_kernel
11137+ jmp 2f 11188+ jmp 2f
11138+1: call pax_enter_kernel_user 11189+1: call pax_enter_kernel_user
11190+2:
11139+#else 11191+#else
11140+ call pax_enter_kernel 11192+ call pax_enter_kernel
11141+#endif 11193+#endif
11142+2: movq %rsp,%rdi /* pt_regs pointer */ 11194 movq %rsp,%rdi /* pt_regs pointer */
11143 movq ORIG_RAX(%rsp),%rsi /* get error code */ 11195 movq ORIG_RAX(%rsp),%rsi /* get error code */
11144 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ 11196 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
11145 call \do_sym 11197@@ -1104,6 +1359,16 @@ ENTRY(\sym)
11146@@ -1104,7 +1354,16 @@ ENTRY(\sym)
11147 call save_paranoid 11198 call save_paranoid
11148 DEFAULT_FRAME 0 11199 DEFAULT_FRAME 0
11149 TRACE_IRQS_OFF 11200 TRACE_IRQS_OFF
11150- movq %rsp,%rdi /* pt_regs pointer */
11151+#ifdef CONFIG_PAX_MEMORY_UDEREF 11201+#ifdef CONFIG_PAX_MEMORY_UDEREF
11152+ testl $3, CS(%rsp) 11202+ testb $3, CS(%rsp)
11153+ jnz 1f 11203+ jnz 1f
11154+ call pax_enter_kernel 11204+ call pax_enter_kernel
11155+ jmp 2f 11205+ jmp 2f
11156+1: call pax_enter_kernel_user 11206+1: call pax_enter_kernel_user
11207+2:
11157+#else 11208+#else
11158+ call pax_enter_kernel 11209+ call pax_enter_kernel
11159+#endif 11210+#endif
11160+2: movq %rsp,%rdi /* pt_regs pointer */ 11211 movq %rsp,%rdi /* pt_regs pointer */
11161 movq ORIG_RAX(%rsp),%rsi /* get error code */ 11212 movq ORIG_RAX(%rsp),%rsi /* get error code */
11162 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ 11213 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
11163 call \do_sym 11214@@ -1405,14 +1670,27 @@ ENTRY(paranoid_exit)
11164@@ -1408,11 +1667,13 @@ ENTRY(paranoid_exit) 11215 TRACE_IRQS_OFF
11165 testl $3,CS(%rsp) 11216 testl %ebx,%ebx /* swapgs needed? */
11217 jnz paranoid_restore
11218- testl $3,CS(%rsp)
11219+ testb $3,CS(%rsp)
11166 jnz paranoid_userspace 11220 jnz paranoid_userspace
11221+#ifdef CONFIG_PAX_MEMORY_UDEREF
11222+ call pax_exit_kernel
11223+ TRACE_IRQS_IRETQ 0
11224+ SWAPGS_UNSAFE_STACK
11225+ RESTORE_ALL 8
11226+ jmp irq_return
11227+#endif
11167 paranoid_swapgs: 11228 paranoid_swapgs:
11229+#ifdef CONFIG_PAX_MEMORY_UDEREF
11230+ call pax_exit_kernel_user
11231+#else
11168+ call pax_exit_kernel 11232+ call pax_exit_kernel
11233+#endif
11169 TRACE_IRQS_IRETQ 0 11234 TRACE_IRQS_IRETQ 0
11170 SWAPGS_UNSAFE_STACK 11235 SWAPGS_UNSAFE_STACK
11171 RESTORE_ALL 8 11236 RESTORE_ALL 8
@@ -11175,24 +11240,39 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/entry_64.S linux-2.6.32.12/arch/x86/k
11175 TRACE_IRQS_IRETQ 0 11240 TRACE_IRQS_IRETQ 0
11176 RESTORE_ALL 8 11241 RESTORE_ALL 8
11177 jmp irq_return 11242 jmp irq_return
11178@@ -1529,6 +1790,16 @@ ENTRY(nmi) 11243@@ -1470,7 +1748,7 @@ ENTRY(error_entry)
11244 movq_cfi r14, R14+8
11245 movq_cfi r15, R15+8
11246 xorl %ebx,%ebx
11247- testl $3,CS+8(%rsp)
11248+ testb $3,CS+8(%rsp)
11249 je error_kernelspace
11250 error_swapgs:
11251 SWAPGS
11252@@ -1529,6 +1807,16 @@ ENTRY(nmi)
11179 CFI_ADJUST_CFA_OFFSET 15*8 11253 CFI_ADJUST_CFA_OFFSET 15*8
11180 call save_paranoid 11254 call save_paranoid
11181 DEFAULT_FRAME 0 11255 DEFAULT_FRAME 0
11182+#ifdef CONFIG_PAX_MEMORY_UDEREF 11256+#ifdef CONFIG_PAX_MEMORY_UDEREF
11183+ testl $3, CS(%rsp) 11257+ testb $3, CS(%rsp)
11184+ jnz 1f 11258+ jnz 1f
11185+ call pax_enter_kernel 11259+ call pax_enter_kernel
11186+ jmp 2f 11260+ jmp 2f
11187+1: call pax_enter_kernel_user 11261+1: call pax_enter_kernel_user
11262+2:
11188+#else 11263+#else
11189+ call pax_enter_kernel 11264+ call pax_enter_kernel
11190+#endif 11265+#endif
11191+2:
11192 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */ 11266 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
11193 movq %rsp,%rdi 11267 movq %rsp,%rdi
11194 movq $-1,%rsi 11268 movq $-1,%rsi
11195@@ -1544,6 +1815,7 @@ ENTRY(nmi) 11269@@ -1539,11 +1827,12 @@ ENTRY(nmi)
11270 DISABLE_INTERRUPTS(CLBR_NONE)
11271 testl %ebx,%ebx /* swapgs needed? */
11272 jnz nmi_restore
11273- testl $3,CS(%rsp)
11274+ testb $3,CS(%rsp)
11275 jnz nmi_userspace
11196 nmi_swapgs: 11276 nmi_swapgs:
11197 SWAPGS_UNSAFE_STACK 11277 SWAPGS_UNSAFE_STACK
11198 nmi_restore: 11278 nmi_restore:
@@ -11200,9 +11280,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/entry_64.S linux-2.6.32.12/arch/x86/k
11200 RESTORE_ALL 8 11280 RESTORE_ALL 8
11201 jmp irq_return 11281 jmp irq_return
11202 nmi_userspace: 11282 nmi_userspace:
11203diff -urNp linux-2.6.32.12/arch/x86/kernel/ftrace.c linux-2.6.32.12/arch/x86/kernel/ftrace.c 11283diff -urNp linux-2.6.32.13/arch/x86/kernel/ftrace.c linux-2.6.32.13/arch/x86/kernel/ftrace.c
11204--- linux-2.6.32.12/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400 11284--- linux-2.6.32.13/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400
11205+++ linux-2.6.32.12/arch/x86/kernel/ftrace.c 2010-04-04 20:46:41.517551870 -0400 11285+++ linux-2.6.32.13/arch/x86/kernel/ftrace.c 2010-05-15 13:21:14.070771689 -0400
11206@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) 11286@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
11207 { 11287 {
11208 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { 11288 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -11268,9 +11348,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/ftrace.c linux-2.6.32.12/arch/x86/ker
11268 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) 11348 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
11269 return -EFAULT; 11349 return -EFAULT;
11270 11350
11271diff -urNp linux-2.6.32.12/arch/x86/kernel/head32.c linux-2.6.32.12/arch/x86/kernel/head32.c 11351diff -urNp linux-2.6.32.13/arch/x86/kernel/head32.c linux-2.6.32.13/arch/x86/kernel/head32.c
11272--- linux-2.6.32.12/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400 11352--- linux-2.6.32.13/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400
11273+++ linux-2.6.32.12/arch/x86/kernel/head32.c 2010-04-04 20:46:41.517551870 -0400 11353+++ linux-2.6.32.13/arch/x86/kernel/head32.c 2010-05-15 13:21:14.070771689 -0400
11274@@ -16,6 +16,7 @@ 11354@@ -16,6 +16,7 @@
11275 #include <asm/apic.h> 11355 #include <asm/apic.h>
11276 #include <asm/io_apic.h> 11356 #include <asm/io_apic.h>
@@ -11288,9 +11368,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/head32.c linux-2.6.32.12/arch/x86/ker
11288 11368
11289 #ifdef CONFIG_BLK_DEV_INITRD 11369 #ifdef CONFIG_BLK_DEV_INITRD
11290 /* Reserve INITRD */ 11370 /* Reserve INITRD */
11291diff -urNp linux-2.6.32.12/arch/x86/kernel/head_32.S linux-2.6.32.12/arch/x86/kernel/head_32.S 11371diff -urNp linux-2.6.32.13/arch/x86/kernel/head_32.S linux-2.6.32.13/arch/x86/kernel/head_32.S
11292--- linux-2.6.32.12/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400 11372--- linux-2.6.32.13/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400
11293+++ linux-2.6.32.12/arch/x86/kernel/head_32.S 2010-04-04 20:58:33.220592413 -0400 11373+++ linux-2.6.32.13/arch/x86/kernel/head_32.S 2010-05-15 13:21:14.070771689 -0400
11294@@ -19,10 +19,17 @@ 11374@@ -19,10 +19,17 @@
11295 #include <asm/setup.h> 11375 #include <asm/setup.h>
11296 #include <asm/processor-flags.h> 11376 #include <asm/processor-flags.h>
@@ -11732,9 +11812,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/head_32.S linux-2.6.32.12/arch/x86/ke
11732+ /* Be sure this is zeroed to avoid false validations in Xen */ 11812+ /* Be sure this is zeroed to avoid false validations in Xen */
11733+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0 11813+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
11734+ .endr 11814+ .endr
11735diff -urNp linux-2.6.32.12/arch/x86/kernel/head64.c linux-2.6.32.12/arch/x86/kernel/head64.c 11815diff -urNp linux-2.6.32.13/arch/x86/kernel/head64.c linux-2.6.32.13/arch/x86/kernel/head64.c
11736--- linux-2.6.32.12/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400 11816--- linux-2.6.32.13/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400
11737+++ linux-2.6.32.12/arch/x86/kernel/head64.c 2010-04-04 20:58:33.225084964 -0400 11817+++ linux-2.6.32.13/arch/x86/kernel/head64.c 2010-05-15 13:21:14.070771689 -0400
11738@@ -29,7 +29,13 @@ 11818@@ -29,7 +29,13 @@
11739 static void __init zap_identity_mappings(void) 11819 static void __init zap_identity_mappings(void)
11740 { 11820 {
@@ -11749,9 +11829,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/head64.c linux-2.6.32.12/arch/x86/ker
11749 __flush_tlb_all(); 11829 __flush_tlb_all();
11750 } 11830 }
11751 11831
11752diff -urNp linux-2.6.32.12/arch/x86/kernel/head_64.S linux-2.6.32.12/arch/x86/kernel/head_64.S 11832diff -urNp linux-2.6.32.13/arch/x86/kernel/head_64.S linux-2.6.32.13/arch/x86/kernel/head_64.S
11753--- linux-2.6.32.12/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400 11833--- linux-2.6.32.13/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400
11754+++ linux-2.6.32.12/arch/x86/kernel/head_64.S 2010-04-04 20:58:33.220592413 -0400 11834+++ linux-2.6.32.13/arch/x86/kernel/head_64.S 2010-05-15 13:21:14.070771689 -0400
11755@@ -19,6 +19,7 @@ 11835@@ -19,6 +19,7 @@
11756 #include <asm/cache.h> 11836 #include <asm/cache.h>
11757 #include <asm/processor-flags.h> 11837 #include <asm/processor-flags.h>
@@ -12022,9 +12102,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/head_64.S linux-2.6.32.12/arch/x86/ke
12022 12102
12023 __PAGE_ALIGNED_BSS 12103 __PAGE_ALIGNED_BSS
12024 .align PAGE_SIZE 12104 .align PAGE_SIZE
12025diff -urNp linux-2.6.32.12/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.12/arch/x86/kernel/i386_ksyms_32.c 12105diff -urNp linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c
12026--- linux-2.6.32.12/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400 12106--- linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400
12027+++ linux-2.6.32.12/arch/x86/kernel/i386_ksyms_32.c 2010-04-04 20:46:41.517551870 -0400 12107+++ linux-2.6.32.13/arch/x86/kernel/i386_ksyms_32.c 2010-05-15 13:21:14.070771689 -0400
12028@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); 12108@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
12029 EXPORT_SYMBOL(cmpxchg8b_emu); 12109 EXPORT_SYMBOL(cmpxchg8b_emu);
12030 #endif 12110 #endif
@@ -12046,9 +12126,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.12/arch/
12046+#ifdef CONFIG_PAX_KERNEXEC 12126+#ifdef CONFIG_PAX_KERNEXEC
12047+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); 12127+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
12048+#endif 12128+#endif
12049diff -urNp linux-2.6.32.12/arch/x86/kernel/init_task.c linux-2.6.32.12/arch/x86/kernel/init_task.c 12129diff -urNp linux-2.6.32.13/arch/x86/kernel/init_task.c linux-2.6.32.13/arch/x86/kernel/init_task.c
12050--- linux-2.6.32.12/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400 12130--- linux-2.6.32.13/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400
12051+++ linux-2.6.32.12/arch/x86/kernel/init_task.c 2010-04-04 20:46:41.517551870 -0400 12131+++ linux-2.6.32.13/arch/x86/kernel/init_task.c 2010-05-15 13:21:14.070771689 -0400
12052@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); 12132@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
12053 * section. Since TSS's are completely CPU-local, we want them 12133 * section. Since TSS's are completely CPU-local, we want them
12054 * on exact cacheline boundaries, to eliminate cacheline ping-pong. 12134 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -12057,9 +12137,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/init_task.c linux-2.6.32.12/arch/x86/
12057- 12137-
12058+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; 12138+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
12059+EXPORT_SYMBOL(init_tss); 12139+EXPORT_SYMBOL(init_tss);
12060diff -urNp linux-2.6.32.12/arch/x86/kernel/ioport.c linux-2.6.32.12/arch/x86/kernel/ioport.c 12140diff -urNp linux-2.6.32.13/arch/x86/kernel/ioport.c linux-2.6.32.13/arch/x86/kernel/ioport.c
12061--- linux-2.6.32.12/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 12141--- linux-2.6.32.13/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
12062+++ linux-2.6.32.12/arch/x86/kernel/ioport.c 2010-04-04 20:46:41.517551870 -0400 12142+++ linux-2.6.32.13/arch/x86/kernel/ioport.c 2010-05-15 13:21:14.070771689 -0400
12063@@ -6,6 +6,7 @@ 12143@@ -6,6 +6,7 @@
12064 #include <linux/sched.h> 12144 #include <linux/sched.h>
12065 #include <linux/kernel.h> 12145 #include <linux/kernel.h>
@@ -12104,9 +12184,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/ioport.c linux-2.6.32.12/arch/x86/ker
12104 } 12184 }
12105 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); 12185 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
12106 12186
12107diff -urNp linux-2.6.32.12/arch/x86/kernel/irq_32.c linux-2.6.32.12/arch/x86/kernel/irq_32.c 12187diff -urNp linux-2.6.32.13/arch/x86/kernel/irq_32.c linux-2.6.32.13/arch/x86/kernel/irq_32.c
12108--- linux-2.6.32.12/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400 12188--- linux-2.6.32.13/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400
12109+++ linux-2.6.32.12/arch/x86/kernel/irq_32.c 2010-04-04 20:46:41.521777445 -0400 12189+++ linux-2.6.32.13/arch/x86/kernel/irq_32.c 2010-05-15 13:21:14.070771689 -0400
12110@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc 12190@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
12111 return 0; 12191 return 0;
12112 12192
@@ -12125,9 +12205,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/irq_32.c linux-2.6.32.12/arch/x86/ker
12125 12205
12126 call_on_stack(__do_softirq, isp); 12206 call_on_stack(__do_softirq, isp);
12127 /* 12207 /*
12128diff -urNp linux-2.6.32.12/arch/x86/kernel/kgdb.c linux-2.6.32.12/arch/x86/kernel/kgdb.c 12208diff -urNp linux-2.6.32.13/arch/x86/kernel/kgdb.c linux-2.6.32.13/arch/x86/kernel/kgdb.c
12129--- linux-2.6.32.12/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 12209--- linux-2.6.32.13/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
12130+++ linux-2.6.32.12/arch/x86/kernel/kgdb.c 2010-04-04 20:46:41.521777445 -0400 12210+++ linux-2.6.32.13/arch/x86/kernel/kgdb.c 2010-05-15 13:21:14.070771689 -0400
12131@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception 12211@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
12132 return instruction_pointer(regs); 12212 return instruction_pointer(regs);
12133 } 12213 }
@@ -12137,9 +12217,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/kgdb.c linux-2.6.32.12/arch/x86/kerne
12137 /* Breakpoint instruction: */ 12217 /* Breakpoint instruction: */
12138 .gdb_bpt_instr = { 0xcc }, 12218 .gdb_bpt_instr = { 0xcc },
12139 .flags = KGDB_HW_BREAKPOINT, 12219 .flags = KGDB_HW_BREAKPOINT,
12140diff -urNp linux-2.6.32.12/arch/x86/kernel/kprobes.c linux-2.6.32.12/arch/x86/kernel/kprobes.c 12220diff -urNp linux-2.6.32.13/arch/x86/kernel/kprobes.c linux-2.6.32.13/arch/x86/kernel/kprobes.c
12141--- linux-2.6.32.12/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 12221--- linux-2.6.32.13/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400
12142+++ linux-2.6.32.12/arch/x86/kernel/kprobes.c 2010-04-04 20:46:41.521777445 -0400 12222+++ linux-2.6.32.13/arch/x86/kernel/kprobes.c 2010-05-15 13:23:38.934774262 -0400
12143@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f 12223@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
12144 char op; 12224 char op;
12145 s32 raddr; 12225 s32 raddr;
@@ -12155,7 +12235,17 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/kprobes.c linux-2.6.32.12/arch/x86/ke
12155 } 12235 }
12156 12236
12157 /* 12237 /*
12158@@ -345,16 +349,18 @@ static void __kprobes fix_riprel(struct 12238@@ -337,7 +341,9 @@ static void __kprobes fix_riprel(struct
12239 disp = (u8 *) p->addr + *((s32 *) insn) -
12240 (u8 *) p->ainsn.insn;
12241 BUG_ON((s64) (s32) disp != disp); /* Sanity check. */
12242+ pax_open_kernel();
12243 *(s32 *)insn = (s32) disp;
12244+ pax_close_kernel();
12245 }
12246 }
12247 #endif
12248@@ -345,16 +351,18 @@ static void __kprobes fix_riprel(struct
12159 12249
12160 static void __kprobes arch_copy_kprobe(struct kprobe *p) 12250 static void __kprobes arch_copy_kprobe(struct kprobe *p)
12161 { 12251 {
@@ -12177,7 +12267,7 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/kprobes.c linux-2.6.32.12/arch/x86/ke
12177 } 12267 }
12178 12268
12179 int __kprobes arch_prepare_kprobe(struct kprobe *p) 12269 int __kprobes arch_prepare_kprobe(struct kprobe *p)
12180@@ -432,7 +438,7 @@ static void __kprobes prepare_singlestep 12270@@ -432,7 +440,7 @@ static void __kprobes prepare_singlestep
12181 if (p->opcode == BREAKPOINT_INSTRUCTION) 12271 if (p->opcode == BREAKPOINT_INSTRUCTION)
12182 regs->ip = (unsigned long)p->addr; 12272 regs->ip = (unsigned long)p->addr;
12183 else 12273 else
@@ -12186,7 +12276,7 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/kprobes.c linux-2.6.32.12/arch/x86/ke
12186 } 12276 }
12187 12277
12188 void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, 12278 void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,
12189@@ -453,7 +459,7 @@ static void __kprobes setup_singlestep(s 12279@@ -453,7 +461,7 @@ static void __kprobes setup_singlestep(s
12190 if (p->ainsn.boostable == 1 && !p->post_handler) { 12280 if (p->ainsn.boostable == 1 && !p->post_handler) {
12191 /* Boost up -- we can execute copied instructions directly */ 12281 /* Boost up -- we can execute copied instructions directly */
12192 reset_current_kprobe(); 12282 reset_current_kprobe();
@@ -12195,7 +12285,7 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/kprobes.c linux-2.6.32.12/arch/x86/ke
12195 preempt_enable_no_resched(); 12285 preempt_enable_no_resched();
12196 return; 12286 return;
12197 } 12287 }
12198@@ -523,7 +529,7 @@ static int __kprobes kprobe_handler(stru 12288@@ -523,7 +531,7 @@ static int __kprobes kprobe_handler(stru
12199 struct kprobe_ctlblk *kcb; 12289 struct kprobe_ctlblk *kcb;
12200 12290
12201 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t)); 12291 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
@@ -12204,7 +12294,7 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/kprobes.c linux-2.6.32.12/arch/x86/ke
12204 /* 12294 /*
12205 * The breakpoint instruction was removed right 12295 * The breakpoint instruction was removed right
12206 * after we hit it. Another cpu has removed 12296 * after we hit it. Another cpu has removed
12207@@ -775,7 +781,7 @@ static void __kprobes resume_execution(s 12297@@ -775,7 +783,7 @@ static void __kprobes resume_execution(s
12208 struct pt_regs *regs, struct kprobe_ctlblk *kcb) 12298 struct pt_regs *regs, struct kprobe_ctlblk *kcb)
12209 { 12299 {
12210 unsigned long *tos = stack_addr(regs); 12300 unsigned long *tos = stack_addr(regs);
@@ -12213,7 +12303,7 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/kprobes.c linux-2.6.32.12/arch/x86/ke
12213 unsigned long orig_ip = (unsigned long)p->addr; 12303 unsigned long orig_ip = (unsigned long)p->addr;
12214 kprobe_opcode_t *insn = p->ainsn.insn; 12304 kprobe_opcode_t *insn = p->ainsn.insn;
12215 12305
12216@@ -958,7 +964,7 @@ int __kprobes kprobe_exceptions_notify(s 12306@@ -958,7 +966,7 @@ int __kprobes kprobe_exceptions_notify(s
12217 struct die_args *args = data; 12307 struct die_args *args = data;
12218 int ret = NOTIFY_DONE; 12308 int ret = NOTIFY_DONE;
12219 12309
@@ -12222,9 +12312,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/kprobes.c linux-2.6.32.12/arch/x86/ke
12222 return ret; 12312 return ret;
12223 12313
12224 switch (val) { 12314 switch (val) {
12225diff -urNp linux-2.6.32.12/arch/x86/kernel/ldt.c linux-2.6.32.12/arch/x86/kernel/ldt.c 12315diff -urNp linux-2.6.32.13/arch/x86/kernel/ldt.c linux-2.6.32.13/arch/x86/kernel/ldt.c
12226--- linux-2.6.32.12/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400 12316--- linux-2.6.32.13/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400
12227+++ linux-2.6.32.12/arch/x86/kernel/ldt.c 2010-04-04 20:46:41.521777445 -0400 12317+++ linux-2.6.32.13/arch/x86/kernel/ldt.c 2010-05-15 13:21:14.074681352 -0400
12228@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i 12318@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
12229 if (reload) { 12319 if (reload) {
12230 #ifdef CONFIG_SMP 12320 #ifdef CONFIG_SMP
@@ -12289,9 +12379,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/ldt.c linux-2.6.32.12/arch/x86/kernel
12289 fill_ldt(&ldt, &ldt_info); 12379 fill_ldt(&ldt, &ldt_info);
12290 if (oldmode) 12380 if (oldmode)
12291 ldt.avl = 0; 12381 ldt.avl = 0;
12292diff -urNp linux-2.6.32.12/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.12/arch/x86/kernel/machine_kexec_32.c 12382diff -urNp linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c
12293--- linux-2.6.32.12/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400 12383--- linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400
12294+++ linux-2.6.32.12/arch/x86/kernel/machine_kexec_32.c 2010-04-04 20:46:41.521777445 -0400 12384+++ linux-2.6.32.13/arch/x86/kernel/machine_kexec_32.c 2010-05-15 13:21:14.082777933 -0400
12295@@ -26,7 +26,7 @@ 12385@@ -26,7 +26,7 @@
12296 #include <asm/system.h> 12386 #include <asm/system.h>
12297 #include <asm/cacheflush.h> 12387 #include <asm/cacheflush.h>
@@ -12319,9 +12409,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.12/ar
12319 12409
12320 relocate_kernel_ptr = control_page; 12410 relocate_kernel_ptr = control_page;
12321 page_list[PA_CONTROL_PAGE] = __pa(control_page); 12411 page_list[PA_CONTROL_PAGE] = __pa(control_page);
12322diff -urNp linux-2.6.32.12/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.12/arch/x86/kernel/machine_kexec_64.c 12412diff -urNp linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c
12323--- linux-2.6.32.12/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400 12413--- linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400
12324+++ linux-2.6.32.12/arch/x86/kernel/machine_kexec_64.c 2010-04-04 20:58:33.225084964 -0400 12414+++ linux-2.6.32.13/arch/x86/kernel/machine_kexec_64.c 2010-05-15 13:21:14.082777933 -0400
12325@@ -126,7 +126,13 @@ static int init_level4_page(struct kimag 12415@@ -126,7 +126,13 @@ static int init_level4_page(struct kimag
12326 } 12416 }
12327 /* clear the unused entries */ 12417 /* clear the unused entries */
@@ -12336,9 +12426,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/machine_kexec_64.c linux-2.6.32.12/ar
12336 addr += PGDIR_SIZE; 12426 addr += PGDIR_SIZE;
12337 } 12427 }
12338 out: 12428 out:
12339diff -urNp linux-2.6.32.12/arch/x86/kernel/microcode_amd.c linux-2.6.32.12/arch/x86/kernel/microcode_amd.c 12429diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_amd.c linux-2.6.32.13/arch/x86/kernel/microcode_amd.c
12340--- linux-2.6.32.12/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400 12430--- linux-2.6.32.13/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400
12341+++ linux-2.6.32.12/arch/x86/kernel/microcode_amd.c 2010-04-04 20:46:41.521777445 -0400 12431+++ linux-2.6.32.13/arch/x86/kernel/microcode_amd.c 2010-05-15 13:21:14.082777933 -0400
12342@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c 12432@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
12343 uci->mc = NULL; 12433 uci->mc = NULL;
12344 } 12434 }
@@ -12357,9 +12447,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/microcode_amd.c linux-2.6.32.12/arch/
12357 { 12447 {
12358 return &microcode_amd_ops; 12448 return &microcode_amd_ops;
12359 } 12449 }
12360diff -urNp linux-2.6.32.12/arch/x86/kernel/microcode_core.c linux-2.6.32.12/arch/x86/kernel/microcode_core.c 12450diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_core.c linux-2.6.32.13/arch/x86/kernel/microcode_core.c
12361--- linux-2.6.32.12/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400 12451--- linux-2.6.32.13/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400
12362+++ linux-2.6.32.12/arch/x86/kernel/microcode_core.c 2010-04-04 20:46:41.521777445 -0400 12452+++ linux-2.6.32.13/arch/x86/kernel/microcode_core.c 2010-05-15 13:21:14.082777933 -0400
12363@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); 12453@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
12364 12454
12365 #define MICROCODE_VERSION "2.00" 12455 #define MICROCODE_VERSION "2.00"
@@ -12369,9 +12459,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/microcode_core.c linux-2.6.32.12/arch
12369 12459
12370 /* 12460 /*
12371 * Synchronization. 12461 * Synchronization.
12372diff -urNp linux-2.6.32.12/arch/x86/kernel/microcode_intel.c linux-2.6.32.12/arch/x86/kernel/microcode_intel.c 12462diff -urNp linux-2.6.32.13/arch/x86/kernel/microcode_intel.c linux-2.6.32.13/arch/x86/kernel/microcode_intel.c
12373--- linux-2.6.32.12/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400 12463--- linux-2.6.32.13/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400
12374+++ linux-2.6.32.12/arch/x86/kernel/microcode_intel.c 2010-04-04 20:46:41.521777445 -0400 12464+++ linux-2.6.32.13/arch/x86/kernel/microcode_intel.c 2010-05-15 13:21:14.082777933 -0400
12375@@ -443,13 +443,13 @@ static enum ucode_state request_microcod 12465@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
12376 12466
12377 static int get_ucode_user(void *to, const void *from, size_t n) 12467 static int get_ucode_user(void *to, const void *from, size_t n)
@@ -12406,9 +12496,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/microcode_intel.c linux-2.6.32.12/arc
12406 { 12496 {
12407 return &microcode_intel_ops; 12497 return &microcode_intel_ops;
12408 } 12498 }
12409diff -urNp linux-2.6.32.12/arch/x86/kernel/module.c linux-2.6.32.12/arch/x86/kernel/module.c 12499diff -urNp linux-2.6.32.13/arch/x86/kernel/module.c linux-2.6.32.13/arch/x86/kernel/module.c
12410--- linux-2.6.32.12/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 12500--- linux-2.6.32.13/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
12411+++ linux-2.6.32.12/arch/x86/kernel/module.c 2010-04-04 20:46:41.521777445 -0400 12501+++ linux-2.6.32.13/arch/x86/kernel/module.c 2010-05-15 13:21:14.082777933 -0400
12412@@ -34,7 +34,7 @@ 12502@@ -34,7 +34,7 @@
12413 #define DEBUGP(fmt...) 12503 #define DEBUGP(fmt...)
12414 #endif 12504 #endif
@@ -12549,9 +12639,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/module.c linux-2.6.32.12/arch/x86/ker
12549 #if 0 12639 #if 0
12550 if ((s64)val != *(s32 *)loc) 12640 if ((s64)val != *(s32 *)loc)
12551 goto overflow; 12641 goto overflow;
12552diff -urNp linux-2.6.32.12/arch/x86/kernel/paravirt.c linux-2.6.32.12/arch/x86/kernel/paravirt.c 12642diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt.c linux-2.6.32.13/arch/x86/kernel/paravirt.c
12553--- linux-2.6.32.12/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400 12643--- linux-2.6.32.13/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400
12554+++ linux-2.6.32.12/arch/x86/kernel/paravirt.c 2010-04-29 17:46:36.865234674 -0400 12644+++ linux-2.6.32.13/arch/x86/kernel/paravirt.c 2010-05-15 13:21:14.088032889 -0400
12555@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu 12645@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
12556 * corresponding structure. */ 12646 * corresponding structure. */
12557 static void *get_call_destination(u8 type) 12647 static void *get_call_destination(u8 type)
@@ -12655,9 +12745,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/paravirt.c linux-2.6.32.12/arch/x86/k
12655 }; 12745 };
12656 12746
12657 EXPORT_SYMBOL_GPL(pv_time_ops); 12747 EXPORT_SYMBOL_GPL(pv_time_ops);
12658diff -urNp linux-2.6.32.12/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.12/arch/x86/kernel/paravirt-spinlocks.c 12748diff -urNp linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c
12659--- linux-2.6.32.12/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400 12749--- linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400
12660+++ linux-2.6.32.12/arch/x86/kernel/paravirt-spinlocks.c 2010-04-04 20:46:41.521777445 -0400 12750+++ linux-2.6.32.13/arch/x86/kernel/paravirt-spinlocks.c 2010-05-15 13:21:14.088032889 -0400
12661@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * 12751@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
12662 __raw_spin_lock(lock); 12752 __raw_spin_lock(lock);
12663 } 12753 }
@@ -12667,9 +12757,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.12/
12667 #ifdef CONFIG_SMP 12757 #ifdef CONFIG_SMP
12668 .spin_is_locked = __ticket_spin_is_locked, 12758 .spin_is_locked = __ticket_spin_is_locked,
12669 .spin_is_contended = __ticket_spin_is_contended, 12759 .spin_is_contended = __ticket_spin_is_contended,
12670diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.12/arch/x86/kernel/pci-calgary_64.c 12760diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c
12671--- linux-2.6.32.12/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400 12761--- linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400
12672+++ linux-2.6.32.12/arch/x86/kernel/pci-calgary_64.c 2010-04-04 20:46:41.521777445 -0400 12762+++ linux-2.6.32.13/arch/x86/kernel/pci-calgary_64.c 2010-05-15 13:21:14.095776197 -0400
12673@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct 12763@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct
12674 free_pages((unsigned long)vaddr, get_order(size)); 12764 free_pages((unsigned long)vaddr, get_order(size));
12675 } 12765 }
@@ -12679,9 +12769,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.12/arch
12679 .alloc_coherent = calgary_alloc_coherent, 12769 .alloc_coherent = calgary_alloc_coherent,
12680 .free_coherent = calgary_free_coherent, 12770 .free_coherent = calgary_free_coherent,
12681 .map_sg = calgary_map_sg, 12771 .map_sg = calgary_map_sg,
12682diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-dma.c linux-2.6.32.12/arch/x86/kernel/pci-dma.c 12772diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-dma.c linux-2.6.32.13/arch/x86/kernel/pci-dma.c
12683--- linux-2.6.32.12/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 12773--- linux-2.6.32.13/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
12684+++ linux-2.6.32.12/arch/x86/kernel/pci-dma.c 2010-04-04 20:46:41.521777445 -0400 12774+++ linux-2.6.32.13/arch/x86/kernel/pci-dma.c 2010-05-15 13:21:14.095776197 -0400
12685@@ -14,7 +14,7 @@ 12775@@ -14,7 +14,7 @@
12686 12776
12687 static int forbid_dac __read_mostly; 12777 static int forbid_dac __read_mostly;
@@ -12700,9 +12790,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-dma.c linux-2.6.32.12/arch/x86/ke
12700 12790
12701 #ifdef CONFIG_PCI 12791 #ifdef CONFIG_PCI
12702 if (mask > 0xffffffff && forbid_dac > 0) { 12792 if (mask > 0xffffffff && forbid_dac > 0) {
12703diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-gart_64.c linux-2.6.32.12/arch/x86/kernel/pci-gart_64.c 12793diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c
12704--- linux-2.6.32.12/arch/x86/kernel/pci-gart_64.c 2010-04-29 17:49:37.537108997 -0400 12794--- linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c 2010-05-15 13:20:18.438563899 -0400
12705+++ linux-2.6.32.12/arch/x86/kernel/pci-gart_64.c 2010-04-29 17:49:57.989487280 -0400 12795+++ linux-2.6.32.13/arch/x86/kernel/pci-gart_64.c 2010-05-15 13:21:14.095776197 -0400
12706@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag 12796@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
12707 return -1; 12797 return -1;
12708 } 12798 }
@@ -12712,9 +12802,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-gart_64.c linux-2.6.32.12/arch/x8
12712 .map_sg = gart_map_sg, 12802 .map_sg = gart_map_sg,
12713 .unmap_sg = gart_unmap_sg, 12803 .unmap_sg = gart_unmap_sg,
12714 .map_page = gart_map_page, 12804 .map_page = gart_map_page,
12715diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-nommu.c linux-2.6.32.12/arch/x86/kernel/pci-nommu.c 12805diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-nommu.c linux-2.6.32.13/arch/x86/kernel/pci-nommu.c
12716--- linux-2.6.32.12/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400 12806--- linux-2.6.32.13/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400
12717+++ linux-2.6.32.12/arch/x86/kernel/pci-nommu.c 2010-04-04 20:46:41.521777445 -0400 12807+++ linux-2.6.32.13/arch/x86/kernel/pci-nommu.c 2010-05-15 13:21:14.095776197 -0400
12718@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str 12808@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
12719 flush_write_buffers(); 12809 flush_write_buffers();
12720 } 12810 }
@@ -12724,9 +12814,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-nommu.c linux-2.6.32.12/arch/x86/
12724 .alloc_coherent = dma_generic_alloc_coherent, 12814 .alloc_coherent = dma_generic_alloc_coherent,
12725 .free_coherent = nommu_free_coherent, 12815 .free_coherent = nommu_free_coherent,
12726 .map_sg = nommu_map_sg, 12816 .map_sg = nommu_map_sg,
12727diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.12/arch/x86/kernel/pci-swiotlb.c 12817diff -urNp linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c
12728--- linux-2.6.32.12/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 12818--- linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
12729+++ linux-2.6.32.12/arch/x86/kernel/pci-swiotlb.c 2010-04-04 20:46:41.521777445 -0400 12819+++ linux-2.6.32.13/arch/x86/kernel/pci-swiotlb.c 2010-05-15 13:21:14.095776197 -0400
12730@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( 12820@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
12731 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); 12821 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
12732 } 12822 }
@@ -12736,9 +12826,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.12/arch/x8
12736 .mapping_error = swiotlb_dma_mapping_error, 12826 .mapping_error = swiotlb_dma_mapping_error,
12737 .alloc_coherent = x86_swiotlb_alloc_coherent, 12827 .alloc_coherent = x86_swiotlb_alloc_coherent,
12738 .free_coherent = swiotlb_free_coherent, 12828 .free_coherent = swiotlb_free_coherent,
12739diff -urNp linux-2.6.32.12/arch/x86/kernel/process_32.c linux-2.6.32.12/arch/x86/kernel/process_32.c 12829diff -urNp linux-2.6.32.13/arch/x86/kernel/process_32.c linux-2.6.32.13/arch/x86/kernel/process_32.c
12740--- linux-2.6.32.12/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400 12830--- linux-2.6.32.13/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400
12741+++ linux-2.6.32.12/arch/x86/kernel/process_32.c 2010-04-04 20:46:41.521777445 -0400 12831+++ linux-2.6.32.13/arch/x86/kernel/process_32.c 2010-05-15 13:21:14.095776197 -0400
12742@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as 12832@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
12743 unsigned long thread_saved_pc(struct task_struct *tsk) 12833 unsigned long thread_saved_pc(struct task_struct *tsk)
12744 { 12834 {
@@ -12833,9 +12923,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/process_32.c linux-2.6.32.12/arch/x86
12833+ load_sp0(init_tss + smp_processor_id(), thread); 12923+ load_sp0(init_tss + smp_processor_id(), thread);
12834+} 12924+}
12835+#endif 12925+#endif
12836diff -urNp linux-2.6.32.12/arch/x86/kernel/process_64.c linux-2.6.32.12/arch/x86/kernel/process_64.c 12926diff -urNp linux-2.6.32.13/arch/x86/kernel/process_64.c linux-2.6.32.13/arch/x86/kernel/process_64.c
12837--- linux-2.6.32.12/arch/x86/kernel/process_64.c 2010-04-04 20:41:49.920655481 -0400 12927--- linux-2.6.32.13/arch/x86/kernel/process_64.c 2010-05-15 13:20:18.438563899 -0400
12838+++ linux-2.6.32.12/arch/x86/kernel/process_64.c 2010-04-04 20:46:41.521777445 -0400 12928+++ linux-2.6.32.13/arch/x86/kernel/process_64.c 2010-05-15 13:21:14.095776197 -0400
12839@@ -91,7 +91,7 @@ static void __exit_idle(void) 12929@@ -91,7 +91,7 @@ static void __exit_idle(void)
12840 void exit_idle(void) 12930 void exit_idle(void)
12841 { 12931 {
@@ -12854,7 +12944,7 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/process_64.c linux-2.6.32.12/arch/x86
12854 init_utsname()->release, 12944 init_utsname()->release,
12855 (int)strcspn(init_utsname()->version, " "), 12945 (int)strcspn(init_utsname()->version, " "),
12856 init_utsname()->version, board); 12946 init_utsname()->version, board);
12857@@ -381,7 +381,7 @@ __switch_to(struct task_struct *prev_p, 12947@@ -380,7 +380,7 @@ __switch_to(struct task_struct *prev_p,
12858 struct thread_struct *prev = &prev_p->thread; 12948 struct thread_struct *prev = &prev_p->thread;
12859 struct thread_struct *next = &next_p->thread; 12949 struct thread_struct *next = &next_p->thread;
12860 int cpu = smp_processor_id(); 12950 int cpu = smp_processor_id();
@@ -12863,7 +12953,7 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/process_64.c linux-2.6.32.12/arch/x86
12863 unsigned fsindex, gsindex; 12953 unsigned fsindex, gsindex;
12864 bool preload_fpu; 12954 bool preload_fpu;
12865 12955
12866@@ -561,12 +561,11 @@ unsigned long get_wchan(struct task_stru 12956@@ -560,12 +560,11 @@ unsigned long get_wchan(struct task_stru
12867 if (!p || p == current || p->state == TASK_RUNNING) 12957 if (!p || p == current || p->state == TASK_RUNNING)
12868 return 0; 12958 return 0;
12869 stack = (unsigned long)task_stack_page(p); 12959 stack = (unsigned long)task_stack_page(p);
@@ -12878,9 +12968,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/process_64.c linux-2.6.32.12/arch/x86
12878 return 0; 12968 return 0;
12879 ip = *(u64 *)(fp+8); 12969 ip = *(u64 *)(fp+8);
12880 if (!in_sched_functions(ip)) 12970 if (!in_sched_functions(ip))
12881diff -urNp linux-2.6.32.12/arch/x86/kernel/process.c linux-2.6.32.12/arch/x86/kernel/process.c 12971diff -urNp linux-2.6.32.13/arch/x86/kernel/process.c linux-2.6.32.13/arch/x86/kernel/process.c
12882--- linux-2.6.32.12/arch/x86/kernel/process.c 2010-04-04 20:41:49.920655481 -0400 12972--- linux-2.6.32.13/arch/x86/kernel/process.c 2010-04-04 20:41:49.920655481 -0400
12883+++ linux-2.6.32.12/arch/x86/kernel/process.c 2010-04-04 20:46:41.521777445 -0400 12973+++ linux-2.6.32.13/arch/x86/kernel/process.c 2010-05-15 13:21:14.095776197 -0400
12884@@ -73,7 +73,7 @@ void exit_thread(void) 12974@@ -73,7 +73,7 @@ void exit_thread(void)
12885 unsigned long *bp = t->io_bitmap_ptr; 12975 unsigned long *bp = t->io_bitmap_ptr;
12886 12976
@@ -12918,9 +13008,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/process.c linux-2.6.32.12/arch/x86/ke
12918- return randomize_range(mm->brk, range_end, 0) ? : mm->brk; 13008- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
12919-} 13009-}
12920- 13010-
12921diff -urNp linux-2.6.32.12/arch/x86/kernel/ptrace.c linux-2.6.32.12/arch/x86/kernel/ptrace.c 13011diff -urNp linux-2.6.32.13/arch/x86/kernel/ptrace.c linux-2.6.32.13/arch/x86/kernel/ptrace.c
12922--- linux-2.6.32.12/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 13012--- linux-2.6.32.13/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400
12923+++ linux-2.6.32.12/arch/x86/kernel/ptrace.c 2010-04-04 20:46:41.525738446 -0400 13013+++ linux-2.6.32.13/arch/x86/kernel/ptrace.c 2010-05-15 13:21:14.110913724 -0400
12924@@ -925,7 +925,7 @@ static const struct user_regset_view use 13014@@ -925,7 +925,7 @@ static const struct user_regset_view use
12925 long arch_ptrace(struct task_struct *child, long request, long addr, long data) 13015 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
12926 { 13016 {
@@ -12989,9 +13079,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/ptrace.c linux-2.6.32.12/arch/x86/ker
12989 13079
12990 /* Send us the fake SIGTRAP */ 13080 /* Send us the fake SIGTRAP */
12991 force_sig_info(SIGTRAP, &info, tsk); 13081 force_sig_info(SIGTRAP, &info, tsk);
12992diff -urNp linux-2.6.32.12/arch/x86/kernel/reboot.c linux-2.6.32.12/arch/x86/kernel/reboot.c 13082diff -urNp linux-2.6.32.13/arch/x86/kernel/reboot.c linux-2.6.32.13/arch/x86/kernel/reboot.c
12993--- linux-2.6.32.12/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400 13083--- linux-2.6.32.13/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400
12994+++ linux-2.6.32.12/arch/x86/kernel/reboot.c 2010-04-04 20:46:41.525738446 -0400 13084+++ linux-2.6.32.13/arch/x86/kernel/reboot.c 2010-05-15 13:21:14.110913724 -0400
12995@@ -33,7 +33,7 @@ void (*pm_power_off)(void); 13085@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
12996 EXPORT_SYMBOL(pm_power_off); 13086 EXPORT_SYMBOL(pm_power_off);
12997 13087
@@ -13068,9 +13158,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/reboot.c linux-2.6.32.12/arch/x86/ker
13068 13158
13069 /* Set up the IDT for real mode. */ 13159 /* Set up the IDT for real mode. */
13070 load_idt(&real_mode_idt); 13160 load_idt(&real_mode_idt);
13071diff -urNp linux-2.6.32.12/arch/x86/kernel/setup.c linux-2.6.32.12/arch/x86/kernel/setup.c 13161diff -urNp linux-2.6.32.13/arch/x86/kernel/setup.c linux-2.6.32.13/arch/x86/kernel/setup.c
13072--- linux-2.6.32.12/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 13162--- linux-2.6.32.13/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
13073+++ linux-2.6.32.12/arch/x86/kernel/setup.c 2010-04-04 20:46:41.525738446 -0400 13163+++ linux-2.6.32.13/arch/x86/kernel/setup.c 2010-05-15 13:21:14.110913724 -0400
13074@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p) 13164@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p)
13075 13165
13076 if (!boot_params.hdr.root_flags) 13166 if (!boot_params.hdr.root_flags)
@@ -13091,9 +13181,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/setup.c linux-2.6.32.12/arch/x86/kern
13091 data_resource.end = virt_to_phys(_edata)-1; 13181 data_resource.end = virt_to_phys(_edata)-1;
13092 bss_resource.start = virt_to_phys(&__bss_start); 13182 bss_resource.start = virt_to_phys(&__bss_start);
13093 bss_resource.end = virt_to_phys(&__bss_stop)-1; 13183 bss_resource.end = virt_to_phys(&__bss_stop)-1;
13094diff -urNp linux-2.6.32.12/arch/x86/kernel/setup_percpu.c linux-2.6.32.12/arch/x86/kernel/setup_percpu.c 13184diff -urNp linux-2.6.32.13/arch/x86/kernel/setup_percpu.c linux-2.6.32.13/arch/x86/kernel/setup_percpu.c
13095--- linux-2.6.32.12/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400 13185--- linux-2.6.32.13/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400
13096+++ linux-2.6.32.12/arch/x86/kernel/setup_percpu.c 2010-04-04 20:46:41.525738446 -0400 13186+++ linux-2.6.32.13/arch/x86/kernel/setup_percpu.c 2010-05-15 13:21:14.119542394 -0400
13097@@ -25,19 +25,17 @@ 13187@@ -25,19 +25,17 @@
13098 # define DBG(x...) 13188 # define DBG(x...)
13099 #endif 13189 #endif
@@ -13156,9 +13246,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/setup_percpu.c linux-2.6.32.12/arch/x
13156 /* 13246 /*
13157 * Up to this point, the boot CPU has been using .data.init 13247 * Up to this point, the boot CPU has been using .data.init
13158 * area. Reload any changed state for the boot CPU. 13248 * area. Reload any changed state for the boot CPU.
13159diff -urNp linux-2.6.32.12/arch/x86/kernel/signal.c linux-2.6.32.12/arch/x86/kernel/signal.c 13249diff -urNp linux-2.6.32.13/arch/x86/kernel/signal.c linux-2.6.32.13/arch/x86/kernel/signal.c
13160--- linux-2.6.32.12/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 13250--- linux-2.6.32.13/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400
13161+++ linux-2.6.32.12/arch/x86/kernel/signal.c 2010-04-04 20:46:41.525738446 -0400 13251+++ linux-2.6.32.13/arch/x86/kernel/signal.c 2010-05-15 13:21:14.119542394 -0400
13162@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi 13252@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
13163 * Align the stack pointer according to the i386 ABI, 13253 * Align the stack pointer according to the i386 ABI,
13164 * i.e. so that on function entry ((sp + 4) & 15) == 0. 13254 * i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -13230,9 +13320,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/signal.c linux-2.6.32.12/arch/x86/ker
13230 return; 13320 return;
13231 13321
13232 if (current_thread_info()->status & TS_RESTORE_SIGMASK) 13322 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
13233diff -urNp linux-2.6.32.12/arch/x86/kernel/smpboot.c linux-2.6.32.12/arch/x86/kernel/smpboot.c 13323diff -urNp linux-2.6.32.13/arch/x86/kernel/smpboot.c linux-2.6.32.13/arch/x86/kernel/smpboot.c
13234--- linux-2.6.32.12/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400 13324--- linux-2.6.32.13/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400
13235+++ linux-2.6.32.12/arch/x86/kernel/smpboot.c 2010-04-04 20:58:33.225084964 -0400 13325+++ linux-2.6.32.13/arch/x86/kernel/smpboot.c 2010-05-15 13:21:14.130650342 -0400
13236@@ -729,7 +729,11 @@ do_rest: 13326@@ -729,7 +729,11 @@ do_rest:
13237 (unsigned long)task_stack_page(c_idle.idle) - 13327 (unsigned long)task_stack_page(c_idle.idle) -
13238 KERNEL_STACK_OFFSET + THREAD_SIZE; 13328 KERNEL_STACK_OFFSET + THREAD_SIZE;
@@ -13258,9 +13348,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/smpboot.c linux-2.6.32.12/arch/x86/ke
13258 #ifdef CONFIG_X86_32 13348 #ifdef CONFIG_X86_32
13259 /* init low mem mapping */ 13349 /* init low mem mapping */
13260 clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, 13350 clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
13261diff -urNp linux-2.6.32.12/arch/x86/kernel/step.c linux-2.6.32.12/arch/x86/kernel/step.c 13351diff -urNp linux-2.6.32.13/arch/x86/kernel/step.c linux-2.6.32.13/arch/x86/kernel/step.c
13262--- linux-2.6.32.12/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400 13352--- linux-2.6.32.13/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400
13263+++ linux-2.6.32.12/arch/x86/kernel/step.c 2010-04-04 20:46:41.525738446 -0400 13353+++ linux-2.6.32.13/arch/x86/kernel/step.c 2010-05-15 13:21:14.130650342 -0400
13264@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc 13354@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
13265 struct desc_struct *desc; 13355 struct desc_struct *desc;
13266 unsigned long base; 13356 unsigned long base;
@@ -13293,17 +13383,17 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/step.c linux-2.6.32.12/arch/x86/kerne
13293 /* 32-bit mode: register increment */ 13383 /* 32-bit mode: register increment */
13294 return 0; 13384 return 0;
13295 /* 64-bit mode: REX prefix */ 13385 /* 64-bit mode: REX prefix */
13296diff -urNp linux-2.6.32.12/arch/x86/kernel/syscall_table_32.S linux-2.6.32.12/arch/x86/kernel/syscall_table_32.S 13386diff -urNp linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S
13297--- linux-2.6.32.12/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400 13387--- linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400
13298+++ linux-2.6.32.12/arch/x86/kernel/syscall_table_32.S 2010-04-04 20:46:41.525738446 -0400 13388+++ linux-2.6.32.13/arch/x86/kernel/syscall_table_32.S 2010-05-15 13:21:14.130650342 -0400
13299@@ -1,3 +1,4 @@ 13389@@ -1,3 +1,4 @@
13300+.section .rodata,"a",@progbits 13390+.section .rodata,"a",@progbits
13301 ENTRY(sys_call_table) 13391 ENTRY(sys_call_table)
13302 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ 13392 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
13303 .long sys_exit 13393 .long sys_exit
13304diff -urNp linux-2.6.32.12/arch/x86/kernel/sys_i386_32.c linux-2.6.32.12/arch/x86/kernel/sys_i386_32.c 13394diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c
13305--- linux-2.6.32.12/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400 13395--- linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400
13306+++ linux-2.6.32.12/arch/x86/kernel/sys_i386_32.c 2010-04-04 20:46:41.525738446 -0400 13396+++ linux-2.6.32.13/arch/x86/kernel/sys_i386_32.c 2010-05-15 13:21:14.130650342 -0400
13307@@ -24,6 +24,21 @@ 13397@@ -24,6 +24,21 @@
13308 13398
13309 #include <asm/syscalls.h> 13399 #include <asm/syscalls.h>
@@ -13550,9 +13640,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/sys_i386_32.c linux-2.6.32.12/arch/x8
13550 } 13640 }
13551 case 1: /* iBCS2 emulator entry point */ 13641 case 1: /* iBCS2 emulator entry point */
13552 if (!segment_eq(get_fs(), get_ds())) 13642 if (!segment_eq(get_fs(), get_ds()))
13553diff -urNp linux-2.6.32.12/arch/x86/kernel/sys_x86_64.c linux-2.6.32.12/arch/x86/kernel/sys_x86_64.c 13643diff -urNp linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c
13554--- linux-2.6.32.12/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400 13644--- linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400
13555+++ linux-2.6.32.12/arch/x86/kernel/sys_x86_64.c 2010-04-04 20:46:41.525738446 -0400 13645+++ linux-2.6.32.13/arch/x86/kernel/sys_x86_64.c 2010-05-15 13:21:14.130650342 -0400
13556@@ -32,8 +32,8 @@ out: 13646@@ -32,8 +32,8 @@ out:
13557 return error; 13647 return error;
13558 } 13648 }
@@ -13634,9 +13724,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/sys_x86_64.c linux-2.6.32.12/arch/x86
13634 mm->cached_hole_size = ~0UL; 13724 mm->cached_hole_size = ~0UL;
13635 13725
13636 return addr; 13726 return addr;
13637diff -urNp linux-2.6.32.12/arch/x86/kernel/time.c linux-2.6.32.12/arch/x86/kernel/time.c 13727diff -urNp linux-2.6.32.13/arch/x86/kernel/time.c linux-2.6.32.13/arch/x86/kernel/time.c
13638--- linux-2.6.32.12/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 13728--- linux-2.6.32.13/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400
13639+++ linux-2.6.32.12/arch/x86/kernel/time.c 2010-04-04 20:46:41.525738446 -0400 13729+++ linux-2.6.32.13/arch/x86/kernel/time.c 2010-05-15 13:21:14.130650342 -0400
13640@@ -26,17 +26,13 @@ 13730@@ -26,17 +26,13 @@
13641 int timer_ack; 13731 int timer_ack;
13642 #endif 13732 #endif
@@ -13675,9 +13765,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/time.c linux-2.6.32.12/arch/x86/kerne
13675 } 13765 }
13676 return pc; 13766 return pc;
13677 } 13767 }
13678diff -urNp linux-2.6.32.12/arch/x86/kernel/tls.c linux-2.6.32.12/arch/x86/kernel/tls.c 13768diff -urNp linux-2.6.32.13/arch/x86/kernel/tls.c linux-2.6.32.13/arch/x86/kernel/tls.c
13679--- linux-2.6.32.12/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400 13769--- linux-2.6.32.13/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400
13680+++ linux-2.6.32.12/arch/x86/kernel/tls.c 2010-04-04 20:46:41.525738446 -0400 13770+++ linux-2.6.32.13/arch/x86/kernel/tls.c 2010-05-15 13:21:14.130650342 -0400
13681@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc 13771@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
13682 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) 13772 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
13683 return -EINVAL; 13773 return -EINVAL;
@@ -13690,9 +13780,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/tls.c linux-2.6.32.12/arch/x86/kernel
13690 set_tls_desc(p, idx, &info, 1); 13780 set_tls_desc(p, idx, &info, 1);
13691 13781
13692 return 0; 13782 return 0;
13693diff -urNp linux-2.6.32.12/arch/x86/kernel/trampoline_32.S linux-2.6.32.12/arch/x86/kernel/trampoline_32.S 13783diff -urNp linux-2.6.32.13/arch/x86/kernel/trampoline_32.S linux-2.6.32.13/arch/x86/kernel/trampoline_32.S
13694--- linux-2.6.32.12/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400 13784--- linux-2.6.32.13/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400
13695+++ linux-2.6.32.12/arch/x86/kernel/trampoline_32.S 2010-04-04 20:46:41.525738446 -0400 13785+++ linux-2.6.32.13/arch/x86/kernel/trampoline_32.S 2010-05-15 13:21:14.130650342 -0400
13696@@ -32,6 +32,12 @@ 13786@@ -32,6 +32,12 @@
13697 #include <asm/segment.h> 13787 #include <asm/segment.h>
13698 #include <asm/page_types.h> 13788 #include <asm/page_types.h>
@@ -13715,9 +13805,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/trampoline_32.S linux-2.6.32.12/arch/
13715 13805
13716 # These need to be in the same 64K segment as the above; 13806 # These need to be in the same 64K segment as the above;
13717 # hence we don't use the boot_gdt_descr defined in head.S 13807 # hence we don't use the boot_gdt_descr defined in head.S
13718diff -urNp linux-2.6.32.12/arch/x86/kernel/traps.c linux-2.6.32.12/arch/x86/kernel/traps.c 13808diff -urNp linux-2.6.32.13/arch/x86/kernel/traps.c linux-2.6.32.13/arch/x86/kernel/traps.c
13719--- linux-2.6.32.12/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 13809--- linux-2.6.32.13/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
13720+++ linux-2.6.32.12/arch/x86/kernel/traps.c 2010-04-04 20:46:41.525738446 -0400 13810+++ linux-2.6.32.13/arch/x86/kernel/traps.c 2010-05-15 13:21:14.130650342 -0400
13721@@ -69,12 +69,6 @@ asmlinkage int system_call(void); 13811@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
13722 13812
13723 /* Do we ignore FPU interrupts ? */ 13813 /* Do we ignore FPU interrupts ? */
@@ -13867,9 +13957,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/traps.c linux-2.6.32.12/arch/x86/kern
13867 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); 13957 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
13868 return; 13958 return;
13869 } 13959 }
13870diff -urNp linux-2.6.32.12/arch/x86/kernel/tsc.c linux-2.6.32.12/arch/x86/kernel/tsc.c 13960diff -urNp linux-2.6.32.13/arch/x86/kernel/tsc.c linux-2.6.32.13/arch/x86/kernel/tsc.c
13871--- linux-2.6.32.12/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400 13961--- linux-2.6.32.13/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400
13872+++ linux-2.6.32.12/arch/x86/kernel/tsc.c 2010-04-04 20:46:41.525738446 -0400 13962+++ linux-2.6.32.13/arch/x86/kernel/tsc.c 2010-05-15 13:21:14.134912019 -0400
13873@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b 13963@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b
13874 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), 13964 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
13875 }, 13965 },
@@ -13879,9 +13969,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/tsc.c linux-2.6.32.12/arch/x86/kernel
13879 }; 13969 };
13880 13970
13881 static void __init check_system_tsc_reliable(void) 13971 static void __init check_system_tsc_reliable(void)
13882diff -urNp linux-2.6.32.12/arch/x86/kernel/vm86_32.c linux-2.6.32.12/arch/x86/kernel/vm86_32.c 13972diff -urNp linux-2.6.32.13/arch/x86/kernel/vm86_32.c linux-2.6.32.13/arch/x86/kernel/vm86_32.c
13883--- linux-2.6.32.12/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400 13973--- linux-2.6.32.13/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400
13884+++ linux-2.6.32.12/arch/x86/kernel/vm86_32.c 2010-04-04 20:46:41.525738446 -0400 13974+++ linux-2.6.32.13/arch/x86/kernel/vm86_32.c 2010-05-15 13:21:14.142909281 -0400
13885@@ -41,6 +41,7 @@ 13975@@ -41,6 +41,7 @@
13886 #include <linux/ptrace.h> 13976 #include <linux/ptrace.h>
13887 #include <linux/audit.h> 13977 #include <linux/audit.h>
@@ -13946,9 +14036,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/vm86_32.c linux-2.6.32.12/arch/x86/ke
13946 if (get_user(segoffs, intr_ptr)) 14036 if (get_user(segoffs, intr_ptr))
13947 goto cannot_handle; 14037 goto cannot_handle;
13948 if ((segoffs >> 16) == BIOSSEG) 14038 if ((segoffs >> 16) == BIOSSEG)
13949diff -urNp linux-2.6.32.12/arch/x86/kernel/vmi_32.c linux-2.6.32.12/arch/x86/kernel/vmi_32.c 14039diff -urNp linux-2.6.32.13/arch/x86/kernel/vmi_32.c linux-2.6.32.13/arch/x86/kernel/vmi_32.c
13950--- linux-2.6.32.12/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400 14040--- linux-2.6.32.13/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400
13951+++ linux-2.6.32.12/arch/x86/kernel/vmi_32.c 2010-04-04 20:46:41.525738446 -0400 14041+++ linux-2.6.32.13/arch/x86/kernel/vmi_32.c 2010-05-15 13:21:14.150906044 -0400
13952@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) 14042@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
13953 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); 14043 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
13954 14044
@@ -14108,9 +14198,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/vmi_32.c linux-2.6.32.12/arch/x86/ker
14108 return; 14198 return;
14109 14199
14110 local_irq_save(flags); 14200 local_irq_save(flags);
14111diff -urNp linux-2.6.32.12/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.12/arch/x86/kernel/vmlinux.lds.S 14201diff -urNp linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S
14112--- linux-2.6.32.12/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 14202--- linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
14113+++ linux-2.6.32.12/arch/x86/kernel/vmlinux.lds.S 2010-04-04 20:46:41.529538490 -0400 14203+++ linux-2.6.32.13/arch/x86/kernel/vmlinux.lds.S 2010-05-15 13:21:14.162641857 -0400
14114@@ -26,6 +26,22 @@ 14204@@ -26,6 +26,22 @@
14115 #include <asm/page_types.h> 14205 #include <asm/page_types.h>
14116 #include <asm/cache.h> 14206 #include <asm/cache.h>
@@ -14398,9 +14488,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.12/arch/x8
14398 "kernel image bigger than KERNEL_IMAGE_SIZE"); 14488 "kernel image bigger than KERNEL_IMAGE_SIZE");
14399 14489
14400 #ifdef CONFIG_SMP 14490 #ifdef CONFIG_SMP
14401diff -urNp linux-2.6.32.12/arch/x86/kernel/vsyscall_64.c linux-2.6.32.12/arch/x86/kernel/vsyscall_64.c 14491diff -urNp linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c
14402--- linux-2.6.32.12/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400 14492--- linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400
14403+++ linux-2.6.32.12/arch/x86/kernel/vsyscall_64.c 2010-04-04 20:46:41.529538490 -0400 14493+++ linux-2.6.32.13/arch/x86/kernel/vsyscall_64.c 2010-05-15 13:21:14.162641857 -0400
14404@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa 14494@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa
14405 14495
14406 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); 14496 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -14434,9 +14524,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/vsyscall_64.c linux-2.6.32.12/arch/x8
14434 }; 14524 };
14435 #endif 14525 #endif
14436 14526
14437diff -urNp linux-2.6.32.12/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.12/arch/x86/kernel/x8664_ksyms_64.c 14527diff -urNp linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c
14438--- linux-2.6.32.12/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400 14528--- linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400
14439+++ linux-2.6.32.12/arch/x86/kernel/x8664_ksyms_64.c 2010-04-04 20:46:41.529538490 -0400 14529+++ linux-2.6.32.13/arch/x86/kernel/x8664_ksyms_64.c 2010-05-15 13:21:14.162641857 -0400
14440@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); 14530@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
14441 14531
14442 EXPORT_SYMBOL(copy_user_generic); 14532 EXPORT_SYMBOL(copy_user_generic);
@@ -14446,9 +14536,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.12/arch
14446 EXPORT_SYMBOL(__copy_from_user_inatomic); 14536 EXPORT_SYMBOL(__copy_from_user_inatomic);
14447 14537
14448 EXPORT_SYMBOL(copy_page); 14538 EXPORT_SYMBOL(copy_page);
14449diff -urNp linux-2.6.32.12/arch/x86/kernel/xsave.c linux-2.6.32.12/arch/x86/kernel/xsave.c 14539diff -urNp linux-2.6.32.13/arch/x86/kernel/xsave.c linux-2.6.32.13/arch/x86/kernel/xsave.c
14450--- linux-2.6.32.12/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400 14540--- linux-2.6.32.13/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400
14451+++ linux-2.6.32.12/arch/x86/kernel/xsave.c 2010-04-04 20:46:41.529538490 -0400 14541+++ linux-2.6.32.13/arch/x86/kernel/xsave.c 2010-05-15 13:21:14.162641857 -0400
14452@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ 14542@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
14453 fx_sw_user->xstate_size > fx_sw_user->extended_size) 14543 fx_sw_user->xstate_size > fx_sw_user->extended_size)
14454 return -1; 14544 return -1;
@@ -14476,9 +14566,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kernel/xsave.c linux-2.6.32.12/arch/x86/kern
14476 buf); 14566 buf);
14477 if (unlikely(err)) { 14567 if (unlikely(err)) {
14478 /* 14568 /*
14479diff -urNp linux-2.6.32.12/arch/x86/kvm/emulate.c linux-2.6.32.12/arch/x86/kvm/emulate.c 14569diff -urNp linux-2.6.32.13/arch/x86/kvm/emulate.c linux-2.6.32.13/arch/x86/kvm/emulate.c
14480--- linux-2.6.32.12/arch/x86/kvm/emulate.c 2010-04-29 17:49:37.541027029 -0400 14570--- linux-2.6.32.13/arch/x86/kvm/emulate.c 2010-04-29 17:49:37.541027029 -0400
14481+++ linux-2.6.32.12/arch/x86/kvm/emulate.c 2010-04-29 17:49:57.993228946 -0400 14571+++ linux-2.6.32.13/arch/x86/kvm/emulate.c 2010-05-15 13:21:14.178920275 -0400
14482@@ -81,8 +81,8 @@ 14572@@ -81,8 +81,8 @@
14483 #define Src2CL (1<<29) 14573 #define Src2CL (1<<29)
14484 #define Src2ImmByte (2<<29) 14574 #define Src2ImmByte (2<<29)
@@ -14515,9 +14605,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kvm/emulate.c linux-2.6.32.12/arch/x86/kvm/e
14515 switch ((_dst).bytes) { \ 14605 switch ((_dst).bytes) { \
14516 case 1: \ 14606 case 1: \
14517 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ 14607 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
14518diff -urNp linux-2.6.32.12/arch/x86/kvm/lapic.c linux-2.6.32.12/arch/x86/kvm/lapic.c 14608diff -urNp linux-2.6.32.13/arch/x86/kvm/lapic.c linux-2.6.32.13/arch/x86/kvm/lapic.c
14519--- linux-2.6.32.12/arch/x86/kvm/lapic.c 2010-03-15 11:52:04.000000000 -0400 14609--- linux-2.6.32.13/arch/x86/kvm/lapic.c 2010-03-15 11:52:04.000000000 -0400
14520+++ linux-2.6.32.12/arch/x86/kvm/lapic.c 2010-04-29 17:46:37.073091406 -0400 14610+++ linux-2.6.32.13/arch/x86/kvm/lapic.c 2010-05-15 13:21:14.186649754 -0400
14521@@ -52,7 +52,7 @@ 14611@@ -52,7 +52,7 @@
14522 #define APIC_BUS_CYCLE_NS 1 14612 #define APIC_BUS_CYCLE_NS 1
14523 14613
@@ -14527,9 +14617,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kvm/lapic.c linux-2.6.32.12/arch/x86/kvm/lap
14527 14617
14528 #define APIC_LVT_NUM 6 14618 #define APIC_LVT_NUM 6
14529 /* 14 is the version for Xeon and Pentium 8.4.8*/ 14619 /* 14 is the version for Xeon and Pentium 8.4.8*/
14530diff -urNp linux-2.6.32.12/arch/x86/kvm/svm.c linux-2.6.32.12/arch/x86/kvm/svm.c 14620diff -urNp linux-2.6.32.13/arch/x86/kvm/svm.c linux-2.6.32.13/arch/x86/kvm/svm.c
14531--- linux-2.6.32.12/arch/x86/kvm/svm.c 2010-04-29 17:49:37.601044544 -0400 14621--- linux-2.6.32.13/arch/x86/kvm/svm.c 2010-04-29 17:49:37.601044544 -0400
14532+++ linux-2.6.32.12/arch/x86/kvm/svm.c 2010-04-29 17:49:58.005400983 -0400 14622+++ linux-2.6.32.13/arch/x86/kvm/svm.c 2010-05-15 13:21:14.206681110 -0400
14533@@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k 14623@@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k
14534 static void reload_tss(struct kvm_vcpu *vcpu) 14624 static void reload_tss(struct kvm_vcpu *vcpu)
14535 { 14625 {
@@ -14553,9 +14643,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kvm/svm.c linux-2.6.32.12/arch/x86/kvm/svm.c
14553 .cpu_has_kvm_support = has_svm, 14643 .cpu_has_kvm_support = has_svm,
14554 .disabled_by_bios = is_disabled, 14644 .disabled_by_bios = is_disabled,
14555 .hardware_setup = svm_hardware_setup, 14645 .hardware_setup = svm_hardware_setup,
14556diff -urNp linux-2.6.32.12/arch/x86/kvm/vmx.c linux-2.6.32.12/arch/x86/kvm/vmx.c 14646diff -urNp linux-2.6.32.13/arch/x86/kvm/vmx.c linux-2.6.32.13/arch/x86/kvm/vmx.c
14557--- linux-2.6.32.12/arch/x86/kvm/vmx.c 2010-04-29 17:49:37.601044544 -0400 14647--- linux-2.6.32.13/arch/x86/kvm/vmx.c 2010-04-29 17:49:37.601044544 -0400
14558+++ linux-2.6.32.12/arch/x86/kvm/vmx.c 2010-04-29 17:49:58.025065700 -0400 14648+++ linux-2.6.32.13/arch/x86/kvm/vmx.c 2010-05-15 13:23:38.934774262 -0400
14559@@ -568,7 +568,11 @@ static void reload_tss(void) 14649@@ -568,7 +568,11 @@ static void reload_tss(void)
14560 14650
14561 kvm_get_gdt(&gdt); 14651 kvm_get_gdt(&gdt);
@@ -14604,7 +14694,7 @@ diff -urNp linux-2.6.32.12/arch/x86/kvm/vmx.c linux-2.6.32.12/arch/x86/kvm/vmx.c
14604 /* Save guest registers, load host registers, keep flags */ 14694 /* Save guest registers, load host registers, keep flags */
14605 "xchg %0, (%%"R"sp) \n\t" 14695 "xchg %0, (%%"R"sp) \n\t"
14606 "mov %%"R"ax, %c[rax](%0) \n\t" 14696 "mov %%"R"ax, %c[rax](%0) \n\t"
14607@@ -3749,6 +3762,11 @@ static void vmx_vcpu_run(struct kvm_vcpu 14697@@ -3749,8 +3762,13 @@ static void vmx_vcpu_run(struct kvm_vcpu
14608 [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])), 14698 [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])),
14609 #endif 14699 #endif
14610 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)) 14700 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2))
@@ -14614,8 +14704,11 @@ diff -urNp linux-2.6.32.12/arch/x86/kvm/vmx.c linux-2.6.32.12/arch/x86/kvm/vmx.c
14614+#endif 14704+#endif
14615+ 14705+
14616 : "cc", "memory" 14706 : "cc", "memory"
14617 , R"bx", R"di", R"si" 14707- , R"bx", R"di", R"si"
14708+ , R"ax", R"bx", R"di", R"si"
14618 #ifdef CONFIG_X86_64 14709 #ifdef CONFIG_X86_64
14710 , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"
14711 #endif
14619@@ -3767,7 +3785,7 @@ static void vmx_vcpu_run(struct kvm_vcpu 14712@@ -3767,7 +3785,7 @@ static void vmx_vcpu_run(struct kvm_vcpu
14620 if (vmx->rmode.irq.pending) 14713 if (vmx->rmode.irq.pending)
14621 fixup_rmode_irq(vmx); 14714 fixup_rmode_irq(vmx);
@@ -14634,9 +14727,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kvm/vmx.c linux-2.6.32.12/arch/x86/kvm/vmx.c
14634 .cpu_has_kvm_support = cpu_has_kvm_support, 14727 .cpu_has_kvm_support = cpu_has_kvm_support,
14635 .disabled_by_bios = vmx_disabled_by_bios, 14728 .disabled_by_bios = vmx_disabled_by_bios,
14636 .hardware_setup = hardware_setup, 14729 .hardware_setup = hardware_setup,
14637diff -urNp linux-2.6.32.12/arch/x86/kvm/x86.c linux-2.6.32.12/arch/x86/kvm/x86.c 14730diff -urNp linux-2.6.32.13/arch/x86/kvm/x86.c linux-2.6.32.13/arch/x86/kvm/x86.c
14638--- linux-2.6.32.12/arch/x86/kvm/x86.c 2010-04-29 17:49:37.601044544 -0400 14731--- linux-2.6.32.13/arch/x86/kvm/x86.c 2010-05-15 13:20:18.454567530 -0400
14639+++ linux-2.6.32.12/arch/x86/kvm/x86.c 2010-04-29 17:49:58.041485405 -0400 14732+++ linux-2.6.32.13/arch/x86/kvm/x86.c 2010-05-15 13:21:14.230911822 -0400
14640@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct 14733@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct
14641 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, 14734 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
14642 struct kvm_cpuid_entry2 __user *entries); 14735 struct kvm_cpuid_entry2 __user *entries);
@@ -14738,9 +14831,9 @@ diff -urNp linux-2.6.32.12/arch/x86/kvm/x86.c linux-2.6.32.12/arch/x86/kvm/x86.c
14738 14831
14739 if (kvm_x86_ops) { 14832 if (kvm_x86_ops) {
14740 printk(KERN_ERR "kvm: already loaded the other module\n"); 14833 printk(KERN_ERR "kvm: already loaded the other module\n");
14741diff -urNp linux-2.6.32.12/arch/x86/lib/checksum_32.S linux-2.6.32.12/arch/x86/lib/checksum_32.S 14834diff -urNp linux-2.6.32.13/arch/x86/lib/checksum_32.S linux-2.6.32.13/arch/x86/lib/checksum_32.S
14742--- linux-2.6.32.12/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400 14835--- linux-2.6.32.13/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400
14743+++ linux-2.6.32.12/arch/x86/lib/checksum_32.S 2010-04-04 20:46:41.529538490 -0400 14836+++ linux-2.6.32.13/arch/x86/lib/checksum_32.S 2010-05-15 13:21:14.230911822 -0400
14744@@ -28,7 +28,8 @@ 14837@@ -28,7 +28,8 @@
14745 #include <linux/linkage.h> 14838 #include <linux/linkage.h>
14746 #include <asm/dwarf2.h> 14839 #include <asm/dwarf2.h>
@@ -14986,9 +15079,9 @@ diff -urNp linux-2.6.32.12/arch/x86/lib/checksum_32.S linux-2.6.32.12/arch/x86/l
14986 15079
14987 #undef ROUND 15080 #undef ROUND
14988 #undef ROUND1 15081 #undef ROUND1
14989diff -urNp linux-2.6.32.12/arch/x86/lib/clear_page_64.S linux-2.6.32.12/arch/x86/lib/clear_page_64.S 15082diff -urNp linux-2.6.32.13/arch/x86/lib/clear_page_64.S linux-2.6.32.13/arch/x86/lib/clear_page_64.S
14990--- linux-2.6.32.12/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400 15083--- linux-2.6.32.13/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400
14991+++ linux-2.6.32.12/arch/x86/lib/clear_page_64.S 2010-04-04 20:46:41.529538490 -0400 15084+++ linux-2.6.32.13/arch/x86/lib/clear_page_64.S 2010-05-15 13:21:14.230911822 -0400
14992@@ -43,7 +43,7 @@ ENDPROC(clear_page) 15085@@ -43,7 +43,7 @@ ENDPROC(clear_page)
14993 15086
14994 #include <asm/cpufeature.h> 15087 #include <asm/cpufeature.h>
@@ -14998,9 +15091,9 @@ diff -urNp linux-2.6.32.12/arch/x86/lib/clear_page_64.S linux-2.6.32.12/arch/x86
14998 1: .byte 0xeb /* jmp <disp8> */ 15091 1: .byte 0xeb /* jmp <disp8> */
14999 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 15092 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
15000 2: 15093 2:
15001diff -urNp linux-2.6.32.12/arch/x86/lib/copy_page_64.S linux-2.6.32.12/arch/x86/lib/copy_page_64.S 15094diff -urNp linux-2.6.32.13/arch/x86/lib/copy_page_64.S linux-2.6.32.13/arch/x86/lib/copy_page_64.S
15002--- linux-2.6.32.12/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400 15095--- linux-2.6.32.13/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400
15003+++ linux-2.6.32.12/arch/x86/lib/copy_page_64.S 2010-04-04 20:46:41.529538490 -0400 15096+++ linux-2.6.32.13/arch/x86/lib/copy_page_64.S 2010-05-15 13:21:14.230911822 -0400
15004@@ -104,7 +104,7 @@ ENDPROC(copy_page) 15097@@ -104,7 +104,7 @@ ENDPROC(copy_page)
15005 15098
15006 #include <asm/cpufeature.h> 15099 #include <asm/cpufeature.h>
@@ -15010,9 +15103,9 @@ diff -urNp linux-2.6.32.12/arch/x86/lib/copy_page_64.S linux-2.6.32.12/arch/x86/
15010 1: .byte 0xeb /* jmp <disp8> */ 15103 1: .byte 0xeb /* jmp <disp8> */
15011 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 15104 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
15012 2: 15105 2:
15013diff -urNp linux-2.6.32.12/arch/x86/lib/copy_user_64.S linux-2.6.32.12/arch/x86/lib/copy_user_64.S 15106diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_64.S linux-2.6.32.13/arch/x86/lib/copy_user_64.S
15014--- linux-2.6.32.12/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400 15107--- linux-2.6.32.13/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400
15015+++ linux-2.6.32.12/arch/x86/lib/copy_user_64.S 2010-04-04 20:58:33.225084964 -0400 15108+++ linux-2.6.32.13/arch/x86/lib/copy_user_64.S 2010-05-15 13:21:14.234766826 -0400
15016@@ -15,13 +15,14 @@ 15109@@ -15,13 +15,14 @@
15017 #include <asm/asm-offsets.h> 15110 #include <asm/asm-offsets.h>
15018 #include <asm/thread_info.h> 15111 #include <asm/thread_info.h>
@@ -15087,9 +15180,9 @@ diff -urNp linux-2.6.32.12/arch/x86/lib/copy_user_64.S linux-2.6.32.12/arch/x86/
15087 movl %edx,%ecx 15180 movl %edx,%ecx
15088 xorl %eax,%eax 15181 xorl %eax,%eax
15089 rep 15182 rep
15090diff -urNp linux-2.6.32.12/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.12/arch/x86/lib/copy_user_nocache_64.S 15183diff -urNp linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S
15091--- linux-2.6.32.12/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400 15184--- linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400
15092+++ linux-2.6.32.12/arch/x86/lib/copy_user_nocache_64.S 2010-04-04 20:58:33.225084964 -0400 15185+++ linux-2.6.32.13/arch/x86/lib/copy_user_nocache_64.S 2010-05-15 13:21:14.234766826 -0400
15093@@ -14,6 +14,7 @@ 15186@@ -14,6 +14,7 @@
15094 #include <asm/current.h> 15187 #include <asm/current.h>
15095 #include <asm/asm-offsets.h> 15188 #include <asm/asm-offsets.h>
@@ -15114,9 +15207,9 @@ diff -urNp linux-2.6.32.12/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.12/a
15114 cmpl $8,%edx 15207 cmpl $8,%edx
15115 jb 20f /* less then 8 bytes, go to byte copy loop */ 15208 jb 20f /* less then 8 bytes, go to byte copy loop */
15116 ALIGN_DESTINATION 15209 ALIGN_DESTINATION
15117diff -urNp linux-2.6.32.12/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.12/arch/x86/lib/csum-wrappers_64.c 15210diff -urNp linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c
15118--- linux-2.6.32.12/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400 15211--- linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400
15119+++ linux-2.6.32.12/arch/x86/lib/csum-wrappers_64.c 2010-04-04 20:58:33.225084964 -0400 15212+++ linux-2.6.32.13/arch/x86/lib/csum-wrappers_64.c 2010-05-15 13:21:14.234766826 -0400
15120@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ 15213@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
15121 len -= 2; 15214 len -= 2;
15122 } 15215 }
@@ -15135,9 +15228,9 @@ diff -urNp linux-2.6.32.12/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.12/arch/
15135 return csum_partial_copy_generic(src, (void __force *)dst, 15228 return csum_partial_copy_generic(src, (void __force *)dst,
15136 len, isum, NULL, errp); 15229 len, isum, NULL, errp);
15137 } 15230 }
15138diff -urNp linux-2.6.32.12/arch/x86/lib/getuser.S linux-2.6.32.12/arch/x86/lib/getuser.S 15231diff -urNp linux-2.6.32.13/arch/x86/lib/getuser.S linux-2.6.32.13/arch/x86/lib/getuser.S
15139--- linux-2.6.32.12/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400 15232--- linux-2.6.32.13/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400
15140+++ linux-2.6.32.12/arch/x86/lib/getuser.S 2010-04-04 20:58:33.225084964 -0400 15233+++ linux-2.6.32.13/arch/x86/lib/getuser.S 2010-05-15 13:21:14.234766826 -0400
15141@@ -33,14 +33,38 @@ 15234@@ -33,14 +33,38 @@
15142 #include <asm/asm-offsets.h> 15235 #include <asm/asm-offsets.h>
15143 #include <asm/thread_info.h> 15236 #include <asm/thread_info.h>
@@ -15274,9 +15367,9 @@ diff -urNp linux-2.6.32.12/arch/x86/lib/getuser.S linux-2.6.32.12/arch/x86/lib/g
15274 xor %edx,%edx 15367 xor %edx,%edx
15275 mov $(-EFAULT),%_ASM_AX 15368 mov $(-EFAULT),%_ASM_AX
15276 ret 15369 ret
15277diff -urNp linux-2.6.32.12/arch/x86/lib/memcpy_64.S linux-2.6.32.12/arch/x86/lib/memcpy_64.S 15370diff -urNp linux-2.6.32.13/arch/x86/lib/memcpy_64.S linux-2.6.32.13/arch/x86/lib/memcpy_64.S
15278--- linux-2.6.32.12/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400 15371--- linux-2.6.32.13/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400
15279+++ linux-2.6.32.12/arch/x86/lib/memcpy_64.S 2010-04-04 20:46:41.529538490 -0400 15372+++ linux-2.6.32.13/arch/x86/lib/memcpy_64.S 2010-05-15 13:21:14.234766826 -0400
15280@@ -128,7 +128,7 @@ ENDPROC(__memcpy) 15373@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
15281 * It is also a lot simpler. Use this when possible: 15374 * It is also a lot simpler. Use this when possible:
15282 */ 15375 */
@@ -15286,9 +15379,9 @@ diff -urNp linux-2.6.32.12/arch/x86/lib/memcpy_64.S linux-2.6.32.12/arch/x86/lib
15286 1: .byte 0xeb /* jmp <disp8> */ 15379 1: .byte 0xeb /* jmp <disp8> */
15287 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 15380 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
15288 2: 15381 2:
15289diff -urNp linux-2.6.32.12/arch/x86/lib/memset_64.S linux-2.6.32.12/arch/x86/lib/memset_64.S 15382diff -urNp linux-2.6.32.13/arch/x86/lib/memset_64.S linux-2.6.32.13/arch/x86/lib/memset_64.S
15290--- linux-2.6.32.12/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400 15383--- linux-2.6.32.13/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400
15291+++ linux-2.6.32.12/arch/x86/lib/memset_64.S 2010-04-04 20:46:41.529538490 -0400 15384+++ linux-2.6.32.13/arch/x86/lib/memset_64.S 2010-05-15 13:21:14.234766826 -0400
15292@@ -118,7 +118,7 @@ ENDPROC(__memset) 15385@@ -118,7 +118,7 @@ ENDPROC(__memset)
15293 15386
15294 #include <asm/cpufeature.h> 15387 #include <asm/cpufeature.h>
@@ -15298,9 +15391,9 @@ diff -urNp linux-2.6.32.12/arch/x86/lib/memset_64.S linux-2.6.32.12/arch/x86/lib
15298 1: .byte 0xeb /* jmp <disp8> */ 15391 1: .byte 0xeb /* jmp <disp8> */
15299 .byte (memset_c - memset) - (2f - 1b) /* offset */ 15392 .byte (memset_c - memset) - (2f - 1b) /* offset */
15300 2: 15393 2:
15301diff -urNp linux-2.6.32.12/arch/x86/lib/mmx_32.c linux-2.6.32.12/arch/x86/lib/mmx_32.c 15394diff -urNp linux-2.6.32.13/arch/x86/lib/mmx_32.c linux-2.6.32.13/arch/x86/lib/mmx_32.c
15302--- linux-2.6.32.12/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400 15395--- linux-2.6.32.13/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400
15303+++ linux-2.6.32.12/arch/x86/lib/mmx_32.c 2010-04-04 20:46:41.533557286 -0400 15396+++ linux-2.6.32.13/arch/x86/lib/mmx_32.c 2010-05-15 13:21:14.234766826 -0400
15304@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * 15397@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
15305 { 15398 {
15306 void *p; 15399 void *p;
@@ -15616,9 +15709,9 @@ diff -urNp linux-2.6.32.12/arch/x86/lib/mmx_32.c linux-2.6.32.12/arch/x86/lib/mm
15616 15709
15617 from += 64; 15710 from += 64;
15618 to += 64; 15711 to += 64;
15619diff -urNp linux-2.6.32.12/arch/x86/lib/putuser.S linux-2.6.32.12/arch/x86/lib/putuser.S 15712diff -urNp linux-2.6.32.13/arch/x86/lib/putuser.S linux-2.6.32.13/arch/x86/lib/putuser.S
15620--- linux-2.6.32.12/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400 15713--- linux-2.6.32.13/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400
15621+++ linux-2.6.32.12/arch/x86/lib/putuser.S 2010-04-04 20:58:33.225084964 -0400 15714+++ linux-2.6.32.13/arch/x86/lib/putuser.S 2010-05-15 13:21:14.234766826 -0400
15622@@ -15,7 +15,8 @@ 15715@@ -15,7 +15,8 @@
15623 #include <asm/thread_info.h> 15716 #include <asm/thread_info.h>
15624 #include <asm/errno.h> 15717 #include <asm/errno.h>
@@ -15788,9 +15881,9 @@ diff -urNp linux-2.6.32.12/arch/x86/lib/putuser.S linux-2.6.32.12/arch/x86/lib/p
15788 movl $-EFAULT,%eax 15881 movl $-EFAULT,%eax
15789 EXIT 15882 EXIT
15790 END(bad_put_user) 15883 END(bad_put_user)
15791diff -urNp linux-2.6.32.12/arch/x86/lib/usercopy_32.c linux-2.6.32.12/arch/x86/lib/usercopy_32.c 15884diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_32.c linux-2.6.32.13/arch/x86/lib/usercopy_32.c
15792--- linux-2.6.32.12/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400 15885--- linux-2.6.32.13/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400
15793+++ linux-2.6.32.12/arch/x86/lib/usercopy_32.c 2010-04-04 20:46:41.533557286 -0400 15886+++ linux-2.6.32.13/arch/x86/lib/usercopy_32.c 2010-05-15 13:21:14.234766826 -0400
15794@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned 15887@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
15795 * Copy a null terminated string from userspace. 15888 * Copy a null terminated string from userspace.
15796 */ 15889 */
@@ -16759,9 +16852,9 @@ diff -urNp linux-2.6.32.12/arch/x86/lib/usercopy_32.c linux-2.6.32.12/arch/x86/l
16759+#endif 16852+#endif
16760+ 16853+
16761+EXPORT_SYMBOL(set_fs); 16854+EXPORT_SYMBOL(set_fs);
16762diff -urNp linux-2.6.32.12/arch/x86/lib/usercopy_64.c linux-2.6.32.12/arch/x86/lib/usercopy_64.c 16855diff -urNp linux-2.6.32.13/arch/x86/lib/usercopy_64.c linux-2.6.32.13/arch/x86/lib/usercopy_64.c
16763--- linux-2.6.32.12/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 16856--- linux-2.6.32.13/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
16764+++ linux-2.6.32.12/arch/x86/lib/usercopy_64.c 2010-04-04 20:58:33.225084964 -0400 16857+++ linux-2.6.32.13/arch/x86/lib/usercopy_64.c 2010-05-15 13:21:14.234766826 -0400
16765@@ -42,6 +42,8 @@ long 16858@@ -42,6 +42,8 @@ long
16766 __strncpy_from_user(char *dst, const char __user *src, long count) 16859 __strncpy_from_user(char *dst, const char __user *src, long count)
16767 { 16860 {
@@ -16798,9 +16891,9 @@ diff -urNp linux-2.6.32.12/arch/x86/lib/usercopy_64.c linux-2.6.32.12/arch/x86/l
16798 } 16891 }
16799 EXPORT_SYMBOL(copy_in_user); 16892 EXPORT_SYMBOL(copy_in_user);
16800 16893
16801diff -urNp linux-2.6.32.12/arch/x86/Makefile linux-2.6.32.12/arch/x86/Makefile 16894diff -urNp linux-2.6.32.13/arch/x86/Makefile linux-2.6.32.13/arch/x86/Makefile
16802--- linux-2.6.32.12/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400 16895--- linux-2.6.32.13/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400
16803+++ linux-2.6.32.12/arch/x86/Makefile 2010-04-04 20:46:41.533557286 -0400 16896+++ linux-2.6.32.13/arch/x86/Makefile 2010-05-15 13:21:14.234766826 -0400
16804@@ -189,3 +189,12 @@ define archhelp 16897@@ -189,3 +189,12 @@ define archhelp
16805 echo ' FDARGS="..." arguments for the booted kernel' 16898 echo ' FDARGS="..." arguments for the booted kernel'
16806 echo ' FDINITRD=file initrd for the booted kernel' 16899 echo ' FDINITRD=file initrd for the booted kernel'
@@ -16814,9 +16907,9 @@ diff -urNp linux-2.6.32.12/arch/x86/Makefile linux-2.6.32.12/arch/x86/Makefile
16814+ 16907+
16815+archprepare: 16908+archprepare:
16816+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) 16909+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
16817diff -urNp linux-2.6.32.12/arch/x86/mm/extable.c linux-2.6.32.12/arch/x86/mm/extable.c 16910diff -urNp linux-2.6.32.13/arch/x86/mm/extable.c linux-2.6.32.13/arch/x86/mm/extable.c
16818--- linux-2.6.32.12/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400 16911--- linux-2.6.32.13/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400
16819+++ linux-2.6.32.12/arch/x86/mm/extable.c 2010-04-04 20:46:41.533557286 -0400 16912+++ linux-2.6.32.13/arch/x86/mm/extable.c 2010-05-15 13:21:14.234766826 -0400
16820@@ -1,14 +1,71 @@ 16913@@ -1,14 +1,71 @@
16821 #include <linux/module.h> 16914 #include <linux/module.h>
16822 #include <linux/spinlock.h> 16915 #include <linux/spinlock.h>
@@ -16890,9 +16983,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/extable.c linux-2.6.32.12/arch/x86/mm/ext
16890 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; 16983 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
16891 extern u32 pnp_bios_is_utter_crap; 16984 extern u32 pnp_bios_is_utter_crap;
16892 pnp_bios_is_utter_crap = 1; 16985 pnp_bios_is_utter_crap = 1;
16893diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault.c 16986diff -urNp linux-2.6.32.13/arch/x86/mm/fault.c linux-2.6.32.13/arch/x86/mm/fault.c
16894--- linux-2.6.32.12/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 16987--- linux-2.6.32.13/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
16895+++ linux-2.6.32.12/arch/x86/mm/fault.c 2010-04-29 17:46:36.897235141 -0400 16988+++ linux-2.6.32.13/arch/x86/mm/fault.c 2010-05-15 13:23:38.934774262 -0400
16896@@ -11,10 +11,19 @@ 16989@@ -11,10 +11,19 @@
16897 #include <linux/kprobes.h> /* __kprobes, ... */ 16990 #include <linux/kprobes.h> /* __kprobes, ... */
16898 #include <linux/mmiotrace.h> /* kmmio_handler, ... */ 16991 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
@@ -16953,7 +17046,43 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault
16953 DEFINE_SPINLOCK(pgd_lock); 17046 DEFINE_SPINLOCK(pgd_lock);
16954 LIST_HEAD(pgd_list); 17047 LIST_HEAD(pgd_list);
16955 17048
16956@@ -332,15 +365,27 @@ void vmalloc_sync_all(void) 17049@@ -224,11 +257,24 @@ void vmalloc_sync_all(void)
17050 address += PMD_SIZE) {
17051
17052 unsigned long flags;
17053+
17054+#ifdef CONFIG_PAX_PER_CPU_PGD
17055+ unsigned long cpu;
17056+#else
17057 struct page *page;
17058+#endif
17059
17060 spin_lock_irqsave(&pgd_lock, flags);
17061+
17062+#ifdef CONFIG_PAX_PER_CPU_PGD
17063+ for (cpu = 0; cpu < NR_CPUS; ++cpu) {
17064+ pgd_t *pgd = get_cpu_pgd(cpu);
17065+#else
17066 list_for_each_entry(page, &pgd_list, lru) {
17067- if (!vmalloc_sync_one(page_address(page), address))
17068+ pgd_t *pgd = page_address(page);
17069+#endif
17070+
17071+ if (!vmalloc_sync_one(pgd, address))
17072 break;
17073 }
17074 spin_unlock_irqrestore(&pgd_lock, flags);
17075@@ -257,6 +303,9 @@ static noinline int vmalloc_fault(unsign
17076 * Do _not_ use "current" here. We might be inside
17077 * an interrupt in the middle of a task switch..
17078 */
17079+#ifdef CONFIG_PAX_PER_CPU_PGD
17080+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
17081+#endif
17082 pgd_paddr = read_cr3();
17083 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
17084 if (!pmd_k)
17085@@ -332,15 +381,27 @@ void vmalloc_sync_all(void)
16957 17086
16958 const pgd_t *pgd_ref = pgd_offset_k(address); 17087 const pgd_t *pgd_ref = pgd_offset_k(address);
16959 unsigned long flags; 17088 unsigned long flags;
@@ -16981,7 +17110,7 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault
16981 if (pgd_none(*pgd)) 17110 if (pgd_none(*pgd))
16982 set_pgd(pgd, *pgd_ref); 17111 set_pgd(pgd, *pgd_ref);
16983 else 17112 else
16984@@ -373,7 +418,14 @@ static noinline int vmalloc_fault(unsign 17113@@ -373,7 +434,14 @@ static noinline int vmalloc_fault(unsign
16985 * happen within a race in page table update. In the later 17114 * happen within a race in page table update. In the later
16986 * case just flush: 17115 * case just flush:
16987 */ 17116 */
@@ -16996,7 +17125,7 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault
16996 pgd_ref = pgd_offset_k(address); 17125 pgd_ref = pgd_offset_k(address);
16997 if (pgd_none(*pgd_ref)) 17126 if (pgd_none(*pgd_ref))
16998 return -1; 17127 return -1;
16999@@ -535,7 +587,7 @@ static int is_errata93(struct pt_regs *r 17128@@ -535,7 +603,7 @@ static int is_errata93(struct pt_regs *r
17000 static int is_errata100(struct pt_regs *regs, unsigned long address) 17129 static int is_errata100(struct pt_regs *regs, unsigned long address)
17001 { 17130 {
17002 #ifdef CONFIG_X86_64 17131 #ifdef CONFIG_X86_64
@@ -17005,7 +17134,7 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault
17005 return 1; 17134 return 1;
17006 #endif 17135 #endif
17007 return 0; 17136 return 0;
17008@@ -562,7 +614,7 @@ static int is_f00f_bug(struct pt_regs *r 17137@@ -562,7 +630,7 @@ static int is_f00f_bug(struct pt_regs *r
17009 } 17138 }
17010 17139
17011 static const char nx_warning[] = KERN_CRIT 17140 static const char nx_warning[] = KERN_CRIT
@@ -17014,7 +17143,7 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault
17014 17143
17015 static void 17144 static void
17016 show_fault_oops(struct pt_regs *regs, unsigned long error_code, 17145 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
17017@@ -571,15 +623,26 @@ show_fault_oops(struct pt_regs *regs, un 17146@@ -571,15 +639,26 @@ show_fault_oops(struct pt_regs *regs, un
17018 if (!oops_may_print()) 17147 if (!oops_may_print())
17019 return; 17148 return;
17020 17149
@@ -17043,7 +17172,7 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault
17043 printk(KERN_ALERT "BUG: unable to handle kernel "); 17172 printk(KERN_ALERT "BUG: unable to handle kernel ");
17044 if (address < PAGE_SIZE) 17173 if (address < PAGE_SIZE)
17045 printk(KERN_CONT "NULL pointer dereference"); 17174 printk(KERN_CONT "NULL pointer dereference");
17046@@ -704,6 +767,68 @@ __bad_area_nosemaphore(struct pt_regs *r 17175@@ -704,6 +783,68 @@ __bad_area_nosemaphore(struct pt_regs *r
17047 unsigned long address, int si_code) 17176 unsigned long address, int si_code)
17048 { 17177 {
17049 struct task_struct *tsk = current; 17178 struct task_struct *tsk = current;
@@ -17112,7 +17241,7 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault
17112 17241
17113 /* User mode accesses just cause a SIGSEGV */ 17242 /* User mode accesses just cause a SIGSEGV */
17114 if (error_code & PF_USER) { 17243 if (error_code & PF_USER) {
17115@@ -848,6 +973,106 @@ static int spurious_fault_check(unsigned 17244@@ -848,6 +989,106 @@ static int spurious_fault_check(unsigned
17116 return 1; 17245 return 1;
17117 } 17246 }
17118 17247
@@ -17219,7 +17348,7 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault
17219 /* 17348 /*
17220 * Handle a spurious fault caused by a stale TLB entry. 17349 * Handle a spurious fault caused by a stale TLB entry.
17221 * 17350 *
17222@@ -914,6 +1139,9 @@ int show_unhandled_signals = 1; 17351@@ -914,6 +1155,9 @@ int show_unhandled_signals = 1;
17223 static inline int 17352 static inline int
17224 access_error(unsigned long error_code, int write, struct vm_area_struct *vma) 17353 access_error(unsigned long error_code, int write, struct vm_area_struct *vma)
17225 { 17354 {
@@ -17229,7 +17358,7 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault
17229 if (write) { 17358 if (write) {
17230 /* write, present and write, not present: */ 17359 /* write, present and write, not present: */
17231 if (unlikely(!(vma->vm_flags & VM_WRITE))) 17360 if (unlikely(!(vma->vm_flags & VM_WRITE)))
17232@@ -947,17 +1175,31 @@ do_page_fault(struct pt_regs *regs, unsi 17361@@ -947,17 +1191,31 @@ do_page_fault(struct pt_regs *regs, unsi
17233 { 17362 {
17234 struct vm_area_struct *vma; 17363 struct vm_area_struct *vma;
17235 struct task_struct *tsk; 17364 struct task_struct *tsk;
@@ -17265,7 +17394,7 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault
17265 /* 17394 /*
17266 * Detect and handle instructions that would cause a page fault for 17395 * Detect and handle instructions that would cause a page fault for
17267 * both a tracked kernel page and a userspace page. 17396 * both a tracked kernel page and a userspace page.
17268@@ -1017,7 +1259,7 @@ do_page_fault(struct pt_regs *regs, unsi 17397@@ -1017,7 +1275,7 @@ do_page_fault(struct pt_regs *regs, unsi
17269 * User-mode registers count as a user access even for any 17398 * User-mode registers count as a user access even for any
17270 * potential system fault or CPU buglet: 17399 * potential system fault or CPU buglet:
17271 */ 17400 */
@@ -17274,7 +17403,7 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault
17274 local_irq_enable(); 17403 local_irq_enable();
17275 error_code |= PF_USER; 17404 error_code |= PF_USER;
17276 } else { 17405 } else {
17277@@ -1071,6 +1313,11 @@ do_page_fault(struct pt_regs *regs, unsi 17406@@ -1071,6 +1329,11 @@ do_page_fault(struct pt_regs *regs, unsi
17278 might_sleep(); 17407 might_sleep();
17279 } 17408 }
17280 17409
@@ -17286,7 +17415,7 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault
17286 vma = find_vma(mm, address); 17415 vma = find_vma(mm, address);
17287 if (unlikely(!vma)) { 17416 if (unlikely(!vma)) {
17288 bad_area(regs, error_code, address); 17417 bad_area(regs, error_code, address);
17289@@ -1082,18 +1329,24 @@ do_page_fault(struct pt_regs *regs, unsi 17418@@ -1082,18 +1345,24 @@ do_page_fault(struct pt_regs *regs, unsi
17290 bad_area(regs, error_code, address); 17419 bad_area(regs, error_code, address);
17291 return; 17420 return;
17292 } 17421 }
@@ -17322,7 +17451,7 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault
17322 if (unlikely(expand_stack(vma, address))) { 17451 if (unlikely(expand_stack(vma, address))) {
17323 bad_area(regs, error_code, address); 17452 bad_area(regs, error_code, address);
17324 return; 17453 return;
17325@@ -1137,3 +1390,199 @@ good_area: 17454@@ -1137,3 +1406,199 @@ good_area:
17326 17455
17327 up_read(&mm->mmap_sem); 17456 up_read(&mm->mmap_sem);
17328 } 17457 }
@@ -17522,9 +17651,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault
17522+ 17651+
17523+ return ret ? -EFAULT : 0; 17652+ return ret ? -EFAULT : 0;
17524+} 17653+}
17525diff -urNp linux-2.6.32.12/arch/x86/mm/gup.c linux-2.6.32.12/arch/x86/mm/gup.c 17654diff -urNp linux-2.6.32.13/arch/x86/mm/gup.c linux-2.6.32.13/arch/x86/mm/gup.c
17526--- linux-2.6.32.12/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400 17655--- linux-2.6.32.13/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400
17527+++ linux-2.6.32.12/arch/x86/mm/gup.c 2010-04-04 20:46:41.533557286 -0400 17656+++ linux-2.6.32.13/arch/x86/mm/gup.c 2010-05-15 13:21:14.234766826 -0400
17528@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long 17657@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
17529 addr = start; 17658 addr = start;
17530 len = (unsigned long) nr_pages << PAGE_SHIFT; 17659 len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -17534,9 +17663,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/gup.c linux-2.6.32.12/arch/x86/mm/gup.c
17534 (void __user *)start, len))) 17663 (void __user *)start, len)))
17535 return 0; 17664 return 0;
17536 17665
17537diff -urNp linux-2.6.32.12/arch/x86/mm/highmem_32.c linux-2.6.32.12/arch/x86/mm/highmem_32.c 17666diff -urNp linux-2.6.32.13/arch/x86/mm/highmem_32.c linux-2.6.32.13/arch/x86/mm/highmem_32.c
17538--- linux-2.6.32.12/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400 17667--- linux-2.6.32.13/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400
17539+++ linux-2.6.32.12/arch/x86/mm/highmem_32.c 2010-04-04 20:46:41.533557286 -0400 17668+++ linux-2.6.32.13/arch/x86/mm/highmem_32.c 2010-05-15 13:21:14.238617110 -0400
17540@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page 17669@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
17541 idx = type + KM_TYPE_NR*smp_processor_id(); 17670 idx = type + KM_TYPE_NR*smp_processor_id();
17542 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); 17671 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -17548,9 +17677,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/highmem_32.c linux-2.6.32.12/arch/x86/mm/
17548 17677
17549 return (void *)vaddr; 17678 return (void *)vaddr;
17550 } 17679 }
17551diff -urNp linux-2.6.32.12/arch/x86/mm/hugetlbpage.c linux-2.6.32.12/arch/x86/mm/hugetlbpage.c 17680diff -urNp linux-2.6.32.13/arch/x86/mm/hugetlbpage.c linux-2.6.32.13/arch/x86/mm/hugetlbpage.c
17552--- linux-2.6.32.12/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400 17681--- linux-2.6.32.13/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400
17553+++ linux-2.6.32.12/arch/x86/mm/hugetlbpage.c 2010-04-04 20:46:41.533557286 -0400 17682+++ linux-2.6.32.13/arch/x86/mm/hugetlbpage.c 2010-05-15 13:21:14.238617110 -0400
17554@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe 17683@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe
17555 struct hstate *h = hstate_file(file); 17684 struct hstate *h = hstate_file(file);
17556 struct mm_struct *mm = current->mm; 17685 struct mm_struct *mm = current->mm;
@@ -17685,9 +17814,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/hugetlbpage.c linux-2.6.32.12/arch/x86/mm
17685 (!vma || addr + len <= vma->vm_start)) 17814 (!vma || addr + len <= vma->vm_start))
17686 return addr; 17815 return addr;
17687 } 17816 }
17688diff -urNp linux-2.6.32.12/arch/x86/mm/init_32.c linux-2.6.32.12/arch/x86/mm/init_32.c 17817diff -urNp linux-2.6.32.13/arch/x86/mm/init_32.c linux-2.6.32.13/arch/x86/mm/init_32.c
17689--- linux-2.6.32.12/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 17818--- linux-2.6.32.13/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
17690+++ linux-2.6.32.12/arch/x86/mm/init_32.c 2010-04-04 20:58:33.225084964 -0400 17819+++ linux-2.6.32.13/arch/x86/mm/init_32.c 2010-05-15 13:21:14.238617110 -0400
17691@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) 17820@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
17692 } 17821 }
17693 17822
@@ -17991,9 +18120,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/init_32.c linux-2.6.32.12/arch/x86/mm/ini
17991 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); 18120 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
17992 printk(KERN_INFO "Write protecting the kernel text: %luk\n", 18121 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
17993 size >> 10); 18122 size >> 10);
17994diff -urNp linux-2.6.32.12/arch/x86/mm/init_64.c linux-2.6.32.12/arch/x86/mm/init_64.c 18123diff -urNp linux-2.6.32.13/arch/x86/mm/init_64.c linux-2.6.32.13/arch/x86/mm/init_64.c
17995--- linux-2.6.32.12/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400 18124--- linux-2.6.32.13/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400
17996+++ linux-2.6.32.12/arch/x86/mm/init_64.c 2010-04-04 20:58:33.225084964 -0400 18125+++ linux-2.6.32.13/arch/x86/mm/init_64.c 2010-05-15 13:21:14.238617110 -0400
17997@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 18126@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
17998 pmd = fill_pmd(pud, vaddr); 18127 pmd = fill_pmd(pud, vaddr);
17999 pte = fill_pte(pmd, vaddr); 18128 pte = fill_pte(pmd, vaddr);
@@ -18054,9 +18183,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/init_64.c linux-2.6.32.12/arch/x86/mm/ini
18054 return "[vdso]"; 18183 return "[vdso]";
18055 if (vma == &gate_vma) 18184 if (vma == &gate_vma)
18056 return "[vsyscall]"; 18185 return "[vsyscall]";
18057diff -urNp linux-2.6.32.12/arch/x86/mm/init.c linux-2.6.32.12/arch/x86/mm/init.c 18186diff -urNp linux-2.6.32.13/arch/x86/mm/init.c linux-2.6.32.13/arch/x86/mm/init.c
18058--- linux-2.6.32.12/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400 18187--- linux-2.6.32.13/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400
18059+++ linux-2.6.32.12/arch/x86/mm/init.c 2010-04-04 20:46:41.533557286 -0400 18188+++ linux-2.6.32.13/arch/x86/mm/init.c 2010-05-15 13:21:14.238617110 -0400
18060@@ -69,11 +69,7 @@ static void __init find_early_table_spac 18189@@ -69,11 +69,7 @@ static void __init find_early_table_spac
18061 * cause a hotspot and fill up ZONE_DMA. The page tables 18190 * cause a hotspot and fill up ZONE_DMA. The page tables
18062 * need roughly 0.5KB per GB. 18191 * need roughly 0.5KB per GB.
@@ -18173,9 +18302,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/init.c linux-2.6.32.12/arch/x86/mm/init.c
18173 free_init_pages("unused kernel memory", 18302 free_init_pages("unused kernel memory",
18174 (unsigned long)(&__init_begin), 18303 (unsigned long)(&__init_begin),
18175 (unsigned long)(&__init_end)); 18304 (unsigned long)(&__init_end));
18176diff -urNp linux-2.6.32.12/arch/x86/mm/iomap_32.c linux-2.6.32.12/arch/x86/mm/iomap_32.c 18305diff -urNp linux-2.6.32.13/arch/x86/mm/iomap_32.c linux-2.6.32.13/arch/x86/mm/iomap_32.c
18177--- linux-2.6.32.12/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400 18306--- linux-2.6.32.13/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400
18178+++ linux-2.6.32.12/arch/x86/mm/iomap_32.c 2010-04-04 20:46:41.533557286 -0400 18307+++ linux-2.6.32.13/arch/x86/mm/iomap_32.c 2010-05-15 13:21:14.238617110 -0400
18179@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long 18308@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
18180 debug_kmap_atomic(type); 18309 debug_kmap_atomic(type);
18181 idx = type + KM_TYPE_NR * smp_processor_id(); 18310 idx = type + KM_TYPE_NR * smp_processor_id();
@@ -18188,9 +18317,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/iomap_32.c linux-2.6.32.12/arch/x86/mm/io
18188 arch_flush_lazy_mmu_mode(); 18317 arch_flush_lazy_mmu_mode();
18189 18318
18190 return (void *)vaddr; 18319 return (void *)vaddr;
18191diff -urNp linux-2.6.32.12/arch/x86/mm/ioremap.c linux-2.6.32.12/arch/x86/mm/ioremap.c 18320diff -urNp linux-2.6.32.13/arch/x86/mm/ioremap.c linux-2.6.32.13/arch/x86/mm/ioremap.c
18192--- linux-2.6.32.12/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400 18321--- linux-2.6.32.13/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400
18193+++ linux-2.6.32.12/arch/x86/mm/ioremap.c 2010-04-04 20:46:41.533557286 -0400 18322+++ linux-2.6.32.13/arch/x86/mm/ioremap.c 2010-05-15 13:21:14.238617110 -0400
18194@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) 18323@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
18195 * Second special case: Some BIOSen report the PC BIOS 18324 * Second special case: Some BIOSen report the PC BIOS
18196 * area (640->1Mb) as ram even though it is not. 18325 * area (640->1Mb) as ram even though it is not.
@@ -18237,9 +18366,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/ioremap.c linux-2.6.32.12/arch/x86/mm/ior
18237 18366
18238 /* 18367 /*
18239 * The boot-ioremap range spans multiple pmds, for which 18368 * The boot-ioremap range spans multiple pmds, for which
18240diff -urNp linux-2.6.32.12/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.12/arch/x86/mm/kmemcheck/kmemcheck.c 18369diff -urNp linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c
18241--- linux-2.6.32.12/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400 18370--- linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400
18242+++ linux-2.6.32.12/arch/x86/mm/kmemcheck/kmemcheck.c 2010-04-04 20:46:41.533557286 -0400 18371+++ linux-2.6.32.13/arch/x86/mm/kmemcheck/kmemcheck.c 2010-05-15 13:21:14.238617110 -0400
18243@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg 18372@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
18244 * memory (e.g. tracked pages)? For now, we need this to avoid 18373 * memory (e.g. tracked pages)? For now, we need this to avoid
18245 * invoking kmemcheck for PnP BIOS calls. 18374 * invoking kmemcheck for PnP BIOS calls.
@@ -18252,9 +18381,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.12/arc
18252 return false; 18381 return false;
18253 18382
18254 pte = kmemcheck_pte_lookup(address); 18383 pte = kmemcheck_pte_lookup(address);
18255diff -urNp linux-2.6.32.12/arch/x86/mm/mmap.c linux-2.6.32.12/arch/x86/mm/mmap.c 18384diff -urNp linux-2.6.32.13/arch/x86/mm/mmap.c linux-2.6.32.13/arch/x86/mm/mmap.c
18256--- linux-2.6.32.12/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 18385--- linux-2.6.32.13/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
18257+++ linux-2.6.32.12/arch/x86/mm/mmap.c 2010-04-04 20:46:41.537568318 -0400 18386+++ linux-2.6.32.13/arch/x86/mm/mmap.c 2010-05-15 13:21:14.238617110 -0400
18258@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size 18387@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
18259 * Leave an at least ~128 MB hole with possible stack randomization. 18388 * Leave an at least ~128 MB hole with possible stack randomization.
18260 */ 18389 */
@@ -18336,9 +18465,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/mmap.c linux-2.6.32.12/arch/x86/mm/mmap.c
18336 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 18465 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
18337 mm->unmap_area = arch_unmap_area_topdown; 18466 mm->unmap_area = arch_unmap_area_topdown;
18338 } 18467 }
18339diff -urNp linux-2.6.32.12/arch/x86/mm/numa_32.c linux-2.6.32.12/arch/x86/mm/numa_32.c 18468diff -urNp linux-2.6.32.13/arch/x86/mm/numa_32.c linux-2.6.32.13/arch/x86/mm/numa_32.c
18340--- linux-2.6.32.12/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400 18469--- linux-2.6.32.13/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400
18341+++ linux-2.6.32.12/arch/x86/mm/numa_32.c 2010-04-04 20:46:41.537568318 -0400 18470+++ linux-2.6.32.13/arch/x86/mm/numa_32.c 2010-05-15 13:21:14.238617110 -0400
18342@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int 18471@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
18343 } 18472 }
18344 #endif 18473 #endif
@@ -18347,9 +18476,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/numa_32.c linux-2.6.32.12/arch/x86/mm/num
18347 extern unsigned long highend_pfn, highstart_pfn; 18476 extern unsigned long highend_pfn, highstart_pfn;
18348 18477
18349 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) 18478 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
18350diff -urNp linux-2.6.32.12/arch/x86/mm/pageattr.c linux-2.6.32.12/arch/x86/mm/pageattr.c 18479diff -urNp linux-2.6.32.13/arch/x86/mm/pageattr.c linux-2.6.32.13/arch/x86/mm/pageattr.c
18351--- linux-2.6.32.12/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400 18480--- linux-2.6.32.13/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400
18352+++ linux-2.6.32.12/arch/x86/mm/pageattr.c 2010-04-04 20:46:41.537568318 -0400 18481+++ linux-2.6.32.13/arch/x86/mm/pageattr.c 2010-05-15 13:21:14.238617110 -0400
18353@@ -268,9 +268,10 @@ static inline pgprot_t static_protection 18482@@ -268,9 +268,10 @@ static inline pgprot_t static_protection
18354 * Does not cover __inittext since that is gone later on. On 18483 * Does not cover __inittext since that is gone later on. On
18355 * 64bit we do not enforce !NX on the low mapping 18484 * 64bit we do not enforce !NX on the low mapping
@@ -18381,9 +18510,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/pageattr.c linux-2.6.32.12/arch/x86/mm/pa
18381 #ifdef CONFIG_X86_32 18510 #ifdef CONFIG_X86_32
18382 if (!SHARED_KERNEL_PMD) { 18511 if (!SHARED_KERNEL_PMD) {
18383 struct page *page; 18512 struct page *page;
18384diff -urNp linux-2.6.32.12/arch/x86/mm/pageattr-test.c linux-2.6.32.12/arch/x86/mm/pageattr-test.c 18513diff -urNp linux-2.6.32.13/arch/x86/mm/pageattr-test.c linux-2.6.32.13/arch/x86/mm/pageattr-test.c
18385--- linux-2.6.32.12/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400 18514--- linux-2.6.32.13/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400
18386+++ linux-2.6.32.12/arch/x86/mm/pageattr-test.c 2010-04-04 20:46:41.537568318 -0400 18515+++ linux-2.6.32.13/arch/x86/mm/pageattr-test.c 2010-05-15 13:21:14.238617110 -0400
18387@@ -36,7 +36,7 @@ enum { 18516@@ -36,7 +36,7 @@ enum {
18388 18517
18389 static int pte_testbit(pte_t pte) 18518 static int pte_testbit(pte_t pte)
@@ -18393,9 +18522,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/pageattr-test.c linux-2.6.32.12/arch/x86/
18393 } 18522 }
18394 18523
18395 struct split_state { 18524 struct split_state {
18396diff -urNp linux-2.6.32.12/arch/x86/mm/pat.c linux-2.6.32.12/arch/x86/mm/pat.c 18525diff -urNp linux-2.6.32.13/arch/x86/mm/pat.c linux-2.6.32.13/arch/x86/mm/pat.c
18397--- linux-2.6.32.12/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400 18526--- linux-2.6.32.13/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400
18398+++ linux-2.6.32.12/arch/x86/mm/pat.c 2010-04-04 20:46:41.537568318 -0400 18527+++ linux-2.6.32.13/arch/x86/mm/pat.c 2010-05-15 13:21:14.258921790 -0400
18399@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct 18528@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
18400 18529
18401 conflict: 18530 conflict:
@@ -18432,9 +18561,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/pat.c linux-2.6.32.12/arch/x86/mm/pat.c
18432 cattr_name(want_flags), 18561 cattr_name(want_flags),
18433 (unsigned long long)paddr, 18562 (unsigned long long)paddr,
18434 (unsigned long long)(paddr + size), 18563 (unsigned long long)(paddr + size),
18435diff -urNp linux-2.6.32.12/arch/x86/mm/pgtable_32.c linux-2.6.32.12/arch/x86/mm/pgtable_32.c 18564diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable_32.c linux-2.6.32.13/arch/x86/mm/pgtable_32.c
18436--- linux-2.6.32.12/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400 18565--- linux-2.6.32.13/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400
18437+++ linux-2.6.32.12/arch/x86/mm/pgtable_32.c 2010-04-04 20:46:41.537568318 -0400 18566+++ linux-2.6.32.13/arch/x86/mm/pgtable_32.c 2010-05-15 13:21:14.258921790 -0400
18438@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 18567@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
18439 return; 18568 return;
18440 } 18569 }
@@ -18449,9 +18578,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/pgtable_32.c linux-2.6.32.12/arch/x86/mm/
18449 18578
18450 /* 18579 /*
18451 * It's enough to flush this one mapping. 18580 * It's enough to flush this one mapping.
18452diff -urNp linux-2.6.32.12/arch/x86/mm/pgtable.c linux-2.6.32.12/arch/x86/mm/pgtable.c 18581diff -urNp linux-2.6.32.13/arch/x86/mm/pgtable.c linux-2.6.32.13/arch/x86/mm/pgtable.c
18453--- linux-2.6.32.12/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400 18582--- linux-2.6.32.13/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400
18454+++ linux-2.6.32.12/arch/x86/mm/pgtable.c 2010-04-04 20:58:33.225084964 -0400 18583+++ linux-2.6.32.13/arch/x86/mm/pgtable.c 2010-05-15 13:21:14.258921790 -0400
18455@@ -63,8 +63,12 @@ void ___pmd_free_tlb(struct mmu_gather * 18584@@ -63,8 +63,12 @@ void ___pmd_free_tlb(struct mmu_gather *
18456 #if PAGETABLE_LEVELS > 3 18585 #if PAGETABLE_LEVELS > 3
18457 void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud) 18586 void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud)
@@ -18721,9 +18850,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/pgtable.c linux-2.6.32.12/arch/x86/mm/pgt
18721 pgd_dtor(pgd); 18850 pgd_dtor(pgd);
18722 paravirt_pgd_free(mm, pgd); 18851 paravirt_pgd_free(mm, pgd);
18723 free_page((unsigned long)pgd); 18852 free_page((unsigned long)pgd);
18724diff -urNp linux-2.6.32.12/arch/x86/mm/setup_nx.c linux-2.6.32.12/arch/x86/mm/setup_nx.c 18853diff -urNp linux-2.6.32.13/arch/x86/mm/setup_nx.c linux-2.6.32.13/arch/x86/mm/setup_nx.c
18725--- linux-2.6.32.12/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400 18854--- linux-2.6.32.13/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400
18726+++ linux-2.6.32.12/arch/x86/mm/setup_nx.c 2010-04-04 20:46:41.537568318 -0400 18855+++ linux-2.6.32.13/arch/x86/mm/setup_nx.c 2010-05-15 13:21:14.258921790 -0400
18727@@ -4,11 +4,10 @@ 18856@@ -4,11 +4,10 @@
18728 18857
18729 #include <asm/pgtable.h> 18858 #include <asm/pgtable.h>
@@ -18789,9 +18918,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/setup_nx.c linux-2.6.32.12/arch/x86/mm/se
18789 __supported_pte_mask &= ~_PAGE_NX; 18918 __supported_pte_mask &= ~_PAGE_NX;
18790 } 18919 }
18791 #endif 18920 #endif
18792diff -urNp linux-2.6.32.12/arch/x86/mm/tlb.c linux-2.6.32.12/arch/x86/mm/tlb.c 18921diff -urNp linux-2.6.32.13/arch/x86/mm/tlb.c linux-2.6.32.13/arch/x86/mm/tlb.c
18793--- linux-2.6.32.12/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400 18922--- linux-2.6.32.13/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400
18794+++ linux-2.6.32.12/arch/x86/mm/tlb.c 2010-04-04 20:58:33.225084964 -0400 18923+++ linux-2.6.32.13/arch/x86/mm/tlb.c 2010-05-15 13:21:14.258921790 -0400
18795@@ -12,7 +12,7 @@ 18924@@ -12,7 +12,7 @@
18796 #include <asm/uv/uv.h> 18925 #include <asm/uv/uv.h>
18797 18926
@@ -18813,9 +18942,9 @@ diff -urNp linux-2.6.32.12/arch/x86/mm/tlb.c linux-2.6.32.12/arch/x86/mm/tlb.c
18813 } 18942 }
18814 EXPORT_SYMBOL_GPL(leave_mm); 18943 EXPORT_SYMBOL_GPL(leave_mm);
18815 18944
18816diff -urNp linux-2.6.32.12/arch/x86/oprofile/backtrace.c linux-2.6.32.12/arch/x86/oprofile/backtrace.c 18945diff -urNp linux-2.6.32.13/arch/x86/oprofile/backtrace.c linux-2.6.32.13/arch/x86/oprofile/backtrace.c
18817--- linux-2.6.32.12/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400 18946--- linux-2.6.32.13/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400
18818+++ linux-2.6.32.12/arch/x86/oprofile/backtrace.c 2010-04-04 20:46:41.537568318 -0400 18947+++ linux-2.6.32.13/arch/x86/oprofile/backtrace.c 2010-05-15 13:21:14.258921790 -0400
18819@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back 18948@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
18820 struct frame_head bufhead[2]; 18949 struct frame_head bufhead[2];
18821 18950
@@ -18834,9 +18963,9 @@ diff -urNp linux-2.6.32.12/arch/x86/oprofile/backtrace.c linux-2.6.32.12/arch/x8
18834 unsigned long stack = kernel_stack_pointer(regs); 18963 unsigned long stack = kernel_stack_pointer(regs);
18835 if (depth) 18964 if (depth)
18836 dump_trace(NULL, regs, (unsigned long *)stack, 0, 18965 dump_trace(NULL, regs, (unsigned long *)stack, 0,
18837diff -urNp linux-2.6.32.12/arch/x86/oprofile/op_model_p4.c linux-2.6.32.12/arch/x86/oprofile/op_model_p4.c 18966diff -urNp linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c
18838--- linux-2.6.32.12/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400 18967--- linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400
18839+++ linux-2.6.32.12/arch/x86/oprofile/op_model_p4.c 2010-04-04 20:46:41.537568318 -0400 18968+++ linux-2.6.32.13/arch/x86/oprofile/op_model_p4.c 2010-05-15 13:21:14.270940782 -0400
18840@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo 18969@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
18841 #endif 18970 #endif
18842 } 18971 }
@@ -18846,9 +18975,9 @@ diff -urNp linux-2.6.32.12/arch/x86/oprofile/op_model_p4.c linux-2.6.32.12/arch/
18846 { 18975 {
18847 #ifdef CONFIG_SMP 18976 #ifdef CONFIG_SMP
18848 return smp_num_siblings == 2 ? 2 : 1; 18977 return smp_num_siblings == 2 ? 2 : 1;
18849diff -urNp linux-2.6.32.12/arch/x86/pci/common.c linux-2.6.32.12/arch/x86/pci/common.c 18978diff -urNp linux-2.6.32.13/arch/x86/pci/common.c linux-2.6.32.13/arch/x86/pci/common.c
18850--- linux-2.6.32.12/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400 18979--- linux-2.6.32.13/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400
18851+++ linux-2.6.32.12/arch/x86/pci/common.c 2010-04-04 20:46:41.537568318 -0400 18980+++ linux-2.6.32.13/arch/x86/pci/common.c 2010-05-15 13:21:14.270940782 -0400
18852@@ -31,8 +31,8 @@ int noioapicreroute = 1; 18981@@ -31,8 +31,8 @@ int noioapicreroute = 1;
18853 int pcibios_last_bus = -1; 18982 int pcibios_last_bus = -1;
18854 unsigned long pirq_table_addr; 18983 unsigned long pirq_table_addr;
@@ -18869,9 +18998,9 @@ diff -urNp linux-2.6.32.12/arch/x86/pci/common.c linux-2.6.32.12/arch/x86/pci/co
18869 }; 18998 };
18870 18999
18871 void __init dmi_check_pciprobe(void) 19000 void __init dmi_check_pciprobe(void)
18872diff -urNp linux-2.6.32.12/arch/x86/pci/direct.c linux-2.6.32.12/arch/x86/pci/direct.c 19001diff -urNp linux-2.6.32.13/arch/x86/pci/direct.c linux-2.6.32.13/arch/x86/pci/direct.c
18873--- linux-2.6.32.12/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400 19002--- linux-2.6.32.13/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400
18874+++ linux-2.6.32.12/arch/x86/pci/direct.c 2010-04-04 20:46:41.537568318 -0400 19003+++ linux-2.6.32.13/arch/x86/pci/direct.c 2010-05-15 13:21:14.270940782 -0400
18875@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 19004@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
18876 19005
18877 #undef PCI_CONF1_ADDRESS 19006 #undef PCI_CONF1_ADDRESS
@@ -18899,9 +19028,9 @@ diff -urNp linux-2.6.32.12/arch/x86/pci/direct.c linux-2.6.32.12/arch/x86/pci/di
18899 { 19028 {
18900 u32 x = 0; 19029 u32 x = 0;
18901 int year, devfn; 19030 int year, devfn;
18902diff -urNp linux-2.6.32.12/arch/x86/pci/fixup.c linux-2.6.32.12/arch/x86/pci/fixup.c 19031diff -urNp linux-2.6.32.13/arch/x86/pci/fixup.c linux-2.6.32.13/arch/x86/pci/fixup.c
18903--- linux-2.6.32.12/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400 19032--- linux-2.6.32.13/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400
18904+++ linux-2.6.32.12/arch/x86/pci/fixup.c 2010-04-04 20:46:41.537568318 -0400 19033+++ linux-2.6.32.13/arch/x86/pci/fixup.c 2010-05-15 13:21:14.270940782 -0400
18905@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi 19034@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
18906 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), 19035 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
18907 }, 19036 },
@@ -18920,9 +19049,9 @@ diff -urNp linux-2.6.32.12/arch/x86/pci/fixup.c linux-2.6.32.12/arch/x86/pci/fix
18920 }; 19049 };
18921 19050
18922 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) 19051 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
18923diff -urNp linux-2.6.32.12/arch/x86/pci/irq.c linux-2.6.32.12/arch/x86/pci/irq.c 19052diff -urNp linux-2.6.32.13/arch/x86/pci/irq.c linux-2.6.32.13/arch/x86/pci/irq.c
18924--- linux-2.6.32.12/arch/x86/pci/irq.c 2010-04-29 17:49:37.625451376 -0400 19053--- linux-2.6.32.13/arch/x86/pci/irq.c 2010-04-29 17:49:37.625451376 -0400
18925+++ linux-2.6.32.12/arch/x86/pci/irq.c 2010-04-29 17:49:58.053442872 -0400 19054+++ linux-2.6.32.13/arch/x86/pci/irq.c 2010-05-15 13:21:14.270940782 -0400
18926@@ -543,7 +543,7 @@ static __init int intel_router_probe(str 19055@@ -543,7 +543,7 @@ static __init int intel_router_probe(str
18927 static struct pci_device_id __initdata pirq_440gx[] = { 19056 static struct pci_device_id __initdata pirq_440gx[] = {
18928 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, 19057 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
@@ -18941,9 +19070,9 @@ diff -urNp linux-2.6.32.12/arch/x86/pci/irq.c linux-2.6.32.12/arch/x86/pci/irq.c
18941 }; 19070 };
18942 19071
18943 int __init pcibios_irq_init(void) 19072 int __init pcibios_irq_init(void)
18944diff -urNp linux-2.6.32.12/arch/x86/pci/mmconfig_32.c linux-2.6.32.12/arch/x86/pci/mmconfig_32.c 19073diff -urNp linux-2.6.32.13/arch/x86/pci/mmconfig_32.c linux-2.6.32.13/arch/x86/pci/mmconfig_32.c
18945--- linux-2.6.32.12/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400 19074--- linux-2.6.32.13/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400
18946+++ linux-2.6.32.12/arch/x86/pci/mmconfig_32.c 2010-04-04 20:46:41.537568318 -0400 19075+++ linux-2.6.32.13/arch/x86/pci/mmconfig_32.c 2010-05-15 13:21:14.270940782 -0400
18947@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int 19076@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
18948 return 0; 19077 return 0;
18949 } 19078 }
@@ -18953,9 +19082,9 @@ diff -urNp linux-2.6.32.12/arch/x86/pci/mmconfig_32.c linux-2.6.32.12/arch/x86/p
18953 .read = pci_mmcfg_read, 19082 .read = pci_mmcfg_read,
18954 .write = pci_mmcfg_write, 19083 .write = pci_mmcfg_write,
18955 }; 19084 };
18956diff -urNp linux-2.6.32.12/arch/x86/pci/mmconfig_64.c linux-2.6.32.12/arch/x86/pci/mmconfig_64.c 19085diff -urNp linux-2.6.32.13/arch/x86/pci/mmconfig_64.c linux-2.6.32.13/arch/x86/pci/mmconfig_64.c
18957--- linux-2.6.32.12/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400 19086--- linux-2.6.32.13/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400
18958+++ linux-2.6.32.12/arch/x86/pci/mmconfig_64.c 2010-04-04 20:46:41.537568318 -0400 19087+++ linux-2.6.32.13/arch/x86/pci/mmconfig_64.c 2010-05-15 13:21:14.270940782 -0400
18959@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int 19088@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
18960 return 0; 19089 return 0;
18961 } 19090 }
@@ -18965,9 +19094,9 @@ diff -urNp linux-2.6.32.12/arch/x86/pci/mmconfig_64.c linux-2.6.32.12/arch/x86/p
18965 .read = pci_mmcfg_read, 19094 .read = pci_mmcfg_read,
18966 .write = pci_mmcfg_write, 19095 .write = pci_mmcfg_write,
18967 }; 19096 };
18968diff -urNp linux-2.6.32.12/arch/x86/pci/numaq_32.c linux-2.6.32.12/arch/x86/pci/numaq_32.c 19097diff -urNp linux-2.6.32.13/arch/x86/pci/numaq_32.c linux-2.6.32.13/arch/x86/pci/numaq_32.c
18969--- linux-2.6.32.12/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400 19098--- linux-2.6.32.13/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400
18970+++ linux-2.6.32.12/arch/x86/pci/numaq_32.c 2010-04-04 20:46:41.537568318 -0400 19099+++ linux-2.6.32.13/arch/x86/pci/numaq_32.c 2010-05-15 13:21:14.270940782 -0400
18971@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i 19100@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
18972 19101
18973 #undef PCI_CONF1_MQ_ADDRESS 19102 #undef PCI_CONF1_MQ_ADDRESS
@@ -18977,9 +19106,9 @@ diff -urNp linux-2.6.32.12/arch/x86/pci/numaq_32.c linux-2.6.32.12/arch/x86/pci/
18977 .read = pci_conf1_mq_read, 19106 .read = pci_conf1_mq_read,
18978 .write = pci_conf1_mq_write 19107 .write = pci_conf1_mq_write
18979 }; 19108 };
18980diff -urNp linux-2.6.32.12/arch/x86/pci/olpc.c linux-2.6.32.12/arch/x86/pci/olpc.c 19109diff -urNp linux-2.6.32.13/arch/x86/pci/olpc.c linux-2.6.32.13/arch/x86/pci/olpc.c
18981--- linux-2.6.32.12/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400 19110--- linux-2.6.32.13/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400
18982+++ linux-2.6.32.12/arch/x86/pci/olpc.c 2010-04-04 20:46:41.537568318 -0400 19111+++ linux-2.6.32.13/arch/x86/pci/olpc.c 2010-05-15 13:21:14.270940782 -0400
18983@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s 19112@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
18984 return 0; 19113 return 0;
18985 } 19114 }
@@ -18989,9 +19118,9 @@ diff -urNp linux-2.6.32.12/arch/x86/pci/olpc.c linux-2.6.32.12/arch/x86/pci/olpc
18989 .read = pci_olpc_read, 19118 .read = pci_olpc_read,
18990 .write = pci_olpc_write, 19119 .write = pci_olpc_write,
18991 }; 19120 };
18992diff -urNp linux-2.6.32.12/arch/x86/pci/pcbios.c linux-2.6.32.12/arch/x86/pci/pcbios.c 19121diff -urNp linux-2.6.32.13/arch/x86/pci/pcbios.c linux-2.6.32.13/arch/x86/pci/pcbios.c
18993--- linux-2.6.32.12/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400 19122--- linux-2.6.32.13/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400
18994+++ linux-2.6.32.12/arch/x86/pci/pcbios.c 2010-04-04 20:46:41.537568318 -0400 19123+++ linux-2.6.32.13/arch/x86/pci/pcbios.c 2010-05-15 13:21:14.274578804 -0400
18995@@ -56,50 +56,93 @@ union bios32 { 19124@@ -56,50 +56,93 @@ union bios32 {
18996 static struct { 19125 static struct {
18997 unsigned long address; 19126 unsigned long address;
@@ -19314,9 +19443,9 @@ diff -urNp linux-2.6.32.12/arch/x86/pci/pcbios.c linux-2.6.32.12/arch/x86/pci/pc
19314 return !(ret & 0xff00); 19443 return !(ret & 0xff00);
19315 } 19444 }
19316 EXPORT_SYMBOL(pcibios_set_irq_routing); 19445 EXPORT_SYMBOL(pcibios_set_irq_routing);
19317diff -urNp linux-2.6.32.12/arch/x86/power/cpu.c linux-2.6.32.12/arch/x86/power/cpu.c 19446diff -urNp linux-2.6.32.13/arch/x86/power/cpu.c linux-2.6.32.13/arch/x86/power/cpu.c
19318--- linux-2.6.32.12/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400 19447--- linux-2.6.32.13/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400
19319+++ linux-2.6.32.12/arch/x86/power/cpu.c 2010-04-04 20:46:41.537568318 -0400 19448+++ linux-2.6.32.13/arch/x86/power/cpu.c 2010-05-15 13:21:14.274578804 -0400
19320@@ -126,7 +126,7 @@ static void do_fpu_end(void) 19449@@ -126,7 +126,7 @@ static void do_fpu_end(void)
19321 static void fix_processor_context(void) 19450 static void fix_processor_context(void)
19322 { 19451 {
@@ -19336,9 +19465,9 @@ diff -urNp linux-2.6.32.12/arch/x86/power/cpu.c linux-2.6.32.12/arch/x86/power/c
19336 19465
19337 syscall_init(); /* This sets MSR_*STAR and related */ 19466 syscall_init(); /* This sets MSR_*STAR and related */
19338 #endif 19467 #endif
19339diff -urNp linux-2.6.32.12/arch/x86/vdso/Makefile linux-2.6.32.12/arch/x86/vdso/Makefile 19468diff -urNp linux-2.6.32.13/arch/x86/vdso/Makefile linux-2.6.32.13/arch/x86/vdso/Makefile
19340--- linux-2.6.32.12/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400 19469--- linux-2.6.32.13/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400
19341+++ linux-2.6.32.12/arch/x86/vdso/Makefile 2010-04-04 20:46:41.537568318 -0400 19470+++ linux-2.6.32.13/arch/x86/vdso/Makefile 2010-05-15 13:21:14.274578804 -0400
19342@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ 19471@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
19343 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ 19472 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
19344 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) 19473 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -19348,9 +19477,9 @@ diff -urNp linux-2.6.32.12/arch/x86/vdso/Makefile linux-2.6.32.12/arch/x86/vdso/
19348 GCOV_PROFILE := n 19477 GCOV_PROFILE := n
19349 19478
19350 # 19479 #
19351diff -urNp linux-2.6.32.12/arch/x86/vdso/vclock_gettime.c linux-2.6.32.12/arch/x86/vdso/vclock_gettime.c 19480diff -urNp linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c
19352--- linux-2.6.32.12/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400 19481--- linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400
19353+++ linux-2.6.32.12/arch/x86/vdso/vclock_gettime.c 2010-04-04 20:46:41.541133870 -0400 19482+++ linux-2.6.32.13/arch/x86/vdso/vclock_gettime.c 2010-05-15 13:21:14.274578804 -0400
19354@@ -22,24 +22,48 @@ 19483@@ -22,24 +22,48 @@
19355 #include <asm/hpet.h> 19484 #include <asm/hpet.h>
19356 #include <asm/unistd.h> 19485 #include <asm/unistd.h>
@@ -19449,9 +19578,9 @@ diff -urNp linux-2.6.32.12/arch/x86/vdso/vclock_gettime.c linux-2.6.32.12/arch/x
19449 } 19578 }
19450 int gettimeofday(struct timeval *, struct timezone *) 19579 int gettimeofday(struct timeval *, struct timezone *)
19451 __attribute__((weak, alias("__vdso_gettimeofday"))); 19580 __attribute__((weak, alias("__vdso_gettimeofday")));
19452diff -urNp linux-2.6.32.12/arch/x86/vdso/vdso32-setup.c linux-2.6.32.12/arch/x86/vdso/vdso32-setup.c 19581diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c
19453--- linux-2.6.32.12/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400 19582--- linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400
19454+++ linux-2.6.32.12/arch/x86/vdso/vdso32-setup.c 2010-04-04 20:46:41.541133870 -0400 19583+++ linux-2.6.32.13/arch/x86/vdso/vdso32-setup.c 2010-05-15 13:21:14.274578804 -0400
19455@@ -25,6 +25,7 @@ 19584@@ -25,6 +25,7 @@
19456 #include <asm/tlbflush.h> 19585 #include <asm/tlbflush.h>
19457 #include <asm/vdso.h> 19586 #include <asm/vdso.h>
@@ -19552,9 +19681,9 @@ diff -urNp linux-2.6.32.12/arch/x86/vdso/vdso32-setup.c linux-2.6.32.12/arch/x86
19552 return &gate_vma; 19681 return &gate_vma;
19553 return NULL; 19682 return NULL;
19554 } 19683 }
19555diff -urNp linux-2.6.32.12/arch/x86/vdso/vdso.lds.S linux-2.6.32.12/arch/x86/vdso/vdso.lds.S 19684diff -urNp linux-2.6.32.13/arch/x86/vdso/vdso.lds.S linux-2.6.32.13/arch/x86/vdso/vdso.lds.S
19556--- linux-2.6.32.12/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400 19685--- linux-2.6.32.13/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400
19557+++ linux-2.6.32.12/arch/x86/vdso/vdso.lds.S 2010-04-04 20:46:41.541133870 -0400 19686+++ linux-2.6.32.13/arch/x86/vdso/vdso.lds.S 2010-05-15 13:21:14.274578804 -0400
19558@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; 19687@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
19559 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; 19688 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
19560 #include "vextern.h" 19689 #include "vextern.h"
@@ -19565,9 +19694,9 @@ diff -urNp linux-2.6.32.12/arch/x86/vdso/vdso.lds.S linux-2.6.32.12/arch/x86/vds
19565+VEXTERN(fallback_time) 19694+VEXTERN(fallback_time)
19566+VEXTERN(getcpu) 19695+VEXTERN(getcpu)
19567+#undef VEXTERN 19696+#undef VEXTERN
19568diff -urNp linux-2.6.32.12/arch/x86/vdso/vextern.h linux-2.6.32.12/arch/x86/vdso/vextern.h 19697diff -urNp linux-2.6.32.13/arch/x86/vdso/vextern.h linux-2.6.32.13/arch/x86/vdso/vextern.h
19569--- linux-2.6.32.12/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400 19698--- linux-2.6.32.13/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400
19570+++ linux-2.6.32.12/arch/x86/vdso/vextern.h 2010-04-04 20:46:41.541133870 -0400 19699+++ linux-2.6.32.13/arch/x86/vdso/vextern.h 2010-05-15 13:21:14.274578804 -0400
19571@@ -11,6 +11,5 @@ 19700@@ -11,6 +11,5 @@
19572 put into vextern.h and be referenced as a pointer with vdso prefix. 19701 put into vextern.h and be referenced as a pointer with vdso prefix.
19573 The main kernel later fills in the values. */ 19702 The main kernel later fills in the values. */
@@ -19575,9 +19704,9 @@ diff -urNp linux-2.6.32.12/arch/x86/vdso/vextern.h linux-2.6.32.12/arch/x86/vdso
19575-VEXTERN(jiffies) 19704-VEXTERN(jiffies)
19576 VEXTERN(vgetcpu_mode) 19705 VEXTERN(vgetcpu_mode)
19577 VEXTERN(vsyscall_gtod_data) 19706 VEXTERN(vsyscall_gtod_data)
19578diff -urNp linux-2.6.32.12/arch/x86/vdso/vma.c linux-2.6.32.12/arch/x86/vdso/vma.c 19707diff -urNp linux-2.6.32.13/arch/x86/vdso/vma.c linux-2.6.32.13/arch/x86/vdso/vma.c
19579--- linux-2.6.32.12/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400 19708--- linux-2.6.32.13/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400
19580+++ linux-2.6.32.12/arch/x86/vdso/vma.c 2010-04-04 20:46:41.541133870 -0400 19709+++ linux-2.6.32.13/arch/x86/vdso/vma.c 2010-05-15 13:21:14.274578804 -0400
19581@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) 19710@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
19582 if (!vbase) 19711 if (!vbase)
19583 goto oom; 19712 goto oom;
@@ -19624,9 +19753,9 @@ diff -urNp linux-2.6.32.12/arch/x86/vdso/vma.c linux-2.6.32.12/arch/x86/vdso/vma
19624- return 0; 19753- return 0;
19625-} 19754-}
19626-__setup("vdso=", vdso_setup); 19755-__setup("vdso=", vdso_setup);
19627diff -urNp linux-2.6.32.12/arch/x86/xen/enlighten.c linux-2.6.32.12/arch/x86/xen/enlighten.c 19756diff -urNp linux-2.6.32.13/arch/x86/xen/enlighten.c linux-2.6.32.13/arch/x86/xen/enlighten.c
19628--- linux-2.6.32.12/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400 19757--- linux-2.6.32.13/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400
19629+++ linux-2.6.32.12/arch/x86/xen/enlighten.c 2010-04-04 20:46:41.541133870 -0400 19758+++ linux-2.6.32.13/arch/x86/xen/enlighten.c 2010-05-15 13:23:38.934774262 -0400
19630@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); 19759@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
19631 19760
19632 struct shared_info xen_dummy_shared_info; 19761 struct shared_info xen_dummy_shared_info;
@@ -19645,7 +19774,24 @@ diff -urNp linux-2.6.32.12/arch/x86/xen/enlighten.c linux-2.6.32.12/arch/x86/xen
19645 end = start + __get_cpu_var(idt_desc).size + 1; 19774 end = start + __get_cpu_var(idt_desc).size + 1;
19646 19775
19647 xen_mc_flush(); 19776 xen_mc_flush();
19648@@ -1133,13 +1131,6 @@ asmlinkage void __init xen_start_kernel( 19777@@ -1102,6 +1100,16 @@ asmlinkage void __init xen_start_kernel(
19778 #ifdef CONFIG_X86_64
19779 /* Work out if we support NX */
19780 check_efer();
19781+#elif defined(CONFIG_X86_PAE)
19782+ if (cpu_has_nx) {
19783+ unsigned l, h;
19784+
19785+ nx_enabled = 1;
19786+ __supported_pte_mask |= _PAGE_NX;
19787+ rdmsr(MSR_EFER, l, h);
19788+ l |= EFER_NX;
19789+ wrmsr(MSR_EFER, l, h);
19790+ }
19791 #endif
19792
19793 xen_setup_features();
19794@@ -1133,13 +1141,6 @@ asmlinkage void __init xen_start_kernel(
19649 19795
19650 machine_ops = xen_machine_ops; 19796 machine_ops = xen_machine_ops;
19651 19797
@@ -19659,9 +19805,9 @@ diff -urNp linux-2.6.32.12/arch/x86/xen/enlighten.c linux-2.6.32.12/arch/x86/xen
19659 xen_smp_init(); 19805 xen_smp_init();
19660 19806
19661 pgd = (pgd_t *)xen_start_info->pt_base; 19807 pgd = (pgd_t *)xen_start_info->pt_base;
19662diff -urNp linux-2.6.32.12/arch/x86/xen/mmu.c linux-2.6.32.12/arch/x86/xen/mmu.c 19808diff -urNp linux-2.6.32.13/arch/x86/xen/mmu.c linux-2.6.32.13/arch/x86/xen/mmu.c
19663--- linux-2.6.32.12/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400 19809--- linux-2.6.32.13/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400
19664+++ linux-2.6.32.12/arch/x86/xen/mmu.c 2010-04-04 20:46:41.541133870 -0400 19810+++ linux-2.6.32.13/arch/x86/xen/mmu.c 2010-05-15 13:21:14.282910849 -0400
19665@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable 19811@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
19666 convert_pfn_mfn(init_level4_pgt); 19812 convert_pfn_mfn(init_level4_pgt);
19667 convert_pfn_mfn(level3_ident_pgt); 19813 convert_pfn_mfn(level3_ident_pgt);
@@ -19682,9 +19828,9 @@ diff -urNp linux-2.6.32.12/arch/x86/xen/mmu.c linux-2.6.32.12/arch/x86/xen/mmu.c
19682 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); 19828 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
19683 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); 19829 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
19684 19830
19685diff -urNp linux-2.6.32.12/arch/x86/xen/smp.c linux-2.6.32.12/arch/x86/xen/smp.c 19831diff -urNp linux-2.6.32.13/arch/x86/xen/smp.c linux-2.6.32.13/arch/x86/xen/smp.c
19686--- linux-2.6.32.12/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400 19832--- linux-2.6.32.13/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400
19687+++ linux-2.6.32.12/arch/x86/xen/smp.c 2010-04-04 20:46:41.541133870 -0400 19833+++ linux-2.6.32.13/arch/x86/xen/smp.c 2010-05-15 13:21:14.282910849 -0400
19688@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ 19834@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
19689 { 19835 {
19690 BUG_ON(smp_processor_id() != 0); 19836 BUG_ON(smp_processor_id() != 0);
@@ -19708,9 +19854,30 @@ diff -urNp linux-2.6.32.12/arch/x86/xen/smp.c linux-2.6.32.12/arch/x86/xen/smp.c
19708 ctxt->user_regs.ss = __KERNEL_DS; 19854 ctxt->user_regs.ss = __KERNEL_DS;
19709 #ifdef CONFIG_X86_32 19855 #ifdef CONFIG_X86_32
19710 ctxt->user_regs.fs = __KERNEL_PERCPU; 19856 ctxt->user_regs.fs = __KERNEL_PERCPU;
19711diff -urNp linux-2.6.32.12/arch/x86/xen/xen-ops.h linux-2.6.32.12/arch/x86/xen/xen-ops.h 19857diff -urNp linux-2.6.32.13/arch/x86/xen/xen-head.S linux-2.6.32.13/arch/x86/xen/xen-head.S
19712--- linux-2.6.32.12/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400 19858--- linux-2.6.32.13/arch/x86/xen/xen-head.S 2010-03-15 11:52:04.000000000 -0400
19713+++ linux-2.6.32.12/arch/x86/xen/xen-ops.h 2010-04-04 20:46:41.541133870 -0400 19859+++ linux-2.6.32.13/arch/x86/xen/xen-head.S 2010-05-15 13:21:14.282910849 -0400
19860@@ -19,6 +19,17 @@ ENTRY(startup_xen)
19861 #ifdef CONFIG_X86_32
19862 mov %esi,xen_start_info
19863 mov $init_thread_union+THREAD_SIZE,%esp
19864+#ifdef CONFIG_SMP
19865+ movl $cpu_gdt_table,%edi
19866+ movl $__per_cpu_load,%eax
19867+ movw %ax,__KERNEL_PERCPU + 2(%edi)
19868+ rorl $16,%eax
19869+ movb %al,__KERNEL_PERCPU + 4(%edi)
19870+ movb %ah,__KERNEL_PERCPU + 7(%edi)
19871+ movl $__per_cpu_end - 1,%eax
19872+ subl $__per_cpu_start,%eax
19873+ movw %ax,__KERNEL_PERCPU + 0(%edi)
19874+#endif
19875 #else
19876 mov %rsi,xen_start_info
19877 mov $init_thread_union+THREAD_SIZE,%rsp
19878diff -urNp linux-2.6.32.13/arch/x86/xen/xen-ops.h linux-2.6.32.13/arch/x86/xen/xen-ops.h
19879--- linux-2.6.32.13/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400
19880+++ linux-2.6.32.13/arch/x86/xen/xen-ops.h 2010-05-15 13:21:14.282910849 -0400
19714@@ -10,8 +10,6 @@ 19881@@ -10,8 +10,6 @@
19715 extern const char xen_hypervisor_callback[]; 19882 extern const char xen_hypervisor_callback[];
19716 extern const char xen_failsafe_callback[]; 19883 extern const char xen_failsafe_callback[];
@@ -19720,9 +19887,9 @@ diff -urNp linux-2.6.32.12/arch/x86/xen/xen-ops.h linux-2.6.32.12/arch/x86/xen/x
19720 struct trap_info; 19887 struct trap_info;
19721 void xen_copy_trap_info(struct trap_info *traps); 19888 void xen_copy_trap_info(struct trap_info *traps);
19722 19889
19723diff -urNp linux-2.6.32.12/block/blk-integrity.c linux-2.6.32.12/block/blk-integrity.c 19890diff -urNp linux-2.6.32.13/block/blk-integrity.c linux-2.6.32.13/block/blk-integrity.c
19724--- linux-2.6.32.12/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400 19891--- linux-2.6.32.13/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400
19725+++ linux-2.6.32.12/block/blk-integrity.c 2010-04-04 20:46:41.541133870 -0400 19892+++ linux-2.6.32.13/block/blk-integrity.c 2010-05-15 13:21:14.282910849 -0400
19726@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs 19893@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
19727 NULL, 19894 NULL,
19728 }; 19895 };
@@ -19732,9 +19899,9 @@ diff -urNp linux-2.6.32.12/block/blk-integrity.c linux-2.6.32.12/block/blk-integ
19732 .show = &integrity_attr_show, 19899 .show = &integrity_attr_show,
19733 .store = &integrity_attr_store, 19900 .store = &integrity_attr_store,
19734 }; 19901 };
19735diff -urNp linux-2.6.32.12/block/blk-iopoll.c linux-2.6.32.12/block/blk-iopoll.c 19902diff -urNp linux-2.6.32.13/block/blk-iopoll.c linux-2.6.32.13/block/blk-iopoll.c
19736--- linux-2.6.32.12/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400 19903--- linux-2.6.32.13/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400
19737+++ linux-2.6.32.12/block/blk-iopoll.c 2010-04-04 20:46:41.541133870 -0400 19904+++ linux-2.6.32.13/block/blk-iopoll.c 2010-05-15 13:21:14.282910849 -0400
19738@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo 19905@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
19739 } 19906 }
19740 EXPORT_SYMBOL(blk_iopoll_complete); 19907 EXPORT_SYMBOL(blk_iopoll_complete);
@@ -19744,9 +19911,9 @@ diff -urNp linux-2.6.32.12/block/blk-iopoll.c linux-2.6.32.12/block/blk-iopoll.c
19744 { 19911 {
19745 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); 19912 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
19746 int rearm = 0, budget = blk_iopoll_budget; 19913 int rearm = 0, budget = blk_iopoll_budget;
19747diff -urNp linux-2.6.32.12/block/blk-map.c linux-2.6.32.12/block/blk-map.c 19914diff -urNp linux-2.6.32.13/block/blk-map.c linux-2.6.32.13/block/blk-map.c
19748--- linux-2.6.32.12/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400 19915--- linux-2.6.32.13/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400
19749+++ linux-2.6.32.12/block/blk-map.c 2010-04-04 20:46:41.541133870 -0400 19916+++ linux-2.6.32.13/block/blk-map.c 2010-05-15 13:21:14.282910849 -0400
19750@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ 19917@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
19751 * direct dma. else, set up kernel bounce buffers 19918 * direct dma. else, set up kernel bounce buffers
19752 */ 19919 */
@@ -19765,9 +19932,9 @@ diff -urNp linux-2.6.32.12/block/blk-map.c linux-2.6.32.12/block/blk-map.c
19765 if (do_copy) 19932 if (do_copy)
19766 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); 19933 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
19767 else 19934 else
19768diff -urNp linux-2.6.32.12/block/blk-softirq.c linux-2.6.32.12/block/blk-softirq.c 19935diff -urNp linux-2.6.32.13/block/blk-softirq.c linux-2.6.32.13/block/blk-softirq.c
19769--- linux-2.6.32.12/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400 19936--- linux-2.6.32.13/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400
19770+++ linux-2.6.32.12/block/blk-softirq.c 2010-04-04 20:46:41.541133870 -0400 19937+++ linux-2.6.32.13/block/blk-softirq.c 2010-05-15 13:21:14.282910849 -0400
19771@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 19938@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
19772 * Softirq action handler - move entries to local list and loop over them 19939 * Softirq action handler - move entries to local list and loop over them
19773 * while passing them to the queue registered handler. 19940 * while passing them to the queue registered handler.
@@ -19777,9 +19944,9 @@ diff -urNp linux-2.6.32.12/block/blk-softirq.c linux-2.6.32.12/block/blk-softirq
19777 { 19944 {
19778 struct list_head *cpu_list, local_list; 19945 struct list_head *cpu_list, local_list;
19779 19946
19780diff -urNp linux-2.6.32.12/block/blk-sysfs.c linux-2.6.32.12/block/blk-sysfs.c 19947diff -urNp linux-2.6.32.13/block/blk-sysfs.c linux-2.6.32.13/block/blk-sysfs.c
19781--- linux-2.6.32.12/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400 19948--- linux-2.6.32.13/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400
19782+++ linux-2.6.32.12/block/blk-sysfs.c 2010-04-04 20:46:41.541133870 -0400 19949+++ linux-2.6.32.13/block/blk-sysfs.c 2010-05-15 13:21:14.282910849 -0400
19783@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob 19950@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
19784 kmem_cache_free(blk_requestq_cachep, q); 19951 kmem_cache_free(blk_requestq_cachep, q);
19785 } 19952 }
@@ -19789,9 +19956,9 @@ diff -urNp linux-2.6.32.12/block/blk-sysfs.c linux-2.6.32.12/block/blk-sysfs.c
19789 .show = queue_attr_show, 19956 .show = queue_attr_show,
19790 .store = queue_attr_store, 19957 .store = queue_attr_store,
19791 }; 19958 };
19792diff -urNp linux-2.6.32.12/block/elevator.c linux-2.6.32.12/block/elevator.c 19959diff -urNp linux-2.6.32.13/block/elevator.c linux-2.6.32.13/block/elevator.c
19793--- linux-2.6.32.12/block/elevator.c 2010-03-15 11:52:04.000000000 -0400 19960--- linux-2.6.32.13/block/elevator.c 2010-03-15 11:52:04.000000000 -0400
19794+++ linux-2.6.32.12/block/elevator.c 2010-04-04 20:46:41.541133870 -0400 19961+++ linux-2.6.32.13/block/elevator.c 2010-05-15 13:21:14.282910849 -0400
19795@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str 19962@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
19796 return error; 19963 return error;
19797 } 19964 }
@@ -19801,9 +19968,9 @@ diff -urNp linux-2.6.32.12/block/elevator.c linux-2.6.32.12/block/elevator.c
19801 .show = elv_attr_show, 19968 .show = elv_attr_show,
19802 .store = elv_attr_store, 19969 .store = elv_attr_store,
19803 }; 19970 };
19804diff -urNp linux-2.6.32.12/crypto/lrw.c linux-2.6.32.12/crypto/lrw.c 19971diff -urNp linux-2.6.32.13/crypto/lrw.c linux-2.6.32.13/crypto/lrw.c
19805--- linux-2.6.32.12/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400 19972--- linux-2.6.32.13/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400
19806+++ linux-2.6.32.12/crypto/lrw.c 2010-04-04 20:46:41.541133870 -0400 19973+++ linux-2.6.32.13/crypto/lrw.c 2010-05-15 13:21:14.282910849 -0400
19807@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par 19974@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
19808 struct priv *ctx = crypto_tfm_ctx(parent); 19975 struct priv *ctx = crypto_tfm_ctx(parent);
19809 struct crypto_cipher *child = ctx->child; 19976 struct crypto_cipher *child = ctx->child;
@@ -19813,9 +19980,9 @@ diff -urNp linux-2.6.32.12/crypto/lrw.c linux-2.6.32.12/crypto/lrw.c
19813 int bsize = crypto_cipher_blocksize(child); 19980 int bsize = crypto_cipher_blocksize(child);
19814 19981
19815 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); 19982 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
19816diff -urNp linux-2.6.32.12/Documentation/dontdiff linux-2.6.32.12/Documentation/dontdiff 19983diff -urNp linux-2.6.32.13/Documentation/dontdiff linux-2.6.32.13/Documentation/dontdiff
19817--- linux-2.6.32.12/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400 19984--- linux-2.6.32.13/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400
19818+++ linux-2.6.32.12/Documentation/dontdiff 2010-04-04 20:47:28.952733264 -0400 19985+++ linux-2.6.32.13/Documentation/dontdiff 2010-05-15 13:21:14.282910849 -0400
19819@@ -3,6 +3,7 @@ 19986@@ -3,6 +3,7 @@
19820 *.bin 19987 *.bin
19821 *.cpio 19988 *.cpio
@@ -19923,10 +20090,10 @@ diff -urNp linux-2.6.32.12/Documentation/dontdiff linux-2.6.32.12/Documentation/
19923 zImage* 20090 zImage*
19924 zconf.hash.c 20091 zconf.hash.c
19925+zoffset.h 20092+zoffset.h
19926diff -urNp linux-2.6.32.12/Documentation/kernel-parameters.txt linux-2.6.32.12/Documentation/kernel-parameters.txt 20093diff -urNp linux-2.6.32.13/Documentation/kernel-parameters.txt linux-2.6.32.13/Documentation/kernel-parameters.txt
19927--- linux-2.6.32.12/Documentation/kernel-parameters.txt 2010-03-15 11:52:04.000000000 -0400 20094--- linux-2.6.32.13/Documentation/kernel-parameters.txt 2010-05-15 13:20:18.374565913 -0400
19928+++ linux-2.6.32.12/Documentation/kernel-parameters.txt 2010-04-04 20:46:41.541133870 -0400 20095+++ linux-2.6.32.13/Documentation/kernel-parameters.txt 2010-05-15 13:21:14.282910849 -0400
19929@@ -1833,6 +1833,12 @@ and is between 256 and 4096 characters. 20096@@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters.
19930 the specified number of seconds. This is to be used if 20097 the specified number of seconds. This is to be used if
19931 your oopses keep scrolling off the screen. 20098 your oopses keep scrolling off the screen.
19932 20099
@@ -19939,9 +20106,9 @@ diff -urNp linux-2.6.32.12/Documentation/kernel-parameters.txt linux-2.6.32.12/D
19939 pcbit= [HW,ISDN] 20106 pcbit= [HW,ISDN]
19940 20107
19941 pcd. [PARIDE] 20108 pcd. [PARIDE]
19942diff -urNp linux-2.6.32.12/drivers/acpi/battery.c linux-2.6.32.12/drivers/acpi/battery.c 20109diff -urNp linux-2.6.32.13/drivers/acpi/battery.c linux-2.6.32.13/drivers/acpi/battery.c
19943--- linux-2.6.32.12/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400 20110--- linux-2.6.32.13/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400
19944+++ linux-2.6.32.12/drivers/acpi/battery.c 2010-04-04 20:46:41.541133870 -0400 20111+++ linux-2.6.32.13/drivers/acpi/battery.c 2010-05-15 13:21:14.282910849 -0400
19945@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); 20112@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
19946 } 20113 }
19947 20114
@@ -19951,9 +20118,9 @@ diff -urNp linux-2.6.32.12/drivers/acpi/battery.c linux-2.6.32.12/drivers/acpi/b
19951 mode_t mode; 20118 mode_t mode;
19952 const char *name; 20119 const char *name;
19953 } acpi_battery_file[] = { 20120 } acpi_battery_file[] = {
19954diff -urNp linux-2.6.32.12/drivers/acpi/blacklist.c linux-2.6.32.12/drivers/acpi/blacklist.c 20121diff -urNp linux-2.6.32.13/drivers/acpi/blacklist.c linux-2.6.32.13/drivers/acpi/blacklist.c
19955--- linux-2.6.32.12/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400 20122--- linux-2.6.32.13/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400
19956+++ linux-2.6.32.12/drivers/acpi/blacklist.c 2010-04-04 20:46:41.541133870 -0400 20123+++ linux-2.6.32.13/drivers/acpi/blacklist.c 2010-05-15 13:21:14.295422110 -0400
19957@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b 20124@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
19958 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, 20125 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
19959 "Incorrect _ADR", 1}, 20126 "Incorrect _ADR", 1},
@@ -19963,9 +20130,9 @@ diff -urNp linux-2.6.32.12/drivers/acpi/blacklist.c linux-2.6.32.12/drivers/acpi
19963 }; 20130 };
19964 20131
19965 #if CONFIG_ACPI_BLACKLIST_YEAR 20132 #if CONFIG_ACPI_BLACKLIST_YEAR
19966diff -urNp linux-2.6.32.12/drivers/acpi/dock.c linux-2.6.32.12/drivers/acpi/dock.c 20133diff -urNp linux-2.6.32.13/drivers/acpi/dock.c linux-2.6.32.13/drivers/acpi/dock.c
19967--- linux-2.6.32.12/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400 20134--- linux-2.6.32.13/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400
19968+++ linux-2.6.32.12/drivers/acpi/dock.c 2010-04-04 20:46:41.544756868 -0400 20135+++ linux-2.6.32.13/drivers/acpi/dock.c 2010-05-15 13:21:14.298962418 -0400
19969@@ -77,7 +77,7 @@ struct dock_dependent_device { 20136@@ -77,7 +77,7 @@ struct dock_dependent_device {
19970 struct list_head list; 20137 struct list_head list;
19971 struct list_head hotplug_list; 20138 struct list_head hotplug_list;
@@ -19984,9 +20151,9 @@ diff -urNp linux-2.6.32.12/drivers/acpi/dock.c linux-2.6.32.12/drivers/acpi/dock
19984 void *context) 20151 void *context)
19985 { 20152 {
19986 struct dock_dependent_device *dd; 20153 struct dock_dependent_device *dd;
19987diff -urNp linux-2.6.32.12/drivers/acpi/osl.c linux-2.6.32.12/drivers/acpi/osl.c 20154diff -urNp linux-2.6.32.13/drivers/acpi/osl.c linux-2.6.32.13/drivers/acpi/osl.c
19988--- linux-2.6.32.12/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400 20155--- linux-2.6.32.13/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400
19989+++ linux-2.6.32.12/drivers/acpi/osl.c 2010-04-04 20:46:41.544756868 -0400 20156+++ linux-2.6.32.13/drivers/acpi/osl.c 2010-05-15 13:21:14.298962418 -0400
19990@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres 20157@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
19991 void __iomem *virt_addr; 20158 void __iomem *virt_addr;
19992 20159
@@ -20005,9 +20172,9 @@ diff -urNp linux-2.6.32.12/drivers/acpi/osl.c linux-2.6.32.12/drivers/acpi/osl.c
20005 20172
20006 switch (width) { 20173 switch (width) {
20007 case 8: 20174 case 8:
20008diff -urNp linux-2.6.32.12/drivers/acpi/power_meter.c linux-2.6.32.12/drivers/acpi/power_meter.c 20175diff -urNp linux-2.6.32.13/drivers/acpi/power_meter.c linux-2.6.32.13/drivers/acpi/power_meter.c
20009--- linux-2.6.32.12/drivers/acpi/power_meter.c 2010-03-15 11:52:04.000000000 -0400 20176--- linux-2.6.32.13/drivers/acpi/power_meter.c 2010-05-15 13:20:18.454567530 -0400
20010+++ linux-2.6.32.12/drivers/acpi/power_meter.c 2010-04-29 17:46:37.081234462 -0400 20177+++ linux-2.6.32.13/drivers/acpi/power_meter.c 2010-05-15 13:21:14.298962418 -0400
20011@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d 20178@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
20012 return res; 20179 return res;
20013 20180
@@ -20017,9 +20184,9 @@ diff -urNp linux-2.6.32.12/drivers/acpi/power_meter.c linux-2.6.32.12/drivers/ac
20017 20184
20018 mutex_lock(&resource->lock); 20185 mutex_lock(&resource->lock);
20019 resource->trip[attr->index - 7] = temp; 20186 resource->trip[attr->index - 7] = temp;
20020diff -urNp linux-2.6.32.12/drivers/acpi/proc.c linux-2.6.32.12/drivers/acpi/proc.c 20187diff -urNp linux-2.6.32.13/drivers/acpi/proc.c linux-2.6.32.13/drivers/acpi/proc.c
20021--- linux-2.6.32.12/drivers/acpi/proc.c 2010-03-15 11:52:04.000000000 -0400 20188--- linux-2.6.32.13/drivers/acpi/proc.c 2010-03-15 11:52:04.000000000 -0400
20022+++ linux-2.6.32.12/drivers/acpi/proc.c 2010-04-29 17:46:37.081234462 -0400 20189+++ linux-2.6.32.13/drivers/acpi/proc.c 2010-05-15 13:21:14.307002164 -0400
20023@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f 20190@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
20024 size_t count, loff_t * ppos) 20191 size_t count, loff_t * ppos)
20025 { 20192 {
@@ -20055,9 +20222,9 @@ diff -urNp linux-2.6.32.12/drivers/acpi/proc.c linux-2.6.32.12/drivers/acpi/proc
20055 dev->wakeup.state.enabled = 20222 dev->wakeup.state.enabled =
20056 dev->wakeup.state.enabled ? 0 : 1; 20223 dev->wakeup.state.enabled ? 0 : 1;
20057 found_dev = dev; 20224 found_dev = dev;
20058diff -urNp linux-2.6.32.12/drivers/acpi/processor_core.c linux-2.6.32.12/drivers/acpi/processor_core.c 20225diff -urNp linux-2.6.32.13/drivers/acpi/processor_core.c linux-2.6.32.13/drivers/acpi/processor_core.c
20059--- linux-2.6.32.12/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400 20226--- linux-2.6.32.13/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400
20060+++ linux-2.6.32.12/drivers/acpi/processor_core.c 2010-04-04 20:46:41.544756868 -0400 20227+++ linux-2.6.32.13/drivers/acpi/processor_core.c 2010-05-15 13:21:14.307002164 -0400
20061@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( 20228@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add(
20062 return 0; 20229 return 0;
20063 } 20230 }
@@ -20067,9 +20234,9 @@ diff -urNp linux-2.6.32.12/drivers/acpi/processor_core.c linux-2.6.32.12/drivers
20067 20234
20068 /* 20235 /*
20069 * Buggy BIOS check 20236 * Buggy BIOS check
20070diff -urNp linux-2.6.32.12/drivers/acpi/processor_idle.c linux-2.6.32.12/drivers/acpi/processor_idle.c 20237diff -urNp linux-2.6.32.13/drivers/acpi/processor_idle.c linux-2.6.32.13/drivers/acpi/processor_idle.c
20071--- linux-2.6.32.12/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400 20238--- linux-2.6.32.13/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400
20072+++ linux-2.6.32.12/drivers/acpi/processor_idle.c 2010-04-04 20:46:41.544756868 -0400 20239+++ linux-2.6.32.13/drivers/acpi/processor_idle.c 2010-05-15 13:21:14.330926828 -0400
20073@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat 20240@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
20074 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), 20241 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
20075 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, 20242 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
@@ -20079,10 +20246,10 @@ diff -urNp linux-2.6.32.12/drivers/acpi/processor_idle.c linux-2.6.32.12/drivers
20079 }; 20246 };
20080 20247
20081 20248
20082diff -urNp linux-2.6.32.12/drivers/acpi/sleep.c linux-2.6.32.12/drivers/acpi/sleep.c 20249diff -urNp linux-2.6.32.13/drivers/acpi/sleep.c linux-2.6.32.13/drivers/acpi/sleep.c
20083--- linux-2.6.32.12/drivers/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400 20250--- linux-2.6.32.13/drivers/acpi/sleep.c 2010-05-15 13:20:18.454567530 -0400
20084+++ linux-2.6.32.12/drivers/acpi/sleep.c 2010-04-04 20:46:41.544756868 -0400 20251+++ linux-2.6.32.13/drivers/acpi/sleep.c 2010-05-15 13:21:14.330926828 -0400
20085@@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp 20252@@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp
20086 } 20253 }
20087 } 20254 }
20088 20255
@@ -20091,7 +20258,7 @@ diff -urNp linux-2.6.32.12/drivers/acpi/sleep.c linux-2.6.32.12/drivers/acpi/sle
20091 .valid = acpi_suspend_state_valid, 20258 .valid = acpi_suspend_state_valid,
20092 .begin = acpi_suspend_begin, 20259 .begin = acpi_suspend_begin,
20093 .prepare_late = acpi_pm_prepare, 20260 .prepare_late = acpi_pm_prepare,
20094@@ -325,7 +325,7 @@ static int acpi_suspend_begin_old(suspen 20261@@ -330,7 +330,7 @@ static int acpi_suspend_begin_old(suspen
20095 * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has 20262 * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
20096 * been requested. 20263 * been requested.
20097 */ 20264 */
@@ -20100,7 +20267,7 @@ diff -urNp linux-2.6.32.12/drivers/acpi/sleep.c linux-2.6.32.12/drivers/acpi/sle
20100 .valid = acpi_suspend_state_valid, 20267 .valid = acpi_suspend_state_valid,
20101 .begin = acpi_suspend_begin_old, 20268 .begin = acpi_suspend_begin_old,
20102 .prepare_late = acpi_pm_disable_gpes, 20269 .prepare_late = acpi_pm_disable_gpes,
20103@@ -552,7 +552,7 @@ static void acpi_pm_enable_gpes(void) 20270@@ -701,7 +701,7 @@ static void acpi_pm_enable_gpes(void)
20104 acpi_enable_all_runtime_gpes(); 20271 acpi_enable_all_runtime_gpes();
20105 } 20272 }
20106 20273
@@ -20109,7 +20276,7 @@ diff -urNp linux-2.6.32.12/drivers/acpi/sleep.c linux-2.6.32.12/drivers/acpi/sle
20109 .begin = acpi_hibernation_begin, 20276 .begin = acpi_hibernation_begin,
20110 .end = acpi_pm_end, 20277 .end = acpi_pm_end,
20111 .pre_snapshot = acpi_hibernation_pre_snapshot, 20278 .pre_snapshot = acpi_hibernation_pre_snapshot,
20112@@ -605,7 +605,7 @@ static int acpi_hibernation_pre_snapshot 20279@@ -754,7 +754,7 @@ static int acpi_hibernation_pre_snapshot
20113 * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has 20280 * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
20114 * been requested. 20281 * been requested.
20115 */ 20282 */
@@ -20118,9 +20285,9 @@ diff -urNp linux-2.6.32.12/drivers/acpi/sleep.c linux-2.6.32.12/drivers/acpi/sle
20118 .begin = acpi_hibernation_begin_old, 20285 .begin = acpi_hibernation_begin_old,
20119 .end = acpi_pm_end, 20286 .end = acpi_pm_end,
20120 .pre_snapshot = acpi_hibernation_pre_snapshot_old, 20287 .pre_snapshot = acpi_hibernation_pre_snapshot_old,
20121diff -urNp linux-2.6.32.12/drivers/acpi/video.c linux-2.6.32.12/drivers/acpi/video.c 20288diff -urNp linux-2.6.32.13/drivers/acpi/video.c linux-2.6.32.13/drivers/acpi/video.c
20122--- linux-2.6.32.12/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400 20289--- linux-2.6.32.13/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400
20123+++ linux-2.6.32.12/drivers/acpi/video.c 2010-04-04 20:46:41.544756868 -0400 20290+++ linux-2.6.32.13/drivers/acpi/video.c 2010-05-15 13:21:14.330926828 -0400
20124@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str 20291@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
20125 vd->brightness->levels[request_level]); 20292 vd->brightness->levels[request_level]);
20126 } 20293 }
@@ -20130,9 +20297,9 @@ diff -urNp linux-2.6.32.12/drivers/acpi/video.c linux-2.6.32.12/drivers/acpi/vid
20130 .get_brightness = acpi_video_get_brightness, 20297 .get_brightness = acpi_video_get_brightness,
20131 .update_status = acpi_video_set_brightness, 20298 .update_status = acpi_video_set_brightness,
20132 }; 20299 };
20133diff -urNp linux-2.6.32.12/drivers/ata/ahci.c linux-2.6.32.12/drivers/ata/ahci.c 20300diff -urNp linux-2.6.32.13/drivers/ata/ahci.c linux-2.6.32.13/drivers/ata/ahci.c
20134--- linux-2.6.32.12/drivers/ata/ahci.c 2010-04-29 17:49:37.661448235 -0400 20301--- linux-2.6.32.13/drivers/ata/ahci.c 2010-04-29 17:49:37.661448235 -0400
20135+++ linux-2.6.32.12/drivers/ata/ahci.c 2010-04-29 17:49:58.057498948 -0400 20302+++ linux-2.6.32.13/drivers/ata/ahci.c 2010-05-15 13:21:14.374114367 -0400
20136@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh 20303@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
20137 .sdev_attrs = ahci_sdev_attrs, 20304 .sdev_attrs = ahci_sdev_attrs,
20138 }; 20305 };
@@ -20172,9 +20339,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/ahci.c linux-2.6.32.12/drivers/ata/ahci.c
20172 }; 20339 };
20173 20340
20174 20341
20175diff -urNp linux-2.6.32.12/drivers/ata/ata_generic.c linux-2.6.32.12/drivers/ata/ata_generic.c 20342diff -urNp linux-2.6.32.13/drivers/ata/ata_generic.c linux-2.6.32.13/drivers/ata/ata_generic.c
20176--- linux-2.6.32.12/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400 20343--- linux-2.6.32.13/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400
20177+++ linux-2.6.32.12/drivers/ata/ata_generic.c 2010-04-04 20:46:41.544756868 -0400 20344+++ linux-2.6.32.13/drivers/ata/ata_generic.c 2010-05-15 13:21:14.387424242 -0400
20178@@ -95,7 +95,7 @@ static struct scsi_host_template generic 20345@@ -95,7 +95,7 @@ static struct scsi_host_template generic
20179 ATA_BMDMA_SHT(DRV_NAME), 20346 ATA_BMDMA_SHT(DRV_NAME),
20180 }; 20347 };
@@ -20184,9 +20351,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/ata_generic.c linux-2.6.32.12/drivers/ata
20184 .inherits = &ata_bmdma_port_ops, 20351 .inherits = &ata_bmdma_port_ops,
20185 .cable_detect = ata_cable_unknown, 20352 .cable_detect = ata_cable_unknown,
20186 .set_mode = generic_set_mode, 20353 .set_mode = generic_set_mode,
20187diff -urNp linux-2.6.32.12/drivers/ata/ata_piix.c linux-2.6.32.12/drivers/ata/ata_piix.c 20354diff -urNp linux-2.6.32.13/drivers/ata/ata_piix.c linux-2.6.32.13/drivers/ata/ata_piix.c
20188--- linux-2.6.32.12/drivers/ata/ata_piix.c 2010-04-29 17:49:37.669446700 -0400 20355--- linux-2.6.32.13/drivers/ata/ata_piix.c 2010-04-29 17:49:37.669446700 -0400
20189+++ linux-2.6.32.12/drivers/ata/ata_piix.c 2010-04-29 18:01:47.141162449 -0400 20356+++ linux-2.6.32.13/drivers/ata/ata_piix.c 2010-05-15 13:21:14.387424242 -0400
20190@@ -299,7 +299,7 @@ static const struct pci_device_id piix_p 20357@@ -299,7 +299,7 @@ static const struct pci_device_id piix_p
20191 { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, 20358 { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
20192 /* SATA Controller IDE (CPT) */ 20359 /* SATA Controller IDE (CPT) */
@@ -20250,9 +20417,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/ata_piix.c linux-2.6.32.12/drivers/ata/at
20250 }; 20417 };
20251 static const char *oemstrs[] = { 20418 static const char *oemstrs[] = {
20252 "Tecra M3,", 20419 "Tecra M3,",
20253diff -urNp linux-2.6.32.12/drivers/ata/libata-acpi.c linux-2.6.32.12/drivers/ata/libata-acpi.c 20420diff -urNp linux-2.6.32.13/drivers/ata/libata-acpi.c linux-2.6.32.13/drivers/ata/libata-acpi.c
20254--- linux-2.6.32.12/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400 20421--- linux-2.6.32.13/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400
20255+++ linux-2.6.32.12/drivers/ata/libata-acpi.c 2010-04-04 20:46:41.544756868 -0400 20422+++ linux-2.6.32.13/drivers/ata/libata-acpi.c 2010-05-15 13:21:14.387424242 -0400
20256@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han 20423@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
20257 ata_acpi_uevent(dev->link->ap, dev, event); 20424 ata_acpi_uevent(dev->link->ap, dev, event);
20258 } 20425 }
@@ -20268,9 +20435,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/libata-acpi.c linux-2.6.32.12/drivers/ata
20268 .handler = ata_acpi_ap_notify_dock, 20435 .handler = ata_acpi_ap_notify_dock,
20269 .uevent = ata_acpi_ap_uevent, 20436 .uevent = ata_acpi_ap_uevent,
20270 }; 20437 };
20271diff -urNp linux-2.6.32.12/drivers/ata/libata-core.c linux-2.6.32.12/drivers/ata/libata-core.c 20438diff -urNp linux-2.6.32.13/drivers/ata/libata-core.c linux-2.6.32.13/drivers/ata/libata-core.c
20272--- linux-2.6.32.12/drivers/ata/libata-core.c 2010-04-29 17:49:37.689144697 -0400 20439--- linux-2.6.32.13/drivers/ata/libata-core.c 2010-04-29 17:49:37.689144697 -0400
20273+++ linux-2.6.32.12/drivers/ata/libata-core.c 2010-04-29 17:49:58.081481928 -0400 20440+++ linux-2.6.32.13/drivers/ata/libata-core.c 2010-05-15 13:21:14.390775531 -0400
20274@@ -896,7 +896,7 @@ static const struct ata_xfer_ent { 20441@@ -896,7 +896,7 @@ static const struct ata_xfer_ent {
20275 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, 20442 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
20276 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, 20443 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
@@ -20344,10 +20511,10 @@ diff -urNp linux-2.6.32.12/drivers/ata/libata-core.c linux-2.6.32.12/drivers/ata
20344 .qc_prep = ata_noop_qc_prep, 20511 .qc_prep = ata_noop_qc_prep,
20345 .qc_issue = ata_dummy_qc_issue, 20512 .qc_issue = ata_dummy_qc_issue,
20346 .error_handler = ata_dummy_error_handler, 20513 .error_handler = ata_dummy_error_handler,
20347diff -urNp linux-2.6.32.12/drivers/ata/libata-eh.c linux-2.6.32.12/drivers/ata/libata-eh.c 20514diff -urNp linux-2.6.32.13/drivers/ata/libata-eh.c linux-2.6.32.13/drivers/ata/libata-eh.c
20348--- linux-2.6.32.12/drivers/ata/libata-eh.c 2010-03-15 11:52:04.000000000 -0400 20515--- linux-2.6.32.13/drivers/ata/libata-eh.c 2010-05-15 13:20:18.462978524 -0400
20349+++ linux-2.6.32.12/drivers/ata/libata-eh.c 2010-04-04 20:46:41.544756868 -0400 20516+++ linux-2.6.32.13/drivers/ata/libata-eh.c 2010-05-15 13:21:14.390775531 -0400
20350@@ -3581,7 +3581,7 @@ void ata_do_eh(struct ata_port *ap, ata_ 20517@@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_
20351 */ 20518 */
20352 void ata_std_error_handler(struct ata_port *ap) 20519 void ata_std_error_handler(struct ata_port *ap)
20353 { 20520 {
@@ -20356,9 +20523,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/libata-eh.c linux-2.6.32.12/drivers/ata/l
20356 ata_reset_fn_t hardreset = ops->hardreset; 20523 ata_reset_fn_t hardreset = ops->hardreset;
20357 20524
20358 /* ignore built-in hardreset if SCR access is not available */ 20525 /* ignore built-in hardreset if SCR access is not available */
20359diff -urNp linux-2.6.32.12/drivers/ata/libata-pmp.c linux-2.6.32.12/drivers/ata/libata-pmp.c 20526diff -urNp linux-2.6.32.13/drivers/ata/libata-pmp.c linux-2.6.32.13/drivers/ata/libata-pmp.c
20360--- linux-2.6.32.12/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400 20527--- linux-2.6.32.13/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400
20361+++ linux-2.6.32.12/drivers/ata/libata-pmp.c 2010-04-04 20:46:41.544756868 -0400 20528+++ linux-2.6.32.13/drivers/ata/libata-pmp.c 2010-05-15 13:21:14.390775531 -0400
20362@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str 20529@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
20363 */ 20530 */
20364 static int sata_pmp_eh_recover(struct ata_port *ap) 20531 static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -20368,9 +20535,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/libata-pmp.c linux-2.6.32.12/drivers/ata/
20368 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; 20535 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
20369 struct ata_link *pmp_link = &ap->link; 20536 struct ata_link *pmp_link = &ap->link;
20370 struct ata_device *pmp_dev = pmp_link->device; 20537 struct ata_device *pmp_dev = pmp_link->device;
20371diff -urNp linux-2.6.32.12/drivers/ata/pata_acpi.c linux-2.6.32.12/drivers/ata/pata_acpi.c 20538diff -urNp linux-2.6.32.13/drivers/ata/pata_acpi.c linux-2.6.32.13/drivers/ata/pata_acpi.c
20372--- linux-2.6.32.12/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400 20539--- linux-2.6.32.13/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400
20373+++ linux-2.6.32.12/drivers/ata/pata_acpi.c 2010-04-04 20:46:41.549452547 -0400 20540+++ linux-2.6.32.13/drivers/ata/pata_acpi.c 2010-05-15 13:21:14.390775531 -0400
20374@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s 20541@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
20375 ATA_BMDMA_SHT(DRV_NAME), 20542 ATA_BMDMA_SHT(DRV_NAME),
20376 }; 20543 };
@@ -20380,9 +20547,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_acpi.c linux-2.6.32.12/drivers/ata/p
20380 .inherits = &ata_bmdma_port_ops, 20547 .inherits = &ata_bmdma_port_ops,
20381 .qc_issue = pacpi_qc_issue, 20548 .qc_issue = pacpi_qc_issue,
20382 .cable_detect = pacpi_cable_detect, 20549 .cable_detect = pacpi_cable_detect,
20383diff -urNp linux-2.6.32.12/drivers/ata/pata_ali.c linux-2.6.32.12/drivers/ata/pata_ali.c 20550diff -urNp linux-2.6.32.13/drivers/ata/pata_ali.c linux-2.6.32.13/drivers/ata/pata_ali.c
20384--- linux-2.6.32.12/drivers/ata/pata_ali.c 2010-04-29 17:49:37.689144697 -0400 20551--- linux-2.6.32.13/drivers/ata/pata_ali.c 2010-04-29 17:49:37.689144697 -0400
20385+++ linux-2.6.32.12/drivers/ata/pata_ali.c 2010-04-29 17:49:58.081481928 -0400 20552+++ linux-2.6.32.13/drivers/ata/pata_ali.c 2010-05-15 13:21:14.402931362 -0400
20386@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht 20553@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
20387 * Port operations for PIO only ALi 20554 * Port operations for PIO only ALi
20388 */ 20555 */
@@ -20428,9 +20595,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_ali.c linux-2.6.32.12/drivers/ata/pa
20428 .inherits = &ali_dma_base_ops, 20595 .inherits = &ali_dma_base_ops,
20429 .check_atapi_dma = ali_check_atapi_dma, 20596 .check_atapi_dma = ali_check_atapi_dma,
20430 .dev_config = ali_warn_atapi_dma, 20597 .dev_config = ali_warn_atapi_dma,
20431diff -urNp linux-2.6.32.12/drivers/ata/pata_amd.c linux-2.6.32.12/drivers/ata/pata_amd.c 20598diff -urNp linux-2.6.32.13/drivers/ata/pata_amd.c linux-2.6.32.13/drivers/ata/pata_amd.c
20432--- linux-2.6.32.12/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400 20599--- linux-2.6.32.13/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400
20433+++ linux-2.6.32.12/drivers/ata/pata_amd.c 2010-04-04 20:46:41.549452547 -0400 20600+++ linux-2.6.32.13/drivers/ata/pata_amd.c 2010-05-15 13:21:14.402931362 -0400
20434@@ -397,28 +397,28 @@ static const struct ata_port_operations 20601@@ -397,28 +397,28 @@ static const struct ata_port_operations
20435 .prereset = amd_pre_reset, 20602 .prereset = amd_pre_reset,
20436 }; 20603 };
@@ -20480,9 +20647,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_amd.c linux-2.6.32.12/drivers/ata/pa
20480 .inherits = &nv_base_port_ops, 20647 .inherits = &nv_base_port_ops,
20481 .set_piomode = nv133_set_piomode, 20648 .set_piomode = nv133_set_piomode,
20482 .set_dmamode = nv133_set_dmamode, 20649 .set_dmamode = nv133_set_dmamode,
20483diff -urNp linux-2.6.32.12/drivers/ata/pata_artop.c linux-2.6.32.12/drivers/ata/pata_artop.c 20650diff -urNp linux-2.6.32.13/drivers/ata/pata_artop.c linux-2.6.32.13/drivers/ata/pata_artop.c
20484--- linux-2.6.32.12/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400 20651--- linux-2.6.32.13/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400
20485+++ linux-2.6.32.12/drivers/ata/pata_artop.c 2010-04-04 20:46:41.549452547 -0400 20652+++ linux-2.6.32.13/drivers/ata/pata_artop.c 2010-05-15 13:21:14.402931362 -0400
20486@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s 20653@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
20487 ATA_BMDMA_SHT(DRV_NAME), 20654 ATA_BMDMA_SHT(DRV_NAME),
20488 }; 20655 };
@@ -20501,9 +20668,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_artop.c linux-2.6.32.12/drivers/ata/
20501 .inherits = &ata_bmdma_port_ops, 20668 .inherits = &ata_bmdma_port_ops,
20502 .cable_detect = artop6260_cable_detect, 20669 .cable_detect = artop6260_cable_detect,
20503 .set_piomode = artop6260_set_piomode, 20670 .set_piomode = artop6260_set_piomode,
20504diff -urNp linux-2.6.32.12/drivers/ata/pata_at32.c linux-2.6.32.12/drivers/ata/pata_at32.c 20671diff -urNp linux-2.6.32.13/drivers/ata/pata_at32.c linux-2.6.32.13/drivers/ata/pata_at32.c
20505--- linux-2.6.32.12/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400 20672--- linux-2.6.32.13/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400
20506+++ linux-2.6.32.12/drivers/ata/pata_at32.c 2010-04-04 20:46:41.549452547 -0400 20673+++ linux-2.6.32.13/drivers/ata/pata_at32.c 2010-05-15 13:21:14.402931362 -0400
20507@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh 20674@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
20508 ATA_PIO_SHT(DRV_NAME), 20675 ATA_PIO_SHT(DRV_NAME),
20509 }; 20676 };
@@ -20513,9 +20680,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_at32.c linux-2.6.32.12/drivers/ata/p
20513 .inherits = &ata_sff_port_ops, 20680 .inherits = &ata_sff_port_ops,
20514 .cable_detect = ata_cable_40wire, 20681 .cable_detect = ata_cable_40wire,
20515 .set_piomode = pata_at32_set_piomode, 20682 .set_piomode = pata_at32_set_piomode,
20516diff -urNp linux-2.6.32.12/drivers/ata/pata_at91.c linux-2.6.32.12/drivers/ata/pata_at91.c 20683diff -urNp linux-2.6.32.13/drivers/ata/pata_at91.c linux-2.6.32.13/drivers/ata/pata_at91.c
20517--- linux-2.6.32.12/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400 20684--- linux-2.6.32.13/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400
20518+++ linux-2.6.32.12/drivers/ata/pata_at91.c 2010-04-04 20:46:41.549452547 -0400 20685+++ linux-2.6.32.13/drivers/ata/pata_at91.c 2010-05-15 13:21:14.402931362 -0400
20519@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at 20686@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
20520 ATA_PIO_SHT(DRV_NAME), 20687 ATA_PIO_SHT(DRV_NAME),
20521 }; 20688 };
@@ -20525,9 +20692,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_at91.c linux-2.6.32.12/drivers/ata/p
20525 .inherits = &ata_sff_port_ops, 20692 .inherits = &ata_sff_port_ops,
20526 20693
20527 .sff_data_xfer = pata_at91_data_xfer_noirq, 20694 .sff_data_xfer = pata_at91_data_xfer_noirq,
20528diff -urNp linux-2.6.32.12/drivers/ata/pata_atiixp.c linux-2.6.32.12/drivers/ata/pata_atiixp.c 20695diff -urNp linux-2.6.32.13/drivers/ata/pata_atiixp.c linux-2.6.32.13/drivers/ata/pata_atiixp.c
20529--- linux-2.6.32.12/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400 20696--- linux-2.6.32.13/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400
20530+++ linux-2.6.32.12/drivers/ata/pata_atiixp.c 2010-04-04 20:46:41.549452547 -0400 20697+++ linux-2.6.32.13/drivers/ata/pata_atiixp.c 2010-05-15 13:21:14.444201793 -0400
20531@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ 20698@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
20532 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 20699 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
20533 }; 20700 };
@@ -20537,9 +20704,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_atiixp.c linux-2.6.32.12/drivers/ata
20537 .inherits = &ata_bmdma_port_ops, 20704 .inherits = &ata_bmdma_port_ops,
20538 20705
20539 .qc_prep = ata_sff_dumb_qc_prep, 20706 .qc_prep = ata_sff_dumb_qc_prep,
20540diff -urNp linux-2.6.32.12/drivers/ata/pata_atp867x.c linux-2.6.32.12/drivers/ata/pata_atp867x.c 20707diff -urNp linux-2.6.32.13/drivers/ata/pata_atp867x.c linux-2.6.32.13/drivers/ata/pata_atp867x.c
20541--- linux-2.6.32.12/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400 20708--- linux-2.6.32.13/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400
20542+++ linux-2.6.32.12/drivers/ata/pata_atp867x.c 2010-04-04 20:46:41.549452547 -0400 20709+++ linux-2.6.32.13/drivers/ata/pata_atp867x.c 2010-05-15 13:21:14.451300458 -0400
20543@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x 20710@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
20544 ATA_BMDMA_SHT(DRV_NAME), 20711 ATA_BMDMA_SHT(DRV_NAME),
20545 }; 20712 };
@@ -20549,9 +20716,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_atp867x.c linux-2.6.32.12/drivers/at
20549 .inherits = &ata_bmdma_port_ops, 20716 .inherits = &ata_bmdma_port_ops,
20550 .cable_detect = atp867x_cable_detect, 20717 .cable_detect = atp867x_cable_detect,
20551 .set_piomode = atp867x_set_piomode, 20718 .set_piomode = atp867x_set_piomode,
20552diff -urNp linux-2.6.32.12/drivers/ata/pata_bf54x.c linux-2.6.32.12/drivers/ata/pata_bf54x.c 20719diff -urNp linux-2.6.32.13/drivers/ata/pata_bf54x.c linux-2.6.32.13/drivers/ata/pata_bf54x.c
20553--- linux-2.6.32.12/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400 20720--- linux-2.6.32.13/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400
20554+++ linux-2.6.32.12/drivers/ata/pata_bf54x.c 2010-04-04 20:46:41.549452547 -0400 20721+++ linux-2.6.32.13/drivers/ata/pata_bf54x.c 2010-05-15 13:21:14.451300458 -0400
20555@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh 20722@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
20556 .dma_boundary = ATA_DMA_BOUNDARY, 20723 .dma_boundary = ATA_DMA_BOUNDARY,
20557 }; 20724 };
@@ -20561,9 +20728,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_bf54x.c linux-2.6.32.12/drivers/ata/
20561 .inherits = &ata_sff_port_ops, 20728 .inherits = &ata_sff_port_ops,
20562 20729
20563 .set_piomode = bfin_set_piomode, 20730 .set_piomode = bfin_set_piomode,
20564diff -urNp linux-2.6.32.12/drivers/ata/pata_cmd640.c linux-2.6.32.12/drivers/ata/pata_cmd640.c 20731diff -urNp linux-2.6.32.13/drivers/ata/pata_cmd640.c linux-2.6.32.13/drivers/ata/pata_cmd640.c
20565--- linux-2.6.32.12/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400 20732--- linux-2.6.32.13/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400
20566+++ linux-2.6.32.12/drivers/ata/pata_cmd640.c 2010-04-04 20:46:41.549452547 -0400 20733+++ linux-2.6.32.13/drivers/ata/pata_cmd640.c 2010-05-15 13:21:14.451300458 -0400
20567@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ 20734@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
20568 ATA_BMDMA_SHT(DRV_NAME), 20735 ATA_BMDMA_SHT(DRV_NAME),
20569 }; 20736 };
@@ -20573,9 +20740,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_cmd640.c linux-2.6.32.12/drivers/ata
20573 .inherits = &ata_bmdma_port_ops, 20740 .inherits = &ata_bmdma_port_ops,
20574 /* In theory xfer_noirq is not needed once we kill the prefetcher */ 20741 /* In theory xfer_noirq is not needed once we kill the prefetcher */
20575 .sff_data_xfer = ata_sff_data_xfer_noirq, 20742 .sff_data_xfer = ata_sff_data_xfer_noirq,
20576diff -urNp linux-2.6.32.12/drivers/ata/pata_cmd64x.c linux-2.6.32.12/drivers/ata/pata_cmd64x.c 20743diff -urNp linux-2.6.32.13/drivers/ata/pata_cmd64x.c linux-2.6.32.13/drivers/ata/pata_cmd64x.c
20577--- linux-2.6.32.12/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400 20744--- linux-2.6.32.13/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400
20578+++ linux-2.6.32.12/drivers/ata/pata_cmd64x.c 2010-04-04 20:46:41.549452547 -0400 20745+++ linux-2.6.32.13/drivers/ata/pata_cmd64x.c 2010-05-15 13:21:14.451300458 -0400
20579@@ -275,18 +275,18 @@ static const struct ata_port_operations 20746@@ -275,18 +275,18 @@ static const struct ata_port_operations
20580 .set_dmamode = cmd64x_set_dmamode, 20747 .set_dmamode = cmd64x_set_dmamode,
20581 }; 20748 };
@@ -20598,9 +20765,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_cmd64x.c linux-2.6.32.12/drivers/ata
20598 .inherits = &cmd64x_base_ops, 20765 .inherits = &cmd64x_base_ops,
20599 .bmdma_stop = cmd648_bmdma_stop, 20766 .bmdma_stop = cmd648_bmdma_stop,
20600 .cable_detect = cmd648_cable_detect, 20767 .cable_detect = cmd648_cable_detect,
20601diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5520.c linux-2.6.32.12/drivers/ata/pata_cs5520.c 20768diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5520.c linux-2.6.32.13/drivers/ata/pata_cs5520.c
20602--- linux-2.6.32.12/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400 20769--- linux-2.6.32.13/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400
20603+++ linux-2.6.32.12/drivers/ata/pata_cs5520.c 2010-04-04 20:46:41.549452547 -0400 20770+++ linux-2.6.32.13/drivers/ata/pata_cs5520.c 2010-05-15 13:21:14.475033843 -0400
20604@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ 20771@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
20605 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 20772 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
20606 }; 20773 };
@@ -20610,9 +20777,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5520.c linux-2.6.32.12/drivers/ata
20610 .inherits = &ata_bmdma_port_ops, 20777 .inherits = &ata_bmdma_port_ops,
20611 .qc_prep = ata_sff_dumb_qc_prep, 20778 .qc_prep = ata_sff_dumb_qc_prep,
20612 .cable_detect = ata_cable_40wire, 20779 .cable_detect = ata_cable_40wire,
20613diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5530.c linux-2.6.32.12/drivers/ata/pata_cs5530.c 20780diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5530.c linux-2.6.32.13/drivers/ata/pata_cs5530.c
20614--- linux-2.6.32.12/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400 20781--- linux-2.6.32.13/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400
20615+++ linux-2.6.32.12/drivers/ata/pata_cs5530.c 2010-04-04 20:46:41.549452547 -0400 20782+++ linux-2.6.32.13/drivers/ata/pata_cs5530.c 2010-05-15 13:21:14.487977689 -0400
20616@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ 20783@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
20617 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 20784 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
20618 }; 20785 };
@@ -20622,9 +20789,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5530.c linux-2.6.32.12/drivers/ata
20622 .inherits = &ata_bmdma_port_ops, 20789 .inherits = &ata_bmdma_port_ops,
20623 20790
20624 .qc_prep = ata_sff_dumb_qc_prep, 20791 .qc_prep = ata_sff_dumb_qc_prep,
20625diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5535.c linux-2.6.32.12/drivers/ata/pata_cs5535.c 20792diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5535.c linux-2.6.32.13/drivers/ata/pata_cs5535.c
20626--- linux-2.6.32.12/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400 20793--- linux-2.6.32.13/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400
20627+++ linux-2.6.32.12/drivers/ata/pata_cs5535.c 2010-04-04 20:46:41.549452547 -0400 20794+++ linux-2.6.32.13/drivers/ata/pata_cs5535.c 2010-05-15 13:21:14.487977689 -0400
20628@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ 20795@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
20629 ATA_BMDMA_SHT(DRV_NAME), 20796 ATA_BMDMA_SHT(DRV_NAME),
20630 }; 20797 };
@@ -20634,9 +20801,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5535.c linux-2.6.32.12/drivers/ata
20634 .inherits = &ata_bmdma_port_ops, 20801 .inherits = &ata_bmdma_port_ops,
20635 .cable_detect = cs5535_cable_detect, 20802 .cable_detect = cs5535_cable_detect,
20636 .set_piomode = cs5535_set_piomode, 20803 .set_piomode = cs5535_set_piomode,
20637diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5536.c linux-2.6.32.12/drivers/ata/pata_cs5536.c 20804diff -urNp linux-2.6.32.13/drivers/ata/pata_cs5536.c linux-2.6.32.13/drivers/ata/pata_cs5536.c
20638--- linux-2.6.32.12/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400 20805--- linux-2.6.32.13/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400
20639+++ linux-2.6.32.12/drivers/ata/pata_cs5536.c 2010-04-04 20:46:41.549452547 -0400 20806+++ linux-2.6.32.13/drivers/ata/pata_cs5536.c 2010-05-15 13:21:14.487977689 -0400
20640@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ 20807@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
20641 ATA_BMDMA_SHT(DRV_NAME), 20808 ATA_BMDMA_SHT(DRV_NAME),
20642 }; 20809 };
@@ -20646,9 +20813,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5536.c linux-2.6.32.12/drivers/ata
20646 .inherits = &ata_bmdma_port_ops, 20813 .inherits = &ata_bmdma_port_ops,
20647 .cable_detect = cs5536_cable_detect, 20814 .cable_detect = cs5536_cable_detect,
20648 .set_piomode = cs5536_set_piomode, 20815 .set_piomode = cs5536_set_piomode,
20649diff -urNp linux-2.6.32.12/drivers/ata/pata_cypress.c linux-2.6.32.12/drivers/ata/pata_cypress.c 20816diff -urNp linux-2.6.32.13/drivers/ata/pata_cypress.c linux-2.6.32.13/drivers/ata/pata_cypress.c
20650--- linux-2.6.32.12/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400 20817--- linux-2.6.32.13/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400
20651+++ linux-2.6.32.12/drivers/ata/pata_cypress.c 2010-04-04 20:46:41.549452547 -0400 20818+++ linux-2.6.32.13/drivers/ata/pata_cypress.c 2010-05-15 13:21:14.487977689 -0400
20652@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 20819@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
20653 ATA_BMDMA_SHT(DRV_NAME), 20820 ATA_BMDMA_SHT(DRV_NAME),
20654 }; 20821 };
@@ -20658,9 +20825,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_cypress.c linux-2.6.32.12/drivers/at
20658 .inherits = &ata_bmdma_port_ops, 20825 .inherits = &ata_bmdma_port_ops,
20659 .cable_detect = ata_cable_40wire, 20826 .cable_detect = ata_cable_40wire,
20660 .set_piomode = cy82c693_set_piomode, 20827 .set_piomode = cy82c693_set_piomode,
20661diff -urNp linux-2.6.32.12/drivers/ata/pata_efar.c linux-2.6.32.12/drivers/ata/pata_efar.c 20828diff -urNp linux-2.6.32.13/drivers/ata/pata_efar.c linux-2.6.32.13/drivers/ata/pata_efar.c
20662--- linux-2.6.32.12/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400 20829--- linux-2.6.32.13/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400
20663+++ linux-2.6.32.12/drivers/ata/pata_efar.c 2010-04-04 20:46:41.549452547 -0400 20830+++ linux-2.6.32.13/drivers/ata/pata_efar.c 2010-05-15 13:21:14.487977689 -0400
20664@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh 20831@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
20665 ATA_BMDMA_SHT(DRV_NAME), 20832 ATA_BMDMA_SHT(DRV_NAME),
20666 }; 20833 };
@@ -20670,9 +20837,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_efar.c linux-2.6.32.12/drivers/ata/p
20670 .inherits = &ata_bmdma_port_ops, 20837 .inherits = &ata_bmdma_port_ops,
20671 .cable_detect = efar_cable_detect, 20838 .cable_detect = efar_cable_detect,
20672 .set_piomode = efar_set_piomode, 20839 .set_piomode = efar_set_piomode,
20673diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt366.c linux-2.6.32.12/drivers/ata/pata_hpt366.c 20840diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt366.c linux-2.6.32.13/drivers/ata/pata_hpt366.c
20674--- linux-2.6.32.12/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400 20841--- linux-2.6.32.13/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400
20675+++ linux-2.6.32.12/drivers/ata/pata_hpt366.c 2010-04-04 20:46:41.549452547 -0400 20842+++ linux-2.6.32.13/drivers/ata/pata_hpt366.c 2010-05-15 13:21:14.487977689 -0400
20676@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ 20843@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
20677 * Configuration for HPT366/68 20844 * Configuration for HPT366/68
20678 */ 20845 */
@@ -20682,9 +20849,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt366.c linux-2.6.32.12/drivers/ata
20682 .inherits = &ata_bmdma_port_ops, 20849 .inherits = &ata_bmdma_port_ops,
20683 .cable_detect = hpt36x_cable_detect, 20850 .cable_detect = hpt36x_cable_detect,
20684 .mode_filter = hpt366_filter, 20851 .mode_filter = hpt366_filter,
20685diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt37x.c linux-2.6.32.12/drivers/ata/pata_hpt37x.c 20852diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt37x.c linux-2.6.32.13/drivers/ata/pata_hpt37x.c
20686--- linux-2.6.32.12/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400 20853--- linux-2.6.32.13/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400
20687+++ linux-2.6.32.12/drivers/ata/pata_hpt37x.c 2010-04-04 20:46:41.552552724 -0400 20854+++ linux-2.6.32.13/drivers/ata/pata_hpt37x.c 2010-05-15 13:21:14.490951596 -0400
20688@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ 20855@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
20689 * Configuration for HPT370 20856 * Configuration for HPT370
20690 */ 20857 */
@@ -20721,9 +20888,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt37x.c linux-2.6.32.12/drivers/ata
20721 .inherits = &hpt372_port_ops, 20888 .inherits = &hpt372_port_ops,
20722 .prereset = hpt374_fn1_pre_reset, 20889 .prereset = hpt374_fn1_pre_reset,
20723 }; 20890 };
20724diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt3x2n.c linux-2.6.32.12/drivers/ata/pata_hpt3x2n.c 20891diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c
20725--- linux-2.6.32.12/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400 20892--- linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400
20726+++ linux-2.6.32.12/drivers/ata/pata_hpt3x2n.c 2010-04-04 20:46:41.552552724 -0400 20893+++ linux-2.6.32.13/drivers/ata/pata_hpt3x2n.c 2010-05-15 13:21:14.498954899 -0400
20727@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n 20894@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
20728 * Configuration for HPT3x2n. 20895 * Configuration for HPT3x2n.
20729 */ 20896 */
@@ -20733,9 +20900,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt3x2n.c linux-2.6.32.12/drivers/at
20733 .inherits = &ata_bmdma_port_ops, 20900 .inherits = &ata_bmdma_port_ops,
20734 20901
20735 .bmdma_stop = hpt3x2n_bmdma_stop, 20902 .bmdma_stop = hpt3x2n_bmdma_stop,
20736diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt3x3.c linux-2.6.32.12/drivers/ata/pata_hpt3x3.c 20903diff -urNp linux-2.6.32.13/drivers/ata/pata_hpt3x3.c linux-2.6.32.13/drivers/ata/pata_hpt3x3.c
20737--- linux-2.6.32.12/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400 20904--- linux-2.6.32.13/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400
20738+++ linux-2.6.32.12/drivers/ata/pata_hpt3x3.c 2010-04-04 20:46:41.552552724 -0400 20905+++ linux-2.6.32.13/drivers/ata/pata_hpt3x3.c 2010-05-15 13:21:14.498954899 -0400
20739@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ 20906@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
20740 ATA_BMDMA_SHT(DRV_NAME), 20907 ATA_BMDMA_SHT(DRV_NAME),
20741 }; 20908 };
@@ -20745,9 +20912,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt3x3.c linux-2.6.32.12/drivers/ata
20745 .inherits = &ata_bmdma_port_ops, 20912 .inherits = &ata_bmdma_port_ops,
20746 .cable_detect = ata_cable_40wire, 20913 .cable_detect = ata_cable_40wire,
20747 .set_piomode = hpt3x3_set_piomode, 20914 .set_piomode = hpt3x3_set_piomode,
20748diff -urNp linux-2.6.32.12/drivers/ata/pata_icside.c linux-2.6.32.12/drivers/ata/pata_icside.c 20915diff -urNp linux-2.6.32.13/drivers/ata/pata_icside.c linux-2.6.32.13/drivers/ata/pata_icside.c
20749--- linux-2.6.32.12/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400 20916--- linux-2.6.32.13/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400
20750+++ linux-2.6.32.12/drivers/ata/pata_icside.c 2010-04-04 20:46:41.552552724 -0400 20917+++ linux-2.6.32.13/drivers/ata/pata_icside.c 2010-05-15 13:21:14.498954899 -0400
20751@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct 20918@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
20752 } 20919 }
20753 } 20920 }
@@ -20757,9 +20924,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_icside.c linux-2.6.32.12/drivers/ata
20757 .inherits = &ata_sff_port_ops, 20924 .inherits = &ata_sff_port_ops,
20758 /* no need to build any PRD tables for DMA */ 20925 /* no need to build any PRD tables for DMA */
20759 .qc_prep = ata_noop_qc_prep, 20926 .qc_prep = ata_noop_qc_prep,
20760diff -urNp linux-2.6.32.12/drivers/ata/pata_isapnp.c linux-2.6.32.12/drivers/ata/pata_isapnp.c 20927diff -urNp linux-2.6.32.13/drivers/ata/pata_isapnp.c linux-2.6.32.13/drivers/ata/pata_isapnp.c
20761--- linux-2.6.32.12/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400 20928--- linux-2.6.32.13/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400
20762+++ linux-2.6.32.12/drivers/ata/pata_isapnp.c 2010-04-04 20:46:41.552552724 -0400 20929+++ linux-2.6.32.13/drivers/ata/pata_isapnp.c 2010-05-15 13:21:14.498954899 -0400
20763@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ 20930@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
20764 ATA_PIO_SHT(DRV_NAME), 20931 ATA_PIO_SHT(DRV_NAME),
20765 }; 20932 };
@@ -20775,9 +20942,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_isapnp.c linux-2.6.32.12/drivers/ata
20775 .inherits = &ata_sff_port_ops, 20942 .inherits = &ata_sff_port_ops,
20776 .cable_detect = ata_cable_40wire, 20943 .cable_detect = ata_cable_40wire,
20777 /* No altstatus so we don't want to use the lost interrupt poll */ 20944 /* No altstatus so we don't want to use the lost interrupt poll */
20778diff -urNp linux-2.6.32.12/drivers/ata/pata_it8213.c linux-2.6.32.12/drivers/ata/pata_it8213.c 20945diff -urNp linux-2.6.32.13/drivers/ata/pata_it8213.c linux-2.6.32.13/drivers/ata/pata_it8213.c
20779--- linux-2.6.32.12/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400 20946--- linux-2.6.32.13/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400
20780+++ linux-2.6.32.12/drivers/ata/pata_it8213.c 2010-04-04 20:46:41.552552724 -0400 20947+++ linux-2.6.32.13/drivers/ata/pata_it8213.c 2010-05-15 13:21:14.498954899 -0400
20781@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ 20948@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
20782 }; 20949 };
20783 20950
@@ -20787,9 +20954,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_it8213.c linux-2.6.32.12/drivers/ata
20787 .inherits = &ata_bmdma_port_ops, 20954 .inherits = &ata_bmdma_port_ops,
20788 .cable_detect = it8213_cable_detect, 20955 .cable_detect = it8213_cable_detect,
20789 .set_piomode = it8213_set_piomode, 20956 .set_piomode = it8213_set_piomode,
20790diff -urNp linux-2.6.32.12/drivers/ata/pata_it821x.c linux-2.6.32.12/drivers/ata/pata_it821x.c 20957diff -urNp linux-2.6.32.13/drivers/ata/pata_it821x.c linux-2.6.32.13/drivers/ata/pata_it821x.c
20791--- linux-2.6.32.12/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400 20958--- linux-2.6.32.13/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400
20792+++ linux-2.6.32.12/drivers/ata/pata_it821x.c 2010-04-04 20:46:41.552552724 -0400 20959+++ linux-2.6.32.13/drivers/ata/pata_it821x.c 2010-05-15 13:21:14.498954899 -0400
20793@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ 20960@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
20794 ATA_BMDMA_SHT(DRV_NAME), 20961 ATA_BMDMA_SHT(DRV_NAME),
20795 }; 20962 };
@@ -20817,9 +20984,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_it821x.c linux-2.6.32.12/drivers/ata
20817 .inherits = &ata_bmdma_port_ops, 20984 .inherits = &ata_bmdma_port_ops,
20818 20985
20819 .check_atapi_dma= it821x_check_atapi_dma, 20986 .check_atapi_dma= it821x_check_atapi_dma,
20820diff -urNp linux-2.6.32.12/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.12/drivers/ata/pata_ixp4xx_cf.c 20987diff -urNp linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c
20821--- linux-2.6.32.12/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400 20988--- linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400
20822+++ linux-2.6.32.12/drivers/ata/pata_ixp4xx_cf.c 2010-04-04 20:46:41.552552724 -0400 20989+++ linux-2.6.32.13/drivers/ata/pata_ixp4xx_cf.c 2010-05-15 13:21:14.498954899 -0400
20823@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ 20990@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
20824 ATA_PIO_SHT(DRV_NAME), 20991 ATA_PIO_SHT(DRV_NAME),
20825 }; 20992 };
@@ -20829,9 +20996,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.12/drivers/
20829 .inherits = &ata_sff_port_ops, 20996 .inherits = &ata_sff_port_ops,
20830 .sff_data_xfer = ixp4xx_mmio_data_xfer, 20997 .sff_data_xfer = ixp4xx_mmio_data_xfer,
20831 .cable_detect = ata_cable_40wire, 20998 .cable_detect = ata_cable_40wire,
20832diff -urNp linux-2.6.32.12/drivers/ata/pata_jmicron.c linux-2.6.32.12/drivers/ata/pata_jmicron.c 20999diff -urNp linux-2.6.32.13/drivers/ata/pata_jmicron.c linux-2.6.32.13/drivers/ata/pata_jmicron.c
20833--- linux-2.6.32.12/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400 21000--- linux-2.6.32.13/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400
20834+++ linux-2.6.32.12/drivers/ata/pata_jmicron.c 2010-04-04 20:46:41.552552724 -0400 21001+++ linux-2.6.32.13/drivers/ata/pata_jmicron.c 2010-05-15 13:21:14.502920623 -0400
20835@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron 21002@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
20836 ATA_BMDMA_SHT(DRV_NAME), 21003 ATA_BMDMA_SHT(DRV_NAME),
20837 }; 21004 };
@@ -20841,9 +21008,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_jmicron.c linux-2.6.32.12/drivers/at
20841 .inherits = &ata_bmdma_port_ops, 21008 .inherits = &ata_bmdma_port_ops,
20842 .prereset = jmicron_pre_reset, 21009 .prereset = jmicron_pre_reset,
20843 }; 21010 };
20844diff -urNp linux-2.6.32.12/drivers/ata/pata_legacy.c linux-2.6.32.12/drivers/ata/pata_legacy.c 21011diff -urNp linux-2.6.32.13/drivers/ata/pata_legacy.c linux-2.6.32.13/drivers/ata/pata_legacy.c
20845--- linux-2.6.32.12/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400 21012--- linux-2.6.32.13/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400
20846+++ linux-2.6.32.12/drivers/ata/pata_legacy.c 2010-04-04 20:46:41.552552724 -0400 21013+++ linux-2.6.32.13/drivers/ata/pata_legacy.c 2010-05-15 13:21:14.502920623 -0400
20847@@ -106,7 +106,7 @@ struct legacy_probe { 21014@@ -106,7 +106,7 @@ struct legacy_probe {
20848 21015
20849 struct legacy_controller { 21016 struct legacy_controller {
@@ -20955,9 +21122,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_legacy.c linux-2.6.32.12/drivers/ata
20955 struct legacy_data *ld = &legacy_data[probe->slot]; 21122 struct legacy_data *ld = &legacy_data[probe->slot];
20956 struct ata_host *host = NULL; 21123 struct ata_host *host = NULL;
20957 struct ata_port *ap; 21124 struct ata_port *ap;
20958diff -urNp linux-2.6.32.12/drivers/ata/pata_marvell.c linux-2.6.32.12/drivers/ata/pata_marvell.c 21125diff -urNp linux-2.6.32.13/drivers/ata/pata_marvell.c linux-2.6.32.13/drivers/ata/pata_marvell.c
20959--- linux-2.6.32.12/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400 21126--- linux-2.6.32.13/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400
20960+++ linux-2.6.32.12/drivers/ata/pata_marvell.c 2010-04-04 20:46:41.552552724 -0400 21127+++ linux-2.6.32.13/drivers/ata/pata_marvell.c 2010-05-15 13:21:14.502920623 -0400
20961@@ -100,7 +100,7 @@ static struct scsi_host_template marvell 21128@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
20962 ATA_BMDMA_SHT(DRV_NAME), 21129 ATA_BMDMA_SHT(DRV_NAME),
20963 }; 21130 };
@@ -20967,9 +21134,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_marvell.c linux-2.6.32.12/drivers/at
20967 .inherits = &ata_bmdma_port_ops, 21134 .inherits = &ata_bmdma_port_ops,
20968 .cable_detect = marvell_cable_detect, 21135 .cable_detect = marvell_cable_detect,
20969 .prereset = marvell_pre_reset, 21136 .prereset = marvell_pre_reset,
20970diff -urNp linux-2.6.32.12/drivers/ata/pata_mpc52xx.c linux-2.6.32.12/drivers/ata/pata_mpc52xx.c 21137diff -urNp linux-2.6.32.13/drivers/ata/pata_mpc52xx.c linux-2.6.32.13/drivers/ata/pata_mpc52xx.c
20971--- linux-2.6.32.12/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400 21138--- linux-2.6.32.13/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400
20972+++ linux-2.6.32.12/drivers/ata/pata_mpc52xx.c 2010-04-04 20:46:41.552552724 -0400 21139+++ linux-2.6.32.13/drivers/ata/pata_mpc52xx.c 2010-05-15 13:21:14.515739682 -0400
20973@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx 21140@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
20974 ATA_PIO_SHT(DRV_NAME), 21141 ATA_PIO_SHT(DRV_NAME),
20975 }; 21142 };
@@ -20979,9 +21146,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_mpc52xx.c linux-2.6.32.12/drivers/at
20979 .inherits = &ata_sff_port_ops, 21146 .inherits = &ata_sff_port_ops,
20980 .sff_dev_select = mpc52xx_ata_dev_select, 21147 .sff_dev_select = mpc52xx_ata_dev_select,
20981 .set_piomode = mpc52xx_ata_set_piomode, 21148 .set_piomode = mpc52xx_ata_set_piomode,
20982diff -urNp linux-2.6.32.12/drivers/ata/pata_mpiix.c linux-2.6.32.12/drivers/ata/pata_mpiix.c 21149diff -urNp linux-2.6.32.13/drivers/ata/pata_mpiix.c linux-2.6.32.13/drivers/ata/pata_mpiix.c
20983--- linux-2.6.32.12/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400 21150--- linux-2.6.32.13/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400
20984+++ linux-2.6.32.12/drivers/ata/pata_mpiix.c 2010-04-04 20:46:41.552552724 -0400 21151+++ linux-2.6.32.13/drivers/ata/pata_mpiix.c 2010-05-15 13:21:14.515739682 -0400
20985@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s 21152@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
20986 ATA_PIO_SHT(DRV_NAME), 21153 ATA_PIO_SHT(DRV_NAME),
20987 }; 21154 };
@@ -20991,9 +21158,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_mpiix.c linux-2.6.32.12/drivers/ata/
20991 .inherits = &ata_sff_port_ops, 21158 .inherits = &ata_sff_port_ops,
20992 .qc_issue = mpiix_qc_issue, 21159 .qc_issue = mpiix_qc_issue,
20993 .cable_detect = ata_cable_40wire, 21160 .cable_detect = ata_cable_40wire,
20994diff -urNp linux-2.6.32.12/drivers/ata/pata_netcell.c linux-2.6.32.12/drivers/ata/pata_netcell.c 21161diff -urNp linux-2.6.32.13/drivers/ata/pata_netcell.c linux-2.6.32.13/drivers/ata/pata_netcell.c
20995--- linux-2.6.32.12/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400 21162--- linux-2.6.32.13/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400
20996+++ linux-2.6.32.12/drivers/ata/pata_netcell.c 2010-04-04 20:46:41.552552724 -0400 21163+++ linux-2.6.32.13/drivers/ata/pata_netcell.c 2010-05-15 13:21:14.515739682 -0400
20997@@ -34,7 +34,7 @@ static struct scsi_host_template netcell 21164@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
20998 ATA_BMDMA_SHT(DRV_NAME), 21165 ATA_BMDMA_SHT(DRV_NAME),
20999 }; 21166 };
@@ -21003,9 +21170,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_netcell.c linux-2.6.32.12/drivers/at
21003 .inherits = &ata_bmdma_port_ops, 21170 .inherits = &ata_bmdma_port_ops,
21004 .cable_detect = ata_cable_80wire, 21171 .cable_detect = ata_cable_80wire,
21005 .read_id = netcell_read_id, 21172 .read_id = netcell_read_id,
21006diff -urNp linux-2.6.32.12/drivers/ata/pata_ninja32.c linux-2.6.32.12/drivers/ata/pata_ninja32.c 21173diff -urNp linux-2.6.32.13/drivers/ata/pata_ninja32.c linux-2.6.32.13/drivers/ata/pata_ninja32.c
21007--- linux-2.6.32.12/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400 21174--- linux-2.6.32.13/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400
21008+++ linux-2.6.32.12/drivers/ata/pata_ninja32.c 2010-04-04 20:46:41.552552724 -0400 21175+++ linux-2.6.32.13/drivers/ata/pata_ninja32.c 2010-05-15 13:21:14.515739682 -0400
21009@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 21176@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
21010 ATA_BMDMA_SHT(DRV_NAME), 21177 ATA_BMDMA_SHT(DRV_NAME),
21011 }; 21178 };
@@ -21015,9 +21182,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_ninja32.c linux-2.6.32.12/drivers/at
21015 .inherits = &ata_bmdma_port_ops, 21182 .inherits = &ata_bmdma_port_ops,
21016 .sff_dev_select = ninja32_dev_select, 21183 .sff_dev_select = ninja32_dev_select,
21017 .cable_detect = ata_cable_40wire, 21184 .cable_detect = ata_cable_40wire,
21018diff -urNp linux-2.6.32.12/drivers/ata/pata_ns87410.c linux-2.6.32.12/drivers/ata/pata_ns87410.c 21185diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87410.c linux-2.6.32.13/drivers/ata/pata_ns87410.c
21019--- linux-2.6.32.12/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400 21186--- linux-2.6.32.13/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400
21020+++ linux-2.6.32.12/drivers/ata/pata_ns87410.c 2010-04-04 20:46:41.552552724 -0400 21187+++ linux-2.6.32.13/drivers/ata/pata_ns87410.c 2010-05-15 13:21:14.515739682 -0400
21021@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 21188@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
21022 ATA_PIO_SHT(DRV_NAME), 21189 ATA_PIO_SHT(DRV_NAME),
21023 }; 21190 };
@@ -21027,9 +21194,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_ns87410.c linux-2.6.32.12/drivers/at
21027 .inherits = &ata_sff_port_ops, 21194 .inherits = &ata_sff_port_ops,
21028 .qc_issue = ns87410_qc_issue, 21195 .qc_issue = ns87410_qc_issue,
21029 .cable_detect = ata_cable_40wire, 21196 .cable_detect = ata_cable_40wire,
21030diff -urNp linux-2.6.32.12/drivers/ata/pata_ns87415.c linux-2.6.32.12/drivers/ata/pata_ns87415.c 21197diff -urNp linux-2.6.32.13/drivers/ata/pata_ns87415.c linux-2.6.32.13/drivers/ata/pata_ns87415.c
21031--- linux-2.6.32.12/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400 21198--- linux-2.6.32.13/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400
21032+++ linux-2.6.32.12/drivers/ata/pata_ns87415.c 2010-04-04 20:46:41.552552724 -0400 21199+++ linux-2.6.32.13/drivers/ata/pata_ns87415.c 2010-05-15 13:21:14.515739682 -0400
21033@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at 21200@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
21034 } 21201 }
21035 #endif /* 87560 SuperIO Support */ 21202 #endif /* 87560 SuperIO Support */
@@ -21048,9 +21215,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_ns87415.c linux-2.6.32.12/drivers/at
21048 .inherits = &ns87415_pata_ops, 21215 .inherits = &ns87415_pata_ops,
21049 .sff_tf_read = ns87560_tf_read, 21216 .sff_tf_read = ns87560_tf_read,
21050 .sff_check_status = ns87560_check_status, 21217 .sff_check_status = ns87560_check_status,
21051diff -urNp linux-2.6.32.12/drivers/ata/pata_octeon_cf.c linux-2.6.32.12/drivers/ata/pata_octeon_cf.c 21218diff -urNp linux-2.6.32.13/drivers/ata/pata_octeon_cf.c linux-2.6.32.13/drivers/ata/pata_octeon_cf.c
21052--- linux-2.6.32.12/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400 21219--- linux-2.6.32.13/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400
21053+++ linux-2.6.32.12/drivers/ata/pata_octeon_cf.c 2010-04-04 20:46:41.552552724 -0400 21220+++ linux-2.6.32.13/drivers/ata/pata_octeon_cf.c 2010-05-15 13:21:14.515739682 -0400
21054@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s 21221@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
21055 return 0; 21222 return 0;
21056 } 21223 }
@@ -21059,9 +21226,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_octeon_cf.c linux-2.6.32.12/drivers/
21059 static struct ata_port_operations octeon_cf_ops = { 21226 static struct ata_port_operations octeon_cf_ops = {
21060 .inherits = &ata_sff_port_ops, 21227 .inherits = &ata_sff_port_ops,
21061 .check_atapi_dma = octeon_cf_check_atapi_dma, 21228 .check_atapi_dma = octeon_cf_check_atapi_dma,
21062diff -urNp linux-2.6.32.12/drivers/ata/pata_oldpiix.c linux-2.6.32.12/drivers/ata/pata_oldpiix.c 21229diff -urNp linux-2.6.32.13/drivers/ata/pata_oldpiix.c linux-2.6.32.13/drivers/ata/pata_oldpiix.c
21063--- linux-2.6.32.12/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400 21230--- linux-2.6.32.13/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400
21064+++ linux-2.6.32.12/drivers/ata/pata_oldpiix.c 2010-04-04 20:46:41.552552724 -0400 21231+++ linux-2.6.32.13/drivers/ata/pata_oldpiix.c 2010-05-15 13:21:14.515739682 -0400
21065@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix 21232@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
21066 ATA_BMDMA_SHT(DRV_NAME), 21233 ATA_BMDMA_SHT(DRV_NAME),
21067 }; 21234 };
@@ -21071,9 +21238,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_oldpiix.c linux-2.6.32.12/drivers/at
21071 .inherits = &ata_bmdma_port_ops, 21238 .inherits = &ata_bmdma_port_ops,
21072 .qc_issue = oldpiix_qc_issue, 21239 .qc_issue = oldpiix_qc_issue,
21073 .cable_detect = ata_cable_40wire, 21240 .cable_detect = ata_cable_40wire,
21074diff -urNp linux-2.6.32.12/drivers/ata/pata_opti.c linux-2.6.32.12/drivers/ata/pata_opti.c 21241diff -urNp linux-2.6.32.13/drivers/ata/pata_opti.c linux-2.6.32.13/drivers/ata/pata_opti.c
21075--- linux-2.6.32.12/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400 21242--- linux-2.6.32.13/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400
21076+++ linux-2.6.32.12/drivers/ata/pata_opti.c 2010-04-04 20:46:41.552552724 -0400 21243+++ linux-2.6.32.13/drivers/ata/pata_opti.c 2010-05-15 13:21:14.515739682 -0400
21077@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh 21244@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
21078 ATA_PIO_SHT(DRV_NAME), 21245 ATA_PIO_SHT(DRV_NAME),
21079 }; 21246 };
@@ -21083,9 +21250,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_opti.c linux-2.6.32.12/drivers/ata/p
21083 .inherits = &ata_sff_port_ops, 21250 .inherits = &ata_sff_port_ops,
21084 .cable_detect = ata_cable_40wire, 21251 .cable_detect = ata_cable_40wire,
21085 .set_piomode = opti_set_piomode, 21252 .set_piomode = opti_set_piomode,
21086diff -urNp linux-2.6.32.12/drivers/ata/pata_optidma.c linux-2.6.32.12/drivers/ata/pata_optidma.c 21253diff -urNp linux-2.6.32.13/drivers/ata/pata_optidma.c linux-2.6.32.13/drivers/ata/pata_optidma.c
21087--- linux-2.6.32.12/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400 21254--- linux-2.6.32.13/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400
21088+++ linux-2.6.32.12/drivers/ata/pata_optidma.c 2010-04-04 20:46:41.552552724 -0400 21255+++ linux-2.6.32.13/drivers/ata/pata_optidma.c 2010-05-15 13:21:14.518593102 -0400
21089@@ -337,7 +337,7 @@ static struct scsi_host_template optidma 21256@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
21090 ATA_BMDMA_SHT(DRV_NAME), 21257 ATA_BMDMA_SHT(DRV_NAME),
21091 }; 21258 };
@@ -21104,9 +21271,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_optidma.c linux-2.6.32.12/drivers/at
21104 .inherits = &optidma_port_ops, 21271 .inherits = &optidma_port_ops,
21105 .set_piomode = optiplus_set_pio_mode, 21272 .set_piomode = optiplus_set_pio_mode,
21106 .set_dmamode = optiplus_set_dma_mode, 21273 .set_dmamode = optiplus_set_dma_mode,
21107diff -urNp linux-2.6.32.12/drivers/ata/pata_palmld.c linux-2.6.32.12/drivers/ata/pata_palmld.c 21274diff -urNp linux-2.6.32.13/drivers/ata/pata_palmld.c linux-2.6.32.13/drivers/ata/pata_palmld.c
21108--- linux-2.6.32.12/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400 21275--- linux-2.6.32.13/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400
21109+++ linux-2.6.32.12/drivers/ata/pata_palmld.c 2010-04-04 20:46:41.552552724 -0400 21276+++ linux-2.6.32.13/drivers/ata/pata_palmld.c 2010-05-15 13:21:14.518593102 -0400
21110@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ 21277@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
21111 ATA_PIO_SHT(DRV_NAME), 21278 ATA_PIO_SHT(DRV_NAME),
21112 }; 21279 };
@@ -21116,9 +21283,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_palmld.c linux-2.6.32.12/drivers/ata
21116 .inherits = &ata_sff_port_ops, 21283 .inherits = &ata_sff_port_ops,
21117 .sff_data_xfer = ata_sff_data_xfer_noirq, 21284 .sff_data_xfer = ata_sff_data_xfer_noirq,
21118 .cable_detect = ata_cable_40wire, 21285 .cable_detect = ata_cable_40wire,
21119diff -urNp linux-2.6.32.12/drivers/ata/pata_pcmcia.c linux-2.6.32.12/drivers/ata/pata_pcmcia.c 21286diff -urNp linux-2.6.32.13/drivers/ata/pata_pcmcia.c linux-2.6.32.13/drivers/ata/pata_pcmcia.c
21120--- linux-2.6.32.12/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400 21287--- linux-2.6.32.13/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400
21121+++ linux-2.6.32.12/drivers/ata/pata_pcmcia.c 2010-04-04 20:46:41.552552724 -0400 21288+++ linux-2.6.32.13/drivers/ata/pata_pcmcia.c 2010-05-15 13:21:14.522920519 -0400
21122@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ 21289@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
21123 ATA_PIO_SHT(DRV_NAME), 21290 ATA_PIO_SHT(DRV_NAME),
21124 }; 21291 };
@@ -21145,9 +21312,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_pcmcia.c linux-2.6.32.12/drivers/ata
21145 21312
21146 info = kzalloc(sizeof(*info), GFP_KERNEL); 21313 info = kzalloc(sizeof(*info), GFP_KERNEL);
21147 if (info == NULL) 21314 if (info == NULL)
21148diff -urNp linux-2.6.32.12/drivers/ata/pata_pdc2027x.c linux-2.6.32.12/drivers/ata/pata_pdc2027x.c 21315diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc2027x.c linux-2.6.32.13/drivers/ata/pata_pdc2027x.c
21149--- linux-2.6.32.12/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400 21316--- linux-2.6.32.13/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400
21150+++ linux-2.6.32.12/drivers/ata/pata_pdc2027x.c 2010-04-04 20:46:41.552552724 -0400 21317+++ linux-2.6.32.13/drivers/ata/pata_pdc2027x.c 2010-05-15 13:21:14.522920519 -0400
21151@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 21318@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
21152 ATA_BMDMA_SHT(DRV_NAME), 21319 ATA_BMDMA_SHT(DRV_NAME),
21153 }; 21320 };
@@ -21165,9 +21332,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_pdc2027x.c linux-2.6.32.12/drivers/a
21165 .inherits = &pdc2027x_pata100_ops, 21332 .inherits = &pdc2027x_pata100_ops,
21166 .mode_filter = pdc2027x_mode_filter, 21333 .mode_filter = pdc2027x_mode_filter,
21167 .set_piomode = pdc2027x_set_piomode, 21334 .set_piomode = pdc2027x_set_piomode,
21168diff -urNp linux-2.6.32.12/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.12/drivers/ata/pata_pdc202xx_old.c 21335diff -urNp linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c
21169--- linux-2.6.32.12/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400 21336--- linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400
21170+++ linux-2.6.32.12/drivers/ata/pata_pdc202xx_old.c 2010-04-04 20:46:41.552552724 -0400 21337+++ linux-2.6.32.13/drivers/ata/pata_pdc202xx_old.c 2010-05-15 13:21:14.522920519 -0400
21171@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x 21338@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x
21172 ATA_BMDMA_SHT(DRV_NAME), 21339 ATA_BMDMA_SHT(DRV_NAME),
21173 }; 21340 };
@@ -21186,9 +21353,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.12/drive
21186 .inherits = &pdc2024x_port_ops, 21353 .inherits = &pdc2024x_port_ops,
21187 21354
21188 .check_atapi_dma = pdc2026x_check_atapi_dma, 21355 .check_atapi_dma = pdc2026x_check_atapi_dma,
21189diff -urNp linux-2.6.32.12/drivers/ata/pata_platform.c linux-2.6.32.12/drivers/ata/pata_platform.c 21356diff -urNp linux-2.6.32.13/drivers/ata/pata_platform.c linux-2.6.32.13/drivers/ata/pata_platform.c
21190--- linux-2.6.32.12/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400 21357--- linux-2.6.32.13/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400
21191+++ linux-2.6.32.12/drivers/ata/pata_platform.c 2010-04-04 20:46:41.552552724 -0400 21358+++ linux-2.6.32.13/drivers/ata/pata_platform.c 2010-05-15 13:21:14.522920519 -0400
21192@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl 21359@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
21193 ATA_PIO_SHT(DRV_NAME), 21360 ATA_PIO_SHT(DRV_NAME),
21194 }; 21361 };
@@ -21198,9 +21365,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_platform.c linux-2.6.32.12/drivers/a
21198 .inherits = &ata_sff_port_ops, 21365 .inherits = &ata_sff_port_ops,
21199 .sff_data_xfer = ata_sff_data_xfer_noirq, 21366 .sff_data_xfer = ata_sff_data_xfer_noirq,
21200 .cable_detect = ata_cable_unknown, 21367 .cable_detect = ata_cable_unknown,
21201diff -urNp linux-2.6.32.12/drivers/ata/pata_qdi.c linux-2.6.32.12/drivers/ata/pata_qdi.c 21368diff -urNp linux-2.6.32.13/drivers/ata/pata_qdi.c linux-2.6.32.13/drivers/ata/pata_qdi.c
21202--- linux-2.6.32.12/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400 21369--- linux-2.6.32.13/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400
21203+++ linux-2.6.32.12/drivers/ata/pata_qdi.c 2010-04-04 20:46:41.552552724 -0400 21370+++ linux-2.6.32.13/drivers/ata/pata_qdi.c 2010-05-15 13:21:14.526754945 -0400
21204@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht 21371@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
21205 ATA_PIO_SHT(DRV_NAME), 21372 ATA_PIO_SHT(DRV_NAME),
21206 }; 21373 };
@@ -21219,9 +21386,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_qdi.c linux-2.6.32.12/drivers/ata/pa
21219 .inherits = &qdi6500_port_ops, 21386 .inherits = &qdi6500_port_ops,
21220 .set_piomode = qdi6580_set_piomode, 21387 .set_piomode = qdi6580_set_piomode,
21221 }; 21388 };
21222diff -urNp linux-2.6.32.12/drivers/ata/pata_radisys.c linux-2.6.32.12/drivers/ata/pata_radisys.c 21389diff -urNp linux-2.6.32.13/drivers/ata/pata_radisys.c linux-2.6.32.13/drivers/ata/pata_radisys.c
21223--- linux-2.6.32.12/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400 21390--- linux-2.6.32.13/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400
21224+++ linux-2.6.32.12/drivers/ata/pata_radisys.c 2010-04-04 20:46:41.556857392 -0400 21391+++ linux-2.6.32.13/drivers/ata/pata_radisys.c 2010-05-15 13:21:14.526754945 -0400
21225@@ -187,7 +187,7 @@ static struct scsi_host_template radisys 21392@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
21226 ATA_BMDMA_SHT(DRV_NAME), 21393 ATA_BMDMA_SHT(DRV_NAME),
21227 }; 21394 };
@@ -21231,9 +21398,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_radisys.c linux-2.6.32.12/drivers/at
21231 .inherits = &ata_bmdma_port_ops, 21398 .inherits = &ata_bmdma_port_ops,
21232 .qc_issue = radisys_qc_issue, 21399 .qc_issue = radisys_qc_issue,
21233 .cable_detect = ata_cable_unknown, 21400 .cable_detect = ata_cable_unknown,
21234diff -urNp linux-2.6.32.12/drivers/ata/pata_rb532_cf.c linux-2.6.32.12/drivers/ata/pata_rb532_cf.c 21401diff -urNp linux-2.6.32.13/drivers/ata/pata_rb532_cf.c linux-2.6.32.13/drivers/ata/pata_rb532_cf.c
21235--- linux-2.6.32.12/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400 21402--- linux-2.6.32.13/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400
21236+++ linux-2.6.32.12/drivers/ata/pata_rb532_cf.c 2010-04-04 20:46:41.556857392 -0400 21403+++ linux-2.6.32.13/drivers/ata/pata_rb532_cf.c 2010-05-15 13:21:14.526754945 -0400
21237@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle 21404@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
21238 return IRQ_HANDLED; 21405 return IRQ_HANDLED;
21239 } 21406 }
@@ -21243,9 +21410,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_rb532_cf.c linux-2.6.32.12/drivers/a
21243 .inherits = &ata_sff_port_ops, 21410 .inherits = &ata_sff_port_ops,
21244 .sff_data_xfer = ata_sff_data_xfer32, 21411 .sff_data_xfer = ata_sff_data_xfer32,
21245 }; 21412 };
21246diff -urNp linux-2.6.32.12/drivers/ata/pata_rdc.c linux-2.6.32.12/drivers/ata/pata_rdc.c 21413diff -urNp linux-2.6.32.13/drivers/ata/pata_rdc.c linux-2.6.32.13/drivers/ata/pata_rdc.c
21247--- linux-2.6.32.12/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400 21414--- linux-2.6.32.13/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400
21248+++ linux-2.6.32.12/drivers/ata/pata_rdc.c 2010-04-04 20:46:41.556857392 -0400 21415+++ linux-2.6.32.13/drivers/ata/pata_rdc.c 2010-05-15 13:21:14.530928469 -0400
21249@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p 21416@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
21250 pci_write_config_byte(dev, 0x48, udma_enable); 21417 pci_write_config_byte(dev, 0x48, udma_enable);
21251 } 21418 }
@@ -21255,9 +21422,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_rdc.c linux-2.6.32.12/drivers/ata/pa
21255 .inherits = &ata_bmdma32_port_ops, 21422 .inherits = &ata_bmdma32_port_ops,
21256 .cable_detect = rdc_pata_cable_detect, 21423 .cable_detect = rdc_pata_cable_detect,
21257 .set_piomode = rdc_set_piomode, 21424 .set_piomode = rdc_set_piomode,
21258diff -urNp linux-2.6.32.12/drivers/ata/pata_rz1000.c linux-2.6.32.12/drivers/ata/pata_rz1000.c 21425diff -urNp linux-2.6.32.13/drivers/ata/pata_rz1000.c linux-2.6.32.13/drivers/ata/pata_rz1000.c
21259--- linux-2.6.32.12/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400 21426--- linux-2.6.32.13/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400
21260+++ linux-2.6.32.12/drivers/ata/pata_rz1000.c 2010-04-04 20:46:41.556857392 -0400 21427+++ linux-2.6.32.13/drivers/ata/pata_rz1000.c 2010-05-15 13:21:14.530928469 -0400
21261@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ 21428@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
21262 ATA_PIO_SHT(DRV_NAME), 21429 ATA_PIO_SHT(DRV_NAME),
21263 }; 21430 };
@@ -21267,9 +21434,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_rz1000.c linux-2.6.32.12/drivers/ata
21267 .inherits = &ata_sff_port_ops, 21434 .inherits = &ata_sff_port_ops,
21268 .cable_detect = ata_cable_40wire, 21435 .cable_detect = ata_cable_40wire,
21269 .set_mode = rz1000_set_mode, 21436 .set_mode = rz1000_set_mode,
21270diff -urNp linux-2.6.32.12/drivers/ata/pata_sc1200.c linux-2.6.32.12/drivers/ata/pata_sc1200.c 21437diff -urNp linux-2.6.32.13/drivers/ata/pata_sc1200.c linux-2.6.32.13/drivers/ata/pata_sc1200.c
21271--- linux-2.6.32.12/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400 21438--- linux-2.6.32.13/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400
21272+++ linux-2.6.32.12/drivers/ata/pata_sc1200.c 2010-04-04 20:46:41.556857392 -0400 21439+++ linux-2.6.32.13/drivers/ata/pata_sc1200.c 2010-05-15 13:21:14.530928469 -0400
21273@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ 21440@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
21274 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 21441 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
21275 }; 21442 };
@@ -21279,9 +21446,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_sc1200.c linux-2.6.32.12/drivers/ata
21279 .inherits = &ata_bmdma_port_ops, 21446 .inherits = &ata_bmdma_port_ops,
21280 .qc_prep = ata_sff_dumb_qc_prep, 21447 .qc_prep = ata_sff_dumb_qc_prep,
21281 .qc_issue = sc1200_qc_issue, 21448 .qc_issue = sc1200_qc_issue,
21282diff -urNp linux-2.6.32.12/drivers/ata/pata_scc.c linux-2.6.32.12/drivers/ata/pata_scc.c 21449diff -urNp linux-2.6.32.13/drivers/ata/pata_scc.c linux-2.6.32.13/drivers/ata/pata_scc.c
21283--- linux-2.6.32.12/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400 21450--- linux-2.6.32.13/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400
21284+++ linux-2.6.32.12/drivers/ata/pata_scc.c 2010-04-04 20:46:41.556857392 -0400 21451+++ linux-2.6.32.13/drivers/ata/pata_scc.c 2010-05-15 13:21:14.530928469 -0400
21285@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht 21452@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
21286 ATA_BMDMA_SHT(DRV_NAME), 21453 ATA_BMDMA_SHT(DRV_NAME),
21287 }; 21454 };
@@ -21291,9 +21458,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_scc.c linux-2.6.32.12/drivers/ata/pa
21291 .inherits = &ata_bmdma_port_ops, 21458 .inherits = &ata_bmdma_port_ops,
21292 21459
21293 .set_piomode = scc_set_piomode, 21460 .set_piomode = scc_set_piomode,
21294diff -urNp linux-2.6.32.12/drivers/ata/pata_sch.c linux-2.6.32.12/drivers/ata/pata_sch.c 21461diff -urNp linux-2.6.32.13/drivers/ata/pata_sch.c linux-2.6.32.13/drivers/ata/pata_sch.c
21295--- linux-2.6.32.12/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400 21462--- linux-2.6.32.13/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400
21296+++ linux-2.6.32.12/drivers/ata/pata_sch.c 2010-04-04 20:46:41.556857392 -0400 21463+++ linux-2.6.32.13/drivers/ata/pata_sch.c 2010-05-15 13:21:14.534836180 -0400
21297@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht 21464@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
21298 ATA_BMDMA_SHT(DRV_NAME), 21465 ATA_BMDMA_SHT(DRV_NAME),
21299 }; 21466 };
@@ -21303,9 +21470,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_sch.c linux-2.6.32.12/drivers/ata/pa
21303 .inherits = &ata_bmdma_port_ops, 21470 .inherits = &ata_bmdma_port_ops,
21304 .cable_detect = ata_cable_unknown, 21471 .cable_detect = ata_cable_unknown,
21305 .set_piomode = sch_set_piomode, 21472 .set_piomode = sch_set_piomode,
21306diff -urNp linux-2.6.32.12/drivers/ata/pata_serverworks.c linux-2.6.32.12/drivers/ata/pata_serverworks.c 21473diff -urNp linux-2.6.32.13/drivers/ata/pata_serverworks.c linux-2.6.32.13/drivers/ata/pata_serverworks.c
21307--- linux-2.6.32.12/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400 21474--- linux-2.6.32.13/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400
21308+++ linux-2.6.32.12/drivers/ata/pata_serverworks.c 2010-04-04 20:46:41.556857392 -0400 21475+++ linux-2.6.32.13/drivers/ata/pata_serverworks.c 2010-05-15 13:21:14.534836180 -0400
21309@@ -299,7 +299,7 @@ static struct scsi_host_template serverw 21476@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
21310 ATA_BMDMA_SHT(DRV_NAME), 21477 ATA_BMDMA_SHT(DRV_NAME),
21311 }; 21478 };
@@ -21324,9 +21491,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_serverworks.c linux-2.6.32.12/driver
21324 .inherits = &serverworks_osb4_port_ops, 21491 .inherits = &serverworks_osb4_port_ops,
21325 .mode_filter = serverworks_csb_filter, 21492 .mode_filter = serverworks_csb_filter,
21326 }; 21493 };
21327diff -urNp linux-2.6.32.12/drivers/ata/pata_sil680.c linux-2.6.32.12/drivers/ata/pata_sil680.c 21494diff -urNp linux-2.6.32.13/drivers/ata/pata_sil680.c linux-2.6.32.13/drivers/ata/pata_sil680.c
21328--- linux-2.6.32.12/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400 21495--- linux-2.6.32.13/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400
21329+++ linux-2.6.32.12/drivers/ata/pata_sil680.c 2010-04-04 20:46:41.556857392 -0400 21496+++ linux-2.6.32.13/drivers/ata/pata_sil680.c 2010-05-15 13:21:14.538682329 -0400
21330@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ 21497@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
21331 ATA_BMDMA_SHT(DRV_NAME), 21498 ATA_BMDMA_SHT(DRV_NAME),
21332 }; 21499 };
@@ -21336,9 +21503,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_sil680.c linux-2.6.32.12/drivers/ata
21336 .inherits = &ata_bmdma32_port_ops, 21503 .inherits = &ata_bmdma32_port_ops,
21337 .cable_detect = sil680_cable_detect, 21504 .cable_detect = sil680_cable_detect,
21338 .set_piomode = sil680_set_piomode, 21505 .set_piomode = sil680_set_piomode,
21339diff -urNp linux-2.6.32.12/drivers/ata/pata_sis.c linux-2.6.32.12/drivers/ata/pata_sis.c 21506diff -urNp linux-2.6.32.13/drivers/ata/pata_sis.c linux-2.6.32.13/drivers/ata/pata_sis.c
21340--- linux-2.6.32.12/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400 21507--- linux-2.6.32.13/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400
21341+++ linux-2.6.32.12/drivers/ata/pata_sis.c 2010-04-04 20:46:41.556857392 -0400 21508+++ linux-2.6.32.13/drivers/ata/pata_sis.c 2010-05-15 13:21:14.538682329 -0400
21342@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht 21509@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
21343 ATA_BMDMA_SHT(DRV_NAME), 21510 ATA_BMDMA_SHT(DRV_NAME),
21344 }; 21511 };
@@ -21394,9 +21561,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_sis.c linux-2.6.32.12/drivers/ata/pa
21394 .inherits = &sis_base_ops, 21561 .inherits = &sis_base_ops,
21395 .set_piomode = sis_old_set_piomode, 21562 .set_piomode = sis_old_set_piomode,
21396 .set_dmamode = sis_old_set_dmamode, 21563 .set_dmamode = sis_old_set_dmamode,
21397diff -urNp linux-2.6.32.12/drivers/ata/pata_sl82c105.c linux-2.6.32.12/drivers/ata/pata_sl82c105.c 21564diff -urNp linux-2.6.32.13/drivers/ata/pata_sl82c105.c linux-2.6.32.13/drivers/ata/pata_sl82c105.c
21398--- linux-2.6.32.12/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400 21565--- linux-2.6.32.13/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400
21399+++ linux-2.6.32.12/drivers/ata/pata_sl82c105.c 2010-04-04 20:46:41.556857392 -0400 21566+++ linux-2.6.32.13/drivers/ata/pata_sl82c105.c 2010-05-15 13:21:14.538682329 -0400
21400@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 21567@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
21401 ATA_BMDMA_SHT(DRV_NAME), 21568 ATA_BMDMA_SHT(DRV_NAME),
21402 }; 21569 };
@@ -21406,9 +21573,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_sl82c105.c linux-2.6.32.12/drivers/a
21406 .inherits = &ata_bmdma_port_ops, 21573 .inherits = &ata_bmdma_port_ops,
21407 .qc_defer = sl82c105_qc_defer, 21574 .qc_defer = sl82c105_qc_defer,
21408 .bmdma_start = sl82c105_bmdma_start, 21575 .bmdma_start = sl82c105_bmdma_start,
21409diff -urNp linux-2.6.32.12/drivers/ata/pata_triflex.c linux-2.6.32.12/drivers/ata/pata_triflex.c 21576diff -urNp linux-2.6.32.13/drivers/ata/pata_triflex.c linux-2.6.32.13/drivers/ata/pata_triflex.c
21410--- linux-2.6.32.12/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400 21577--- linux-2.6.32.13/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400
21411+++ linux-2.6.32.12/drivers/ata/pata_triflex.c 2010-04-04 20:46:41.556857392 -0400 21578+++ linux-2.6.32.13/drivers/ata/pata_triflex.c 2010-05-15 13:21:14.538682329 -0400
21412@@ -178,7 +178,7 @@ static struct scsi_host_template triflex 21579@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
21413 ATA_BMDMA_SHT(DRV_NAME), 21580 ATA_BMDMA_SHT(DRV_NAME),
21414 }; 21581 };
@@ -21418,9 +21585,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_triflex.c linux-2.6.32.12/drivers/at
21418 .inherits = &ata_bmdma_port_ops, 21585 .inherits = &ata_bmdma_port_ops,
21419 .bmdma_start = triflex_bmdma_start, 21586 .bmdma_start = triflex_bmdma_start,
21420 .bmdma_stop = triflex_bmdma_stop, 21587 .bmdma_stop = triflex_bmdma_stop,
21421diff -urNp linux-2.6.32.12/drivers/ata/pata_via.c linux-2.6.32.12/drivers/ata/pata_via.c 21588diff -urNp linux-2.6.32.13/drivers/ata/pata_via.c linux-2.6.32.13/drivers/ata/pata_via.c
21422--- linux-2.6.32.12/drivers/ata/pata_via.c 2010-04-29 17:49:37.709698369 -0400 21589--- linux-2.6.32.13/drivers/ata/pata_via.c 2010-04-29 17:49:37.709698369 -0400
21423+++ linux-2.6.32.12/drivers/ata/pata_via.c 2010-04-29 17:49:58.093238510 -0400 21590+++ linux-2.6.32.13/drivers/ata/pata_via.c 2010-05-15 13:21:14.538682329 -0400
21424@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht 21591@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
21425 ATA_BMDMA_SHT(DRV_NAME), 21592 ATA_BMDMA_SHT(DRV_NAME),
21426 }; 21593 };
@@ -21439,9 +21606,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_via.c linux-2.6.32.12/drivers/ata/pa
21439 .inherits = &via_port_ops, 21606 .inherits = &via_port_ops,
21440 .sff_data_xfer = ata_sff_data_xfer_noirq, 21607 .sff_data_xfer = ata_sff_data_xfer_noirq,
21441 }; 21608 };
21442diff -urNp linux-2.6.32.12/drivers/ata/pata_winbond.c linux-2.6.32.12/drivers/ata/pata_winbond.c 21609diff -urNp linux-2.6.32.13/drivers/ata/pata_winbond.c linux-2.6.32.13/drivers/ata/pata_winbond.c
21443--- linux-2.6.32.12/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400 21610--- linux-2.6.32.13/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400
21444+++ linux-2.6.32.12/drivers/ata/pata_winbond.c 2010-04-04 20:46:41.556857392 -0400 21611+++ linux-2.6.32.13/drivers/ata/pata_winbond.c 2010-05-15 13:21:14.538682329 -0400
21445@@ -125,7 +125,7 @@ static struct scsi_host_template winbond 21612@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
21446 ATA_PIO_SHT(DRV_NAME), 21613 ATA_PIO_SHT(DRV_NAME),
21447 }; 21614 };
@@ -21451,9 +21618,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pata_winbond.c linux-2.6.32.12/drivers/at
21451 .inherits = &ata_sff_port_ops, 21618 .inherits = &ata_sff_port_ops,
21452 .sff_data_xfer = winbond_data_xfer, 21619 .sff_data_xfer = winbond_data_xfer,
21453 .cable_detect = ata_cable_40wire, 21620 .cable_detect = ata_cable_40wire,
21454diff -urNp linux-2.6.32.12/drivers/ata/pdc_adma.c linux-2.6.32.12/drivers/ata/pdc_adma.c 21621diff -urNp linux-2.6.32.13/drivers/ata/pdc_adma.c linux-2.6.32.13/drivers/ata/pdc_adma.c
21455--- linux-2.6.32.12/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400 21622--- linux-2.6.32.13/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400
21456+++ linux-2.6.32.12/drivers/ata/pdc_adma.c 2010-04-04 20:46:41.556857392 -0400 21623+++ linux-2.6.32.13/drivers/ata/pdc_adma.c 2010-05-15 13:21:14.538682329 -0400
21457@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at 21624@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
21458 .dma_boundary = ADMA_DMA_BOUNDARY, 21625 .dma_boundary = ADMA_DMA_BOUNDARY,
21459 }; 21626 };
@@ -21463,9 +21630,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/pdc_adma.c linux-2.6.32.12/drivers/ata/pd
21463 .inherits = &ata_sff_port_ops, 21630 .inherits = &ata_sff_port_ops,
21464 21631
21465 .lost_interrupt = ATA_OP_NULL, 21632 .lost_interrupt = ATA_OP_NULL,
21466diff -urNp linux-2.6.32.12/drivers/ata/sata_fsl.c linux-2.6.32.12/drivers/ata/sata_fsl.c 21633diff -urNp linux-2.6.32.13/drivers/ata/sata_fsl.c linux-2.6.32.13/drivers/ata/sata_fsl.c
21467--- linux-2.6.32.12/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400 21634--- linux-2.6.32.13/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400
21468+++ linux-2.6.32.12/drivers/ata/sata_fsl.c 2010-04-04 20:46:41.556857392 -0400 21635+++ linux-2.6.32.13/drivers/ata/sata_fsl.c 2010-05-15 13:21:14.542941562 -0400
21469@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs 21636@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
21470 .dma_boundary = ATA_DMA_BOUNDARY, 21637 .dma_boundary = ATA_DMA_BOUNDARY,
21471 }; 21638 };
@@ -21475,9 +21642,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/sata_fsl.c linux-2.6.32.12/drivers/ata/sa
21475 .inherits = &sata_pmp_port_ops, 21642 .inherits = &sata_pmp_port_ops,
21476 21643
21477 .qc_defer = ata_std_qc_defer, 21644 .qc_defer = ata_std_qc_defer,
21478diff -urNp linux-2.6.32.12/drivers/ata/sata_inic162x.c linux-2.6.32.12/drivers/ata/sata_inic162x.c 21645diff -urNp linux-2.6.32.13/drivers/ata/sata_inic162x.c linux-2.6.32.13/drivers/ata/sata_inic162x.c
21479--- linux-2.6.32.12/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400 21646--- linux-2.6.32.13/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400
21480+++ linux-2.6.32.12/drivers/ata/sata_inic162x.c 2010-04-04 20:46:41.556857392 -0400 21647+++ linux-2.6.32.13/drivers/ata/sata_inic162x.c 2010-05-15 13:21:14.542941562 -0400
21481@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po 21648@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
21482 return 0; 21649 return 0;
21483 } 21650 }
@@ -21487,9 +21654,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/sata_inic162x.c linux-2.6.32.12/drivers/a
21487 .inherits = &sata_port_ops, 21654 .inherits = &sata_port_ops,
21488 21655
21489 .check_atapi_dma = inic_check_atapi_dma, 21656 .check_atapi_dma = inic_check_atapi_dma,
21490diff -urNp linux-2.6.32.12/drivers/ata/sata_mv.c linux-2.6.32.12/drivers/ata/sata_mv.c 21657diff -urNp linux-2.6.32.13/drivers/ata/sata_mv.c linux-2.6.32.13/drivers/ata/sata_mv.c
21491--- linux-2.6.32.12/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400 21658--- linux-2.6.32.13/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400
21492+++ linux-2.6.32.12/drivers/ata/sata_mv.c 2010-04-04 20:46:41.556857392 -0400 21659+++ linux-2.6.32.13/drivers/ata/sata_mv.c 2010-05-15 13:21:14.567430978 -0400
21493@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht 21660@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
21494 .dma_boundary = MV_DMA_BOUNDARY, 21661 .dma_boundary = MV_DMA_BOUNDARY,
21495 }; 21662 };
@@ -21517,9 +21684,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/sata_mv.c linux-2.6.32.12/drivers/ata/sat
21517 .inherits = &mv6_ops, 21684 .inherits = &mv6_ops,
21518 .dev_config = ATA_OP_NULL, 21685 .dev_config = ATA_OP_NULL,
21519 .qc_prep = mv_qc_prep_iie, 21686 .qc_prep = mv_qc_prep_iie,
21520diff -urNp linux-2.6.32.12/drivers/ata/sata_nv.c linux-2.6.32.12/drivers/ata/sata_nv.c 21687diff -urNp linux-2.6.32.13/drivers/ata/sata_nv.c linux-2.6.32.13/drivers/ata/sata_nv.c
21521--- linux-2.6.32.12/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400 21688--- linux-2.6.32.13/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400
21522+++ linux-2.6.32.12/drivers/ata/sata_nv.c 2010-04-04 20:46:41.556857392 -0400 21689+++ linux-2.6.32.13/drivers/ata/sata_nv.c 2010-05-15 13:21:14.570612236 -0400
21523@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc 21690@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
21524 * cases. Define nv_hardreset() which only kicks in for post-boot 21691 * cases. Define nv_hardreset() which only kicks in for post-boot
21525 * probing and use it for all variants. 21692 * probing and use it for all variants.
@@ -21562,9 +21729,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/sata_nv.c linux-2.6.32.12/drivers/ata/sat
21562 .inherits = &nv_generic_ops, 21729 .inherits = &nv_generic_ops,
21563 21730
21564 .qc_defer = ata_std_qc_defer, 21731 .qc_defer = ata_std_qc_defer,
21565diff -urNp linux-2.6.32.12/drivers/ata/sata_promise.c linux-2.6.32.12/drivers/ata/sata_promise.c 21732diff -urNp linux-2.6.32.13/drivers/ata/sata_promise.c linux-2.6.32.13/drivers/ata/sata_promise.c
21566--- linux-2.6.32.12/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400 21733--- linux-2.6.32.13/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400
21567+++ linux-2.6.32.12/drivers/ata/sata_promise.c 2010-04-04 20:46:41.556857392 -0400 21734+++ linux-2.6.32.13/drivers/ata/sata_promise.c 2010-05-15 13:21:14.570612236 -0400
21568@@ -195,7 +195,7 @@ static const struct ata_port_operations 21735@@ -195,7 +195,7 @@ static const struct ata_port_operations
21569 .error_handler = pdc_error_handler, 21736 .error_handler = pdc_error_handler,
21570 }; 21737 };
@@ -21591,9 +21758,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/sata_promise.c linux-2.6.32.12/drivers/at
21591 .inherits = &pdc_common_ops, 21758 .inherits = &pdc_common_ops,
21592 .cable_detect = pdc_pata_cable_detect, 21759 .cable_detect = pdc_pata_cable_detect,
21593 .freeze = pdc_freeze, 21760 .freeze = pdc_freeze,
21594diff -urNp linux-2.6.32.12/drivers/ata/sata_qstor.c linux-2.6.32.12/drivers/ata/sata_qstor.c 21761diff -urNp linux-2.6.32.13/drivers/ata/sata_qstor.c linux-2.6.32.13/drivers/ata/sata_qstor.c
21595--- linux-2.6.32.12/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400 21762--- linux-2.6.32.13/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400
21596+++ linux-2.6.32.12/drivers/ata/sata_qstor.c 2010-04-04 20:46:41.556857392 -0400 21763+++ linux-2.6.32.13/drivers/ata/sata_qstor.c 2010-05-15 13:21:14.570612236 -0400
21597@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ 21764@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
21598 .dma_boundary = QS_DMA_BOUNDARY, 21765 .dma_boundary = QS_DMA_BOUNDARY,
21599 }; 21766 };
@@ -21603,9 +21770,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/sata_qstor.c linux-2.6.32.12/drivers/ata/
21603 .inherits = &ata_sff_port_ops, 21770 .inherits = &ata_sff_port_ops,
21604 21771
21605 .check_atapi_dma = qs_check_atapi_dma, 21772 .check_atapi_dma = qs_check_atapi_dma,
21606diff -urNp linux-2.6.32.12/drivers/ata/sata_sil24.c linux-2.6.32.12/drivers/ata/sata_sil24.c 21773diff -urNp linux-2.6.32.13/drivers/ata/sata_sil24.c linux-2.6.32.13/drivers/ata/sata_sil24.c
21607--- linux-2.6.32.12/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400 21774--- linux-2.6.32.13/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400
21608+++ linux-2.6.32.12/drivers/ata/sata_sil24.c 2010-04-04 20:46:41.556857392 -0400 21775+++ linux-2.6.32.13/drivers/ata/sata_sil24.c 2010-05-15 13:21:14.570612236 -0400
21609@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s 21776@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
21610 .dma_boundary = ATA_DMA_BOUNDARY, 21777 .dma_boundary = ATA_DMA_BOUNDARY,
21611 }; 21778 };
@@ -21615,9 +21782,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/sata_sil24.c linux-2.6.32.12/drivers/ata/
21615 .inherits = &sata_pmp_port_ops, 21782 .inherits = &sata_pmp_port_ops,
21616 21783
21617 .qc_defer = sil24_qc_defer, 21784 .qc_defer = sil24_qc_defer,
21618diff -urNp linux-2.6.32.12/drivers/ata/sata_sil.c linux-2.6.32.12/drivers/ata/sata_sil.c 21785diff -urNp linux-2.6.32.13/drivers/ata/sata_sil.c linux-2.6.32.13/drivers/ata/sata_sil.c
21619--- linux-2.6.32.12/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400 21786--- linux-2.6.32.13/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400
21620+++ linux-2.6.32.12/drivers/ata/sata_sil.c 2010-04-04 20:46:41.556857392 -0400 21787+++ linux-2.6.32.13/drivers/ata/sata_sil.c 2010-05-15 13:21:14.570612236 -0400
21621@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht 21788@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
21622 .sg_tablesize = ATA_MAX_PRD 21789 .sg_tablesize = ATA_MAX_PRD
21623 }; 21790 };
@@ -21627,9 +21794,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/sata_sil.c linux-2.6.32.12/drivers/ata/sa
21627 .inherits = &ata_bmdma32_port_ops, 21794 .inherits = &ata_bmdma32_port_ops,
21628 .dev_config = sil_dev_config, 21795 .dev_config = sil_dev_config,
21629 .set_mode = sil_set_mode, 21796 .set_mode = sil_set_mode,
21630diff -urNp linux-2.6.32.12/drivers/ata/sata_sis.c linux-2.6.32.12/drivers/ata/sata_sis.c 21797diff -urNp linux-2.6.32.13/drivers/ata/sata_sis.c linux-2.6.32.13/drivers/ata/sata_sis.c
21631--- linux-2.6.32.12/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400 21798--- linux-2.6.32.13/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400
21632+++ linux-2.6.32.12/drivers/ata/sata_sis.c 2010-04-04 20:46:41.561786507 -0400 21799+++ linux-2.6.32.13/drivers/ata/sata_sis.c 2010-05-15 13:21:14.578938263 -0400
21633@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht 21800@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
21634 ATA_BMDMA_SHT(DRV_NAME), 21801 ATA_BMDMA_SHT(DRV_NAME),
21635 }; 21802 };
@@ -21639,9 +21806,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/sata_sis.c linux-2.6.32.12/drivers/ata/sa
21639 .inherits = &ata_bmdma_port_ops, 21806 .inherits = &ata_bmdma_port_ops,
21640 .scr_read = sis_scr_read, 21807 .scr_read = sis_scr_read,
21641 .scr_write = sis_scr_write, 21808 .scr_write = sis_scr_write,
21642diff -urNp linux-2.6.32.12/drivers/ata/sata_svw.c linux-2.6.32.12/drivers/ata/sata_svw.c 21809diff -urNp linux-2.6.32.13/drivers/ata/sata_svw.c linux-2.6.32.13/drivers/ata/sata_svw.c
21643--- linux-2.6.32.12/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400 21810--- linux-2.6.32.13/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400
21644+++ linux-2.6.32.12/drivers/ata/sata_svw.c 2010-04-04 20:46:41.561786507 -0400 21811+++ linux-2.6.32.13/drivers/ata/sata_svw.c 2010-05-15 13:21:14.578938263 -0400
21645@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata 21812@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
21646 }; 21813 };
21647 21814
@@ -21651,9 +21818,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/sata_svw.c linux-2.6.32.12/drivers/ata/sa
21651 .inherits = &ata_bmdma_port_ops, 21818 .inherits = &ata_bmdma_port_ops,
21652 .sff_tf_load = k2_sata_tf_load, 21819 .sff_tf_load = k2_sata_tf_load,
21653 .sff_tf_read = k2_sata_tf_read, 21820 .sff_tf_read = k2_sata_tf_read,
21654diff -urNp linux-2.6.32.12/drivers/ata/sata_sx4.c linux-2.6.32.12/drivers/ata/sata_sx4.c 21821diff -urNp linux-2.6.32.13/drivers/ata/sata_sx4.c linux-2.6.32.13/drivers/ata/sata_sx4.c
21655--- linux-2.6.32.12/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400 21822--- linux-2.6.32.13/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400
21656+++ linux-2.6.32.12/drivers/ata/sata_sx4.c 2010-04-04 20:46:41.561786507 -0400 21823+++ linux-2.6.32.13/drivers/ata/sata_sx4.c 2010-05-15 13:21:14.594941059 -0400
21657@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat 21824@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
21658 }; 21825 };
21659 21826
@@ -21663,9 +21830,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/sata_sx4.c linux-2.6.32.12/drivers/ata/sa
21663 .inherits = &ata_sff_port_ops, 21830 .inherits = &ata_sff_port_ops,
21664 21831
21665 .check_atapi_dma = pdc_check_atapi_dma, 21832 .check_atapi_dma = pdc_check_atapi_dma,
21666diff -urNp linux-2.6.32.12/drivers/ata/sata_uli.c linux-2.6.32.12/drivers/ata/sata_uli.c 21833diff -urNp linux-2.6.32.13/drivers/ata/sata_uli.c linux-2.6.32.13/drivers/ata/sata_uli.c
21667--- linux-2.6.32.12/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400 21834--- linux-2.6.32.13/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400
21668+++ linux-2.6.32.12/drivers/ata/sata_uli.c 2010-04-04 20:46:41.561786507 -0400 21835+++ linux-2.6.32.13/drivers/ata/sata_uli.c 2010-05-15 13:21:14.594941059 -0400
21669@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht 21836@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
21670 ATA_BMDMA_SHT(DRV_NAME), 21837 ATA_BMDMA_SHT(DRV_NAME),
21671 }; 21838 };
@@ -21675,9 +21842,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/sata_uli.c linux-2.6.32.12/drivers/ata/sa
21675 .inherits = &ata_bmdma_port_ops, 21842 .inherits = &ata_bmdma_port_ops,
21676 .scr_read = uli_scr_read, 21843 .scr_read = uli_scr_read,
21677 .scr_write = uli_scr_write, 21844 .scr_write = uli_scr_write,
21678diff -urNp linux-2.6.32.12/drivers/ata/sata_via.c linux-2.6.32.12/drivers/ata/sata_via.c 21845diff -urNp linux-2.6.32.13/drivers/ata/sata_via.c linux-2.6.32.13/drivers/ata/sata_via.c
21679--- linux-2.6.32.12/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400 21846--- linux-2.6.32.13/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400
21680+++ linux-2.6.32.12/drivers/ata/sata_via.c 2010-04-04 20:46:41.561786507 -0400 21847+++ linux-2.6.32.13/drivers/ata/sata_via.c 2010-05-15 13:21:14.599908388 -0400
21681@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh 21848@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
21682 ATA_BMDMA_SHT(DRV_NAME), 21849 ATA_BMDMA_SHT(DRV_NAME),
21683 }; 21850 };
@@ -21715,9 +21882,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/sata_via.c linux-2.6.32.12/drivers/ata/sa
21715 .inherits = &svia_base_ops, 21882 .inherits = &svia_base_ops,
21716 .hardreset = sata_std_hardreset, 21883 .hardreset = sata_std_hardreset,
21717 .scr_read = vt8251_scr_read, 21884 .scr_read = vt8251_scr_read,
21718diff -urNp linux-2.6.32.12/drivers/ata/sata_vsc.c linux-2.6.32.12/drivers/ata/sata_vsc.c 21885diff -urNp linux-2.6.32.13/drivers/ata/sata_vsc.c linux-2.6.32.13/drivers/ata/sata_vsc.c
21719--- linux-2.6.32.12/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400 21886--- linux-2.6.32.13/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400
21720+++ linux-2.6.32.12/drivers/ata/sata_vsc.c 2010-04-04 20:46:41.561786507 -0400 21887+++ linux-2.6.32.13/drivers/ata/sata_vsc.c 2010-05-15 13:21:14.606569540 -0400
21721@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat 21888@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
21722 }; 21889 };
21723 21890
@@ -21727,9 +21894,9 @@ diff -urNp linux-2.6.32.12/drivers/ata/sata_vsc.c linux-2.6.32.12/drivers/ata/sa
21727 .inherits = &ata_bmdma_port_ops, 21894 .inherits = &ata_bmdma_port_ops,
21728 /* The IRQ handling is not quite standard SFF behaviour so we 21895 /* The IRQ handling is not quite standard SFF behaviour so we
21729 cannot use the default lost interrupt handler */ 21896 cannot use the default lost interrupt handler */
21730diff -urNp linux-2.6.32.12/drivers/atm/adummy.c linux-2.6.32.12/drivers/atm/adummy.c 21897diff -urNp linux-2.6.32.13/drivers/atm/adummy.c linux-2.6.32.13/drivers/atm/adummy.c
21731--- linux-2.6.32.12/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400 21898--- linux-2.6.32.13/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400
21732+++ linux-2.6.32.12/drivers/atm/adummy.c 2010-04-04 20:46:41.561786507 -0400 21899+++ linux-2.6.32.13/drivers/atm/adummy.c 2010-05-15 13:21:14.606569540 -0400
21733@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct 21900@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
21734 vcc->pop(vcc, skb); 21901 vcc->pop(vcc, skb);
21735 else 21902 else
@@ -21739,9 +21906,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/adummy.c linux-2.6.32.12/drivers/atm/adum
21739 21906
21740 return 0; 21907 return 0;
21741 } 21908 }
21742diff -urNp linux-2.6.32.12/drivers/atm/ambassador.c linux-2.6.32.12/drivers/atm/ambassador.c 21909diff -urNp linux-2.6.32.13/drivers/atm/ambassador.c linux-2.6.32.13/drivers/atm/ambassador.c
21743--- linux-2.6.32.12/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400 21910--- linux-2.6.32.13/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400
21744+++ linux-2.6.32.12/drivers/atm/ambassador.c 2010-04-04 20:46:41.561786507 -0400 21911+++ linux-2.6.32.13/drivers/atm/ambassador.c 2010-05-15 13:21:14.622930740 -0400
21745@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, 21912@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
21746 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); 21913 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
21747 21914
@@ -21778,9 +21945,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/ambassador.c linux-2.6.32.12/drivers/atm/
21778 return -ENOMEM; // ? 21945 return -ENOMEM; // ?
21779 } 21946 }
21780 21947
21781diff -urNp linux-2.6.32.12/drivers/atm/atmtcp.c linux-2.6.32.12/drivers/atm/atmtcp.c 21948diff -urNp linux-2.6.32.13/drivers/atm/atmtcp.c linux-2.6.32.13/drivers/atm/atmtcp.c
21782--- linux-2.6.32.12/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400 21949--- linux-2.6.32.13/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400
21783+++ linux-2.6.32.12/drivers/atm/atmtcp.c 2010-04-04 20:46:41.561786507 -0400 21950+++ linux-2.6.32.13/drivers/atm/atmtcp.c 2010-05-15 13:21:14.626657707 -0400
21784@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc 21951@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc
21785 if (vcc->pop) vcc->pop(vcc,skb); 21952 if (vcc->pop) vcc->pop(vcc,skb);
21786 else dev_kfree_skb(skb); 21953 else dev_kfree_skb(skb);
@@ -21830,9 +21997,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/atmtcp.c linux-2.6.32.12/drivers/atm/atmt
21830 done: 21997 done:
21831 if (vcc->pop) vcc->pop(vcc,skb); 21998 if (vcc->pop) vcc->pop(vcc,skb);
21832 else dev_kfree_skb(skb); 21999 else dev_kfree_skb(skb);
21833diff -urNp linux-2.6.32.12/drivers/atm/eni.c linux-2.6.32.12/drivers/atm/eni.c 22000diff -urNp linux-2.6.32.13/drivers/atm/eni.c linux-2.6.32.13/drivers/atm/eni.c
21834--- linux-2.6.32.12/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400 22001--- linux-2.6.32.13/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400
21835+++ linux-2.6.32.12/drivers/atm/eni.c 2010-04-04 20:46:41.561786507 -0400 22002+++ linux-2.6.32.13/drivers/atm/eni.c 2010-05-15 13:21:14.634928336 -0400
21836@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) 22003@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
21837 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", 22004 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
21838 vcc->dev->number); 22005 vcc->dev->number);
@@ -21878,9 +22045,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/eni.c linux-2.6.32.12/drivers/atm/eni.c
21878 wake_up(&eni_dev->tx_wait); 22045 wake_up(&eni_dev->tx_wait);
21879 dma_complete++; 22046 dma_complete++;
21880 } 22047 }
21881diff -urNp linux-2.6.32.12/drivers/atm/firestream.c linux-2.6.32.12/drivers/atm/firestream.c 22048diff -urNp linux-2.6.32.13/drivers/atm/firestream.c linux-2.6.32.13/drivers/atm/firestream.c
21882--- linux-2.6.32.12/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400 22049--- linux-2.6.32.13/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400
21883+++ linux-2.6.32.12/drivers/atm/firestream.c 2010-04-04 20:46:41.561786507 -0400 22050+++ linux-2.6.32.13/drivers/atm/firestream.c 2010-05-15 13:21:14.647057643 -0400
21884@@ -748,7 +748,7 @@ static void process_txdone_queue (struct 22051@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
21885 } 22052 }
21886 } 22053 }
@@ -21914,9 +22081,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/firestream.c linux-2.6.32.12/drivers/atm/
21914 break; 22081 break;
21915 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ 22082 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
21916 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 22083 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
21917diff -urNp linux-2.6.32.12/drivers/atm/fore200e.c linux-2.6.32.12/drivers/atm/fore200e.c 22084diff -urNp linux-2.6.32.13/drivers/atm/fore200e.c linux-2.6.32.13/drivers/atm/fore200e.c
21918--- linux-2.6.32.12/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400 22085--- linux-2.6.32.13/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400
21919+++ linux-2.6.32.12/drivers/atm/fore200e.c 2010-04-04 20:46:41.561786507 -0400 22086+++ linux-2.6.32.13/drivers/atm/fore200e.c 2010-05-15 13:21:14.676169638 -0400
21920@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 22087@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
21921 #endif 22088 #endif
21922 /* check error condition */ 22089 /* check error condition */
@@ -21973,9 +22140,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/fore200e.c linux-2.6.32.12/drivers/atm/fo
21973 22140
21974 fore200e->tx_sat++; 22141 fore200e->tx_sat++;
21975 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", 22142 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
21976diff -urNp linux-2.6.32.12/drivers/atm/he.c linux-2.6.32.12/drivers/atm/he.c 22143diff -urNp linux-2.6.32.13/drivers/atm/he.c linux-2.6.32.13/drivers/atm/he.c
21977--- linux-2.6.32.12/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400 22144--- linux-2.6.32.13/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400
21978+++ linux-2.6.32.12/drivers/atm/he.c 2010-04-04 20:46:41.565779517 -0400 22145+++ linux-2.6.32.13/drivers/atm/he.c 2010-05-15 13:21:14.691446990 -0400
21979@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i 22146@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
21980 22147
21981 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { 22148 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -22057,9 +22224,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/he.c linux-2.6.32.12/drivers/atm/he.c
22057 22224
22058 return 0; 22225 return 0;
22059 } 22226 }
22060diff -urNp linux-2.6.32.12/drivers/atm/horizon.c linux-2.6.32.12/drivers/atm/horizon.c 22227diff -urNp linux-2.6.32.13/drivers/atm/horizon.c linux-2.6.32.13/drivers/atm/horizon.c
22061--- linux-2.6.32.12/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400 22228--- linux-2.6.32.13/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400
22062+++ linux-2.6.32.12/drivers/atm/horizon.c 2010-04-04 20:46:41.565779517 -0400 22229+++ linux-2.6.32.13/drivers/atm/horizon.c 2010-05-15 13:21:14.706969618 -0400
22063@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, 22230@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
22064 { 22231 {
22065 struct atm_vcc * vcc = ATM_SKB(skb)->vcc; 22232 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -22078,9 +22245,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/horizon.c linux-2.6.32.12/drivers/atm/hor
22078 22245
22079 // free the skb 22246 // free the skb
22080 hrz_kfree_skb (skb); 22247 hrz_kfree_skb (skb);
22081diff -urNp linux-2.6.32.12/drivers/atm/idt77252.c linux-2.6.32.12/drivers/atm/idt77252.c 22248diff -urNp linux-2.6.32.13/drivers/atm/idt77252.c linux-2.6.32.13/drivers/atm/idt77252.c
22082--- linux-2.6.32.12/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400 22249--- linux-2.6.32.13/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400
22083+++ linux-2.6.32.12/drivers/atm/idt77252.c 2010-04-04 20:46:41.565779517 -0400 22250+++ linux-2.6.32.13/drivers/atm/idt77252.c 2010-05-15 13:21:14.706969618 -0400
22084@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str 22251@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
22085 else 22252 else
22086 dev_kfree_skb(skb); 22253 dev_kfree_skb(skb);
@@ -22235,9 +22402,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/idt77252.c linux-2.6.32.12/drivers/atm/id
22235 return -ENOMEM; 22402 return -ENOMEM;
22236 } 22403 }
22237 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); 22404 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
22238diff -urNp linux-2.6.32.12/drivers/atm/iphase.c linux-2.6.32.12/drivers/atm/iphase.c 22405diff -urNp linux-2.6.32.13/drivers/atm/iphase.c linux-2.6.32.13/drivers/atm/iphase.c
22239--- linux-2.6.32.12/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400 22406--- linux-2.6.32.13/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400
22240+++ linux-2.6.32.12/drivers/atm/iphase.c 2010-04-04 20:46:41.565779517 -0400 22407+++ linux-2.6.32.13/drivers/atm/iphase.c 2010-05-15 13:21:14.750617431 -0400
22241@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) 22408@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
22242 status = (u_short) (buf_desc_ptr->desc_mode); 22409 status = (u_short) (buf_desc_ptr->desc_mode);
22243 if (status & (RX_CER | RX_PTE | RX_OFL)) 22410 if (status & (RX_CER | RX_PTE | RX_OFL))
@@ -22334,9 +22501,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/iphase.c linux-2.6.32.12/drivers/atm/ipha
22334 if (iavcc->vc_desc_cnt > 10) { 22501 if (iavcc->vc_desc_cnt > 10) {
22335 vcc->tx_quota = vcc->tx_quota * 3 / 4; 22502 vcc->tx_quota = vcc->tx_quota * 3 / 4;
22336 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); 22503 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
22337diff -urNp linux-2.6.32.12/drivers/atm/lanai.c linux-2.6.32.12/drivers/atm/lanai.c 22504diff -urNp linux-2.6.32.13/drivers/atm/lanai.c linux-2.6.32.13/drivers/atm/lanai.c
22338--- linux-2.6.32.12/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400 22505--- linux-2.6.32.13/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400
22339+++ linux-2.6.32.12/drivers/atm/lanai.c 2010-04-04 20:46:41.565779517 -0400 22506+++ linux-2.6.32.13/drivers/atm/lanai.c 2010-05-15 13:21:14.750617431 -0400
22340@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l 22507@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
22341 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); 22508 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
22342 lanai_endtx(lanai, lvcc); 22509 lanai_endtx(lanai, lvcc);
@@ -22391,9 +22558,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/lanai.c linux-2.6.32.12/drivers/atm/lanai
22391 lvcc->stats.x.aal5.service_rxcrc++; 22558 lvcc->stats.x.aal5.service_rxcrc++;
22392 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; 22559 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
22393 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); 22560 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
22394diff -urNp linux-2.6.32.12/drivers/atm/nicstar.c linux-2.6.32.12/drivers/atm/nicstar.c 22561diff -urNp linux-2.6.32.13/drivers/atm/nicstar.c linux-2.6.32.13/drivers/atm/nicstar.c
22395--- linux-2.6.32.12/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400 22562--- linux-2.6.32.13/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400
22396+++ linux-2.6.32.12/drivers/atm/nicstar.c 2010-04-04 20:46:41.565779517 -0400 22563+++ linux-2.6.32.13/drivers/atm/nicstar.c 2010-05-15 13:21:14.787751803 -0400
22397@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, 22564@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
22398 if ((vc = (vc_map *) vcc->dev_data) == NULL) 22565 if ((vc = (vc_map *) vcc->dev_data) == NULL)
22399 { 22566 {
@@ -22596,9 +22763,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/nicstar.c linux-2.6.32.12/drivers/atm/nic
22596 } 22763 }
22597 } 22764 }
22598 22765
22599diff -urNp linux-2.6.32.12/drivers/atm/solos-pci.c linux-2.6.32.12/drivers/atm/solos-pci.c 22766diff -urNp linux-2.6.32.13/drivers/atm/solos-pci.c linux-2.6.32.13/drivers/atm/solos-pci.c
22600--- linux-2.6.32.12/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400 22767--- linux-2.6.32.13/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400
22601+++ linux-2.6.32.12/drivers/atm/solos-pci.c 2010-04-04 20:46:41.565779517 -0400 22768+++ linux-2.6.32.13/drivers/atm/solos-pci.c 2010-05-15 13:21:14.815606670 -0400
22602@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) 22769@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
22603 } 22770 }
22604 atm_charge(vcc, skb->truesize); 22771 atm_charge(vcc, skb->truesize);
@@ -22617,9 +22784,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/solos-pci.c linux-2.6.32.12/drivers/atm/s
22617 solos_pop(vcc, oldskb); 22784 solos_pop(vcc, oldskb);
22618 } else 22785 } else
22619 dev_kfree_skb_irq(oldskb); 22786 dev_kfree_skb_irq(oldskb);
22620diff -urNp linux-2.6.32.12/drivers/atm/suni.c linux-2.6.32.12/drivers/atm/suni.c 22787diff -urNp linux-2.6.32.13/drivers/atm/suni.c linux-2.6.32.13/drivers/atm/suni.c
22621--- linux-2.6.32.12/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400 22788--- linux-2.6.32.13/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400
22622+++ linux-2.6.32.12/drivers/atm/suni.c 2010-04-04 20:46:41.565779517 -0400 22789+++ linux-2.6.32.13/drivers/atm/suni.c 2010-05-15 13:21:14.815606670 -0400
22623@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); 22790@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
22624 22791
22625 22792
@@ -22631,9 +22798,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/suni.c linux-2.6.32.12/drivers/atm/suni.c
22631 22798
22632 22799
22633 static void suni_hz(unsigned long from_timer) 22800 static void suni_hz(unsigned long from_timer)
22634diff -urNp linux-2.6.32.12/drivers/atm/uPD98402.c linux-2.6.32.12/drivers/atm/uPD98402.c 22801diff -urNp linux-2.6.32.13/drivers/atm/uPD98402.c linux-2.6.32.13/drivers/atm/uPD98402.c
22635--- linux-2.6.32.12/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400 22802--- linux-2.6.32.13/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400
22636+++ linux-2.6.32.12/drivers/atm/uPD98402.c 2010-04-04 20:46:41.565779517 -0400 22803+++ linux-2.6.32.13/drivers/atm/uPD98402.c 2010-05-15 13:21:14.815606670 -0400
22637@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d 22804@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
22638 struct sonet_stats tmp; 22805 struct sonet_stats tmp;
22639 int error = 0; 22806 int error = 0;
@@ -22678,9 +22845,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/uPD98402.c linux-2.6.32.12/drivers/atm/uP
22678 return 0; 22845 return 0;
22679 } 22846 }
22680 22847
22681diff -urNp linux-2.6.32.12/drivers/atm/zatm.c linux-2.6.32.12/drivers/atm/zatm.c 22848diff -urNp linux-2.6.32.13/drivers/atm/zatm.c linux-2.6.32.13/drivers/atm/zatm.c
22682--- linux-2.6.32.12/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400 22849--- linux-2.6.32.13/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400
22683+++ linux-2.6.32.12/drivers/atm/zatm.c 2010-04-04 20:46:41.569782507 -0400 22850+++ linux-2.6.32.13/drivers/atm/zatm.c 2010-05-15 13:21:14.815606670 -0400
22684@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy 22851@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
22685 } 22852 }
22686 if (!size) { 22853 if (!size) {
@@ -22708,9 +22875,9 @@ diff -urNp linux-2.6.32.12/drivers/atm/zatm.c linux-2.6.32.12/drivers/atm/zatm.c
22708 wake_up(&zatm_vcc->tx_wait); 22875 wake_up(&zatm_vcc->tx_wait);
22709 } 22876 }
22710 22877
22711diff -urNp linux-2.6.32.12/drivers/base/bus.c linux-2.6.32.12/drivers/base/bus.c 22878diff -urNp linux-2.6.32.13/drivers/base/bus.c linux-2.6.32.13/drivers/base/bus.c
22712--- linux-2.6.32.12/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400 22879--- linux-2.6.32.13/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400
22713+++ linux-2.6.32.12/drivers/base/bus.c 2010-04-04 20:46:41.569782507 -0400 22880+++ linux-2.6.32.13/drivers/base/bus.c 2010-05-15 13:21:14.831148567 -0400
22714@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob 22881@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
22715 return ret; 22882 return ret;
22716 } 22883 }
@@ -22738,9 +22905,9 @@ diff -urNp linux-2.6.32.12/drivers/base/bus.c linux-2.6.32.12/drivers/base/bus.c
22738 .filter = bus_uevent_filter, 22905 .filter = bus_uevent_filter,
22739 }; 22906 };
22740 22907
22741diff -urNp linux-2.6.32.12/drivers/base/class.c linux-2.6.32.12/drivers/base/class.c 22908diff -urNp linux-2.6.32.13/drivers/base/class.c linux-2.6.32.13/drivers/base/class.c
22742--- linux-2.6.32.12/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400 22909--- linux-2.6.32.13/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400
22743+++ linux-2.6.32.12/drivers/base/class.c 2010-04-04 20:46:41.569782507 -0400 22910+++ linux-2.6.32.13/drivers/base/class.c 2010-05-15 13:21:14.874164060 -0400
22744@@ -63,7 +63,7 @@ static void class_release(struct kobject 22911@@ -63,7 +63,7 @@ static void class_release(struct kobject
22745 kfree(cp); 22912 kfree(cp);
22746 } 22913 }
@@ -22750,9 +22917,9 @@ diff -urNp linux-2.6.32.12/drivers/base/class.c linux-2.6.32.12/drivers/base/cla
22750 .show = class_attr_show, 22917 .show = class_attr_show,
22751 .store = class_attr_store, 22918 .store = class_attr_store,
22752 }; 22919 };
22753diff -urNp linux-2.6.32.12/drivers/base/core.c linux-2.6.32.12/drivers/base/core.c 22920diff -urNp linux-2.6.32.13/drivers/base/core.c linux-2.6.32.13/drivers/base/core.c
22754--- linux-2.6.32.12/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400 22921--- linux-2.6.32.13/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400
22755+++ linux-2.6.32.12/drivers/base/core.c 2010-04-04 20:46:41.569782507 -0400 22922+++ linux-2.6.32.13/drivers/base/core.c 2010-05-15 13:21:14.878954723 -0400
22756@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob 22923@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
22757 return ret; 22924 return ret;
22758 } 22925 }
@@ -22771,9 +22938,9 @@ diff -urNp linux-2.6.32.12/drivers/base/core.c linux-2.6.32.12/drivers/base/core
22771 .filter = dev_uevent_filter, 22938 .filter = dev_uevent_filter,
22772 .name = dev_uevent_name, 22939 .name = dev_uevent_name,
22773 .uevent = dev_uevent, 22940 .uevent = dev_uevent,
22774diff -urNp linux-2.6.32.12/drivers/base/memory.c linux-2.6.32.12/drivers/base/memory.c 22941diff -urNp linux-2.6.32.13/drivers/base/memory.c linux-2.6.32.13/drivers/base/memory.c
22775--- linux-2.6.32.12/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400 22942--- linux-2.6.32.13/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400
22776+++ linux-2.6.32.12/drivers/base/memory.c 2010-04-04 20:46:41.569782507 -0400 22943+++ linux-2.6.32.13/drivers/base/memory.c 2010-05-15 13:21:14.882954278 -0400
22777@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks 22944@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
22778 return retval; 22945 return retval;
22779 } 22946 }
@@ -22783,9 +22950,9 @@ diff -urNp linux-2.6.32.12/drivers/base/memory.c linux-2.6.32.12/drivers/base/me
22783 .name = memory_uevent_name, 22950 .name = memory_uevent_name,
22784 .uevent = memory_uevent, 22951 .uevent = memory_uevent,
22785 }; 22952 };
22786diff -urNp linux-2.6.32.12/drivers/base/sys.c linux-2.6.32.12/drivers/base/sys.c 22953diff -urNp linux-2.6.32.13/drivers/base/sys.c linux-2.6.32.13/drivers/base/sys.c
22787--- linux-2.6.32.12/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400 22954--- linux-2.6.32.13/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400
22788+++ linux-2.6.32.12/drivers/base/sys.c 2010-04-04 20:46:41.569782507 -0400 22955+++ linux-2.6.32.13/drivers/base/sys.c 2010-05-15 13:21:14.890945998 -0400
22789@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc 22956@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
22790 return -EIO; 22957 return -EIO;
22791 } 22958 }
@@ -22804,9 +22971,9 @@ diff -urNp linux-2.6.32.12/drivers/base/sys.c linux-2.6.32.12/drivers/base/sys.c
22804 .show = sysdev_class_show, 22971 .show = sysdev_class_show,
22805 .store = sysdev_class_store, 22972 .store = sysdev_class_store,
22806 }; 22973 };
22807diff -urNp linux-2.6.32.12/drivers/block/pktcdvd.c linux-2.6.32.12/drivers/block/pktcdvd.c 22974diff -urNp linux-2.6.32.13/drivers/block/pktcdvd.c linux-2.6.32.13/drivers/block/pktcdvd.c
22808--- linux-2.6.32.12/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400 22975--- linux-2.6.32.13/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400
22809+++ linux-2.6.32.12/drivers/block/pktcdvd.c 2010-04-04 20:46:41.569782507 -0400 22976+++ linux-2.6.32.13/drivers/block/pktcdvd.c 2010-05-15 13:21:14.919938646 -0400
22810@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob 22977@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
22811 return len; 22978 return len;
22812 } 22979 }
@@ -22816,9 +22983,9 @@ diff -urNp linux-2.6.32.12/drivers/block/pktcdvd.c linux-2.6.32.12/drivers/block
22816 .show = kobj_pkt_show, 22983 .show = kobj_pkt_show,
22817 .store = kobj_pkt_store 22984 .store = kobj_pkt_store
22818 }; 22985 };
22819diff -urNp linux-2.6.32.12/drivers/char/agp/frontend.c linux-2.6.32.12/drivers/char/agp/frontend.c 22986diff -urNp linux-2.6.32.13/drivers/char/agp/frontend.c linux-2.6.32.13/drivers/char/agp/frontend.c
22820--- linux-2.6.32.12/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400 22987--- linux-2.6.32.13/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400
22821+++ linux-2.6.32.12/drivers/char/agp/frontend.c 2010-04-04 20:46:41.569782507 -0400 22988+++ linux-2.6.32.13/drivers/char/agp/frontend.c 2010-05-15 13:21:14.919938646 -0400
22822@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag 22989@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
22823 if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) 22990 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
22824 return -EFAULT; 22991 return -EFAULT;
@@ -22828,9 +22995,9 @@ diff -urNp linux-2.6.32.12/drivers/char/agp/frontend.c linux-2.6.32.12/drivers/c
22828 return -EFAULT; 22995 return -EFAULT;
22829 22996
22830 client = agp_find_client_by_pid(reserve.pid); 22997 client = agp_find_client_by_pid(reserve.pid);
22831diff -urNp linux-2.6.32.12/drivers/char/agp/intel-agp.c linux-2.6.32.12/drivers/char/agp/intel-agp.c 22998diff -urNp linux-2.6.32.13/drivers/char/agp/intel-agp.c linux-2.6.32.13/drivers/char/agp/intel-agp.c
22832--- linux-2.6.32.12/drivers/char/agp/intel-agp.c 2010-04-29 17:49:37.777981896 -0400 22999--- linux-2.6.32.13/drivers/char/agp/intel-agp.c 2010-04-29 17:49:37.777981896 -0400
22833+++ linux-2.6.32.12/drivers/char/agp/intel-agp.c 2010-04-29 17:49:58.121109354 -0400 23000+++ linux-2.6.32.13/drivers/char/agp/intel-agp.c 2010-05-15 13:21:14.919938646 -0400
22834@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc 23001@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc
22835 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), 23002 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
22836 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), 23003 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
@@ -22840,9 +23007,9 @@ diff -urNp linux-2.6.32.12/drivers/char/agp/intel-agp.c linux-2.6.32.12/drivers/
22840 }; 23007 };
22841 23008
22842 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); 23009 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
22843diff -urNp linux-2.6.32.12/drivers/char/hpet.c linux-2.6.32.12/drivers/char/hpet.c 23010diff -urNp linux-2.6.32.13/drivers/char/hpet.c linux-2.6.32.13/drivers/char/hpet.c
22844--- linux-2.6.32.12/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400 23011--- linux-2.6.32.13/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400
22845+++ linux-2.6.32.12/drivers/char/hpet.c 2010-04-29 17:46:36.909235393 -0400 23012+++ linux-2.6.32.13/drivers/char/hpet.c 2010-05-15 13:21:14.922737516 -0400
22846@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in 23013@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
22847 return 0; 23014 return 0;
22848 } 23015 }
@@ -22870,9 +23037,9 @@ diff -urNp linux-2.6.32.12/drivers/char/hpet.c linux-2.6.32.12/drivers/char/hpet
22870 23037
22871 static int __init hpet_init(void) 23038 static int __init hpet_init(void)
22872 { 23039 {
22873diff -urNp linux-2.6.32.12/drivers/char/hvc_beat.c linux-2.6.32.12/drivers/char/hvc_beat.c 23040diff -urNp linux-2.6.32.13/drivers/char/hvc_beat.c linux-2.6.32.13/drivers/char/hvc_beat.c
22874--- linux-2.6.32.12/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400 23041--- linux-2.6.32.13/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400
22875+++ linux-2.6.32.12/drivers/char/hvc_beat.c 2010-04-04 20:46:41.569782507 -0400 23042+++ linux-2.6.32.13/drivers/char/hvc_beat.c 2010-05-15 13:21:14.922737516 -0400
22876@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v 23043@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
22877 return cnt; 23044 return cnt;
22878 } 23045 }
@@ -22882,9 +23049,9 @@ diff -urNp linux-2.6.32.12/drivers/char/hvc_beat.c linux-2.6.32.12/drivers/char/
22882 .get_chars = hvc_beat_get_chars, 23049 .get_chars = hvc_beat_get_chars,
22883 .put_chars = hvc_beat_put_chars, 23050 .put_chars = hvc_beat_put_chars,
22884 }; 23051 };
22885diff -urNp linux-2.6.32.12/drivers/char/hvc_console.c linux-2.6.32.12/drivers/char/hvc_console.c 23052diff -urNp linux-2.6.32.13/drivers/char/hvc_console.c linux-2.6.32.13/drivers/char/hvc_console.c
22886--- linux-2.6.32.12/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400 23053--- linux-2.6.32.13/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400
22887+++ linux-2.6.32.12/drivers/char/hvc_console.c 2010-04-04 20:46:41.569782507 -0400 23054+++ linux-2.6.32.13/drivers/char/hvc_console.c 2010-05-15 13:21:14.922737516 -0400
22888@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind 23055@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
22889 * console interfaces but can still be used as a tty device. This has to be 23056 * console interfaces but can still be used as a tty device. This has to be
22890 * static because kmalloc will not work during early console init. 23057 * static because kmalloc will not work during early console init.
@@ -22912,9 +23079,9 @@ diff -urNp linux-2.6.32.12/drivers/char/hvc_console.c linux-2.6.32.12/drivers/ch
22912 { 23079 {
22913 struct hvc_struct *hp; 23080 struct hvc_struct *hp;
22914 int i; 23081 int i;
22915diff -urNp linux-2.6.32.12/drivers/char/hvc_console.h linux-2.6.32.12/drivers/char/hvc_console.h 23082diff -urNp linux-2.6.32.13/drivers/char/hvc_console.h linux-2.6.32.13/drivers/char/hvc_console.h
22916--- linux-2.6.32.12/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400 23083--- linux-2.6.32.13/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400
22917+++ linux-2.6.32.12/drivers/char/hvc_console.h 2010-04-04 20:46:41.569782507 -0400 23084+++ linux-2.6.32.13/drivers/char/hvc_console.h 2010-05-15 13:21:14.922737516 -0400
22918@@ -55,7 +55,7 @@ struct hvc_struct { 23085@@ -55,7 +55,7 @@ struct hvc_struct {
22919 int outbuf_size; 23086 int outbuf_size;
22920 int n_outbuf; 23087 int n_outbuf;
@@ -22938,9 +23105,9 @@ diff -urNp linux-2.6.32.12/drivers/char/hvc_console.h linux-2.6.32.12/drivers/ch
22938 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ 23105 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
22939 extern int hvc_remove(struct hvc_struct *hp); 23106 extern int hvc_remove(struct hvc_struct *hp);
22940 23107
22941diff -urNp linux-2.6.32.12/drivers/char/hvc_iseries.c linux-2.6.32.12/drivers/char/hvc_iseries.c 23108diff -urNp linux-2.6.32.13/drivers/char/hvc_iseries.c linux-2.6.32.13/drivers/char/hvc_iseries.c
22942--- linux-2.6.32.12/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400 23109--- linux-2.6.32.13/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400
22943+++ linux-2.6.32.12/drivers/char/hvc_iseries.c 2010-04-04 20:46:41.569782507 -0400 23110+++ linux-2.6.32.13/drivers/char/hvc_iseries.c 2010-05-15 13:21:14.922737516 -0400
22944@@ -197,7 +197,7 @@ done: 23111@@ -197,7 +197,7 @@ done:
22945 return sent; 23112 return sent;
22946 } 23113 }
@@ -22950,9 +23117,9 @@ diff -urNp linux-2.6.32.12/drivers/char/hvc_iseries.c linux-2.6.32.12/drivers/ch
22950 .get_chars = get_chars, 23117 .get_chars = get_chars,
22951 .put_chars = put_chars, 23118 .put_chars = put_chars,
22952 .notifier_add = notifier_add_irq, 23119 .notifier_add = notifier_add_irq,
22953diff -urNp linux-2.6.32.12/drivers/char/hvc_iucv.c linux-2.6.32.12/drivers/char/hvc_iucv.c 23120diff -urNp linux-2.6.32.13/drivers/char/hvc_iucv.c linux-2.6.32.13/drivers/char/hvc_iucv.c
22954--- linux-2.6.32.12/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400 23121--- linux-2.6.32.13/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400
22955+++ linux-2.6.32.12/drivers/char/hvc_iucv.c 2010-04-04 20:46:41.569782507 -0400 23122+++ linux-2.6.32.13/drivers/char/hvc_iucv.c 2010-05-15 13:21:14.922737516 -0400
22956@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru 23123@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
22957 23124
22958 23125
@@ -22962,9 +23129,9 @@ diff -urNp linux-2.6.32.12/drivers/char/hvc_iucv.c linux-2.6.32.12/drivers/char/
22962 .get_chars = hvc_iucv_get_chars, 23129 .get_chars = hvc_iucv_get_chars,
22963 .put_chars = hvc_iucv_put_chars, 23130 .put_chars = hvc_iucv_put_chars,
22964 .notifier_add = hvc_iucv_notifier_add, 23131 .notifier_add = hvc_iucv_notifier_add,
22965diff -urNp linux-2.6.32.12/drivers/char/hvc_rtas.c linux-2.6.32.12/drivers/char/hvc_rtas.c 23132diff -urNp linux-2.6.32.13/drivers/char/hvc_rtas.c linux-2.6.32.13/drivers/char/hvc_rtas.c
22966--- linux-2.6.32.12/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400 23133--- linux-2.6.32.13/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400
22967+++ linux-2.6.32.12/drivers/char/hvc_rtas.c 2010-04-04 20:46:41.569782507 -0400 23134+++ linux-2.6.32.13/drivers/char/hvc_rtas.c 2010-05-15 13:21:14.922737516 -0400
22968@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ 23135@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
22969 return i; 23136 return i;
22970 } 23137 }
@@ -22974,9 +23141,9 @@ diff -urNp linux-2.6.32.12/drivers/char/hvc_rtas.c linux-2.6.32.12/drivers/char/
22974 .get_chars = hvc_rtas_read_console, 23141 .get_chars = hvc_rtas_read_console,
22975 .put_chars = hvc_rtas_write_console, 23142 .put_chars = hvc_rtas_write_console,
22976 }; 23143 };
22977diff -urNp linux-2.6.32.12/drivers/char/hvcs.c linux-2.6.32.12/drivers/char/hvcs.c 23144diff -urNp linux-2.6.32.13/drivers/char/hvcs.c linux-2.6.32.13/drivers/char/hvcs.c
22978--- linux-2.6.32.12/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400 23145--- linux-2.6.32.13/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400
22979+++ linux-2.6.32.12/drivers/char/hvcs.c 2010-04-04 20:46:41.573523483 -0400 23146+++ linux-2.6.32.13/drivers/char/hvcs.c 2010-05-15 13:21:14.967285135 -0400
22980@@ -269,7 +269,7 @@ struct hvcs_struct { 23147@@ -269,7 +269,7 @@ struct hvcs_struct {
22981 unsigned int index; 23148 unsigned int index;
22982 23149
@@ -23071,9 +23238,9 @@ diff -urNp linux-2.6.32.12/drivers/char/hvcs.c linux-2.6.32.12/drivers/char/hvcs
23071 return 0; 23238 return 0;
23072 23239
23073 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; 23240 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
23074diff -urNp linux-2.6.32.12/drivers/char/hvc_udbg.c linux-2.6.32.12/drivers/char/hvc_udbg.c 23241diff -urNp linux-2.6.32.13/drivers/char/hvc_udbg.c linux-2.6.32.13/drivers/char/hvc_udbg.c
23075--- linux-2.6.32.12/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400 23242--- linux-2.6.32.13/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400
23076+++ linux-2.6.32.12/drivers/char/hvc_udbg.c 2010-04-04 20:46:41.573523483 -0400 23243+++ linux-2.6.32.13/drivers/char/hvc_udbg.c 2010-05-15 13:21:14.967285135 -0400
23077@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno 23244@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
23078 return i; 23245 return i;
23079 } 23246 }
@@ -23083,9 +23250,9 @@ diff -urNp linux-2.6.32.12/drivers/char/hvc_udbg.c linux-2.6.32.12/drivers/char/
23083 .get_chars = hvc_udbg_get, 23250 .get_chars = hvc_udbg_get,
23084 .put_chars = hvc_udbg_put, 23251 .put_chars = hvc_udbg_put,
23085 }; 23252 };
23086diff -urNp linux-2.6.32.12/drivers/char/hvc_vio.c linux-2.6.32.12/drivers/char/hvc_vio.c 23253diff -urNp linux-2.6.32.13/drivers/char/hvc_vio.c linux-2.6.32.13/drivers/char/hvc_vio.c
23087--- linux-2.6.32.12/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400 23254--- linux-2.6.32.13/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400
23088+++ linux-2.6.32.12/drivers/char/hvc_vio.c 2010-04-04 20:46:41.573523483 -0400 23255+++ linux-2.6.32.13/drivers/char/hvc_vio.c 2010-05-15 13:21:14.967285135 -0400
23089@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v 23256@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
23090 return got; 23257 return got;
23091 } 23258 }
@@ -23095,9 +23262,9 @@ diff -urNp linux-2.6.32.12/drivers/char/hvc_vio.c linux-2.6.32.12/drivers/char/h
23095 .get_chars = filtered_get_chars, 23262 .get_chars = filtered_get_chars,
23096 .put_chars = hvc_put_chars, 23263 .put_chars = hvc_put_chars,
23097 .notifier_add = notifier_add_irq, 23264 .notifier_add = notifier_add_irq,
23098diff -urNp linux-2.6.32.12/drivers/char/hvc_xen.c linux-2.6.32.12/drivers/char/hvc_xen.c 23265diff -urNp linux-2.6.32.13/drivers/char/hvc_xen.c linux-2.6.32.13/drivers/char/hvc_xen.c
23099--- linux-2.6.32.12/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400 23266--- linux-2.6.32.13/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400
23100+++ linux-2.6.32.12/drivers/char/hvc_xen.c 2010-04-04 20:46:41.573523483 -0400 23267+++ linux-2.6.32.13/drivers/char/hvc_xen.c 2010-05-15 13:21:14.967285135 -0400
23101@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno 23268@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
23102 return recv; 23269 return recv;
23103 } 23270 }
@@ -23107,9 +23274,9 @@ diff -urNp linux-2.6.32.12/drivers/char/hvc_xen.c linux-2.6.32.12/drivers/char/h
23107 .get_chars = read_console, 23274 .get_chars = read_console,
23108 .put_chars = write_console, 23275 .put_chars = write_console,
23109 .notifier_add = notifier_add_irq, 23276 .notifier_add = notifier_add_irq,
23110diff -urNp linux-2.6.32.12/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.12/drivers/char/ipmi/ipmi_msghandler.c 23277diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c
23111--- linux-2.6.32.12/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400 23278--- linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400
23112+++ linux-2.6.32.12/drivers/char/ipmi/ipmi_msghandler.c 2010-04-04 20:46:41.573523483 -0400 23279+++ linux-2.6.32.13/drivers/char/ipmi/ipmi_msghandler.c 2010-05-15 13:21:15.002974818 -0400
23113@@ -414,7 +414,7 @@ struct ipmi_smi { 23280@@ -414,7 +414,7 @@ struct ipmi_smi {
23114 struct proc_dir_entry *proc_dir; 23281 struct proc_dir_entry *proc_dir;
23115 char proc_dir_name[10]; 23282 char proc_dir_name[10];
@@ -23140,9 +23307,9 @@ diff -urNp linux-2.6.32.12/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.12/d
23140 23307
23141 intf->proc_dir = NULL; 23308 intf->proc_dir = NULL;
23142 23309
23143diff -urNp linux-2.6.32.12/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.12/drivers/char/ipmi/ipmi_si_intf.c 23310diff -urNp linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c
23144--- linux-2.6.32.12/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400 23311--- linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400
23145+++ linux-2.6.32.12/drivers/char/ipmi/ipmi_si_intf.c 2010-04-04 20:46:41.573523483 -0400 23312+++ linux-2.6.32.13/drivers/char/ipmi/ipmi_si_intf.c 2010-05-15 13:21:15.014624441 -0400
23146@@ -277,7 +277,7 @@ struct smi_info { 23313@@ -277,7 +277,7 @@ struct smi_info {
23147 unsigned char slave_addr; 23314 unsigned char slave_addr;
23148 23315
@@ -23173,9 +23340,9 @@ diff -urNp linux-2.6.32.12/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.12/driv
23173 23340
23174 new_smi->interrupt_disabled = 0; 23341 new_smi->interrupt_disabled = 0;
23175 atomic_set(&new_smi->stop_operation, 0); 23342 atomic_set(&new_smi->stop_operation, 0);
23176diff -urNp linux-2.6.32.12/drivers/char/keyboard.c linux-2.6.32.12/drivers/char/keyboard.c 23343diff -urNp linux-2.6.32.13/drivers/char/keyboard.c linux-2.6.32.13/drivers/char/keyboard.c
23177--- linux-2.6.32.12/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400 23344--- linux-2.6.32.13/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400
23178+++ linux-2.6.32.12/drivers/char/keyboard.c 2010-04-04 20:46:41.573523483 -0400 23345+++ linux-2.6.32.13/drivers/char/keyboard.c 2010-05-15 13:21:15.018564312 -0400
23179@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u 23346@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
23180 kbd->kbdmode == VC_MEDIUMRAW) && 23347 kbd->kbdmode == VC_MEDIUMRAW) &&
23181 value != KVAL(K_SAK)) 23348 value != KVAL(K_SAK))
@@ -23202,9 +23369,9 @@ diff -urNp linux-2.6.32.12/drivers/char/keyboard.c linux-2.6.32.12/drivers/char/
23202 }; 23369 };
23203 23370
23204 MODULE_DEVICE_TABLE(input, kbd_ids); 23371 MODULE_DEVICE_TABLE(input, kbd_ids);
23205diff -urNp linux-2.6.32.12/drivers/char/mem.c linux-2.6.32.12/drivers/char/mem.c 23372diff -urNp linux-2.6.32.13/drivers/char/mem.c linux-2.6.32.13/drivers/char/mem.c
23206--- linux-2.6.32.12/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400 23373--- linux-2.6.32.13/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400
23207+++ linux-2.6.32.12/drivers/char/mem.c 2010-04-04 20:46:41.573523483 -0400 23374+++ linux-2.6.32.13/drivers/char/mem.c 2010-05-15 13:21:15.018564312 -0400
23208@@ -18,6 +18,7 @@ 23375@@ -18,6 +18,7 @@
23209 #include <linux/raw.h> 23376 #include <linux/raw.h>
23210 #include <linux/tty.h> 23377 #include <linux/tty.h>
@@ -23295,9 +23462,9 @@ diff -urNp linux-2.6.32.12/drivers/char/mem.c linux-2.6.32.12/drivers/char/mem.c
23295 }; 23462 };
23296 23463
23297 static int memory_open(struct inode *inode, struct file *filp) 23464 static int memory_open(struct inode *inode, struct file *filp)
23298diff -urNp linux-2.6.32.12/drivers/char/nvram.c linux-2.6.32.12/drivers/char/nvram.c 23465diff -urNp linux-2.6.32.13/drivers/char/nvram.c linux-2.6.32.13/drivers/char/nvram.c
23299--- linux-2.6.32.12/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400 23466--- linux-2.6.32.13/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400
23300+++ linux-2.6.32.12/drivers/char/nvram.c 2010-04-04 20:46:41.573523483 -0400 23467+++ linux-2.6.32.13/drivers/char/nvram.c 2010-05-15 13:21:15.018564312 -0400
23301@@ -429,7 +429,10 @@ static const struct file_operations nvra 23468@@ -429,7 +429,10 @@ static const struct file_operations nvra
23302 static struct miscdevice nvram_dev = { 23469 static struct miscdevice nvram_dev = {
23303 NVRAM_MINOR, 23470 NVRAM_MINOR,
@@ -23310,9 +23477,9 @@ diff -urNp linux-2.6.32.12/drivers/char/nvram.c linux-2.6.32.12/drivers/char/nvr
23310 }; 23477 };
23311 23478
23312 static int __init nvram_init(void) 23479 static int __init nvram_init(void)
23313diff -urNp linux-2.6.32.12/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.12/drivers/char/pcmcia/ipwireless/tty.c 23480diff -urNp linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c
23314--- linux-2.6.32.12/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400 23481--- linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400
23315+++ linux-2.6.32.12/drivers/char/pcmcia/ipwireless/tty.c 2010-04-04 20:46:41.573523483 -0400 23482+++ linux-2.6.32.13/drivers/char/pcmcia/ipwireless/tty.c 2010-05-15 13:21:15.018564312 -0400
23316@@ -51,7 +51,7 @@ struct ipw_tty { 23483@@ -51,7 +51,7 @@ struct ipw_tty {
23317 int tty_type; 23484 int tty_type;
23318 struct ipw_network *network; 23485 struct ipw_network *network;
@@ -23427,9 +23594,9 @@ diff -urNp linux-2.6.32.12/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.12/
23427 do_ipw_close(ttyj); 23594 do_ipw_close(ttyj);
23428 ipwireless_disassociate_network_ttys(network, 23595 ipwireless_disassociate_network_ttys(network,
23429 ttyj->channel_idx); 23596 ttyj->channel_idx);
23430diff -urNp linux-2.6.32.12/drivers/char/pty.c linux-2.6.32.12/drivers/char/pty.c 23597diff -urNp linux-2.6.32.13/drivers/char/pty.c linux-2.6.32.13/drivers/char/pty.c
23431--- linux-2.6.32.12/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400 23598--- linux-2.6.32.13/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400
23432+++ linux-2.6.32.12/drivers/char/pty.c 2010-04-04 20:46:41.573523483 -0400 23599+++ linux-2.6.32.13/drivers/char/pty.c 2010-05-15 13:21:15.035728941 -0400
23433@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode 23600@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
23434 return ret; 23601 return ret;
23435 } 23602 }
@@ -23460,9 +23627,9 @@ diff -urNp linux-2.6.32.12/drivers/char/pty.c linux-2.6.32.12/drivers/char/pty.c
23460 cdev_init(&ptmx_cdev, &ptmx_fops); 23627 cdev_init(&ptmx_cdev, &ptmx_fops);
23461 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || 23628 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
23462 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) 23629 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
23463diff -urNp linux-2.6.32.12/drivers/char/random.c linux-2.6.32.12/drivers/char/random.c 23630diff -urNp linux-2.6.32.13/drivers/char/random.c linux-2.6.32.13/drivers/char/random.c
23464--- linux-2.6.32.12/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400 23631--- linux-2.6.32.13/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400
23465+++ linux-2.6.32.12/drivers/char/random.c 2010-04-04 20:46:41.573523483 -0400 23632+++ linux-2.6.32.13/drivers/char/random.c 2010-05-15 13:21:15.038954680 -0400
23466@@ -254,8 +254,13 @@ 23633@@ -254,8 +254,13 @@
23467 /* 23634 /*
23468 * Configuration information 23635 * Configuration information
@@ -23504,9 +23671,9 @@ diff -urNp linux-2.6.32.12/drivers/char/random.c linux-2.6.32.12/drivers/char/ra
23504 static int max_write_thresh = INPUT_POOL_WORDS * 32; 23671 static int max_write_thresh = INPUT_POOL_WORDS * 32;
23505 static char sysctl_bootid[16]; 23672 static char sysctl_bootid[16];
23506 23673
23507diff -urNp linux-2.6.32.12/drivers/char/sonypi.c linux-2.6.32.12/drivers/char/sonypi.c 23674diff -urNp linux-2.6.32.13/drivers/char/sonypi.c linux-2.6.32.13/drivers/char/sonypi.c
23508--- linux-2.6.32.12/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400 23675--- linux-2.6.32.13/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400
23509+++ linux-2.6.32.12/drivers/char/sonypi.c 2010-04-04 20:46:41.573523483 -0400 23676+++ linux-2.6.32.13/drivers/char/sonypi.c 2010-05-15 13:21:15.038954680 -0400
23510@@ -491,7 +491,7 @@ static struct sonypi_device { 23677@@ -491,7 +491,7 @@ static struct sonypi_device {
23511 spinlock_t fifo_lock; 23678 spinlock_t fifo_lock;
23512 wait_queue_head_t fifo_proc_list; 23679 wait_queue_head_t fifo_proc_list;
@@ -23537,9 +23704,9 @@ diff -urNp linux-2.6.32.12/drivers/char/sonypi.c linux-2.6.32.12/drivers/char/so
23537 mutex_unlock(&sonypi_device.lock); 23704 mutex_unlock(&sonypi_device.lock);
23538 unlock_kernel(); 23705 unlock_kernel();
23539 return 0; 23706 return 0;
23540diff -urNp linux-2.6.32.12/drivers/char/tpm/tpm_bios.c linux-2.6.32.12/drivers/char/tpm/tpm_bios.c 23707diff -urNp linux-2.6.32.13/drivers/char/tpm/tpm_bios.c linux-2.6.32.13/drivers/char/tpm/tpm_bios.c
23541--- linux-2.6.32.12/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400 23708--- linux-2.6.32.13/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400
23542+++ linux-2.6.32.12/drivers/char/tpm/tpm_bios.c 2010-04-04 20:46:41.573523483 -0400 23709+++ linux-2.6.32.13/drivers/char/tpm/tpm_bios.c 2010-05-15 13:21:15.042644897 -0400
23543@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start 23710@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
23544 event = addr; 23711 event = addr;
23545 23712
@@ -23580,9 +23747,9 @@ diff -urNp linux-2.6.32.12/drivers/char/tpm/tpm_bios.c linux-2.6.32.12/drivers/c
23580 23747
23581 memcpy(log->bios_event_log, virt, len); 23748 memcpy(log->bios_event_log, virt, len);
23582 23749
23583diff -urNp linux-2.6.32.12/drivers/char/tty_io.c linux-2.6.32.12/drivers/char/tty_io.c 23750diff -urNp linux-2.6.32.13/drivers/char/tty_io.c linux-2.6.32.13/drivers/char/tty_io.c
23584--- linux-2.6.32.12/drivers/char/tty_io.c 2010-04-29 17:49:37.826084348 -0400 23751--- linux-2.6.32.13/drivers/char/tty_io.c 2010-04-29 17:49:37.826084348 -0400
23585+++ linux-2.6.32.12/drivers/char/tty_io.c 2010-04-29 17:49:58.141506968 -0400 23752+++ linux-2.6.32.13/drivers/char/tty_io.c 2010-05-15 13:21:15.058626500 -0400
23586@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list 23753@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
23587 DEFINE_MUTEX(tty_mutex); 23754 DEFINE_MUTEX(tty_mutex);
23588 EXPORT_SYMBOL(tty_mutex); 23755 EXPORT_SYMBOL(tty_mutex);
@@ -23721,9 +23888,9 @@ diff -urNp linux-2.6.32.12/drivers/char/tty_io.c linux-2.6.32.12/drivers/char/tt
23721 /* 23888 /*
23722 * Initialize the console device. This is called *early*, so 23889 * Initialize the console device. This is called *early*, so
23723 * we can't necessarily depend on lots of kernel help here. 23890 * we can't necessarily depend on lots of kernel help here.
23724diff -urNp linux-2.6.32.12/drivers/char/tty_ldisc.c linux-2.6.32.12/drivers/char/tty_ldisc.c 23891diff -urNp linux-2.6.32.13/drivers/char/tty_ldisc.c linux-2.6.32.13/drivers/char/tty_ldisc.c
23725--- linux-2.6.32.12/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400 23892--- linux-2.6.32.13/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400
23726+++ linux-2.6.32.12/drivers/char/tty_ldisc.c 2010-04-04 20:46:41.577798214 -0400 23893+++ linux-2.6.32.13/drivers/char/tty_ldisc.c 2010-05-15 13:21:15.058626500 -0400
23727@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * 23894@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc *
23728 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { 23895 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
23729 struct tty_ldisc_ops *ldo = ld->ops; 23896 struct tty_ldisc_ops *ldo = ld->ops;
@@ -23769,9 +23936,9 @@ diff -urNp linux-2.6.32.12/drivers/char/tty_ldisc.c linux-2.6.32.12/drivers/char
23769 module_put(ldops->owner); 23936 module_put(ldops->owner);
23770 spin_unlock_irqrestore(&tty_ldisc_lock, flags); 23937 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
23771 } 23938 }
23772diff -urNp linux-2.6.32.12/drivers/char/virtio_console.c linux-2.6.32.12/drivers/char/virtio_console.c 23939diff -urNp linux-2.6.32.13/drivers/char/virtio_console.c linux-2.6.32.13/drivers/char/virtio_console.c
23773--- linux-2.6.32.12/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400 23940--- linux-2.6.32.13/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400
23774+++ linux-2.6.32.12/drivers/char/virtio_console.c 2010-04-04 20:46:41.577798214 -0400 23941+++ linux-2.6.32.13/drivers/char/virtio_console.c 2010-05-15 13:21:15.058626500 -0400
23775@@ -44,6 +44,7 @@ static unsigned int in_len; 23942@@ -44,6 +44,7 @@ static unsigned int in_len;
23776 static char *in, *inbuf; 23943 static char *in, *inbuf;
23777 23944
@@ -23780,9 +23947,9 @@ diff -urNp linux-2.6.32.12/drivers/char/virtio_console.c linux-2.6.32.12/drivers
23780 static struct hv_ops virtio_cons; 23947 static struct hv_ops virtio_cons;
23781 23948
23782 /* The hvc device */ 23949 /* The hvc device */
23783diff -urNp linux-2.6.32.12/drivers/char/vt_ioctl.c linux-2.6.32.12/drivers/char/vt_ioctl.c 23950diff -urNp linux-2.6.32.13/drivers/char/vt_ioctl.c linux-2.6.32.13/drivers/char/vt_ioctl.c
23784--- linux-2.6.32.12/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400 23951--- linux-2.6.32.13/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400
23785+++ linux-2.6.32.12/drivers/char/vt_ioctl.c 2010-04-04 20:46:41.577798214 -0400 23952+++ linux-2.6.32.13/drivers/char/vt_ioctl.c 2010-05-15 13:21:15.062960555 -0400
23786@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ 23953@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __
23787 case KDSKBENT: 23954 case KDSKBENT:
23788 if (!perm) 23955 if (!perm)
@@ -23810,9 +23977,9 @@ diff -urNp linux-2.6.32.12/drivers/char/vt_ioctl.c linux-2.6.32.12/drivers/char/
23810 q = func_table[i]; 23977 q = func_table[i];
23811 first_free = funcbufptr + (funcbufsize - funcbufleft); 23978 first_free = funcbufptr + (funcbufsize - funcbufleft);
23812 for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 23979 for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++)
23813diff -urNp linux-2.6.32.12/drivers/cpufreq/cpufreq.c linux-2.6.32.12/drivers/cpufreq/cpufreq.c 23980diff -urNp linux-2.6.32.13/drivers/cpufreq/cpufreq.c linux-2.6.32.13/drivers/cpufreq/cpufreq.c
23814--- linux-2.6.32.12/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400 23981--- linux-2.6.32.13/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400
23815+++ linux-2.6.32.12/drivers/cpufreq/cpufreq.c 2010-04-04 20:46:41.577798214 -0400 23982+++ linux-2.6.32.13/drivers/cpufreq/cpufreq.c 2010-05-15 13:21:15.062960555 -0400
23816@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct 23983@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
23817 complete(&policy->kobj_unregister); 23984 complete(&policy->kobj_unregister);
23818 } 23985 }
@@ -23822,9 +23989,9 @@ diff -urNp linux-2.6.32.12/drivers/cpufreq/cpufreq.c linux-2.6.32.12/drivers/cpu
23822 .show = show, 23989 .show = show,
23823 .store = store, 23990 .store = store,
23824 }; 23991 };
23825diff -urNp linux-2.6.32.12/drivers/cpuidle/sysfs.c linux-2.6.32.12/drivers/cpuidle/sysfs.c 23992diff -urNp linux-2.6.32.13/drivers/cpuidle/sysfs.c linux-2.6.32.13/drivers/cpuidle/sysfs.c
23826--- linux-2.6.32.12/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400 23993--- linux-2.6.32.13/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400
23827+++ linux-2.6.32.12/drivers/cpuidle/sysfs.c 2010-04-29 17:46:36.917238919 -0400 23994+++ linux-2.6.32.13/drivers/cpuidle/sysfs.c 2010-05-15 13:21:15.062960555 -0400
23828@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj 23995@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
23829 return ret; 23996 return ret;
23830 } 23997 }
@@ -23852,9 +24019,9 @@ diff -urNp linux-2.6.32.12/drivers/cpuidle/sysfs.c linux-2.6.32.12/drivers/cpuid
23852 { 24019 {
23853 kobject_put(&device->kobjs[i]->kobj); 24020 kobject_put(&device->kobjs[i]->kobj);
23854 wait_for_completion(&device->kobjs[i]->kobj_unregister); 24021 wait_for_completion(&device->kobjs[i]->kobj_unregister);
23855diff -urNp linux-2.6.32.12/drivers/dma/ioat/dma.c linux-2.6.32.12/drivers/dma/ioat/dma.c 24022diff -urNp linux-2.6.32.13/drivers/dma/ioat/dma.c linux-2.6.32.13/drivers/dma/ioat/dma.c
23856--- linux-2.6.32.12/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400 24023--- linux-2.6.32.13/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400
23857+++ linux-2.6.32.12/drivers/dma/ioat/dma.c 2010-04-04 20:46:41.577798214 -0400 24024+++ linux-2.6.32.13/drivers/dma/ioat/dma.c 2010-05-15 13:21:15.074651091 -0400
23858@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str 24025@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
23859 return entry->show(&chan->common, page); 24026 return entry->show(&chan->common, page);
23860 } 24027 }
@@ -23864,9 +24031,9 @@ diff -urNp linux-2.6.32.12/drivers/dma/ioat/dma.c linux-2.6.32.12/drivers/dma/io
23864 .show = ioat_attr_show, 24031 .show = ioat_attr_show,
23865 }; 24032 };
23866 24033
23867diff -urNp linux-2.6.32.12/drivers/dma/ioat/dma.h linux-2.6.32.12/drivers/dma/ioat/dma.h 24034diff -urNp linux-2.6.32.13/drivers/dma/ioat/dma.h linux-2.6.32.13/drivers/dma/ioat/dma.h
23868--- linux-2.6.32.12/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400 24035--- linux-2.6.32.13/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400
23869+++ linux-2.6.32.12/drivers/dma/ioat/dma.h 2010-04-04 20:46:41.577798214 -0400 24036+++ linux-2.6.32.13/drivers/dma/ioat/dma.h 2010-05-15 13:21:15.090639890 -0400
23870@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c 24037@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
23871 unsigned long *phys_complete); 24038 unsigned long *phys_complete);
23872 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); 24039 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
@@ -23876,9 +24043,9 @@ diff -urNp linux-2.6.32.12/drivers/dma/ioat/dma.h linux-2.6.32.12/drivers/dma/io
23876 extern struct ioat_sysfs_entry ioat_version_attr; 24043 extern struct ioat_sysfs_entry ioat_version_attr;
23877 extern struct ioat_sysfs_entry ioat_cap_attr; 24044 extern struct ioat_sysfs_entry ioat_cap_attr;
23878 #endif /* IOATDMA_H */ 24045 #endif /* IOATDMA_H */
23879diff -urNp linux-2.6.32.12/drivers/edac/edac_core.h linux-2.6.32.12/drivers/edac/edac_core.h 24046diff -urNp linux-2.6.32.13/drivers/edac/edac_core.h linux-2.6.32.13/drivers/edac/edac_core.h
23880--- linux-2.6.32.12/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400 24047--- linux-2.6.32.13/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400
23881+++ linux-2.6.32.12/drivers/edac/edac_core.h 2010-04-04 20:46:41.577798214 -0400 24048+++ linux-2.6.32.13/drivers/edac/edac_core.h 2010-05-15 13:21:15.090639890 -0400
23882@@ -99,11 +99,11 @@ extern int edac_debug_level; 24049@@ -99,11 +99,11 @@ extern int edac_debug_level;
23883 24050
23884 #else /* !CONFIG_EDAC_DEBUG */ 24051 #else /* !CONFIG_EDAC_DEBUG */
@@ -23896,9 +24063,9 @@ diff -urNp linux-2.6.32.12/drivers/edac/edac_core.h linux-2.6.32.12/drivers/edac
23896 24063
23897 #endif /* !CONFIG_EDAC_DEBUG */ 24064 #endif /* !CONFIG_EDAC_DEBUG */
23898 24065
23899diff -urNp linux-2.6.32.12/drivers/edac/edac_device_sysfs.c linux-2.6.32.12/drivers/edac/edac_device_sysfs.c 24066diff -urNp linux-2.6.32.13/drivers/edac/edac_device_sysfs.c linux-2.6.32.13/drivers/edac/edac_device_sysfs.c
23900--- linux-2.6.32.12/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400 24067--- linux-2.6.32.13/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400
23901+++ linux-2.6.32.12/drivers/edac/edac_device_sysfs.c 2010-04-04 20:46:41.577798214 -0400 24068+++ linux-2.6.32.13/drivers/edac/edac_device_sysfs.c 2010-05-15 13:21:15.090639890 -0400
23902@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s 24069@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
23903 } 24070 }
23904 24071
@@ -23926,9 +24093,9 @@ diff -urNp linux-2.6.32.12/drivers/edac/edac_device_sysfs.c linux-2.6.32.12/driv
23926 .show = edac_dev_block_show, 24093 .show = edac_dev_block_show,
23927 .store = edac_dev_block_store 24094 .store = edac_dev_block_store
23928 }; 24095 };
23929diff -urNp linux-2.6.32.12/drivers/edac/edac_mc_sysfs.c linux-2.6.32.12/drivers/edac/edac_mc_sysfs.c 24096diff -urNp linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c
23930--- linux-2.6.32.12/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400 24097--- linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400
23931+++ linux-2.6.32.12/drivers/edac/edac_mc_sysfs.c 2010-04-04 20:46:41.577798214 -0400 24098+++ linux-2.6.32.13/drivers/edac/edac_mc_sysfs.c 2010-05-15 13:21:15.090639890 -0400
23932@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob 24099@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
23933 return -EIO; 24100 return -EIO;
23934 } 24101 }
@@ -23947,9 +24114,9 @@ diff -urNp linux-2.6.32.12/drivers/edac/edac_mc_sysfs.c linux-2.6.32.12/drivers/
23947 .show = mcidev_show, 24114 .show = mcidev_show,
23948 .store = mcidev_store 24115 .store = mcidev_store
23949 }; 24116 };
23950diff -urNp linux-2.6.32.12/drivers/edac/edac_pci_sysfs.c linux-2.6.32.12/drivers/edac/edac_pci_sysfs.c 24117diff -urNp linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c
23951--- linux-2.6.32.12/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400 24118--- linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400
23952+++ linux-2.6.32.12/drivers/edac/edac_pci_sysfs.c 2010-04-04 20:46:41.577798214 -0400 24119+++ linux-2.6.32.13/drivers/edac/edac_pci_sysfs.c 2010-05-15 13:21:15.090639890 -0400
23953@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s 24120@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
23954 } 24121 }
23955 24122
@@ -23968,9 +24135,9 @@ diff -urNp linux-2.6.32.12/drivers/edac/edac_pci_sysfs.c linux-2.6.32.12/drivers
23968 .show = edac_pci_dev_show, 24135 .show = edac_pci_dev_show,
23969 .store = edac_pci_dev_store 24136 .store = edac_pci_dev_store
23970 }; 24137 };
23971diff -urNp linux-2.6.32.12/drivers/firewire/core-cdev.c linux-2.6.32.12/drivers/firewire/core-cdev.c 24138diff -urNp linux-2.6.32.13/drivers/firewire/core-cdev.c linux-2.6.32.13/drivers/firewire/core-cdev.c
23972--- linux-2.6.32.12/drivers/firewire/core-cdev.c 2010-03-15 11:52:04.000000000 -0400 24139--- linux-2.6.32.13/drivers/firewire/core-cdev.c 2010-03-15 11:52:04.000000000 -0400
23973+++ linux-2.6.32.12/drivers/firewire/core-cdev.c 2010-04-29 17:46:37.101039010 -0400 24140+++ linux-2.6.32.13/drivers/firewire/core-cdev.c 2010-05-15 13:21:15.094957471 -0400
23974@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie 24141@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
23975 int ret; 24142 int ret;
23976 24143
@@ -23981,9 +24148,9 @@ diff -urNp linux-2.6.32.12/drivers/firewire/core-cdev.c linux-2.6.32.12/drivers/
23981 return -EINVAL; 24148 return -EINVAL;
23982 24149
23983 r = kmalloc(sizeof(*r), GFP_KERNEL); 24150 r = kmalloc(sizeof(*r), GFP_KERNEL);
23984diff -urNp linux-2.6.32.12/drivers/firmware/dmi_scan.c linux-2.6.32.12/drivers/firmware/dmi_scan.c 24151diff -urNp linux-2.6.32.13/drivers/firmware/dmi_scan.c linux-2.6.32.13/drivers/firmware/dmi_scan.c
23985--- linux-2.6.32.12/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400 24152--- linux-2.6.32.13/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400
23986+++ linux-2.6.32.12/drivers/firmware/dmi_scan.c 2010-04-04 20:46:41.577798214 -0400 24153+++ linux-2.6.32.13/drivers/firmware/dmi_scan.c 2010-05-15 13:21:15.094957471 -0400
23987@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) 24154@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
23988 } 24155 }
23989 } 24156 }
@@ -23996,9 +24163,9 @@ diff -urNp linux-2.6.32.12/drivers/firmware/dmi_scan.c linux-2.6.32.12/drivers/f
23996 p = dmi_ioremap(0xF0000, 0x10000); 24163 p = dmi_ioremap(0xF0000, 0x10000);
23997 if (p == NULL) 24164 if (p == NULL)
23998 goto error; 24165 goto error;
23999diff -urNp linux-2.6.32.12/drivers/firmware/edd.c linux-2.6.32.12/drivers/firmware/edd.c 24166diff -urNp linux-2.6.32.13/drivers/firmware/edd.c linux-2.6.32.13/drivers/firmware/edd.c
24000--- linux-2.6.32.12/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400 24167--- linux-2.6.32.13/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400
24001+++ linux-2.6.32.12/drivers/firmware/edd.c 2010-04-04 20:46:41.577798214 -0400 24168+++ linux-2.6.32.13/drivers/firmware/edd.c 2010-05-15 13:21:15.094957471 -0400
24002@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str 24169@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
24003 return ret; 24170 return ret;
24004 } 24171 }
@@ -24008,9 +24175,9 @@ diff -urNp linux-2.6.32.12/drivers/firmware/edd.c linux-2.6.32.12/drivers/firmwa
24008 .show = edd_attr_show, 24175 .show = edd_attr_show,
24009 }; 24176 };
24010 24177
24011diff -urNp linux-2.6.32.12/drivers/firmware/efivars.c linux-2.6.32.12/drivers/firmware/efivars.c 24178diff -urNp linux-2.6.32.13/drivers/firmware/efivars.c linux-2.6.32.13/drivers/firmware/efivars.c
24012--- linux-2.6.32.12/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400 24179--- linux-2.6.32.13/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400
24013+++ linux-2.6.32.12/drivers/firmware/efivars.c 2010-04-04 20:46:41.577798214 -0400 24180+++ linux-2.6.32.13/drivers/firmware/efivars.c 2010-05-15 13:21:15.102953838 -0400
24014@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct 24181@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
24015 return ret; 24182 return ret;
24016 } 24183 }
@@ -24020,9 +24187,9 @@ diff -urNp linux-2.6.32.12/drivers/firmware/efivars.c linux-2.6.32.12/drivers/fi
24020 .show = efivar_attr_show, 24187 .show = efivar_attr_show,
24021 .store = efivar_attr_store, 24188 .store = efivar_attr_store,
24022 }; 24189 };
24023diff -urNp linux-2.6.32.12/drivers/firmware/iscsi_ibft.c linux-2.6.32.12/drivers/firmware/iscsi_ibft.c 24190diff -urNp linux-2.6.32.13/drivers/firmware/iscsi_ibft.c linux-2.6.32.13/drivers/firmware/iscsi_ibft.c
24024--- linux-2.6.32.12/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400 24191--- linux-2.6.32.13/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400
24025+++ linux-2.6.32.12/drivers/firmware/iscsi_ibft.c 2010-04-04 20:46:41.581454607 -0400 24192+++ linux-2.6.32.13/drivers/firmware/iscsi_ibft.c 2010-05-15 13:21:15.102953838 -0400
24026@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc 24193@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
24027 return ret; 24194 return ret;
24028 } 24195 }
@@ -24032,9 +24199,9 @@ diff -urNp linux-2.6.32.12/drivers/firmware/iscsi_ibft.c linux-2.6.32.12/drivers
24032 .show = ibft_show_attribute, 24199 .show = ibft_show_attribute,
24033 }; 24200 };
24034 24201
24035diff -urNp linux-2.6.32.12/drivers/firmware/memmap.c linux-2.6.32.12/drivers/firmware/memmap.c 24202diff -urNp linux-2.6.32.13/drivers/firmware/memmap.c linux-2.6.32.13/drivers/firmware/memmap.c
24036--- linux-2.6.32.12/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400 24203--- linux-2.6.32.13/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400
24037+++ linux-2.6.32.12/drivers/firmware/memmap.c 2010-04-04 20:46:41.581454607 -0400 24204+++ linux-2.6.32.13/drivers/firmware/memmap.c 2010-05-15 13:21:15.102953838 -0400
24038@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { 24205@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
24039 NULL 24206 NULL
24040 }; 24207 };
@@ -24044,9 +24211,9 @@ diff -urNp linux-2.6.32.12/drivers/firmware/memmap.c linux-2.6.32.12/drivers/fir
24044 .show = memmap_attr_show, 24211 .show = memmap_attr_show,
24045 }; 24212 };
24046 24213
24047diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_drv.c linux-2.6.32.12/drivers/gpu/drm/drm_drv.c 24214diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_drv.c linux-2.6.32.13/drivers/gpu/drm/drm_drv.c
24048--- linux-2.6.32.12/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400 24215--- linux-2.6.32.13/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400
24049+++ linux-2.6.32.12/drivers/gpu/drm/drm_drv.c 2010-04-04 20:46:41.581454607 -0400 24216+++ linux-2.6.32.13/drivers/gpu/drm/drm_drv.c 2010-05-15 13:21:15.118645498 -0400
24050@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc 24217@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
24051 char *kdata = NULL; 24218 char *kdata = NULL;
24052 24219
@@ -24056,9 +24223,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_drv.c linux-2.6.32.12/drivers/gpu
24056 ++file_priv->ioctl_count; 24223 ++file_priv->ioctl_count;
24057 24224
24058 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", 24225 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
24059diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_fops.c linux-2.6.32.12/drivers/gpu/drm/drm_fops.c 24226diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_fops.c linux-2.6.32.13/drivers/gpu/drm/drm_fops.c
24060--- linux-2.6.32.12/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:37.845185844 -0400 24227--- linux-2.6.32.13/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:37.845185844 -0400
24061+++ linux-2.6.32.12/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:58.154995647 -0400 24228+++ linux-2.6.32.13/drivers/gpu/drm/drm_fops.c 2010-05-15 13:21:15.130631389 -0400
24062@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * 24229@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
24063 } 24230 }
24064 24231
@@ -24110,9 +24277,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_fops.c linux-2.6.32.12/drivers/gp
24110 if (atomic_read(&dev->ioctl_count)) { 24277 if (atomic_read(&dev->ioctl_count)) {
24111 DRM_ERROR("Device busy: %d\n", 24278 DRM_ERROR("Device busy: %d\n",
24112 atomic_read(&dev->ioctl_count)); 24279 atomic_read(&dev->ioctl_count));
24113diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.12/drivers/gpu/drm/drm_ioctl.c 24280diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c
24114--- linux-2.6.32.12/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400 24281--- linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400
24115+++ linux-2.6.32.12/drivers/gpu/drm/drm_ioctl.c 2010-04-04 20:46:41.581454607 -0400 24282+++ linux-2.6.32.13/drivers/gpu/drm/drm_ioctl.c 2010-05-15 13:21:15.138734335 -0400
24116@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, 24283@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
24117 stats->data[i].value = 24284 stats->data[i].value =
24118 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); 24285 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -24122,9 +24289,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.12/drivers/g
24122 stats->data[i].type = dev->types[i]; 24289 stats->data[i].type = dev->types[i];
24123 } 24290 }
24124 24291
24125diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_lock.c linux-2.6.32.12/drivers/gpu/drm/drm_lock.c 24292diff -urNp linux-2.6.32.13/drivers/gpu/drm/drm_lock.c linux-2.6.32.13/drivers/gpu/drm/drm_lock.c
24126--- linux-2.6.32.12/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400 24293--- linux-2.6.32.13/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400
24127+++ linux-2.6.32.12/drivers/gpu/drm/drm_lock.c 2010-04-04 20:46:41.581454607 -0400 24294+++ linux-2.6.32.13/drivers/gpu/drm/drm_lock.c 2010-05-15 13:21:15.138734335 -0400
24128@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi 24295@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
24129 if (drm_lock_take(&master->lock, lock->context)) { 24296 if (drm_lock_take(&master->lock, lock->context)) {
24130 master->lock.file_priv = file_priv; 24297 master->lock.file_priv = file_priv;
@@ -24143,9 +24310,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_lock.c linux-2.6.32.12/drivers/gp
24143 24310
24144 /* kernel_context_switch isn't used by any of the x86 drm 24311 /* kernel_context_switch isn't used by any of the x86 drm
24145 * modules but is required by the Sparc driver. 24312 * modules but is required by the Sparc driver.
24146diff -urNp linux-2.6.32.12/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.12/drivers/gpu/drm/i810/i810_dma.c 24313diff -urNp linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c
24147--- linux-2.6.32.12/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400 24314--- linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400
24148+++ linux-2.6.32.12/drivers/gpu/drm/i810/i810_dma.c 2010-04-04 20:46:41.581454607 -0400 24315+++ linux-2.6.32.13/drivers/gpu/drm/i810/i810_dma.c 2010-05-15 13:21:15.158669145 -0400
24149@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de 24316@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
24150 dma->buflist[vertex->idx], 24317 dma->buflist[vertex->idx],
24151 vertex->discard, vertex->used); 24318 vertex->discard, vertex->used);
@@ -24168,9 +24335,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.12/drive
24168 sarea_priv->last_enqueue = dev_priv->counter - 1; 24335 sarea_priv->last_enqueue = dev_priv->counter - 1;
24169 sarea_priv->last_dispatch = (int)hw_status[5]; 24336 sarea_priv->last_dispatch = (int)hw_status[5];
24170 24337
24171diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7017.c 24338diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c
24172--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400 24339--- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400
24173+++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7017.c 2010-04-04 20:46:41.581454607 -0400 24340+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7017.c 2010-05-15 13:21:15.175041309 -0400
24174@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ 24341@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
24175 } 24342 }
24176 } 24343 }
@@ -24180,9 +24347,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.12/dri
24180 .init = ch7017_init, 24347 .init = ch7017_init,
24181 .detect = ch7017_detect, 24348 .detect = ch7017_detect,
24182 .mode_valid = ch7017_mode_valid, 24349 .mode_valid = ch7017_mode_valid,
24183diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7xxx.c 24350diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c
24184--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400 24351--- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400
24185+++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-04-04 20:46:41.581454607 -0400 24352+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-05-15 13:21:15.175041309 -0400
24186@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ 24353@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
24187 } 24354 }
24188 } 24355 }
@@ -24192,9 +24359,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.12/dri
24192 .init = ch7xxx_init, 24359 .init = ch7xxx_init,
24193 .detect = ch7xxx_detect, 24360 .detect = ch7xxx_detect,
24194 .mode_valid = ch7xxx_mode_valid, 24361 .mode_valid = ch7xxx_mode_valid,
24195diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo.h linux-2.6.32.12/drivers/gpu/drm/i915/dvo.h 24362diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h
24196--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400 24363--- linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400
24197+++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo.h 2010-04-04 20:46:41.581454607 -0400 24364+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo.h 2010-05-15 13:21:15.175041309 -0400
24198@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { 24365@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
24199 * 24366 *
24200 * \return singly-linked list of modes or NULL if no modes found. 24367 * \return singly-linked list of modes or NULL if no modes found.
@@ -24227,9 +24394,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo.h linux-2.6.32.12/drivers/gp
24227+extern const struct intel_dvo_dev_ops ch7017_ops; 24394+extern const struct intel_dvo_dev_ops ch7017_ops;
24228 24395
24229 #endif /* _INTEL_DVO_H */ 24396 #endif /* _INTEL_DVO_H */
24230diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ivch.c 24397diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c
24231--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400 24398--- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400
24232+++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ivch.c 2010-04-04 20:46:41.581454607 -0400 24399+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_ivch.c 2010-05-15 13:21:15.175041309 -0400
24233@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv 24400@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
24234 } 24401 }
24235 } 24402 }
@@ -24239,9 +24406,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.12/drive
24239 .init = ivch_init, 24406 .init = ivch_init,
24240 .dpms = ivch_dpms, 24407 .dpms = ivch_dpms,
24241 .save = ivch_save, 24408 .save = ivch_save,
24242diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.12/drivers/gpu/drm/i915/dvo_sil164.c 24409diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c
24243--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400 24410--- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400
24244+++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_sil164.c 2010-04-04 20:46:41.581454607 -0400 24411+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_sil164.c 2010-05-15 13:21:15.175041309 -0400
24245@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ 24412@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
24246 } 24413 }
24247 } 24414 }
@@ -24251,9 +24418,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.12/dri
24251 .init = sil164_init, 24418 .init = sil164_init,
24252 .detect = sil164_detect, 24419 .detect = sil164_detect,
24253 .mode_valid = sil164_mode_valid, 24420 .mode_valid = sil164_mode_valid,
24254diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.12/drivers/gpu/drm/i915/dvo_tfp410.c 24421diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c
24255--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400 24422--- linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400
24256+++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_tfp410.c 2010-04-04 20:46:41.581454607 -0400 24423+++ linux-2.6.32.13/drivers/gpu/drm/i915/dvo_tfp410.c 2010-05-15 13:21:15.178966455 -0400
24257@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ 24424@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
24258 } 24425 }
24259 } 24426 }
@@ -24263,9 +24430,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.12/dri
24263 .init = tfp410_init, 24430 .init = tfp410_init,
24264 .detect = tfp410_detect, 24431 .detect = tfp410_detect,
24265 .mode_valid = tfp410_mode_valid, 24432 .mode_valid = tfp410_mode_valid,
24266diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.12/drivers/gpu/drm/i915/i915_drv.c 24433diff -urNp linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c
24267--- linux-2.6.32.12/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400 24434--- linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400
24268+++ linux-2.6.32.12/drivers/gpu/drm/i915/i915_drv.c 2010-04-04 20:46:41.581454607 -0400 24435+++ linux-2.6.32.13/drivers/gpu/drm/i915/i915_drv.c 2010-05-15 13:21:15.178966455 -0400
24269@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) 24436@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev)
24270 return i915_resume(dev); 24437 return i915_resume(dev);
24271 } 24438 }
@@ -24275,9 +24442,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.12/drive
24275 .fault = i915_gem_fault, 24442 .fault = i915_gem_fault,
24276 .open = drm_gem_vm_open, 24443 .open = drm_gem_vm_open,
24277 .close = drm_gem_vm_close, 24444 .close = drm_gem_vm_close,
24278diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.12/drivers/gpu/drm/radeon/mkregtable.c 24445diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c
24279--- linux-2.6.32.12/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400 24446--- linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400
24280+++ linux-2.6.32.12/drivers/gpu/drm/radeon/mkregtable.c 2010-04-04 20:46:41.581454607 -0400 24447+++ linux-2.6.32.13/drivers/gpu/drm/radeon/mkregtable.c 2010-05-15 13:21:15.190982657 -0400
24281@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 24448@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
24282 regex_t mask_rex; 24449 regex_t mask_rex;
24283 regmatch_t match[4]; 24450 regmatch_t match[4];
@@ -24295,9 +24462,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.12/d
24295 24462
24296 if (regcomp 24463 if (regcomp
24297 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { 24464 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
24298diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_atombios.c 24465diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c
24299--- linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400 24466--- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400
24300+++ linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_atombios.c 2010-04-04 20:46:41.581454607 -0400 24467+++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_atombios.c 2010-05-15 13:21:15.194751236 -0400
24301@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o 24468@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o
24302 } 24469 }
24303 } 24470 }
@@ -24322,9 +24489,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32
24322 24489
24323 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); 24490 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
24324 24491
24325diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_display.c 24492diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c
24326--- linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_display.c 2010-03-15 11:52:04.000000000 -0400 24493--- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c 2010-03-15 11:52:04.000000000 -0400
24327+++ linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_display.c 2010-04-29 17:46:37.101039010 -0400 24494+++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_display.c 2010-05-15 13:21:15.198961996 -0400
24328@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl 24495@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
24329 24496
24330 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { 24497 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
@@ -24334,9 +24501,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.
24334 } else 24501 } else
24335 error = abs(current_freq - freq); 24502 error = abs(current_freq - freq);
24336 vco_diff = abs(vco - best_vco); 24503 vco_diff = abs(vco - best_vco);
24337diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_state.c 24504diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c
24338--- linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400 24505--- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400
24339+++ linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_state.c 2010-04-04 20:46:41.581454607 -0400 24506+++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_state.c 2010-05-15 13:21:15.206905040 -0400
24340@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm 24507@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm
24341 { 24508 {
24342 drm_radeon_private_t *dev_priv = dev->dev_private; 24509 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -24346,9 +24513,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.12
24346 24513
24347 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); 24514 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
24348 24515
24349diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_ttm.c 24516diff -urNp linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c
24350--- linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400 24517--- linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400
24351+++ linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_ttm.c 2010-04-04 20:46:41.581454607 -0400 24518+++ linux-2.6.32.13/drivers/gpu/drm/radeon/radeon_ttm.c 2010-05-15 13:21:15.206905040 -0400
24352@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic 24519@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
24353 DRM_INFO("radeon: ttm finalized\n"); 24520 DRM_INFO("radeon: ttm finalized\n");
24354 } 24521 }
@@ -24400,9 +24567,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.12/d
24400 } 24567 }
24401 24568
24402 24569
24403diff -urNp linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo.c 24570diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c
24404--- linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400 24571--- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400
24405+++ linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo.c 2010-04-29 17:46:36.939238869 -0400 24572+++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo.c 2010-05-15 13:21:15.206905040 -0400
24406@@ -39,7 +39,7 @@ 24573@@ -39,7 +39,7 @@
24407 #include <linux/module.h> 24574 #include <linux/module.h>
24408 24575
@@ -24421,9 +24588,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.12/drivers/
24421 .show = &ttm_bo_global_show 24588 .show = &ttm_bo_global_show
24422 }; 24589 };
24423 24590
24424diff -urNp linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo_vm.c 24591diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c
24425--- linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400 24592--- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400
24426+++ linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-04-04 20:46:41.585591308 -0400 24593+++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-05-15 13:21:15.206905040 -0400
24427@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are 24594@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
24428 { 24595 {
24429 struct ttm_buffer_object *bo = (struct ttm_buffer_object *) 24596 struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -24444,9 +24611,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.12/drive
24444 /* 24611 /*
24445 * Work around locking order reversal in fault / nopfn 24612 * Work around locking order reversal in fault / nopfn
24446 * between mmap_sem and bo_reserve: Perform a trylock operation 24613 * between mmap_sem and bo_reserve: Perform a trylock operation
24447diff -urNp linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_global.c 24614diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c
24448--- linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400 24615--- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400
24449+++ linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_global.c 2010-04-04 20:46:41.585591308 -0400 24616+++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_global.c 2010-05-15 13:21:15.206905040 -0400
24450@@ -36,7 +36,7 @@ 24617@@ -36,7 +36,7 @@
24451 struct ttm_global_item { 24618 struct ttm_global_item {
24452 struct mutex mutex; 24619 struct mutex mutex;
@@ -24504,9 +24671,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.12/driv
24504 ref->release(ref); 24671 ref->release(ref);
24505 item->object = NULL; 24672 item->object = NULL;
24506 } 24673 }
24507diff -urNp linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_memory.c 24674diff -urNp linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c
24508--- linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400 24675--- linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400
24509+++ linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_memory.c 2010-04-04 20:46:41.585591308 -0400 24676+++ linux-2.6.32.13/drivers/gpu/drm/ttm/ttm_memory.c 2010-05-15 13:21:15.206905040 -0400
24510@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at 24677@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
24511 NULL 24678 NULL
24512 }; 24679 };
@@ -24516,9 +24683,9 @@ diff -urNp linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.12/driv
24516 .show = &ttm_mem_zone_show, 24683 .show = &ttm_mem_zone_show,
24517 .store = &ttm_mem_zone_store 24684 .store = &ttm_mem_zone_store
24518 }; 24685 };
24519diff -urNp linux-2.6.32.12/drivers/hid/usbhid/hiddev.c linux-2.6.32.12/drivers/hid/usbhid/hiddev.c 24686diff -urNp linux-2.6.32.13/drivers/hid/usbhid/hiddev.c linux-2.6.32.13/drivers/hid/usbhid/hiddev.c
24520--- linux-2.6.32.12/drivers/hid/usbhid/hiddev.c 2010-03-15 11:52:04.000000000 -0400 24687--- linux-2.6.32.13/drivers/hid/usbhid/hiddev.c 2010-03-15 11:52:04.000000000 -0400
24521+++ linux-2.6.32.12/drivers/hid/usbhid/hiddev.c 2010-04-29 17:46:37.113104605 -0400 24688+++ linux-2.6.32.13/drivers/hid/usbhid/hiddev.c 2010-05-15 13:21:15.206905040 -0400
24522@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi 24689@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
24523 return put_user(HID_VERSION, (int __user *)arg); 24690 return put_user(HID_VERSION, (int __user *)arg);
24524 24691
@@ -24528,9 +24695,9 @@ diff -urNp linux-2.6.32.12/drivers/hid/usbhid/hiddev.c linux-2.6.32.12/drivers/h
24528 return -EINVAL; 24695 return -EINVAL;
24529 24696
24530 for (i = 0; i < hid->maxcollection; i++) 24697 for (i = 0; i < hid->maxcollection; i++)
24531diff -urNp linux-2.6.32.12/drivers/hwmon/k8temp.c linux-2.6.32.12/drivers/hwmon/k8temp.c 24698diff -urNp linux-2.6.32.13/drivers/hwmon/k8temp.c linux-2.6.32.13/drivers/hwmon/k8temp.c
24532--- linux-2.6.32.12/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400 24699--- linux-2.6.32.13/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400
24533+++ linux-2.6.32.12/drivers/hwmon/k8temp.c 2010-04-04 20:46:41.585591308 -0400 24700+++ linux-2.6.32.13/drivers/hwmon/k8temp.c 2010-05-15 13:21:15.206905040 -0400
24534@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n 24701@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
24535 24702
24536 static struct pci_device_id k8temp_ids[] = { 24703 static struct pci_device_id k8temp_ids[] = {
@@ -24540,9 +24707,9 @@ diff -urNp linux-2.6.32.12/drivers/hwmon/k8temp.c linux-2.6.32.12/drivers/hwmon/
24540 }; 24707 };
24541 24708
24542 MODULE_DEVICE_TABLE(pci, k8temp_ids); 24709 MODULE_DEVICE_TABLE(pci, k8temp_ids);
24543diff -urNp linux-2.6.32.12/drivers/hwmon/sis5595.c linux-2.6.32.12/drivers/hwmon/sis5595.c 24710diff -urNp linux-2.6.32.13/drivers/hwmon/sis5595.c linux-2.6.32.13/drivers/hwmon/sis5595.c
24544--- linux-2.6.32.12/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400 24711--- linux-2.6.32.13/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400
24545+++ linux-2.6.32.12/drivers/hwmon/sis5595.c 2010-04-04 20:46:41.585591308 -0400 24712+++ linux-2.6.32.13/drivers/hwmon/sis5595.c 2010-05-15 13:21:15.222963784 -0400
24546@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda 24713@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
24547 24714
24548 static struct pci_device_id sis5595_pci_ids[] = { 24715 static struct pci_device_id sis5595_pci_ids[] = {
@@ -24552,9 +24719,9 @@ diff -urNp linux-2.6.32.12/drivers/hwmon/sis5595.c linux-2.6.32.12/drivers/hwmon
24552 }; 24719 };
24553 24720
24554 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); 24721 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
24555diff -urNp linux-2.6.32.12/drivers/hwmon/via686a.c linux-2.6.32.12/drivers/hwmon/via686a.c 24722diff -urNp linux-2.6.32.13/drivers/hwmon/via686a.c linux-2.6.32.13/drivers/hwmon/via686a.c
24556--- linux-2.6.32.12/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400 24723--- linux-2.6.32.13/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400
24557+++ linux-2.6.32.12/drivers/hwmon/via686a.c 2010-04-04 20:46:41.585591308 -0400 24724+++ linux-2.6.32.13/drivers/hwmon/via686a.c 2010-05-15 13:21:15.230602217 -0400
24558@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda 24725@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
24559 24726
24560 static struct pci_device_id via686a_pci_ids[] = { 24727 static struct pci_device_id via686a_pci_ids[] = {
@@ -24564,9 +24731,9 @@ diff -urNp linux-2.6.32.12/drivers/hwmon/via686a.c linux-2.6.32.12/drivers/hwmon
24564 }; 24731 };
24565 24732
24566 MODULE_DEVICE_TABLE(pci, via686a_pci_ids); 24733 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
24567diff -urNp linux-2.6.32.12/drivers/hwmon/vt8231.c linux-2.6.32.12/drivers/hwmon/vt8231.c 24734diff -urNp linux-2.6.32.13/drivers/hwmon/vt8231.c linux-2.6.32.13/drivers/hwmon/vt8231.c
24568--- linux-2.6.32.12/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400 24735--- linux-2.6.32.13/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400
24569+++ linux-2.6.32.12/drivers/hwmon/vt8231.c 2010-04-04 20:46:41.585591308 -0400 24736+++ linux-2.6.32.13/drivers/hwmon/vt8231.c 2010-05-15 13:21:15.230602217 -0400
24570@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri 24737@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
24571 24738
24572 static struct pci_device_id vt8231_pci_ids[] = { 24739 static struct pci_device_id vt8231_pci_ids[] = {
@@ -24576,9 +24743,9 @@ diff -urNp linux-2.6.32.12/drivers/hwmon/vt8231.c linux-2.6.32.12/drivers/hwmon/
24576 }; 24743 };
24577 24744
24578 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); 24745 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
24579diff -urNp linux-2.6.32.12/drivers/hwmon/w83791d.c linux-2.6.32.12/drivers/hwmon/w83791d.c 24746diff -urNp linux-2.6.32.13/drivers/hwmon/w83791d.c linux-2.6.32.13/drivers/hwmon/w83791d.c
24580--- linux-2.6.32.12/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400 24747--- linux-2.6.32.13/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400
24581+++ linux-2.6.32.12/drivers/hwmon/w83791d.c 2010-04-04 20:46:41.585591308 -0400 24748+++ linux-2.6.32.13/drivers/hwmon/w83791d.c 2010-05-15 13:21:15.234719424 -0400
24582@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli 24749@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
24583 struct i2c_board_info *info); 24750 struct i2c_board_info *info);
24584 static int w83791d_remove(struct i2c_client *client); 24751 static int w83791d_remove(struct i2c_client *client);
@@ -24590,9 +24757,9 @@ diff -urNp linux-2.6.32.12/drivers/hwmon/w83791d.c linux-2.6.32.12/drivers/hwmon
24590 static struct w83791d_data *w83791d_update_device(struct device *dev); 24757 static struct w83791d_data *w83791d_update_device(struct device *dev);
24591 24758
24592 #ifdef DEBUG 24759 #ifdef DEBUG
24593diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-i801.c linux-2.6.32.12/drivers/i2c/busses/i2c-i801.c 24760diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c
24594--- linux-2.6.32.12/drivers/i2c/busses/i2c-i801.c 2010-04-29 17:49:37.945518391 -0400 24761--- linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c 2010-04-29 17:49:37.945518391 -0400
24595+++ linux-2.6.32.12/drivers/i2c/busses/i2c-i801.c 2010-04-29 18:00:43.521920899 -0400 24762+++ linux-2.6.32.13/drivers/i2c/busses/i2c-i801.c 2010-05-15 13:21:15.234719424 -0400
24596@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] = 24763@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] =
24597 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, 24764 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
24598 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, 24765 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
@@ -24602,9 +24769,9 @@ diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-i801.c linux-2.6.32.12/drivers
24602 }; 24769 };
24603 24770
24604 MODULE_DEVICE_TABLE (pci, i801_ids); 24771 MODULE_DEVICE_TABLE (pci, i801_ids);
24605diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.12/drivers/i2c/busses/i2c-piix4.c 24772diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c
24606--- linux-2.6.32.12/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400 24773--- linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400
24607+++ linux-2.6.32.12/drivers/i2c/busses/i2c-piix4.c 2010-04-04 20:46:41.585591308 -0400 24774+++ linux-2.6.32.13/drivers/i2c/busses/i2c-piix4.c 2010-05-15 13:21:15.234719424 -0400
24608@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat 24775@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
24609 .ident = "IBM", 24776 .ident = "IBM",
24610 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, 24777 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -24623,9 +24790,9 @@ diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.12/driver
24623 }; 24790 };
24624 24791
24625 MODULE_DEVICE_TABLE (pci, piix4_ids); 24792 MODULE_DEVICE_TABLE (pci, piix4_ids);
24626diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.12/drivers/i2c/busses/i2c-sis630.c 24793diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c
24627--- linux-2.6.32.12/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400 24794--- linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400
24628+++ linux-2.6.32.12/drivers/i2c/busses/i2c-sis630.c 2010-04-04 20:46:41.585591308 -0400 24795+++ linux-2.6.32.13/drivers/i2c/busses/i2c-sis630.c 2010-05-15 13:21:15.234719424 -0400
24629@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter 24796@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
24630 static struct pci_device_id sis630_ids[] __devinitdata = { 24797 static struct pci_device_id sis630_ids[] __devinitdata = {
24631 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 24798 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
@@ -24635,9 +24802,9 @@ diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.12/drive
24635 }; 24802 };
24636 24803
24637 MODULE_DEVICE_TABLE (pci, sis630_ids); 24804 MODULE_DEVICE_TABLE (pci, sis630_ids);
24638diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.12/drivers/i2c/busses/i2c-sis96x.c 24805diff -urNp linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c
24639--- linux-2.6.32.12/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400 24806--- linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400
24640+++ linux-2.6.32.12/drivers/i2c/busses/i2c-sis96x.c 2010-04-04 20:46:41.585591308 -0400 24807+++ linux-2.6.32.13/drivers/i2c/busses/i2c-sis96x.c 2010-05-15 13:21:15.234719424 -0400
24641@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter 24808@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
24642 24809
24643 static struct pci_device_id sis96x_ids[] = { 24810 static struct pci_device_id sis96x_ids[] = {
@@ -24647,9 +24814,9 @@ diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.12/drive
24647 }; 24814 };
24648 24815
24649 MODULE_DEVICE_TABLE (pci, sis96x_ids); 24816 MODULE_DEVICE_TABLE (pci, sis96x_ids);
24650diff -urNp linux-2.6.32.12/drivers/ide/ide-cd.c linux-2.6.32.12/drivers/ide/ide-cd.c 24817diff -urNp linux-2.6.32.13/drivers/ide/ide-cd.c linux-2.6.32.13/drivers/ide/ide-cd.c
24651--- linux-2.6.32.12/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400 24818--- linux-2.6.32.13/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400
24652+++ linux-2.6.32.12/drivers/ide/ide-cd.c 2010-04-04 20:46:41.585591308 -0400 24819+++ linux-2.6.32.13/drivers/ide/ide-cd.c 2010-05-15 13:21:15.234719424 -0400
24653@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ 24820@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_
24654 alignment = queue_dma_alignment(q) | q->dma_pad_mask; 24821 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
24655 if ((unsigned long)buf & alignment 24822 if ((unsigned long)buf & alignment
@@ -24659,9 +24826,9 @@ diff -urNp linux-2.6.32.12/drivers/ide/ide-cd.c linux-2.6.32.12/drivers/ide/ide-
24659 drive->dma = 0; 24826 drive->dma = 0;
24660 } 24827 }
24661 } 24828 }
24662diff -urNp linux-2.6.32.12/drivers/ieee1394/dv1394.c linux-2.6.32.12/drivers/ieee1394/dv1394.c 24829diff -urNp linux-2.6.32.13/drivers/ieee1394/dv1394.c linux-2.6.32.13/drivers/ieee1394/dv1394.c
24663--- linux-2.6.32.12/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400 24830--- linux-2.6.32.13/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400
24664+++ linux-2.6.32.12/drivers/ieee1394/dv1394.c 2010-04-04 20:46:41.585591308 -0400 24831+++ linux-2.6.32.13/drivers/ieee1394/dv1394.c 2010-05-15 13:21:15.234719424 -0400
24665@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c 24832@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
24666 based upon DIF section and sequence 24833 based upon DIF section and sequence
24667 */ 24834 */
@@ -24680,9 +24847,9 @@ diff -urNp linux-2.6.32.12/drivers/ieee1394/dv1394.c linux-2.6.32.12/drivers/iee
24680 }; 24847 };
24681 24848
24682 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); 24849 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
24683diff -urNp linux-2.6.32.12/drivers/ieee1394/eth1394.c linux-2.6.32.12/drivers/ieee1394/eth1394.c 24850diff -urNp linux-2.6.32.13/drivers/ieee1394/eth1394.c linux-2.6.32.13/drivers/ieee1394/eth1394.c
24684--- linux-2.6.32.12/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400 24851--- linux-2.6.32.13/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400
24685+++ linux-2.6.32.12/drivers/ieee1394/eth1394.c 2010-04-04 20:46:41.585591308 -0400 24852+++ linux-2.6.32.13/drivers/ieee1394/eth1394.c 2010-05-15 13:21:15.250965621 -0400
24686@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e 24853@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
24687 .specifier_id = ETHER1394_GASP_SPECIFIER_ID, 24854 .specifier_id = ETHER1394_GASP_SPECIFIER_ID,
24688 .version = ETHER1394_GASP_VERSION, 24855 .version = ETHER1394_GASP_VERSION,
@@ -24692,9 +24859,9 @@ diff -urNp linux-2.6.32.12/drivers/ieee1394/eth1394.c linux-2.6.32.12/drivers/ie
24692 }; 24859 };
24693 24860
24694 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); 24861 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
24695diff -urNp linux-2.6.32.12/drivers/ieee1394/hosts.c linux-2.6.32.12/drivers/ieee1394/hosts.c 24862diff -urNp linux-2.6.32.13/drivers/ieee1394/hosts.c linux-2.6.32.13/drivers/ieee1394/hosts.c
24696--- linux-2.6.32.12/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400 24863--- linux-2.6.32.13/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400
24697+++ linux-2.6.32.12/drivers/ieee1394/hosts.c 2010-04-04 20:46:41.589782410 -0400 24864+++ linux-2.6.32.13/drivers/ieee1394/hosts.c 2010-05-15 13:21:15.250965621 -0400
24698@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso 24865@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
24699 } 24866 }
24700 24867
@@ -24703,9 +24870,9 @@ diff -urNp linux-2.6.32.12/drivers/ieee1394/hosts.c linux-2.6.32.12/drivers/ieee
24703 .transmit_packet = dummy_transmit_packet, 24870 .transmit_packet = dummy_transmit_packet,
24704 .devctl = dummy_devctl, 24871 .devctl = dummy_devctl,
24705 .isoctl = dummy_isoctl 24872 .isoctl = dummy_isoctl
24706diff -urNp linux-2.6.32.12/drivers/ieee1394/ohci1394.c linux-2.6.32.12/drivers/ieee1394/ohci1394.c 24873diff -urNp linux-2.6.32.13/drivers/ieee1394/ohci1394.c linux-2.6.32.13/drivers/ieee1394/ohci1394.c
24707--- linux-2.6.32.12/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400 24874--- linux-2.6.32.13/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400
24708+++ linux-2.6.32.12/drivers/ieee1394/ohci1394.c 2010-04-04 20:46:41.589782410 -0400 24875+++ linux-2.6.32.13/drivers/ieee1394/ohci1394.c 2010-05-15 13:21:15.283282671 -0400
24709@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ 24876@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
24710 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) 24877 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
24711 24878
@@ -24727,9 +24894,9 @@ diff -urNp linux-2.6.32.12/drivers/ieee1394/ohci1394.c linux-2.6.32.12/drivers/i
24727 }; 24894 };
24728 24895
24729 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); 24896 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
24730diff -urNp linux-2.6.32.12/drivers/ieee1394/raw1394.c linux-2.6.32.12/drivers/ieee1394/raw1394.c 24897diff -urNp linux-2.6.32.13/drivers/ieee1394/raw1394.c linux-2.6.32.13/drivers/ieee1394/raw1394.c
24731--- linux-2.6.32.12/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400 24898--- linux-2.6.32.13/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400
24732+++ linux-2.6.32.12/drivers/ieee1394/raw1394.c 2010-04-04 20:46:41.589782410 -0400 24899+++ linux-2.6.32.13/drivers/ieee1394/raw1394.c 2010-05-15 13:21:15.340016183 -0400
24733@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r 24900@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
24734 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 24901 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
24735 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 24902 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -24739,9 +24906,9 @@ diff -urNp linux-2.6.32.12/drivers/ieee1394/raw1394.c linux-2.6.32.12/drivers/ie
24739 }; 24906 };
24740 24907
24741 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); 24908 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
24742diff -urNp linux-2.6.32.12/drivers/ieee1394/sbp2.c linux-2.6.32.12/drivers/ieee1394/sbp2.c 24909diff -urNp linux-2.6.32.13/drivers/ieee1394/sbp2.c linux-2.6.32.13/drivers/ieee1394/sbp2.c
24743--- linux-2.6.32.12/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400 24910--- linux-2.6.32.13/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400
24744+++ linux-2.6.32.12/drivers/ieee1394/sbp2.c 2010-04-04 20:46:41.589782410 -0400 24911+++ linux-2.6.32.13/drivers/ieee1394/sbp2.c 2010-05-15 13:21:15.374974502 -0400
24745@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s 24912@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
24746 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 24913 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
24747 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, 24914 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -24760,9 +24927,9 @@ diff -urNp linux-2.6.32.12/drivers/ieee1394/sbp2.c linux-2.6.32.12/drivers/ieee1
24760 { 24927 {
24761 int ret; 24928 int ret;
24762 24929
24763diff -urNp linux-2.6.32.12/drivers/ieee1394/video1394.c linux-2.6.32.12/drivers/ieee1394/video1394.c 24930diff -urNp linux-2.6.32.13/drivers/ieee1394/video1394.c linux-2.6.32.13/drivers/ieee1394/video1394.c
24764--- linux-2.6.32.12/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400 24931--- linux-2.6.32.13/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400
24765+++ linux-2.6.32.12/drivers/ieee1394/video1394.c 2010-04-04 20:46:41.589782410 -0400 24932+++ linux-2.6.32.13/drivers/ieee1394/video1394.c 2010-05-15 13:21:15.379405032 -0400
24766@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v 24933@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
24767 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 24934 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
24768 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff 24935 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
@@ -24772,9 +24939,9 @@ diff -urNp linux-2.6.32.12/drivers/ieee1394/video1394.c linux-2.6.32.12/drivers/
24772 }; 24939 };
24773 24940
24774 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); 24941 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
24775diff -urNp linux-2.6.32.12/drivers/infiniband/core/cm.c linux-2.6.32.12/drivers/infiniband/core/cm.c 24942diff -urNp linux-2.6.32.13/drivers/infiniband/core/cm.c linux-2.6.32.13/drivers/infiniband/core/cm.c
24776--- linux-2.6.32.12/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400 24943--- linux-2.6.32.13/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400
24777+++ linux-2.6.32.12/drivers/infiniband/core/cm.c 2010-04-04 20:46:41.589782410 -0400 24944+++ linux-2.6.32.13/drivers/infiniband/core/cm.c 2010-05-15 13:21:15.390974340 -0400
24778@@ -112,7 +112,7 @@ static char const counter_group_names[CM 24945@@ -112,7 +112,7 @@ static char const counter_group_names[CM
24779 24946
24780 struct cm_counter_group { 24947 struct cm_counter_group {
@@ -24918,9 +25085,9 @@ diff -urNp linux-2.6.32.12/drivers/infiniband/core/cm.c linux-2.6.32.12/drivers/
24918 .show = cm_show_counter 25085 .show = cm_show_counter
24919 }; 25086 };
24920 25087
24921diff -urNp linux-2.6.32.12/drivers/infiniband/core/sysfs.c linux-2.6.32.12/drivers/infiniband/core/sysfs.c 25088diff -urNp linux-2.6.32.13/drivers/infiniband/core/sysfs.c linux-2.6.32.13/drivers/infiniband/core/sysfs.c
24922--- linux-2.6.32.12/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400 25089--- linux-2.6.32.13/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400
24923+++ linux-2.6.32.12/drivers/infiniband/core/sysfs.c 2010-04-04 20:46:41.589782410 -0400 25090+++ linux-2.6.32.13/drivers/infiniband/core/sysfs.c 2010-05-15 13:21:15.420653417 -0400
24924@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob 25091@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
24925 return port_attr->show(p, port_attr, buf); 25092 return port_attr->show(p, port_attr, buf);
24926 } 25093 }
@@ -24930,9 +25097,9 @@ diff -urNp linux-2.6.32.12/drivers/infiniband/core/sysfs.c linux-2.6.32.12/drive
24930 .show = port_attr_show 25097 .show = port_attr_show
24931 }; 25098 };
24932 25099
24933diff -urNp linux-2.6.32.12/drivers/input/keyboard/atkbd.c linux-2.6.32.12/drivers/input/keyboard/atkbd.c 25100diff -urNp linux-2.6.32.13/drivers/input/keyboard/atkbd.c linux-2.6.32.13/drivers/input/keyboard/atkbd.c
24934--- linux-2.6.32.12/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400 25101--- linux-2.6.32.13/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400
24935+++ linux-2.6.32.12/drivers/input/keyboard/atkbd.c 2010-04-04 20:46:41.589782410 -0400 25102+++ linux-2.6.32.13/drivers/input/keyboard/atkbd.c 2010-05-15 13:21:15.420653417 -0400
24936@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri 25103@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
24937 .id = SERIO_ANY, 25104 .id = SERIO_ANY,
24938 .extra = SERIO_ANY, 25105 .extra = SERIO_ANY,
@@ -24942,9 +25109,9 @@ diff -urNp linux-2.6.32.12/drivers/input/keyboard/atkbd.c linux-2.6.32.12/driver
24942 }; 25109 };
24943 25110
24944 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); 25111 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
24945diff -urNp linux-2.6.32.12/drivers/input/mouse/lifebook.c linux-2.6.32.12/drivers/input/mouse/lifebook.c 25112diff -urNp linux-2.6.32.13/drivers/input/mouse/lifebook.c linux-2.6.32.13/drivers/input/mouse/lifebook.c
24946--- linux-2.6.32.12/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400 25113--- linux-2.6.32.13/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400
24947+++ linux-2.6.32.12/drivers/input/mouse/lifebook.c 2010-04-04 20:46:41.589782410 -0400 25114+++ linux-2.6.32.13/drivers/input/mouse/lifebook.c 2010-05-15 13:21:15.420653417 -0400
24948@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo 25115@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
24949 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), 25116 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
24950 }, 25117 },
@@ -24954,9 +25121,9 @@ diff -urNp linux-2.6.32.12/drivers/input/mouse/lifebook.c linux-2.6.32.12/driver
24954 }; 25121 };
24955 25122
24956 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) 25123 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
24957diff -urNp linux-2.6.32.12/drivers/input/mouse/psmouse-base.c linux-2.6.32.12/drivers/input/mouse/psmouse-base.c 25124diff -urNp linux-2.6.32.13/drivers/input/mouse/psmouse-base.c linux-2.6.32.13/drivers/input/mouse/psmouse-base.c
24958--- linux-2.6.32.12/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400 25125--- linux-2.6.32.13/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400
24959+++ linux-2.6.32.12/drivers/input/mouse/psmouse-base.c 2010-04-04 20:46:41.593451026 -0400 25126+++ linux-2.6.32.13/drivers/input/mouse/psmouse-base.c 2010-05-15 13:21:15.430620618 -0400
24960@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se 25127@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se
24961 .id = SERIO_ANY, 25128 .id = SERIO_ANY,
24962 .extra = SERIO_ANY, 25129 .extra = SERIO_ANY,
@@ -24966,9 +25133,9 @@ diff -urNp linux-2.6.32.12/drivers/input/mouse/psmouse-base.c linux-2.6.32.12/dr
24966 }; 25133 };
24967 25134
24968 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); 25135 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
24969diff -urNp linux-2.6.32.12/drivers/input/mouse/synaptics.c linux-2.6.32.12/drivers/input/mouse/synaptics.c 25136diff -urNp linux-2.6.32.13/drivers/input/mouse/synaptics.c linux-2.6.32.13/drivers/input/mouse/synaptics.c
24970--- linux-2.6.32.12/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400 25137--- linux-2.6.32.13/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400
24971+++ linux-2.6.32.12/drivers/input/mouse/synaptics.c 2010-04-04 20:46:41.593451026 -0400 25138+++ linux-2.6.32.13/drivers/input/mouse/synaptics.c 2010-05-15 13:21:15.430620618 -0400
24972@@ -437,7 +437,7 @@ static void synaptics_process_packet(str 25139@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
24973 break; 25140 break;
24974 case 2: 25141 case 2:
@@ -24997,9 +25164,9 @@ diff -urNp linux-2.6.32.12/drivers/input/mouse/synaptics.c linux-2.6.32.12/drive
24997 }; 25164 };
24998 #endif 25165 #endif
24999 25166
25000diff -urNp linux-2.6.32.12/drivers/input/mousedev.c linux-2.6.32.12/drivers/input/mousedev.c 25167diff -urNp linux-2.6.32.13/drivers/input/mousedev.c linux-2.6.32.13/drivers/input/mousedev.c
25001--- linux-2.6.32.12/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400 25168--- linux-2.6.32.13/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400
25002+++ linux-2.6.32.12/drivers/input/mousedev.c 2010-04-04 20:46:41.593451026 -0400 25169+++ linux-2.6.32.13/drivers/input/mousedev.c 2010-05-15 13:21:15.435182881 -0400
25003@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han 25170@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
25004 25171
25005 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX 25172 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -25009,9 +25176,9 @@ diff -urNp linux-2.6.32.12/drivers/input/mousedev.c linux-2.6.32.12/drivers/inpu
25009 }; 25176 };
25010 static int psaux_registered; 25177 static int psaux_registered;
25011 #endif 25178 #endif
25012diff -urNp linux-2.6.32.12/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.12/drivers/input/serio/i8042-x86ia64io.h 25179diff -urNp linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h
25013--- linux-2.6.32.12/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400 25180--- linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400
25014+++ linux-2.6.32.12/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:46:41.593451026 -0400 25181+++ linux-2.6.32.13/drivers/input/serio/i8042-x86ia64io.h 2010-05-15 13:21:15.435182881 -0400
25015@@ -172,7 +172,7 @@ static const struct dmi_system_id __init 25182@@ -172,7 +172,7 @@ static const struct dmi_system_id __init
25016 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), 25183 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
25017 }, 25184 },
@@ -25066,9 +25233,9 @@ diff -urNp linux-2.6.32.12/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.12
25066 }; 25233 };
25067 25234
25068 #endif /* CONFIG_X86 */ 25235 #endif /* CONFIG_X86 */
25069diff -urNp linux-2.6.32.12/drivers/input/serio/serio_raw.c linux-2.6.32.12/drivers/input/serio/serio_raw.c 25236diff -urNp linux-2.6.32.13/drivers/input/serio/serio_raw.c linux-2.6.32.13/drivers/input/serio/serio_raw.c
25070--- linux-2.6.32.12/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400 25237--- linux-2.6.32.13/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400
25071+++ linux-2.6.32.12/drivers/input/serio/serio_raw.c 2010-04-04 20:46:41.593451026 -0400 25238+++ linux-2.6.32.13/drivers/input/serio/serio_raw.c 2010-05-15 13:21:15.435182881 -0400
25072@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ 25239@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
25073 .id = SERIO_ANY, 25240 .id = SERIO_ANY,
25074 .extra = SERIO_ANY, 25241 .extra = SERIO_ANY,
@@ -25078,9 +25245,9 @@ diff -urNp linux-2.6.32.12/drivers/input/serio/serio_raw.c linux-2.6.32.12/drive
25078 }; 25245 };
25079 25246
25080 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); 25247 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
25081diff -urNp linux-2.6.32.12/drivers/isdn/gigaset/common.c linux-2.6.32.12/drivers/isdn/gigaset/common.c 25248diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/common.c linux-2.6.32.13/drivers/isdn/gigaset/common.c
25082--- linux-2.6.32.12/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400 25249--- linux-2.6.32.13/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400
25083+++ linux-2.6.32.12/drivers/isdn/gigaset/common.c 2010-04-04 20:46:41.593451026 -0400 25250+++ linux-2.6.32.13/drivers/isdn/gigaset/common.c 2010-05-15 13:21:15.435182881 -0400
25084@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct 25251@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
25085 cs->commands_pending = 0; 25252 cs->commands_pending = 0;
25086 cs->cur_at_seq = 0; 25253 cs->cur_at_seq = 0;
@@ -25090,9 +25257,9 @@ diff -urNp linux-2.6.32.12/drivers/isdn/gigaset/common.c linux-2.6.32.12/drivers
25090 cs->dev = NULL; 25257 cs->dev = NULL;
25091 cs->tty = NULL; 25258 cs->tty = NULL;
25092 cs->tty_dev = NULL; 25259 cs->tty_dev = NULL;
25093diff -urNp linux-2.6.32.12/drivers/isdn/gigaset/gigaset.h linux-2.6.32.12/drivers/isdn/gigaset/gigaset.h 25260diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h
25094--- linux-2.6.32.12/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400 25261--- linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400
25095+++ linux-2.6.32.12/drivers/isdn/gigaset/gigaset.h 2010-04-04 20:46:41.593451026 -0400 25262+++ linux-2.6.32.13/drivers/isdn/gigaset/gigaset.h 2010-05-15 13:21:15.435182881 -0400
25096@@ -446,7 +446,7 @@ struct cardstate { 25263@@ -446,7 +446,7 @@ struct cardstate {
25097 spinlock_t cmdlock; 25264 spinlock_t cmdlock;
25098 unsigned curlen, cmdbytes; 25265 unsigned curlen, cmdbytes;
@@ -25102,9 +25269,9 @@ diff -urNp linux-2.6.32.12/drivers/isdn/gigaset/gigaset.h linux-2.6.32.12/driver
25102 struct tty_struct *tty; 25269 struct tty_struct *tty;
25103 struct tasklet_struct if_wake_tasklet; 25270 struct tasklet_struct if_wake_tasklet;
25104 unsigned control_state; 25271 unsigned control_state;
25105diff -urNp linux-2.6.32.12/drivers/isdn/gigaset/interface.c linux-2.6.32.12/drivers/isdn/gigaset/interface.c 25272diff -urNp linux-2.6.32.13/drivers/isdn/gigaset/interface.c linux-2.6.32.13/drivers/isdn/gigaset/interface.c
25106--- linux-2.6.32.12/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400 25273--- linux-2.6.32.13/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400
25107+++ linux-2.6.32.12/drivers/isdn/gigaset/interface.c 2010-04-04 20:46:41.593451026 -0400 25274+++ linux-2.6.32.13/drivers/isdn/gigaset/interface.c 2010-05-15 13:21:15.462977265 -0400
25108@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt 25275@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
25109 return -ERESTARTSYS; // FIXME -EINTR? 25276 return -ERESTARTSYS; // FIXME -EINTR?
25110 tty->driver_data = cs; 25277 tty->driver_data = cs;
@@ -25192,9 +25359,9 @@ diff -urNp linux-2.6.32.12/drivers/isdn/gigaset/interface.c linux-2.6.32.12/driv
25192 dev_warn(cs->dev, "%s: device not opened\n", __func__); 25359 dev_warn(cs->dev, "%s: device not opened\n", __func__);
25193 goto out; 25360 goto out;
25194 } 25361 }
25195diff -urNp linux-2.6.32.12/drivers/isdn/hardware/avm/b1.c linux-2.6.32.12/drivers/isdn/hardware/avm/b1.c 25362diff -urNp linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c
25196--- linux-2.6.32.12/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400 25363--- linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400
25197+++ linux-2.6.32.12/drivers/isdn/hardware/avm/b1.c 2010-04-04 20:46:41.593451026 -0400 25364+++ linux-2.6.32.13/drivers/isdn/hardware/avm/b1.c 2010-05-15 13:21:15.462977265 -0400
25198@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo 25365@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
25199 } 25366 }
25200 if (left) { 25367 if (left) {
@@ -25213,9 +25380,9 @@ diff -urNp linux-2.6.32.12/drivers/isdn/hardware/avm/b1.c linux-2.6.32.12/driver
25213 return -EFAULT; 25380 return -EFAULT;
25214 } else { 25381 } else {
25215 memcpy(buf, dp, left); 25382 memcpy(buf, dp, left);
25216diff -urNp linux-2.6.32.12/drivers/isdn/icn/icn.c linux-2.6.32.12/drivers/isdn/icn/icn.c 25383diff -urNp linux-2.6.32.13/drivers/isdn/icn/icn.c linux-2.6.32.13/drivers/isdn/icn/icn.c
25217--- linux-2.6.32.12/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400 25384--- linux-2.6.32.13/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400
25218+++ linux-2.6.32.12/drivers/isdn/icn/icn.c 2010-04-04 20:46:41.593451026 -0400 25385+++ linux-2.6.32.13/drivers/isdn/icn/icn.c 2010-05-15 13:21:15.462977265 -0400
25219@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len 25386@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
25220 if (count > len) 25387 if (count > len)
25221 count = len; 25388 count = len;
@@ -25225,9 +25392,9 @@ diff -urNp linux-2.6.32.12/drivers/isdn/icn/icn.c linux-2.6.32.12/drivers/isdn/i
25225 return -EFAULT; 25392 return -EFAULT;
25226 } else 25393 } else
25227 memcpy(msg, buf, count); 25394 memcpy(msg, buf, count);
25228diff -urNp linux-2.6.32.12/drivers/lguest/core.c linux-2.6.32.12/drivers/lguest/core.c 25395diff -urNp linux-2.6.32.13/drivers/lguest/core.c linux-2.6.32.13/drivers/lguest/core.c
25229--- linux-2.6.32.12/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400 25396--- linux-2.6.32.13/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400
25230+++ linux-2.6.32.12/drivers/lguest/core.c 2010-04-04 20:46:41.593451026 -0400 25397+++ linux-2.6.32.13/drivers/lguest/core.c 2010-05-15 13:21:15.466573931 -0400
25231@@ -91,9 +91,17 @@ static __init int map_switcher(void) 25398@@ -91,9 +91,17 @@ static __init int map_switcher(void)
25232 * it's worked so far. The end address needs +1 because __get_vm_area 25399 * it's worked so far. The end address needs +1 because __get_vm_area
25233 * allocates an extra guard page, so we need space for that. 25400 * allocates an extra guard page, so we need space for that.
@@ -25246,9 +25413,9 @@ diff -urNp linux-2.6.32.12/drivers/lguest/core.c linux-2.6.32.12/drivers/lguest/
25246 if (!switcher_vma) { 25413 if (!switcher_vma) {
25247 err = -ENOMEM; 25414 err = -ENOMEM;
25248 printk("lguest: could not map switcher pages high\n"); 25415 printk("lguest: could not map switcher pages high\n");
25249diff -urNp linux-2.6.32.12/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.12/drivers/macintosh/via-pmu-backlight.c 25416diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c
25250--- linux-2.6.32.12/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400 25417--- linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400
25251+++ linux-2.6.32.12/drivers/macintosh/via-pmu-backlight.c 2010-04-04 20:46:41.593451026 -0400 25418+++ linux-2.6.32.13/drivers/macintosh/via-pmu-backlight.c 2010-05-15 13:21:15.466573931 -0400
25252@@ -15,7 +15,7 @@ 25419@@ -15,7 +15,7 @@
25253 25420
25254 #define MAX_PMU_LEVEL 0xFF 25421 #define MAX_PMU_LEVEL 0xFF
@@ -25267,9 +25434,9 @@ diff -urNp linux-2.6.32.12/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.12
25267 .get_brightness = pmu_backlight_get_brightness, 25434 .get_brightness = pmu_backlight_get_brightness,
25268 .update_status = pmu_backlight_update_status, 25435 .update_status = pmu_backlight_update_status,
25269 25436
25270diff -urNp linux-2.6.32.12/drivers/macintosh/via-pmu.c linux-2.6.32.12/drivers/macintosh/via-pmu.c 25437diff -urNp linux-2.6.32.13/drivers/macintosh/via-pmu.c linux-2.6.32.13/drivers/macintosh/via-pmu.c
25271--- linux-2.6.32.12/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400 25438--- linux-2.6.32.13/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400
25272+++ linux-2.6.32.12/drivers/macintosh/via-pmu.c 2010-04-04 20:46:41.593451026 -0400 25439+++ linux-2.6.32.13/drivers/macintosh/via-pmu.c 2010-05-15 13:21:15.488292870 -0400
25273@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state 25440@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
25274 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); 25441 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
25275 } 25442 }
@@ -25279,9 +25446,9 @@ diff -urNp linux-2.6.32.12/drivers/macintosh/via-pmu.c linux-2.6.32.12/drivers/m
25279 .enter = powerbook_sleep, 25446 .enter = powerbook_sleep,
25280 .valid = pmu_sleep_valid, 25447 .valid = pmu_sleep_valid,
25281 }; 25448 };
25282diff -urNp linux-2.6.32.12/drivers/md/bitmap.c linux-2.6.32.12/drivers/md/bitmap.c 25449diff -urNp linux-2.6.32.13/drivers/md/bitmap.c linux-2.6.32.13/drivers/md/bitmap.c
25283--- linux-2.6.32.12/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400 25450--- linux-2.6.32.13/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400
25284+++ linux-2.6.32.12/drivers/md/bitmap.c 2010-04-04 20:46:41.593451026 -0400 25451+++ linux-2.6.32.13/drivers/md/bitmap.c 2010-05-15 13:21:15.498921900 -0400
25285@@ -58,7 +58,7 @@ 25452@@ -58,7 +58,7 @@
25286 # if DEBUG > 0 25453 # if DEBUG > 0
25287 # define PRINTK(x...) printk(KERN_DEBUG x) 25454 # define PRINTK(x...) printk(KERN_DEBUG x)
@@ -25291,9 +25458,9 @@ diff -urNp linux-2.6.32.12/drivers/md/bitmap.c linux-2.6.32.12/drivers/md/bitmap
25291 # endif 25458 # endif
25292 #endif 25459 #endif
25293 25460
25294diff -urNp linux-2.6.32.12/drivers/md/dm-sysfs.c linux-2.6.32.12/drivers/md/dm-sysfs.c 25461diff -urNp linux-2.6.32.13/drivers/md/dm-sysfs.c linux-2.6.32.13/drivers/md/dm-sysfs.c
25295--- linux-2.6.32.12/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400 25462--- linux-2.6.32.13/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400
25296+++ linux-2.6.32.12/drivers/md/dm-sysfs.c 2010-04-04 20:46:41.593451026 -0400 25463+++ linux-2.6.32.13/drivers/md/dm-sysfs.c 2010-05-15 13:21:15.498921900 -0400
25297@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { 25464@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
25298 NULL, 25465 NULL,
25299 }; 25466 };
@@ -25303,9 +25470,9 @@ diff -urNp linux-2.6.32.12/drivers/md/dm-sysfs.c linux-2.6.32.12/drivers/md/dm-s
25303 .show = dm_attr_show, 25470 .show = dm_attr_show,
25304 }; 25471 };
25305 25472
25306diff -urNp linux-2.6.32.12/drivers/md/dm-table.c linux-2.6.32.12/drivers/md/dm-table.c 25473diff -urNp linux-2.6.32.13/drivers/md/dm-table.c linux-2.6.32.13/drivers/md/dm-table.c
25307--- linux-2.6.32.12/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400 25474--- linux-2.6.32.13/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400
25308+++ linux-2.6.32.12/drivers/md/dm-table.c 2010-04-04 20:46:41.593451026 -0400 25475+++ linux-2.6.32.13/drivers/md/dm-table.c 2010-05-15 13:21:15.498921900 -0400
25309@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct 25476@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
25310 if (!dev_size) 25477 if (!dev_size)
25311 return 0; 25478 return 0;
@@ -25315,10 +25482,10 @@ diff -urNp linux-2.6.32.12/drivers/md/dm-table.c linux-2.6.32.12/drivers/md/dm-t
25315 DMWARN("%s: %s too small for target: " 25482 DMWARN("%s: %s too small for target: "
25316 "start=%llu, len=%llu, dev_size=%llu", 25483 "start=%llu, len=%llu, dev_size=%llu",
25317 dm_device_name(ti->table->md), bdevname(bdev, b), 25484 dm_device_name(ti->table->md), bdevname(bdev, b),
25318diff -urNp linux-2.6.32.12/drivers/md/md.c linux-2.6.32.12/drivers/md/md.c 25485diff -urNp linux-2.6.32.13/drivers/md/md.c linux-2.6.32.13/drivers/md/md.c
25319--- linux-2.6.32.12/drivers/md/md.c 2010-03-15 11:52:04.000000000 -0400 25486--- linux-2.6.32.13/drivers/md/md.c 2010-05-15 13:20:18.542567696 -0400
25320+++ linux-2.6.32.12/drivers/md/md.c 2010-04-04 20:46:41.597784214 -0400 25487+++ linux-2.6.32.13/drivers/md/md.c 2010-05-15 13:21:15.498921900 -0400
25321@@ -2508,7 +2508,7 @@ static void rdev_free(struct kobject *ko 25488@@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko
25322 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); 25489 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
25323 kfree(rdev); 25490 kfree(rdev);
25324 } 25491 }
@@ -25327,7 +25494,7 @@ diff -urNp linux-2.6.32.12/drivers/md/md.c linux-2.6.32.12/drivers/md/md.c
25327 .show = rdev_attr_show, 25494 .show = rdev_attr_show,
25328 .store = rdev_attr_store, 25495 .store = rdev_attr_store,
25329 }; 25496 };
25330@@ -3878,7 +3878,7 @@ static void md_free(struct kobject *ko) 25497@@ -3884,7 +3884,7 @@ static void md_free(struct kobject *ko)
25331 kfree(mddev); 25498 kfree(mddev);
25332 } 25499 }
25333 25500
@@ -25336,7 +25503,7 @@ diff -urNp linux-2.6.32.12/drivers/md/md.c linux-2.6.32.12/drivers/md/md.c
25336 .show = md_attr_show, 25503 .show = md_attr_show,
25337 .store = md_attr_store, 25504 .store = md_attr_store,
25338 }; 25505 };
25339@@ -6004,7 +6004,7 @@ static int md_seq_show(struct seq_file * 25506@@ -6010,7 +6010,7 @@ static int md_seq_show(struct seq_file *
25340 chunk_kb ? "KB" : "B"); 25507 chunk_kb ? "KB" : "B");
25341 if (bitmap->file) { 25508 if (bitmap->file) {
25342 seq_printf(seq, ", file: "); 25509 seq_printf(seq, ", file: ");
@@ -25345,7 +25512,7 @@ diff -urNp linux-2.6.32.12/drivers/md/md.c linux-2.6.32.12/drivers/md/md.c
25345 } 25512 }
25346 25513
25347 seq_printf(seq, "\n"); 25514 seq_printf(seq, "\n");
25348@@ -6098,7 +6098,7 @@ static int is_mddev_idle(mddev_t *mddev, 25515@@ -6104,7 +6104,7 @@ static int is_mddev_idle(mddev_t *mddev,
25349 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk; 25516 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
25350 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) + 25517 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
25351 (int)part_stat_read(&disk->part0, sectors[1]) - 25518 (int)part_stat_read(&disk->part0, sectors[1]) -
@@ -25354,9 +25521,9 @@ diff -urNp linux-2.6.32.12/drivers/md/md.c linux-2.6.32.12/drivers/md/md.c
25354 /* sync IO will cause sync_io to increase before the disk_stats 25521 /* sync IO will cause sync_io to increase before the disk_stats
25355 * as sync_io is counted when a request starts, and 25522 * as sync_io is counted when a request starts, and
25356 * disk_stats is counted when it completes. 25523 * disk_stats is counted when it completes.
25357diff -urNp linux-2.6.32.12/drivers/md/md.h linux-2.6.32.12/drivers/md/md.h 25524diff -urNp linux-2.6.32.13/drivers/md/md.h linux-2.6.32.13/drivers/md/md.h
25358--- linux-2.6.32.12/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400 25525--- linux-2.6.32.13/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400
25359+++ linux-2.6.32.12/drivers/md/md.h 2010-04-04 20:46:41.597784214 -0400 25526+++ linux-2.6.32.13/drivers/md/md.h 2010-05-15 13:21:15.507356136 -0400
25360@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ 25527@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
25361 25528
25362 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) 25529 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
@@ -25366,9 +25533,9 @@ diff -urNp linux-2.6.32.12/drivers/md/md.h linux-2.6.32.12/drivers/md/md.h
25366 } 25533 }
25367 25534
25368 struct mdk_personality 25535 struct mdk_personality
25369diff -urNp linux-2.6.32.12/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.12/drivers/media/dvb/dvb-core/dvbdev.c 25536diff -urNp linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c
25370--- linux-2.6.32.12/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400 25537--- linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400
25371+++ linux-2.6.32.12/drivers/media/dvb/dvb-core/dvbdev.c 2010-04-04 20:46:41.597784214 -0400 25538+++ linux-2.6.32.13/drivers/media/dvb/dvb-core/dvbdev.c 2010-05-15 13:21:15.510998118 -0400
25372@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt 25539@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
25373 const struct dvb_device *template, void *priv, int type) 25540 const struct dvb_device *template, void *priv, int type)
25374 { 25541 {
@@ -25377,9 +25544,9 @@ diff -urNp linux-2.6.32.12/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.12/d
25377 struct file_operations *dvbdevfops; 25544 struct file_operations *dvbdevfops;
25378 struct device *clsdev; 25545 struct device *clsdev;
25379 int minor; 25546 int minor;
25380diff -urNp linux-2.6.32.12/drivers/media/radio/radio-cadet.c linux-2.6.32.12/drivers/media/radio/radio-cadet.c 25547diff -urNp linux-2.6.32.13/drivers/media/radio/radio-cadet.c linux-2.6.32.13/drivers/media/radio/radio-cadet.c
25381--- linux-2.6.32.12/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400 25548--- linux-2.6.32.13/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400
25382+++ linux-2.6.32.12/drivers/media/radio/radio-cadet.c 2010-04-04 20:46:41.597784214 -0400 25549+++ linux-2.6.32.13/drivers/media/radio/radio-cadet.c 2010-05-15 13:21:15.510998118 -0400
25383@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f 25550@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
25384 while (i < count && dev->rdsin != dev->rdsout) 25551 while (i < count && dev->rdsin != dev->rdsout)
25385 readbuf[i++] = dev->rdsbuf[dev->rdsout++]; 25552 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
@@ -25389,9 +25556,9 @@ diff -urNp linux-2.6.32.12/drivers/media/radio/radio-cadet.c linux-2.6.32.12/dri
25389 return -EFAULT; 25556 return -EFAULT;
25390 return i; 25557 return i;
25391 } 25558 }
25392diff -urNp linux-2.6.32.12/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.12/drivers/media/video/usbvideo/konicawc.c 25559diff -urNp linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c
25393--- linux-2.6.32.12/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400 25560--- linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400
25394+++ linux-2.6.32.12/drivers/media/video/usbvideo/konicawc.c 2010-04-04 20:46:41.597784214 -0400 25561+++ linux-2.6.32.13/drivers/media/video/usbvideo/konicawc.c 2010-05-15 13:21:15.526921305 -0400
25395@@ -225,7 +225,7 @@ static void konicawc_register_input(stru 25562@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
25396 int error; 25563 int error;
25397 25564
@@ -25401,9 +25568,9 @@ diff -urNp linux-2.6.32.12/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
25401 25568
25402 cam->input = input_dev = input_allocate_device(); 25569 cam->input = input_dev = input_allocate_device();
25403 if (!input_dev) { 25570 if (!input_dev) {
25404diff -urNp linux-2.6.32.12/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.12/drivers/media/video/usbvideo/quickcam_messenger.c 25571diff -urNp linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c
25405--- linux-2.6.32.12/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400 25572--- linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400
25406+++ linux-2.6.32.12/drivers/media/video/usbvideo/quickcam_messenger.c 2010-04-04 20:46:41.597784214 -0400 25573+++ linux-2.6.32.13/drivers/media/video/usbvideo/quickcam_messenger.c 2010-05-15 13:21:15.526921305 -0400
25407@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc 25574@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
25408 int error; 25575 int error;
25409 25576
@@ -25413,9 +25580,9 @@ diff -urNp linux-2.6.32.12/drivers/media/video/usbvideo/quickcam_messenger.c lin
25413 25580
25414 cam->input = input_dev = input_allocate_device(); 25581 cam->input = input_dev = input_allocate_device();
25415 if (!input_dev) { 25582 if (!input_dev) {
25416diff -urNp linux-2.6.32.12/drivers/message/fusion/mptdebug.h linux-2.6.32.12/drivers/message/fusion/mptdebug.h 25583diff -urNp linux-2.6.32.13/drivers/message/fusion/mptdebug.h linux-2.6.32.13/drivers/message/fusion/mptdebug.h
25417--- linux-2.6.32.12/drivers/message/fusion/mptdebug.h 2010-03-15 11:52:04.000000000 -0400 25584--- linux-2.6.32.13/drivers/message/fusion/mptdebug.h 2010-03-15 11:52:04.000000000 -0400
25418+++ linux-2.6.32.12/drivers/message/fusion/mptdebug.h 2010-04-29 17:46:37.113104605 -0400 25585+++ linux-2.6.32.13/drivers/message/fusion/mptdebug.h 2010-05-15 13:21:15.526921305 -0400
25419@@ -71,7 +71,7 @@ 25586@@ -71,7 +71,7 @@
25420 CMD; \ 25587 CMD; \
25421 } 25588 }
@@ -25425,9 +25592,9 @@ diff -urNp linux-2.6.32.12/drivers/message/fusion/mptdebug.h linux-2.6.32.12/dri
25425 #endif 25592 #endif
25426 25593
25427 25594
25428diff -urNp linux-2.6.32.12/drivers/message/fusion/mptsas.c linux-2.6.32.12/drivers/message/fusion/mptsas.c 25595diff -urNp linux-2.6.32.13/drivers/message/fusion/mptsas.c linux-2.6.32.13/drivers/message/fusion/mptsas.c
25429--- linux-2.6.32.12/drivers/message/fusion/mptsas.c 2010-03-15 11:52:04.000000000 -0400 25596--- linux-2.6.32.13/drivers/message/fusion/mptsas.c 2010-03-15 11:52:04.000000000 -0400
25430+++ linux-2.6.32.12/drivers/message/fusion/mptsas.c 2010-04-29 17:46:37.113104605 -0400 25597+++ linux-2.6.32.13/drivers/message/fusion/mptsas.c 2010-05-15 13:21:15.526921305 -0400
25431@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin 25598@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
25432 return 0; 25599 return 0;
25433 } 25600 }
@@ -25476,9 +25643,9 @@ diff -urNp linux-2.6.32.12/drivers/message/fusion/mptsas.c linux-2.6.32.12/drive
25476 static inline struct sas_port * 25643 static inline struct sas_port *
25477 mptsas_get_port(struct mptsas_phyinfo *phy_info) 25644 mptsas_get_port(struct mptsas_phyinfo *phy_info)
25478 { 25645 {
25479diff -urNp linux-2.6.32.12/drivers/message/i2o/i2o_proc.c linux-2.6.32.12/drivers/message/i2o/i2o_proc.c 25646diff -urNp linux-2.6.32.13/drivers/message/i2o/i2o_proc.c linux-2.6.32.13/drivers/message/i2o/i2o_proc.c
25480--- linux-2.6.32.12/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400 25647--- linux-2.6.32.13/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400
25481+++ linux-2.6.32.12/drivers/message/i2o/i2o_proc.c 2010-04-04 20:46:41.597784214 -0400 25648+++ linux-2.6.32.13/drivers/message/i2o/i2o_proc.c 2010-05-15 13:21:15.526921305 -0400
25482@@ -259,13 +259,6 @@ static char *scsi_devices[] = { 25649@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
25483 "Array Controller Device" 25650 "Array Controller Device"
25484 }; 25651 };
@@ -25565,9 +25732,9 @@ diff -urNp linux-2.6.32.12/drivers/message/i2o/i2o_proc.c linux-2.6.32.12/driver
25565 25732
25566 return 0; 25733 return 0;
25567 } 25734 }
25568diff -urNp linux-2.6.32.12/drivers/misc/kgdbts.c linux-2.6.32.12/drivers/misc/kgdbts.c 25735diff -urNp linux-2.6.32.13/drivers/misc/kgdbts.c linux-2.6.32.13/drivers/misc/kgdbts.c
25569--- linux-2.6.32.12/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400 25736--- linux-2.6.32.13/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400
25570+++ linux-2.6.32.12/drivers/misc/kgdbts.c 2010-04-04 20:46:41.597784214 -0400 25737+++ linux-2.6.32.13/drivers/misc/kgdbts.c 2010-05-15 13:21:15.554995461 -0400
25571@@ -118,7 +118,7 @@ 25738@@ -118,7 +118,7 @@
25572 } while (0) 25739 } while (0)
25573 #define MAX_CONFIG_LEN 40 25740 #define MAX_CONFIG_LEN 40
@@ -25586,9 +25753,9 @@ diff -urNp linux-2.6.32.12/drivers/misc/kgdbts.c linux-2.6.32.12/drivers/misc/kg
25586 .name = "kgdbts", 25753 .name = "kgdbts",
25587 .read_char = kgdbts_get_char, 25754 .read_char = kgdbts_get_char,
25588 .write_char = kgdbts_put_char, 25755 .write_char = kgdbts_put_char,
25589diff -urNp linux-2.6.32.12/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.12/drivers/misc/sgi-gru/gruhandles.c 25756diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c
25590--- linux-2.6.32.12/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400 25757--- linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400
25591+++ linux-2.6.32.12/drivers/misc/sgi-gru/gruhandles.c 2010-04-04 20:46:41.597784214 -0400 25758+++ linux-2.6.32.13/drivers/misc/sgi-gru/gruhandles.c 2010-05-15 13:21:15.554995461 -0400
25592@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic 25759@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
25593 25760
25594 static void update_mcs_stats(enum mcs_op op, unsigned long clks) 25761 static void update_mcs_stats(enum mcs_op op, unsigned long clks)
@@ -25600,9 +25767,9 @@ diff -urNp linux-2.6.32.12/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.12/dri
25600 if (mcs_op_statistics[op].max < clks) 25767 if (mcs_op_statistics[op].max < clks)
25601 mcs_op_statistics[op].max = clks; 25768 mcs_op_statistics[op].max = clks;
25602 } 25769 }
25603diff -urNp linux-2.6.32.12/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.12/drivers/misc/sgi-gru/gruprocfs.c 25770diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c
25604--- linux-2.6.32.12/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400 25771--- linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400
25605+++ linux-2.6.32.12/drivers/misc/sgi-gru/gruprocfs.c 2010-04-04 20:46:41.597784214 -0400 25772+++ linux-2.6.32.13/drivers/misc/sgi-gru/gruprocfs.c 2010-05-15 13:21:15.554995461 -0400
25606@@ -32,9 +32,9 @@ 25773@@ -32,9 +32,9 @@
25607 25774
25608 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) 25775 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -25626,9 +25793,9 @@ diff -urNp linux-2.6.32.12/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.12/driv
25626 max = mcs_op_statistics[op].max; 25793 max = mcs_op_statistics[op].max;
25627 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, 25794 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
25628 count ? total / count : 0, max); 25795 count ? total / count : 0, max);
25629diff -urNp linux-2.6.32.12/drivers/misc/sgi-gru/grutables.h linux-2.6.32.12/drivers/misc/sgi-gru/grutables.h 25796diff -urNp linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h
25630--- linux-2.6.32.12/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400 25797--- linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400
25631+++ linux-2.6.32.12/drivers/misc/sgi-gru/grutables.h 2010-04-04 20:46:41.597784214 -0400 25798+++ linux-2.6.32.13/drivers/misc/sgi-gru/grutables.h 2010-05-15 13:21:15.554995461 -0400
25632@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; 25799@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
25633 * GRU statistics. 25800 * GRU statistics.
25634 */ 25801 */
@@ -25812,9 +25979,9 @@ diff -urNp linux-2.6.32.12/drivers/misc/sgi-gru/grutables.h linux-2.6.32.12/driv
25812 } while (0) 25979 } while (0)
25813 25980
25814 #ifdef CONFIG_SGI_GRU_DEBUG 25981 #ifdef CONFIG_SGI_GRU_DEBUG
25815diff -urNp linux-2.6.32.12/drivers/mtd/devices/doc2000.c linux-2.6.32.12/drivers/mtd/devices/doc2000.c 25982diff -urNp linux-2.6.32.13/drivers/mtd/devices/doc2000.c linux-2.6.32.13/drivers/mtd/devices/doc2000.c
25816--- linux-2.6.32.12/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400 25983--- linux-2.6.32.13/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400
25817+++ linux-2.6.32.12/drivers/mtd/devices/doc2000.c 2010-04-04 20:46:41.597784214 -0400 25984+++ linux-2.6.32.13/drivers/mtd/devices/doc2000.c 2010-05-15 13:21:15.563050037 -0400
25818@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt 25985@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
25819 25986
25820 /* The ECC will not be calculated correctly if less than 512 is written */ 25987 /* The ECC will not be calculated correctly if less than 512 is written */
@@ -25824,9 +25991,9 @@ diff -urNp linux-2.6.32.12/drivers/mtd/devices/doc2000.c linux-2.6.32.12/drivers
25824 printk(KERN_WARNING 25991 printk(KERN_WARNING
25825 "ECC needs a full sector write (adr: %lx size %lx)\n", 25992 "ECC needs a full sector write (adr: %lx size %lx)\n",
25826 (long) to, (long) len); 25993 (long) to, (long) len);
25827diff -urNp linux-2.6.32.12/drivers/mtd/devices/doc2001.c linux-2.6.32.12/drivers/mtd/devices/doc2001.c 25994diff -urNp linux-2.6.32.13/drivers/mtd/devices/doc2001.c linux-2.6.32.13/drivers/mtd/devices/doc2001.c
25828--- linux-2.6.32.12/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400 25995--- linux-2.6.32.13/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400
25829+++ linux-2.6.32.12/drivers/mtd/devices/doc2001.c 2010-04-04 20:46:41.597784214 -0400 25996+++ linux-2.6.32.13/drivers/mtd/devices/doc2001.c 2010-05-15 13:21:15.563050037 -0400
25830@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt 25997@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
25831 struct Nand *mychip = &this->chips[from >> (this->chipshift)]; 25998 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
25832 25999
@@ -25836,9 +26003,9 @@ diff -urNp linux-2.6.32.12/drivers/mtd/devices/doc2001.c linux-2.6.32.12/drivers
25836 return -EINVAL; 26003 return -EINVAL;
25837 26004
25838 /* Don't allow a single read to cross a 512-byte block boundary */ 26005 /* Don't allow a single read to cross a 512-byte block boundary */
25839diff -urNp linux-2.6.32.12/drivers/mtd/ubi/build.c linux-2.6.32.12/drivers/mtd/ubi/build.c 26006diff -urNp linux-2.6.32.13/drivers/mtd/ubi/build.c linux-2.6.32.13/drivers/mtd/ubi/build.c
25840--- linux-2.6.32.12/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400 26007--- linux-2.6.32.13/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400
25841+++ linux-2.6.32.12/drivers/mtd/ubi/build.c 2010-04-04 20:46:41.597784214 -0400 26008+++ linux-2.6.32.13/drivers/mtd/ubi/build.c 2010-05-15 13:21:15.566632432 -0400
25842@@ -1255,7 +1255,7 @@ module_exit(ubi_exit); 26009@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
25843 static int __init bytes_str_to_int(const char *str) 26010 static int __init bytes_str_to_int(const char *str)
25844 { 26011 {
@@ -25878,9 +26045,9 @@ diff -urNp linux-2.6.32.12/drivers/mtd/ubi/build.c linux-2.6.32.12/drivers/mtd/u
25878 } 26045 }
25879 26046
25880 /** 26047 /**
25881diff -urNp linux-2.6.32.12/drivers/net/e1000e/82571.c linux-2.6.32.12/drivers/net/e1000e/82571.c 26048diff -urNp linux-2.6.32.13/drivers/net/e1000e/82571.c linux-2.6.32.13/drivers/net/e1000e/82571.c
25882--- linux-2.6.32.12/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400 26049--- linux-2.6.32.13/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400
25883+++ linux-2.6.32.12/drivers/net/e1000e/82571.c 2010-04-04 20:46:41.597784214 -0400 26050+++ linux-2.6.32.13/drivers/net/e1000e/82571.c 2010-05-15 13:21:15.586662276 -0400
25884@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s 26051@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
25885 { 26052 {
25886 struct e1000_hw *hw = &adapter->hw; 26053 struct e1000_hw *hw = &adapter->hw;
@@ -25934,9 +26101,9 @@ diff -urNp linux-2.6.32.12/drivers/net/e1000e/82571.c linux-2.6.32.12/drivers/ne
25934 .acquire_nvm = e1000_acquire_nvm_82571, 26101 .acquire_nvm = e1000_acquire_nvm_82571,
25935 .read_nvm = e1000e_read_nvm_eerd, 26102 .read_nvm = e1000e_read_nvm_eerd,
25936 .release_nvm = e1000_release_nvm_82571, 26103 .release_nvm = e1000_release_nvm_82571,
25937diff -urNp linux-2.6.32.12/drivers/net/e1000e/e1000.h linux-2.6.32.12/drivers/net/e1000e/e1000.h 26104diff -urNp linux-2.6.32.13/drivers/net/e1000e/e1000.h linux-2.6.32.13/drivers/net/e1000e/e1000.h
25938--- linux-2.6.32.12/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400 26105--- linux-2.6.32.13/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400
25939+++ linux-2.6.32.12/drivers/net/e1000e/e1000.h 2010-04-04 20:46:41.597784214 -0400 26106+++ linux-2.6.32.13/drivers/net/e1000e/e1000.h 2010-05-15 13:21:15.586662276 -0400
25940@@ -375,9 +375,9 @@ struct e1000_info { 26107@@ -375,9 +375,9 @@ struct e1000_info {
25941 u32 pba; 26108 u32 pba;
25942 u32 max_hw_frame_size; 26109 u32 max_hw_frame_size;
@@ -25950,9 +26117,9 @@ diff -urNp linux-2.6.32.12/drivers/net/e1000e/e1000.h linux-2.6.32.12/drivers/ne
25950 }; 26117 };
25951 26118
25952 /* hardware capability, feature, and workaround flags */ 26119 /* hardware capability, feature, and workaround flags */
25953diff -urNp linux-2.6.32.12/drivers/net/e1000e/es2lan.c linux-2.6.32.12/drivers/net/e1000e/es2lan.c 26120diff -urNp linux-2.6.32.13/drivers/net/e1000e/es2lan.c linux-2.6.32.13/drivers/net/e1000e/es2lan.c
25954--- linux-2.6.32.12/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400 26121--- linux-2.6.32.13/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400
25955+++ linux-2.6.32.12/drivers/net/e1000e/es2lan.c 2010-04-04 20:46:41.597784214 -0400 26122+++ linux-2.6.32.13/drivers/net/e1000e/es2lan.c 2010-05-15 13:21:15.611440944 -0400
25956@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es 26123@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
25957 { 26124 {
25958 struct e1000_hw *hw = &adapter->hw; 26125 struct e1000_hw *hw = &adapter->hw;
@@ -25988,9 +26155,9 @@ diff -urNp linux-2.6.32.12/drivers/net/e1000e/es2lan.c linux-2.6.32.12/drivers/n
25988 .acquire_nvm = e1000_acquire_nvm_80003es2lan, 26155 .acquire_nvm = e1000_acquire_nvm_80003es2lan,
25989 .read_nvm = e1000e_read_nvm_eerd, 26156 .read_nvm = e1000e_read_nvm_eerd,
25990 .release_nvm = e1000_release_nvm_80003es2lan, 26157 .release_nvm = e1000_release_nvm_80003es2lan,
25991diff -urNp linux-2.6.32.12/drivers/net/e1000e/hw.h linux-2.6.32.12/drivers/net/e1000e/hw.h 26158diff -urNp linux-2.6.32.13/drivers/net/e1000e/hw.h linux-2.6.32.13/drivers/net/e1000e/hw.h
25992--- linux-2.6.32.12/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400 26159--- linux-2.6.32.13/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400
25993+++ linux-2.6.32.12/drivers/net/e1000e/hw.h 2010-04-04 20:46:41.601781347 -0400 26160+++ linux-2.6.32.13/drivers/net/e1000e/hw.h 2010-05-15 13:21:15.627454440 -0400
25994@@ -756,34 +756,34 @@ struct e1000_mac_operations { 26161@@ -756,34 +756,34 @@ struct e1000_mac_operations {
25995 26162
25996 /* Function pointers for the PHY. */ 26163 /* Function pointers for the PHY. */
@@ -26050,9 +26217,9 @@ diff -urNp linux-2.6.32.12/drivers/net/e1000e/hw.h linux-2.6.32.12/drivers/net/e
26050 }; 26217 };
26051 26218
26052 struct e1000_mac_info { 26219 struct e1000_mac_info {
26053diff -urNp linux-2.6.32.12/drivers/net/e1000e/ich8lan.c linux-2.6.32.12/drivers/net/e1000e/ich8lan.c 26220diff -urNp linux-2.6.32.13/drivers/net/e1000e/ich8lan.c linux-2.6.32.13/drivers/net/e1000e/ich8lan.c
26054--- linux-2.6.32.12/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400 26221--- linux-2.6.32.13/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400
26055+++ linux-2.6.32.12/drivers/net/e1000e/ich8lan.c 2010-04-04 20:46:41.601781347 -0400 26222+++ linux-2.6.32.13/drivers/net/e1000e/ich8lan.c 2010-05-15 13:21:15.627454440 -0400
26056@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan 26223@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
26057 } 26224 }
26058 } 26225 }
@@ -26080,9 +26247,9 @@ diff -urNp linux-2.6.32.12/drivers/net/e1000e/ich8lan.c linux-2.6.32.12/drivers/
26080 .acquire_nvm = e1000_acquire_nvm_ich8lan, 26247 .acquire_nvm = e1000_acquire_nvm_ich8lan,
26081 .read_nvm = e1000_read_nvm_ich8lan, 26248 .read_nvm = e1000_read_nvm_ich8lan,
26082 .release_nvm = e1000_release_nvm_ich8lan, 26249 .release_nvm = e1000_release_nvm_ich8lan,
26083diff -urNp linux-2.6.32.12/drivers/net/ibmveth.c linux-2.6.32.12/drivers/net/ibmveth.c 26250diff -urNp linux-2.6.32.13/drivers/net/ibmveth.c linux-2.6.32.13/drivers/net/ibmveth.c
26084--- linux-2.6.32.12/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400 26251--- linux-2.6.32.13/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400
26085+++ linux-2.6.32.12/drivers/net/ibmveth.c 2010-04-04 20:46:41.601781347 -0400 26252+++ linux-2.6.32.13/drivers/net/ibmveth.c 2010-05-15 13:21:15.630621605 -0400
26086@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr 26253@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
26087 NULL, 26254 NULL,
26088 }; 26255 };
@@ -26092,9 +26259,9 @@ diff -urNp linux-2.6.32.12/drivers/net/ibmveth.c linux-2.6.32.12/drivers/net/ibm
26092 .show = veth_pool_show, 26259 .show = veth_pool_show,
26093 .store = veth_pool_store, 26260 .store = veth_pool_store,
26094 }; 26261 };
26095diff -urNp linux-2.6.32.12/drivers/net/igb/e1000_82575.c linux-2.6.32.12/drivers/net/igb/e1000_82575.c 26262diff -urNp linux-2.6.32.13/drivers/net/igb/e1000_82575.c linux-2.6.32.13/drivers/net/igb/e1000_82575.c
26096--- linux-2.6.32.12/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:38.085476187 -0400 26263--- linux-2.6.32.13/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:38.085476187 -0400
26097+++ linux-2.6.32.12/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:58.193505226 -0400 26264+++ linux-2.6.32.13/drivers/net/igb/e1000_82575.c 2010-05-15 13:21:15.646981498 -0400
26098@@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct 26265@@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct
26099 wr32(E1000_VT_CTL, vt_ctl); 26266 wr32(E1000_VT_CTL, vt_ctl);
26100 } 26267 }
@@ -26120,9 +26287,9 @@ diff -urNp linux-2.6.32.12/drivers/net/igb/e1000_82575.c linux-2.6.32.12/drivers
26120 .acquire = igb_acquire_nvm_82575, 26287 .acquire = igb_acquire_nvm_82575,
26121 .read = igb_read_nvm_eerd, 26288 .read = igb_read_nvm_eerd,
26122 .release = igb_release_nvm_82575, 26289 .release = igb_release_nvm_82575,
26123diff -urNp linux-2.6.32.12/drivers/net/igb/e1000_hw.h linux-2.6.32.12/drivers/net/igb/e1000_hw.h 26290diff -urNp linux-2.6.32.13/drivers/net/igb/e1000_hw.h linux-2.6.32.13/drivers/net/igb/e1000_hw.h
26124--- linux-2.6.32.12/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:38.085476187 -0400 26291--- linux-2.6.32.13/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:38.085476187 -0400
26125+++ linux-2.6.32.12/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:58.197572571 -0400 26292+++ linux-2.6.32.13/drivers/net/igb/e1000_hw.h 2010-05-15 13:21:15.646981498 -0400
26126@@ -303,17 +303,17 @@ struct e1000_phy_operations { 26293@@ -303,17 +303,17 @@ struct e1000_phy_operations {
26127 }; 26294 };
26128 26295
@@ -26148,9 +26315,9 @@ diff -urNp linux-2.6.32.12/drivers/net/igb/e1000_hw.h linux-2.6.32.12/drivers/ne
26148 }; 26315 };
26149 26316
26150 extern const struct e1000_info e1000_82575_info; 26317 extern const struct e1000_info e1000_82575_info;
26151diff -urNp linux-2.6.32.12/drivers/net/irda/vlsi_ir.c linux-2.6.32.12/drivers/net/irda/vlsi_ir.c 26318diff -urNp linux-2.6.32.13/drivers/net/irda/vlsi_ir.c linux-2.6.32.13/drivers/net/irda/vlsi_ir.c
26152--- linux-2.6.32.12/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400 26319--- linux-2.6.32.13/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400
26153+++ linux-2.6.32.12/drivers/net/irda/vlsi_ir.c 2010-04-04 20:46:41.601781347 -0400 26320+++ linux-2.6.32.13/drivers/net/irda/vlsi_ir.c 2010-05-15 13:21:15.650979196 -0400
26154@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( 26321@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
26155 /* no race - tx-ring already empty */ 26322 /* no race - tx-ring already empty */
26156 vlsi_set_baud(idev, iobase); 26323 vlsi_set_baud(idev, iobase);
@@ -26167,9 +26334,9 @@ diff -urNp linux-2.6.32.12/drivers/net/irda/vlsi_ir.c linux-2.6.32.12/drivers/ne
26167 spin_unlock_irqrestore(&idev->lock, flags); 26334 spin_unlock_irqrestore(&idev->lock, flags);
26168 dev_kfree_skb_any(skb); 26335 dev_kfree_skb_any(skb);
26169 return NETDEV_TX_OK; 26336 return NETDEV_TX_OK;
26170diff -urNp linux-2.6.32.12/drivers/net/iseries_veth.c linux-2.6.32.12/drivers/net/iseries_veth.c 26337diff -urNp linux-2.6.32.13/drivers/net/iseries_veth.c linux-2.6.32.13/drivers/net/iseries_veth.c
26171--- linux-2.6.32.12/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400 26338--- linux-2.6.32.13/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400
26172+++ linux-2.6.32.12/drivers/net/iseries_veth.c 2010-04-04 20:46:41.601781347 -0400 26339+++ linux-2.6.32.13/drivers/net/iseries_veth.c 2010-05-15 13:21:15.675080517 -0400
26173@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul 26340@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
26174 NULL 26341 NULL
26175 }; 26342 };
@@ -26188,9 +26355,9 @@ diff -urNp linux-2.6.32.12/drivers/net/iseries_veth.c linux-2.6.32.12/drivers/ne
26188 .show = veth_port_attribute_show 26355 .show = veth_port_attribute_show
26189 }; 26356 };
26190 26357
26191diff -urNp linux-2.6.32.12/drivers/net/pcnet32.c linux-2.6.32.12/drivers/net/pcnet32.c 26358diff -urNp linux-2.6.32.13/drivers/net/pcnet32.c linux-2.6.32.13/drivers/net/pcnet32.c
26192--- linux-2.6.32.12/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400 26359--- linux-2.6.32.13/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400
26193+++ linux-2.6.32.12/drivers/net/pcnet32.c 2010-04-04 20:46:41.601781347 -0400 26360+++ linux-2.6.32.13/drivers/net/pcnet32.c 2010-05-15 13:21:15.695242570 -0400
26194@@ -79,7 +79,7 @@ static int cards_found; 26361@@ -79,7 +79,7 @@ static int cards_found;
26195 /* 26362 /*
26196 * VLB I/O addresses 26363 * VLB I/O addresses
@@ -26200,9 +26367,9 @@ diff -urNp linux-2.6.32.12/drivers/net/pcnet32.c linux-2.6.32.12/drivers/net/pcn
26200 { 0x300, 0x320, 0x340, 0x360, 0 }; 26367 { 0x300, 0x320, 0x340, 0x360, 0 };
26201 26368
26202 static int pcnet32_debug = 0; 26369 static int pcnet32_debug = 0;
26203diff -urNp linux-2.6.32.12/drivers/net/tg3.h linux-2.6.32.12/drivers/net/tg3.h 26370diff -urNp linux-2.6.32.13/drivers/net/tg3.h linux-2.6.32.13/drivers/net/tg3.h
26204--- linux-2.6.32.12/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400 26371--- linux-2.6.32.13/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400
26205+++ linux-2.6.32.12/drivers/net/tg3.h 2010-04-04 20:46:41.601781347 -0400 26372+++ linux-2.6.32.13/drivers/net/tg3.h 2010-05-15 13:21:15.715816686 -0400
26206@@ -95,6 +95,7 @@ 26373@@ -95,6 +95,7 @@
26207 #define CHIPREV_ID_5750_A0 0x4000 26374 #define CHIPREV_ID_5750_A0 0x4000
26208 #define CHIPREV_ID_5750_A1 0x4001 26375 #define CHIPREV_ID_5750_A1 0x4001
@@ -26211,9 +26378,9 @@ diff -urNp linux-2.6.32.12/drivers/net/tg3.h linux-2.6.32.12/drivers/net/tg3.h
26211 #define CHIPREV_ID_5750_C2 0x4202 26378 #define CHIPREV_ID_5750_C2 0x4202
26212 #define CHIPREV_ID_5752_A0_HW 0x5000 26379 #define CHIPREV_ID_5752_A0_HW 0x5000
26213 #define CHIPREV_ID_5752_A0 0x6000 26380 #define CHIPREV_ID_5752_A0 0x6000
26214diff -urNp linux-2.6.32.12/drivers/net/tulip/de4x5.c linux-2.6.32.12/drivers/net/tulip/de4x5.c 26381diff -urNp linux-2.6.32.13/drivers/net/tulip/de4x5.c linux-2.6.32.13/drivers/net/tulip/de4x5.c
26215--- linux-2.6.32.12/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400 26382--- linux-2.6.32.13/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400
26216+++ linux-2.6.32.12/drivers/net/tulip/de4x5.c 2010-04-04 20:46:41.601781347 -0400 26383+++ linux-2.6.32.13/drivers/net/tulip/de4x5.c 2010-05-15 13:21:15.731971640 -0400
26217@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru 26384@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
26218 for (i=0; i<ETH_ALEN; i++) { 26385 for (i=0; i<ETH_ALEN; i++) {
26219 tmp.addr[i] = dev->dev_addr[i]; 26386 tmp.addr[i] = dev->dev_addr[i];
@@ -26232,9 +26399,9 @@ diff -urNp linux-2.6.32.12/drivers/net/tulip/de4x5.c linux-2.6.32.12/drivers/net
26232 return -EFAULT; 26399 return -EFAULT;
26233 break; 26400 break;
26234 } 26401 }
26235diff -urNp linux-2.6.32.12/drivers/net/usb/hso.c linux-2.6.32.12/drivers/net/usb/hso.c 26402diff -urNp linux-2.6.32.13/drivers/net/usb/hso.c linux-2.6.32.13/drivers/net/usb/hso.c
26236--- linux-2.6.32.12/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400 26403--- linux-2.6.32.13/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400
26237+++ linux-2.6.32.12/drivers/net/usb/hso.c 2010-04-04 20:46:41.605567348 -0400 26404+++ linux-2.6.32.13/drivers/net/usb/hso.c 2010-05-15 13:21:15.731971640 -0400
26238@@ -258,7 +258,7 @@ struct hso_serial { 26405@@ -258,7 +258,7 @@ struct hso_serial {
26239 26406
26240 /* from usb_serial_port */ 26407 /* from usb_serial_port */
@@ -26313,9 +26480,9 @@ diff -urNp linux-2.6.32.12/drivers/net/usb/hso.c linux-2.6.32.12/drivers/net/usb
26313 result = 26480 result =
26314 hso_start_serial_device(serial_table[i], GFP_NOIO); 26481 hso_start_serial_device(serial_table[i], GFP_NOIO);
26315 hso_kick_transmit(dev2ser(serial_table[i])); 26482 hso_kick_transmit(dev2ser(serial_table[i]));
26316diff -urNp linux-2.6.32.12/drivers/net/wireless/b43/debugfs.c linux-2.6.32.12/drivers/net/wireless/b43/debugfs.c 26483diff -urNp linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c
26317--- linux-2.6.32.12/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400 26484--- linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400
26318+++ linux-2.6.32.12/drivers/net/wireless/b43/debugfs.c 2010-04-04 20:46:41.605567348 -0400 26485+++ linux-2.6.32.13/drivers/net/wireless/b43/debugfs.c 2010-05-15 13:21:15.742991879 -0400
26319@@ -43,7 +43,7 @@ static struct dentry *rootdir; 26486@@ -43,7 +43,7 @@ static struct dentry *rootdir;
26320 struct b43_debugfs_fops { 26487 struct b43_debugfs_fops {
26321 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); 26488 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -26325,9 +26492,9 @@ diff -urNp linux-2.6.32.12/drivers/net/wireless/b43/debugfs.c linux-2.6.32.12/dr
26325 /* Offset of struct b43_dfs_file in struct b43_dfsentry */ 26492 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
26326 size_t file_struct_offset; 26493 size_t file_struct_offset;
26327 }; 26494 };
26328diff -urNp linux-2.6.32.12/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.12/drivers/net/wireless/b43legacy/debugfs.c 26495diff -urNp linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c
26329--- linux-2.6.32.12/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400 26496--- linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400
26330+++ linux-2.6.32.12/drivers/net/wireless/b43legacy/debugfs.c 2010-04-04 20:46:41.605567348 -0400 26497+++ linux-2.6.32.13/drivers/net/wireless/b43legacy/debugfs.c 2010-05-15 13:21:15.742991879 -0400
26331@@ -44,7 +44,7 @@ static struct dentry *rootdir; 26498@@ -44,7 +44,7 @@ static struct dentry *rootdir;
26332 struct b43legacy_debugfs_fops { 26499 struct b43legacy_debugfs_fops {
26333 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); 26500 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -26337,9 +26504,9 @@ diff -urNp linux-2.6.32.12/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32
26337 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ 26504 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
26338 size_t file_struct_offset; 26505 size_t file_struct_offset;
26339 /* Take wl->irq_lock before calling read/write? */ 26506 /* Take wl->irq_lock before calling read/write? */
26340diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-1000.c 26507diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c
26341--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400 26508--- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400
26342+++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-04-04 20:46:41.605567348 -0400 26509+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-05-15 13:21:15.746908676 -0400
26343@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = 26510@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
26344 }, 26511 },
26345 }; 26512 };
@@ -26349,9 +26516,9 @@ diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
26349 .ucode = &iwl5000_ucode, 26516 .ucode = &iwl5000_ucode,
26350 .lib = &iwl1000_lib, 26517 .lib = &iwl1000_lib,
26351 .hcmd = &iwl5000_hcmd, 26518 .hcmd = &iwl5000_hcmd,
26352diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-3945.c 26519diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c
26353--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400 26520--- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400
26354+++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:46:41.605567348 -0400 26521+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-05-15 13:21:15.777121582 -0400
26355@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 26522@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
26356 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, 26523 .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
26357 }; 26524 };
@@ -26361,9 +26528,9 @@ diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.
26361 .ucode = &iwl3945_ucode, 26528 .ucode = &iwl3945_ucode,
26362 .lib = &iwl3945_lib, 26529 .lib = &iwl3945_lib,
26363 .hcmd = &iwl3945_hcmd, 26530 .hcmd = &iwl3945_hcmd,
26364diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-4965.c 26531diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c
26365--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-04-29 17:49:38.221487644 -0400 26532--- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-04-29 17:49:38.221487644 -0400
26366+++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-04-29 17:49:58.277496729 -0400 26533+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-05-15 13:21:15.803555313 -0400
26367@@ -2340,7 +2340,7 @@ static struct iwl_lib_ops iwl4965_lib = 26534@@ -2340,7 +2340,7 @@ static struct iwl_lib_ops iwl4965_lib =
26368 }, 26535 },
26369 }; 26536 };
@@ -26373,9 +26540,9 @@ diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.
26373 .ucode = &iwl4965_ucode, 26540 .ucode = &iwl4965_ucode,
26374 .lib = &iwl4965_lib, 26541 .lib = &iwl4965_lib,
26375 .hcmd = &iwl4965_hcmd, 26542 .hcmd = &iwl4965_hcmd,
26376diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-5000.c 26543diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c
26377--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-04-29 17:49:38.221487644 -0400 26544--- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-04-29 17:49:38.221487644 -0400
26378+++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-04-29 17:49:58.285504530 -0400 26545+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-05-15 13:21:15.810712850 -0400
26379@@ -1628,14 +1628,14 @@ static struct iwl_lib_ops iwl5150_lib = 26546@@ -1628,14 +1628,14 @@ static struct iwl_lib_ops iwl5150_lib =
26380 }, 26547 },
26381 }; 26548 };
@@ -26393,9 +26560,9 @@ diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.
26393 .ucode = &iwl5000_ucode, 26560 .ucode = &iwl5000_ucode,
26394 .lib = &iwl5150_lib, 26561 .lib = &iwl5150_lib,
26395 .hcmd = &iwl5000_hcmd, 26562 .hcmd = &iwl5000_hcmd,
26396diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-6000.c 26563diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c
26397--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400 26564--- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400
26398+++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-04-04 20:46:41.605567348 -0400 26565+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-05-15 13:21:15.810712850 -0400
26399@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 26566@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
26400 .calc_rssi = iwl5000_calc_rssi, 26567 .calc_rssi = iwl5000_calc_rssi,
26401 }; 26568 };
@@ -26405,9 +26572,9 @@ diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
26405 .ucode = &iwl5000_ucode, 26572 .ucode = &iwl5000_ucode,
26406 .lib = &iwl6000_lib, 26573 .lib = &iwl6000_lib,
26407 .hcmd = &iwl5000_hcmd, 26574 .hcmd = &iwl5000_hcmd,
26408diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-debug.h 26575diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h
26409--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-03-15 11:52:04.000000000 -0400 26576--- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-03-15 11:52:04.000000000 -0400
26410+++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-04-29 17:46:37.170092362 -0400 26577+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-05-15 13:21:15.810712850 -0400
26411@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri 26578@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
26412 #endif 26579 #endif
26413 26580
@@ -26419,9 +26586,9 @@ diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32
26419 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, 26586 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
26420 void *p, u32 len) 26587 void *p, u32 len)
26421 {} 26588 {}
26422diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-dev.h 26589diff -urNp linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h
26423--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400 26590--- linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400
26424+++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-04-04 20:46:41.605567348 -0400 26591+++ linux-2.6.32.13/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-05-15 13:21:15.810712850 -0400
26425@@ -67,7 +67,7 @@ struct iwl_tx_queue; 26592@@ -67,7 +67,7 @@ struct iwl_tx_queue;
26426 26593
26427 /* shared structures from iwl-5000.c */ 26594 /* shared structures from iwl-5000.c */
@@ -26431,9 +26598,9 @@ diff -urNp linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.1
26431 extern struct iwl_ucode_ops iwl5000_ucode; 26598 extern struct iwl_ucode_ops iwl5000_ucode;
26432 extern struct iwl_lib_ops iwl5000_lib; 26599 extern struct iwl_lib_ops iwl5000_lib;
26433 extern struct iwl_hcmd_ops iwl5000_hcmd; 26600 extern struct iwl_hcmd_ops iwl5000_hcmd;
26434diff -urNp linux-2.6.32.12/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.12/drivers/net/wireless/libertas/debugfs.c 26601diff -urNp linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c
26435--- linux-2.6.32.12/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400 26602--- linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400
26436+++ linux-2.6.32.12/drivers/net/wireless/libertas/debugfs.c 2010-04-04 20:46:41.605567348 -0400 26603+++ linux-2.6.32.13/drivers/net/wireless/libertas/debugfs.c 2010-05-15 13:21:15.810712850 -0400
26437@@ -708,7 +708,7 @@ out_unlock: 26604@@ -708,7 +708,7 @@ out_unlock:
26438 struct lbs_debugfs_files { 26605 struct lbs_debugfs_files {
26439 const char *name; 26606 const char *name;
@@ -26443,9 +26610,9 @@ diff -urNp linux-2.6.32.12/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
26443 }; 26610 };
26444 26611
26445 static const struct lbs_debugfs_files debugfs_files[] = { 26612 static const struct lbs_debugfs_files debugfs_files[] = {
26446diff -urNp linux-2.6.32.12/drivers/net/wireless/rndis_wlan.c linux-2.6.32.12/drivers/net/wireless/rndis_wlan.c 26613diff -urNp linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c
26447--- linux-2.6.32.12/drivers/net/wireless/rndis_wlan.c 2010-03-15 11:52:04.000000000 -0400 26614--- linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c 2010-03-15 11:52:04.000000000 -0400
26448+++ linux-2.6.32.12/drivers/net/wireless/rndis_wlan.c 2010-04-29 17:46:37.185749089 -0400 26615+++ linux-2.6.32.13/drivers/net/wireless/rndis_wlan.c 2010-05-15 13:21:15.822985498 -0400
26449@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn 26616@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
26450 26617
26451 devdbg(usbdev, "set_rts_threshold %i", rts_threshold); 26618 devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
@@ -26455,9 +26622,9 @@ diff -urNp linux-2.6.32.12/drivers/net/wireless/rndis_wlan.c linux-2.6.32.12/dri
26455 rts_threshold = 2347; 26622 rts_threshold = 2347;
26456 26623
26457 tmp = cpu_to_le32(rts_threshold); 26624 tmp = cpu_to_le32(rts_threshold);
26458diff -urNp linux-2.6.32.12/drivers/oprofile/buffer_sync.c linux-2.6.32.12/drivers/oprofile/buffer_sync.c 26625diff -urNp linux-2.6.32.13/drivers/oprofile/buffer_sync.c linux-2.6.32.13/drivers/oprofile/buffer_sync.c
26459--- linux-2.6.32.12/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400 26626--- linux-2.6.32.13/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400
26460+++ linux-2.6.32.12/drivers/oprofile/buffer_sync.c 2010-04-04 20:46:41.605567348 -0400 26627+++ linux-2.6.32.13/drivers/oprofile/buffer_sync.c 2010-05-15 13:21:15.822985498 -0400
26461@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en 26628@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en
26462 if (cookie == NO_COOKIE) 26629 if (cookie == NO_COOKIE)
26463 offset = pc; 26630 offset = pc;
@@ -26493,9 +26660,9 @@ diff -urNp linux-2.6.32.12/drivers/oprofile/buffer_sync.c linux-2.6.32.12/driver
26493 } 26660 }
26494 } 26661 }
26495 release_mm(mm); 26662 release_mm(mm);
26496diff -urNp linux-2.6.32.12/drivers/oprofile/event_buffer.c linux-2.6.32.12/drivers/oprofile/event_buffer.c 26663diff -urNp linux-2.6.32.13/drivers/oprofile/event_buffer.c linux-2.6.32.13/drivers/oprofile/event_buffer.c
26497--- linux-2.6.32.12/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400 26664--- linux-2.6.32.13/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400
26498+++ linux-2.6.32.12/drivers/oprofile/event_buffer.c 2010-04-04 20:46:41.605567348 -0400 26665+++ linux-2.6.32.13/drivers/oprofile/event_buffer.c 2010-05-15 13:21:15.822985498 -0400
26499@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value 26666@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
26500 } 26667 }
26501 26668
@@ -26505,9 +26672,9 @@ diff -urNp linux-2.6.32.12/drivers/oprofile/event_buffer.c linux-2.6.32.12/drive
26505 return; 26672 return;
26506 } 26673 }
26507 26674
26508diff -urNp linux-2.6.32.12/drivers/oprofile/oprof.c linux-2.6.32.12/drivers/oprofile/oprof.c 26675diff -urNp linux-2.6.32.13/drivers/oprofile/oprof.c linux-2.6.32.13/drivers/oprofile/oprof.c
26509--- linux-2.6.32.12/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400 26676--- linux-2.6.32.13/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400
26510+++ linux-2.6.32.12/drivers/oprofile/oprof.c 2010-04-04 20:46:41.605567348 -0400 26677+++ linux-2.6.32.13/drivers/oprofile/oprof.c 2010-05-15 13:21:15.822985498 -0400
26511@@ -110,7 +110,7 @@ static void switch_worker(struct work_st 26678@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
26512 if (oprofile_ops.switch_events()) 26679 if (oprofile_ops.switch_events())
26513 return; 26680 return;
@@ -26517,9 +26684,9 @@ diff -urNp linux-2.6.32.12/drivers/oprofile/oprof.c linux-2.6.32.12/drivers/opro
26517 start_switch_worker(); 26684 start_switch_worker();
26518 } 26685 }
26519 26686
26520diff -urNp linux-2.6.32.12/drivers/oprofile/oprofilefs.c linux-2.6.32.12/drivers/oprofile/oprofilefs.c 26687diff -urNp linux-2.6.32.13/drivers/oprofile/oprofilefs.c linux-2.6.32.13/drivers/oprofile/oprofilefs.c
26521--- linux-2.6.32.12/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400 26688--- linux-2.6.32.13/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400
26522+++ linux-2.6.32.12/drivers/oprofile/oprofilefs.c 2010-04-04 20:46:41.609229988 -0400 26689+++ linux-2.6.32.13/drivers/oprofile/oprofilefs.c 2010-05-15 13:21:15.822985498 -0400
26523@@ -187,7 +187,7 @@ static const struct file_operations atom 26690@@ -187,7 +187,7 @@ static const struct file_operations atom
26524 26691
26525 26692
@@ -26529,9 +26696,9 @@ diff -urNp linux-2.6.32.12/drivers/oprofile/oprofilefs.c linux-2.6.32.12/drivers
26529 { 26696 {
26530 struct dentry *d = __oprofilefs_create_file(sb, root, name, 26697 struct dentry *d = __oprofilefs_create_file(sb, root, name,
26531 &atomic_ro_fops, 0444); 26698 &atomic_ro_fops, 0444);
26532diff -urNp linux-2.6.32.12/drivers/oprofile/oprofile_stats.c linux-2.6.32.12/drivers/oprofile/oprofile_stats.c 26699diff -urNp linux-2.6.32.13/drivers/oprofile/oprofile_stats.c linux-2.6.32.13/drivers/oprofile/oprofile_stats.c
26533--- linux-2.6.32.12/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400 26700--- linux-2.6.32.13/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400
26534+++ linux-2.6.32.12/drivers/oprofile/oprofile_stats.c 2010-04-04 20:46:41.609229988 -0400 26701+++ linux-2.6.32.13/drivers/oprofile/oprofile_stats.c 2010-05-15 13:21:15.822985498 -0400
26535@@ -30,11 +30,11 @@ void oprofile_reset_stats(void) 26702@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
26536 cpu_buf->sample_invalid_eip = 0; 26703 cpu_buf->sample_invalid_eip = 0;
26537 } 26704 }
@@ -26549,9 +26716,9 @@ diff -urNp linux-2.6.32.12/drivers/oprofile/oprofile_stats.c linux-2.6.32.12/dri
26549 } 26716 }
26550 26717
26551 26718
26552diff -urNp linux-2.6.32.12/drivers/oprofile/oprofile_stats.h linux-2.6.32.12/drivers/oprofile/oprofile_stats.h 26719diff -urNp linux-2.6.32.13/drivers/oprofile/oprofile_stats.h linux-2.6.32.13/drivers/oprofile/oprofile_stats.h
26553--- linux-2.6.32.12/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400 26720--- linux-2.6.32.13/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400
26554+++ linux-2.6.32.12/drivers/oprofile/oprofile_stats.h 2010-04-04 20:46:41.609229988 -0400 26721+++ linux-2.6.32.13/drivers/oprofile/oprofile_stats.h 2010-05-15 13:21:15.822985498 -0400
26555@@ -13,11 +13,11 @@ 26722@@ -13,11 +13,11 @@
26556 #include <asm/atomic.h> 26723 #include <asm/atomic.h>
26557 26724
@@ -26569,9 +26736,9 @@ diff -urNp linux-2.6.32.12/drivers/oprofile/oprofile_stats.h linux-2.6.32.12/dri
26569 }; 26736 };
26570 26737
26571 extern struct oprofile_stat_struct oprofile_stats; 26738 extern struct oprofile_stat_struct oprofile_stats;
26572diff -urNp linux-2.6.32.12/drivers/parisc/pdc_stable.c linux-2.6.32.12/drivers/parisc/pdc_stable.c 26739diff -urNp linux-2.6.32.13/drivers/parisc/pdc_stable.c linux-2.6.32.13/drivers/parisc/pdc_stable.c
26573--- linux-2.6.32.12/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400 26740--- linux-2.6.32.13/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400
26574+++ linux-2.6.32.12/drivers/parisc/pdc_stable.c 2010-04-04 20:46:41.609229988 -0400 26741+++ linux-2.6.32.13/drivers/parisc/pdc_stable.c 2010-05-15 13:21:15.822985498 -0400
26575@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj 26742@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
26576 return ret; 26743 return ret;
26577 } 26744 }
@@ -26581,9 +26748,9 @@ diff -urNp linux-2.6.32.12/drivers/parisc/pdc_stable.c linux-2.6.32.12/drivers/p
26581 .show = pdcspath_attr_show, 26748 .show = pdcspath_attr_show,
26582 .store = pdcspath_attr_store, 26749 .store = pdcspath_attr_store,
26583 }; 26750 };
26584diff -urNp linux-2.6.32.12/drivers/parport/procfs.c linux-2.6.32.12/drivers/parport/procfs.c 26751diff -urNp linux-2.6.32.13/drivers/parport/procfs.c linux-2.6.32.13/drivers/parport/procfs.c
26585--- linux-2.6.32.12/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400 26752--- linux-2.6.32.13/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400
26586+++ linux-2.6.32.12/drivers/parport/procfs.c 2010-04-04 20:46:41.609229988 -0400 26753+++ linux-2.6.32.13/drivers/parport/procfs.c 2010-05-15 13:21:15.822985498 -0400
26587@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t 26754@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
26588 26755
26589 *ppos += len; 26756 *ppos += len;
@@ -26602,9 +26769,9 @@ diff -urNp linux-2.6.32.12/drivers/parport/procfs.c linux-2.6.32.12/drivers/parp
26602 } 26769 }
26603 #endif /* IEEE1284.3 support. */ 26770 #endif /* IEEE1284.3 support. */
26604 26771
26605diff -urNp linux-2.6.32.12/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.12/drivers/pci/hotplug/acpiphp_glue.c 26772diff -urNp linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c
26606--- linux-2.6.32.12/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400 26773--- linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400
26607+++ linux-2.6.32.12/drivers/pci/hotplug/acpiphp_glue.c 2010-04-04 20:46:41.609229988 -0400 26774+++ linux-2.6.32.13/drivers/pci/hotplug/acpiphp_glue.c 2010-05-15 13:21:15.842765021 -0400
26608@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif 26775@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
26609 } 26776 }
26610 26777
@@ -26614,9 +26781,9 @@ diff -urNp linux-2.6.32.12/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.12/dr
26614 .handler = handle_hotplug_event_func, 26781 .handler = handle_hotplug_event_func,
26615 }; 26782 };
26616 26783
26617diff -urNp linux-2.6.32.12/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.12/drivers/pci/hotplug/cpqphp_nvram.c 26784diff -urNp linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c
26618--- linux-2.6.32.12/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400 26785--- linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400
26619+++ linux-2.6.32.12/drivers/pci/hotplug/cpqphp_nvram.c 2010-04-04 20:46:41.609229988 -0400 26786+++ linux-2.6.32.13/drivers/pci/hotplug/cpqphp_nvram.c 2010-05-15 13:21:15.842765021 -0400
26620@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ 26787@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
26621 26788
26622 void compaq_nvram_init (void __iomem *rom_start) 26789 void compaq_nvram_init (void __iomem *rom_start)
@@ -26631,9 +26798,9 @@ diff -urNp linux-2.6.32.12/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.12/dr
26631 dbg("int15 entry = %p\n", compaq_int15_entry_point); 26798 dbg("int15 entry = %p\n", compaq_int15_entry_point);
26632 26799
26633 /* initialize our int15 lock */ 26800 /* initialize our int15 lock */
26634diff -urNp linux-2.6.32.12/drivers/pci/hotplug/fakephp.c linux-2.6.32.12/drivers/pci/hotplug/fakephp.c 26801diff -urNp linux-2.6.32.13/drivers/pci/hotplug/fakephp.c linux-2.6.32.13/drivers/pci/hotplug/fakephp.c
26635--- linux-2.6.32.12/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400 26802--- linux-2.6.32.13/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400
26636+++ linux-2.6.32.12/drivers/pci/hotplug/fakephp.c 2010-04-04 20:46:41.609229988 -0400 26803+++ linux-2.6.32.13/drivers/pci/hotplug/fakephp.c 2010-05-15 13:21:15.847000534 -0400
26637@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec 26804@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
26638 } 26805 }
26639 26806
@@ -26643,9 +26810,9 @@ diff -urNp linux-2.6.32.12/drivers/pci/hotplug/fakephp.c linux-2.6.32.12/drivers
26643 .store = legacy_store, .show = legacy_show 26810 .store = legacy_store, .show = legacy_show
26644 }, 26811 },
26645 .release = &legacy_release, 26812 .release = &legacy_release,
26646diff -urNp linux-2.6.32.12/drivers/pci/intel-iommu.c linux-2.6.32.12/drivers/pci/intel-iommu.c 26813diff -urNp linux-2.6.32.13/drivers/pci/intel-iommu.c linux-2.6.32.13/drivers/pci/intel-iommu.c
26647--- linux-2.6.32.12/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400 26814--- linux-2.6.32.13/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400
26648+++ linux-2.6.32.12/drivers/pci/intel-iommu.c 2010-04-04 20:46:41.609229988 -0400 26815+++ linux-2.6.32.13/drivers/pci/intel-iommu.c 2010-05-15 13:21:15.847000534 -0400
26649@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de 26816@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de
26650 return !dma_addr; 26817 return !dma_addr;
26651 } 26818 }
@@ -26655,9 +26822,9 @@ diff -urNp linux-2.6.32.12/drivers/pci/intel-iommu.c linux-2.6.32.12/drivers/pci
26655 .alloc_coherent = intel_alloc_coherent, 26822 .alloc_coherent = intel_alloc_coherent,
26656 .free_coherent = intel_free_coherent, 26823 .free_coherent = intel_free_coherent,
26657 .map_sg = intel_map_sg, 26824 .map_sg = intel_map_sg,
26658diff -urNp linux-2.6.32.12/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.12/drivers/pci/pcie/portdrv_pci.c 26825diff -urNp linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c
26659--- linux-2.6.32.12/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400 26826--- linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400
26660+++ linux-2.6.32.12/drivers/pci/pcie/portdrv_pci.c 2010-04-04 20:46:41.609229988 -0400 26827+++ linux-2.6.32.13/drivers/pci/pcie/portdrv_pci.c 2010-05-15 13:21:15.867469095 -0400
26661@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru 26828@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru
26662 static const struct pci_device_id port_pci_ids[] = { { 26829 static const struct pci_device_id port_pci_ids[] = { {
26663 /* handle any PCI-Express port */ 26830 /* handle any PCI-Express port */
@@ -26667,9 +26834,9 @@ diff -urNp linux-2.6.32.12/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.12/driver
26667 }; 26834 };
26668 MODULE_DEVICE_TABLE(pci, port_pci_ids); 26835 MODULE_DEVICE_TABLE(pci, port_pci_ids);
26669 26836
26670diff -urNp linux-2.6.32.12/drivers/pci/probe.c linux-2.6.32.12/drivers/pci/probe.c 26837diff -urNp linux-2.6.32.13/drivers/pci/probe.c linux-2.6.32.13/drivers/pci/probe.c
26671--- linux-2.6.32.12/drivers/pci/probe.c 2010-03-15 11:52:04.000000000 -0400 26838--- linux-2.6.32.13/drivers/pci/probe.c 2010-03-15 11:52:04.000000000 -0400
26672+++ linux-2.6.32.12/drivers/pci/probe.c 2010-04-29 17:46:37.193749810 -0400 26839+++ linux-2.6.32.13/drivers/pci/probe.c 2010-05-15 13:21:15.867469095 -0400
26673@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( 26840@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
26674 return ret; 26841 return ret;
26675 } 26842 }
@@ -26687,9 +26854,9 @@ diff -urNp linux-2.6.32.12/drivers/pci/probe.c linux-2.6.32.12/drivers/pci/probe
26687 struct device_attribute *attr, 26854 struct device_attribute *attr,
26688 char *buf) 26855 char *buf)
26689 { 26856 {
26690diff -urNp linux-2.6.32.12/drivers/pci/proc.c linux-2.6.32.12/drivers/pci/proc.c 26857diff -urNp linux-2.6.32.13/drivers/pci/proc.c linux-2.6.32.13/drivers/pci/proc.c
26691--- linux-2.6.32.12/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400 26858--- linux-2.6.32.13/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400
26692+++ linux-2.6.32.12/drivers/pci/proc.c 2010-04-04 20:46:41.609229988 -0400 26859+++ linux-2.6.32.13/drivers/pci/proc.c 2010-05-15 13:21:15.867469095 -0400
26693@@ -480,7 +480,16 @@ static const struct file_operations proc 26860@@ -480,7 +480,16 @@ static const struct file_operations proc
26694 static int __init pci_proc_init(void) 26861 static int __init pci_proc_init(void)
26695 { 26862 {
@@ -26707,9 +26874,9 @@ diff -urNp linux-2.6.32.12/drivers/pci/proc.c linux-2.6.32.12/drivers/pci/proc.c
26707 proc_create("devices", 0, proc_bus_pci_dir, 26874 proc_create("devices", 0, proc_bus_pci_dir,
26708 &proc_bus_pci_dev_operations); 26875 &proc_bus_pci_dev_operations);
26709 proc_initialized = 1; 26876 proc_initialized = 1;
26710diff -urNp linux-2.6.32.12/drivers/pci/slot.c linux-2.6.32.12/drivers/pci/slot.c 26877diff -urNp linux-2.6.32.13/drivers/pci/slot.c linux-2.6.32.13/drivers/pci/slot.c
26711--- linux-2.6.32.12/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400 26878--- linux-2.6.32.13/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400
26712+++ linux-2.6.32.12/drivers/pci/slot.c 2010-04-04 20:46:41.609229988 -0400 26879+++ linux-2.6.32.13/drivers/pci/slot.c 2010-05-15 13:21:15.895764457 -0400
26713@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc 26880@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
26714 return attribute->store ? attribute->store(slot, buf, len) : -EIO; 26881 return attribute->store ? attribute->store(slot, buf, len) : -EIO;
26715 } 26882 }
@@ -26719,9 +26886,9 @@ diff -urNp linux-2.6.32.12/drivers/pci/slot.c linux-2.6.32.12/drivers/pci/slot.c
26719 .show = pci_slot_attr_show, 26886 .show = pci_slot_attr_show,
26720 .store = pci_slot_attr_store, 26887 .store = pci_slot_attr_store,
26721 }; 26888 };
26722diff -urNp linux-2.6.32.12/drivers/pcmcia/ti113x.h linux-2.6.32.12/drivers/pcmcia/ti113x.h 26889diff -urNp linux-2.6.32.13/drivers/pcmcia/ti113x.h linux-2.6.32.13/drivers/pcmcia/ti113x.h
26723--- linux-2.6.32.12/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400 26890--- linux-2.6.32.13/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400
26724+++ linux-2.6.32.12/drivers/pcmcia/ti113x.h 2010-04-04 20:46:41.609229988 -0400 26891+++ linux-2.6.32.13/drivers/pcmcia/ti113x.h 2010-05-15 13:21:15.895764457 -0400
26725@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl 26892@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
26726 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, 26893 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
26727 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), 26894 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
@@ -26731,9 +26898,9 @@ diff -urNp linux-2.6.32.12/drivers/pcmcia/ti113x.h linux-2.6.32.12/drivers/pcmci
26731 }; 26898 };
26732 26899
26733 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) 26900 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
26734diff -urNp linux-2.6.32.12/drivers/pcmcia/yenta_socket.c linux-2.6.32.12/drivers/pcmcia/yenta_socket.c 26901diff -urNp linux-2.6.32.13/drivers/pcmcia/yenta_socket.c linux-2.6.32.13/drivers/pcmcia/yenta_socket.c
26735--- linux-2.6.32.12/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400 26902--- linux-2.6.32.13/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400
26736+++ linux-2.6.32.12/drivers/pcmcia/yenta_socket.c 2010-04-04 20:46:41.609229988 -0400 26903+++ linux-2.6.32.13/drivers/pcmcia/yenta_socket.c 2010-05-15 13:21:15.911499692 -0400
26737@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table 26904@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
26738 26905
26739 /* match any cardbus bridge */ 26906 /* match any cardbus bridge */
@@ -26743,9 +26910,9 @@ diff -urNp linux-2.6.32.12/drivers/pcmcia/yenta_socket.c linux-2.6.32.12/drivers
26743 }; 26910 };
26744 MODULE_DEVICE_TABLE(pci, yenta_table); 26911 MODULE_DEVICE_TABLE(pci, yenta_table);
26745 26912
26746diff -urNp linux-2.6.32.12/drivers/platform/x86/acer-wmi.c linux-2.6.32.12/drivers/platform/x86/acer-wmi.c 26913diff -urNp linux-2.6.32.13/drivers/platform/x86/acer-wmi.c linux-2.6.32.13/drivers/platform/x86/acer-wmi.c
26747--- linux-2.6.32.12/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400 26914--- linux-2.6.32.13/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400
26748+++ linux-2.6.32.12/drivers/platform/x86/acer-wmi.c 2010-04-04 20:46:41.609229988 -0400 26915+++ linux-2.6.32.13/drivers/platform/x86/acer-wmi.c 2010-05-15 13:21:15.911499692 -0400
26749@@ -918,7 +918,7 @@ static int update_bl_status(struct backl 26916@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
26750 return 0; 26917 return 0;
26751 } 26918 }
@@ -26755,9 +26922,9 @@ diff -urNp linux-2.6.32.12/drivers/platform/x86/acer-wmi.c linux-2.6.32.12/drive
26755 .get_brightness = read_brightness, 26922 .get_brightness = read_brightness,
26756 .update_status = update_bl_status, 26923 .update_status = update_bl_status,
26757 }; 26924 };
26758diff -urNp linux-2.6.32.12/drivers/platform/x86/asus_acpi.c linux-2.6.32.12/drivers/platform/x86/asus_acpi.c 26925diff -urNp linux-2.6.32.13/drivers/platform/x86/asus_acpi.c linux-2.6.32.13/drivers/platform/x86/asus_acpi.c
26759--- linux-2.6.32.12/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400 26926--- linux-2.6.32.13/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400
26760+++ linux-2.6.32.12/drivers/platform/x86/asus_acpi.c 2010-04-04 20:46:41.609229988 -0400 26927+++ linux-2.6.32.13/drivers/platform/x86/asus_acpi.c 2010-05-15 13:21:15.911499692 -0400
26761@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ 26928@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
26762 return 0; 26929 return 0;
26763 } 26930 }
@@ -26767,9 +26934,9 @@ diff -urNp linux-2.6.32.12/drivers/platform/x86/asus_acpi.c linux-2.6.32.12/driv
26767 .get_brightness = read_brightness, 26934 .get_brightness = read_brightness,
26768 .update_status = set_brightness_status, 26935 .update_status = set_brightness_status,
26769 }; 26936 };
26770diff -urNp linux-2.6.32.12/drivers/platform/x86/asus-laptop.c linux-2.6.32.12/drivers/platform/x86/asus-laptop.c 26937diff -urNp linux-2.6.32.13/drivers/platform/x86/asus-laptop.c linux-2.6.32.13/drivers/platform/x86/asus-laptop.c
26771--- linux-2.6.32.12/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400 26938--- linux-2.6.32.13/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400
26772+++ linux-2.6.32.12/drivers/platform/x86/asus-laptop.c 2010-04-04 20:46:41.609229988 -0400 26939+++ linux-2.6.32.13/drivers/platform/x86/asus-laptop.c 2010-05-15 13:21:15.911499692 -0400
26773@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac 26940@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
26774 */ 26941 */
26775 static int read_brightness(struct backlight_device *bd); 26942 static int read_brightness(struct backlight_device *bd);
@@ -26779,9 +26946,9 @@ diff -urNp linux-2.6.32.12/drivers/platform/x86/asus-laptop.c linux-2.6.32.12/dr
26779 .get_brightness = read_brightness, 26946 .get_brightness = read_brightness,
26780 .update_status = update_bl_status, 26947 .update_status = update_bl_status,
26781 }; 26948 };
26782diff -urNp linux-2.6.32.12/drivers/platform/x86/compal-laptop.c linux-2.6.32.12/drivers/platform/x86/compal-laptop.c 26949diff -urNp linux-2.6.32.13/drivers/platform/x86/compal-laptop.c linux-2.6.32.13/drivers/platform/x86/compal-laptop.c
26783--- linux-2.6.32.12/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400 26950--- linux-2.6.32.13/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400
26784+++ linux-2.6.32.12/drivers/platform/x86/compal-laptop.c 2010-04-04 20:46:41.612789562 -0400 26951+++ linux-2.6.32.13/drivers/platform/x86/compal-laptop.c 2010-05-15 13:21:15.911499692 -0400
26785@@ -163,7 +163,7 @@ static int bl_update_status(struct backl 26952@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
26786 return set_lcd_level(b->props.brightness); 26953 return set_lcd_level(b->props.brightness);
26787 } 26954 }
@@ -26791,9 +26958,9 @@ diff -urNp linux-2.6.32.12/drivers/platform/x86/compal-laptop.c linux-2.6.32.12/
26791 .get_brightness = bl_get_brightness, 26958 .get_brightness = bl_get_brightness,
26792 .update_status = bl_update_status, 26959 .update_status = bl_update_status,
26793 }; 26960 };
26794diff -urNp linux-2.6.32.12/drivers/platform/x86/dell-laptop.c linux-2.6.32.12/drivers/platform/x86/dell-laptop.c 26961diff -urNp linux-2.6.32.13/drivers/platform/x86/dell-laptop.c linux-2.6.32.13/drivers/platform/x86/dell-laptop.c
26795--- linux-2.6.32.12/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400 26962--- linux-2.6.32.13/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400
26796+++ linux-2.6.32.12/drivers/platform/x86/dell-laptop.c 2010-04-04 20:46:41.612789562 -0400 26963+++ linux-2.6.32.13/drivers/platform/x86/dell-laptop.c 2010-05-15 13:21:15.911499692 -0400
26797@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac 26964@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
26798 return buffer.output[1]; 26965 return buffer.output[1];
26799 } 26966 }
@@ -26803,9 +26970,9 @@ diff -urNp linux-2.6.32.12/drivers/platform/x86/dell-laptop.c linux-2.6.32.12/dr
26803 .get_brightness = dell_get_intensity, 26970 .get_brightness = dell_get_intensity,
26804 .update_status = dell_send_intensity, 26971 .update_status = dell_send_intensity,
26805 }; 26972 };
26806diff -urNp linux-2.6.32.12/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.12/drivers/platform/x86/eeepc-laptop.c 26973diff -urNp linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c
26807--- linux-2.6.32.12/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:38.317493070 -0400 26974--- linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:38.317493070 -0400
26808+++ linux-2.6.32.12/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:58.337509449 -0400 26975+++ linux-2.6.32.13/drivers/platform/x86/eeepc-laptop.c 2010-05-15 13:21:15.911499692 -0400
26809@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device 26976@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
26810 */ 26977 */
26811 static int read_brightness(struct backlight_device *bd); 26978 static int read_brightness(struct backlight_device *bd);
@@ -26815,9 +26982,9 @@ diff -urNp linux-2.6.32.12/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.12/d
26815 .get_brightness = read_brightness, 26982 .get_brightness = read_brightness,
26816 .update_status = update_bl_status, 26983 .update_status = update_bl_status,
26817 }; 26984 };
26818diff -urNp linux-2.6.32.12/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.12/drivers/platform/x86/fujitsu-laptop.c 26985diff -urNp linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c
26819--- linux-2.6.32.12/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400 26986--- linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400
26820+++ linux-2.6.32.12/drivers/platform/x86/fujitsu-laptop.c 2010-04-04 20:46:41.612789562 -0400 26987+++ linux-2.6.32.13/drivers/platform/x86/fujitsu-laptop.c 2010-05-15 13:21:15.911499692 -0400
26821@@ -436,7 +436,7 @@ static int bl_update_status(struct backl 26988@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
26822 return ret; 26989 return ret;
26823 } 26990 }
@@ -26827,9 +26994,9 @@ diff -urNp linux-2.6.32.12/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.12
26827 .get_brightness = bl_get_brightness, 26994 .get_brightness = bl_get_brightness,
26828 .update_status = bl_update_status, 26995 .update_status = bl_update_status,
26829 }; 26996 };
26830diff -urNp linux-2.6.32.12/drivers/platform/x86/msi-laptop.c linux-2.6.32.12/drivers/platform/x86/msi-laptop.c 26997diff -urNp linux-2.6.32.13/drivers/platform/x86/msi-laptop.c linux-2.6.32.13/drivers/platform/x86/msi-laptop.c
26831--- linux-2.6.32.12/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400 26998--- linux-2.6.32.13/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400
26832+++ linux-2.6.32.12/drivers/platform/x86/msi-laptop.c 2010-04-04 20:46:41.612789562 -0400 26999+++ linux-2.6.32.13/drivers/platform/x86/msi-laptop.c 2010-05-15 13:21:15.911499692 -0400
26833@@ -161,7 +161,7 @@ static int bl_update_status(struct backl 27000@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
26834 return set_lcd_level(b->props.brightness); 27001 return set_lcd_level(b->props.brightness);
26835 } 27002 }
@@ -26839,9 +27006,9 @@ diff -urNp linux-2.6.32.12/drivers/platform/x86/msi-laptop.c linux-2.6.32.12/dri
26839 .get_brightness = bl_get_brightness, 27006 .get_brightness = bl_get_brightness,
26840 .update_status = bl_update_status, 27007 .update_status = bl_update_status,
26841 }; 27008 };
26842diff -urNp linux-2.6.32.12/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.12/drivers/platform/x86/panasonic-laptop.c 27009diff -urNp linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c
26843--- linux-2.6.32.12/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400 27010--- linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400
26844+++ linux-2.6.32.12/drivers/platform/x86/panasonic-laptop.c 2010-04-04 20:46:41.612789562 -0400 27011+++ linux-2.6.32.13/drivers/platform/x86/panasonic-laptop.c 2010-05-15 13:21:15.911499692 -0400
26845@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh 27012@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
26846 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); 27013 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
26847 } 27014 }
@@ -26851,9 +27018,9 @@ diff -urNp linux-2.6.32.12/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.
26851 .get_brightness = bl_get, 27018 .get_brightness = bl_get,
26852 .update_status = bl_set_status, 27019 .update_status = bl_set_status,
26853 }; 27020 };
26854diff -urNp linux-2.6.32.12/drivers/platform/x86/sony-laptop.c linux-2.6.32.12/drivers/platform/x86/sony-laptop.c 27021diff -urNp linux-2.6.32.13/drivers/platform/x86/sony-laptop.c linux-2.6.32.13/drivers/platform/x86/sony-laptop.c
26855--- linux-2.6.32.12/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400 27022--- linux-2.6.32.13/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400
26856+++ linux-2.6.32.12/drivers/platform/x86/sony-laptop.c 2010-04-04 20:46:41.612789562 -0400 27023+++ linux-2.6.32.13/drivers/platform/x86/sony-laptop.c 2010-05-15 13:21:15.914756904 -0400
26857@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness 27024@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
26858 } 27025 }
26859 27026
@@ -26863,9 +27030,9 @@ diff -urNp linux-2.6.32.12/drivers/platform/x86/sony-laptop.c linux-2.6.32.12/dr
26863 .update_status = sony_backlight_update_status, 27030 .update_status = sony_backlight_update_status,
26864 .get_brightness = sony_backlight_get_brightness, 27031 .get_brightness = sony_backlight_get_brightness,
26865 }; 27032 };
26866diff -urNp linux-2.6.32.12/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.12/drivers/platform/x86/thinkpad_acpi.c 27033diff -urNp linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c
26867--- linux-2.6.32.12/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 17:49:38.333363657 -0400 27034--- linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 17:49:38.333363657 -0400
26868+++ linux-2.6.32.12/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 18:04:08.901389713 -0400 27035+++ linux-2.6.32.13/drivers/platform/x86/thinkpad_acpi.c 2010-05-15 13:21:15.914756904 -0400
26869@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha 27036@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
26870 BACKLIGHT_UPDATE_HOTKEY); 27037 BACKLIGHT_UPDATE_HOTKEY);
26871 } 27038 }
@@ -26875,9 +27042,9 @@ diff -urNp linux-2.6.32.12/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.12/
26875 .get_brightness = brightness_get, 27042 .get_brightness = brightness_get,
26876 .update_status = brightness_update_status, 27043 .update_status = brightness_update_status,
26877 }; 27044 };
26878diff -urNp linux-2.6.32.12/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.12/drivers/platform/x86/toshiba_acpi.c 27045diff -urNp linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c
26879--- linux-2.6.32.12/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400 27046--- linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400
26880+++ linux-2.6.32.12/drivers/platform/x86/toshiba_acpi.c 2010-04-04 20:46:41.612789562 -0400 27047+++ linux-2.6.32.13/drivers/platform/x86/toshiba_acpi.c 2010-05-15 13:21:15.914756904 -0400
26881@@ -671,7 +671,7 @@ static acpi_status remove_device(void) 27048@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
26882 return AE_OK; 27049 return AE_OK;
26883 } 27050 }
@@ -26887,9 +27054,9 @@ diff -urNp linux-2.6.32.12/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.12/d
26887 .get_brightness = get_lcd, 27054 .get_brightness = get_lcd,
26888 .update_status = set_lcd_status, 27055 .update_status = set_lcd_status,
26889 }; 27056 };
26890diff -urNp linux-2.6.32.12/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.12/drivers/pnp/pnpbios/bioscalls.c 27057diff -urNp linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c
26891--- linux-2.6.32.12/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400 27058--- linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400
26892+++ linux-2.6.32.12/drivers/pnp/pnpbios/bioscalls.c 2010-04-04 20:46:41.612789562 -0400 27059+++ linux-2.6.32.13/drivers/pnp/pnpbios/bioscalls.c 2010-05-15 13:21:15.914756904 -0400
26893@@ -60,7 +60,7 @@ do { \ 27060@@ -60,7 +60,7 @@ do { \
26894 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ 27061 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
26895 } while(0) 27062 } while(0)
@@ -26946,9 +27113,9 @@ diff -urNp linux-2.6.32.12/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.12/drive
26946+ 27113+
26947+ pax_close_kernel(); 27114+ pax_close_kernel();
26948 } 27115 }
26949diff -urNp linux-2.6.32.12/drivers/pnp/quirks.c linux-2.6.32.12/drivers/pnp/quirks.c 27116diff -urNp linux-2.6.32.13/drivers/pnp/quirks.c linux-2.6.32.13/drivers/pnp/quirks.c
26950--- linux-2.6.32.12/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400 27117--- linux-2.6.32.13/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400
26951+++ linux-2.6.32.12/drivers/pnp/quirks.c 2010-04-04 20:46:41.612789562 -0400 27118+++ linux-2.6.32.13/drivers/pnp/quirks.c 2010-05-15 13:21:15.914756904 -0400
26952@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { 27119@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
26953 /* PnP resources that might overlap PCI BARs */ 27120 /* PnP resources that might overlap PCI BARs */
26954 {"PNP0c01", quirk_system_pci_resources}, 27121 {"PNP0c01", quirk_system_pci_resources},
@@ -26958,9 +27125,9 @@ diff -urNp linux-2.6.32.12/drivers/pnp/quirks.c linux-2.6.32.12/drivers/pnp/quir
26958 }; 27125 };
26959 27126
26960 void pnp_fixup_device(struct pnp_dev *dev) 27127 void pnp_fixup_device(struct pnp_dev *dev)
26961diff -urNp linux-2.6.32.12/drivers/pnp/resource.c linux-2.6.32.12/drivers/pnp/resource.c 27128diff -urNp linux-2.6.32.13/drivers/pnp/resource.c linux-2.6.32.13/drivers/pnp/resource.c
26962--- linux-2.6.32.12/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400 27129--- linux-2.6.32.13/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400
26963+++ linux-2.6.32.12/drivers/pnp/resource.c 2010-04-04 20:46:41.612789562 -0400 27130+++ linux-2.6.32.13/drivers/pnp/resource.c 2010-05-15 13:21:15.914756904 -0400
26964@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s 27131@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
26965 return 1; 27132 return 1;
26966 27133
@@ -26979,9 +27146,9 @@ diff -urNp linux-2.6.32.12/drivers/pnp/resource.c linux-2.6.32.12/drivers/pnp/re
26979 return 0; 27146 return 0;
26980 27147
26981 /* check if the resource is reserved */ 27148 /* check if the resource is reserved */
26982diff -urNp linux-2.6.32.12/drivers/s390/cio/qdio_perf.c linux-2.6.32.12/drivers/s390/cio/qdio_perf.c 27149diff -urNp linux-2.6.32.13/drivers/s390/cio/qdio_perf.c linux-2.6.32.13/drivers/s390/cio/qdio_perf.c
26983--- linux-2.6.32.12/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400 27150--- linux-2.6.32.13/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400
26984+++ linux-2.6.32.12/drivers/s390/cio/qdio_perf.c 2010-04-04 20:46:41.612789562 -0400 27151+++ linux-2.6.32.13/drivers/s390/cio/qdio_perf.c 2010-05-15 13:21:15.914756904 -0400
26985@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ 27152@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
26986 static int qdio_perf_proc_show(struct seq_file *m, void *v) 27153 static int qdio_perf_proc_show(struct seq_file *m, void *v)
26987 { 27154 {
@@ -27057,9 +27224,9 @@ diff -urNp linux-2.6.32.12/drivers/s390/cio/qdio_perf.c linux-2.6.32.12/drivers/
27057 seq_printf(m, "\n"); 27224 seq_printf(m, "\n");
27058 return 0; 27225 return 0;
27059 } 27226 }
27060diff -urNp linux-2.6.32.12/drivers/s390/cio/qdio_perf.h linux-2.6.32.12/drivers/s390/cio/qdio_perf.h 27227diff -urNp linux-2.6.32.13/drivers/s390/cio/qdio_perf.h linux-2.6.32.13/drivers/s390/cio/qdio_perf.h
27061--- linux-2.6.32.12/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400 27228--- linux-2.6.32.13/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400
27062+++ linux-2.6.32.12/drivers/s390/cio/qdio_perf.h 2010-04-04 20:46:41.612789562 -0400 27229+++ linux-2.6.32.13/drivers/s390/cio/qdio_perf.h 2010-05-15 13:21:15.927411554 -0400
27063@@ -13,46 +13,46 @@ 27230@@ -13,46 +13,46 @@
27064 27231
27065 struct qdio_perf_stats { 27232 struct qdio_perf_stats {
@@ -27132,9 +27299,9 @@ diff -urNp linux-2.6.32.12/drivers/s390/cio/qdio_perf.h linux-2.6.32.12/drivers/
27132 } 27299 }
27133 27300
27134 int qdio_setup_perf_stats(void); 27301 int qdio_setup_perf_stats(void);
27135diff -urNp linux-2.6.32.12/drivers/scsi/ipr.c linux-2.6.32.12/drivers/scsi/ipr.c 27302diff -urNp linux-2.6.32.13/drivers/scsi/ipr.c linux-2.6.32.13/drivers/scsi/ipr.c
27136--- linux-2.6.32.12/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400 27303--- linux-2.6.32.13/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400
27137+++ linux-2.6.32.12/drivers/scsi/ipr.c 2010-04-04 20:46:41.616874360 -0400 27304+++ linux-2.6.32.13/drivers/scsi/ipr.c 2010-05-15 13:21:15.970703897 -0400
27138@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q 27305@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
27139 return true; 27306 return true;
27140 } 27307 }
@@ -27144,9 +27311,9 @@ diff -urNp linux-2.6.32.12/drivers/scsi/ipr.c linux-2.6.32.12/drivers/scsi/ipr.c
27144 .phy_reset = ipr_ata_phy_reset, 27311 .phy_reset = ipr_ata_phy_reset,
27145 .hardreset = ipr_sata_reset, 27312 .hardreset = ipr_sata_reset,
27146 .post_internal_cmd = ipr_ata_post_internal, 27313 .post_internal_cmd = ipr_ata_post_internal,
27147diff -urNp linux-2.6.32.12/drivers/scsi/libfc/fc_exch.c linux-2.6.32.12/drivers/scsi/libfc/fc_exch.c 27314diff -urNp linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c
27148--- linux-2.6.32.12/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400 27315--- linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400
27149+++ linux-2.6.32.12/drivers/scsi/libfc/fc_exch.c 2010-04-04 20:46:41.616874360 -0400 27316+++ linux-2.6.32.13/drivers/scsi/libfc/fc_exch.c 2010-05-15 13:21:15.970703897 -0400
27150@@ -86,12 +86,12 @@ struct fc_exch_mgr { 27317@@ -86,12 +86,12 @@ struct fc_exch_mgr {
27151 * all together if not used XXX 27318 * all together if not used XXX
27152 */ 27319 */
@@ -27268,9 +27435,9 @@ diff -urNp linux-2.6.32.12/drivers/scsi/libfc/fc_exch.c linux-2.6.32.12/drivers/
27268 27435
27269 fc_frame_free(fp); 27436 fc_frame_free(fp);
27270 } 27437 }
27271diff -urNp linux-2.6.32.12/drivers/scsi/libsas/sas_ata.c linux-2.6.32.12/drivers/scsi/libsas/sas_ata.c 27438diff -urNp linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c
27272--- linux-2.6.32.12/drivers/scsi/libsas/sas_ata.c 2010-03-15 11:52:04.000000000 -0400 27439--- linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c 2010-05-15 13:20:18.878584179 -0400
27273+++ linux-2.6.32.12/drivers/scsi/libsas/sas_ata.c 2010-04-04 20:46:41.616874360 -0400 27440+++ linux-2.6.32.13/drivers/scsi/libsas/sas_ata.c 2010-05-15 13:21:15.970703897 -0400
27274@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l 27441@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
27275 } 27442 }
27276 } 27443 }
@@ -27280,9 +27447,9 @@ diff -urNp linux-2.6.32.12/drivers/scsi/libsas/sas_ata.c linux-2.6.32.12/drivers
27280 .phy_reset = sas_ata_phy_reset, 27447 .phy_reset = sas_ata_phy_reset,
27281 .post_internal_cmd = sas_ata_post_internal, 27448 .post_internal_cmd = sas_ata_post_internal,
27282 .qc_prep = ata_noop_qc_prep, 27449 .qc_prep = ata_noop_qc_prep,
27283diff -urNp linux-2.6.32.12/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.12/drivers/scsi/mpt2sas/mpt2sas_debug.h 27450diff -urNp linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h
27284--- linux-2.6.32.12/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-03-15 11:52:04.000000000 -0400 27451--- linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-03-15 11:52:04.000000000 -0400
27285+++ linux-2.6.32.12/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-04-29 17:46:37.209772088 -0400 27452+++ linux-2.6.32.13/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-05-15 13:21:15.991412669 -0400
27286@@ -79,7 +79,7 @@ 27453@@ -79,7 +79,7 @@
27287 CMD; \ 27454 CMD; \
27288 } 27455 }
@@ -27292,9 +27459,9 @@ diff -urNp linux-2.6.32.12/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.12/
27292 #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ 27459 #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
27293 27460
27294 27461
27295diff -urNp linux-2.6.32.12/drivers/scsi/scsi_logging.h linux-2.6.32.12/drivers/scsi/scsi_logging.h 27462diff -urNp linux-2.6.32.13/drivers/scsi/scsi_logging.h linux-2.6.32.13/drivers/scsi/scsi_logging.h
27296--- linux-2.6.32.12/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400 27463--- linux-2.6.32.13/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400
27297+++ linux-2.6.32.12/drivers/scsi/scsi_logging.h 2010-04-04 20:46:41.616874360 -0400 27464+++ linux-2.6.32.13/drivers/scsi/scsi_logging.h 2010-05-15 13:21:15.991412669 -0400
27298@@ -51,7 +51,7 @@ do { \ 27465@@ -51,7 +51,7 @@ do { \
27299 } while (0); \ 27466 } while (0); \
27300 } while (0) 27467 } while (0)
@@ -27304,9 +27471,9 @@ diff -urNp linux-2.6.32.12/drivers/scsi/scsi_logging.h linux-2.6.32.12/drivers/s
27304 #endif /* CONFIG_SCSI_LOGGING */ 27471 #endif /* CONFIG_SCSI_LOGGING */
27305 27472
27306 /* 27473 /*
27307diff -urNp linux-2.6.32.12/drivers/scsi/sg.c linux-2.6.32.12/drivers/scsi/sg.c 27474diff -urNp linux-2.6.32.13/drivers/scsi/sg.c linux-2.6.32.13/drivers/scsi/sg.c
27308--- linux-2.6.32.12/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400 27475--- linux-2.6.32.13/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400
27309+++ linux-2.6.32.12/drivers/scsi/sg.c 2010-04-04 20:46:41.616874360 -0400 27476+++ linux-2.6.32.13/drivers/scsi/sg.c 2010-05-15 13:21:15.991412669 -0400
27310@@ -2292,7 +2292,7 @@ struct sg_proc_leaf { 27477@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
27311 const struct file_operations * fops; 27478 const struct file_operations * fops;
27312 }; 27479 };
@@ -27325,9 +27492,9 @@ diff -urNp linux-2.6.32.12/drivers/scsi/sg.c linux-2.6.32.12/drivers/scsi/sg.c
27325 27492
27326 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); 27493 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
27327 if (!sg_proc_sgp) 27494 if (!sg_proc_sgp)
27328diff -urNp linux-2.6.32.12/drivers/serial/8250_pci.c linux-2.6.32.12/drivers/serial/8250_pci.c 27495diff -urNp linux-2.6.32.13/drivers/serial/8250_pci.c linux-2.6.32.13/drivers/serial/8250_pci.c
27329--- linux-2.6.32.12/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400 27496--- linux-2.6.32.13/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400
27330+++ linux-2.6.32.12/drivers/serial/8250_pci.c 2010-04-04 20:46:41.616874360 -0400 27497+++ linux-2.6.32.13/drivers/serial/8250_pci.c 2010-05-15 13:21:16.030795257 -0400
27331@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t 27498@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
27332 PCI_ANY_ID, PCI_ANY_ID, 27499 PCI_ANY_ID, PCI_ANY_ID,
27333 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 27500 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
@@ -27337,9 +27504,9 @@ diff -urNp linux-2.6.32.12/drivers/serial/8250_pci.c linux-2.6.32.12/drivers/ser
27337 }; 27504 };
27338 27505
27339 static struct pci_driver serial_pci_driver = { 27506 static struct pci_driver serial_pci_driver = {
27340diff -urNp linux-2.6.32.12/drivers/serial/kgdboc.c linux-2.6.32.12/drivers/serial/kgdboc.c 27507diff -urNp linux-2.6.32.13/drivers/serial/kgdboc.c linux-2.6.32.13/drivers/serial/kgdboc.c
27341--- linux-2.6.32.12/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400 27508--- linux-2.6.32.13/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400
27342+++ linux-2.6.32.12/drivers/serial/kgdboc.c 2010-04-04 20:46:41.616874360 -0400 27509+++ linux-2.6.32.13/drivers/serial/kgdboc.c 2010-05-15 13:21:16.030795257 -0400
27343@@ -18,7 +18,7 @@ 27510@@ -18,7 +18,7 @@
27344 27511
27345 #define MAX_CONFIG_LEN 40 27512 #define MAX_CONFIG_LEN 40
@@ -27358,9 +27525,9 @@ diff -urNp linux-2.6.32.12/drivers/serial/kgdboc.c linux-2.6.32.12/drivers/seria
27358 .name = "kgdboc", 27525 .name = "kgdboc",
27359 .read_char = kgdboc_get_char, 27526 .read_char = kgdboc_get_char,
27360 .write_char = kgdboc_put_char, 27527 .write_char = kgdboc_put_char,
27361diff -urNp linux-2.6.32.12/drivers/staging/android/binder.c linux-2.6.32.12/drivers/staging/android/binder.c 27528diff -urNp linux-2.6.32.13/drivers/staging/android/binder.c linux-2.6.32.13/drivers/staging/android/binder.c
27362--- linux-2.6.32.12/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400 27529--- linux-2.6.32.13/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400
27363+++ linux-2.6.32.12/drivers/staging/android/binder.c 2010-04-04 20:46:41.616874360 -0400 27530+++ linux-2.6.32.13/drivers/staging/android/binder.c 2010-05-15 13:21:16.072777583 -0400
27364@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a 27531@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
27365 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); 27532 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
27366 } 27533 }
@@ -27370,9 +27537,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/android/binder.c linux-2.6.32.12/driv
27370 .open = binder_vma_open, 27537 .open = binder_vma_open,
27371 .close = binder_vma_close, 27538 .close = binder_vma_close,
27372 }; 27539 };
27373diff -urNp linux-2.6.32.12/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.12/drivers/staging/b3dfg/b3dfg.c 27540diff -urNp linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c
27374--- linux-2.6.32.12/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400 27541--- linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400
27375+++ linux-2.6.32.12/drivers/staging/b3dfg/b3dfg.c 2010-04-04 20:46:41.616874360 -0400 27542+++ linux-2.6.32.13/drivers/staging/b3dfg/b3dfg.c 2010-05-15 13:21:16.111132239 -0400
27376@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are 27543@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
27377 return VM_FAULT_NOPAGE; 27544 return VM_FAULT_NOPAGE;
27378 } 27545 }
@@ -27391,9 +27558,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.12/drivers
27391 .owner = THIS_MODULE, 27558 .owner = THIS_MODULE,
27392 .open = b3dfg_open, 27559 .open = b3dfg_open,
27393 .release = b3dfg_release, 27560 .release = b3dfg_release,
27394diff -urNp linux-2.6.32.12/drivers/staging/comedi/comedi_fops.c linux-2.6.32.12/drivers/staging/comedi/comedi_fops.c 27561diff -urNp linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c
27395--- linux-2.6.32.12/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400 27562--- linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400
27396+++ linux-2.6.32.12/drivers/staging/comedi/comedi_fops.c 2010-04-04 20:46:41.616874360 -0400 27563+++ linux-2.6.32.13/drivers/staging/comedi/comedi_fops.c 2010-05-15 13:21:16.111132239 -0400
27397@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct 27564@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
27398 mutex_unlock(&dev->mutex); 27565 mutex_unlock(&dev->mutex);
27399 } 27566 }
@@ -27403,9 +27570,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/comedi/comedi_fops.c linux-2.6.32.12/
27403 .close = comedi_unmap, 27570 .close = comedi_unmap,
27404 }; 27571 };
27405 27572
27406diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.12/drivers/staging/dream/qdsp5/adsp_driver.c 27573diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c
27407--- linux-2.6.32.12/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400 27574--- linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400
27408+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/adsp_driver.c 2010-04-04 20:46:41.616874360 -0400 27575+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/adsp_driver.c 2010-05-15 13:21:16.111132239 -0400
27409@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi 27576@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
27410 static dev_t adsp_devno; 27577 static dev_t adsp_devno;
27411 static struct class *adsp_class; 27578 static struct class *adsp_class;
@@ -27415,9 +27582,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3
27415 .owner = THIS_MODULE, 27582 .owner = THIS_MODULE,
27416 .open = adsp_open, 27583 .open = adsp_open,
27417 .unlocked_ioctl = adsp_ioctl, 27584 .unlocked_ioctl = adsp_ioctl,
27418diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_aac.c 27585diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c
27419--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400 27586--- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400
27420+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_aac.c 2010-04-04 20:46:41.621505029 -0400 27587+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_aac.c 2010-05-15 13:21:16.127017061 -0400
27421@@ -1022,7 +1022,7 @@ done: 27588@@ -1022,7 +1022,7 @@ done:
27422 return rc; 27589 return rc;
27423 } 27590 }
@@ -27427,9 +27594,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
27427 .owner = THIS_MODULE, 27594 .owner = THIS_MODULE,
27428 .open = audio_open, 27595 .open = audio_open,
27429 .release = audio_release, 27596 .release = audio_release,
27430diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_amrnb.c 27597diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c
27431--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400 27598--- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400
27432+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-04-04 20:46:41.621505029 -0400 27599+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-05-15 13:21:16.139031435 -0400
27433@@ -833,7 +833,7 @@ done: 27600@@ -833,7 +833,7 @@ done:
27434 return rc; 27601 return rc;
27435 } 27602 }
@@ -27439,9 +27606,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
27439 .owner = THIS_MODULE, 27606 .owner = THIS_MODULE,
27440 .open = audamrnb_open, 27607 .open = audamrnb_open,
27441 .release = audamrnb_release, 27608 .release = audamrnb_release,
27442diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_evrc.c 27609diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c
27443--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400 27610--- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400
27444+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_evrc.c 2010-04-04 20:46:41.621505029 -0400 27611+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_evrc.c 2010-05-15 13:21:16.151007392 -0400
27445@@ -805,7 +805,7 @@ dma_fail: 27612@@ -805,7 +805,7 @@ dma_fail:
27446 return rc; 27613 return rc;
27447 } 27614 }
@@ -27451,9 +27618,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32
27451 .owner = THIS_MODULE, 27618 .owner = THIS_MODULE,
27452 .open = audevrc_open, 27619 .open = audevrc_open,
27453 .release = audevrc_release, 27620 .release = audevrc_release,
27454diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_in.c 27621diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c
27455--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400 27622--- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400
27456+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_in.c 2010-04-04 20:46:41.621505029 -0400 27623+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_in.c 2010-05-15 13:21:16.155145249 -0400
27457@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino 27624@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
27458 return 0; 27625 return 0;
27459 } 27626 }
@@ -27472,9 +27639,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.1
27472 .owner = THIS_MODULE, 27639 .owner = THIS_MODULE,
27473 .open = audpre_open, 27640 .open = audpre_open,
27474 .unlocked_ioctl = audpre_ioctl, 27641 .unlocked_ioctl = audpre_ioctl,
27475diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_mp3.c 27642diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c
27476--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400 27643--- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400
27477+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_mp3.c 2010-04-04 20:46:41.621505029 -0400 27644+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_mp3.c 2010-05-15 13:21:16.171026730 -0400
27478@@ -941,7 +941,7 @@ done: 27645@@ -941,7 +941,7 @@ done:
27479 return rc; 27646 return rc;
27480 } 27647 }
@@ -27484,9 +27651,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
27484 .owner = THIS_MODULE, 27651 .owner = THIS_MODULE,
27485 .open = audio_open, 27652 .open = audio_open,
27486 .release = audio_release, 27653 .release = audio_release,
27487diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_out.c 27654diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c
27488--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400 27655--- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400
27489+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_out.c 2010-04-04 20:46:41.621505029 -0400 27656+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_out.c 2010-05-15 13:21:16.175016772 -0400
27490@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod 27657@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
27491 return 0; 27658 return 0;
27492 } 27659 }
@@ -27505,9 +27672,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
27505 .owner = THIS_MODULE, 27672 .owner = THIS_MODULE,
27506 .open = audpp_open, 27673 .open = audpp_open,
27507 .unlocked_ioctl = audpp_ioctl, 27674 .unlocked_ioctl = audpp_ioctl,
27508diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_qcelp.c 27675diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c
27509--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400 27676--- linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400
27510+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-04-04 20:46:41.621505029 -0400 27677+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-05-15 13:21:16.183014216 -0400
27511@@ -816,7 +816,7 @@ err: 27678@@ -816,7 +816,7 @@ err:
27512 return rc; 27679 return rc;
27513 } 27680 }
@@ -27517,9 +27684,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
27517 .owner = THIS_MODULE, 27684 .owner = THIS_MODULE,
27518 .open = audqcelp_open, 27685 .open = audqcelp_open,
27519 .release = audqcelp_release, 27686 .release = audqcelp_release,
27520diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.12/drivers/staging/dream/qdsp5/snd.c 27687diff -urNp linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c
27521--- linux-2.6.32.12/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400 27688--- linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400
27522+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/snd.c 2010-04-04 20:46:41.621505029 -0400 27689+++ linux-2.6.32.13/drivers/staging/dream/qdsp5/snd.c 2010-05-15 13:21:16.187015266 -0400
27523@@ -242,7 +242,7 @@ err: 27690@@ -242,7 +242,7 @@ err:
27524 return rc; 27691 return rc;
27525 } 27692 }
@@ -27529,9 +27696,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.12/dri
27529 .owner = THIS_MODULE, 27696 .owner = THIS_MODULE,
27530 .open = snd_open, 27697 .open = snd_open,
27531 .release = snd_release, 27698 .release = snd_release,
27532diff -urNp linux-2.6.32.12/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.12/drivers/staging/dream/smd/smd_qmi.c 27699diff -urNp linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c
27533--- linux-2.6.32.12/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400 27700--- linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400
27534+++ linux-2.6.32.12/drivers/staging/dream/smd/smd_qmi.c 2010-04-04 20:46:41.621505029 -0400 27701+++ linux-2.6.32.13/drivers/staging/dream/smd/smd_qmi.c 2010-05-15 13:21:16.190693177 -0400
27535@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, 27702@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
27536 return 0; 27703 return 0;
27537 } 27704 }
@@ -27541,9 +27708,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.12/d
27541 .owner = THIS_MODULE, 27708 .owner = THIS_MODULE,
27542 .read = qmi_read, 27709 .read = qmi_read,
27543 .write = qmi_write, 27710 .write = qmi_write,
27544diff -urNp linux-2.6.32.12/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.12/drivers/staging/dream/smd/smd_rpcrouter_device.c 27711diff -urNp linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c
27545--- linux-2.6.32.12/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400 27712--- linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400
27546+++ linux-2.6.32.12/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-04-04 20:46:41.621505029 -0400 27713+++ linux-2.6.32.13/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-05-15 13:21:16.190693177 -0400
27547@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file 27714@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
27548 return rc; 27715 return rc;
27549 } 27716 }
@@ -27562,9 +27729,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
27562 .owner = THIS_MODULE, 27729 .owner = THIS_MODULE,
27563 .open = rpcrouter_open, 27730 .open = rpcrouter_open,
27564 .release = rpcrouter_release, 27731 .release = rpcrouter_release,
27565diff -urNp linux-2.6.32.12/drivers/staging/dst/dcore.c linux-2.6.32.12/drivers/staging/dst/dcore.c 27732diff -urNp linux-2.6.32.13/drivers/staging/dst/dcore.c linux-2.6.32.13/drivers/staging/dst/dcore.c
27566--- linux-2.6.32.12/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400 27733--- linux-2.6.32.13/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400
27567+++ linux-2.6.32.12/drivers/staging/dst/dcore.c 2010-04-04 20:46:41.621505029 -0400 27734+++ linux-2.6.32.13/drivers/staging/dst/dcore.c 2010-05-15 13:21:16.190693177 -0400
27568@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi 27735@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
27569 return 0; 27736 return 0;
27570 } 27737 }
@@ -27583,9 +27750,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/dst/dcore.c linux-2.6.32.12/drivers/s
27583 snprintf(n->name, sizeof(n->name), "%s", ctl->name); 27750 snprintf(n->name, sizeof(n->name), "%s", ctl->name);
27584 27751
27585 err = dst_node_sysfs_init(n); 27752 err = dst_node_sysfs_init(n);
27586diff -urNp linux-2.6.32.12/drivers/staging/dst/trans.c linux-2.6.32.12/drivers/staging/dst/trans.c 27753diff -urNp linux-2.6.32.13/drivers/staging/dst/trans.c linux-2.6.32.13/drivers/staging/dst/trans.c
27587--- linux-2.6.32.12/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400 27754--- linux-2.6.32.13/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400
27588+++ linux-2.6.32.12/drivers/staging/dst/trans.c 2010-04-04 20:46:41.621505029 -0400 27755+++ linux-2.6.32.13/drivers/staging/dst/trans.c 2010-05-15 13:21:16.211066896 -0400
27589@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, 27756@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
27590 t->error = 0; 27757 t->error = 0;
27591 t->retries = 0; 27758 t->retries = 0;
@@ -27595,9 +27762,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/dst/trans.c linux-2.6.32.12/drivers/s
27595 27762
27596 t->enc = bio_data_dir(bio); 27763 t->enc = bio_data_dir(bio);
27597 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); 27764 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
27598diff -urNp linux-2.6.32.12/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.12/drivers/staging/go7007/go7007-v4l2.c 27765diff -urNp linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c
27599--- linux-2.6.32.12/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400 27766--- linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400
27600+++ linux-2.6.32.12/drivers/staging/go7007/go7007-v4l2.c 2010-04-04 20:46:41.621505029 -0400 27767+++ linux-2.6.32.13/drivers/staging/go7007/go7007-v4l2.c 2010-05-15 13:21:16.231838911 -0400
27601@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are 27768@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
27602 return 0; 27769 return 0;
27603 } 27770 }
@@ -27607,9 +27774,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.12/
27607 .open = go7007_vm_open, 27774 .open = go7007_vm_open,
27608 .close = go7007_vm_close, 27775 .close = go7007_vm_close,
27609 .fault = go7007_vm_fault, 27776 .fault = go7007_vm_fault,
27610diff -urNp linux-2.6.32.12/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.12/drivers/staging/hv/blkvsc_drv.c 27777diff -urNp linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c
27611--- linux-2.6.32.12/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400 27778--- linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400
27612+++ linux-2.6.32.12/drivers/staging/hv/blkvsc_drv.c 2010-04-04 20:46:41.621505029 -0400 27779+++ linux-2.6.32.13/drivers/staging/hv/blkvsc_drv.c 2010-05-15 13:21:16.231838911 -0400
27613@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV 27780@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
27614 /* The one and only one */ 27781 /* The one and only one */
27615 static struct blkvsc_driver_context g_blkvsc_drv; 27782 static struct blkvsc_driver_context g_blkvsc_drv;
@@ -27619,9 +27786,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.12/drive
27619 .owner = THIS_MODULE, 27786 .owner = THIS_MODULE,
27620 .open = blkvsc_open, 27787 .open = blkvsc_open,
27621 .release = blkvsc_release, 27788 .release = blkvsc_release,
27622diff -urNp linux-2.6.32.12/drivers/staging/panel/panel.c linux-2.6.32.12/drivers/staging/panel/panel.c 27789diff -urNp linux-2.6.32.13/drivers/staging/panel/panel.c linux-2.6.32.13/drivers/staging/panel/panel.c
27623--- linux-2.6.32.12/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400 27790--- linux-2.6.32.13/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400
27624+++ linux-2.6.32.12/drivers/staging/panel/panel.c 2010-04-04 20:46:41.621505029 -0400 27791+++ linux-2.6.32.13/drivers/staging/panel/panel.c 2010-05-15 13:21:16.231838911 -0400
27625@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino 27792@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
27626 return 0; 27793 return 0;
27627 } 27794 }
@@ -27640,9 +27807,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/panel/panel.c linux-2.6.32.12/drivers
27640 .read = keypad_read, /* read */ 27807 .read = keypad_read, /* read */
27641 .open = keypad_open, /* open */ 27808 .open = keypad_open, /* open */
27642 .release = keypad_release, /* close */ 27809 .release = keypad_release, /* close */
27643diff -urNp linux-2.6.32.12/drivers/staging/phison/phison.c linux-2.6.32.12/drivers/staging/phison/phison.c 27810diff -urNp linux-2.6.32.13/drivers/staging/phison/phison.c linux-2.6.32.13/drivers/staging/phison/phison.c
27644--- linux-2.6.32.12/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400 27811--- linux-2.6.32.13/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400
27645+++ linux-2.6.32.12/drivers/staging/phison/phison.c 2010-04-04 20:46:41.621505029 -0400 27812+++ linux-2.6.32.13/drivers/staging/phison/phison.c 2010-05-15 13:21:16.242656725 -0400
27646@@ -43,7 +43,7 @@ static struct scsi_host_template phison_ 27813@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
27647 ATA_BMDMA_SHT(DRV_NAME), 27814 ATA_BMDMA_SHT(DRV_NAME),
27648 }; 27815 };
@@ -27652,9 +27819,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/phison/phison.c linux-2.6.32.12/drive
27652 .inherits = &ata_bmdma_port_ops, 27819 .inherits = &ata_bmdma_port_ops,
27653 .prereset = phison_pre_reset, 27820 .prereset = phison_pre_reset,
27654 }; 27821 };
27655diff -urNp linux-2.6.32.12/drivers/staging/poch/poch.c linux-2.6.32.12/drivers/staging/poch/poch.c 27822diff -urNp linux-2.6.32.13/drivers/staging/poch/poch.c linux-2.6.32.13/drivers/staging/poch/poch.c
27656--- linux-2.6.32.12/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400 27823--- linux-2.6.32.13/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400
27657+++ linux-2.6.32.12/drivers/staging/poch/poch.c 2010-04-04 20:46:41.625742858 -0400 27824+++ linux-2.6.32.13/drivers/staging/poch/poch.c 2010-05-15 13:21:16.268445393 -0400
27658@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod 27825@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
27659 return 0; 27826 return 0;
27660 } 27827 }
@@ -27664,9 +27831,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/poch/poch.c linux-2.6.32.12/drivers/s
27664 .owner = THIS_MODULE, 27831 .owner = THIS_MODULE,
27665 .open = poch_open, 27832 .open = poch_open,
27666 .release = poch_release, 27833 .release = poch_release,
27667diff -urNp linux-2.6.32.12/drivers/staging/pohmelfs/inode.c linux-2.6.32.12/drivers/staging/pohmelfs/inode.c 27834diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/inode.c linux-2.6.32.13/drivers/staging/pohmelfs/inode.c
27668--- linux-2.6.32.12/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400 27835--- linux-2.6.32.13/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400
27669+++ linux-2.6.32.12/drivers/staging/pohmelfs/inode.c 2010-04-04 20:46:41.625742858 -0400 27836+++ linux-2.6.32.13/drivers/staging/pohmelfs/inode.c 2010-05-15 13:21:16.285190860 -0400
27670@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su 27837@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
27671 mutex_init(&psb->mcache_lock); 27838 mutex_init(&psb->mcache_lock);
27672 psb->mcache_root = RB_ROOT; 27839 psb->mcache_root = RB_ROOT;
@@ -27676,9 +27843,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/pohmelfs/inode.c linux-2.6.32.12/driv
27676 27843
27677 psb->trans_max_pages = 100; 27844 psb->trans_max_pages = 100;
27678 27845
27679diff -urNp linux-2.6.32.12/drivers/staging/pohmelfs/mcache.c linux-2.6.32.12/drivers/staging/pohmelfs/mcache.c 27846diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c
27680--- linux-2.6.32.12/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400 27847--- linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400
27681+++ linux-2.6.32.12/drivers/staging/pohmelfs/mcache.c 2010-04-04 20:46:41.625742858 -0400 27848+++ linux-2.6.32.13/drivers/staging/pohmelfs/mcache.c 2010-05-15 13:21:16.291030028 -0400
27682@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ 27849@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
27683 m->data = data; 27850 m->data = data;
27684 m->start = start; 27851 m->start = start;
@@ -27688,9 +27855,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/pohmelfs/mcache.c linux-2.6.32.12/dri
27688 27855
27689 mutex_lock(&psb->mcache_lock); 27856 mutex_lock(&psb->mcache_lock);
27690 err = pohmelfs_mcache_insert(psb, m); 27857 err = pohmelfs_mcache_insert(psb, m);
27691diff -urNp linux-2.6.32.12/drivers/staging/pohmelfs/netfs.h linux-2.6.32.12/drivers/staging/pohmelfs/netfs.h 27858diff -urNp linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h
27692--- linux-2.6.32.12/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400 27859--- linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400
27693+++ linux-2.6.32.12/drivers/staging/pohmelfs/netfs.h 2010-04-04 20:46:41.625742858 -0400 27860+++ linux-2.6.32.13/drivers/staging/pohmelfs/netfs.h 2010-05-15 13:21:16.307023663 -0400
27694@@ -570,7 +570,7 @@ struct pohmelfs_config; 27861@@ -570,7 +570,7 @@ struct pohmelfs_config;
27695 struct pohmelfs_sb { 27862 struct pohmelfs_sb {
27696 struct rb_root mcache_root; 27863 struct rb_root mcache_root;
@@ -27700,9 +27867,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/pohmelfs/netfs.h linux-2.6.32.12/driv
27700 unsigned long mcache_timeout; 27867 unsigned long mcache_timeout;
27701 27868
27702 unsigned int idx; 27869 unsigned int idx;
27703diff -urNp linux-2.6.32.12/drivers/staging/sep/sep_driver.c linux-2.6.32.12/drivers/staging/sep/sep_driver.c 27870diff -urNp linux-2.6.32.13/drivers/staging/sep/sep_driver.c linux-2.6.32.13/drivers/staging/sep/sep_driver.c
27704--- linux-2.6.32.12/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400 27871--- linux-2.6.32.13/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400
27705+++ linux-2.6.32.12/drivers/staging/sep/sep_driver.c 2010-04-04 20:46:41.625742858 -0400 27872+++ linux-2.6.32.13/drivers/staging/sep/sep_driver.c 2010-05-15 13:21:16.365819296 -0400
27706@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver 27873@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
27707 static dev_t sep_devno; 27874 static dev_t sep_devno;
27708 27875
@@ -27712,9 +27879,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/sep/sep_driver.c linux-2.6.32.12/driv
27712 .owner = THIS_MODULE, 27879 .owner = THIS_MODULE,
27713 .ioctl = sep_ioctl, 27880 .ioctl = sep_ioctl,
27714 .poll = sep_poll, 27881 .poll = sep_poll,
27715diff -urNp linux-2.6.32.12/drivers/staging/vme/devices/vme_user.c linux-2.6.32.12/drivers/staging/vme/devices/vme_user.c 27882diff -urNp linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c
27716--- linux-2.6.32.12/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400 27883--- linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400
27717+++ linux-2.6.32.12/drivers/staging/vme/devices/vme_user.c 2010-04-04 20:46:41.625742858 -0400 27884+++ linux-2.6.32.13/drivers/staging/vme/devices/vme_user.c 2010-05-15 13:21:16.387343522 -0400
27718@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * 27885@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
27719 static int __init vme_user_probe(struct device *, int, int); 27886 static int __init vme_user_probe(struct device *, int, int);
27720 static int __exit vme_user_remove(struct device *, int, int); 27887 static int __exit vme_user_remove(struct device *, int, int);
@@ -27724,9 +27891,9 @@ diff -urNp linux-2.6.32.12/drivers/staging/vme/devices/vme_user.c linux-2.6.32.1
27724 .open = vme_user_open, 27891 .open = vme_user_open,
27725 .release = vme_user_release, 27892 .release = vme_user_release,
27726 .read = vme_user_read, 27893 .read = vme_user_read,
27727diff -urNp linux-2.6.32.12/drivers/uio/uio.c linux-2.6.32.12/drivers/uio/uio.c 27894diff -urNp linux-2.6.32.13/drivers/uio/uio.c linux-2.6.32.13/drivers/uio/uio.c
27728--- linux-2.6.32.12/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400 27895--- linux-2.6.32.13/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400
27729+++ linux-2.6.32.12/drivers/uio/uio.c 2010-04-04 20:46:41.625742858 -0400 27896+++ linux-2.6.32.13/drivers/uio/uio.c 2010-05-15 13:21:16.387343522 -0400
27730@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj 27897@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
27731 return entry->show(mem, buf); 27898 return entry->show(mem, buf);
27732 } 27899 }
@@ -27745,9 +27912,9 @@ diff -urNp linux-2.6.32.12/drivers/uio/uio.c linux-2.6.32.12/drivers/uio/uio.c
27745 .show = portio_type_show, 27912 .show = portio_type_show,
27746 }; 27913 };
27747 27914
27748diff -urNp linux-2.6.32.12/drivers/usb/atm/usbatm.c linux-2.6.32.12/drivers/usb/atm/usbatm.c 27915diff -urNp linux-2.6.32.13/drivers/usb/atm/usbatm.c linux-2.6.32.13/drivers/usb/atm/usbatm.c
27749--- linux-2.6.32.12/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400 27916--- linux-2.6.32.13/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400
27750+++ linux-2.6.32.12/drivers/usb/atm/usbatm.c 2010-04-04 20:46:41.625742858 -0400 27917+++ linux-2.6.32.13/drivers/usb/atm/usbatm.c 2010-05-15 13:21:16.394585811 -0400
27751@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru 27918@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
27752 if (printk_ratelimit()) 27919 if (printk_ratelimit())
27753 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", 27920 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -27827,9 +27994,9 @@ diff -urNp linux-2.6.32.12/drivers/usb/atm/usbatm.c linux-2.6.32.12/drivers/usb/
27827 27994
27828 if (!left--) { 27995 if (!left--) {
27829 if (instance->disconnected) 27996 if (instance->disconnected)
27830diff -urNp linux-2.6.32.12/drivers/usb/class/cdc-acm.c linux-2.6.32.12/drivers/usb/class/cdc-acm.c 27997diff -urNp linux-2.6.32.13/drivers/usb/class/cdc-acm.c linux-2.6.32.13/drivers/usb/class/cdc-acm.c
27831--- linux-2.6.32.12/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:38.389083173 -0400 27998--- linux-2.6.32.13/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:38.389083173 -0400
27832+++ linux-2.6.32.12/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:58.429105010 -0400 27999+++ linux-2.6.32.13/drivers/usb/class/cdc-acm.c 2010-05-15 13:21:16.402576854 -0400
27833@@ -1535,7 +1535,7 @@ static struct usb_device_id acm_ids[] = 28000@@ -1535,7 +1535,7 @@ static struct usb_device_id acm_ids[] =
27834 USB_CDC_ACM_PROTO_AT_CDMA) }, 28001 USB_CDC_ACM_PROTO_AT_CDMA) },
27835 28002
@@ -27839,9 +28006,9 @@ diff -urNp linux-2.6.32.12/drivers/usb/class/cdc-acm.c linux-2.6.32.12/drivers/u
27839 }; 28006 };
27840 28007
27841 MODULE_DEVICE_TABLE(usb, acm_ids); 28008 MODULE_DEVICE_TABLE(usb, acm_ids);
27842diff -urNp linux-2.6.32.12/drivers/usb/class/usblp.c linux-2.6.32.12/drivers/usb/class/usblp.c 28009diff -urNp linux-2.6.32.13/drivers/usb/class/usblp.c linux-2.6.32.13/drivers/usb/class/usblp.c
27843--- linux-2.6.32.12/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400 28010--- linux-2.6.32.13/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400
27844+++ linux-2.6.32.12/drivers/usb/class/usblp.c 2010-04-04 20:46:41.625742858 -0400 28011+++ linux-2.6.32.13/drivers/usb/class/usblp.c 2010-05-15 13:21:16.423521533 -0400
27845@@ -228,7 +228,7 @@ static const struct quirk_printer_struct 28012@@ -228,7 +228,7 @@ static const struct quirk_printer_struct
27846 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ 28013 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
27847 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ 28014 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
@@ -27860,9 +28027,9 @@ diff -urNp linux-2.6.32.12/drivers/usb/class/usblp.c linux-2.6.32.12/drivers/usb
27860 }; 28027 };
27861 28028
27862 MODULE_DEVICE_TABLE (usb, usblp_ids); 28029 MODULE_DEVICE_TABLE (usb, usblp_ids);
27863diff -urNp linux-2.6.32.12/drivers/usb/core/hcd.c linux-2.6.32.12/drivers/usb/core/hcd.c 28030diff -urNp linux-2.6.32.13/drivers/usb/core/hcd.c linux-2.6.32.13/drivers/usb/core/hcd.c
27864--- linux-2.6.32.12/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400 28031--- linux-2.6.32.13/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400
27865+++ linux-2.6.32.12/drivers/usb/core/hcd.c 2010-04-04 20:46:41.625742858 -0400 28032+++ linux-2.6.32.13/drivers/usb/core/hcd.c 2010-05-15 13:21:16.445526992 -0400
27866@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd 28033@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
27867 28034
27868 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 28035 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -27881,9 +28048,9 @@ diff -urNp linux-2.6.32.12/drivers/usb/core/hcd.c linux-2.6.32.12/drivers/usb/co
27881 { 28048 {
27882 28049
27883 if (mon_ops) 28050 if (mon_ops)
27884diff -urNp linux-2.6.32.12/drivers/usb/core/hcd.h linux-2.6.32.12/drivers/usb/core/hcd.h 28051diff -urNp linux-2.6.32.13/drivers/usb/core/hcd.h linux-2.6.32.13/drivers/usb/core/hcd.h
27885--- linux-2.6.32.12/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400 28052--- linux-2.6.32.13/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400
27886+++ linux-2.6.32.12/drivers/usb/core/hcd.h 2010-04-04 20:46:41.625742858 -0400 28053+++ linux-2.6.32.13/drivers/usb/core/hcd.h 2010-05-15 13:21:16.447026425 -0400
27887@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { 28054@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
27888 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 28055 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
27889 28056
@@ -27911,9 +28078,9 @@ diff -urNp linux-2.6.32.12/drivers/usb/core/hcd.h linux-2.6.32.12/drivers/usb/co
27911 void usb_mon_deregister(void); 28078 void usb_mon_deregister(void);
27912 28079
27913 #else 28080 #else
27914diff -urNp linux-2.6.32.12/drivers/usb/core/hub.c linux-2.6.32.12/drivers/usb/core/hub.c 28081diff -urNp linux-2.6.32.13/drivers/usb/core/hub.c linux-2.6.32.13/drivers/usb/core/hub.c
27915--- linux-2.6.32.12/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400 28082--- linux-2.6.32.13/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400
27916+++ linux-2.6.32.12/drivers/usb/core/hub.c 2010-04-04 20:46:41.625742858 -0400 28083+++ linux-2.6.32.13/drivers/usb/core/hub.c 2010-05-15 13:21:16.479087397 -0400
27917@@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table 28084@@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table
27918 .bDeviceClass = USB_CLASS_HUB}, 28085 .bDeviceClass = USB_CLASS_HUB},
27919 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, 28086 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
@@ -27923,9 +28090,9 @@ diff -urNp linux-2.6.32.12/drivers/usb/core/hub.c linux-2.6.32.12/drivers/usb/co
27923 }; 28090 };
27924 28091
27925 MODULE_DEVICE_TABLE (usb, hub_id_table); 28092 MODULE_DEVICE_TABLE (usb, hub_id_table);
27926diff -urNp linux-2.6.32.12/drivers/usb/core/message.c linux-2.6.32.12/drivers/usb/core/message.c 28093diff -urNp linux-2.6.32.13/drivers/usb/core/message.c linux-2.6.32.13/drivers/usb/core/message.c
27927--- linux-2.6.32.12/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400 28094--- linux-2.6.32.13/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400
27928+++ linux-2.6.32.12/drivers/usb/core/message.c 2010-04-04 20:46:41.629706570 -0400 28095+++ linux-2.6.32.13/drivers/usb/core/message.c 2010-05-15 13:21:16.479087397 -0400
27929@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device 28096@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
27930 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); 28097 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
27931 if (buf) { 28098 if (buf) {
@@ -27937,9 +28104,9 @@ diff -urNp linux-2.6.32.12/drivers/usb/core/message.c linux-2.6.32.12/drivers/us
27937 if (!smallbuf) 28104 if (!smallbuf)
27938 return buf; 28105 return buf;
27939 memcpy(smallbuf, buf, len); 28106 memcpy(smallbuf, buf, len);
27940diff -urNp linux-2.6.32.12/drivers/usb/host/ehci-pci.c linux-2.6.32.12/drivers/usb/host/ehci-pci.c 28107diff -urNp linux-2.6.32.13/drivers/usb/host/ehci-pci.c linux-2.6.32.13/drivers/usb/host/ehci-pci.c
27941--- linux-2.6.32.12/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400 28108--- linux-2.6.32.13/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400
27942+++ linux-2.6.32.12/drivers/usb/host/ehci-pci.c 2010-04-04 20:46:41.629706570 -0400 28109+++ linux-2.6.32.13/drivers/usb/host/ehci-pci.c 2010-05-15 13:21:16.495431959 -0400
27943@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id 28110@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
27944 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), 28111 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
27945 .driver_data = (unsigned long) &ehci_pci_hc_driver, 28112 .driver_data = (unsigned long) &ehci_pci_hc_driver,
@@ -27949,9 +28116,9 @@ diff -urNp linux-2.6.32.12/drivers/usb/host/ehci-pci.c linux-2.6.32.12/drivers/u
27949 }; 28116 };
27950 MODULE_DEVICE_TABLE(pci, pci_ids); 28117 MODULE_DEVICE_TABLE(pci, pci_ids);
27951 28118
27952diff -urNp linux-2.6.32.12/drivers/usb/host/uhci-hcd.c linux-2.6.32.12/drivers/usb/host/uhci-hcd.c 28119diff -urNp linux-2.6.32.13/drivers/usb/host/uhci-hcd.c linux-2.6.32.13/drivers/usb/host/uhci-hcd.c
27953--- linux-2.6.32.12/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400 28120--- linux-2.6.32.13/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400
27954+++ linux-2.6.32.12/drivers/usb/host/uhci-hcd.c 2010-04-04 20:46:41.629706570 -0400 28121+++ linux-2.6.32.13/drivers/usb/host/uhci-hcd.c 2010-05-15 13:21:16.495431959 -0400
27955@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p 28122@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
27956 /* handle any USB UHCI controller */ 28123 /* handle any USB UHCI controller */
27957 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), 28124 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -27961,9 +28128,9 @@ diff -urNp linux-2.6.32.12/drivers/usb/host/uhci-hcd.c linux-2.6.32.12/drivers/u
27961 }; 28128 };
27962 28129
27963 MODULE_DEVICE_TABLE(pci, uhci_pci_ids); 28130 MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
27964diff -urNp linux-2.6.32.12/drivers/usb/misc/appledisplay.c linux-2.6.32.12/drivers/usb/misc/appledisplay.c 28131diff -urNp linux-2.6.32.13/drivers/usb/misc/appledisplay.c linux-2.6.32.13/drivers/usb/misc/appledisplay.c
27965--- linux-2.6.32.12/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400 28132--- linux-2.6.32.13/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400
27966+++ linux-2.6.32.12/drivers/usb/misc/appledisplay.c 2010-04-04 20:46:41.629706570 -0400 28133+++ linux-2.6.32.13/drivers/usb/misc/appledisplay.c 2010-05-15 13:21:16.495431959 -0400
27967@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes 28134@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
27968 return pdata->msgdata[1]; 28135 return pdata->msgdata[1];
27969 } 28136 }
@@ -27973,9 +28140,9 @@ diff -urNp linux-2.6.32.12/drivers/usb/misc/appledisplay.c linux-2.6.32.12/drive
27973 .get_brightness = appledisplay_bl_get_brightness, 28140 .get_brightness = appledisplay_bl_get_brightness,
27974 .update_status = appledisplay_bl_update_status, 28141 .update_status = appledisplay_bl_update_status,
27975 }; 28142 };
27976diff -urNp linux-2.6.32.12/drivers/usb/mon/mon_main.c linux-2.6.32.12/drivers/usb/mon/mon_main.c 28143diff -urNp linux-2.6.32.13/drivers/usb/mon/mon_main.c linux-2.6.32.13/drivers/usb/mon/mon_main.c
27977--- linux-2.6.32.12/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400 28144--- linux-2.6.32.13/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400
27978+++ linux-2.6.32.12/drivers/usb/mon/mon_main.c 2010-04-04 20:46:41.629706570 -0400 28145+++ linux-2.6.32.13/drivers/usb/mon/mon_main.c 2010-05-15 13:21:16.504078790 -0400
27979@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { 28146@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
27980 /* 28147 /*
27981 * Ops 28148 * Ops
@@ -27985,9 +28152,9 @@ diff -urNp linux-2.6.32.12/drivers/usb/mon/mon_main.c linux-2.6.32.12/drivers/us
27985 .urb_submit = mon_submit, 28152 .urb_submit = mon_submit,
27986 .urb_submit_error = mon_submit_error, 28153 .urb_submit_error = mon_submit_error,
27987 .urb_complete = mon_complete, 28154 .urb_complete = mon_complete,
27988diff -urNp linux-2.6.32.12/drivers/usb/storage/debug.h linux-2.6.32.12/drivers/usb/storage/debug.h 28155diff -urNp linux-2.6.32.13/drivers/usb/storage/debug.h linux-2.6.32.13/drivers/usb/storage/debug.h
27989--- linux-2.6.32.12/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400 28156--- linux-2.6.32.13/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400
27990+++ linux-2.6.32.12/drivers/usb/storage/debug.h 2010-04-04 20:46:41.629706570 -0400 28157+++ linux-2.6.32.13/drivers/usb/storage/debug.h 2010-05-15 13:21:16.521852812 -0400
27991@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char 28158@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
27992 #define US_DEBUGPX(x...) printk( x ) 28159 #define US_DEBUGPX(x...) printk( x )
27993 #define US_DEBUG(x) x 28160 #define US_DEBUG(x) x
@@ -28001,9 +28168,9 @@ diff -urNp linux-2.6.32.12/drivers/usb/storage/debug.h linux-2.6.32.12/drivers/u
28001 #endif 28168 #endif
28002 28169
28003 #endif 28170 #endif
28004diff -urNp linux-2.6.32.12/drivers/usb/storage/usb.c linux-2.6.32.12/drivers/usb/storage/usb.c 28171diff -urNp linux-2.6.32.13/drivers/usb/storage/usb.c linux-2.6.32.13/drivers/usb/storage/usb.c
28005--- linux-2.6.32.12/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400 28172--- linux-2.6.32.13/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400
28006+++ linux-2.6.32.12/drivers/usb/storage/usb.c 2010-04-04 20:46:41.629706570 -0400 28173+++ linux-2.6.32.13/drivers/usb/storage/usb.c 2010-05-15 13:21:16.547749964 -0400
28007@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l 28174@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
28008 28175
28009 static struct us_unusual_dev us_unusual_dev_list[] = { 28176 static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -28013,9 +28180,9 @@ diff -urNp linux-2.6.32.12/drivers/usb/storage/usb.c linux-2.6.32.12/drivers/usb
28013 }; 28180 };
28014 28181
28015 #undef UNUSUAL_DEV 28182 #undef UNUSUAL_DEV
28016diff -urNp linux-2.6.32.12/drivers/usb/storage/usual-tables.c linux-2.6.32.12/drivers/usb/storage/usual-tables.c 28183diff -urNp linux-2.6.32.13/drivers/usb/storage/usual-tables.c linux-2.6.32.13/drivers/usb/storage/usual-tables.c
28017--- linux-2.6.32.12/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400 28184--- linux-2.6.32.13/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400
28018+++ linux-2.6.32.12/drivers/usb/storage/usual-tables.c 2010-04-04 20:46:41.629706570 -0400 28185+++ linux-2.6.32.13/drivers/usb/storage/usual-tables.c 2010-05-15 13:21:16.559032137 -0400
28019@@ -48,7 +48,7 @@ 28186@@ -48,7 +48,7 @@
28020 28187
28021 struct usb_device_id usb_storage_usb_ids[] = { 28188 struct usb_device_id usb_storage_usb_ids[] = {
@@ -28025,9 +28192,9 @@ diff -urNp linux-2.6.32.12/drivers/usb/storage/usual-tables.c linux-2.6.32.12/dr
28025 }; 28192 };
28026 EXPORT_SYMBOL_GPL(usb_storage_usb_ids); 28193 EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
28027 28194
28028diff -urNp linux-2.6.32.12/drivers/uwb/wlp/messages.c linux-2.6.32.12/drivers/uwb/wlp/messages.c 28195diff -urNp linux-2.6.32.13/drivers/uwb/wlp/messages.c linux-2.6.32.13/drivers/uwb/wlp/messages.c
28029--- linux-2.6.32.12/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400 28196--- linux-2.6.32.13/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400
28030+++ linux-2.6.32.12/drivers/uwb/wlp/messages.c 2010-04-04 20:46:41.629706570 -0400 28197+++ linux-2.6.32.13/drivers/uwb/wlp/messages.c 2010-05-15 13:21:16.584920944 -0400
28031@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct 28198@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
28032 size_t len = skb->len; 28199 size_t len = skb->len;
28033 size_t used; 28200 size_t used;
@@ -28037,9 +28204,9 @@ diff -urNp linux-2.6.32.12/drivers/uwb/wlp/messages.c linux-2.6.32.12/drivers/uw
28037 enum wlp_assc_error assc_err; 28204 enum wlp_assc_error assc_err;
28038 char enonce_buf[WLP_WSS_NONCE_STRSIZE]; 28205 char enonce_buf[WLP_WSS_NONCE_STRSIZE];
28039 char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; 28206 char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
28040diff -urNp linux-2.6.32.12/drivers/uwb/wlp/sysfs.c linux-2.6.32.12/drivers/uwb/wlp/sysfs.c 28207diff -urNp linux-2.6.32.13/drivers/uwb/wlp/sysfs.c linux-2.6.32.13/drivers/uwb/wlp/sysfs.c
28041--- linux-2.6.32.12/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400 28208--- linux-2.6.32.13/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400
28042+++ linux-2.6.32.12/drivers/uwb/wlp/sysfs.c 2010-04-04 20:46:41.629706570 -0400 28209+++ linux-2.6.32.13/drivers/uwb/wlp/sysfs.c 2010-05-15 13:21:16.587027337 -0400
28043@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec 28210@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
28044 return ret; 28211 return ret;
28045 } 28212 }
@@ -28050,9 +28217,9 @@ diff -urNp linux-2.6.32.12/drivers/uwb/wlp/sysfs.c linux-2.6.32.12/drivers/uwb/w
28050 .show = wlp_wss_attr_show, 28217 .show = wlp_wss_attr_show,
28051 .store = wlp_wss_attr_store, 28218 .store = wlp_wss_attr_store,
28052 }; 28219 };
28053diff -urNp linux-2.6.32.12/drivers/video/atmel_lcdfb.c linux-2.6.32.12/drivers/video/atmel_lcdfb.c 28220diff -urNp linux-2.6.32.13/drivers/video/atmel_lcdfb.c linux-2.6.32.13/drivers/video/atmel_lcdfb.c
28054--- linux-2.6.32.12/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400 28221--- linux-2.6.32.13/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400
28055+++ linux-2.6.32.12/drivers/video/atmel_lcdfb.c 2010-04-04 20:46:41.629706570 -0400 28222+++ linux-2.6.32.13/drivers/video/atmel_lcdfb.c 2010-05-15 13:21:16.587027337 -0400
28056@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc 28223@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
28057 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); 28224 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
28058 } 28225 }
@@ -28062,9 +28229,9 @@ diff -urNp linux-2.6.32.12/drivers/video/atmel_lcdfb.c linux-2.6.32.12/drivers/v
28062 .update_status = atmel_bl_update_status, 28229 .update_status = atmel_bl_update_status,
28063 .get_brightness = atmel_bl_get_brightness, 28230 .get_brightness = atmel_bl_get_brightness,
28064 }; 28231 };
28065diff -urNp linux-2.6.32.12/drivers/video/aty/aty128fb.c linux-2.6.32.12/drivers/video/aty/aty128fb.c 28232diff -urNp linux-2.6.32.13/drivers/video/aty/aty128fb.c linux-2.6.32.13/drivers/video/aty/aty128fb.c
28066--- linux-2.6.32.12/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400 28233--- linux-2.6.32.13/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400
28067+++ linux-2.6.32.12/drivers/video/aty/aty128fb.c 2010-04-04 20:46:41.629706570 -0400 28234+++ linux-2.6.32.13/drivers/video/aty/aty128fb.c 2010-05-15 13:21:16.599120806 -0400
28068@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru 28235@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
28069 return bd->props.brightness; 28236 return bd->props.brightness;
28070 } 28237 }
@@ -28074,9 +28241,9 @@ diff -urNp linux-2.6.32.12/drivers/video/aty/aty128fb.c linux-2.6.32.12/drivers/
28074 .get_brightness = aty128_bl_get_brightness, 28241 .get_brightness = aty128_bl_get_brightness,
28075 .update_status = aty128_bl_update_status, 28242 .update_status = aty128_bl_update_status,
28076 }; 28243 };
28077diff -urNp linux-2.6.32.12/drivers/video/aty/atyfb_base.c linux-2.6.32.12/drivers/video/aty/atyfb_base.c 28244diff -urNp linux-2.6.32.13/drivers/video/aty/atyfb_base.c linux-2.6.32.13/drivers/video/aty/atyfb_base.c
28078--- linux-2.6.32.12/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400 28245--- linux-2.6.32.13/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400
28079+++ linux-2.6.32.12/drivers/video/aty/atyfb_base.c 2010-04-04 20:46:41.629706570 -0400 28246+++ linux-2.6.32.13/drivers/video/aty/atyfb_base.c 2010-05-15 13:21:16.611030004 -0400
28080@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct 28247@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
28081 return bd->props.brightness; 28248 return bd->props.brightness;
28082 } 28249 }
@@ -28086,9 +28253,9 @@ diff -urNp linux-2.6.32.12/drivers/video/aty/atyfb_base.c linux-2.6.32.12/driver
28086 .get_brightness = aty_bl_get_brightness, 28253 .get_brightness = aty_bl_get_brightness,
28087 .update_status = aty_bl_update_status, 28254 .update_status = aty_bl_update_status,
28088 }; 28255 };
28089diff -urNp linux-2.6.32.12/drivers/video/aty/radeon_backlight.c linux-2.6.32.12/drivers/video/aty/radeon_backlight.c 28256diff -urNp linux-2.6.32.13/drivers/video/aty/radeon_backlight.c linux-2.6.32.13/drivers/video/aty/radeon_backlight.c
28090--- linux-2.6.32.12/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400 28257--- linux-2.6.32.13/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400
28091+++ linux-2.6.32.12/drivers/video/aty/radeon_backlight.c 2010-04-04 20:46:41.629706570 -0400 28258+++ linux-2.6.32.13/drivers/video/aty/radeon_backlight.c 2010-05-15 13:21:16.611030004 -0400
28092@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru 28259@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
28093 return bd->props.brightness; 28260 return bd->props.brightness;
28094 } 28261 }
@@ -28098,9 +28265,9 @@ diff -urNp linux-2.6.32.12/drivers/video/aty/radeon_backlight.c linux-2.6.32.12/
28098 .get_brightness = radeon_bl_get_brightness, 28265 .get_brightness = radeon_bl_get_brightness,
28099 .update_status = radeon_bl_update_status, 28266 .update_status = radeon_bl_update_status,
28100 }; 28267 };
28101diff -urNp linux-2.6.32.12/drivers/video/backlight/adp5520_bl.c linux-2.6.32.12/drivers/video/backlight/adp5520_bl.c 28268diff -urNp linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c
28102--- linux-2.6.32.12/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400 28269--- linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400
28103+++ linux-2.6.32.12/drivers/video/backlight/adp5520_bl.c 2010-04-04 20:46:41.629706570 -0400 28270+++ linux-2.6.32.13/drivers/video/backlight/adp5520_bl.c 2010-05-15 13:21:16.611030004 -0400
28104@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str 28271@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
28105 return error ? data->current_brightness : reg_val; 28272 return error ? data->current_brightness : reg_val;
28106 } 28273 }
@@ -28110,9 +28277,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/adp5520_bl.c linux-2.6.32.12/
28110 .update_status = adp5520_bl_update_status, 28277 .update_status = adp5520_bl_update_status,
28111 .get_brightness = adp5520_bl_get_brightness, 28278 .get_brightness = adp5520_bl_get_brightness,
28112 }; 28279 };
28113diff -urNp linux-2.6.32.12/drivers/video/backlight/adx_bl.c linux-2.6.32.12/drivers/video/backlight/adx_bl.c 28280diff -urNp linux-2.6.32.13/drivers/video/backlight/adx_bl.c linux-2.6.32.13/drivers/video/backlight/adx_bl.c
28114--- linux-2.6.32.12/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400 28281--- linux-2.6.32.13/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400
28115+++ linux-2.6.32.12/drivers/video/backlight/adx_bl.c 2010-04-04 20:46:41.633638271 -0400 28282+++ linux-2.6.32.13/drivers/video/backlight/adx_bl.c 2010-05-15 13:21:16.611030004 -0400
28116@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct 28283@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
28117 return 1; 28284 return 1;
28118 } 28285 }
@@ -28122,9 +28289,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/adx_bl.c linux-2.6.32.12/driv
28122 .options = 0, 28289 .options = 0,
28123 .update_status = adx_backlight_update_status, 28290 .update_status = adx_backlight_update_status,
28124 .get_brightness = adx_backlight_get_brightness, 28291 .get_brightness = adx_backlight_get_brightness,
28125diff -urNp linux-2.6.32.12/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.12/drivers/video/backlight/atmel-pwm-bl.c 28292diff -urNp linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c
28126--- linux-2.6.32.12/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400 28293--- linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400
28127+++ linux-2.6.32.12/drivers/video/backlight/atmel-pwm-bl.c 2010-04-04 20:46:41.633638271 -0400 28294+++ linux-2.6.32.13/drivers/video/backlight/atmel-pwm-bl.c 2010-05-15 13:21:16.611030004 -0400
28128@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct 28295@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
28129 return pwm_channel_enable(&pwmbl->pwmc); 28296 return pwm_channel_enable(&pwmbl->pwmc);
28130 } 28297 }
@@ -28134,9 +28301,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.1
28134 .get_brightness = atmel_pwm_bl_get_intensity, 28301 .get_brightness = atmel_pwm_bl_get_intensity,
28135 .update_status = atmel_pwm_bl_set_intensity, 28302 .update_status = atmel_pwm_bl_set_intensity,
28136 }; 28303 };
28137diff -urNp linux-2.6.32.12/drivers/video/backlight/backlight.c linux-2.6.32.12/drivers/video/backlight/backlight.c 28304diff -urNp linux-2.6.32.13/drivers/video/backlight/backlight.c linux-2.6.32.13/drivers/video/backlight/backlight.c
28138--- linux-2.6.32.12/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400 28305--- linux-2.6.32.13/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400
28139+++ linux-2.6.32.12/drivers/video/backlight/backlight.c 2010-04-04 20:46:41.633638271 -0400 28306+++ linux-2.6.32.13/drivers/video/backlight/backlight.c 2010-05-15 13:21:16.611030004 -0400
28140@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); 28307@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
28141 * ERR_PTR() or a pointer to the newly allocated device. 28308 * ERR_PTR() or a pointer to the newly allocated device.
28142 */ 28309 */
@@ -28146,9 +28313,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/backlight.c linux-2.6.32.12/d
28146 { 28313 {
28147 struct backlight_device *new_bd; 28314 struct backlight_device *new_bd;
28148 int rc; 28315 int rc;
28149diff -urNp linux-2.6.32.12/drivers/video/backlight/corgi_lcd.c linux-2.6.32.12/drivers/video/backlight/corgi_lcd.c 28316diff -urNp linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c
28150--- linux-2.6.32.12/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400 28317--- linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400
28151+++ linux-2.6.32.12/drivers/video/backlight/corgi_lcd.c 2010-04-04 20:46:41.633638271 -0400 28318+++ linux-2.6.32.13/drivers/video/backlight/corgi_lcd.c 2010-05-15 13:21:16.611030004 -0400
28152@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit 28319@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
28153 } 28320 }
28154 EXPORT_SYMBOL(corgi_lcd_limit_intensity); 28321 EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -28158,9 +28325,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/corgi_lcd.c linux-2.6.32.12/d
28158 .get_brightness = corgi_bl_get_intensity, 28325 .get_brightness = corgi_bl_get_intensity,
28159 .update_status = corgi_bl_update_status, 28326 .update_status = corgi_bl_update_status,
28160 }; 28327 };
28161diff -urNp linux-2.6.32.12/drivers/video/backlight/cr_bllcd.c linux-2.6.32.12/drivers/video/backlight/cr_bllcd.c 28328diff -urNp linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c
28162--- linux-2.6.32.12/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400 28329--- linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400
28163+++ linux-2.6.32.12/drivers/video/backlight/cr_bllcd.c 2010-04-04 20:46:41.633638271 -0400 28330+++ linux-2.6.32.13/drivers/video/backlight/cr_bllcd.c 2010-05-15 13:21:16.611030004 -0400
28164@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st 28331@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
28165 return intensity; 28332 return intensity;
28166 } 28333 }
@@ -28170,9 +28337,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/cr_bllcd.c linux-2.6.32.12/dr
28170 .get_brightness = cr_backlight_get_intensity, 28337 .get_brightness = cr_backlight_get_intensity,
28171 .update_status = cr_backlight_set_intensity, 28338 .update_status = cr_backlight_set_intensity,
28172 }; 28339 };
28173diff -urNp linux-2.6.32.12/drivers/video/backlight/da903x_bl.c linux-2.6.32.12/drivers/video/backlight/da903x_bl.c 28340diff -urNp linux-2.6.32.13/drivers/video/backlight/da903x_bl.c linux-2.6.32.13/drivers/video/backlight/da903x_bl.c
28174--- linux-2.6.32.12/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400 28341--- linux-2.6.32.13/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400
28175+++ linux-2.6.32.12/drivers/video/backlight/da903x_bl.c 2010-04-04 20:46:41.633638271 -0400 28342+++ linux-2.6.32.13/drivers/video/backlight/da903x_bl.c 2010-05-15 13:21:16.611030004 -0400
28176@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne 28343@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
28177 return data->current_brightness; 28344 return data->current_brightness;
28178 } 28345 }
@@ -28182,9 +28349,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/da903x_bl.c linux-2.6.32.12/d
28182 .update_status = da903x_backlight_update_status, 28349 .update_status = da903x_backlight_update_status,
28183 .get_brightness = da903x_backlight_get_brightness, 28350 .get_brightness = da903x_backlight_get_brightness,
28184 }; 28351 };
28185diff -urNp linux-2.6.32.12/drivers/video/backlight/generic_bl.c linux-2.6.32.12/drivers/video/backlight/generic_bl.c 28352diff -urNp linux-2.6.32.13/drivers/video/backlight/generic_bl.c linux-2.6.32.13/drivers/video/backlight/generic_bl.c
28186--- linux-2.6.32.12/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400 28353--- linux-2.6.32.13/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400
28187+++ linux-2.6.32.12/drivers/video/backlight/generic_bl.c 2010-04-04 20:46:41.633638271 -0400 28354+++ linux-2.6.32.13/drivers/video/backlight/generic_bl.c 2010-05-15 13:21:16.611030004 -0400
28188@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) 28355@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
28189 } 28356 }
28190 EXPORT_SYMBOL(corgibl_limit_intensity); 28357 EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -28194,9 +28361,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/generic_bl.c linux-2.6.32.12/
28194 .options = BL_CORE_SUSPENDRESUME, 28361 .options = BL_CORE_SUSPENDRESUME,
28195 .get_brightness = genericbl_get_intensity, 28362 .get_brightness = genericbl_get_intensity,
28196 .update_status = genericbl_send_intensity, 28363 .update_status = genericbl_send_intensity,
28197diff -urNp linux-2.6.32.12/drivers/video/backlight/hp680_bl.c linux-2.6.32.12/drivers/video/backlight/hp680_bl.c 28364diff -urNp linux-2.6.32.13/drivers/video/backlight/hp680_bl.c linux-2.6.32.13/drivers/video/backlight/hp680_bl.c
28198--- linux-2.6.32.12/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400 28365--- linux-2.6.32.13/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400
28199+++ linux-2.6.32.12/drivers/video/backlight/hp680_bl.c 2010-04-04 20:46:41.633638271 -0400 28366+++ linux-2.6.32.13/drivers/video/backlight/hp680_bl.c 2010-05-15 13:21:16.611030004 -0400
28200@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct 28367@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
28201 return current_intensity; 28368 return current_intensity;
28202 } 28369 }
@@ -28206,9 +28373,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/hp680_bl.c linux-2.6.32.12/dr
28206 .get_brightness = hp680bl_get_intensity, 28373 .get_brightness = hp680bl_get_intensity,
28207 .update_status = hp680bl_set_intensity, 28374 .update_status = hp680bl_set_intensity,
28208 }; 28375 };
28209diff -urNp linux-2.6.32.12/drivers/video/backlight/jornada720_bl.c linux-2.6.32.12/drivers/video/backlight/jornada720_bl.c 28376diff -urNp linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c
28210--- linux-2.6.32.12/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400 28377--- linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400
28211+++ linux-2.6.32.12/drivers/video/backlight/jornada720_bl.c 2010-04-04 20:46:41.633638271 -0400 28378+++ linux-2.6.32.13/drivers/video/backlight/jornada720_bl.c 2010-05-15 13:21:16.611030004 -0400
28212@@ -93,7 +93,7 @@ out: 28379@@ -93,7 +93,7 @@ out:
28213 return ret; 28380 return ret;
28214 } 28381 }
@@ -28218,9 +28385,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/jornada720_bl.c linux-2.6.32.
28218 .get_brightness = jornada_bl_get_brightness, 28385 .get_brightness = jornada_bl_get_brightness,
28219 .update_status = jornada_bl_update_status, 28386 .update_status = jornada_bl_update_status,
28220 .options = BL_CORE_SUSPENDRESUME, 28387 .options = BL_CORE_SUSPENDRESUME,
28221diff -urNp linux-2.6.32.12/drivers/video/backlight/kb3886_bl.c linux-2.6.32.12/drivers/video/backlight/kb3886_bl.c 28388diff -urNp linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c
28222--- linux-2.6.32.12/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400 28389--- linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400
28223+++ linux-2.6.32.12/drivers/video/backlight/kb3886_bl.c 2010-04-04 20:46:41.633638271 -0400 28390+++ linux-2.6.32.13/drivers/video/backlight/kb3886_bl.c 2010-05-15 13:21:16.611030004 -0400
28224@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct 28391@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
28225 return kb3886bl_intensity; 28392 return kb3886bl_intensity;
28226 } 28393 }
@@ -28230,9 +28397,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/kb3886_bl.c linux-2.6.32.12/d
28230 .get_brightness = kb3886bl_get_intensity, 28397 .get_brightness = kb3886bl_get_intensity,
28231 .update_status = kb3886bl_send_intensity, 28398 .update_status = kb3886bl_send_intensity,
28232 }; 28399 };
28233diff -urNp linux-2.6.32.12/drivers/video/backlight/locomolcd.c linux-2.6.32.12/drivers/video/backlight/locomolcd.c 28400diff -urNp linux-2.6.32.13/drivers/video/backlight/locomolcd.c linux-2.6.32.13/drivers/video/backlight/locomolcd.c
28234--- linux-2.6.32.12/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400 28401--- linux-2.6.32.13/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400
28235+++ linux-2.6.32.12/drivers/video/backlight/locomolcd.c 2010-04-04 20:46:41.633638271 -0400 28402+++ linux-2.6.32.13/drivers/video/backlight/locomolcd.c 2010-05-15 13:21:16.611030004 -0400
28236@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc 28403@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
28237 return current_intensity; 28404 return current_intensity;
28238 } 28405 }
@@ -28242,9 +28409,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/locomolcd.c linux-2.6.32.12/d
28242 .get_brightness = locomolcd_get_intensity, 28409 .get_brightness = locomolcd_get_intensity,
28243 .update_status = locomolcd_set_intensity, 28410 .update_status = locomolcd_set_intensity,
28244 }; 28411 };
28245diff -urNp linux-2.6.32.12/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.12/drivers/video/backlight/mbp_nvidia_bl.c 28412diff -urNp linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c
28246--- linux-2.6.32.12/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:38.397382140 -0400 28413--- linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:38.397382140 -0400
28247+++ linux-2.6.32.12/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:58.433026851 -0400 28414+++ linux-2.6.32.13/drivers/video/backlight/mbp_nvidia_bl.c 2010-05-15 13:21:16.611030004 -0400
28248@@ -33,7 +33,7 @@ struct dmi_match_data { 28415@@ -33,7 +33,7 @@ struct dmi_match_data {
28249 unsigned long iostart; 28416 unsigned long iostart;
28250 unsigned long iolen; 28417 unsigned long iolen;
@@ -28254,9 +28421,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
28254 }; 28421 };
28255 28422
28256 /* Module parameters. */ 28423 /* Module parameters. */
28257diff -urNp linux-2.6.32.12/drivers/video/backlight/omap1_bl.c linux-2.6.32.12/drivers/video/backlight/omap1_bl.c 28424diff -urNp linux-2.6.32.13/drivers/video/backlight/omap1_bl.c linux-2.6.32.13/drivers/video/backlight/omap1_bl.c
28258--- linux-2.6.32.12/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400 28425--- linux-2.6.32.13/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400
28259+++ linux-2.6.32.12/drivers/video/backlight/omap1_bl.c 2010-04-04 20:46:41.633638271 -0400 28426+++ linux-2.6.32.13/drivers/video/backlight/omap1_bl.c 2010-05-15 13:21:16.647199475 -0400
28260@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b 28427@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
28261 return bl->current_intensity; 28428 return bl->current_intensity;
28262 } 28429 }
@@ -28266,9 +28433,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/omap1_bl.c linux-2.6.32.12/dr
28266 .get_brightness = omapbl_get_intensity, 28433 .get_brightness = omapbl_get_intensity,
28267 .update_status = omapbl_update_status, 28434 .update_status = omapbl_update_status,
28268 }; 28435 };
28269diff -urNp linux-2.6.32.12/drivers/video/backlight/progear_bl.c linux-2.6.32.12/drivers/video/backlight/progear_bl.c 28436diff -urNp linux-2.6.32.13/drivers/video/backlight/progear_bl.c linux-2.6.32.13/drivers/video/backlight/progear_bl.c
28270--- linux-2.6.32.12/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400 28437--- linux-2.6.32.13/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400
28271+++ linux-2.6.32.12/drivers/video/backlight/progear_bl.c 2010-04-04 20:46:41.633638271 -0400 28438+++ linux-2.6.32.13/drivers/video/backlight/progear_bl.c 2010-05-15 13:21:16.647199475 -0400
28272@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc 28439@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
28273 return intensity - HW_LEVEL_MIN; 28440 return intensity - HW_LEVEL_MIN;
28274 } 28441 }
@@ -28278,9 +28445,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/progear_bl.c linux-2.6.32.12/
28278 .get_brightness = progearbl_get_intensity, 28445 .get_brightness = progearbl_get_intensity,
28279 .update_status = progearbl_set_intensity, 28446 .update_status = progearbl_set_intensity,
28280 }; 28447 };
28281diff -urNp linux-2.6.32.12/drivers/video/backlight/pwm_bl.c linux-2.6.32.12/drivers/video/backlight/pwm_bl.c 28448diff -urNp linux-2.6.32.13/drivers/video/backlight/pwm_bl.c linux-2.6.32.13/drivers/video/backlight/pwm_bl.c
28282--- linux-2.6.32.12/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400 28449--- linux-2.6.32.13/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400
28283+++ linux-2.6.32.12/drivers/video/backlight/pwm_bl.c 2010-04-04 20:46:41.633638271 -0400 28450+++ linux-2.6.32.13/drivers/video/backlight/pwm_bl.c 2010-05-15 13:21:16.647199475 -0400
28284@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( 28451@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
28285 return bl->props.brightness; 28452 return bl->props.brightness;
28286 } 28453 }
@@ -28290,9 +28457,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/pwm_bl.c linux-2.6.32.12/driv
28290 .update_status = pwm_backlight_update_status, 28457 .update_status = pwm_backlight_update_status,
28291 .get_brightness = pwm_backlight_get_brightness, 28458 .get_brightness = pwm_backlight_get_brightness,
28292 }; 28459 };
28293diff -urNp linux-2.6.32.12/drivers/video/backlight/tosa_bl.c linux-2.6.32.12/drivers/video/backlight/tosa_bl.c 28460diff -urNp linux-2.6.32.13/drivers/video/backlight/tosa_bl.c linux-2.6.32.13/drivers/video/backlight/tosa_bl.c
28294--- linux-2.6.32.12/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400 28461--- linux-2.6.32.13/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400
28295+++ linux-2.6.32.12/drivers/video/backlight/tosa_bl.c 2010-04-04 20:46:41.633638271 -0400 28462+++ linux-2.6.32.13/drivers/video/backlight/tosa_bl.c 2010-05-15 13:21:16.647199475 -0400
28296@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct 28463@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
28297 return props->brightness; 28464 return props->brightness;
28298 } 28465 }
@@ -28302,9 +28469,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/tosa_bl.c linux-2.6.32.12/dri
28302 .get_brightness = tosa_bl_get_brightness, 28469 .get_brightness = tosa_bl_get_brightness,
28303 .update_status = tosa_bl_update_status, 28470 .update_status = tosa_bl_update_status,
28304 }; 28471 };
28305diff -urNp linux-2.6.32.12/drivers/video/backlight/wm831x_bl.c linux-2.6.32.12/drivers/video/backlight/wm831x_bl.c 28472diff -urNp linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c
28306--- linux-2.6.32.12/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400 28473--- linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400
28307+++ linux-2.6.32.12/drivers/video/backlight/wm831x_bl.c 2010-04-04 20:46:41.633638271 -0400 28474+++ linux-2.6.32.13/drivers/video/backlight/wm831x_bl.c 2010-05-15 13:21:16.647199475 -0400
28308@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne 28475@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
28309 return data->current_brightness; 28476 return data->current_brightness;
28310 } 28477 }
@@ -28314,9 +28481,9 @@ diff -urNp linux-2.6.32.12/drivers/video/backlight/wm831x_bl.c linux-2.6.32.12/d
28314 .options = BL_CORE_SUSPENDRESUME, 28481 .options = BL_CORE_SUSPENDRESUME,
28315 .update_status = wm831x_backlight_update_status, 28482 .update_status = wm831x_backlight_update_status,
28316 .get_brightness = wm831x_backlight_get_brightness, 28483 .get_brightness = wm831x_backlight_get_brightness,
28317diff -urNp linux-2.6.32.12/drivers/video/bf54x-lq043fb.c linux-2.6.32.12/drivers/video/bf54x-lq043fb.c 28484diff -urNp linux-2.6.32.13/drivers/video/bf54x-lq043fb.c linux-2.6.32.13/drivers/video/bf54x-lq043fb.c
28318--- linux-2.6.32.12/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400 28485--- linux-2.6.32.13/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400
28319+++ linux-2.6.32.12/drivers/video/bf54x-lq043fb.c 2010-04-04 20:46:41.633638271 -0400 28486+++ linux-2.6.32.13/drivers/video/bf54x-lq043fb.c 2010-05-15 13:21:16.647199475 -0400
28320@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back 28487@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
28321 return 0; 28488 return 0;
28322 } 28489 }
@@ -28326,9 +28493,9 @@ diff -urNp linux-2.6.32.12/drivers/video/bf54x-lq043fb.c linux-2.6.32.12/drivers
28326 .get_brightness = bl_get_brightness, 28493 .get_brightness = bl_get_brightness,
28327 }; 28494 };
28328 28495
28329diff -urNp linux-2.6.32.12/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.12/drivers/video/bfin-t350mcqb-fb.c 28496diff -urNp linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c
28330--- linux-2.6.32.12/drivers/video/bfin-t350mcqb-fb.c 2010-03-15 11:52:04.000000000 -0400 28497--- linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c 2010-03-15 11:52:04.000000000 -0400
28331+++ linux-2.6.32.12/drivers/video/bfin-t350mcqb-fb.c 2010-04-04 20:46:41.633638271 -0400 28498+++ linux-2.6.32.13/drivers/video/bfin-t350mcqb-fb.c 2010-05-15 13:21:16.647199475 -0400
28332@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back 28499@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
28333 return 0; 28500 return 0;
28334 } 28501 }
@@ -28338,9 +28505,9 @@ diff -urNp linux-2.6.32.12/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.12/driv
28338 .get_brightness = bl_get_brightness, 28505 .get_brightness = bl_get_brightness,
28339 }; 28506 };
28340 28507
28341diff -urNp linux-2.6.32.12/drivers/video/fbcmap.c linux-2.6.32.12/drivers/video/fbcmap.c 28508diff -urNp linux-2.6.32.13/drivers/video/fbcmap.c linux-2.6.32.13/drivers/video/fbcmap.c
28342--- linux-2.6.32.12/drivers/video/fbcmap.c 2010-03-15 11:52:04.000000000 -0400 28509--- linux-2.6.32.13/drivers/video/fbcmap.c 2010-03-15 11:52:04.000000000 -0400
28343+++ linux-2.6.32.12/drivers/video/fbcmap.c 2010-04-29 17:46:37.213234717 -0400 28510+++ linux-2.6.32.13/drivers/video/fbcmap.c 2010-05-15 13:21:16.647199475 -0400
28344@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user 28511@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
28345 rc = -ENODEV; 28512 rc = -ENODEV;
28346 goto out; 28513 goto out;
@@ -28351,9 +28518,9 @@ diff -urNp linux-2.6.32.12/drivers/video/fbcmap.c linux-2.6.32.12/drivers/video/
28351 rc = -EINVAL; 28518 rc = -EINVAL;
28352 goto out1; 28519 goto out1;
28353 } 28520 }
28354diff -urNp linux-2.6.32.12/drivers/video/fbmem.c linux-2.6.32.12/drivers/video/fbmem.c 28521diff -urNp linux-2.6.32.13/drivers/video/fbmem.c linux-2.6.32.13/drivers/video/fbmem.c
28355--- linux-2.6.32.12/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400 28522--- linux-2.6.32.13/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400
28356+++ linux-2.6.32.12/drivers/video/fbmem.c 2010-04-04 20:46:41.633638271 -0400 28523+++ linux-2.6.32.13/drivers/video/fbmem.c 2010-05-15 13:21:16.659032956 -0400
28357@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in 28524@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
28358 image->dx += image->width + 8; 28525 image->dx += image->width + 8;
28359 } 28526 }
@@ -28381,9 +28548,9 @@ diff -urNp linux-2.6.32.12/drivers/video/fbmem.c linux-2.6.32.12/drivers/video/f
28381 return -EINVAL; 28548 return -EINVAL;
28382 if (!registered_fb[con2fb.framebuffer]) 28549 if (!registered_fb[con2fb.framebuffer])
28383 request_module("fb%d", con2fb.framebuffer); 28550 request_module("fb%d", con2fb.framebuffer);
28384diff -urNp linux-2.6.32.12/drivers/video/fbmon.c linux-2.6.32.12/drivers/video/fbmon.c 28551diff -urNp linux-2.6.32.13/drivers/video/fbmon.c linux-2.6.32.13/drivers/video/fbmon.c
28385--- linux-2.6.32.12/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400 28552--- linux-2.6.32.13/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400
28386+++ linux-2.6.32.12/drivers/video/fbmon.c 2010-04-04 20:46:41.633638271 -0400 28553+++ linux-2.6.32.13/drivers/video/fbmon.c 2010-05-15 13:21:16.667905259 -0400
28387@@ -45,7 +45,7 @@ 28554@@ -45,7 +45,7 @@
28388 #ifdef DEBUG 28555 #ifdef DEBUG
28389 #define DPRINTK(fmt, args...) printk(fmt,## args) 28556 #define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -28393,9 +28560,9 @@ diff -urNp linux-2.6.32.12/drivers/video/fbmon.c linux-2.6.32.12/drivers/video/f
28393 #endif 28560 #endif
28394 28561
28395 #define FBMON_FIX_HEADER 1 28562 #define FBMON_FIX_HEADER 1
28396diff -urNp linux-2.6.32.12/drivers/video/i810/i810_accel.c linux-2.6.32.12/drivers/video/i810/i810_accel.c 28563diff -urNp linux-2.6.32.13/drivers/video/i810/i810_accel.c linux-2.6.32.13/drivers/video/i810/i810_accel.c
28397--- linux-2.6.32.12/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400 28564--- linux-2.6.32.13/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400
28398+++ linux-2.6.32.12/drivers/video/i810/i810_accel.c 2010-04-04 20:46:41.633638271 -0400 28565+++ linux-2.6.32.13/drivers/video/i810/i810_accel.c 2010-05-15 13:21:16.667905259 -0400
28399@@ -73,6 +73,7 @@ static inline int wait_for_space(struct 28566@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
28400 } 28567 }
28401 } 28568 }
@@ -28404,9 +28571,9 @@ diff -urNp linux-2.6.32.12/drivers/video/i810/i810_accel.c linux-2.6.32.12/drive
28404 i810_report_error(mmio); 28571 i810_report_error(mmio);
28405 par->dev_flags |= LOCKUP; 28572 par->dev_flags |= LOCKUP;
28406 info->pixmap.scan_align = 1; 28573 info->pixmap.scan_align = 1;
28407diff -urNp linux-2.6.32.12/drivers/video/i810/i810_main.c linux-2.6.32.12/drivers/video/i810/i810_main.c 28574diff -urNp linux-2.6.32.13/drivers/video/i810/i810_main.c linux-2.6.32.13/drivers/video/i810/i810_main.c
28408--- linux-2.6.32.12/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400 28575--- linux-2.6.32.13/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400
28409+++ linux-2.6.32.12/drivers/video/i810/i810_main.c 2010-04-04 20:46:41.633638271 -0400 28576+++ linux-2.6.32.13/drivers/video/i810/i810_main.c 2010-05-15 13:21:16.675089243 -0400
28410@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t 28577@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
28411 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, 28578 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
28412 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, 28579 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -28416,9 +28583,9 @@ diff -urNp linux-2.6.32.12/drivers/video/i810/i810_main.c linux-2.6.32.12/driver
28416 }; 28583 };
28417 28584
28418 static struct pci_driver i810fb_driver = { 28585 static struct pci_driver i810fb_driver = {
28419diff -urNp linux-2.6.32.12/drivers/video/modedb.c linux-2.6.32.12/drivers/video/modedb.c 28586diff -urNp linux-2.6.32.13/drivers/video/modedb.c linux-2.6.32.13/drivers/video/modedb.c
28420--- linux-2.6.32.12/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400 28587--- linux-2.6.32.13/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400
28421+++ linux-2.6.32.12/drivers/video/modedb.c 2010-04-04 20:46:41.637780128 -0400 28588+++ linux-2.6.32.13/drivers/video/modedb.c 2010-05-15 13:21:16.691535841 -0400
28422@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ 28589@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
28423 { 28590 {
28424 /* 640x400 @ 70 Hz, 31.5 kHz hsync */ 28591 /* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -28719,9 +28886,9 @@ diff -urNp linux-2.6.32.12/drivers/video/modedb.c linux-2.6.32.12/drivers/video/
28719 }, 28886 },
28720 }; 28887 };
28721 28888
28722diff -urNp linux-2.6.32.12/drivers/video/nvidia/nv_backlight.c linux-2.6.32.12/drivers/video/nvidia/nv_backlight.c 28889diff -urNp linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c
28723--- linux-2.6.32.12/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400 28890--- linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400
28724+++ linux-2.6.32.12/drivers/video/nvidia/nv_backlight.c 2010-04-04 20:46:41.637780128 -0400 28891+++ linux-2.6.32.13/drivers/video/nvidia/nv_backlight.c 2010-05-15 13:21:16.691535841 -0400
28725@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru 28892@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
28726 return bd->props.brightness; 28893 return bd->props.brightness;
28727 } 28894 }
@@ -28731,9 +28898,9 @@ diff -urNp linux-2.6.32.12/drivers/video/nvidia/nv_backlight.c linux-2.6.32.12/d
28731 .get_brightness = nvidia_bl_get_brightness, 28898 .get_brightness = nvidia_bl_get_brightness,
28732 .update_status = nvidia_bl_update_status, 28899 .update_status = nvidia_bl_update_status,
28733 }; 28900 };
28734diff -urNp linux-2.6.32.12/drivers/video/riva/fbdev.c linux-2.6.32.12/drivers/video/riva/fbdev.c 28901diff -urNp linux-2.6.32.13/drivers/video/riva/fbdev.c linux-2.6.32.13/drivers/video/riva/fbdev.c
28735--- linux-2.6.32.12/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400 28902--- linux-2.6.32.13/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400
28736+++ linux-2.6.32.12/drivers/video/riva/fbdev.c 2010-04-04 20:46:41.637780128 -0400 28903+++ linux-2.6.32.13/drivers/video/riva/fbdev.c 2010-05-15 13:21:16.695039791 -0400
28737@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct 28904@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
28738 return bd->props.brightness; 28905 return bd->props.brightness;
28739 } 28906 }
@@ -28743,9 +28910,9 @@ diff -urNp linux-2.6.32.12/drivers/video/riva/fbdev.c linux-2.6.32.12/drivers/vi
28743 .get_brightness = riva_bl_get_brightness, 28910 .get_brightness = riva_bl_get_brightness,
28744 .update_status = riva_bl_update_status, 28911 .update_status = riva_bl_update_status,
28745 }; 28912 };
28746diff -urNp linux-2.6.32.12/drivers/video/uvesafb.c linux-2.6.32.12/drivers/video/uvesafb.c 28913diff -urNp linux-2.6.32.13/drivers/video/uvesafb.c linux-2.6.32.13/drivers/video/uvesafb.c
28747--- linux-2.6.32.12/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400 28914--- linux-2.6.32.13/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400
28748+++ linux-2.6.32.12/drivers/video/uvesafb.c 2010-04-04 20:46:41.637780128 -0400 28915+++ linux-2.6.32.13/drivers/video/uvesafb.c 2010-05-15 13:21:16.714782153 -0400
28749@@ -18,6 +18,7 @@ 28916@@ -18,6 +18,7 @@
28750 #include <linux/fb.h> 28917 #include <linux/fb.h>
28751 #include <linux/io.h> 28918 #include <linux/io.h>
@@ -28821,9 +28988,9 @@ diff -urNp linux-2.6.32.12/drivers/video/uvesafb.c linux-2.6.32.12/drivers/video
28821 } 28988 }
28822 28989
28823 framebuffer_release(info); 28990 framebuffer_release(info);
28824diff -urNp linux-2.6.32.12/drivers/video/vesafb.c linux-2.6.32.12/drivers/video/vesafb.c 28991diff -urNp linux-2.6.32.13/drivers/video/vesafb.c linux-2.6.32.13/drivers/video/vesafb.c
28825--- linux-2.6.32.12/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400 28992--- linux-2.6.32.13/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400
28826+++ linux-2.6.32.12/drivers/video/vesafb.c 2010-04-04 20:46:41.637780128 -0400 28993+++ linux-2.6.32.13/drivers/video/vesafb.c 2010-05-15 13:21:16.727737170 -0400
28827@@ -9,6 +9,7 @@ 28994@@ -9,6 +9,7 @@
28828 */ 28995 */
28829 28996
@@ -28927,9 +29094,9 @@ diff -urNp linux-2.6.32.12/drivers/video/vesafb.c linux-2.6.32.12/drivers/video/
28927 if (info->screen_base) 29094 if (info->screen_base)
28928 iounmap(info->screen_base); 29095 iounmap(info->screen_base);
28929 framebuffer_release(info); 29096 framebuffer_release(info);
28930diff -urNp linux-2.6.32.12/drivers/xen/sys-hypervisor.c linux-2.6.32.12/drivers/xen/sys-hypervisor.c 29097diff -urNp linux-2.6.32.13/drivers/xen/sys-hypervisor.c linux-2.6.32.13/drivers/xen/sys-hypervisor.c
28931--- linux-2.6.32.12/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400 29098--- linux-2.6.32.13/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400
28932+++ linux-2.6.32.12/drivers/xen/sys-hypervisor.c 2010-04-04 20:46:41.637780128 -0400 29099+++ linux-2.6.32.13/drivers/xen/sys-hypervisor.c 2010-05-15 13:21:16.727737170 -0400
28933@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko 29100@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
28934 return 0; 29101 return 0;
28935 } 29102 }
@@ -28939,9 +29106,9 @@ diff -urNp linux-2.6.32.12/drivers/xen/sys-hypervisor.c linux-2.6.32.12/drivers/
28939 .show = hyp_sysfs_show, 29106 .show = hyp_sysfs_show,
28940 .store = hyp_sysfs_store, 29107 .store = hyp_sysfs_store,
28941 }; 29108 };
28942diff -urNp linux-2.6.32.12/fs/9p/vfs_inode.c linux-2.6.32.12/fs/9p/vfs_inode.c 29109diff -urNp linux-2.6.32.13/fs/9p/vfs_inode.c linux-2.6.32.13/fs/9p/vfs_inode.c
28943--- linux-2.6.32.12/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400 29110--- linux-2.6.32.13/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400
28944+++ linux-2.6.32.12/fs/9p/vfs_inode.c 2010-04-04 20:46:41.637780128 -0400 29111+++ linux-2.6.32.13/fs/9p/vfs_inode.c 2010-05-15 13:21:16.735266886 -0400
28945@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct 29112@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
28946 static void 29113 static void
28947 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 29114 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -28951,9 +29118,9 @@ diff -urNp linux-2.6.32.12/fs/9p/vfs_inode.c linux-2.6.32.12/fs/9p/vfs_inode.c
28951 29118
28952 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, 29119 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
28953 IS_ERR(s) ? "<error>" : s); 29120 IS_ERR(s) ? "<error>" : s);
28954diff -urNp linux-2.6.32.12/fs/aio.c linux-2.6.32.12/fs/aio.c 29121diff -urNp linux-2.6.32.13/fs/aio.c linux-2.6.32.13/fs/aio.c
28955--- linux-2.6.32.12/fs/aio.c 2010-03-15 11:52:04.000000000 -0400 29122--- linux-2.6.32.13/fs/aio.c 2010-03-15 11:52:04.000000000 -0400
28956+++ linux-2.6.32.12/fs/aio.c 2010-04-04 20:46:41.637780128 -0400 29123+++ linux-2.6.32.13/fs/aio.c 2010-05-15 13:21:16.759050469 -0400
28957@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx 29124@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
28958 size += sizeof(struct io_event) * nr_events; 29125 size += sizeof(struct io_event) * nr_events;
28959 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; 29126 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -28963,9 +29130,9 @@ diff -urNp linux-2.6.32.12/fs/aio.c linux-2.6.32.12/fs/aio.c
28963 return -EINVAL; 29130 return -EINVAL;
28964 29131
28965 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); 29132 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
28966diff -urNp linux-2.6.32.12/fs/attr.c linux-2.6.32.12/fs/attr.c 29133diff -urNp linux-2.6.32.13/fs/attr.c linux-2.6.32.13/fs/attr.c
28967--- linux-2.6.32.12/fs/attr.c 2010-03-15 11:52:04.000000000 -0400 29134--- linux-2.6.32.13/fs/attr.c 2010-03-15 11:52:04.000000000 -0400
28968+++ linux-2.6.32.12/fs/attr.c 2010-04-04 20:46:41.637780128 -0400 29135+++ linux-2.6.32.13/fs/attr.c 2010-05-15 13:21:16.767048242 -0400
28969@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode 29136@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
28970 unsigned long limit; 29137 unsigned long limit;
28971 29138
@@ -28974,9 +29141,9 @@ diff -urNp linux-2.6.32.12/fs/attr.c linux-2.6.32.12/fs/attr.c
28974 if (limit != RLIM_INFINITY && offset > limit) 29141 if (limit != RLIM_INFINITY && offset > limit)
28975 goto out_sig; 29142 goto out_sig;
28976 if (offset > inode->i_sb->s_maxbytes) 29143 if (offset > inode->i_sb->s_maxbytes)
28977diff -urNp linux-2.6.32.12/fs/autofs/root.c linux-2.6.32.12/fs/autofs/root.c 29144diff -urNp linux-2.6.32.13/fs/autofs/root.c linux-2.6.32.13/fs/autofs/root.c
28978--- linux-2.6.32.12/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400 29145--- linux-2.6.32.13/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400
28979+++ linux-2.6.32.12/fs/autofs/root.c 2010-04-04 20:46:41.637780128 -0400 29146+++ linux-2.6.32.13/fs/autofs/root.c 2010-05-15 13:21:16.770726483 -0400
28980@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in 29147@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
28981 set_bit(n,sbi->symlink_bitmap); 29148 set_bit(n,sbi->symlink_bitmap);
28982 sl = &sbi->symlink[n]; 29149 sl = &sbi->symlink[n];
@@ -28987,9 +29154,9 @@ diff -urNp linux-2.6.32.12/fs/autofs/root.c linux-2.6.32.12/fs/autofs/root.c
28987 if (!sl->data) { 29154 if (!sl->data) {
28988 clear_bit(n,sbi->symlink_bitmap); 29155 clear_bit(n,sbi->symlink_bitmap);
28989 unlock_kernel(); 29156 unlock_kernel();
28990diff -urNp linux-2.6.32.12/fs/autofs4/symlink.c linux-2.6.32.12/fs/autofs4/symlink.c 29157diff -urNp linux-2.6.32.13/fs/autofs4/symlink.c linux-2.6.32.13/fs/autofs4/symlink.c
28991--- linux-2.6.32.12/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400 29158--- linux-2.6.32.13/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400
28992+++ linux-2.6.32.12/fs/autofs4/symlink.c 2010-04-04 20:46:41.637780128 -0400 29159+++ linux-2.6.32.13/fs/autofs4/symlink.c 2010-05-15 13:21:16.786757439 -0400
28993@@ -15,7 +15,7 @@ 29160@@ -15,7 +15,7 @@
28994 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) 29161 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
28995 { 29162 {
@@ -28999,9 +29166,9 @@ diff -urNp linux-2.6.32.12/fs/autofs4/symlink.c linux-2.6.32.12/fs/autofs4/symli
28999 return NULL; 29166 return NULL;
29000 } 29167 }
29001 29168
29002diff -urNp linux-2.6.32.12/fs/befs/linuxvfs.c linux-2.6.32.12/fs/befs/linuxvfs.c 29169diff -urNp linux-2.6.32.13/fs/befs/linuxvfs.c linux-2.6.32.13/fs/befs/linuxvfs.c
29003--- linux-2.6.32.12/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400 29170--- linux-2.6.32.13/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400
29004+++ linux-2.6.32.12/fs/befs/linuxvfs.c 2010-04-04 20:46:41.637780128 -0400 29171+++ linux-2.6.32.13/fs/befs/linuxvfs.c 2010-05-15 13:21:16.795284033 -0400
29005@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry 29172@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
29006 { 29173 {
29007 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); 29174 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -29011,9 +29178,9 @@ diff -urNp linux-2.6.32.12/fs/befs/linuxvfs.c linux-2.6.32.12/fs/befs/linuxvfs.c
29011 if (!IS_ERR(link)) 29178 if (!IS_ERR(link))
29012 kfree(link); 29179 kfree(link);
29013 } 29180 }
29014diff -urNp linux-2.6.32.12/fs/binfmt_aout.c linux-2.6.32.12/fs/binfmt_aout.c 29181diff -urNp linux-2.6.32.13/fs/binfmt_aout.c linux-2.6.32.13/fs/binfmt_aout.c
29015--- linux-2.6.32.12/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400 29182--- linux-2.6.32.13/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400
29016+++ linux-2.6.32.12/fs/binfmt_aout.c 2010-04-04 20:46:41.637780128 -0400 29183+++ linux-2.6.32.13/fs/binfmt_aout.c 2010-05-15 13:21:16.799043518 -0400
29017@@ -16,6 +16,7 @@ 29184@@ -16,6 +16,7 @@
29018 #include <linux/string.h> 29185 #include <linux/string.h>
29019 #include <linux/fs.h> 29186 #include <linux/fs.h>
@@ -29081,9 +29248,9 @@ diff -urNp linux-2.6.32.12/fs/binfmt_aout.c linux-2.6.32.12/fs/binfmt_aout.c
29081 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, 29248 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
29082 fd_offset + ex.a_text); 29249 fd_offset + ex.a_text);
29083 up_write(&current->mm->mmap_sem); 29250 up_write(&current->mm->mmap_sem);
29084diff -urNp linux-2.6.32.12/fs/binfmt_elf.c linux-2.6.32.12/fs/binfmt_elf.c 29251diff -urNp linux-2.6.32.13/fs/binfmt_elf.c linux-2.6.32.13/fs/binfmt_elf.c
29085--- linux-2.6.32.12/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 29252--- linux-2.6.32.13/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400
29086+++ linux-2.6.32.12/fs/binfmt_elf.c 2010-04-04 20:47:28.956670452 -0400 29253+++ linux-2.6.32.13/fs/binfmt_elf.c 2010-05-15 13:21:16.818718975 -0400
29087@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str 29254@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
29088 #define elf_core_dump NULL 29255 #define elf_core_dump NULL
29089 #endif 29256 #endif
@@ -29719,9 +29886,9 @@ diff -urNp linux-2.6.32.12/fs/binfmt_elf.c linux-2.6.32.12/fs/binfmt_elf.c
29719 static int __init init_elf_binfmt(void) 29886 static int __init init_elf_binfmt(void)
29720 { 29887 {
29721 return register_binfmt(&elf_format); 29888 return register_binfmt(&elf_format);
29722diff -urNp linux-2.6.32.12/fs/binfmt_flat.c linux-2.6.32.12/fs/binfmt_flat.c 29889diff -urNp linux-2.6.32.13/fs/binfmt_flat.c linux-2.6.32.13/fs/binfmt_flat.c
29723--- linux-2.6.32.12/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400 29890--- linux-2.6.32.13/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400
29724+++ linux-2.6.32.12/fs/binfmt_flat.c 2010-04-04 20:46:41.641560293 -0400 29891+++ linux-2.6.32.13/fs/binfmt_flat.c 2010-05-15 13:21:16.818718975 -0400
29725@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b 29892@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
29726 realdatastart = (unsigned long) -ENOMEM; 29893 realdatastart = (unsigned long) -ENOMEM;
29727 printk("Unable to allocate RAM for process data, errno %d\n", 29894 printk("Unable to allocate RAM for process data, errno %d\n",
@@ -29754,9 +29921,9 @@ diff -urNp linux-2.6.32.12/fs/binfmt_flat.c linux-2.6.32.12/fs/binfmt_flat.c
29754 ret = result; 29921 ret = result;
29755 goto err; 29922 goto err;
29756 } 29923 }
29757diff -urNp linux-2.6.32.12/fs/binfmt_misc.c linux-2.6.32.12/fs/binfmt_misc.c 29924diff -urNp linux-2.6.32.13/fs/binfmt_misc.c linux-2.6.32.13/fs/binfmt_misc.c
29758--- linux-2.6.32.12/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400 29925--- linux-2.6.32.13/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400
29759+++ linux-2.6.32.12/fs/binfmt_misc.c 2010-04-04 20:46:41.641560293 -0400 29926+++ linux-2.6.32.13/fs/binfmt_misc.c 2010-05-15 13:21:16.827094561 -0400
29760@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl 29927@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
29761 static struct tree_descr bm_files[] = { 29928 static struct tree_descr bm_files[] = {
29762 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, 29929 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -29766,9 +29933,9 @@ diff -urNp linux-2.6.32.12/fs/binfmt_misc.c linux-2.6.32.12/fs/binfmt_misc.c
29766 }; 29933 };
29767 int err = simple_fill_super(sb, 0x42494e4d, bm_files); 29934 int err = simple_fill_super(sb, 0x42494e4d, bm_files);
29768 if (!err) 29935 if (!err)
29769diff -urNp linux-2.6.32.12/fs/bio.c linux-2.6.32.12/fs/bio.c 29936diff -urNp linux-2.6.32.13/fs/bio.c linux-2.6.32.13/fs/bio.c
29770--- linux-2.6.32.12/fs/bio.c 2010-03-15 11:52:04.000000000 -0400 29937--- linux-2.6.32.13/fs/bio.c 2010-03-15 11:52:04.000000000 -0400
29771+++ linux-2.6.32.12/fs/bio.c 2010-04-04 20:46:41.641560293 -0400 29938+++ linux-2.6.32.13/fs/bio.c 2010-05-15 13:21:16.827094561 -0400
29772@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr 29939@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
29773 29940
29774 i = 0; 29941 i = 0;
@@ -29787,9 +29954,9 @@ diff -urNp linux-2.6.32.12/fs/bio.c linux-2.6.32.12/fs/bio.c
29787 29954
29788 __bio_for_each_segment(bvec, bio, i, 0) { 29955 __bio_for_each_segment(bvec, bio, i, 0) {
29789 char *addr = page_address(bvec->bv_page); 29956 char *addr = page_address(bvec->bv_page);
29790diff -urNp linux-2.6.32.12/fs/block_dev.c linux-2.6.32.12/fs/block_dev.c 29957diff -urNp linux-2.6.32.13/fs/block_dev.c linux-2.6.32.13/fs/block_dev.c
29791--- linux-2.6.32.12/fs/block_dev.c 2010-04-29 17:49:38.421500081 -0400 29958--- linux-2.6.32.13/fs/block_dev.c 2010-04-29 17:49:38.421500081 -0400
29792+++ linux-2.6.32.12/fs/block_dev.c 2010-04-29 17:49:58.449523678 -0400 29959+++ linux-2.6.32.13/fs/block_dev.c 2010-05-15 13:21:16.839060742 -0400
29793@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, 29960@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev,
29794 else if (bdev->bd_contains == bdev) 29961 else if (bdev->bd_contains == bdev)
29795 res = 0; /* is a whole device which isn't held */ 29962 res = 0; /* is a whole device which isn't held */
@@ -29799,9 +29966,9 @@ diff -urNp linux-2.6.32.12/fs/block_dev.c linux-2.6.32.12/fs/block_dev.c
29799 res = 0; /* is a partition of a device that is being partitioned */ 29966 res = 0; /* is a partition of a device that is being partitioned */
29800 else if (bdev->bd_contains->bd_holder != NULL) 29967 else if (bdev->bd_contains->bd_holder != NULL)
29801 res = -EBUSY; /* is a partition of a held device */ 29968 res = -EBUSY; /* is a partition of a held device */
29802diff -urNp linux-2.6.32.12/fs/btrfs/ctree.c linux-2.6.32.12/fs/btrfs/ctree.c 29969diff -urNp linux-2.6.32.13/fs/btrfs/ctree.c linux-2.6.32.13/fs/btrfs/ctree.c
29803--- linux-2.6.32.12/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400 29970--- linux-2.6.32.13/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400
29804+++ linux-2.6.32.12/fs/btrfs/ctree.c 2010-04-04 20:46:41.641560293 -0400 29971+++ linux-2.6.32.13/fs/btrfs/ctree.c 2010-05-15 13:21:16.884750763 -0400
29805@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran 29972@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran
29806 29973
29807 ret = 0; 29974 ret = 0;
@@ -29810,9 +29977,9 @@ diff -urNp linux-2.6.32.12/fs/btrfs/ctree.c linux-2.6.32.12/fs/btrfs/ctree.c
29810 btrfs_cpu_key_to_disk(&disk_key, cpu_key); 29977 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
29811 ret = fixup_low_keys(trans, root, path, &disk_key, 1); 29978 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
29812 } 29979 }
29813diff -urNp linux-2.6.32.12/fs/btrfs/disk-io.c linux-2.6.32.12/fs/btrfs/disk-io.c 29980diff -urNp linux-2.6.32.13/fs/btrfs/disk-io.c linux-2.6.32.13/fs/btrfs/disk-io.c
29814--- linux-2.6.32.12/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400 29981--- linux-2.6.32.13/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400
29815+++ linux-2.6.32.12/fs/btrfs/disk-io.c 2010-04-04 20:46:41.641560293 -0400 29982+++ linux-2.6.32.13/fs/btrfs/disk-io.c 2010-05-15 13:21:16.884750763 -0400
29816@@ -39,7 +39,7 @@ 29983@@ -39,7 +39,7 @@
29817 #include "tree-log.h" 29984 #include "tree-log.h"
29818 #include "free-space-cache.h" 29985 #include "free-space-cache.h"
@@ -29831,9 +29998,9 @@ diff -urNp linux-2.6.32.12/fs/btrfs/disk-io.c linux-2.6.32.12/fs/btrfs/disk-io.c
29831 .write_cache_pages_lock_hook = btree_lock_page_hook, 29998 .write_cache_pages_lock_hook = btree_lock_page_hook,
29832 .readpage_end_io_hook = btree_readpage_end_io_hook, 29999 .readpage_end_io_hook = btree_readpage_end_io_hook,
29833 .submit_bio_hook = btree_submit_bio_hook, 30000 .submit_bio_hook = btree_submit_bio_hook,
29834diff -urNp linux-2.6.32.12/fs/btrfs/extent_io.h linux-2.6.32.12/fs/btrfs/extent_io.h 30001diff -urNp linux-2.6.32.13/fs/btrfs/extent_io.h linux-2.6.32.13/fs/btrfs/extent_io.h
29835--- linux-2.6.32.12/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400 30002--- linux-2.6.32.13/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400
29836+++ linux-2.6.32.12/fs/btrfs/extent_io.h 2010-04-04 20:46:41.641560293 -0400 30003+++ linux-2.6.32.13/fs/btrfs/extent_io.h 2010-05-15 13:21:16.911563863 -0400
29837@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s 30004@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
29838 struct bio *bio, int mirror_num, 30005 struct bio *bio, int mirror_num,
29839 unsigned long bio_flags); 30006 unsigned long bio_flags);
@@ -29894,9 +30061,9 @@ diff -urNp linux-2.6.32.12/fs/btrfs/extent_io.h linux-2.6.32.12/fs/btrfs/extent_
29894 }; 30061 };
29895 30062
29896 struct extent_state { 30063 struct extent_state {
29897diff -urNp linux-2.6.32.12/fs/btrfs/free-space-cache.c linux-2.6.32.12/fs/btrfs/free-space-cache.c 30064diff -urNp linux-2.6.32.13/fs/btrfs/free-space-cache.c linux-2.6.32.13/fs/btrfs/free-space-cache.c
29898--- linux-2.6.32.12/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400 30065--- linux-2.6.32.13/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400
29899+++ linux-2.6.32.12/fs/btrfs/free-space-cache.c 2010-04-04 20:46:41.641560293 -0400 30066+++ linux-2.6.32.13/fs/btrfs/free-space-cache.c 2010-05-15 13:21:16.918599051 -0400
29900@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf 30067@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
29901 30068
29902 while(1) { 30069 while(1) {
@@ -29915,9 +30082,9 @@ diff -urNp linux-2.6.32.12/fs/btrfs/free-space-cache.c linux-2.6.32.12/fs/btrfs/
29915 30082
29916 if (entry->bitmap && entry->bytes > bytes + empty_size) { 30083 if (entry->bitmap && entry->bytes > bytes + empty_size) {
29917 ret = btrfs_bitmap_cluster(block_group, entry, cluster, 30084 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
29918diff -urNp linux-2.6.32.12/fs/btrfs/inode.c linux-2.6.32.12/fs/btrfs/inode.c 30085diff -urNp linux-2.6.32.13/fs/btrfs/inode.c linux-2.6.32.13/fs/btrfs/inode.c
29919--- linux-2.6.32.12/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400 30086--- linux-2.6.32.13/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400
29920+++ linux-2.6.32.12/fs/btrfs/inode.c 2010-04-04 20:46:41.641560293 -0400 30087+++ linux-2.6.32.13/fs/btrfs/inode.c 2010-05-15 13:21:16.951236359 -0400
29921@@ -63,7 +63,7 @@ static const struct inode_operations btr 30088@@ -63,7 +63,7 @@ static const struct inode_operations btr
29922 static const struct address_space_operations btrfs_aops; 30089 static const struct address_space_operations btrfs_aops;
29923 static const struct address_space_operations btrfs_symlink_aops; 30090 static const struct address_space_operations btrfs_symlink_aops;
@@ -29936,9 +30103,9 @@ diff -urNp linux-2.6.32.12/fs/btrfs/inode.c linux-2.6.32.12/fs/btrfs/inode.c
29936 .fill_delalloc = run_delalloc_range, 30103 .fill_delalloc = run_delalloc_range,
29937 .submit_bio_hook = btrfs_submit_bio_hook, 30104 .submit_bio_hook = btrfs_submit_bio_hook,
29938 .merge_bio_hook = btrfs_merge_bio_hook, 30105 .merge_bio_hook = btrfs_merge_bio_hook,
29939diff -urNp linux-2.6.32.12/fs/btrfs/sysfs.c linux-2.6.32.12/fs/btrfs/sysfs.c 30106diff -urNp linux-2.6.32.13/fs/btrfs/sysfs.c linux-2.6.32.13/fs/btrfs/sysfs.c
29940--- linux-2.6.32.12/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400 30107--- linux-2.6.32.13/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400
29941+++ linux-2.6.32.12/fs/btrfs/sysfs.c 2010-04-04 20:46:41.641560293 -0400 30108+++ linux-2.6.32.13/fs/btrfs/sysfs.c 2010-05-15 13:21:16.956074066 -0400
29942@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko 30109@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
29943 complete(&root->kobj_unregister); 30110 complete(&root->kobj_unregister);
29944 } 30111 }
@@ -29954,9 +30121,9 @@ diff -urNp linux-2.6.32.12/fs/btrfs/sysfs.c linux-2.6.32.12/fs/btrfs/sysfs.c
29954 .show = btrfs_root_attr_show, 30121 .show = btrfs_root_attr_show,
29955 .store = btrfs_root_attr_store, 30122 .store = btrfs_root_attr_store,
29956 }; 30123 };
29957diff -urNp linux-2.6.32.12/fs/buffer.c linux-2.6.32.12/fs/buffer.c 30124diff -urNp linux-2.6.32.13/fs/buffer.c linux-2.6.32.13/fs/buffer.c
29958--- linux-2.6.32.12/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400 30125--- linux-2.6.32.13/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400
29959+++ linux-2.6.32.12/fs/buffer.c 2010-04-04 20:46:41.641560293 -0400 30126+++ linux-2.6.32.13/fs/buffer.c 2010-05-15 13:21:16.978563593 -0400
29960@@ -25,6 +25,7 @@ 30127@@ -25,6 +25,7 @@
29961 #include <linux/percpu.h> 30128 #include <linux/percpu.h>
29962 #include <linux/slab.h> 30129 #include <linux/slab.h>
@@ -29965,9 +30132,9 @@ diff -urNp linux-2.6.32.12/fs/buffer.c linux-2.6.32.12/fs/buffer.c
29965 #include <linux/blkdev.h> 30132 #include <linux/blkdev.h>
29966 #include <linux/file.h> 30133 #include <linux/file.h>
29967 #include <linux/quotaops.h> 30134 #include <linux/quotaops.h>
29968diff -urNp linux-2.6.32.12/fs/cachefiles/bind.c linux-2.6.32.12/fs/cachefiles/bind.c 30135diff -urNp linux-2.6.32.13/fs/cachefiles/bind.c linux-2.6.32.13/fs/cachefiles/bind.c
29969--- linux-2.6.32.12/fs/cachefiles/bind.c 2010-03-15 11:52:04.000000000 -0400 30136--- linux-2.6.32.13/fs/cachefiles/bind.c 2010-03-15 11:52:04.000000000 -0400
29970+++ linux-2.6.32.12/fs/cachefiles/bind.c 2010-04-29 17:46:37.245246835 -0400 30137+++ linux-2.6.32.13/fs/cachefiles/bind.c 2010-05-15 13:21:16.978563593 -0400
29971@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef 30138@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
29972 args); 30139 args);
29973 30140
@@ -29984,9 +30151,9 @@ diff -urNp linux-2.6.32.12/fs/cachefiles/bind.c linux-2.6.32.12/fs/cachefiles/bi
29984 cache->bcull_percent < cache->brun_percent && 30151 cache->bcull_percent < cache->brun_percent &&
29985 cache->brun_percent < 100); 30152 cache->brun_percent < 100);
29986 30153
29987diff -urNp linux-2.6.32.12/fs/cachefiles/daemon.c linux-2.6.32.12/fs/cachefiles/daemon.c 30154diff -urNp linux-2.6.32.13/fs/cachefiles/daemon.c linux-2.6.32.13/fs/cachefiles/daemon.c
29988--- linux-2.6.32.12/fs/cachefiles/daemon.c 2010-03-15 11:52:04.000000000 -0400 30155--- linux-2.6.32.13/fs/cachefiles/daemon.c 2010-03-15 11:52:04.000000000 -0400
29989+++ linux-2.6.32.12/fs/cachefiles/daemon.c 2010-04-29 17:46:37.253252101 -0400 30156+++ linux-2.6.32.13/fs/cachefiles/daemon.c 2010-05-15 13:21:16.995071409 -0400
29990@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s 30157@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
29991 if (test_bit(CACHEFILES_DEAD, &cache->flags)) 30158 if (test_bit(CACHEFILES_DEAD, &cache->flags))
29992 return -EIO; 30159 return -EIO;
@@ -30014,9 +30181,9 @@ diff -urNp linux-2.6.32.12/fs/cachefiles/daemon.c linux-2.6.32.12/fs/cachefiles/
30014 return cachefiles_daemon_range_error(cache, args); 30181 return cachefiles_daemon_range_error(cache, args);
30015 30182
30016 cache->bstop_percent = bstop; 30183 cache->bstop_percent = bstop;
30017diff -urNp linux-2.6.32.12/fs/cachefiles/rdwr.c linux-2.6.32.12/fs/cachefiles/rdwr.c 30184diff -urNp linux-2.6.32.13/fs/cachefiles/rdwr.c linux-2.6.32.13/fs/cachefiles/rdwr.c
30018--- linux-2.6.32.12/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400 30185--- linux-2.6.32.13/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400
30019+++ linux-2.6.32.12/fs/cachefiles/rdwr.c 2010-04-04 20:46:41.641560293 -0400 30186+++ linux-2.6.32.13/fs/cachefiles/rdwr.c 2010-05-15 13:21:16.995071409 -0400
30020@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache 30187@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
30021 old_fs = get_fs(); 30188 old_fs = get_fs();
30022 set_fs(KERNEL_DS); 30189 set_fs(KERNEL_DS);
@@ -30026,9 +30193,9 @@ diff -urNp linux-2.6.32.12/fs/cachefiles/rdwr.c linux-2.6.32.12/fs/cachefiles/rd
30026 set_fs(old_fs); 30193 set_fs(old_fs);
30027 kunmap(page); 30194 kunmap(page);
30028 if (ret != len) 30195 if (ret != len)
30029diff -urNp linux-2.6.32.12/fs/cifs/cifs_uniupr.h linux-2.6.32.12/fs/cifs/cifs_uniupr.h 30196diff -urNp linux-2.6.32.13/fs/cifs/cifs_uniupr.h linux-2.6.32.13/fs/cifs/cifs_uniupr.h
30030--- linux-2.6.32.12/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400 30197--- linux-2.6.32.13/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400
30031+++ linux-2.6.32.12/fs/cifs/cifs_uniupr.h 2010-04-04 20:46:41.645781188 -0400 30198+++ linux-2.6.32.13/fs/cifs/cifs_uniupr.h 2010-05-15 13:21:16.995071409 -0400
30032@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa 30199@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
30033 {0x0490, 0x04cc, UniCaseRangeU0490}, 30200 {0x0490, 0x04cc, UniCaseRangeU0490},
30034 {0x1e00, 0x1ffc, UniCaseRangeU1e00}, 30201 {0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -30038,9 +30205,9 @@ diff -urNp linux-2.6.32.12/fs/cifs/cifs_uniupr.h linux-2.6.32.12/fs/cifs/cifs_un
30038 }; 30205 };
30039 #endif 30206 #endif
30040 30207
30041diff -urNp linux-2.6.32.12/fs/cifs/link.c linux-2.6.32.12/fs/cifs/link.c 30208diff -urNp linux-2.6.32.13/fs/cifs/link.c linux-2.6.32.13/fs/cifs/link.c
30042--- linux-2.6.32.12/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400 30209--- linux-2.6.32.13/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400
30043+++ linux-2.6.32.12/fs/cifs/link.c 2010-04-04 20:46:41.645781188 -0400 30210+++ linux-2.6.32.13/fs/cifs/link.c 2010-05-15 13:21:16.995071409 -0400
30044@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct 30211@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
30045 30212
30046 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) 30213 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -30050,9 +30217,9 @@ diff -urNp linux-2.6.32.12/fs/cifs/link.c linux-2.6.32.12/fs/cifs/link.c
30050 if (!IS_ERR(p)) 30217 if (!IS_ERR(p))
30051 kfree(p); 30218 kfree(p);
30052 } 30219 }
30053diff -urNp linux-2.6.32.12/fs/compat_binfmt_elf.c linux-2.6.32.12/fs/compat_binfmt_elf.c 30220diff -urNp linux-2.6.32.13/fs/compat_binfmt_elf.c linux-2.6.32.13/fs/compat_binfmt_elf.c
30054--- linux-2.6.32.12/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 30221--- linux-2.6.32.13/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400
30055+++ linux-2.6.32.12/fs/compat_binfmt_elf.c 2010-04-04 20:46:41.645781188 -0400 30222+++ linux-2.6.32.13/fs/compat_binfmt_elf.c 2010-05-15 13:21:16.995071409 -0400
30056@@ -29,10 +29,12 @@ 30223@@ -29,10 +29,12 @@
30057 #undef elfhdr 30224 #undef elfhdr
30058 #undef elf_phdr 30225 #undef elf_phdr
@@ -30066,9 +30233,9 @@ diff -urNp linux-2.6.32.12/fs/compat_binfmt_elf.c linux-2.6.32.12/fs/compat_binf
30066 #define elf_addr_t Elf32_Addr 30233 #define elf_addr_t Elf32_Addr
30067 30234
30068 /* 30235 /*
30069diff -urNp linux-2.6.32.12/fs/compat.c linux-2.6.32.12/fs/compat.c 30236diff -urNp linux-2.6.32.13/fs/compat.c linux-2.6.32.13/fs/compat.c
30070--- linux-2.6.32.12/fs/compat.c 2010-03-15 11:52:04.000000000 -0400 30237--- linux-2.6.32.13/fs/compat.c 2010-03-15 11:52:04.000000000 -0400
30071+++ linux-2.6.32.12/fs/compat.c 2010-04-04 20:46:41.645781188 -0400 30238+++ linux-2.6.32.13/fs/compat.c 2010-05-15 13:21:17.027084488 -0400
30072@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, 30239@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc,
30073 if (!kmapped_page || kpos != (pos & PAGE_MASK)) { 30240 if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
30074 struct page *page; 30241 struct page *page;
@@ -30168,9 +30335,9 @@ diff -urNp linux-2.6.32.12/fs/compat.c linux-2.6.32.12/fs/compat.c
30168 out: 30335 out:
30169 if (bprm->mm) 30336 if (bprm->mm)
30170 mmput(bprm->mm); 30337 mmput(bprm->mm);
30171diff -urNp linux-2.6.32.12/fs/compat_ioctl.c linux-2.6.32.12/fs/compat_ioctl.c 30338diff -urNp linux-2.6.32.13/fs/compat_ioctl.c linux-2.6.32.13/fs/compat_ioctl.c
30172--- linux-2.6.32.12/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400 30339--- linux-2.6.32.13/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400
30173+++ linux-2.6.32.12/fs/compat_ioctl.c 2010-04-04 20:46:41.645781188 -0400 30340+++ linux-2.6.32.13/fs/compat_ioctl.c 2010-05-15 13:21:17.050796208 -0400
30174@@ -1827,15 +1827,15 @@ struct ioctl_trans { 30341@@ -1827,15 +1827,15 @@ struct ioctl_trans {
30175 }; 30342 };
30176 30343
@@ -30190,9 +30357,9 @@ diff -urNp linux-2.6.32.12/fs/compat_ioctl.c linux-2.6.32.12/fs/compat_ioctl.c
30190 30357
30191 /* ioctl should not be warned about even if it's not implemented. 30358 /* ioctl should not be warned about even if it's not implemented.
30192 Valid reasons to use this: 30359 Valid reasons to use this:
30193diff -urNp linux-2.6.32.12/fs/debugfs/inode.c linux-2.6.32.12/fs/debugfs/inode.c 30360diff -urNp linux-2.6.32.13/fs/debugfs/inode.c linux-2.6.32.13/fs/debugfs/inode.c
30194--- linux-2.6.32.12/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400 30361--- linux-2.6.32.13/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400
30195+++ linux-2.6.32.12/fs/debugfs/inode.c 2010-04-04 20:46:41.645781188 -0400 30362+++ linux-2.6.32.13/fs/debugfs/inode.c 2010-05-15 13:21:17.062663383 -0400
30196@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc 30363@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
30197 30364
30198 static int debug_fill_super(struct super_block *sb, void *data, int silent) 30365 static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -30202,9 +30369,9 @@ diff -urNp linux-2.6.32.12/fs/debugfs/inode.c linux-2.6.32.12/fs/debugfs/inode.c
30202 30369
30203 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); 30370 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
30204 } 30371 }
30205diff -urNp linux-2.6.32.12/fs/dlm/lockspace.c linux-2.6.32.12/fs/dlm/lockspace.c 30372diff -urNp linux-2.6.32.13/fs/dlm/lockspace.c linux-2.6.32.13/fs/dlm/lockspace.c
30206--- linux-2.6.32.12/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400 30373--- linux-2.6.32.13/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400
30207+++ linux-2.6.32.12/fs/dlm/lockspace.c 2010-04-04 20:46:41.645781188 -0400 30374+++ linux-2.6.32.13/fs/dlm/lockspace.c 2010-05-15 13:21:17.082686362 -0400
30208@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc 30375@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
30209 kfree(ls); 30376 kfree(ls);
30210 } 30377 }
@@ -30214,9 +30381,9 @@ diff -urNp linux-2.6.32.12/fs/dlm/lockspace.c linux-2.6.32.12/fs/dlm/lockspace.c
30214 .show = dlm_attr_show, 30381 .show = dlm_attr_show,
30215 .store = dlm_attr_store, 30382 .store = dlm_attr_store,
30216 }; 30383 };
30217diff -urNp linux-2.6.32.12/fs/ecryptfs/inode.c linux-2.6.32.12/fs/ecryptfs/inode.c 30384diff -urNp linux-2.6.32.13/fs/ecryptfs/inode.c linux-2.6.32.13/fs/ecryptfs/inode.c
30218--- linux-2.6.32.12/fs/ecryptfs/inode.c 2010-04-29 17:49:38.429034237 -0400 30385--- linux-2.6.32.13/fs/ecryptfs/inode.c 2010-04-29 17:49:38.429034237 -0400
30219+++ linux-2.6.32.12/fs/ecryptfs/inode.c 2010-04-29 17:49:58.465067636 -0400 30386+++ linux-2.6.32.13/fs/ecryptfs/inode.c 2010-05-15 13:21:17.090658956 -0400
30220@@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc 30387@@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc
30221 old_fs = get_fs(); 30388 old_fs = get_fs();
30222 set_fs(get_ds()); 30389 set_fs(get_ds());
@@ -30235,9 +30402,9 @@ diff -urNp linux-2.6.32.12/fs/ecryptfs/inode.c linux-2.6.32.12/fs/ecryptfs/inode
30235 set_fs(old_fs); 30402 set_fs(old_fs);
30236 if (rc < 0) 30403 if (rc < 0)
30237 goto out_free; 30404 goto out_free;
30238diff -urNp linux-2.6.32.12/fs/exec.c linux-2.6.32.12/fs/exec.c 30405diff -urNp linux-2.6.32.13/fs/exec.c linux-2.6.32.13/fs/exec.c
30239--- linux-2.6.32.12/fs/exec.c 2010-04-04 20:41:50.037938751 -0400 30406--- linux-2.6.32.13/fs/exec.c 2010-04-04 20:41:50.037938751 -0400
30240+++ linux-2.6.32.12/fs/exec.c 2010-04-04 20:46:41.645781188 -0400 30407+++ linux-2.6.32.13/fs/exec.c 2010-05-15 13:21:17.114657511 -0400
30241@@ -56,12 +56,24 @@ 30408@@ -56,12 +56,24 @@
30242 #include <linux/fsnotify.h> 30409 #include <linux/fsnotify.h>
30243 #include <linux/fs_struct.h> 30410 #include <linux/fs_struct.h>
@@ -30716,9 +30883,9 @@ diff -urNp linux-2.6.32.12/fs/exec.c linux-2.6.32.12/fs/exec.c
30716 /* 30883 /*
30717 * lock_kernel() because format_corename() is controlled by sysctl, which 30884 * lock_kernel() because format_corename() is controlled by sysctl, which
30718 * uses lock_kernel() 30885 * uses lock_kernel()
30719diff -urNp linux-2.6.32.12/fs/ext2/balloc.c linux-2.6.32.12/fs/ext2/balloc.c 30886diff -urNp linux-2.6.32.13/fs/ext2/balloc.c linux-2.6.32.13/fs/ext2/balloc.c
30720--- linux-2.6.32.12/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400 30887--- linux-2.6.32.13/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400
30721+++ linux-2.6.32.12/fs/ext2/balloc.c 2010-04-04 20:46:41.645781188 -0400 30888+++ linux-2.6.32.13/fs/ext2/balloc.c 2010-05-15 13:21:17.118672646 -0400
30722@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e 30889@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
30723 30890
30724 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 30891 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -30728,9 +30895,9 @@ diff -urNp linux-2.6.32.12/fs/ext2/balloc.c linux-2.6.32.12/fs/ext2/balloc.c
30728 sbi->s_resuid != current_fsuid() && 30895 sbi->s_resuid != current_fsuid() &&
30729 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 30896 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
30730 return 0; 30897 return 0;
30731diff -urNp linux-2.6.32.12/fs/ext2/xattr.c linux-2.6.32.12/fs/ext2/xattr.c 30898diff -urNp linux-2.6.32.13/fs/ext2/xattr.c linux-2.6.32.13/fs/ext2/xattr.c
30732--- linux-2.6.32.12/fs/ext2/xattr.c 2010-03-15 11:52:04.000000000 -0400 30899--- linux-2.6.32.13/fs/ext2/xattr.c 2010-03-15 11:52:04.000000000 -0400
30733+++ linux-2.6.32.12/fs/ext2/xattr.c 2010-04-29 17:46:37.253252101 -0400 30900+++ linux-2.6.32.13/fs/ext2/xattr.c 2010-05-15 13:21:17.122783817 -0400
30734@@ -85,8 +85,8 @@ 30901@@ -85,8 +85,8 @@
30735 printk("\n"); \ 30902 printk("\n"); \
30736 } while (0) 30903 } while (0)
@@ -30742,9 +30909,9 @@ diff -urNp linux-2.6.32.12/fs/ext2/xattr.c linux-2.6.32.12/fs/ext2/xattr.c
30742 #endif 30909 #endif
30743 30910
30744 static int ext2_xattr_set2(struct inode *, struct buffer_head *, 30911 static int ext2_xattr_set2(struct inode *, struct buffer_head *,
30745diff -urNp linux-2.6.32.12/fs/ext3/balloc.c linux-2.6.32.12/fs/ext3/balloc.c 30912diff -urNp linux-2.6.32.13/fs/ext3/balloc.c linux-2.6.32.13/fs/ext3/balloc.c
30746--- linux-2.6.32.12/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400 30913--- linux-2.6.32.13/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400
30747+++ linux-2.6.32.12/fs/ext3/balloc.c 2010-04-04 20:46:41.645781188 -0400 30914+++ linux-2.6.32.13/fs/ext3/balloc.c 2010-05-15 13:21:17.135016428 -0400
30748@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e 30915@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
30749 30916
30750 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 30917 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -30754,9 +30921,9 @@ diff -urNp linux-2.6.32.12/fs/ext3/balloc.c linux-2.6.32.12/fs/ext3/balloc.c
30754 sbi->s_resuid != current_fsuid() && 30921 sbi->s_resuid != current_fsuid() &&
30755 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 30922 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
30756 return 0; 30923 return 0;
30757diff -urNp linux-2.6.32.12/fs/ext3/namei.c linux-2.6.32.12/fs/ext3/namei.c 30924diff -urNp linux-2.6.32.13/fs/ext3/namei.c linux-2.6.32.13/fs/ext3/namei.c
30758--- linux-2.6.32.12/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400 30925--- linux-2.6.32.13/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400
30759+++ linux-2.6.32.12/fs/ext3/namei.c 2010-04-04 20:46:41.649500937 -0400 30926+++ linux-2.6.32.13/fs/ext3/namei.c 2010-05-15 13:21:17.155157464 -0400
30760@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split 30927@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
30761 char *data1 = (*bh)->b_data, *data2; 30928 char *data1 = (*bh)->b_data, *data2;
30762 unsigned split, move, size; 30929 unsigned split, move, size;
@@ -30766,9 +30933,9 @@ diff -urNp linux-2.6.32.12/fs/ext3/namei.c linux-2.6.32.12/fs/ext3/namei.c
30766 30933
30767 bh2 = ext3_append (handle, dir, &newblock, &err); 30934 bh2 = ext3_append (handle, dir, &newblock, &err);
30768 if (!(bh2)) { 30935 if (!(bh2)) {
30769diff -urNp linux-2.6.32.12/fs/ext3/xattr.c linux-2.6.32.12/fs/ext3/xattr.c 30936diff -urNp linux-2.6.32.13/fs/ext3/xattr.c linux-2.6.32.13/fs/ext3/xattr.c
30770--- linux-2.6.32.12/fs/ext3/xattr.c 2010-04-29 17:49:38.429034237 -0400 30937--- linux-2.6.32.13/fs/ext3/xattr.c 2010-04-29 17:49:38.429034237 -0400
30771+++ linux-2.6.32.12/fs/ext3/xattr.c 2010-04-29 17:49:58.485032679 -0400 30938+++ linux-2.6.32.13/fs/ext3/xattr.c 2010-05-15 13:21:17.158583972 -0400
30772@@ -89,8 +89,8 @@ 30939@@ -89,8 +89,8 @@
30773 printk("\n"); \ 30940 printk("\n"); \
30774 } while (0) 30941 } while (0)
@@ -30780,9 +30947,9 @@ diff -urNp linux-2.6.32.12/fs/ext3/xattr.c linux-2.6.32.12/fs/ext3/xattr.c
30780 #endif 30947 #endif
30781 30948
30782 static void ext3_xattr_cache_insert(struct buffer_head *); 30949 static void ext3_xattr_cache_insert(struct buffer_head *);
30783diff -urNp linux-2.6.32.12/fs/ext4/balloc.c linux-2.6.32.12/fs/ext4/balloc.c 30950diff -urNp linux-2.6.32.13/fs/ext4/balloc.c linux-2.6.32.13/fs/ext4/balloc.c
30784--- linux-2.6.32.12/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400 30951--- linux-2.6.32.13/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400
30785+++ linux-2.6.32.12/fs/ext4/balloc.c 2010-04-04 20:46:41.649500937 -0400 30952+++ linux-2.6.32.13/fs/ext4/balloc.c 2010-05-15 13:21:17.158583972 -0400
30786@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ 30953@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_
30787 /* Hm, nope. Are (enough) root reserved blocks available? */ 30954 /* Hm, nope. Are (enough) root reserved blocks available? */
30788 if (sbi->s_resuid == current_fsuid() || 30955 if (sbi->s_resuid == current_fsuid() ||
@@ -30792,9 +30959,9 @@ diff -urNp linux-2.6.32.12/fs/ext4/balloc.c linux-2.6.32.12/fs/ext4/balloc.c
30792 if (free_blocks >= (nblocks + dirty_blocks)) 30959 if (free_blocks >= (nblocks + dirty_blocks))
30793 return 1; 30960 return 1;
30794 } 30961 }
30795diff -urNp linux-2.6.32.12/fs/ext4/ioctl.c linux-2.6.32.12/fs/ext4/ioctl.c 30962diff -urNp linux-2.6.32.13/fs/ext4/ioctl.c linux-2.6.32.13/fs/ext4/ioctl.c
30796--- linux-2.6.32.12/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400 30963--- linux-2.6.32.13/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400
30797+++ linux-2.6.32.12/fs/ext4/ioctl.c 2010-04-04 20:46:41.649500937 -0400 30964+++ linux-2.6.32.13/fs/ext4/ioctl.c 2010-05-15 13:21:17.158583972 -0400
30798@@ -221,6 +221,9 @@ setversion_out: 30965@@ -221,6 +221,9 @@ setversion_out:
30799 struct file *donor_filp; 30966 struct file *donor_filp;
30800 int err; 30967 int err;
@@ -30805,9 +30972,9 @@ diff -urNp linux-2.6.32.12/fs/ext4/ioctl.c linux-2.6.32.12/fs/ext4/ioctl.c
30805 if (!(filp->f_mode & FMODE_READ) || 30972 if (!(filp->f_mode & FMODE_READ) ||
30806 !(filp->f_mode & FMODE_WRITE)) 30973 !(filp->f_mode & FMODE_WRITE))
30807 return -EBADF; 30974 return -EBADF;
30808diff -urNp linux-2.6.32.12/fs/ext4/namei.c linux-2.6.32.12/fs/ext4/namei.c 30975diff -urNp linux-2.6.32.13/fs/ext4/namei.c linux-2.6.32.13/fs/ext4/namei.c
30809--- linux-2.6.32.12/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400 30976--- linux-2.6.32.13/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400
30810+++ linux-2.6.32.12/fs/ext4/namei.c 2010-04-04 20:46:41.649500937 -0400 30977+++ linux-2.6.32.13/fs/ext4/namei.c 2010-05-15 13:21:17.183216444 -0400
30811@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split 30978@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
30812 char *data1 = (*bh)->b_data, *data2; 30979 char *data1 = (*bh)->b_data, *data2;
30813 unsigned split, move, size; 30980 unsigned split, move, size;
@@ -30817,9 +30984,9 @@ diff -urNp linux-2.6.32.12/fs/ext4/namei.c linux-2.6.32.12/fs/ext4/namei.c
30817 30984
30818 bh2 = ext4_append (handle, dir, &newblock, &err); 30985 bh2 = ext4_append (handle, dir, &newblock, &err);
30819 if (!(bh2)) { 30986 if (!(bh2)) {
30820diff -urNp linux-2.6.32.12/fs/ext4/super.c linux-2.6.32.12/fs/ext4/super.c 30987diff -urNp linux-2.6.32.13/fs/ext4/super.c linux-2.6.32.13/fs/ext4/super.c
30821--- linux-2.6.32.12/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400 30988--- linux-2.6.32.13/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400
30822+++ linux-2.6.32.12/fs/ext4/super.c 2010-04-04 20:46:41.649500937 -0400 30989+++ linux-2.6.32.13/fs/ext4/super.c 2010-05-15 13:21:17.215811745 -0400
30823@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje 30990@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje
30824 } 30991 }
30825 30992
@@ -30829,9 +30996,9 @@ diff -urNp linux-2.6.32.12/fs/ext4/super.c linux-2.6.32.12/fs/ext4/super.c
30829 .show = ext4_attr_show, 30996 .show = ext4_attr_show,
30830 .store = ext4_attr_store, 30997 .store = ext4_attr_store,
30831 }; 30998 };
30832diff -urNp linux-2.6.32.12/fs/ext4/xattr.c linux-2.6.32.12/fs/ext4/xattr.c 30999diff -urNp linux-2.6.32.13/fs/ext4/xattr.c linux-2.6.32.13/fs/ext4/xattr.c
30833--- linux-2.6.32.12/fs/ext4/xattr.c 2010-03-15 11:52:04.000000000 -0400 31000--- linux-2.6.32.13/fs/ext4/xattr.c 2010-03-15 11:52:04.000000000 -0400
30834+++ linux-2.6.32.12/fs/ext4/xattr.c 2010-04-29 17:46:37.279760502 -0400 31001+++ linux-2.6.32.13/fs/ext4/xattr.c 2010-05-15 13:21:17.227060881 -0400
30835@@ -82,8 +82,8 @@ 31002@@ -82,8 +82,8 @@
30836 printk("\n"); \ 31003 printk("\n"); \
30837 } while (0) 31004 } while (0)
@@ -30843,9 +31010,9 @@ diff -urNp linux-2.6.32.12/fs/ext4/xattr.c linux-2.6.32.12/fs/ext4/xattr.c
30843 #endif 31010 #endif
30844 31011
30845 static void ext4_xattr_cache_insert(struct buffer_head *); 31012 static void ext4_xattr_cache_insert(struct buffer_head *);
30846diff -urNp linux-2.6.32.12/fs/fcntl.c linux-2.6.32.12/fs/fcntl.c 31013diff -urNp linux-2.6.32.13/fs/fcntl.c linux-2.6.32.13/fs/fcntl.c
30847--- linux-2.6.32.12/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400 31014--- linux-2.6.32.13/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400
30848+++ linux-2.6.32.12/fs/fcntl.c 2010-04-04 20:46:41.649500937 -0400 31015+++ linux-2.6.32.13/fs/fcntl.c 2010-05-15 13:21:17.227060881 -0400
30849@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in 31016@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in
30850 switch (cmd) { 31017 switch (cmd) {
30851 case F_DUPFD: 31018 case F_DUPFD:
@@ -30864,9 +31031,9 @@ diff -urNp linux-2.6.32.12/fs/fcntl.c linux-2.6.32.12/fs/fcntl.c
30864 rcu_read_unlock(); 31031 rcu_read_unlock();
30865 return ret; 31032 return ret;
30866 } 31033 }
30867diff -urNp linux-2.6.32.12/fs/fifo.c linux-2.6.32.12/fs/fifo.c 31034diff -urNp linux-2.6.32.13/fs/fifo.c linux-2.6.32.13/fs/fifo.c
30868--- linux-2.6.32.12/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400 31035--- linux-2.6.32.13/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400
30869+++ linux-2.6.32.12/fs/fifo.c 2010-04-04 20:46:41.649500937 -0400 31036+++ linux-2.6.32.13/fs/fifo.c 2010-05-15 13:21:17.252844788 -0400
30870@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode 31037@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
30871 */ 31038 */
30872 filp->f_op = &read_pipefifo_fops; 31039 filp->f_op = &read_pipefifo_fops;
@@ -30937,9 +31104,9 @@ diff -urNp linux-2.6.32.12/fs/fifo.c linux-2.6.32.12/fs/fifo.c
30937 free_pipe_info(inode); 31104 free_pipe_info(inode);
30938 31105
30939 err_nocleanup: 31106 err_nocleanup:
30940diff -urNp linux-2.6.32.12/fs/file.c linux-2.6.32.12/fs/file.c 31107diff -urNp linux-2.6.32.13/fs/file.c linux-2.6.32.13/fs/file.c
30941--- linux-2.6.32.12/fs/file.c 2010-03-15 11:52:04.000000000 -0400 31108--- linux-2.6.32.13/fs/file.c 2010-03-15 11:52:04.000000000 -0400
30942+++ linux-2.6.32.12/fs/file.c 2010-04-04 20:46:41.649500937 -0400 31109+++ linux-2.6.32.13/fs/file.c 2010-05-15 13:21:17.256078508 -0400
30943@@ -14,6 +14,7 @@ 31110@@ -14,6 +14,7 @@
30944 #include <linux/slab.h> 31111 #include <linux/slab.h>
30945 #include <linux/vmalloc.h> 31112 #include <linux/vmalloc.h>
@@ -30957,9 +31124,9 @@ diff -urNp linux-2.6.32.12/fs/file.c linux-2.6.32.12/fs/file.c
30957 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 31124 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
30958 return -EMFILE; 31125 return -EMFILE;
30959 31126
30960diff -urNp linux-2.6.32.12/fs/fs_struct.c linux-2.6.32.12/fs/fs_struct.c 31127diff -urNp linux-2.6.32.13/fs/fs_struct.c linux-2.6.32.13/fs/fs_struct.c
30961--- linux-2.6.32.12/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400 31128--- linux-2.6.32.13/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400
30962+++ linux-2.6.32.12/fs/fs_struct.c 2010-04-04 20:46:41.649500937 -0400 31129+++ linux-2.6.32.13/fs/fs_struct.c 2010-05-15 13:21:17.256078508 -0400
30963@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo 31130@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo
30964 struct task_struct *g, *p; 31131 struct task_struct *g, *p;
30965 struct fs_struct *fs; 31132 struct fs_struct *fs;
@@ -31064,9 +31231,9 @@ diff -urNp linux-2.6.32.12/fs/fs_struct.c linux-2.6.32.12/fs/fs_struct.c
31064 31231
31065 task_unlock(current); 31232 task_unlock(current);
31066 if (kill) 31233 if (kill)
31067diff -urNp linux-2.6.32.12/fs/fuse/control.c linux-2.6.32.12/fs/fuse/control.c 31234diff -urNp linux-2.6.32.13/fs/fuse/control.c linux-2.6.32.13/fs/fuse/control.c
31068--- linux-2.6.32.12/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400 31235--- linux-2.6.32.13/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400
31069+++ linux-2.6.32.12/fs/fuse/control.c 2010-04-04 20:46:41.649500937 -0400 31236+++ linux-2.6.32.13/fs/fuse/control.c 2010-05-15 13:21:17.271074520 -0400
31070@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co 31237@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
31071 31238
31072 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) 31239 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -31076,9 +31243,9 @@ diff -urNp linux-2.6.32.12/fs/fuse/control.c linux-2.6.32.12/fs/fuse/control.c
31076 struct fuse_conn *fc; 31243 struct fuse_conn *fc;
31077 int err; 31244 int err;
31078 31245
31079diff -urNp linux-2.6.32.12/fs/fuse/cuse.c linux-2.6.32.12/fs/fuse/cuse.c 31246diff -urNp linux-2.6.32.13/fs/fuse/cuse.c linux-2.6.32.13/fs/fuse/cuse.c
31080--- linux-2.6.32.12/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400 31247--- linux-2.6.32.13/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400
31081+++ linux-2.6.32.12/fs/fuse/cuse.c 2010-04-04 20:46:41.649500937 -0400 31248+++ linux-2.6.32.13/fs/fuse/cuse.c 2010-05-15 13:21:17.289230785 -0400
31082@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i 31249@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
31083 return rc; 31250 return rc;
31084 } 31251 }
@@ -31113,9 +31280,9 @@ diff -urNp linux-2.6.32.12/fs/fuse/cuse.c linux-2.6.32.12/fs/fuse/cuse.c
31113 cuse_class = class_create(THIS_MODULE, "cuse"); 31280 cuse_class = class_create(THIS_MODULE, "cuse");
31114 if (IS_ERR(cuse_class)) 31281 if (IS_ERR(cuse_class))
31115 return PTR_ERR(cuse_class); 31282 return PTR_ERR(cuse_class);
31116diff -urNp linux-2.6.32.12/fs/fuse/dev.c linux-2.6.32.12/fs/fuse/dev.c 31283diff -urNp linux-2.6.32.13/fs/fuse/dev.c linux-2.6.32.13/fs/fuse/dev.c
31117--- linux-2.6.32.12/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400 31284--- linux-2.6.32.13/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400
31118+++ linux-2.6.32.12/fs/fuse/dev.c 2010-04-04 20:46:41.649500937 -0400 31285+++ linux-2.6.32.13/fs/fuse/dev.c 2010-05-15 13:21:17.290606220 -0400
31119@@ -745,7 +745,7 @@ __releases(&fc->lock) 31286@@ -745,7 +745,7 @@ __releases(&fc->lock)
31120 * request_end(). Otherwise add it to the processing list, and set 31287 * request_end(). Otherwise add it to the processing list, and set
31121 * the 'sent' flag. 31288 * the 'sent' flag.
@@ -31221,9 +31388,9 @@ diff -urNp linux-2.6.32.12/fs/fuse/dev.c linux-2.6.32.12/fs/fuse/dev.c
31221 31388
31222 const struct file_operations fuse_dev_operations = { 31389 const struct file_operations fuse_dev_operations = {
31223 .owner = THIS_MODULE, 31390 .owner = THIS_MODULE,
31224diff -urNp linux-2.6.32.12/fs/fuse/dir.c linux-2.6.32.12/fs/fuse/dir.c 31391diff -urNp linux-2.6.32.13/fs/fuse/dir.c linux-2.6.32.13/fs/fuse/dir.c
31225--- linux-2.6.32.12/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400 31392--- linux-2.6.32.13/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400
31226+++ linux-2.6.32.12/fs/fuse/dir.c 2010-04-04 20:46:41.649500937 -0400 31393+++ linux-2.6.32.13/fs/fuse/dir.c 2010-05-15 13:21:17.295063654 -0400
31227@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de 31394@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
31228 return link; 31395 return link;
31229 } 31396 }
@@ -31233,9 +31400,9 @@ diff -urNp linux-2.6.32.12/fs/fuse/dir.c linux-2.6.32.12/fs/fuse/dir.c
31233 { 31400 {
31234 if (!IS_ERR(link)) 31401 if (!IS_ERR(link))
31235 free_page((unsigned long) link); 31402 free_page((unsigned long) link);
31236diff -urNp linux-2.6.32.12/fs/fuse/fuse_i.h linux-2.6.32.12/fs/fuse/fuse_i.h 31403diff -urNp linux-2.6.32.13/fs/fuse/fuse_i.h linux-2.6.32.13/fs/fuse/fuse_i.h
31237--- linux-2.6.32.12/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400 31404--- linux-2.6.32.13/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400
31238+++ linux-2.6.32.12/fs/fuse/fuse_i.h 2010-04-04 20:46:41.649500937 -0400 31405+++ linux-2.6.32.13/fs/fuse/fuse_i.h 2010-05-15 13:21:17.298596794 -0400
31239@@ -521,6 +521,16 @@ extern const struct file_operations fuse 31406@@ -521,6 +521,16 @@ extern const struct file_operations fuse
31240 31407
31241 extern const struct dentry_operations fuse_dentry_operations; 31408 extern const struct dentry_operations fuse_dentry_operations;
@@ -31253,9 +31420,9 @@ diff -urNp linux-2.6.32.12/fs/fuse/fuse_i.h linux-2.6.32.12/fs/fuse/fuse_i.h
31253 /** 31420 /**
31254 * Inode to nodeid comparison. 31421 * Inode to nodeid comparison.
31255 */ 31422 */
31256diff -urNp linux-2.6.32.12/fs/gfs2/sys.c linux-2.6.32.12/fs/gfs2/sys.c 31423diff -urNp linux-2.6.32.13/fs/gfs2/sys.c linux-2.6.32.13/fs/gfs2/sys.c
31257--- linux-2.6.32.12/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400 31424--- linux-2.6.32.13/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400
31258+++ linux-2.6.32.12/fs/gfs2/sys.c 2010-04-04 20:46:41.649500937 -0400 31425+++ linux-2.6.32.13/fs/gfs2/sys.c 2010-05-15 13:21:17.323073000 -0400
31259@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko 31426@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
31260 return a->store ? a->store(sdp, buf, len) : len; 31427 return a->store ? a->store(sdp, buf, len) : len;
31261 } 31428 }
@@ -31274,9 +31441,9 @@ diff -urNp linux-2.6.32.12/fs/gfs2/sys.c linux-2.6.32.12/fs/gfs2/sys.c
31274 .uevent = gfs2_uevent, 31441 .uevent = gfs2_uevent,
31275 }; 31442 };
31276 31443
31277diff -urNp linux-2.6.32.12/fs/hfs/inode.c linux-2.6.32.12/fs/hfs/inode.c 31444diff -urNp linux-2.6.32.13/fs/hfs/inode.c linux-2.6.32.13/fs/hfs/inode.c
31278--- linux-2.6.32.12/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400 31445--- linux-2.6.32.13/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400
31279+++ linux-2.6.32.12/fs/hfs/inode.c 2010-04-04 20:46:41.653544810 -0400 31446+++ linux-2.6.32.13/fs/hfs/inode.c 2010-05-15 13:21:17.331804288 -0400
31280@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, 31447@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
31281 31448
31282 if (S_ISDIR(main_inode->i_mode)) { 31449 if (S_ISDIR(main_inode->i_mode)) {
@@ -31295,9 +31462,9 @@ diff -urNp linux-2.6.32.12/fs/hfs/inode.c linux-2.6.32.12/fs/hfs/inode.c
31295 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, 31462 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
31296 sizeof(struct hfs_cat_file)); 31463 sizeof(struct hfs_cat_file));
31297 if (rec.type != HFS_CDR_FIL || 31464 if (rec.type != HFS_CDR_FIL ||
31298diff -urNp linux-2.6.32.12/fs/hfsplus/inode.c linux-2.6.32.12/fs/hfsplus/inode.c 31465diff -urNp linux-2.6.32.13/fs/hfsplus/inode.c linux-2.6.32.13/fs/hfsplus/inode.c
31299--- linux-2.6.32.12/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400 31466--- linux-2.6.32.13/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400
31300+++ linux-2.6.32.12/fs/hfsplus/inode.c 2010-04-04 20:46:41.653544810 -0400 31467+++ linux-2.6.32.13/fs/hfsplus/inode.c 2010-05-15 13:21:17.338586981 -0400
31301@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode 31468@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
31302 struct hfsplus_cat_folder *folder = &entry.folder; 31469 struct hfsplus_cat_folder *folder = &entry.folder;
31303 31470
@@ -31334,9 +31501,9 @@ diff -urNp linux-2.6.32.12/fs/hfsplus/inode.c linux-2.6.32.12/fs/hfsplus/inode.c
31334 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, 31501 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
31335 sizeof(struct hfsplus_cat_file)); 31502 sizeof(struct hfsplus_cat_file));
31336 hfsplus_inode_write_fork(inode, &file->data_fork); 31503 hfsplus_inode_write_fork(inode, &file->data_fork);
31337diff -urNp linux-2.6.32.12/fs/hugetlbfs/inode.c linux-2.6.32.12/fs/hugetlbfs/inode.c 31504diff -urNp linux-2.6.32.13/fs/hugetlbfs/inode.c linux-2.6.32.13/fs/hugetlbfs/inode.c
31338--- linux-2.6.32.12/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400 31505--- linux-2.6.32.13/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400
31339+++ linux-2.6.32.12/fs/hugetlbfs/inode.c 2010-04-06 22:13:08.677504702 -0400 31506+++ linux-2.6.32.13/fs/hugetlbfs/inode.c 2010-05-15 13:21:17.367723130 -0400
31340@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs 31507@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
31341 .kill_sb = kill_litter_super, 31508 .kill_sb = kill_litter_super,
31342 }; 31509 };
@@ -31346,9 +31513,9 @@ diff -urNp linux-2.6.32.12/fs/hugetlbfs/inode.c linux-2.6.32.12/fs/hugetlbfs/ino
31346 31513
31347 static int can_do_hugetlb_shm(void) 31514 static int can_do_hugetlb_shm(void)
31348 { 31515 {
31349diff -urNp linux-2.6.32.12/fs/ioctl.c linux-2.6.32.12/fs/ioctl.c 31516diff -urNp linux-2.6.32.13/fs/ioctl.c linux-2.6.32.13/fs/ioctl.c
31350--- linux-2.6.32.12/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400 31517--- linux-2.6.32.13/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400
31351+++ linux-2.6.32.12/fs/ioctl.c 2010-04-04 20:46:41.653544810 -0400 31518+++ linux-2.6.32.13/fs/ioctl.c 2010-05-15 13:21:17.367723130 -0400
31352@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema 31519@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
31353 u64 phys, u64 len, u32 flags) 31520 u64 phys, u64 len, u32 flags)
31354 { 31521 {
@@ -31376,9 +31543,9 @@ diff -urNp linux-2.6.32.12/fs/ioctl.c linux-2.6.32.12/fs/ioctl.c
31376 error = -EFAULT; 31543 error = -EFAULT;
31377 31544
31378 return error; 31545 return error;
31379diff -urNp linux-2.6.32.12/fs/jffs2/debug.h linux-2.6.32.12/fs/jffs2/debug.h 31546diff -urNp linux-2.6.32.13/fs/jffs2/debug.h linux-2.6.32.13/fs/jffs2/debug.h
31380--- linux-2.6.32.12/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400 31547--- linux-2.6.32.13/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400
31381+++ linux-2.6.32.12/fs/jffs2/debug.h 2010-04-04 20:46:41.653544810 -0400 31548+++ linux-2.6.32.13/fs/jffs2/debug.h 2010-05-15 13:21:17.378571837 -0400
31382@@ -52,13 +52,13 @@ 31549@@ -52,13 +52,13 @@
31383 #if CONFIG_JFFS2_FS_DEBUG > 0 31550 #if CONFIG_JFFS2_FS_DEBUG > 0
31384 #define D1(x) x 31551 #define D1(x) x
@@ -31480,9 +31647,9 @@ diff -urNp linux-2.6.32.12/fs/jffs2/debug.h linux-2.6.32.12/fs/jffs2/debug.h
31480 #endif 31647 #endif
31481 31648
31482 /* "Sanity" checks */ 31649 /* "Sanity" checks */
31483diff -urNp linux-2.6.32.12/fs/jffs2/erase.c linux-2.6.32.12/fs/jffs2/erase.c 31650diff -urNp linux-2.6.32.13/fs/jffs2/erase.c linux-2.6.32.13/fs/jffs2/erase.c
31484--- linux-2.6.32.12/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400 31651--- linux-2.6.32.13/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400
31485+++ linux-2.6.32.12/fs/jffs2/erase.c 2010-04-04 20:46:41.653544810 -0400 31652+++ linux-2.6.32.13/fs/jffs2/erase.c 2010-05-15 13:21:17.386577527 -0400
31486@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru 31653@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
31487 struct jffs2_unknown_node marker = { 31654 struct jffs2_unknown_node marker = {
31488 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), 31655 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -31493,9 +31660,9 @@ diff -urNp linux-2.6.32.12/fs/jffs2/erase.c linux-2.6.32.12/fs/jffs2/erase.c
31493 }; 31660 };
31494 31661
31495 jffs2_prealloc_raw_node_refs(c, jeb, 1); 31662 jffs2_prealloc_raw_node_refs(c, jeb, 1);
31496diff -urNp linux-2.6.32.12/fs/jffs2/summary.h linux-2.6.32.12/fs/jffs2/summary.h 31663diff -urNp linux-2.6.32.13/fs/jffs2/summary.h linux-2.6.32.13/fs/jffs2/summary.h
31497--- linux-2.6.32.12/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400 31664--- linux-2.6.32.13/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400
31498+++ linux-2.6.32.12/fs/jffs2/summary.h 2010-04-04 20:46:41.653544810 -0400 31665+++ linux-2.6.32.13/fs/jffs2/summary.h 2010-05-15 13:21:17.386577527 -0400
31499@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ 31666@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
31500 31667
31501 #define jffs2_sum_active() (0) 31668 #define jffs2_sum_active() (0)
@@ -31524,9 +31691,9 @@ diff -urNp linux-2.6.32.12/fs/jffs2/summary.h linux-2.6.32.12/fs/jffs2/summary.h
31524 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) 31691 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
31525 31692
31526 #endif /* CONFIG_JFFS2_SUMMARY */ 31693 #endif /* CONFIG_JFFS2_SUMMARY */
31527diff -urNp linux-2.6.32.12/fs/jffs2/wbuf.c linux-2.6.32.12/fs/jffs2/wbuf.c 31694diff -urNp linux-2.6.32.13/fs/jffs2/wbuf.c linux-2.6.32.13/fs/jffs2/wbuf.c
31528--- linux-2.6.32.12/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400 31695--- linux-2.6.32.13/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400
31529+++ linux-2.6.32.12/fs/jffs2/wbuf.c 2010-04-04 20:46:41.653544810 -0400 31696+++ linux-2.6.32.13/fs/jffs2/wbuf.c 2010-05-15 13:21:17.386577527 -0400
31530@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o 31697@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
31531 { 31698 {
31532 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), 31699 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -31537,9 +31704,9 @@ diff -urNp linux-2.6.32.12/fs/jffs2/wbuf.c linux-2.6.32.12/fs/jffs2/wbuf.c
31537 }; 31704 };
31538 31705
31539 /* 31706 /*
31540diff -urNp linux-2.6.32.12/fs/lockd/svc.c linux-2.6.32.12/fs/lockd/svc.c 31707diff -urNp linux-2.6.32.13/fs/lockd/svc.c linux-2.6.32.13/fs/lockd/svc.c
31541--- linux-2.6.32.12/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400 31708--- linux-2.6.32.13/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400
31542+++ linux-2.6.32.12/fs/lockd/svc.c 2010-04-04 20:46:41.653544810 -0400 31709+++ linux-2.6.32.13/fs/lockd/svc.c 2010-05-15 13:21:17.394616660 -0400
31543@@ -43,7 +43,7 @@ 31710@@ -43,7 +43,7 @@
31544 31711
31545 static struct svc_program nlmsvc_program; 31712 static struct svc_program nlmsvc_program;
@@ -31549,9 +31716,9 @@ diff -urNp linux-2.6.32.12/fs/lockd/svc.c linux-2.6.32.12/fs/lockd/svc.c
31549 EXPORT_SYMBOL_GPL(nlmsvc_ops); 31716 EXPORT_SYMBOL_GPL(nlmsvc_ops);
31550 31717
31551 static DEFINE_MUTEX(nlmsvc_mutex); 31718 static DEFINE_MUTEX(nlmsvc_mutex);
31552diff -urNp linux-2.6.32.12/fs/locks.c linux-2.6.32.12/fs/locks.c 31719diff -urNp linux-2.6.32.13/fs/locks.c linux-2.6.32.13/fs/locks.c
31553--- linux-2.6.32.12/fs/locks.c 2010-03-15 11:52:04.000000000 -0400 31720--- linux-2.6.32.13/fs/locks.c 2010-03-15 11:52:04.000000000 -0400
31554+++ linux-2.6.32.12/fs/locks.c 2010-04-04 20:46:41.653544810 -0400 31721+++ linux-2.6.32.13/fs/locks.c 2010-05-15 13:21:17.398591192 -0400
31555@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil 31722@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
31556 return; 31723 return;
31557 31724
@@ -31573,9 +31740,9 @@ diff -urNp linux-2.6.32.12/fs/locks.c linux-2.6.32.12/fs/locks.c
31573 } 31740 }
31574 31741
31575 lock_kernel(); 31742 lock_kernel();
31576diff -urNp linux-2.6.32.12/fs/namei.c linux-2.6.32.12/fs/namei.c 31743diff -urNp linux-2.6.32.13/fs/namei.c linux-2.6.32.13/fs/namei.c
31577--- linux-2.6.32.12/fs/namei.c 2010-03-15 11:52:04.000000000 -0400 31744--- linux-2.6.32.13/fs/namei.c 2010-03-15 11:52:04.000000000 -0400
31578+++ linux-2.6.32.12/fs/namei.c 2010-04-04 20:46:41.653544810 -0400 31745+++ linux-2.6.32.13/fs/namei.c 2010-05-15 13:21:17.402570795 -0400
31579@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l 31746@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l
31580 cookie = dentry->d_inode->i_op->follow_link(dentry, nd); 31747 cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
31581 error = PTR_ERR(cookie); 31748 error = PTR_ERR(cookie);
@@ -31902,9 +32069,9 @@ diff -urNp linux-2.6.32.12/fs/namei.c linux-2.6.32.12/fs/namei.c
31902 exit6: 32069 exit6:
31903 mnt_drop_write(oldnd.path.mnt); 32070 mnt_drop_write(oldnd.path.mnt);
31904 exit5: 32071 exit5:
31905diff -urNp linux-2.6.32.12/fs/namespace.c linux-2.6.32.12/fs/namespace.c 32072diff -urNp linux-2.6.32.13/fs/namespace.c linux-2.6.32.13/fs/namespace.c
31906--- linux-2.6.32.12/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400 32073--- linux-2.6.32.13/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400
31907+++ linux-2.6.32.12/fs/namespace.c 2010-04-04 20:46:41.653544810 -0400 32074+++ linux-2.6.32.13/fs/namespace.c 2010-05-15 13:21:17.430740691 -0400
31908@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn 32075@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
31909 if (!(sb->s_flags & MS_RDONLY)) 32076 if (!(sb->s_flags & MS_RDONLY))
31910 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); 32077 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -31965,9 +32132,9 @@ diff -urNp linux-2.6.32.12/fs/namespace.c linux-2.6.32.12/fs/namespace.c
31965 read_lock(&current->fs->lock); 32132 read_lock(&current->fs->lock);
31966 root = current->fs->root; 32133 root = current->fs->root;
31967 path_get(&current->fs->root); 32134 path_get(&current->fs->root);
31968diff -urNp linux-2.6.32.12/fs/nfs/inode.c linux-2.6.32.12/fs/nfs/inode.c 32135diff -urNp linux-2.6.32.13/fs/nfs/inode.c linux-2.6.32.13/fs/nfs/inode.c
31969--- linux-2.6.32.12/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400 32136--- linux-2.6.32.13/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400
31970+++ linux-2.6.32.12/fs/nfs/inode.c 2010-04-04 20:46:41.653544810 -0400 32137+++ linux-2.6.32.13/fs/nfs/inode.c 2010-05-15 13:21:17.459288785 -0400
31971@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st 32138@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
31972 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); 32139 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
31973 } 32140 }
@@ -31988,9 +32155,9 @@ diff -urNp linux-2.6.32.12/fs/nfs/inode.c linux-2.6.32.12/fs/nfs/inode.c
31988 } 32155 }
31989 32156
31990 void nfs_fattr_init(struct nfs_fattr *fattr) 32157 void nfs_fattr_init(struct nfs_fattr *fattr)
31991diff -urNp linux-2.6.32.12/fs/nfs/nfs4proc.c linux-2.6.32.12/fs/nfs/nfs4proc.c 32158diff -urNp linux-2.6.32.13/fs/nfs/nfs4proc.c linux-2.6.32.13/fs/nfs/nfs4proc.c
31992--- linux-2.6.32.12/fs/nfs/nfs4proc.c 2010-04-29 17:49:38.445067399 -0400 32159--- linux-2.6.32.13/fs/nfs/nfs4proc.c 2010-04-29 17:49:38.445067399 -0400
31993+++ linux-2.6.32.12/fs/nfs/nfs4proc.c 2010-04-29 17:49:58.597031543 -0400 32160+++ linux-2.6.32.13/fs/nfs/nfs4proc.c 2010-05-15 13:21:17.510781468 -0400
31994@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct 32161@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct
31995 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) 32162 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
31996 { 32163 {
@@ -32261,9 +32428,9 @@ diff -urNp linux-2.6.32.12/fs/nfs/nfs4proc.c linux-2.6.32.12/fs/nfs/nfs4proc.c
32261 int err; 32428 int err;
32262 32429
32263 err = nfs4_set_lock_state(state, fl); 32430 err = nfs4_set_lock_state(state, fl);
32264diff -urNp linux-2.6.32.12/fs/nfsd/lockd.c linux-2.6.32.12/fs/nfsd/lockd.c 32431diff -urNp linux-2.6.32.13/fs/nfsd/lockd.c linux-2.6.32.13/fs/nfsd/lockd.c
32265--- linux-2.6.32.12/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400 32432--- linux-2.6.32.13/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400
32266+++ linux-2.6.32.12/fs/nfsd/lockd.c 2010-04-04 20:46:41.653544810 -0400 32433+++ linux-2.6.32.13/fs/nfsd/lockd.c 2010-05-15 13:21:17.510781468 -0400
32267@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) 32434@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
32268 fput(filp); 32435 fput(filp);
32269 } 32436 }
@@ -32273,9 +32440,9 @@ diff -urNp linux-2.6.32.12/fs/nfsd/lockd.c linux-2.6.32.12/fs/nfsd/lockd.c
32273 .fopen = nlm_fopen, /* open file for locking */ 32440 .fopen = nlm_fopen, /* open file for locking */
32274 .fclose = nlm_fclose, /* close file */ 32441 .fclose = nlm_fclose, /* close file */
32275 }; 32442 };
32276diff -urNp linux-2.6.32.12/fs/nfsd/vfs.c linux-2.6.32.12/fs/nfsd/vfs.c 32443diff -urNp linux-2.6.32.13/fs/nfsd/vfs.c linux-2.6.32.13/fs/nfsd/vfs.c
32277--- linux-2.6.32.12/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400 32444--- linux-2.6.32.13/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400
32278+++ linux-2.6.32.12/fs/nfsd/vfs.c 2010-04-04 20:46:41.657782339 -0400 32445+++ linux-2.6.32.13/fs/nfsd/vfs.c 2010-05-15 13:21:17.539124101 -0400
32279@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st 32446@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
32280 } else { 32447 } else {
32281 oldfs = get_fs(); 32448 oldfs = get_fs();
@@ -32303,9 +32470,9 @@ diff -urNp linux-2.6.32.12/fs/nfsd/vfs.c linux-2.6.32.12/fs/nfsd/vfs.c
32303 set_fs(oldfs); 32470 set_fs(oldfs);
32304 32471
32305 if (host_err < 0) 32472 if (host_err < 0)
32306diff -urNp linux-2.6.32.12/fs/nls/nls_base.c linux-2.6.32.12/fs/nls/nls_base.c 32473diff -urNp linux-2.6.32.13/fs/nls/nls_base.c linux-2.6.32.13/fs/nls/nls_base.c
32307--- linux-2.6.32.12/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400 32474--- linux-2.6.32.13/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400
32308+++ linux-2.6.32.12/fs/nls/nls_base.c 2010-04-04 20:46:41.657782339 -0400 32475+++ linux-2.6.32.13/fs/nls/nls_base.c 2010-05-15 13:21:17.550577951 -0400
32309@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl 32476@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
32310 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, 32477 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
32311 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, 32478 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
@@ -32315,9 +32482,9 @@ diff -urNp linux-2.6.32.12/fs/nls/nls_base.c linux-2.6.32.12/fs/nls/nls_base.c
32315 }; 32482 };
32316 32483
32317 #define UNICODE_MAX 0x0010ffff 32484 #define UNICODE_MAX 0x0010ffff
32318diff -urNp linux-2.6.32.12/fs/ntfs/file.c linux-2.6.32.12/fs/ntfs/file.c 32485diff -urNp linux-2.6.32.13/fs/ntfs/file.c linux-2.6.32.13/fs/ntfs/file.c
32319--- linux-2.6.32.12/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400 32486--- linux-2.6.32.13/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400
32320+++ linux-2.6.32.12/fs/ntfs/file.c 2010-04-04 20:46:41.657782339 -0400 32487+++ linux-2.6.32.13/fs/ntfs/file.c 2010-05-15 13:21:17.582652999 -0400
32321@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ 32488@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
32322 #endif /* NTFS_RW */ 32489 #endif /* NTFS_RW */
32323 }; 32490 };
@@ -32327,9 +32494,9 @@ diff -urNp linux-2.6.32.12/fs/ntfs/file.c linux-2.6.32.12/fs/ntfs/file.c
32327 32494
32328-const struct inode_operations ntfs_empty_inode_ops = {}; 32495-const struct inode_operations ntfs_empty_inode_ops = {};
32329+const struct inode_operations ntfs_empty_inode_ops __read_only; 32496+const struct inode_operations ntfs_empty_inode_ops __read_only;
32330diff -urNp linux-2.6.32.12/fs/ocfs2/cluster/masklog.c linux-2.6.32.12/fs/ocfs2/cluster/masklog.c 32497diff -urNp linux-2.6.32.13/fs/ocfs2/cluster/masklog.c linux-2.6.32.13/fs/ocfs2/cluster/masklog.c
32331--- linux-2.6.32.12/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400 32498--- linux-2.6.32.13/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400
32332+++ linux-2.6.32.12/fs/ocfs2/cluster/masklog.c 2010-04-04 20:46:41.657782339 -0400 32499+++ linux-2.6.32.13/fs/ocfs2/cluster/masklog.c 2010-05-15 13:21:17.582652999 -0400
32333@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject 32500@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
32334 return mlog_mask_store(mlog_attr->mask, buf, count); 32501 return mlog_mask_store(mlog_attr->mask, buf, count);
32335 } 32502 }
@@ -32339,9 +32506,9 @@ diff -urNp linux-2.6.32.12/fs/ocfs2/cluster/masklog.c linux-2.6.32.12/fs/ocfs2/c
32339 .show = mlog_show, 32506 .show = mlog_show,
32340 .store = mlog_store, 32507 .store = mlog_store,
32341 }; 32508 };
32342diff -urNp linux-2.6.32.12/fs/ocfs2/localalloc.c linux-2.6.32.12/fs/ocfs2/localalloc.c 32509diff -urNp linux-2.6.32.13/fs/ocfs2/localalloc.c linux-2.6.32.13/fs/ocfs2/localalloc.c
32343--- linux-2.6.32.12/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400 32510--- linux-2.6.32.13/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400
32344+++ linux-2.6.32.12/fs/ocfs2/localalloc.c 2010-04-04 20:46:41.657782339 -0400 32511+++ linux-2.6.32.13/fs/ocfs2/localalloc.c 2010-05-15 13:21:17.587704007 -0400
32345@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo 32512@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
32346 goto bail; 32513 goto bail;
32347 } 32514 }
@@ -32351,9 +32518,9 @@ diff -urNp linux-2.6.32.12/fs/ocfs2/localalloc.c linux-2.6.32.12/fs/ocfs2/locala
32351 32518
32352 status = 0; 32519 status = 0;
32353 bail: 32520 bail:
32354diff -urNp linux-2.6.32.12/fs/ocfs2/ocfs2.h linux-2.6.32.12/fs/ocfs2/ocfs2.h 32521diff -urNp linux-2.6.32.13/fs/ocfs2/ocfs2.h linux-2.6.32.13/fs/ocfs2/ocfs2.h
32355--- linux-2.6.32.12/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400 32522--- linux-2.6.32.13/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400
32356+++ linux-2.6.32.12/fs/ocfs2/ocfs2.h 2010-04-04 20:46:41.657782339 -0400 32523+++ linux-2.6.32.13/fs/ocfs2/ocfs2.h 2010-05-15 13:21:17.612604736 -0400
32357@@ -217,11 +217,11 @@ enum ocfs2_vol_state 32524@@ -217,11 +217,11 @@ enum ocfs2_vol_state
32358 32525
32359 struct ocfs2_alloc_stats 32526 struct ocfs2_alloc_stats
@@ -32371,9 +32538,9 @@ diff -urNp linux-2.6.32.12/fs/ocfs2/ocfs2.h linux-2.6.32.12/fs/ocfs2/ocfs2.h
32371 }; 32538 };
32372 32539
32373 enum ocfs2_local_alloc_state 32540 enum ocfs2_local_alloc_state
32374diff -urNp linux-2.6.32.12/fs/ocfs2/suballoc.c linux-2.6.32.12/fs/ocfs2/suballoc.c 32541diff -urNp linux-2.6.32.13/fs/ocfs2/suballoc.c linux-2.6.32.13/fs/ocfs2/suballoc.c
32375--- linux-2.6.32.12/fs/ocfs2/suballoc.c 2010-04-29 17:49:38.449086403 -0400 32542--- linux-2.6.32.13/fs/ocfs2/suballoc.c 2010-04-29 17:49:38.449086403 -0400
32376+++ linux-2.6.32.12/fs/ocfs2/suballoc.c 2010-04-29 17:49:58.609026943 -0400 32543+++ linux-2.6.32.13/fs/ocfs2/suballoc.c 2010-05-15 13:21:17.655985201 -0400
32377@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s 32544@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
32378 mlog_errno(status); 32545 mlog_errno(status);
32379 goto bail; 32546 goto bail;
@@ -32419,9 +32586,9 @@ diff -urNp linux-2.6.32.12/fs/ocfs2/suballoc.c linux-2.6.32.12/fs/ocfs2/suballoc
32419 } 32586 }
32420 } 32587 }
32421 if (status < 0) { 32588 if (status < 0) {
32422diff -urNp linux-2.6.32.12/fs/ocfs2/super.c linux-2.6.32.12/fs/ocfs2/super.c 32589diff -urNp linux-2.6.32.13/fs/ocfs2/super.c linux-2.6.32.13/fs/ocfs2/super.c
32423--- linux-2.6.32.12/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400 32590--- linux-2.6.32.13/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400
32424+++ linux-2.6.32.12/fs/ocfs2/super.c 2010-04-04 20:46:41.657782339 -0400 32591+++ linux-2.6.32.13/fs/ocfs2/super.c 2010-05-15 13:21:17.677940986 -0400
32425@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s 32592@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
32426 "%10s => GlobalAllocs: %d LocalAllocs: %d " 32593 "%10s => GlobalAllocs: %d LocalAllocs: %d "
32427 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", 32594 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
@@ -32456,9 +32623,9 @@ diff -urNp linux-2.6.32.12/fs/ocfs2/super.c linux-2.6.32.12/fs/ocfs2/super.c
32456 32623
32457 /* Copy the blockcheck stats from the superblock probe */ 32624 /* Copy the blockcheck stats from the superblock probe */
32458 osb->osb_ecc_stats = *stats; 32625 osb->osb_ecc_stats = *stats;
32459diff -urNp linux-2.6.32.12/fs/open.c linux-2.6.32.12/fs/open.c 32626diff -urNp linux-2.6.32.13/fs/open.c linux-2.6.32.13/fs/open.c
32460--- linux-2.6.32.12/fs/open.c 2010-03-15 11:52:04.000000000 -0400 32627--- linux-2.6.32.13/fs/open.c 2010-03-15 11:52:04.000000000 -0400
32461+++ linux-2.6.32.12/fs/open.c 2010-04-04 20:46:41.657782339 -0400 32628+++ linux-2.6.32.13/fs/open.c 2010-05-15 13:21:17.687346474 -0400
32462@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l 32629@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l
32463 if (length < 0) 32630 if (length < 0)
32464 return -EINVAL; 32631 return -EINVAL;
@@ -32632,9 +32799,9 @@ diff -urNp linux-2.6.32.12/fs/open.c linux-2.6.32.12/fs/open.c
32632 mnt_drop_write(file->f_path.mnt); 32799 mnt_drop_write(file->f_path.mnt);
32633 out_fput: 32800 out_fput:
32634 fput(file); 32801 fput(file);
32635diff -urNp linux-2.6.32.12/fs/pipe.c linux-2.6.32.12/fs/pipe.c 32802diff -urNp linux-2.6.32.13/fs/pipe.c linux-2.6.32.13/fs/pipe.c
32636--- linux-2.6.32.12/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400 32803--- linux-2.6.32.13/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400
32637+++ linux-2.6.32.12/fs/pipe.c 2010-04-04 20:46:41.657782339 -0400 32804+++ linux-2.6.32.13/fs/pipe.c 2010-05-15 13:21:17.687346474 -0400
32638@@ -401,9 +401,9 @@ redo: 32805@@ -401,9 +401,9 @@ redo:
32639 } 32806 }
32640 if (bufs) /* More to do? */ 32807 if (bufs) /* More to do? */
@@ -32758,9 +32925,9 @@ diff -urNp linux-2.6.32.12/fs/pipe.c linux-2.6.32.12/fs/pipe.c
32758 inode->i_fop = &rdwr_pipefifo_fops; 32925 inode->i_fop = &rdwr_pipefifo_fops;
32759 32926
32760 /* 32927 /*
32761diff -urNp linux-2.6.32.12/fs/proc/array.c linux-2.6.32.12/fs/proc/array.c 32928diff -urNp linux-2.6.32.13/fs/proc/array.c linux-2.6.32.13/fs/proc/array.c
32762--- linux-2.6.32.12/fs/proc/array.c 2010-03-15 11:52:04.000000000 -0400 32929--- linux-2.6.32.13/fs/proc/array.c 2010-03-15 11:52:04.000000000 -0400
32763+++ linux-2.6.32.12/fs/proc/array.c 2010-04-04 20:46:41.657782339 -0400 32930+++ linux-2.6.32.13/fs/proc/array.c 2010-05-15 13:21:17.690587811 -0400
32764@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct 32931@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct
32765 } 32932 }
32766 #endif /* CONFIG_MMU */ 32933 #endif /* CONFIG_MMU */
@@ -32851,9 +33018,9 @@ diff -urNp linux-2.6.32.12/fs/proc/array.c linux-2.6.32.12/fs/proc/array.c
32851+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); 33018+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
32852+} 33019+}
32853+#endif 33020+#endif
32854diff -urNp linux-2.6.32.12/fs/proc/base.c linux-2.6.32.12/fs/proc/base.c 33021diff -urNp linux-2.6.32.13/fs/proc/base.c linux-2.6.32.13/fs/proc/base.c
32855--- linux-2.6.32.12/fs/proc/base.c 2010-04-29 17:49:38.453075413 -0400 33022--- linux-2.6.32.13/fs/proc/base.c 2010-05-15 13:20:19.242597763 -0400
32856+++ linux-2.6.32.12/fs/proc/base.c 2010-04-29 17:49:58.609026943 -0400 33023+++ linux-2.6.32.13/fs/proc/base.c 2010-05-15 13:21:17.690587811 -0400
32857@@ -102,6 +102,22 @@ struct pid_entry { 33024@@ -102,6 +102,22 @@ struct pid_entry {
32858 union proc_op op; 33025 union proc_op op;
32859 }; 33026 };
@@ -33219,9 +33386,9 @@ diff -urNp linux-2.6.32.12/fs/proc/base.c linux-2.6.32.12/fs/proc/base.c
33219 ONE("stack", S_IRUSR, proc_pid_stack), 33386 ONE("stack", S_IRUSR, proc_pid_stack),
33220 #endif 33387 #endif
33221 #ifdef CONFIG_SCHEDSTATS 33388 #ifdef CONFIG_SCHEDSTATS
33222diff -urNp linux-2.6.32.12/fs/proc/cmdline.c linux-2.6.32.12/fs/proc/cmdline.c 33389diff -urNp linux-2.6.32.13/fs/proc/cmdline.c linux-2.6.32.13/fs/proc/cmdline.c
33223--- linux-2.6.32.12/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400 33390--- linux-2.6.32.13/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400
33224+++ linux-2.6.32.12/fs/proc/cmdline.c 2010-04-04 20:46:41.661529739 -0400 33391+++ linux-2.6.32.13/fs/proc/cmdline.c 2010-05-15 13:21:17.694581759 -0400
33225@@ -23,7 +23,11 @@ static const struct file_operations cmdl 33392@@ -23,7 +23,11 @@ static const struct file_operations cmdl
33226 33393
33227 static int __init proc_cmdline_init(void) 33394 static int __init proc_cmdline_init(void)
@@ -33234,9 +33401,9 @@ diff -urNp linux-2.6.32.12/fs/proc/cmdline.c linux-2.6.32.12/fs/proc/cmdline.c
33234 return 0; 33401 return 0;
33235 } 33402 }
33236 module_init(proc_cmdline_init); 33403 module_init(proc_cmdline_init);
33237diff -urNp linux-2.6.32.12/fs/proc/devices.c linux-2.6.32.12/fs/proc/devices.c 33404diff -urNp linux-2.6.32.13/fs/proc/devices.c linux-2.6.32.13/fs/proc/devices.c
33238--- linux-2.6.32.12/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400 33405--- linux-2.6.32.13/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400
33239+++ linux-2.6.32.12/fs/proc/devices.c 2010-04-04 20:46:41.661529739 -0400 33406+++ linux-2.6.32.13/fs/proc/devices.c 2010-05-15 13:21:17.706647417 -0400
33240@@ -64,7 +64,11 @@ static const struct file_operations proc 33407@@ -64,7 +64,11 @@ static const struct file_operations proc
33241 33408
33242 static int __init proc_devices_init(void) 33409 static int __init proc_devices_init(void)
@@ -33249,9 +33416,9 @@ diff -urNp linux-2.6.32.12/fs/proc/devices.c linux-2.6.32.12/fs/proc/devices.c
33249 return 0; 33416 return 0;
33250 } 33417 }
33251 module_init(proc_devices_init); 33418 module_init(proc_devices_init);
33252diff -urNp linux-2.6.32.12/fs/proc/inode.c linux-2.6.32.12/fs/proc/inode.c 33419diff -urNp linux-2.6.32.13/fs/proc/inode.c linux-2.6.32.13/fs/proc/inode.c
33253--- linux-2.6.32.12/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400 33420--- linux-2.6.32.13/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400
33254+++ linux-2.6.32.12/fs/proc/inode.c 2010-04-04 20:46:41.661529739 -0400 33421+++ linux-2.6.32.13/fs/proc/inode.c 2010-05-15 13:21:17.710596393 -0400
33255@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe 33422@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
33256 if (de->mode) { 33423 if (de->mode) {
33257 inode->i_mode = de->mode; 33424 inode->i_mode = de->mode;
@@ -33264,9 +33431,9 @@ diff -urNp linux-2.6.32.12/fs/proc/inode.c linux-2.6.32.12/fs/proc/inode.c
33264 } 33431 }
33265 if (de->size) 33432 if (de->size)
33266 inode->i_size = de->size; 33433 inode->i_size = de->size;
33267diff -urNp linux-2.6.32.12/fs/proc/internal.h linux-2.6.32.12/fs/proc/internal.h 33434diff -urNp linux-2.6.32.13/fs/proc/internal.h linux-2.6.32.13/fs/proc/internal.h
33268--- linux-2.6.32.12/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400 33435--- linux-2.6.32.13/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400
33269+++ linux-2.6.32.12/fs/proc/internal.h 2010-04-04 20:46:41.661529739 -0400 33436+++ linux-2.6.32.13/fs/proc/internal.h 2010-05-15 13:21:17.714628011 -0400
33270@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi 33437@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
33271 struct pid *pid, struct task_struct *task); 33438 struct pid *pid, struct task_struct *task);
33272 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, 33439 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -33277,9 +33444,9 @@ diff -urNp linux-2.6.32.12/fs/proc/internal.h linux-2.6.32.12/fs/proc/internal.h
33277 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); 33444 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
33278 33445
33279 extern const struct file_operations proc_maps_operations; 33446 extern const struct file_operations proc_maps_operations;
33280diff -urNp linux-2.6.32.12/fs/proc/Kconfig linux-2.6.32.12/fs/proc/Kconfig 33447diff -urNp linux-2.6.32.13/fs/proc/Kconfig linux-2.6.32.13/fs/proc/Kconfig
33281--- linux-2.6.32.12/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400 33448--- linux-2.6.32.13/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400
33282+++ linux-2.6.32.12/fs/proc/Kconfig 2010-04-04 20:46:41.661529739 -0400 33449+++ linux-2.6.32.13/fs/proc/Kconfig 2010-05-15 13:21:17.722605604 -0400
33283@@ -30,12 +30,12 @@ config PROC_FS 33450@@ -30,12 +30,12 @@ config PROC_FS
33284 33451
33285 config PROC_KCORE 33452 config PROC_KCORE
@@ -33307,9 +33474,9 @@ diff -urNp linux-2.6.32.12/fs/proc/Kconfig linux-2.6.32.12/fs/proc/Kconfig
33307 bool "Enable /proc page monitoring" if EMBEDDED 33474 bool "Enable /proc page monitoring" if EMBEDDED
33308 help 33475 help
33309 Various /proc files exist to monitor process memory utilization: 33476 Various /proc files exist to monitor process memory utilization:
33310diff -urNp linux-2.6.32.12/fs/proc/kcore.c linux-2.6.32.12/fs/proc/kcore.c 33477diff -urNp linux-2.6.32.13/fs/proc/kcore.c linux-2.6.32.13/fs/proc/kcore.c
33311--- linux-2.6.32.12/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400 33478--- linux-2.6.32.13/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400
33312+++ linux-2.6.32.12/fs/proc/kcore.c 2010-04-04 20:46:41.661529739 -0400 33479+++ linux-2.6.32.13/fs/proc/kcore.c 2010-05-15 13:21:17.730660780 -0400
33313@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use 33480@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use
33314 33481
33315 static int open_kcore(struct inode *inode, struct file *filp) 33482 static int open_kcore(struct inode *inode, struct file *filp)
@@ -33320,9 +33487,9 @@ diff -urNp linux-2.6.32.12/fs/proc/kcore.c linux-2.6.32.12/fs/proc/kcore.c
33320 if (!capable(CAP_SYS_RAWIO)) 33487 if (!capable(CAP_SYS_RAWIO))
33321 return -EPERM; 33488 return -EPERM;
33322 if (kcore_need_update) 33489 if (kcore_need_update)
33323diff -urNp linux-2.6.32.12/fs/proc/meminfo.c linux-2.6.32.12/fs/proc/meminfo.c 33490diff -urNp linux-2.6.32.13/fs/proc/meminfo.c linux-2.6.32.13/fs/proc/meminfo.c
33324--- linux-2.6.32.12/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400 33491--- linux-2.6.32.13/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400
33325+++ linux-2.6.32.12/fs/proc/meminfo.c 2010-04-04 20:46:41.661529739 -0400 33492+++ linux-2.6.32.13/fs/proc/meminfo.c 2010-05-15 13:21:17.734637714 -0400
33326@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ 33493@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
33327 vmi.used >> 10, 33494 vmi.used >> 10,
33328 vmi.largest_chunk >> 10 33495 vmi.largest_chunk >> 10
@@ -33332,9 +33499,9 @@ diff -urNp linux-2.6.32.12/fs/proc/meminfo.c linux-2.6.32.12/fs/proc/meminfo.c
33332 #endif 33499 #endif
33333 ); 33500 );
33334 33501
33335diff -urNp linux-2.6.32.12/fs/proc/nommu.c linux-2.6.32.12/fs/proc/nommu.c 33502diff -urNp linux-2.6.32.13/fs/proc/nommu.c linux-2.6.32.13/fs/proc/nommu.c
33336--- linux-2.6.32.12/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400 33503--- linux-2.6.32.13/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400
33337+++ linux-2.6.32.12/fs/proc/nommu.c 2010-04-04 20:46:41.661529739 -0400 33504+++ linux-2.6.32.13/fs/proc/nommu.c 2010-05-15 13:21:17.738599356 -0400
33338@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ 33505@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
33339 if (len < 1) 33506 if (len < 1)
33340 len = 1; 33507 len = 1;
@@ -33344,9 +33511,9 @@ diff -urNp linux-2.6.32.12/fs/proc/nommu.c linux-2.6.32.12/fs/proc/nommu.c
33344 } 33511 }
33345 33512
33346 seq_putc(m, '\n'); 33513 seq_putc(m, '\n');
33347diff -urNp linux-2.6.32.12/fs/proc/proc_net.c linux-2.6.32.12/fs/proc/proc_net.c 33514diff -urNp linux-2.6.32.13/fs/proc/proc_net.c linux-2.6.32.13/fs/proc/proc_net.c
33348--- linux-2.6.32.12/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400 33515--- linux-2.6.32.13/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400
33349+++ linux-2.6.32.12/fs/proc/proc_net.c 2010-04-04 20:46:41.661529739 -0400 33516+++ linux-2.6.32.13/fs/proc/proc_net.c 2010-05-15 13:21:17.742599005 -0400
33350@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str 33517@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
33351 struct task_struct *task; 33518 struct task_struct *task;
33352 struct nsproxy *ns; 33519 struct nsproxy *ns;
@@ -33365,9 +33532,9 @@ diff -urNp linux-2.6.32.12/fs/proc/proc_net.c linux-2.6.32.12/fs/proc/proc_net.c
33365 33532
33366 rcu_read_lock(); 33533 rcu_read_lock();
33367 task = pid_task(proc_pid(dir), PIDTYPE_PID); 33534 task = pid_task(proc_pid(dir), PIDTYPE_PID);
33368diff -urNp linux-2.6.32.12/fs/proc/proc_sysctl.c linux-2.6.32.12/fs/proc/proc_sysctl.c 33535diff -urNp linux-2.6.32.13/fs/proc/proc_sysctl.c linux-2.6.32.13/fs/proc/proc_sysctl.c
33369--- linux-2.6.32.12/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 33536--- linux-2.6.32.13/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400
33370+++ linux-2.6.32.12/fs/proc/proc_sysctl.c 2010-04-04 20:46:41.661529739 -0400 33537+++ linux-2.6.32.13/fs/proc/proc_sysctl.c 2010-05-15 13:21:17.746588317 -0400
33371@@ -7,6 +7,8 @@ 33538@@ -7,6 +7,8 @@
33372 #include <linux/security.h> 33539 #include <linux/security.h>
33373 #include "internal.h" 33540 #include "internal.h"
@@ -33407,9 +33574,9 @@ diff -urNp linux-2.6.32.12/fs/proc/proc_sysctl.c linux-2.6.32.12/fs/proc/proc_sy
33407 generic_fillattr(inode, stat); 33574 generic_fillattr(inode, stat);
33408 if (table) 33575 if (table)
33409 stat->mode = (stat->mode & S_IFMT) | table->mode; 33576 stat->mode = (stat->mode & S_IFMT) | table->mode;
33410diff -urNp linux-2.6.32.12/fs/proc/root.c linux-2.6.32.12/fs/proc/root.c 33577diff -urNp linux-2.6.32.13/fs/proc/root.c linux-2.6.32.13/fs/proc/root.c
33411--- linux-2.6.32.12/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400 33578--- linux-2.6.32.13/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400
33412+++ linux-2.6.32.12/fs/proc/root.c 2010-04-04 20:46:41.661529739 -0400 33579+++ linux-2.6.32.13/fs/proc/root.c 2010-05-15 13:21:17.750584298 -0400
33413@@ -134,7 +134,15 @@ void __init proc_root_init(void) 33580@@ -134,7 +134,15 @@ void __init proc_root_init(void)
33414 #ifdef CONFIG_PROC_DEVICETREE 33581 #ifdef CONFIG_PROC_DEVICETREE
33415 proc_device_tree_init(); 33582 proc_device_tree_init();
@@ -33426,9 +33593,9 @@ diff -urNp linux-2.6.32.12/fs/proc/root.c linux-2.6.32.12/fs/proc/root.c
33426 proc_sys_init(); 33593 proc_sys_init();
33427 } 33594 }
33428 33595
33429diff -urNp linux-2.6.32.12/fs/proc/task_mmu.c linux-2.6.32.12/fs/proc/task_mmu.c 33596diff -urNp linux-2.6.32.13/fs/proc/task_mmu.c linux-2.6.32.13/fs/proc/task_mmu.c
33430--- linux-2.6.32.12/fs/proc/task_mmu.c 2010-03-15 11:52:04.000000000 -0400 33597--- linux-2.6.32.13/fs/proc/task_mmu.c 2010-03-15 11:52:04.000000000 -0400
33431+++ linux-2.6.32.12/fs/proc/task_mmu.c 2010-04-04 20:46:41.661529739 -0400 33598+++ linux-2.6.32.13/fs/proc/task_mmu.c 2010-05-15 13:21:17.758934117 -0400
33432@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct 33599@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
33433 "VmStk:\t%8lu kB\n" 33600 "VmStk:\t%8lu kB\n"
33434 "VmExe:\t%8lu kB\n" 33601 "VmExe:\t%8lu kB\n"
@@ -33549,9 +33716,9 @@ diff -urNp linux-2.6.32.12/fs/proc/task_mmu.c linux-2.6.32.12/fs/proc/task_mmu.c
33549 mss.resident >> 10, 33716 mss.resident >> 10,
33550 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), 33717 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
33551 mss.shared_clean >> 10, 33718 mss.shared_clean >> 10,
33552diff -urNp linux-2.6.32.12/fs/proc/task_nommu.c linux-2.6.32.12/fs/proc/task_nommu.c 33719diff -urNp linux-2.6.32.13/fs/proc/task_nommu.c linux-2.6.32.13/fs/proc/task_nommu.c
33553--- linux-2.6.32.12/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400 33720--- linux-2.6.32.13/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400
33554+++ linux-2.6.32.12/fs/proc/task_nommu.c 2010-04-04 20:46:41.661529739 -0400 33721+++ linux-2.6.32.13/fs/proc/task_nommu.c 2010-05-15 13:21:17.758934117 -0400
33555@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct 33722@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
33556 else 33723 else
33557 bytes += kobjsize(mm); 33724 bytes += kobjsize(mm);
@@ -33570,9 +33737,9 @@ diff -urNp linux-2.6.32.12/fs/proc/task_nommu.c linux-2.6.32.12/fs/proc/task_nom
33570 } 33737 }
33571 33738
33572 seq_putc(m, '\n'); 33739 seq_putc(m, '\n');
33573diff -urNp linux-2.6.32.12/fs/readdir.c linux-2.6.32.12/fs/readdir.c 33740diff -urNp linux-2.6.32.13/fs/readdir.c linux-2.6.32.13/fs/readdir.c
33574--- linux-2.6.32.12/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400 33741--- linux-2.6.32.13/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400
33575+++ linux-2.6.32.12/fs/readdir.c 2010-04-04 20:46:41.661529739 -0400 33742+++ linux-2.6.32.13/fs/readdir.c 2010-05-15 13:21:17.778956743 -0400
33576@@ -16,6 +16,7 @@ 33743@@ -16,6 +16,7 @@
33577 #include <linux/security.h> 33744 #include <linux/security.h>
33578 #include <linux/syscalls.h> 33745 #include <linux/syscalls.h>
@@ -33662,9 +33829,9 @@ diff -urNp linux-2.6.32.12/fs/readdir.c linux-2.6.32.12/fs/readdir.c
33662 buf.count = count; 33829 buf.count = count;
33663 buf.error = 0; 33830 buf.error = 0;
33664 33831
33665diff -urNp linux-2.6.32.12/fs/reiserfs/do_balan.c linux-2.6.32.12/fs/reiserfs/do_balan.c 33832diff -urNp linux-2.6.32.13/fs/reiserfs/do_balan.c linux-2.6.32.13/fs/reiserfs/do_balan.c
33666--- linux-2.6.32.12/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400 33833--- linux-2.6.32.13/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400
33667+++ linux-2.6.32.12/fs/reiserfs/do_balan.c 2010-04-04 20:46:41.661529739 -0400 33834+++ linux-2.6.32.13/fs/reiserfs/do_balan.c 2010-05-15 13:21:17.786600991 -0400
33668@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, 33835@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
33669 return; 33836 return;
33670 } 33837 }
@@ -33674,9 +33841,9 @@ diff -urNp linux-2.6.32.12/fs/reiserfs/do_balan.c linux-2.6.32.12/fs/reiserfs/do
33674 do_balance_starts(tb); 33841 do_balance_starts(tb);
33675 33842
33676 /* balance leaf returns 0 except if combining L R and S into 33843 /* balance leaf returns 0 except if combining L R and S into
33677diff -urNp linux-2.6.32.12/fs/reiserfs/item_ops.c linux-2.6.32.12/fs/reiserfs/item_ops.c 33844diff -urNp linux-2.6.32.13/fs/reiserfs/item_ops.c linux-2.6.32.13/fs/reiserfs/item_ops.c
33678--- linux-2.6.32.12/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400 33845--- linux-2.6.32.13/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400
33679+++ linux-2.6.32.12/fs/reiserfs/item_ops.c 2010-04-04 20:46:41.661529739 -0400 33846+++ linux-2.6.32.13/fs/reiserfs/item_ops.c 2010-05-15 13:21:17.794567981 -0400
33680@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i 33847@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
33681 vi->vi_index, vi->vi_type, vi->vi_ih); 33848 vi->vi_index, vi->vi_type, vi->vi_ih);
33682 } 33849 }
@@ -33731,9 +33898,9 @@ diff -urNp linux-2.6.32.12/fs/reiserfs/item_ops.c linux-2.6.32.12/fs/reiserfs/it
33731 &stat_data_ops, 33898 &stat_data_ops,
33732 &indirect_ops, 33899 &indirect_ops,
33733 &direct_ops, 33900 &direct_ops,
33734diff -urNp linux-2.6.32.12/fs/reiserfs/procfs.c linux-2.6.32.12/fs/reiserfs/procfs.c 33901diff -urNp linux-2.6.32.13/fs/reiserfs/procfs.c linux-2.6.32.13/fs/reiserfs/procfs.c
33735--- linux-2.6.32.12/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400 33902--- linux-2.6.32.13/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400
33736+++ linux-2.6.32.12/fs/reiserfs/procfs.c 2010-04-04 20:46:41.661529739 -0400 33903+++ linux-2.6.32.13/fs/reiserfs/procfs.c 2010-05-15 13:21:17.802593961 -0400
33737@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m 33904@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
33738 "SMALL_TAILS " : "NO_TAILS ", 33905 "SMALL_TAILS " : "NO_TAILS ",
33739 replay_only(sb) ? "REPLAY_ONLY " : "", 33906 replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -33743,9 +33910,9 @@ diff -urNp linux-2.6.32.12/fs/reiserfs/procfs.c linux-2.6.32.12/fs/reiserfs/proc
33743 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), 33910 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
33744 SF(s_do_balance), SF(s_unneeded_left_neighbor), 33911 SF(s_do_balance), SF(s_unneeded_left_neighbor),
33745 SF(s_good_search_by_key_reada), SF(s_bmaps), 33912 SF(s_good_search_by_key_reada), SF(s_bmaps),
33746diff -urNp linux-2.6.32.12/fs/select.c linux-2.6.32.12/fs/select.c 33913diff -urNp linux-2.6.32.13/fs/select.c linux-2.6.32.13/fs/select.c
33747--- linux-2.6.32.12/fs/select.c 2010-03-15 11:52:04.000000000 -0400 33914--- linux-2.6.32.13/fs/select.c 2010-03-15 11:52:04.000000000 -0400
33748+++ linux-2.6.32.12/fs/select.c 2010-04-04 20:46:41.661529739 -0400 33915+++ linux-2.6.32.13/fs/select.c 2010-05-15 13:21:17.806683634 -0400
33749@@ -20,6 +20,7 @@ 33916@@ -20,6 +20,7 @@
33750 #include <linux/module.h> 33917 #include <linux/module.h>
33751 #include <linux/slab.h> 33918 #include <linux/slab.h>
@@ -33762,9 +33929,9 @@ diff -urNp linux-2.6.32.12/fs/select.c linux-2.6.32.12/fs/select.c
33762 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 33929 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
33763 return -EINVAL; 33930 return -EINVAL;
33764 33931
33765diff -urNp linux-2.6.32.12/fs/seq_file.c linux-2.6.32.12/fs/seq_file.c 33932diff -urNp linux-2.6.32.13/fs/seq_file.c linux-2.6.32.13/fs/seq_file.c
33766--- linux-2.6.32.12/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400 33933--- linux-2.6.32.13/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400
33767+++ linux-2.6.32.12/fs/seq_file.c 2010-04-04 20:46:41.661529739 -0400 33934+++ linux-2.6.32.13/fs/seq_file.c 2010-05-15 13:21:17.810601731 -0400
33768@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 33935@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
33769 return 0; 33936 return 0;
33770 } 33937 }
@@ -33805,9 +33972,9 @@ diff -urNp linux-2.6.32.12/fs/seq_file.c linux-2.6.32.12/fs/seq_file.c
33805 if (!m->buf) 33972 if (!m->buf)
33806 goto Enomem; 33973 goto Enomem;
33807 m->count = 0; 33974 m->count = 0;
33808diff -urNp linux-2.6.32.12/fs/smbfs/symlink.c linux-2.6.32.12/fs/smbfs/symlink.c 33975diff -urNp linux-2.6.32.13/fs/smbfs/symlink.c linux-2.6.32.13/fs/smbfs/symlink.c
33809--- linux-2.6.32.12/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 33976--- linux-2.6.32.13/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400
33810+++ linux-2.6.32.12/fs/smbfs/symlink.c 2010-04-04 20:46:41.661529739 -0400 33977+++ linux-2.6.32.13/fs/smbfs/symlink.c 2010-05-15 13:21:17.810601731 -0400
33811@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent 33978@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
33812 33979
33813 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 33980 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -33817,9 +33984,9 @@ diff -urNp linux-2.6.32.12/fs/smbfs/symlink.c linux-2.6.32.12/fs/smbfs/symlink.c
33817 if (!IS_ERR(s)) 33984 if (!IS_ERR(s))
33818 __putname(s); 33985 __putname(s);
33819 } 33986 }
33820diff -urNp linux-2.6.32.12/fs/splice.c linux-2.6.32.12/fs/splice.c 33987diff -urNp linux-2.6.32.13/fs/splice.c linux-2.6.32.13/fs/splice.c
33821--- linux-2.6.32.12/fs/splice.c 2010-03-15 11:52:04.000000000 -0400 33988--- linux-2.6.32.13/fs/splice.c 2010-03-15 11:52:04.000000000 -0400
33822+++ linux-2.6.32.12/fs/splice.c 2010-04-04 20:46:41.661529739 -0400 33989+++ linux-2.6.32.13/fs/splice.c 2010-05-15 13:21:17.818603295 -0400
33823@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode 33990@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
33824 pipe_lock(pipe); 33991 pipe_lock(pipe);
33825 33992
@@ -33958,9 +34125,9 @@ diff -urNp linux-2.6.32.12/fs/splice.c linux-2.6.32.12/fs/splice.c
33958 ret = -EAGAIN; 34125 ret = -EAGAIN;
33959 34126
33960 pipe_unlock(ipipe); 34127 pipe_unlock(ipipe);
33961diff -urNp linux-2.6.32.12/fs/sysfs/file.c linux-2.6.32.12/fs/sysfs/file.c 34128diff -urNp linux-2.6.32.13/fs/sysfs/file.c linux-2.6.32.13/fs/sysfs/file.c
33962--- linux-2.6.32.12/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400 34129--- linux-2.6.32.13/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400
33963+++ linux-2.6.32.12/fs/sysfs/file.c 2010-04-04 20:46:41.661529739 -0400 34130+++ linux-2.6.32.13/fs/sysfs/file.c 2010-05-15 13:21:17.818603295 -0400
33964@@ -53,7 +53,7 @@ struct sysfs_buffer { 34131@@ -53,7 +53,7 @@ struct sysfs_buffer {
33965 size_t count; 34132 size_t count;
33966 loff_t pos; 34133 loff_t pos;
@@ -33997,9 +34164,9 @@ diff -urNp linux-2.6.32.12/fs/sysfs/file.c linux-2.6.32.12/fs/sysfs/file.c
33997 int error = -EACCES; 34164 int error = -EACCES;
33998 char *p; 34165 char *p;
33999 34166
34000diff -urNp linux-2.6.32.12/fs/sysfs/symlink.c linux-2.6.32.12/fs/sysfs/symlink.c 34167diff -urNp linux-2.6.32.13/fs/sysfs/symlink.c linux-2.6.32.13/fs/sysfs/symlink.c
34001--- linux-2.6.32.12/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 34168--- linux-2.6.32.13/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400
34002+++ linux-2.6.32.12/fs/sysfs/symlink.c 2010-04-04 20:46:41.661529739 -0400 34169+++ linux-2.6.32.13/fs/sysfs/symlink.c 2010-05-15 13:21:17.822590321 -0400
34003@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de 34170@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
34004 34171
34005 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) 34172 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -34009,9 +34176,9 @@ diff -urNp linux-2.6.32.12/fs/sysfs/symlink.c linux-2.6.32.12/fs/sysfs/symlink.c
34009 if (!IS_ERR(page)) 34176 if (!IS_ERR(page))
34010 free_page((unsigned long)page); 34177 free_page((unsigned long)page);
34011 } 34178 }
34012diff -urNp linux-2.6.32.12/fs/udf/balloc.c linux-2.6.32.12/fs/udf/balloc.c 34179diff -urNp linux-2.6.32.13/fs/udf/balloc.c linux-2.6.32.13/fs/udf/balloc.c
34013--- linux-2.6.32.12/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400 34180--- linux-2.6.32.13/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400
34014+++ linux-2.6.32.12/fs/udf/balloc.c 2010-04-04 20:46:41.665784997 -0400 34181+++ linux-2.6.32.13/fs/udf/balloc.c 2010-05-15 13:21:17.834616935 -0400
34015@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc 34182@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
34016 34183
34017 mutex_lock(&sbi->s_alloc_mutex); 34184 mutex_lock(&sbi->s_alloc_mutex);
@@ -34034,9 +34201,9 @@ diff -urNp linux-2.6.32.12/fs/udf/balloc.c linux-2.6.32.12/fs/udf/balloc.c
34034 udf_debug("%d < %d || %d + %d > %d\n", 34201 udf_debug("%d < %d || %d + %d > %d\n",
34035 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, 34202 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
34036 partmap->s_partition_len); 34203 partmap->s_partition_len);
34037diff -urNp linux-2.6.32.12/fs/udf/misc.c linux-2.6.32.12/fs/udf/misc.c 34204diff -urNp linux-2.6.32.13/fs/udf/misc.c linux-2.6.32.13/fs/udf/misc.c
34038--- linux-2.6.32.12/fs/udf/misc.c 2010-03-15 11:52:04.000000000 -0400 34205--- linux-2.6.32.13/fs/udf/misc.c 2010-03-15 11:52:04.000000000 -0400
34039+++ linux-2.6.32.12/fs/udf/misc.c 2010-04-29 17:46:37.289044536 -0400 34206+++ linux-2.6.32.13/fs/udf/misc.c 2010-05-15 13:21:17.834616935 -0400
34040@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat 34207@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
34041 iinfo->i_lenEAttr += size; 34208 iinfo->i_lenEAttr += size;
34042 return (struct genericFormat *)&ea[offset]; 34209 return (struct genericFormat *)&ea[offset];
@@ -34048,9 +34215,9 @@ diff -urNp linux-2.6.32.12/fs/udf/misc.c linux-2.6.32.12/fs/udf/misc.c
34048 34215
34049 return NULL; 34216 return NULL;
34050 } 34217 }
34051diff -urNp linux-2.6.32.12/fs/udf/udfdecl.h linux-2.6.32.12/fs/udf/udfdecl.h 34218diff -urNp linux-2.6.32.13/fs/udf/udfdecl.h linux-2.6.32.13/fs/udf/udfdecl.h
34052--- linux-2.6.32.12/fs/udf/udfdecl.h 2010-03-15 11:52:04.000000000 -0400 34219--- linux-2.6.32.13/fs/udf/udfdecl.h 2010-03-15 11:52:04.000000000 -0400
34053+++ linux-2.6.32.12/fs/udf/udfdecl.h 2010-04-29 17:46:37.289044536 -0400 34220+++ linux-2.6.32.13/fs/udf/udfdecl.h 2010-05-15 13:21:17.859848219 -0400
34054@@ -26,7 +26,7 @@ do { \ 34221@@ -26,7 +26,7 @@ do { \
34055 printk(f, ##a); \ 34222 printk(f, ##a); \
34056 } while (0) 34223 } while (0)
@@ -34060,9 +34227,9 @@ diff -urNp linux-2.6.32.12/fs/udf/udfdecl.h linux-2.6.32.12/fs/udf/udfdecl.h
34060 #endif 34227 #endif
34061 34228
34062 #define udf_info(f, a...) \ 34229 #define udf_info(f, a...) \
34063diff -urNp linux-2.6.32.12/fs/utimes.c linux-2.6.32.12/fs/utimes.c 34230diff -urNp linux-2.6.32.13/fs/utimes.c linux-2.6.32.13/fs/utimes.c
34064--- linux-2.6.32.12/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400 34231--- linux-2.6.32.13/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400
34065+++ linux-2.6.32.12/fs/utimes.c 2010-04-04 20:46:41.665784997 -0400 34232+++ linux-2.6.32.13/fs/utimes.c 2010-05-15 13:21:17.859848219 -0400
34066@@ -1,6 +1,7 @@ 34233@@ -1,6 +1,7 @@
34067 #include <linux/compiler.h> 34234 #include <linux/compiler.h>
34068 #include <linux/file.h> 34235 #include <linux/file.h>
@@ -34084,9 +34251,9 @@ diff -urNp linux-2.6.32.12/fs/utimes.c linux-2.6.32.12/fs/utimes.c
34084 mutex_lock(&inode->i_mutex); 34251 mutex_lock(&inode->i_mutex);
34085 error = notify_change(path->dentry, &newattrs); 34252 error = notify_change(path->dentry, &newattrs);
34086 mutex_unlock(&inode->i_mutex); 34253 mutex_unlock(&inode->i_mutex);
34087diff -urNp linux-2.6.32.12/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.12/fs/xfs/linux-2.6/xfs_ioctl.c 34254diff -urNp linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c
34088--- linux-2.6.32.12/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400 34255--- linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400
34089+++ linux-2.6.32.12/fs/xfs/linux-2.6/xfs_ioctl.c 2010-04-04 20:46:41.665784997 -0400 34256+++ linux-2.6.32.13/fs/xfs/linux-2.6/xfs_ioctl.c 2010-05-15 13:21:17.862604779 -0400
34090@@ -134,7 +134,7 @@ xfs_find_handle( 34257@@ -134,7 +134,7 @@ xfs_find_handle(
34091 } 34258 }
34092 34259
@@ -34096,9 +34263,9 @@ diff -urNp linux-2.6.32.12/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.12/fs/xfs/l
34096 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) 34263 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
34097 goto out_put; 34264 goto out_put;
34098 34265
34099diff -urNp linux-2.6.32.12/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.12/fs/xfs/linux-2.6/xfs_iops.c 34266diff -urNp linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c
34100--- linux-2.6.32.12/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:38.453075413 -0400 34267--- linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:38.453075413 -0400
34101+++ linux-2.6.32.12/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:58.609026943 -0400 34268+++ linux-2.6.32.13/fs/xfs/linux-2.6/xfs_iops.c 2010-05-15 13:21:17.866593235 -0400
34102@@ -468,7 +468,7 @@ xfs_vn_put_link( 34269@@ -468,7 +468,7 @@ xfs_vn_put_link(
34103 struct nameidata *nd, 34270 struct nameidata *nd,
34104 void *p) 34271 void *p)
@@ -34108,9 +34275,9 @@ diff -urNp linux-2.6.32.12/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.12/fs/xfs/li
34108 34275
34109 if (!IS_ERR(s)) 34276 if (!IS_ERR(s))
34110 kfree(s); 34277 kfree(s);
34111diff -urNp linux-2.6.32.12/fs/xfs/xfs_bmap.c linux-2.6.32.12/fs/xfs/xfs_bmap.c 34278diff -urNp linux-2.6.32.13/fs/xfs/xfs_bmap.c linux-2.6.32.13/fs/xfs/xfs_bmap.c
34112--- linux-2.6.32.12/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400 34279--- linux-2.6.32.13/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400
34113+++ linux-2.6.32.12/fs/xfs/xfs_bmap.c 2010-04-04 20:46:41.665784997 -0400 34280+++ linux-2.6.32.13/fs/xfs/xfs_bmap.c 2010-05-15 13:21:17.902607196 -0400
34114@@ -360,7 +360,7 @@ xfs_bmap_validate_ret( 34281@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
34115 int nmap, 34282 int nmap,
34116 int ret_nmap); 34283 int ret_nmap);
@@ -34120,9 +34287,9 @@ diff -urNp linux-2.6.32.12/fs/xfs/xfs_bmap.c linux-2.6.32.12/fs/xfs/xfs_bmap.c
34120 #endif /* DEBUG */ 34287 #endif /* DEBUG */
34121 34288
34122 #if defined(XFS_RW_TRACE) 34289 #if defined(XFS_RW_TRACE)
34123diff -urNp linux-2.6.32.12/grsecurity/gracl_alloc.c linux-2.6.32.12/grsecurity/gracl_alloc.c 34290diff -urNp linux-2.6.32.13/grsecurity/gracl_alloc.c linux-2.6.32.13/grsecurity/gracl_alloc.c
34124--- linux-2.6.32.12/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 34291--- linux-2.6.32.13/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
34125+++ linux-2.6.32.12/grsecurity/gracl_alloc.c 2010-04-04 20:46:41.665784997 -0400 34292+++ linux-2.6.32.13/grsecurity/gracl_alloc.c 2010-05-15 13:21:17.902607196 -0400
34126@@ -0,0 +1,105 @@ 34293@@ -0,0 +1,105 @@
34127+#include <linux/kernel.h> 34294+#include <linux/kernel.h>
34128+#include <linux/mm.h> 34295+#include <linux/mm.h>
@@ -34229,9 +34396,9 @@ diff -urNp linux-2.6.32.12/grsecurity/gracl_alloc.c linux-2.6.32.12/grsecurity/g
34229+ else 34396+ else
34230+ return 1; 34397+ return 1;
34231+} 34398+}
34232diff -urNp linux-2.6.32.12/grsecurity/gracl.c linux-2.6.32.12/grsecurity/gracl.c 34399diff -urNp linux-2.6.32.13/grsecurity/gracl.c linux-2.6.32.13/grsecurity/gracl.c
34233--- linux-2.6.32.12/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 34400--- linux-2.6.32.13/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
34234+++ linux-2.6.32.12/grsecurity/gracl.c 2010-04-29 17:48:04.497204424 -0400 34401+++ linux-2.6.32.13/grsecurity/gracl.c 2010-05-15 13:21:17.906582737 -0400
34235@@ -0,0 +1,3897 @@ 34402@@ -0,0 +1,3897 @@
34236+#include <linux/kernel.h> 34403+#include <linux/kernel.h>
34237+#include <linux/module.h> 34404+#include <linux/module.h>
@@ -38130,9 +38297,9 @@ diff -urNp linux-2.6.32.12/grsecurity/gracl.c linux-2.6.32.12/grsecurity/gracl.c
38130+EXPORT_SYMBOL(gr_check_group_change); 38297+EXPORT_SYMBOL(gr_check_group_change);
38131+#endif 38298+#endif
38132+ 38299+
38133diff -urNp linux-2.6.32.12/grsecurity/gracl_cap.c linux-2.6.32.12/grsecurity/gracl_cap.c 38300diff -urNp linux-2.6.32.13/grsecurity/gracl_cap.c linux-2.6.32.13/grsecurity/gracl_cap.c
38134--- linux-2.6.32.12/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 38301--- linux-2.6.32.13/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
38135+++ linux-2.6.32.12/grsecurity/gracl_cap.c 2010-04-04 20:46:41.668784531 -0400 38302+++ linux-2.6.32.13/grsecurity/gracl_cap.c 2010-05-15 13:21:17.906582737 -0400
38136@@ -0,0 +1,131 @@ 38303@@ -0,0 +1,131 @@
38137+#include <linux/kernel.h> 38304+#include <linux/kernel.h>
38138+#include <linux/module.h> 38305+#include <linux/module.h>
@@ -38265,9 +38432,9 @@ diff -urNp linux-2.6.32.12/grsecurity/gracl_cap.c linux-2.6.32.12/grsecurity/gra
38265+ return 0; 38432+ return 0;
38266+} 38433+}
38267+ 38434+
38268diff -urNp linux-2.6.32.12/grsecurity/gracl_fs.c linux-2.6.32.12/grsecurity/gracl_fs.c 38435diff -urNp linux-2.6.32.13/grsecurity/gracl_fs.c linux-2.6.32.13/grsecurity/gracl_fs.c
38269--- linux-2.6.32.12/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 38436--- linux-2.6.32.13/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
38270+++ linux-2.6.32.12/grsecurity/gracl_fs.c 2010-04-04 20:46:41.668784531 -0400 38437+++ linux-2.6.32.13/grsecurity/gracl_fs.c 2010-05-15 13:21:17.906582737 -0400
38271@@ -0,0 +1,424 @@ 38438@@ -0,0 +1,424 @@
38272+#include <linux/kernel.h> 38439+#include <linux/kernel.h>
38273+#include <linux/sched.h> 38440+#include <linux/sched.h>
@@ -38693,9 +38860,9 @@ diff -urNp linux-2.6.32.12/grsecurity/gracl_fs.c linux-2.6.32.12/grsecurity/grac
38693+ 38860+
38694+ return 0; 38861+ return 0;
38695+} 38862+}
38696diff -urNp linux-2.6.32.12/grsecurity/gracl_ip.c linux-2.6.32.12/grsecurity/gracl_ip.c 38863diff -urNp linux-2.6.32.13/grsecurity/gracl_ip.c linux-2.6.32.13/grsecurity/gracl_ip.c
38697--- linux-2.6.32.12/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 38864--- linux-2.6.32.13/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
38698+++ linux-2.6.32.12/grsecurity/gracl_ip.c 2010-04-04 20:46:41.668784531 -0400 38865+++ linux-2.6.32.13/grsecurity/gracl_ip.c 2010-05-15 13:21:17.906582737 -0400
38699@@ -0,0 +1,339 @@ 38866@@ -0,0 +1,339 @@
38700+#include <linux/kernel.h> 38867+#include <linux/kernel.h>
38701+#include <asm/uaccess.h> 38868+#include <asm/uaccess.h>
@@ -39036,9 +39203,9 @@ diff -urNp linux-2.6.32.12/grsecurity/gracl_ip.c linux-2.6.32.12/grsecurity/grac
39036+ 39203+
39037+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); 39204+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
39038+} 39205+}
39039diff -urNp linux-2.6.32.12/grsecurity/gracl_learn.c linux-2.6.32.12/grsecurity/gracl_learn.c 39206diff -urNp linux-2.6.32.13/grsecurity/gracl_learn.c linux-2.6.32.13/grsecurity/gracl_learn.c
39040--- linux-2.6.32.12/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 39207--- linux-2.6.32.13/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
39041+++ linux-2.6.32.12/grsecurity/gracl_learn.c 2010-04-04 20:46:41.668784531 -0400 39208+++ linux-2.6.32.13/grsecurity/gracl_learn.c 2010-05-15 13:21:17.906582737 -0400
39042@@ -0,0 +1,211 @@ 39209@@ -0,0 +1,211 @@
39043+#include <linux/kernel.h> 39210+#include <linux/kernel.h>
39044+#include <linux/mm.h> 39211+#include <linux/mm.h>
@@ -39251,9 +39418,9 @@ diff -urNp linux-2.6.32.12/grsecurity/gracl_learn.c linux-2.6.32.12/grsecurity/g
39251+ .release = close_learn, 39418+ .release = close_learn,
39252+ .poll = poll_learn, 39419+ .poll = poll_learn,
39253+}; 39420+};
39254diff -urNp linux-2.6.32.12/grsecurity/gracl_res.c linux-2.6.32.12/grsecurity/gracl_res.c 39421diff -urNp linux-2.6.32.13/grsecurity/gracl_res.c linux-2.6.32.13/grsecurity/gracl_res.c
39255--- linux-2.6.32.12/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 39422--- linux-2.6.32.13/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
39256+++ linux-2.6.32.12/grsecurity/gracl_res.c 2010-04-04 20:46:41.668784531 -0400 39423+++ linux-2.6.32.13/grsecurity/gracl_res.c 2010-05-15 13:21:17.906582737 -0400
39257@@ -0,0 +1,65 @@ 39424@@ -0,0 +1,65 @@
39258+#include <linux/kernel.h> 39425+#include <linux/kernel.h>
39259+#include <linux/sched.h> 39426+#include <linux/sched.h>
@@ -39320,9 +39487,9 @@ diff -urNp linux-2.6.32.12/grsecurity/gracl_res.c linux-2.6.32.12/grsecurity/gra
39320+ rcu_read_unlock(); 39487+ rcu_read_unlock();
39321+ return; 39488+ return;
39322+} 39489+}
39323diff -urNp linux-2.6.32.12/grsecurity/gracl_segv.c linux-2.6.32.12/grsecurity/gracl_segv.c 39490diff -urNp linux-2.6.32.13/grsecurity/gracl_segv.c linux-2.6.32.13/grsecurity/gracl_segv.c
39324--- linux-2.6.32.12/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 39491--- linux-2.6.32.13/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
39325+++ linux-2.6.32.12/grsecurity/gracl_segv.c 2010-04-04 20:46:41.668784531 -0400 39492+++ linux-2.6.32.13/grsecurity/gracl_segv.c 2010-05-15 13:21:17.906582737 -0400
39326@@ -0,0 +1,310 @@ 39493@@ -0,0 +1,310 @@
39327+#include <linux/kernel.h> 39494+#include <linux/kernel.h>
39328+#include <linux/mm.h> 39495+#include <linux/mm.h>
@@ -39634,9 +39801,9 @@ diff -urNp linux-2.6.32.12/grsecurity/gracl_segv.c linux-2.6.32.12/grsecurity/gr
39634+ 39801+
39635+ return; 39802+ return;
39636+} 39803+}
39637diff -urNp linux-2.6.32.12/grsecurity/gracl_shm.c linux-2.6.32.12/grsecurity/gracl_shm.c 39804diff -urNp linux-2.6.32.13/grsecurity/gracl_shm.c linux-2.6.32.13/grsecurity/gracl_shm.c
39638--- linux-2.6.32.12/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 39805--- linux-2.6.32.13/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
39639+++ linux-2.6.32.12/grsecurity/gracl_shm.c 2010-04-04 20:46:41.668784531 -0400 39806+++ linux-2.6.32.13/grsecurity/gracl_shm.c 2010-05-15 13:21:17.906582737 -0400
39640@@ -0,0 +1,37 @@ 39807@@ -0,0 +1,37 @@
39641+#include <linux/kernel.h> 39808+#include <linux/kernel.h>
39642+#include <linux/mm.h> 39809+#include <linux/mm.h>
@@ -39675,9 +39842,9 @@ diff -urNp linux-2.6.32.12/grsecurity/gracl_shm.c linux-2.6.32.12/grsecurity/gra
39675+ 39842+
39676+ return 1; 39843+ return 1;
39677+} 39844+}
39678diff -urNp linux-2.6.32.12/grsecurity/grsec_chdir.c linux-2.6.32.12/grsecurity/grsec_chdir.c 39845diff -urNp linux-2.6.32.13/grsecurity/grsec_chdir.c linux-2.6.32.13/grsecurity/grsec_chdir.c
39679--- linux-2.6.32.12/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 39846--- linux-2.6.32.13/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
39680+++ linux-2.6.32.12/grsecurity/grsec_chdir.c 2010-04-04 20:46:41.668784531 -0400 39847+++ linux-2.6.32.13/grsecurity/grsec_chdir.c 2010-05-15 13:21:17.906582737 -0400
39681@@ -0,0 +1,19 @@ 39848@@ -0,0 +1,19 @@
39682+#include <linux/kernel.h> 39849+#include <linux/kernel.h>
39683+#include <linux/sched.h> 39850+#include <linux/sched.h>
@@ -39698,9 +39865,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_chdir.c linux-2.6.32.12/grsecurity/g
39698+#endif 39865+#endif
39699+ return; 39866+ return;
39700+} 39867+}
39701diff -urNp linux-2.6.32.12/grsecurity/grsec_chroot.c linux-2.6.32.12/grsecurity/grsec_chroot.c 39868diff -urNp linux-2.6.32.13/grsecurity/grsec_chroot.c linux-2.6.32.13/grsecurity/grsec_chroot.c
39702--- linux-2.6.32.12/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 39869--- linux-2.6.32.13/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
39703+++ linux-2.6.32.12/grsecurity/grsec_chroot.c 2010-04-04 20:46:41.668784531 -0400 39870+++ linux-2.6.32.13/grsecurity/grsec_chroot.c 2010-05-15 13:21:17.906582737 -0400
39704@@ -0,0 +1,348 @@ 39871@@ -0,0 +1,348 @@
39705+#include <linux/kernel.h> 39872+#include <linux/kernel.h>
39706+#include <linux/module.h> 39873+#include <linux/module.h>
@@ -40050,9 +40217,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_chroot.c linux-2.6.32.12/grsecurity/
40050+#ifdef CONFIG_SECURITY 40217+#ifdef CONFIG_SECURITY
40051+EXPORT_SYMBOL(gr_handle_chroot_caps); 40218+EXPORT_SYMBOL(gr_handle_chroot_caps);
40052+#endif 40219+#endif
40053diff -urNp linux-2.6.32.12/grsecurity/grsec_disabled.c linux-2.6.32.12/grsecurity/grsec_disabled.c 40220diff -urNp linux-2.6.32.13/grsecurity/grsec_disabled.c linux-2.6.32.13/grsecurity/grsec_disabled.c
40054--- linux-2.6.32.12/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 40221--- linux-2.6.32.13/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
40055+++ linux-2.6.32.12/grsecurity/grsec_disabled.c 2010-04-04 20:46:41.668784531 -0400 40222+++ linux-2.6.32.13/grsecurity/grsec_disabled.c 2010-05-15 13:21:17.906582737 -0400
40056@@ -0,0 +1,426 @@ 40223@@ -0,0 +1,426 @@
40057+#include <linux/kernel.h> 40224+#include <linux/kernel.h>
40058+#include <linux/module.h> 40225+#include <linux/module.h>
@@ -40480,9 +40647,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_disabled.c linux-2.6.32.12/grsecurit
40480+EXPORT_SYMBOL(gr_check_user_change); 40647+EXPORT_SYMBOL(gr_check_user_change);
40481+EXPORT_SYMBOL(gr_check_group_change); 40648+EXPORT_SYMBOL(gr_check_group_change);
40482+#endif 40649+#endif
40483diff -urNp linux-2.6.32.12/grsecurity/grsec_exec.c linux-2.6.32.12/grsecurity/grsec_exec.c 40650diff -urNp linux-2.6.32.13/grsecurity/grsec_exec.c linux-2.6.32.13/grsecurity/grsec_exec.c
40484--- linux-2.6.32.12/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 40651--- linux-2.6.32.13/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
40485+++ linux-2.6.32.12/grsecurity/grsec_exec.c 2010-04-04 20:46:41.668784531 -0400 40652+++ linux-2.6.32.13/grsecurity/grsec_exec.c 2010-05-15 13:21:17.906582737 -0400
40486@@ -0,0 +1,89 @@ 40653@@ -0,0 +1,89 @@
40487+#include <linux/kernel.h> 40654+#include <linux/kernel.h>
40488+#include <linux/sched.h> 40655+#include <linux/sched.h>
@@ -40573,9 +40740,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_exec.c linux-2.6.32.12/grsecurity/gr
40573+#endif 40740+#endif
40574+ return; 40741+ return;
40575+} 40742+}
40576diff -urNp linux-2.6.32.12/grsecurity/grsec_fifo.c linux-2.6.32.12/grsecurity/grsec_fifo.c 40743diff -urNp linux-2.6.32.13/grsecurity/grsec_fifo.c linux-2.6.32.13/grsecurity/grsec_fifo.c
40577--- linux-2.6.32.12/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 40744--- linux-2.6.32.13/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
40578+++ linux-2.6.32.12/grsecurity/grsec_fifo.c 2010-04-04 20:46:41.668784531 -0400 40745+++ linux-2.6.32.13/grsecurity/grsec_fifo.c 2010-05-15 13:21:17.906582737 -0400
40579@@ -0,0 +1,24 @@ 40746@@ -0,0 +1,24 @@
40580+#include <linux/kernel.h> 40747+#include <linux/kernel.h>
40581+#include <linux/sched.h> 40748+#include <linux/sched.h>
@@ -40601,9 +40768,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_fifo.c linux-2.6.32.12/grsecurity/gr
40601+#endif 40768+#endif
40602+ return 0; 40769+ return 0;
40603+} 40770+}
40604diff -urNp linux-2.6.32.12/grsecurity/grsec_fork.c linux-2.6.32.12/grsecurity/grsec_fork.c 40771diff -urNp linux-2.6.32.13/grsecurity/grsec_fork.c linux-2.6.32.13/grsecurity/grsec_fork.c
40605--- linux-2.6.32.12/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 40772--- linux-2.6.32.13/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
40606+++ linux-2.6.32.12/grsecurity/grsec_fork.c 2010-04-04 20:46:41.668784531 -0400 40773+++ linux-2.6.32.13/grsecurity/grsec_fork.c 2010-05-15 13:21:17.906582737 -0400
40607@@ -0,0 +1,15 @@ 40774@@ -0,0 +1,15 @@
40608+#include <linux/kernel.h> 40775+#include <linux/kernel.h>
40609+#include <linux/sched.h> 40776+#include <linux/sched.h>
@@ -40620,9 +40787,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_fork.c linux-2.6.32.12/grsecurity/gr
40620+#endif 40787+#endif
40621+ return; 40788+ return;
40622+} 40789+}
40623diff -urNp linux-2.6.32.12/grsecurity/grsec_init.c linux-2.6.32.12/grsecurity/grsec_init.c 40790diff -urNp linux-2.6.32.13/grsecurity/grsec_init.c linux-2.6.32.13/grsecurity/grsec_init.c
40624--- linux-2.6.32.12/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 40791--- linux-2.6.32.13/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
40625+++ linux-2.6.32.12/grsecurity/grsec_init.c 2010-04-04 20:46:41.668784531 -0400 40792+++ linux-2.6.32.13/grsecurity/grsec_init.c 2010-05-15 13:21:17.906582737 -0400
40626@@ -0,0 +1,241 @@ 40793@@ -0,0 +1,241 @@
40627+#include <linux/kernel.h> 40794+#include <linux/kernel.h>
40628+#include <linux/sched.h> 40795+#include <linux/sched.h>
@@ -40865,9 +41032,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_init.c linux-2.6.32.12/grsecurity/gr
40865+ 41032+
40866+ return; 41033+ return;
40867+} 41034+}
40868diff -urNp linux-2.6.32.12/grsecurity/grsec_link.c linux-2.6.32.12/grsecurity/grsec_link.c 41035diff -urNp linux-2.6.32.13/grsecurity/grsec_link.c linux-2.6.32.13/grsecurity/grsec_link.c
40869--- linux-2.6.32.12/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 41036--- linux-2.6.32.13/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
40870+++ linux-2.6.32.12/grsecurity/grsec_link.c 2010-04-04 20:46:41.668784531 -0400 41037+++ linux-2.6.32.13/grsecurity/grsec_link.c 2010-05-15 13:21:17.906582737 -0400
40871@@ -0,0 +1,43 @@ 41038@@ -0,0 +1,43 @@
40872+#include <linux/kernel.h> 41039+#include <linux/kernel.h>
40873+#include <linux/sched.h> 41040+#include <linux/sched.h>
@@ -40912,9 +41079,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_link.c linux-2.6.32.12/grsecurity/gr
40912+#endif 41079+#endif
40913+ return 0; 41080+ return 0;
40914+} 41081+}
40915diff -urNp linux-2.6.32.12/grsecurity/grsec_log.c linux-2.6.32.12/grsecurity/grsec_log.c 41082diff -urNp linux-2.6.32.13/grsecurity/grsec_log.c linux-2.6.32.13/grsecurity/grsec_log.c
40916--- linux-2.6.32.12/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 41083--- linux-2.6.32.13/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
40917+++ linux-2.6.32.12/grsecurity/grsec_log.c 2010-04-04 20:46:41.668784531 -0400 41084+++ linux-2.6.32.13/grsecurity/grsec_log.c 2010-05-15 13:21:17.906582737 -0400
40918@@ -0,0 +1,296 @@ 41085@@ -0,0 +1,296 @@
40919+#include <linux/kernel.h> 41086+#include <linux/kernel.h>
40920+#include <linux/sched.h> 41087+#include <linux/sched.h>
@@ -41212,9 +41379,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_log.c linux-2.6.32.12/grsecurity/grs
41212+ gr_log_end(audit); 41379+ gr_log_end(audit);
41213+ END_LOCKS(audit); 41380+ END_LOCKS(audit);
41214+} 41381+}
41215diff -urNp linux-2.6.32.12/grsecurity/grsec_mem.c linux-2.6.32.12/grsecurity/grsec_mem.c 41382diff -urNp linux-2.6.32.13/grsecurity/grsec_mem.c linux-2.6.32.13/grsecurity/grsec_mem.c
41216--- linux-2.6.32.12/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 41383--- linux-2.6.32.13/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
41217+++ linux-2.6.32.12/grsecurity/grsec_mem.c 2010-04-04 20:46:41.668784531 -0400 41384+++ linux-2.6.32.13/grsecurity/grsec_mem.c 2010-05-15 13:21:17.910594530 -0400
41218@@ -0,0 +1,85 @@ 41385@@ -0,0 +1,85 @@
41219+#include <linux/kernel.h> 41386+#include <linux/kernel.h>
41220+#include <linux/sched.h> 41387+#include <linux/sched.h>
@@ -41301,9 +41468,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_mem.c linux-2.6.32.12/grsecurity/grs
41301+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); 41468+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
41302+ return; 41469+ return;
41303+} 41470+}
41304diff -urNp linux-2.6.32.12/grsecurity/grsec_mount.c linux-2.6.32.12/grsecurity/grsec_mount.c 41471diff -urNp linux-2.6.32.13/grsecurity/grsec_mount.c linux-2.6.32.13/grsecurity/grsec_mount.c
41305--- linux-2.6.32.12/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 41472--- linux-2.6.32.13/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
41306+++ linux-2.6.32.12/grsecurity/grsec_mount.c 2010-04-04 20:46:41.668784531 -0400 41473+++ linux-2.6.32.13/grsecurity/grsec_mount.c 2010-05-15 13:21:17.910594530 -0400
41307@@ -0,0 +1,62 @@ 41474@@ -0,0 +1,62 @@
41308+#include <linux/kernel.h> 41475+#include <linux/kernel.h>
41309+#include <linux/sched.h> 41476+#include <linux/sched.h>
@@ -41367,9 +41534,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_mount.c linux-2.6.32.12/grsecurity/g
41367+#endif 41534+#endif
41368+ return 0; 41535+ return 0;
41369+} 41536+}
41370diff -urNp linux-2.6.32.12/grsecurity/grsec_ptrace.c linux-2.6.32.12/grsecurity/grsec_ptrace.c 41537diff -urNp linux-2.6.32.13/grsecurity/grsec_ptrace.c linux-2.6.32.13/grsecurity/grsec_ptrace.c
41371--- linux-2.6.32.12/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 41538--- linux-2.6.32.13/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
41372+++ linux-2.6.32.12/grsecurity/grsec_ptrace.c 2010-04-04 20:46:41.668784531 -0400 41539+++ linux-2.6.32.13/grsecurity/grsec_ptrace.c 2010-05-15 13:21:17.910594530 -0400
41373@@ -0,0 +1,14 @@ 41540@@ -0,0 +1,14 @@
41374+#include <linux/kernel.h> 41541+#include <linux/kernel.h>
41375+#include <linux/sched.h> 41542+#include <linux/sched.h>
@@ -41385,9 +41552,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_ptrace.c linux-2.6.32.12/grsecurity/
41385+#endif 41552+#endif
41386+ return; 41553+ return;
41387+} 41554+}
41388diff -urNp linux-2.6.32.12/grsecurity/grsec_sig.c linux-2.6.32.12/grsecurity/grsec_sig.c 41555diff -urNp linux-2.6.32.13/grsecurity/grsec_sig.c linux-2.6.32.13/grsecurity/grsec_sig.c
41389--- linux-2.6.32.12/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 41556--- linux-2.6.32.13/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
41390+++ linux-2.6.32.12/grsecurity/grsec_sig.c 2010-04-04 20:46:41.668784531 -0400 41557+++ linux-2.6.32.13/grsecurity/grsec_sig.c 2010-05-15 13:21:17.910594530 -0400
41391@@ -0,0 +1,65 @@ 41558@@ -0,0 +1,65 @@
41392+#include <linux/kernel.h> 41559+#include <linux/kernel.h>
41393+#include <linux/sched.h> 41560+#include <linux/sched.h>
@@ -41454,9 +41621,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_sig.c linux-2.6.32.12/grsecurity/grs
41454+ return; 41621+ return;
41455+} 41622+}
41456+ 41623+
41457diff -urNp linux-2.6.32.12/grsecurity/grsec_sock.c linux-2.6.32.12/grsecurity/grsec_sock.c 41624diff -urNp linux-2.6.32.13/grsecurity/grsec_sock.c linux-2.6.32.13/grsecurity/grsec_sock.c
41458--- linux-2.6.32.12/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 41625--- linux-2.6.32.13/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
41459+++ linux-2.6.32.12/grsecurity/grsec_sock.c 2010-04-04 20:46:41.668784531 -0400 41626+++ linux-2.6.32.13/grsecurity/grsec_sock.c 2010-05-15 13:21:17.910594530 -0400
41460@@ -0,0 +1,271 @@ 41627@@ -0,0 +1,271 @@
41461+#include <linux/kernel.h> 41628+#include <linux/kernel.h>
41462+#include <linux/module.h> 41629+#include <linux/module.h>
@@ -41729,9 +41896,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_sock.c linux-2.6.32.12/grsecurity/gr
41729+ return current_cap(); 41896+ return current_cap();
41730+#endif 41897+#endif
41731+} 41898+}
41732diff -urNp linux-2.6.32.12/grsecurity/grsec_sysctl.c linux-2.6.32.12/grsecurity/grsec_sysctl.c 41899diff -urNp linux-2.6.32.13/grsecurity/grsec_sysctl.c linux-2.6.32.13/grsecurity/grsec_sysctl.c
41733--- linux-2.6.32.12/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 41900--- linux-2.6.32.13/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
41734+++ linux-2.6.32.12/grsecurity/grsec_sysctl.c 2010-04-04 20:46:41.668784531 -0400 41901+++ linux-2.6.32.13/grsecurity/grsec_sysctl.c 2010-05-15 13:21:17.910594530 -0400
41735@@ -0,0 +1,447 @@ 41902@@ -0,0 +1,447 @@
41736+#include <linux/kernel.h> 41903+#include <linux/kernel.h>
41737+#include <linux/sched.h> 41904+#include <linux/sched.h>
@@ -42180,9 +42347,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_sysctl.c linux-2.6.32.12/grsecurity/
42180+ { .ctl_name = 0 } 42347+ { .ctl_name = 0 }
42181+}; 42348+};
42182+#endif 42349+#endif
42183diff -urNp linux-2.6.32.12/grsecurity/grsec_textrel.c linux-2.6.32.12/grsecurity/grsec_textrel.c 42350diff -urNp linux-2.6.32.13/grsecurity/grsec_textrel.c linux-2.6.32.13/grsecurity/grsec_textrel.c
42184--- linux-2.6.32.12/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 42351--- linux-2.6.32.13/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
42185+++ linux-2.6.32.12/grsecurity/grsec_textrel.c 2010-04-04 20:46:41.668784531 -0400 42352+++ linux-2.6.32.13/grsecurity/grsec_textrel.c 2010-05-15 13:21:17.910594530 -0400
42186@@ -0,0 +1,16 @@ 42353@@ -0,0 +1,16 @@
42187+#include <linux/kernel.h> 42354+#include <linux/kernel.h>
42188+#include <linux/sched.h> 42355+#include <linux/sched.h>
@@ -42200,9 +42367,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_textrel.c linux-2.6.32.12/grsecurity
42200+#endif 42367+#endif
42201+ return; 42368+ return;
42202+} 42369+}
42203diff -urNp linux-2.6.32.12/grsecurity/grsec_time.c linux-2.6.32.12/grsecurity/grsec_time.c 42370diff -urNp linux-2.6.32.13/grsecurity/grsec_time.c linux-2.6.32.13/grsecurity/grsec_time.c
42204--- linux-2.6.32.12/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 42371--- linux-2.6.32.13/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
42205+++ linux-2.6.32.12/grsecurity/grsec_time.c 2010-04-04 20:46:41.668784531 -0400 42372+++ linux-2.6.32.13/grsecurity/grsec_time.c 2010-05-15 13:21:17.910594530 -0400
42206@@ -0,0 +1,13 @@ 42373@@ -0,0 +1,13 @@
42207+#include <linux/kernel.h> 42374+#include <linux/kernel.h>
42208+#include <linux/sched.h> 42375+#include <linux/sched.h>
@@ -42217,9 +42384,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_time.c linux-2.6.32.12/grsecurity/gr
42217+#endif 42384+#endif
42218+ return; 42385+ return;
42219+} 42386+}
42220diff -urNp linux-2.6.32.12/grsecurity/grsec_tpe.c linux-2.6.32.12/grsecurity/grsec_tpe.c 42387diff -urNp linux-2.6.32.13/grsecurity/grsec_tpe.c linux-2.6.32.13/grsecurity/grsec_tpe.c
42221--- linux-2.6.32.12/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 42388--- linux-2.6.32.13/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
42222+++ linux-2.6.32.12/grsecurity/grsec_tpe.c 2010-04-04 20:46:41.668784531 -0400 42389+++ linux-2.6.32.13/grsecurity/grsec_tpe.c 2010-05-15 13:21:17.910594530 -0400
42223@@ -0,0 +1,38 @@ 42390@@ -0,0 +1,38 @@
42224+#include <linux/kernel.h> 42391+#include <linux/kernel.h>
42225+#include <linux/sched.h> 42392+#include <linux/sched.h>
@@ -42259,9 +42426,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsec_tpe.c linux-2.6.32.12/grsecurity/grs
42259+#endif 42426+#endif
42260+ return 1; 42427+ return 1;
42261+} 42428+}
42262diff -urNp linux-2.6.32.12/grsecurity/grsum.c linux-2.6.32.12/grsecurity/grsum.c 42429diff -urNp linux-2.6.32.13/grsecurity/grsum.c linux-2.6.32.13/grsecurity/grsum.c
42263--- linux-2.6.32.12/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 42430--- linux-2.6.32.13/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
42264+++ linux-2.6.32.12/grsecurity/grsum.c 2010-04-04 20:46:41.668784531 -0400 42431+++ linux-2.6.32.13/grsecurity/grsum.c 2010-05-15 13:21:17.910594530 -0400
42265@@ -0,0 +1,59 @@ 42432@@ -0,0 +1,59 @@
42266+#include <linux/err.h> 42433+#include <linux/err.h>
42267+#include <linux/kernel.h> 42434+#include <linux/kernel.h>
@@ -42322,9 +42489,9 @@ diff -urNp linux-2.6.32.12/grsecurity/grsum.c linux-2.6.32.12/grsecurity/grsum.c
42322+ 42489+
42323+ return retval; 42490+ return retval;
42324+} 42491+}
42325diff -urNp linux-2.6.32.12/grsecurity/Kconfig linux-2.6.32.12/grsecurity/Kconfig 42492diff -urNp linux-2.6.32.13/grsecurity/Kconfig linux-2.6.32.13/grsecurity/Kconfig
42326--- linux-2.6.32.12/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 42493--- linux-2.6.32.13/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
42327+++ linux-2.6.32.12/grsecurity/Kconfig 2010-04-04 20:46:41.668784531 -0400 42494+++ linux-2.6.32.13/grsecurity/Kconfig 2010-05-15 13:21:17.910594530 -0400
42328@@ -0,0 +1,965 @@ 42495@@ -0,0 +1,965 @@
42329+# 42496+#
42330+# grecurity configuration 42497+# grecurity configuration
@@ -43291,9 +43458,9 @@ diff -urNp linux-2.6.32.12/grsecurity/Kconfig linux-2.6.32.12/grsecurity/Kconfig
43291+endmenu 43458+endmenu
43292+ 43459+
43293+endmenu 43460+endmenu
43294diff -urNp linux-2.6.32.12/grsecurity/Makefile linux-2.6.32.12/grsecurity/Makefile 43461diff -urNp linux-2.6.32.13/grsecurity/Makefile linux-2.6.32.13/grsecurity/Makefile
43295--- linux-2.6.32.12/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 43462--- linux-2.6.32.13/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
43296+++ linux-2.6.32.12/grsecurity/Makefile 2010-04-04 20:46:41.668784531 -0400 43463+++ linux-2.6.32.13/grsecurity/Makefile 2010-05-15 13:21:17.910594530 -0400
43297@@ -0,0 +1,29 @@ 43464@@ -0,0 +1,29 @@
43298+# grsecurity's ACL system was originally written in 2001 by Michael Dalton 43465+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
43299+# during 2001-2009 it has been completely redesigned by Brad Spengler 43466+# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -43324,9 +43491,9 @@ diff -urNp linux-2.6.32.12/grsecurity/Makefile linux-2.6.32.12/grsecurity/Makefi
43324+ @-chmod -f 700 . 43491+ @-chmod -f 700 .
43325+ @echo ' grsec: protected kernel image paths' 43492+ @echo ' grsec: protected kernel image paths'
43326+endif 43493+endif
43327diff -urNp linux-2.6.32.12/include/acpi/acoutput.h linux-2.6.32.12/include/acpi/acoutput.h 43494diff -urNp linux-2.6.32.13/include/acpi/acoutput.h linux-2.6.32.13/include/acpi/acoutput.h
43328--- linux-2.6.32.12/include/acpi/acoutput.h 2010-03-15 11:52:04.000000000 -0400 43495--- linux-2.6.32.13/include/acpi/acoutput.h 2010-03-15 11:52:04.000000000 -0400
43329+++ linux-2.6.32.12/include/acpi/acoutput.h 2010-04-29 17:46:37.297250222 -0400 43496+++ linux-2.6.32.13/include/acpi/acoutput.h 2010-05-15 13:21:17.910594530 -0400
43330@@ -264,8 +264,8 @@ 43497@@ -264,8 +264,8 @@
43331 * leaving no executable debug code! 43498 * leaving no executable debug code!
43332 */ 43499 */
@@ -43338,9 +43505,9 @@ diff -urNp linux-2.6.32.12/include/acpi/acoutput.h linux-2.6.32.12/include/acpi/
43338 43505
43339 #endif /* ACPI_DEBUG_OUTPUT */ 43506 #endif /* ACPI_DEBUG_OUTPUT */
43340 43507
43341diff -urNp linux-2.6.32.12/include/acpi/acpi_drivers.h linux-2.6.32.12/include/acpi/acpi_drivers.h 43508diff -urNp linux-2.6.32.13/include/acpi/acpi_drivers.h linux-2.6.32.13/include/acpi/acpi_drivers.h
43342--- linux-2.6.32.12/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400 43509--- linux-2.6.32.13/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400
43343+++ linux-2.6.32.12/include/acpi/acpi_drivers.h 2010-04-04 20:46:41.668784531 -0400 43510+++ linux-2.6.32.13/include/acpi/acpi_drivers.h 2010-05-15 13:21:17.910594530 -0400
43344@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp 43511@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
43345 Dock Station 43512 Dock Station
43346 -------------------------------------------------------------------------- */ 43513 -------------------------------------------------------------------------- */
@@ -43370,9 +43537,9 @@ diff -urNp linux-2.6.32.12/include/acpi/acpi_drivers.h linux-2.6.32.12/include/a
43370 void *context) 43537 void *context)
43371 { 43538 {
43372 return -ENODEV; 43539 return -ENODEV;
43373diff -urNp linux-2.6.32.12/include/asm-generic/atomic-long.h linux-2.6.32.12/include/asm-generic/atomic-long.h 43540diff -urNp linux-2.6.32.13/include/asm-generic/atomic-long.h linux-2.6.32.13/include/asm-generic/atomic-long.h
43374--- linux-2.6.32.12/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400 43541--- linux-2.6.32.13/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400
43375+++ linux-2.6.32.12/include/asm-generic/atomic-long.h 2010-04-04 20:46:41.668784531 -0400 43542+++ linux-2.6.32.13/include/asm-generic/atomic-long.h 2010-05-15 13:21:17.910594530 -0400
43376@@ -22,6 +22,12 @@ 43543@@ -22,6 +22,12 @@
43377 43544
43378 typedef atomic64_t atomic_long_t; 43545 typedef atomic64_t atomic_long_t;
@@ -43593,9 +43760,9 @@ diff -urNp linux-2.6.32.12/include/asm-generic/atomic-long.h linux-2.6.32.12/inc
43593+#endif 43760+#endif
43594+ 43761+
43595 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ 43762 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
43596diff -urNp linux-2.6.32.12/include/asm-generic/dma-mapping-common.h linux-2.6.32.12/include/asm-generic/dma-mapping-common.h 43763diff -urNp linux-2.6.32.13/include/asm-generic/dma-mapping-common.h linux-2.6.32.13/include/asm-generic/dma-mapping-common.h
43597--- linux-2.6.32.12/include/asm-generic/dma-mapping-common.h 2010-03-15 11:52:04.000000000 -0400 43764--- linux-2.6.32.13/include/asm-generic/dma-mapping-common.h 2010-03-15 11:52:04.000000000 -0400
43598+++ linux-2.6.32.12/include/asm-generic/dma-mapping-common.h 2010-04-04 20:46:41.673688119 -0400 43765+++ linux-2.6.32.13/include/asm-generic/dma-mapping-common.h 2010-05-15 13:21:17.910594530 -0400
43599@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ 43766@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
43600 enum dma_data_direction dir, 43767 enum dma_data_direction dir,
43601 struct dma_attrs *attrs) 43768 struct dma_attrs *attrs)
@@ -43704,9 +43871,9 @@ diff -urNp linux-2.6.32.12/include/asm-generic/dma-mapping-common.h linux-2.6.32
43704 43871
43705 BUG_ON(!valid_dma_direction(dir)); 43872 BUG_ON(!valid_dma_direction(dir));
43706 if (ops->sync_sg_for_device) 43873 if (ops->sync_sg_for_device)
43707diff -urNp linux-2.6.32.12/include/asm-generic/futex.h linux-2.6.32.12/include/asm-generic/futex.h 43874diff -urNp linux-2.6.32.13/include/asm-generic/futex.h linux-2.6.32.13/include/asm-generic/futex.h
43708--- linux-2.6.32.12/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400 43875--- linux-2.6.32.13/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400
43709+++ linux-2.6.32.12/include/asm-generic/futex.h 2010-04-04 20:46:41.673688119 -0400 43876+++ linux-2.6.32.13/include/asm-generic/futex.h 2010-05-15 13:21:17.910594530 -0400
43710@@ -6,7 +6,7 @@ 43877@@ -6,7 +6,7 @@
43711 #include <asm/errno.h> 43878 #include <asm/errno.h>
43712 43879
@@ -43725,9 +43892,9 @@ diff -urNp linux-2.6.32.12/include/asm-generic/futex.h linux-2.6.32.12/include/a
43725 { 43892 {
43726 return -ENOSYS; 43893 return -ENOSYS;
43727 } 43894 }
43728diff -urNp linux-2.6.32.12/include/asm-generic/int-l64.h linux-2.6.32.12/include/asm-generic/int-l64.h 43895diff -urNp linux-2.6.32.13/include/asm-generic/int-l64.h linux-2.6.32.13/include/asm-generic/int-l64.h
43729--- linux-2.6.32.12/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400 43896--- linux-2.6.32.13/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400
43730+++ linux-2.6.32.12/include/asm-generic/int-l64.h 2010-04-04 20:46:41.673688119 -0400 43897+++ linux-2.6.32.13/include/asm-generic/int-l64.h 2010-05-15 13:21:17.910594530 -0400
43731@@ -46,6 +46,8 @@ typedef unsigned int u32; 43898@@ -46,6 +46,8 @@ typedef unsigned int u32;
43732 typedef signed long s64; 43899 typedef signed long s64;
43733 typedef unsigned long u64; 43900 typedef unsigned long u64;
@@ -43737,9 +43904,9 @@ diff -urNp linux-2.6.32.12/include/asm-generic/int-l64.h linux-2.6.32.12/include
43737 #define S8_C(x) x 43904 #define S8_C(x) x
43738 #define U8_C(x) x ## U 43905 #define U8_C(x) x ## U
43739 #define S16_C(x) x 43906 #define S16_C(x) x
43740diff -urNp linux-2.6.32.12/include/asm-generic/int-ll64.h linux-2.6.32.12/include/asm-generic/int-ll64.h 43907diff -urNp linux-2.6.32.13/include/asm-generic/int-ll64.h linux-2.6.32.13/include/asm-generic/int-ll64.h
43741--- linux-2.6.32.12/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400 43908--- linux-2.6.32.13/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400
43742+++ linux-2.6.32.12/include/asm-generic/int-ll64.h 2010-04-04 20:46:41.673688119 -0400 43909+++ linux-2.6.32.13/include/asm-generic/int-ll64.h 2010-05-15 13:21:17.910594530 -0400
43743@@ -51,6 +51,8 @@ typedef unsigned int u32; 43910@@ -51,6 +51,8 @@ typedef unsigned int u32;
43744 typedef signed long long s64; 43911 typedef signed long long s64;
43745 typedef unsigned long long u64; 43912 typedef unsigned long long u64;
@@ -43749,9 +43916,9 @@ diff -urNp linux-2.6.32.12/include/asm-generic/int-ll64.h linux-2.6.32.12/includ
43749 #define S8_C(x) x 43916 #define S8_C(x) x
43750 #define U8_C(x) x ## U 43917 #define U8_C(x) x ## U
43751 #define S16_C(x) x 43918 #define S16_C(x) x
43752diff -urNp linux-2.6.32.12/include/asm-generic/kmap_types.h linux-2.6.32.12/include/asm-generic/kmap_types.h 43919diff -urNp linux-2.6.32.13/include/asm-generic/kmap_types.h linux-2.6.32.13/include/asm-generic/kmap_types.h
43753--- linux-2.6.32.12/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 43920--- linux-2.6.32.13/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
43754+++ linux-2.6.32.12/include/asm-generic/kmap_types.h 2010-04-04 20:46:41.673688119 -0400 43921+++ linux-2.6.32.13/include/asm-generic/kmap_types.h 2010-05-15 13:21:17.910594530 -0400
43755@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, 43922@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
43756 KMAP_D(16) KM_IRQ_PTE, 43923 KMAP_D(16) KM_IRQ_PTE,
43757 KMAP_D(17) KM_NMI, 43924 KMAP_D(17) KM_NMI,
@@ -43762,9 +43929,9 @@ diff -urNp linux-2.6.32.12/include/asm-generic/kmap_types.h linux-2.6.32.12/incl
43762 }; 43929 };
43763 43930
43764 #undef KMAP_D 43931 #undef KMAP_D
43765diff -urNp linux-2.6.32.12/include/asm-generic/pgtable.h linux-2.6.32.12/include/asm-generic/pgtable.h 43932diff -urNp linux-2.6.32.13/include/asm-generic/pgtable.h linux-2.6.32.13/include/asm-generic/pgtable.h
43766--- linux-2.6.32.12/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400 43933--- linux-2.6.32.13/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400
43767+++ linux-2.6.32.12/include/asm-generic/pgtable.h 2010-04-04 20:46:41.673688119 -0400 43934+++ linux-2.6.32.13/include/asm-generic/pgtable.h 2010-05-15 13:21:17.910594530 -0400
43768@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar 43935@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
43769 unsigned long size); 43936 unsigned long size);
43770 #endif 43937 #endif
@@ -43780,9 +43947,9 @@ diff -urNp linux-2.6.32.12/include/asm-generic/pgtable.h linux-2.6.32.12/include
43780 #endif /* !__ASSEMBLY__ */ 43947 #endif /* !__ASSEMBLY__ */
43781 43948
43782 #endif /* _ASM_GENERIC_PGTABLE_H */ 43949 #endif /* _ASM_GENERIC_PGTABLE_H */
43783diff -urNp linux-2.6.32.12/include/asm-generic/vmlinux.lds.h linux-2.6.32.12/include/asm-generic/vmlinux.lds.h 43950diff -urNp linux-2.6.32.13/include/asm-generic/vmlinux.lds.h linux-2.6.32.13/include/asm-generic/vmlinux.lds.h
43784--- linux-2.6.32.12/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400 43951--- linux-2.6.32.13/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400
43785+++ linux-2.6.32.12/include/asm-generic/vmlinux.lds.h 2010-04-04 20:46:41.673688119 -0400 43952+++ linux-2.6.32.13/include/asm-generic/vmlinux.lds.h 2010-05-15 13:21:17.910594530 -0400
43786@@ -199,6 +199,7 @@ 43953@@ -199,6 +199,7 @@
43787 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ 43954 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
43788 VMLINUX_SYMBOL(__start_rodata) = .; \ 43955 VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -43821,9 +43988,9 @@ diff -urNp linux-2.6.32.12/include/asm-generic/vmlinux.lds.h linux-2.6.32.12/inc
43821 43988
43822 /** 43989 /**
43823 * PERCPU - define output section for percpu area, simple version 43990 * PERCPU - define output section for percpu area, simple version
43824diff -urNp linux-2.6.32.12/include/drm/drm_pciids.h linux-2.6.32.12/include/drm/drm_pciids.h 43991diff -urNp linux-2.6.32.13/include/drm/drm_pciids.h linux-2.6.32.13/include/drm/drm_pciids.h
43825--- linux-2.6.32.12/include/drm/drm_pciids.h 2010-04-29 17:49:38.529851956 -0400 43992--- linux-2.6.32.13/include/drm/drm_pciids.h 2010-04-29 17:49:38.529851956 -0400
43826+++ linux-2.6.32.12/include/drm/drm_pciids.h 2010-04-29 18:05:16.209337414 -0400 43993+++ linux-2.6.32.13/include/drm/drm_pciids.h 2010-05-15 13:21:17.910594530 -0400
43827@@ -377,7 +377,7 @@ 43994@@ -377,7 +377,7 @@
43828 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 43995 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
43829 {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 43996 {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -43927,9 +44094,9 @@ diff -urNp linux-2.6.32.12/include/drm/drm_pciids.h linux-2.6.32.12/include/drm/
43927 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 44094 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
43928- {0, 0, 0} 44095- {0, 0, 0}
43929+ {0, 0, 0, 0, 0, 0} 44096+ {0, 0, 0, 0, 0, 0}
43930diff -urNp linux-2.6.32.12/include/drm/drmP.h linux-2.6.32.12/include/drm/drmP.h 44097diff -urNp linux-2.6.32.13/include/drm/drmP.h linux-2.6.32.13/include/drm/drmP.h
43931--- linux-2.6.32.12/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400 44098--- linux-2.6.32.13/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400
43932+++ linux-2.6.32.12/include/drm/drmP.h 2010-04-04 20:46:41.673688119 -0400 44099+++ linux-2.6.32.13/include/drm/drmP.h 2010-05-15 13:21:17.910594530 -0400
43933@@ -814,7 +814,7 @@ struct drm_driver { 44100@@ -814,7 +814,7 @@ struct drm_driver {
43934 void (*vgaarb_irq)(struct drm_device *dev, bool state); 44101 void (*vgaarb_irq)(struct drm_device *dev, bool state);
43935 44102
@@ -43957,9 +44124,9 @@ diff -urNp linux-2.6.32.12/include/drm/drmP.h linux-2.6.32.12/include/drm/drmP.h
43957 /*@} */ 44124 /*@} */
43958 44125
43959 struct list_head filelist; 44126 struct list_head filelist;
43960diff -urNp linux-2.6.32.12/include/linux/a.out.h linux-2.6.32.12/include/linux/a.out.h 44127diff -urNp linux-2.6.32.13/include/linux/a.out.h linux-2.6.32.13/include/linux/a.out.h
43961--- linux-2.6.32.12/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400 44128--- linux-2.6.32.13/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400
43962+++ linux-2.6.32.12/include/linux/a.out.h 2010-04-04 20:46:41.673688119 -0400 44129+++ linux-2.6.32.13/include/linux/a.out.h 2010-05-15 13:21:17.914599996 -0400
43963@@ -39,6 +39,14 @@ enum machine_type { 44130@@ -39,6 +39,14 @@ enum machine_type {
43964 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ 44131 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
43965 }; 44132 };
@@ -43975,9 +44142,9 @@ diff -urNp linux-2.6.32.12/include/linux/a.out.h linux-2.6.32.12/include/linux/a
43975 #if !defined (N_MAGIC) 44142 #if !defined (N_MAGIC)
43976 #define N_MAGIC(exec) ((exec).a_info & 0xffff) 44143 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
43977 #endif 44144 #endif
43978diff -urNp linux-2.6.32.12/include/linux/atmdev.h linux-2.6.32.12/include/linux/atmdev.h 44145diff -urNp linux-2.6.32.13/include/linux/atmdev.h linux-2.6.32.13/include/linux/atmdev.h
43979--- linux-2.6.32.12/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400 44146--- linux-2.6.32.13/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400
43980+++ linux-2.6.32.12/include/linux/atmdev.h 2010-04-04 20:46:41.673688119 -0400 44147+++ linux-2.6.32.13/include/linux/atmdev.h 2010-05-15 13:21:17.914599996 -0400
43981@@ -237,7 +237,7 @@ struct compat_atm_iobuf { 44148@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
43982 #endif 44149 #endif
43983 44150
@@ -43987,9 +44154,9 @@ diff -urNp linux-2.6.32.12/include/linux/atmdev.h linux-2.6.32.12/include/linux/
43987 __AAL_STAT_ITEMS 44154 __AAL_STAT_ITEMS
43988 #undef __HANDLE_ITEM 44155 #undef __HANDLE_ITEM
43989 }; 44156 };
43990diff -urNp linux-2.6.32.12/include/linux/backlight.h linux-2.6.32.12/include/linux/backlight.h 44157diff -urNp linux-2.6.32.13/include/linux/backlight.h linux-2.6.32.13/include/linux/backlight.h
43991--- linux-2.6.32.12/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400 44158--- linux-2.6.32.13/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400
43992+++ linux-2.6.32.12/include/linux/backlight.h 2010-04-04 20:46:41.673688119 -0400 44159+++ linux-2.6.32.13/include/linux/backlight.h 2010-05-15 13:21:17.914599996 -0400
43993@@ -36,18 +36,18 @@ struct backlight_device; 44160@@ -36,18 +36,18 @@ struct backlight_device;
43994 struct fb_info; 44161 struct fb_info;
43995 44162
@@ -44031,9 +44198,9 @@ diff -urNp linux-2.6.32.12/include/linux/backlight.h linux-2.6.32.12/include/lin
44031 extern void backlight_device_unregister(struct backlight_device *bd); 44198 extern void backlight_device_unregister(struct backlight_device *bd);
44032 extern void backlight_force_update(struct backlight_device *bd, 44199 extern void backlight_force_update(struct backlight_device *bd,
44033 enum backlight_update_reason reason); 44200 enum backlight_update_reason reason);
44034diff -urNp linux-2.6.32.12/include/linux/binfmts.h linux-2.6.32.12/include/linux/binfmts.h 44201diff -urNp linux-2.6.32.13/include/linux/binfmts.h linux-2.6.32.13/include/linux/binfmts.h
44035--- linux-2.6.32.12/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400 44202--- linux-2.6.32.13/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400
44036+++ linux-2.6.32.12/include/linux/binfmts.h 2010-04-04 20:46:41.673688119 -0400 44203+++ linux-2.6.32.13/include/linux/binfmts.h 2010-05-15 13:21:17.934614916 -0400
44037@@ -78,6 +78,7 @@ struct linux_binfmt { 44204@@ -78,6 +78,7 @@ struct linux_binfmt {
44038 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); 44205 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
44039 int (*load_shlib)(struct file *); 44206 int (*load_shlib)(struct file *);
@@ -44042,9 +44209,9 @@ diff -urNp linux-2.6.32.12/include/linux/binfmts.h linux-2.6.32.12/include/linux
44042 unsigned long min_coredump; /* minimal dump size */ 44209 unsigned long min_coredump; /* minimal dump size */
44043 int hasvdso; 44210 int hasvdso;
44044 }; 44211 };
44045diff -urNp linux-2.6.32.12/include/linux/blkdev.h linux-2.6.32.12/include/linux/blkdev.h 44212diff -urNp linux-2.6.32.13/include/linux/blkdev.h linux-2.6.32.13/include/linux/blkdev.h
44046--- linux-2.6.32.12/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400 44213--- linux-2.6.32.13/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400
44047+++ linux-2.6.32.12/include/linux/blkdev.h 2010-04-04 20:46:41.673688119 -0400 44214+++ linux-2.6.32.13/include/linux/blkdev.h 2010-05-15 13:21:17.934614916 -0400
44048@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc 44215@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc
44049 #endif /* CONFIG_BLK_DEV_INTEGRITY */ 44216 #endif /* CONFIG_BLK_DEV_INTEGRITY */
44050 44217
@@ -44076,9 +44243,9 @@ diff -urNp linux-2.6.32.12/include/linux/blkdev.h linux-2.6.32.12/include/linux/
44076 }; 44243 };
44077 44244
44078 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, 44245 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
44079diff -urNp linux-2.6.32.12/include/linux/cache.h linux-2.6.32.12/include/linux/cache.h 44246diff -urNp linux-2.6.32.13/include/linux/cache.h linux-2.6.32.13/include/linux/cache.h
44080--- linux-2.6.32.12/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400 44247--- linux-2.6.32.13/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400
44081+++ linux-2.6.32.12/include/linux/cache.h 2010-04-04 20:46:41.673688119 -0400 44248+++ linux-2.6.32.13/include/linux/cache.h 2010-05-15 13:21:17.934614916 -0400
44082@@ -16,6 +16,10 @@ 44249@@ -16,6 +16,10 @@
44083 #define __read_mostly 44250 #define __read_mostly
44084 #endif 44251 #endif
@@ -44090,9 +44257,9 @@ diff -urNp linux-2.6.32.12/include/linux/cache.h linux-2.6.32.12/include/linux/c
44090 #ifndef ____cacheline_aligned 44257 #ifndef ____cacheline_aligned
44091 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) 44258 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
44092 #endif 44259 #endif
44093diff -urNp linux-2.6.32.12/include/linux/capability.h linux-2.6.32.12/include/linux/capability.h 44260diff -urNp linux-2.6.32.13/include/linux/capability.h linux-2.6.32.13/include/linux/capability.h
44094--- linux-2.6.32.12/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400 44261--- linux-2.6.32.13/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400
44095+++ linux-2.6.32.12/include/linux/capability.h 2010-04-04 20:46:41.673688119 -0400 44262+++ linux-2.6.32.13/include/linux/capability.h 2010-05-15 13:21:17.934614916 -0400
44096@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff 44263@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
44097 (security_real_capable_noaudit((t), (cap)) == 0) 44264 (security_real_capable_noaudit((t), (cap)) == 0)
44098 44265
@@ -44101,9 +44268,9 @@ diff -urNp linux-2.6.32.12/include/linux/capability.h linux-2.6.32.12/include/li
44101 44268
44102 /* audit system wants to get cap info from files as well */ 44269 /* audit system wants to get cap info from files as well */
44103 struct dentry; 44270 struct dentry;
44104diff -urNp linux-2.6.32.12/include/linux/compiler-gcc4.h linux-2.6.32.12/include/linux/compiler-gcc4.h 44271diff -urNp linux-2.6.32.13/include/linux/compiler-gcc4.h linux-2.6.32.13/include/linux/compiler-gcc4.h
44105--- linux-2.6.32.12/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400 44272--- linux-2.6.32.13/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400
44106+++ linux-2.6.32.12/include/linux/compiler-gcc4.h 2010-04-04 20:46:41.673688119 -0400 44273+++ linux-2.6.32.13/include/linux/compiler-gcc4.h 2010-05-15 13:21:17.934614916 -0400
44107@@ -36,4 +36,8 @@ 44274@@ -36,4 +36,8 @@
44108 the kernel context */ 44275 the kernel context */
44109 #define __cold __attribute__((__cold__)) 44276 #define __cold __attribute__((__cold__))
@@ -44113,9 +44280,9 @@ diff -urNp linux-2.6.32.12/include/linux/compiler-gcc4.h linux-2.6.32.12/include
44113+#define __bos0(ptr) __bos((ptr), 0) 44280+#define __bos0(ptr) __bos((ptr), 0)
44114+#define __bos1(ptr) __bos((ptr), 1) 44281+#define __bos1(ptr) __bos((ptr), 1)
44115 #endif 44282 #endif
44116diff -urNp linux-2.6.32.12/include/linux/compiler.h linux-2.6.32.12/include/linux/compiler.h 44283diff -urNp linux-2.6.32.13/include/linux/compiler.h linux-2.6.32.13/include/linux/compiler.h
44117--- linux-2.6.32.12/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400 44284--- linux-2.6.32.13/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400
44118+++ linux-2.6.32.12/include/linux/compiler.h 2010-04-04 20:46:41.673688119 -0400 44285+++ linux-2.6.32.13/include/linux/compiler.h 2010-05-15 13:21:17.934614916 -0400
44119@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ 44286@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
44120 #define __cold 44287 #define __cold
44121 #endif 44288 #endif
@@ -44139,9 +44306,9 @@ diff -urNp linux-2.6.32.12/include/linux/compiler.h linux-2.6.32.12/include/linu
44139 /* Simple shorthand for a section definition */ 44306 /* Simple shorthand for a section definition */
44140 #ifndef __section 44307 #ifndef __section
44141 # define __section(S) __attribute__ ((__section__(#S))) 44308 # define __section(S) __attribute__ ((__section__(#S)))
44142diff -urNp linux-2.6.32.12/include/linux/decompress/mm.h linux-2.6.32.12/include/linux/decompress/mm.h 44309diff -urNp linux-2.6.32.13/include/linux/decompress/mm.h linux-2.6.32.13/include/linux/decompress/mm.h
44143--- linux-2.6.32.12/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400 44310--- linux-2.6.32.13/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400
44144+++ linux-2.6.32.12/include/linux/decompress/mm.h 2010-04-04 20:46:41.673688119 -0400 44311+++ linux-2.6.32.13/include/linux/decompress/mm.h 2010-05-15 13:21:17.938584561 -0400
44145@@ -78,7 +78,7 @@ static void free(void *where) 44312@@ -78,7 +78,7 @@ static void free(void *where)
44146 * warnings when not needed (indeed large_malloc / large_free are not 44313 * warnings when not needed (indeed large_malloc / large_free are not
44147 * needed by inflate */ 44314 * needed by inflate */
@@ -44151,9 +44318,9 @@ diff -urNp linux-2.6.32.12/include/linux/decompress/mm.h linux-2.6.32.12/include
44151 #define free(a) kfree(a) 44318 #define free(a) kfree(a)
44152 44319
44153 #define large_malloc(a) vmalloc(a) 44320 #define large_malloc(a) vmalloc(a)
44154diff -urNp linux-2.6.32.12/include/linux/dma-mapping.h linux-2.6.32.12/include/linux/dma-mapping.h 44321diff -urNp linux-2.6.32.13/include/linux/dma-mapping.h linux-2.6.32.13/include/linux/dma-mapping.h
44155--- linux-2.6.32.12/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 44322--- linux-2.6.32.13/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
44156+++ linux-2.6.32.12/include/linux/dma-mapping.h 2010-04-04 20:46:41.673688119 -0400 44323+++ linux-2.6.32.13/include/linux/dma-mapping.h 2010-05-15 13:21:17.938584561 -0400
44157@@ -16,50 +16,50 @@ enum dma_data_direction { 44324@@ -16,50 +16,50 @@ enum dma_data_direction {
44158 }; 44325 };
44159 44326
@@ -44220,9 +44387,9 @@ diff -urNp linux-2.6.32.12/include/linux/dma-mapping.h linux-2.6.32.12/include/l
44220 }; 44387 };
44221 44388
44222 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) 44389 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
44223diff -urNp linux-2.6.32.12/include/linux/dst.h linux-2.6.32.12/include/linux/dst.h 44390diff -urNp linux-2.6.32.13/include/linux/dst.h linux-2.6.32.13/include/linux/dst.h
44224--- linux-2.6.32.12/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400 44391--- linux-2.6.32.13/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400
44225+++ linux-2.6.32.12/include/linux/dst.h 2010-04-04 20:46:41.673688119 -0400 44392+++ linux-2.6.32.13/include/linux/dst.h 2010-05-15 13:21:17.938584561 -0400
44226@@ -380,7 +380,7 @@ struct dst_node 44393@@ -380,7 +380,7 @@ struct dst_node
44227 struct thread_pool *pool; 44394 struct thread_pool *pool;
44228 44395
@@ -44232,9 +44399,9 @@ diff -urNp linux-2.6.32.12/include/linux/dst.h linux-2.6.32.12/include/linux/dst
44232 44399
44233 /* 44400 /*
44234 * How frequently and how many times transaction 44401 * How frequently and how many times transaction
44235diff -urNp linux-2.6.32.12/include/linux/elf.h linux-2.6.32.12/include/linux/elf.h 44402diff -urNp linux-2.6.32.13/include/linux/elf.h linux-2.6.32.13/include/linux/elf.h
44236--- linux-2.6.32.12/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400 44403--- linux-2.6.32.13/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400
44237+++ linux-2.6.32.12/include/linux/elf.h 2010-04-04 20:46:41.673688119 -0400 44404+++ linux-2.6.32.13/include/linux/elf.h 2010-05-15 13:21:17.938584561 -0400
44238@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; 44405@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
44239 #define PT_GNU_EH_FRAME 0x6474e550 44406 #define PT_GNU_EH_FRAME 0x6474e550
44240 44407
@@ -44307,9 +44474,9 @@ diff -urNp linux-2.6.32.12/include/linux/elf.h linux-2.6.32.12/include/linux/elf
44307 44474
44308 #endif 44475 #endif
44309 44476
44310diff -urNp linux-2.6.32.12/include/linux/fs.h linux-2.6.32.12/include/linux/fs.h 44477diff -urNp linux-2.6.32.13/include/linux/fs.h linux-2.6.32.13/include/linux/fs.h
44311--- linux-2.6.32.12/include/linux/fs.h 2010-04-29 17:49:38.529851956 -0400 44478--- linux-2.6.32.13/include/linux/fs.h 2010-04-29 17:49:38.529851956 -0400
44312+++ linux-2.6.32.12/include/linux/fs.h 2010-04-29 17:49:58.621028174 -0400 44479+++ linux-2.6.32.13/include/linux/fs.h 2010-05-15 13:21:17.938584561 -0400
44313@@ -90,6 +90,11 @@ struct inodes_stat_t { 44480@@ -90,6 +90,11 @@ struct inodes_stat_t {
44314 /* Expect random access pattern */ 44481 /* Expect random access pattern */
44315 #define FMODE_RANDOM ((__force fmode_t)4096) 44482 #define FMODE_RANDOM ((__force fmode_t)4096)
@@ -44471,9 +44638,9 @@ diff -urNp linux-2.6.32.12/include/linux/fs.h linux-2.6.32.12/include/linux/fs.h
44471 }; 44638 };
44472 44639
44473 /* 44640 /*
44474diff -urNp linux-2.6.32.12/include/linux/fs_struct.h linux-2.6.32.12/include/linux/fs_struct.h 44641diff -urNp linux-2.6.32.13/include/linux/fs_struct.h linux-2.6.32.13/include/linux/fs_struct.h
44475--- linux-2.6.32.12/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400 44642--- linux-2.6.32.13/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400
44476+++ linux-2.6.32.12/include/linux/fs_struct.h 2010-04-04 20:46:41.677383221 -0400 44643+++ linux-2.6.32.13/include/linux/fs_struct.h 2010-05-15 13:21:17.938584561 -0400
44477@@ -4,7 +4,7 @@ 44644@@ -4,7 +4,7 @@
44478 #include <linux/path.h> 44645 #include <linux/path.h>
44479 44646
@@ -44483,9 +44650,9 @@ diff -urNp linux-2.6.32.12/include/linux/fs_struct.h linux-2.6.32.12/include/lin
44483 rwlock_t lock; 44650 rwlock_t lock;
44484 int umask; 44651 int umask;
44485 int in_exec; 44652 int in_exec;
44486diff -urNp linux-2.6.32.12/include/linux/genhd.h linux-2.6.32.12/include/linux/genhd.h 44653diff -urNp linux-2.6.32.13/include/linux/genhd.h linux-2.6.32.13/include/linux/genhd.h
44487--- linux-2.6.32.12/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400 44654--- linux-2.6.32.13/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400
44488+++ linux-2.6.32.12/include/linux/genhd.h 2010-04-04 20:46:41.677383221 -0400 44655+++ linux-2.6.32.13/include/linux/genhd.h 2010-05-15 13:21:17.938584561 -0400
44489@@ -161,7 +161,7 @@ struct gendisk { 44656@@ -161,7 +161,7 @@ struct gendisk {
44490 44657
44491 struct timer_rand_state *random; 44658 struct timer_rand_state *random;
@@ -44495,9 +44662,9 @@ diff -urNp linux-2.6.32.12/include/linux/genhd.h linux-2.6.32.12/include/linux/g
44495 struct work_struct async_notify; 44662 struct work_struct async_notify;
44496 #ifdef CONFIG_BLK_DEV_INTEGRITY 44663 #ifdef CONFIG_BLK_DEV_INTEGRITY
44497 struct blk_integrity *integrity; 44664 struct blk_integrity *integrity;
44498diff -urNp linux-2.6.32.12/include/linux/gracl.h linux-2.6.32.12/include/linux/gracl.h 44665diff -urNp linux-2.6.32.13/include/linux/gracl.h linux-2.6.32.13/include/linux/gracl.h
44499--- linux-2.6.32.12/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 44666--- linux-2.6.32.13/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
44500+++ linux-2.6.32.12/include/linux/gracl.h 2010-04-04 20:46:41.677383221 -0400 44667+++ linux-2.6.32.13/include/linux/gracl.h 2010-05-15 13:21:17.938584561 -0400
44501@@ -0,0 +1,309 @@ 44668@@ -0,0 +1,309 @@
44502+#ifndef GR_ACL_H 44669+#ifndef GR_ACL_H
44503+#define GR_ACL_H 44670+#define GR_ACL_H
@@ -44808,9 +44975,9 @@ diff -urNp linux-2.6.32.12/include/linux/gracl.h linux-2.6.32.12/include/linux/g
44808+ 44975+
44809+#endif 44976+#endif
44810+ 44977+
44811diff -urNp linux-2.6.32.12/include/linux/gralloc.h linux-2.6.32.12/include/linux/gralloc.h 44978diff -urNp linux-2.6.32.13/include/linux/gralloc.h linux-2.6.32.13/include/linux/gralloc.h
44812--- linux-2.6.32.12/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 44979--- linux-2.6.32.13/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
44813+++ linux-2.6.32.12/include/linux/gralloc.h 2010-04-04 20:46:41.677383221 -0400 44980+++ linux-2.6.32.13/include/linux/gralloc.h 2010-05-15 13:21:17.938584561 -0400
44814@@ -0,0 +1,9 @@ 44981@@ -0,0 +1,9 @@
44815+#ifndef __GRALLOC_H 44982+#ifndef __GRALLOC_H
44816+#define __GRALLOC_H 44983+#define __GRALLOC_H
@@ -44821,9 +44988,9 @@ diff -urNp linux-2.6.32.12/include/linux/gralloc.h linux-2.6.32.12/include/linux
44821+void *acl_alloc_num(unsigned long num, unsigned long len); 44988+void *acl_alloc_num(unsigned long num, unsigned long len);
44822+ 44989+
44823+#endif 44990+#endif
44824diff -urNp linux-2.6.32.12/include/linux/grdefs.h linux-2.6.32.12/include/linux/grdefs.h 44991diff -urNp linux-2.6.32.13/include/linux/grdefs.h linux-2.6.32.13/include/linux/grdefs.h
44825--- linux-2.6.32.12/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 44992--- linux-2.6.32.13/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
44826+++ linux-2.6.32.12/include/linux/grdefs.h 2010-04-04 20:46:41.677383221 -0400 44993+++ linux-2.6.32.13/include/linux/grdefs.h 2010-05-15 13:21:17.938584561 -0400
44827@@ -0,0 +1,136 @@ 44994@@ -0,0 +1,136 @@
44828+#ifndef GRDEFS_H 44995+#ifndef GRDEFS_H
44829+#define GRDEFS_H 44996+#define GRDEFS_H
@@ -44961,9 +45128,9 @@ diff -urNp linux-2.6.32.12/include/linux/grdefs.h linux-2.6.32.12/include/linux/
44961+}; 45128+};
44962+ 45129+
44963+#endif 45130+#endif
44964diff -urNp linux-2.6.32.12/include/linux/grinternal.h linux-2.6.32.12/include/linux/grinternal.h 45131diff -urNp linux-2.6.32.13/include/linux/grinternal.h linux-2.6.32.13/include/linux/grinternal.h
44965--- linux-2.6.32.12/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 45132--- linux-2.6.32.13/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
44966+++ linux-2.6.32.12/include/linux/grinternal.h 2010-04-04 20:46:41.677383221 -0400 45133+++ linux-2.6.32.13/include/linux/grinternal.h 2010-05-15 13:21:17.938584561 -0400
44967@@ -0,0 +1,215 @@ 45134@@ -0,0 +1,215 @@
44968+#ifndef __GRINTERNAL_H 45135+#ifndef __GRINTERNAL_H
44969+#define __GRINTERNAL_H 45136+#define __GRINTERNAL_H
@@ -45180,9 +45347,9 @@ diff -urNp linux-2.6.32.12/include/linux/grinternal.h linux-2.6.32.12/include/li
45180+#endif 45347+#endif
45181+ 45348+
45182+#endif 45349+#endif
45183diff -urNp linux-2.6.32.12/include/linux/grmsg.h linux-2.6.32.12/include/linux/grmsg.h 45350diff -urNp linux-2.6.32.13/include/linux/grmsg.h linux-2.6.32.13/include/linux/grmsg.h
45184--- linux-2.6.32.12/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 45351--- linux-2.6.32.13/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
45185+++ linux-2.6.32.12/include/linux/grmsg.h 2010-04-04 20:46:41.677383221 -0400 45352+++ linux-2.6.32.13/include/linux/grmsg.h 2010-05-15 13:21:17.938584561 -0400
45186@@ -0,0 +1,107 @@ 45353@@ -0,0 +1,107 @@
45187+#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" 45354+#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"
45188+#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" 45355+#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"
@@ -45291,9 +45458,9 @@ diff -urNp linux-2.6.32.12/include/linux/grmsg.h linux-2.6.32.12/include/linux/g
45291+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " 45458+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
45292+#define GR_VM86_MSG "denied use of vm86 by " 45459+#define GR_VM86_MSG "denied use of vm86 by "
45293+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " 45460+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
45294diff -urNp linux-2.6.32.12/include/linux/grsecurity.h linux-2.6.32.12/include/linux/grsecurity.h 45461diff -urNp linux-2.6.32.13/include/linux/grsecurity.h linux-2.6.32.13/include/linux/grsecurity.h
45295--- linux-2.6.32.12/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 45462--- linux-2.6.32.13/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
45296+++ linux-2.6.32.12/include/linux/grsecurity.h 2010-04-04 20:46:41.677383221 -0400 45463+++ linux-2.6.32.13/include/linux/grsecurity.h 2010-05-15 13:21:17.942979526 -0400
45297@@ -0,0 +1,199 @@ 45464@@ -0,0 +1,199 @@
45298+#ifndef GR_SECURITY_H 45465+#ifndef GR_SECURITY_H
45299+#define GR_SECURITY_H 45466+#define GR_SECURITY_H
@@ -45494,9 +45661,9 @@ diff -urNp linux-2.6.32.12/include/linux/grsecurity.h linux-2.6.32.12/include/li
45494+#endif 45661+#endif
45495+ 45662+
45496+#endif 45663+#endif
45497diff -urNp linux-2.6.32.12/include/linux/hdpu_features.h linux-2.6.32.12/include/linux/hdpu_features.h 45664diff -urNp linux-2.6.32.13/include/linux/hdpu_features.h linux-2.6.32.13/include/linux/hdpu_features.h
45498--- linux-2.6.32.12/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400 45665--- linux-2.6.32.13/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400
45499+++ linux-2.6.32.12/include/linux/hdpu_features.h 2010-04-04 20:46:41.677383221 -0400 45666+++ linux-2.6.32.13/include/linux/hdpu_features.h 2010-05-15 13:21:17.942979526 -0400
45500@@ -3,7 +3,7 @@ 45667@@ -3,7 +3,7 @@
45501 struct cpustate_t { 45668 struct cpustate_t {
45502 spinlock_t lock; 45669 spinlock_t lock;
@@ -45506,9 +45673,9 @@ diff -urNp linux-2.6.32.12/include/linux/hdpu_features.h linux-2.6.32.12/include
45506 unsigned char cached_val; 45673 unsigned char cached_val;
45507 int inited; 45674 int inited;
45508 unsigned long *set_addr; 45675 unsigned long *set_addr;
45509diff -urNp linux-2.6.32.12/include/linux/highmem.h linux-2.6.32.12/include/linux/highmem.h 45676diff -urNp linux-2.6.32.13/include/linux/highmem.h linux-2.6.32.13/include/linux/highmem.h
45510--- linux-2.6.32.12/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400 45677--- linux-2.6.32.13/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400
45511+++ linux-2.6.32.12/include/linux/highmem.h 2010-04-04 20:46:41.677383221 -0400 45678+++ linux-2.6.32.13/include/linux/highmem.h 2010-05-15 13:21:17.942979526 -0400
45512@@ -137,6 +137,18 @@ static inline void clear_highpage(struct 45679@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
45513 kunmap_atomic(kaddr, KM_USER0); 45680 kunmap_atomic(kaddr, KM_USER0);
45514 } 45681 }
@@ -45528,9 +45695,9 @@ diff -urNp linux-2.6.32.12/include/linux/highmem.h linux-2.6.32.12/include/linux
45528 static inline void zero_user_segments(struct page *page, 45695 static inline void zero_user_segments(struct page *page,
45529 unsigned start1, unsigned end1, 45696 unsigned start1, unsigned end1,
45530 unsigned start2, unsigned end2) 45697 unsigned start2, unsigned end2)
45531diff -urNp linux-2.6.32.12/include/linux/init_task.h linux-2.6.32.12/include/linux/init_task.h 45698diff -urNp linux-2.6.32.13/include/linux/init_task.h linux-2.6.32.13/include/linux/init_task.h
45532--- linux-2.6.32.12/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400 45699--- linux-2.6.32.13/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400
45533+++ linux-2.6.32.12/include/linux/init_task.h 2010-04-04 20:46:41.677383221 -0400 45700+++ linux-2.6.32.13/include/linux/init_task.h 2010-05-15 13:21:17.942979526 -0400
45534@@ -115,6 +115,13 @@ extern struct cred init_cred; 45701@@ -115,6 +115,13 @@ extern struct cred init_cred;
45535 # define INIT_PERF_EVENTS(tsk) 45702 # define INIT_PERF_EVENTS(tsk)
45536 #endif 45703 #endif
@@ -45553,9 +45720,9 @@ diff -urNp linux-2.6.32.12/include/linux/init_task.h linux-2.6.32.12/include/lin
45553 } 45720 }
45554 45721
45555 45722
45556diff -urNp linux-2.6.32.12/include/linux/interrupt.h linux-2.6.32.12/include/linux/interrupt.h 45723diff -urNp linux-2.6.32.13/include/linux/interrupt.h linux-2.6.32.13/include/linux/interrupt.h
45557--- linux-2.6.32.12/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400 45724--- linux-2.6.32.13/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400
45558+++ linux-2.6.32.12/include/linux/interrupt.h 2010-04-04 20:46:41.677383221 -0400 45725+++ linux-2.6.32.13/include/linux/interrupt.h 2010-05-15 13:21:17.942979526 -0400
45559@@ -357,7 +357,7 @@ enum 45726@@ -357,7 +357,7 @@ enum
45560 /* map softirq index to softirq name. update 'softirq_to_name' in 45727 /* map softirq index to softirq name. update 'softirq_to_name' in
45561 * kernel/softirq.c when adding a new softirq. 45728 * kernel/softirq.c when adding a new softirq.
@@ -45580,9 +45747,9 @@ diff -urNp linux-2.6.32.12/include/linux/interrupt.h linux-2.6.32.12/include/lin
45580 extern void softirq_init(void); 45747 extern void softirq_init(void);
45581 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) 45748 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
45582 extern void raise_softirq_irqoff(unsigned int nr); 45749 extern void raise_softirq_irqoff(unsigned int nr);
45583diff -urNp linux-2.6.32.12/include/linux/jbd2.h linux-2.6.32.12/include/linux/jbd2.h 45750diff -urNp linux-2.6.32.13/include/linux/jbd2.h linux-2.6.32.13/include/linux/jbd2.h
45584--- linux-2.6.32.12/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400 45751--- linux-2.6.32.13/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400
45585+++ linux-2.6.32.12/include/linux/jbd2.h 2010-04-04 20:46:41.677383221 -0400 45752+++ linux-2.6.32.13/include/linux/jbd2.h 2010-05-15 13:21:17.942979526 -0400
45586@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; 45753@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
45587 } \ 45754 } \
45588 } while (0) 45755 } while (0)
@@ -45592,9 +45759,9 @@ diff -urNp linux-2.6.32.12/include/linux/jbd2.h linux-2.6.32.12/include/linux/jb
45592 #endif 45759 #endif
45593 45760
45594 static inline void *jbd2_alloc(size_t size, gfp_t flags) 45761 static inline void *jbd2_alloc(size_t size, gfp_t flags)
45595diff -urNp linux-2.6.32.12/include/linux/jbd.h linux-2.6.32.12/include/linux/jbd.h 45762diff -urNp linux-2.6.32.13/include/linux/jbd.h linux-2.6.32.13/include/linux/jbd.h
45596--- linux-2.6.32.12/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400 45763--- linux-2.6.32.13/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400
45597+++ linux-2.6.32.12/include/linux/jbd.h 2010-04-04 20:46:41.677383221 -0400 45764+++ linux-2.6.32.13/include/linux/jbd.h 2010-05-15 13:21:17.942979526 -0400
45598@@ -66,7 +66,7 @@ extern u8 journal_enable_debug; 45765@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
45599 } \ 45766 } \
45600 } while (0) 45767 } while (0)
@@ -45604,9 +45771,9 @@ diff -urNp linux-2.6.32.12/include/linux/jbd.h linux-2.6.32.12/include/linux/jbd
45604 #endif 45771 #endif
45605 45772
45606 static inline void *jbd_alloc(size_t size, gfp_t flags) 45773 static inline void *jbd_alloc(size_t size, gfp_t flags)
45607diff -urNp linux-2.6.32.12/include/linux/kallsyms.h linux-2.6.32.12/include/linux/kallsyms.h 45774diff -urNp linux-2.6.32.13/include/linux/kallsyms.h linux-2.6.32.13/include/linux/kallsyms.h
45608--- linux-2.6.32.12/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400 45775--- linux-2.6.32.13/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400
45609+++ linux-2.6.32.12/include/linux/kallsyms.h 2010-04-04 20:46:41.677383221 -0400 45776+++ linux-2.6.32.13/include/linux/kallsyms.h 2010-05-15 13:21:17.942979526 -0400
45610@@ -15,7 +15,8 @@ 45777@@ -15,7 +15,8 @@
45611 45778
45612 struct module; 45779 struct module;
@@ -45627,9 +45794,9 @@ diff -urNp linux-2.6.32.12/include/linux/kallsyms.h linux-2.6.32.12/include/linu
45627 45794
45628 /* This macro allows us to keep printk typechecking */ 45795 /* This macro allows us to keep printk typechecking */
45629 static void __check_printsym_format(const char *fmt, ...) 45796 static void __check_printsym_format(const char *fmt, ...)
45630diff -urNp linux-2.6.32.12/include/linux/kgdb.h linux-2.6.32.12/include/linux/kgdb.h 45797diff -urNp linux-2.6.32.13/include/linux/kgdb.h linux-2.6.32.13/include/linux/kgdb.h
45631--- linux-2.6.32.12/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400 45798--- linux-2.6.32.13/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400
45632+++ linux-2.6.32.12/include/linux/kgdb.h 2010-04-04 20:46:41.677383221 -0400 45799+++ linux-2.6.32.13/include/linux/kgdb.h 2010-05-15 13:21:17.942979526 -0400
45633@@ -251,20 +251,20 @@ struct kgdb_arch { 45800@@ -251,20 +251,20 @@ struct kgdb_arch {
45634 */ 45801 */
45635 struct kgdb_io { 45802 struct kgdb_io {
@@ -45660,9 +45827,9 @@ diff -urNp linux-2.6.32.12/include/linux/kgdb.h linux-2.6.32.12/include/linux/kg
45660 45827
45661 extern int kgdb_hex2long(char **ptr, unsigned long *long_val); 45828 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
45662 extern int kgdb_mem2hex(char *mem, char *buf, int count); 45829 extern int kgdb_mem2hex(char *mem, char *buf, int count);
45663diff -urNp linux-2.6.32.12/include/linux/kobject.h linux-2.6.32.12/include/linux/kobject.h 45830diff -urNp linux-2.6.32.13/include/linux/kobject.h linux-2.6.32.13/include/linux/kobject.h
45664--- linux-2.6.32.12/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400 45831--- linux-2.6.32.13/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400
45665+++ linux-2.6.32.12/include/linux/kobject.h 2010-04-04 20:46:41.677383221 -0400 45832+++ linux-2.6.32.13/include/linux/kobject.h 2010-05-15 13:21:17.942979526 -0400
45666@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob 45833@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
45667 45834
45668 struct kobj_type { 45835 struct kobj_type {
@@ -45711,9 +45878,9 @@ diff -urNp linux-2.6.32.12/include/linux/kobject.h linux-2.6.32.12/include/linux
45711 struct kobject *parent_kobj); 45878 struct kobject *parent_kobj);
45712 45879
45713 static inline struct kset *to_kset(struct kobject *kobj) 45880 static inline struct kset *to_kset(struct kobject *kobj)
45714diff -urNp linux-2.6.32.12/include/linux/kvm_host.h linux-2.6.32.12/include/linux/kvm_host.h 45881diff -urNp linux-2.6.32.13/include/linux/kvm_host.h linux-2.6.32.13/include/linux/kvm_host.h
45715--- linux-2.6.32.12/include/linux/kvm_host.h 2010-04-29 17:49:38.529851956 -0400 45882--- linux-2.6.32.13/include/linux/kvm_host.h 2010-04-29 17:49:38.529851956 -0400
45716+++ linux-2.6.32.12/include/linux/kvm_host.h 2010-04-29 17:49:58.621028174 -0400 45883+++ linux-2.6.32.13/include/linux/kvm_host.h 2010-05-15 13:21:17.942979526 -0400
45717@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc 45884@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
45718 void vcpu_load(struct kvm_vcpu *vcpu); 45885 void vcpu_load(struct kvm_vcpu *vcpu);
45719 void vcpu_put(struct kvm_vcpu *vcpu); 45886 void vcpu_put(struct kvm_vcpu *vcpu);
@@ -45732,9 +45899,9 @@ diff -urNp linux-2.6.32.12/include/linux/kvm_host.h linux-2.6.32.12/include/linu
45732 void kvm_arch_exit(void); 45899 void kvm_arch_exit(void);
45733 45900
45734 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); 45901 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
45735diff -urNp linux-2.6.32.12/include/linux/libata.h linux-2.6.32.12/include/linux/libata.h 45902diff -urNp linux-2.6.32.13/include/linux/libata.h linux-2.6.32.13/include/linux/libata.h
45736--- linux-2.6.32.12/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400 45903--- linux-2.6.32.13/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400
45737+++ linux-2.6.32.12/include/linux/libata.h 2010-04-04 20:46:41.677383221 -0400 45904+++ linux-2.6.32.13/include/linux/libata.h 2010-05-15 13:21:17.942979526 -0400
45738@@ -64,11 +64,11 @@ 45905@@ -64,11 +64,11 @@
45739 #ifdef ATA_VERBOSE_DEBUG 45906 #ifdef ATA_VERBOSE_DEBUG
45740 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) 45907 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -45800,9 +45967,9 @@ diff -urNp linux-2.6.32.12/include/linux/libata.h linux-2.6.32.12/include/linux/
45800 extern int ata_scsi_detect(struct scsi_host_template *sht); 45967 extern int ata_scsi_detect(struct scsi_host_template *sht);
45801 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); 45968 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
45802 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); 45969 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
45803diff -urNp linux-2.6.32.12/include/linux/lockd/bind.h linux-2.6.32.12/include/linux/lockd/bind.h 45970diff -urNp linux-2.6.32.13/include/linux/lockd/bind.h linux-2.6.32.13/include/linux/lockd/bind.h
45804--- linux-2.6.32.12/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400 45971--- linux-2.6.32.13/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400
45805+++ linux-2.6.32.12/include/linux/lockd/bind.h 2010-04-04 20:46:41.681061354 -0400 45972+++ linux-2.6.32.13/include/linux/lockd/bind.h 2010-05-15 13:21:17.942979526 -0400
45806@@ -23,13 +23,13 @@ struct svc_rqst; 45973@@ -23,13 +23,13 @@ struct svc_rqst;
45807 * This is the set of functions for lockd->nfsd communication 45974 * This is the set of functions for lockd->nfsd communication
45808 */ 45975 */
@@ -45820,9 +45987,9 @@ diff -urNp linux-2.6.32.12/include/linux/lockd/bind.h linux-2.6.32.12/include/li
45820 45987
45821 /* 45988 /*
45822 * Similar to nfs_client_initdata, but without the NFS-specific 45989 * Similar to nfs_client_initdata, but without the NFS-specific
45823diff -urNp linux-2.6.32.12/include/linux/mm.h linux-2.6.32.12/include/linux/mm.h 45990diff -urNp linux-2.6.32.13/include/linux/mm.h linux-2.6.32.13/include/linux/mm.h
45824--- linux-2.6.32.12/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400 45991--- linux-2.6.32.13/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400
45825+++ linux-2.6.32.12/include/linux/mm.h 2010-04-04 20:46:41.681061354 -0400 45992+++ linux-2.6.32.13/include/linux/mm.h 2010-05-15 13:21:17.946623351 -0400
45826@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void 45993@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void
45827 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ 45994 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
45828 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ 45995 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
@@ -45885,9 +46052,9 @@ diff -urNp linux-2.6.32.12/include/linux/mm.h linux-2.6.32.12/include/linux/mm.h
45885 46052
45886 #endif /* __KERNEL__ */ 46053 #endif /* __KERNEL__ */
45887 #endif /* _LINUX_MM_H */ 46054 #endif /* _LINUX_MM_H */
45888diff -urNp linux-2.6.32.12/include/linux/mm_types.h linux-2.6.32.12/include/linux/mm_types.h 46055diff -urNp linux-2.6.32.13/include/linux/mm_types.h linux-2.6.32.13/include/linux/mm_types.h
45889--- linux-2.6.32.12/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400 46056--- linux-2.6.32.13/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400
45890+++ linux-2.6.32.12/include/linux/mm_types.h 2010-04-04 20:46:41.681061354 -0400 46057+++ linux-2.6.32.13/include/linux/mm_types.h 2010-05-15 13:21:17.946623351 -0400
45891@@ -186,6 +186,8 @@ struct vm_area_struct { 46058@@ -186,6 +186,8 @@ struct vm_area_struct {
45892 #ifdef CONFIG_NUMA 46059 #ifdef CONFIG_NUMA
45893 struct mempolicy *vm_policy; /* NUMA policy for the VMA */ 46060 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -45922,9 +46089,9 @@ diff -urNp linux-2.6.32.12/include/linux/mm_types.h linux-2.6.32.12/include/linu
45922 }; 46089 };
45923 46090
45924 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ 46091 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
45925diff -urNp linux-2.6.32.12/include/linux/mmu_notifier.h linux-2.6.32.12/include/linux/mmu_notifier.h 46092diff -urNp linux-2.6.32.13/include/linux/mmu_notifier.h linux-2.6.32.13/include/linux/mmu_notifier.h
45926--- linux-2.6.32.12/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400 46093--- linux-2.6.32.13/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400
45927+++ linux-2.6.32.12/include/linux/mmu_notifier.h 2010-04-04 20:46:41.681061354 -0400 46094+++ linux-2.6.32.13/include/linux/mmu_notifier.h 2010-05-15 13:21:17.946623351 -0400
45928@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr 46095@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
45929 */ 46096 */
45930 #define ptep_clear_flush_notify(__vma, __address, __ptep) \ 46097 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -45941,9 +46108,9 @@ diff -urNp linux-2.6.32.12/include/linux/mmu_notifier.h linux-2.6.32.12/include/
45941 }) 46108 })
45942 46109
45943 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ 46110 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
45944diff -urNp linux-2.6.32.12/include/linux/mod_devicetable.h linux-2.6.32.12/include/linux/mod_devicetable.h 46111diff -urNp linux-2.6.32.13/include/linux/mod_devicetable.h linux-2.6.32.13/include/linux/mod_devicetable.h
45945--- linux-2.6.32.12/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400 46112--- linux-2.6.32.13/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400
45946+++ linux-2.6.32.12/include/linux/mod_devicetable.h 2010-04-04 20:46:41.681061354 -0400 46113+++ linux-2.6.32.13/include/linux/mod_devicetable.h 2010-05-15 13:21:17.946623351 -0400
45947@@ -12,7 +12,7 @@ 46114@@ -12,7 +12,7 @@
45948 typedef unsigned long kernel_ulong_t; 46115 typedef unsigned long kernel_ulong_t;
45949 #endif 46116 #endif
@@ -45962,9 +46129,9 @@ diff -urNp linux-2.6.32.12/include/linux/mod_devicetable.h linux-2.6.32.12/inclu
45962 46129
45963 struct hid_device_id { 46130 struct hid_device_id {
45964 __u16 bus; 46131 __u16 bus;
45965diff -urNp linux-2.6.32.12/include/linux/module.h linux-2.6.32.12/include/linux/module.h 46132diff -urNp linux-2.6.32.13/include/linux/module.h linux-2.6.32.13/include/linux/module.h
45966--- linux-2.6.32.12/include/linux/module.h 2010-04-29 17:49:38.529851956 -0400 46133--- linux-2.6.32.13/include/linux/module.h 2010-04-29 17:49:38.529851956 -0400
45967+++ linux-2.6.32.12/include/linux/module.h 2010-04-29 17:49:58.621028174 -0400 46134+++ linux-2.6.32.13/include/linux/module.h 2010-05-15 13:21:17.946623351 -0400
45968@@ -287,16 +287,16 @@ struct module 46135@@ -287,16 +287,16 @@ struct module
45969 int (*init)(void); 46136 int (*init)(void);
45970 46137
@@ -46037,9 +46204,9 @@ diff -urNp linux-2.6.32.12/include/linux/module.h linux-2.6.32.12/include/linux/
46037 } 46204 }
46038 46205
46039 /* Search for module by name: must hold module_mutex. */ 46206 /* Search for module by name: must hold module_mutex. */
46040diff -urNp linux-2.6.32.12/include/linux/moduleloader.h linux-2.6.32.12/include/linux/moduleloader.h 46207diff -urNp linux-2.6.32.13/include/linux/moduleloader.h linux-2.6.32.13/include/linux/moduleloader.h
46041--- linux-2.6.32.12/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400 46208--- linux-2.6.32.13/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400
46042+++ linux-2.6.32.12/include/linux/moduleloader.h 2010-04-04 20:46:41.681061354 -0400 46209+++ linux-2.6.32.13/include/linux/moduleloader.h 2010-05-15 13:21:17.946623351 -0400
46043@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st 46210@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
46044 sections. Returns NULL on failure. */ 46211 sections. Returns NULL on failure. */
46045 void *module_alloc(unsigned long size); 46212 void *module_alloc(unsigned long size);
@@ -46062,9 +46229,9 @@ diff -urNp linux-2.6.32.12/include/linux/moduleloader.h linux-2.6.32.12/include/
46062 /* Apply the given relocation to the (simplified) ELF. Return -error 46229 /* Apply the given relocation to the (simplified) ELF. Return -error
46063 or 0. */ 46230 or 0. */
46064 int apply_relocate(Elf_Shdr *sechdrs, 46231 int apply_relocate(Elf_Shdr *sechdrs,
46065diff -urNp linux-2.6.32.12/include/linux/namei.h linux-2.6.32.12/include/linux/namei.h 46232diff -urNp linux-2.6.32.13/include/linux/namei.h linux-2.6.32.13/include/linux/namei.h
46066--- linux-2.6.32.12/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400 46233--- linux-2.6.32.13/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400
46067+++ linux-2.6.32.12/include/linux/namei.h 2010-04-04 20:46:41.681061354 -0400 46234+++ linux-2.6.32.13/include/linux/namei.h 2010-05-15 13:21:17.946623351 -0400
46068@@ -22,7 +22,7 @@ struct nameidata { 46235@@ -22,7 +22,7 @@ struct nameidata {
46069 unsigned int flags; 46236 unsigned int flags;
46070 int last_type; 46237 int last_type;
@@ -46089,9 +46256,9 @@ diff -urNp linux-2.6.32.12/include/linux/namei.h linux-2.6.32.12/include/linux/n
46089 { 46256 {
46090 return nd->saved_names[nd->depth]; 46257 return nd->saved_names[nd->depth];
46091 } 46258 }
46092diff -urNp linux-2.6.32.12/include/linux/nodemask.h linux-2.6.32.12/include/linux/nodemask.h 46259diff -urNp linux-2.6.32.13/include/linux/nodemask.h linux-2.6.32.13/include/linux/nodemask.h
46093--- linux-2.6.32.12/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400 46260--- linux-2.6.32.13/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400
46094+++ linux-2.6.32.12/include/linux/nodemask.h 2010-04-04 20:46:41.681061354 -0400 46261+++ linux-2.6.32.13/include/linux/nodemask.h 2010-05-15 13:21:17.946623351 -0400
46095@@ -464,11 +464,11 @@ static inline int num_node_state(enum no 46262@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
46096 46263
46097 #define any_online_node(mask) \ 46264 #define any_online_node(mask) \
@@ -46108,9 +46275,9 @@ diff -urNp linux-2.6.32.12/include/linux/nodemask.h linux-2.6.32.12/include/linu
46108 }) 46275 })
46109 46276
46110 #define num_online_nodes() num_node_state(N_ONLINE) 46277 #define num_online_nodes() num_node_state(N_ONLINE)
46111diff -urNp linux-2.6.32.12/include/linux/oprofile.h linux-2.6.32.12/include/linux/oprofile.h 46278diff -urNp linux-2.6.32.13/include/linux/oprofile.h linux-2.6.32.13/include/linux/oprofile.h
46112--- linux-2.6.32.12/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400 46279--- linux-2.6.32.13/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400
46113+++ linux-2.6.32.12/include/linux/oprofile.h 2010-04-04 20:46:41.681061354 -0400 46280+++ linux-2.6.32.13/include/linux/oprofile.h 2010-05-15 13:21:17.946623351 -0400
46114@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super 46281@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
46115 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, 46282 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
46116 char const * name, ulong * val); 46283 char const * name, ulong * val);
@@ -46123,9 +46290,9 @@ diff -urNp linux-2.6.32.12/include/linux/oprofile.h linux-2.6.32.12/include/linu
46123 46290
46124 /** create a directory */ 46291 /** create a directory */
46125 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, 46292 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
46126diff -urNp linux-2.6.32.12/include/linux/pipe_fs_i.h linux-2.6.32.12/include/linux/pipe_fs_i.h 46293diff -urNp linux-2.6.32.13/include/linux/pipe_fs_i.h linux-2.6.32.13/include/linux/pipe_fs_i.h
46127--- linux-2.6.32.12/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400 46294--- linux-2.6.32.13/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400
46128+++ linux-2.6.32.12/include/linux/pipe_fs_i.h 2010-04-04 20:46:41.681061354 -0400 46295+++ linux-2.6.32.13/include/linux/pipe_fs_i.h 2010-05-15 13:21:17.946623351 -0400
46129@@ -46,9 +46,9 @@ struct pipe_inode_info { 46296@@ -46,9 +46,9 @@ struct pipe_inode_info {
46130 wait_queue_head_t wait; 46297 wait_queue_head_t wait;
46131 unsigned int nrbufs, curbuf; 46298 unsigned int nrbufs, curbuf;
@@ -46139,23 +46306,23 @@ diff -urNp linux-2.6.32.12/include/linux/pipe_fs_i.h linux-2.6.32.12/include/lin
46139 unsigned int r_counter; 46306 unsigned int r_counter;
46140 unsigned int w_counter; 46307 unsigned int w_counter;
46141 struct fasync_struct *fasync_readers; 46308 struct fasync_struct *fasync_readers;
46142diff -urNp linux-2.6.32.12/include/linux/poison.h linux-2.6.32.12/include/linux/poison.h 46309diff -urNp linux-2.6.32.13/include/linux/poison.h linux-2.6.32.13/include/linux/poison.h
46143--- linux-2.6.32.12/include/linux/poison.h 2010-03-15 11:52:04.000000000 -0400 46310--- linux-2.6.32.13/include/linux/poison.h 2010-05-15 13:20:19.331913169 -0400
46144+++ linux-2.6.32.12/include/linux/poison.h 2010-04-04 20:46:41.681061354 -0400 46311+++ linux-2.6.32.13/include/linux/poison.h 2010-05-15 13:23:00.179313143 -0400
46145@@ -7,8 +7,8 @@ 46312@@ -19,8 +19,8 @@
46146 * under normal circumstances, used to verify that nobody uses 46313 * under normal circumstances, used to verify that nobody uses
46147 * non-initialized list entries. 46314 * non-initialized list entries.
46148 */ 46315 */
46149-#define LIST_POISON1 ((void *) 0x00100100) 46316-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
46150-#define LIST_POISON2 ((void *) 0x00200200) 46317-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
46151+#define LIST_POISON1 ((void *) (long)0xFFFFFF01) 46318+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
46152+#define LIST_POISON2 ((void *) (long)0xFFFFFF02) 46319+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
46153 46320
46154 /********** include/linux/timer.h **********/ 46321 /********** include/linux/timer.h **********/
46155 /* 46322 /*
46156diff -urNp linux-2.6.32.12/include/linux/proc_fs.h linux-2.6.32.12/include/linux/proc_fs.h 46323diff -urNp linux-2.6.32.13/include/linux/proc_fs.h linux-2.6.32.13/include/linux/proc_fs.h
46157--- linux-2.6.32.12/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400 46324--- linux-2.6.32.13/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400
46158+++ linux-2.6.32.12/include/linux/proc_fs.h 2010-04-04 20:46:41.681061354 -0400 46325+++ linux-2.6.32.13/include/linux/proc_fs.h 2010-05-15 13:21:17.946623351 -0400
46159@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro 46326@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
46160 return proc_create_data(name, mode, parent, proc_fops, NULL); 46327 return proc_create_data(name, mode, parent, proc_fops, NULL);
46161 } 46328 }
@@ -46176,9 +46343,9 @@ diff -urNp linux-2.6.32.12/include/linux/proc_fs.h linux-2.6.32.12/include/linux
46176 static inline struct proc_dir_entry *create_proc_read_entry(const char *name, 46343 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
46177 mode_t mode, struct proc_dir_entry *base, 46344 mode_t mode, struct proc_dir_entry *base,
46178 read_proc_t *read_proc, void * data) 46345 read_proc_t *read_proc, void * data)
46179diff -urNp linux-2.6.32.12/include/linux/random.h linux-2.6.32.12/include/linux/random.h 46346diff -urNp linux-2.6.32.13/include/linux/random.h linux-2.6.32.13/include/linux/random.h
46180--- linux-2.6.32.12/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400 46347--- linux-2.6.32.13/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400
46181+++ linux-2.6.32.12/include/linux/random.h 2010-04-04 20:46:41.681061354 -0400 46348+++ linux-2.6.32.13/include/linux/random.h 2010-05-15 13:21:17.950606770 -0400
46182@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l 46349@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
46183 u32 random32(void); 46350 u32 random32(void);
46184 void srandom32(u32 seed); 46351 void srandom32(u32 seed);
@@ -46191,9 +46358,9 @@ diff -urNp linux-2.6.32.12/include/linux/random.h linux-2.6.32.12/include/linux/
46191 #endif /* __KERNEL___ */ 46358 #endif /* __KERNEL___ */
46192 46359
46193 #endif /* _LINUX_RANDOM_H */ 46360 #endif /* _LINUX_RANDOM_H */
46194diff -urNp linux-2.6.32.12/include/linux/reiserfs_fs.h linux-2.6.32.12/include/linux/reiserfs_fs.h 46361diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs.h linux-2.6.32.13/include/linux/reiserfs_fs.h
46195--- linux-2.6.32.12/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400 46362--- linux-2.6.32.13/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400
46196+++ linux-2.6.32.12/include/linux/reiserfs_fs.h 2010-04-04 20:46:41.681061354 -0400 46363+++ linux-2.6.32.13/include/linux/reiserfs_fs.h 2010-05-15 13:21:17.950606770 -0400
46197@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset 46364@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
46198 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ 46365 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
46199 46366
@@ -46240,9 +46407,9 @@ diff -urNp linux-2.6.32.12/include/linux/reiserfs_fs.h linux-2.6.32.12/include/l
46240 46407
46241 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) 46408 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
46242 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) 46409 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
46243diff -urNp linux-2.6.32.12/include/linux/reiserfs_fs_sb.h linux-2.6.32.12/include/linux/reiserfs_fs_sb.h 46410diff -urNp linux-2.6.32.13/include/linux/reiserfs_fs_sb.h linux-2.6.32.13/include/linux/reiserfs_fs_sb.h
46244--- linux-2.6.32.12/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400 46411--- linux-2.6.32.13/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400
46245+++ linux-2.6.32.12/include/linux/reiserfs_fs_sb.h 2010-04-04 20:46:41.681061354 -0400 46412+++ linux-2.6.32.13/include/linux/reiserfs_fs_sb.h 2010-05-15 13:21:17.950606770 -0400
46246@@ -377,7 +377,7 @@ struct reiserfs_sb_info { 46413@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
46247 /* Comment? -Hans */ 46414 /* Comment? -Hans */
46248 wait_queue_head_t s_wait; 46415 wait_queue_head_t s_wait;
@@ -46252,9 +46419,9 @@ diff -urNp linux-2.6.32.12/include/linux/reiserfs_fs_sb.h linux-2.6.32.12/includ
46252 // tree gets re-balanced 46419 // tree gets re-balanced
46253 unsigned long s_properties; /* File system properties. Currently holds 46420 unsigned long s_properties; /* File system properties. Currently holds
46254 on-disk FS format */ 46421 on-disk FS format */
46255diff -urNp linux-2.6.32.12/include/linux/sched.h linux-2.6.32.12/include/linux/sched.h 46422diff -urNp linux-2.6.32.13/include/linux/sched.h linux-2.6.32.13/include/linux/sched.h
46256--- linux-2.6.32.12/include/linux/sched.h 2010-03-15 11:52:04.000000000 -0400 46423--- linux-2.6.32.13/include/linux/sched.h 2010-03-15 11:52:04.000000000 -0400
46257+++ linux-2.6.32.12/include/linux/sched.h 2010-04-04 20:46:41.681061354 -0400 46424+++ linux-2.6.32.13/include/linux/sched.h 2010-05-15 13:21:17.950606770 -0400
46258@@ -101,6 +101,7 @@ struct bio; 46425@@ -101,6 +101,7 @@ struct bio;
46259 struct fs_struct; 46426 struct fs_struct;
46260 struct bts_context; 46427 struct bts_context;
@@ -46503,9 +46670,9 @@ diff -urNp linux-2.6.32.12/include/linux/sched.h linux-2.6.32.12/include/linux/s
46503 extern void thread_info_cache_init(void); 46670 extern void thread_info_cache_init(void);
46504 46671
46505 #ifdef CONFIG_DEBUG_STACK_USAGE 46672 #ifdef CONFIG_DEBUG_STACK_USAGE
46506diff -urNp linux-2.6.32.12/include/linux/screen_info.h linux-2.6.32.12/include/linux/screen_info.h 46673diff -urNp linux-2.6.32.13/include/linux/screen_info.h linux-2.6.32.13/include/linux/screen_info.h
46507--- linux-2.6.32.12/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400 46674--- linux-2.6.32.13/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400
46508+++ linux-2.6.32.12/include/linux/screen_info.h 2010-04-04 20:46:41.681061354 -0400 46675+++ linux-2.6.32.13/include/linux/screen_info.h 2010-05-15 13:21:17.950606770 -0400
46509@@ -42,7 +42,8 @@ struct screen_info { 46676@@ -42,7 +42,8 @@ struct screen_info {
46510 __u16 pages; /* 0x32 */ 46677 __u16 pages; /* 0x32 */
46511 __u16 vesa_attributes; /* 0x34 */ 46678 __u16 vesa_attributes; /* 0x34 */
@@ -46516,9 +46683,9 @@ diff -urNp linux-2.6.32.12/include/linux/screen_info.h linux-2.6.32.12/include/l
46516 } __attribute__((packed)); 46683 } __attribute__((packed));
46517 46684
46518 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ 46685 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
46519diff -urNp linux-2.6.32.12/include/linux/security.h linux-2.6.32.12/include/linux/security.h 46686diff -urNp linux-2.6.32.13/include/linux/security.h linux-2.6.32.13/include/linux/security.h
46520--- linux-2.6.32.12/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400 46687--- linux-2.6.32.13/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400
46521+++ linux-2.6.32.12/include/linux/security.h 2010-04-04 20:46:41.681061354 -0400 46688+++ linux-2.6.32.13/include/linux/security.h 2010-05-15 13:21:17.950606770 -0400
46522@@ -34,6 +34,7 @@ 46689@@ -34,6 +34,7 @@
46523 #include <linux/key.h> 46690 #include <linux/key.h>
46524 #include <linux/xfrm.h> 46691 #include <linux/xfrm.h>
@@ -46527,9 +46694,9 @@ diff -urNp linux-2.6.32.12/include/linux/security.h linux-2.6.32.12/include/linu
46527 #include <net/flow.h> 46694 #include <net/flow.h>
46528 46695
46529 /* Maximum number of letters for an LSM name string */ 46696 /* Maximum number of letters for an LSM name string */
46530diff -urNp linux-2.6.32.12/include/linux/shm.h linux-2.6.32.12/include/linux/shm.h 46697diff -urNp linux-2.6.32.13/include/linux/shm.h linux-2.6.32.13/include/linux/shm.h
46531--- linux-2.6.32.12/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400 46698--- linux-2.6.32.13/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400
46532+++ linux-2.6.32.12/include/linux/shm.h 2010-04-04 20:46:41.681061354 -0400 46699+++ linux-2.6.32.13/include/linux/shm.h 2010-05-15 13:21:17.950606770 -0400
46533@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke 46700@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
46534 pid_t shm_cprid; 46701 pid_t shm_cprid;
46535 pid_t shm_lprid; 46702 pid_t shm_lprid;
@@ -46541,9 +46708,9 @@ diff -urNp linux-2.6.32.12/include/linux/shm.h linux-2.6.32.12/include/linux/shm
46541 }; 46708 };
46542 46709
46543 /* shm_mode upper byte flags */ 46710 /* shm_mode upper byte flags */
46544diff -urNp linux-2.6.32.12/include/linux/slab.h linux-2.6.32.12/include/linux/slab.h 46711diff -urNp linux-2.6.32.13/include/linux/slab.h linux-2.6.32.13/include/linux/slab.h
46545--- linux-2.6.32.12/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400 46712--- linux-2.6.32.13/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400
46546+++ linux-2.6.32.12/include/linux/slab.h 2010-04-04 20:47:28.956670452 -0400 46713+++ linux-2.6.32.13/include/linux/slab.h 2010-05-15 13:21:17.950606770 -0400
46547@@ -11,6 +11,7 @@ 46714@@ -11,6 +11,7 @@
46548 46715
46549 #include <linux/gfp.h> 46716 #include <linux/gfp.h>
@@ -46615,9 +46782,9 @@ diff -urNp linux-2.6.32.12/include/linux/slab.h linux-2.6.32.12/include/linux/sl
46615+}) 46782+})
46616+ 46783+
46617 #endif /* _LINUX_SLAB_H */ 46784 #endif /* _LINUX_SLAB_H */
46618diff -urNp linux-2.6.32.12/include/linux/slub_def.h linux-2.6.32.12/include/linux/slub_def.h 46785diff -urNp linux-2.6.32.13/include/linux/slub_def.h linux-2.6.32.13/include/linux/slub_def.h
46619--- linux-2.6.32.12/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400 46786--- linux-2.6.32.13/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400
46620+++ linux-2.6.32.12/include/linux/slub_def.h 2010-04-04 20:46:41.685762250 -0400 46787+++ linux-2.6.32.13/include/linux/slub_def.h 2010-05-15 13:21:17.950606770 -0400
46621@@ -86,7 +86,7 @@ struct kmem_cache { 46788@@ -86,7 +86,7 @@ struct kmem_cache {
46622 struct kmem_cache_order_objects max; 46789 struct kmem_cache_order_objects max;
46623 struct kmem_cache_order_objects min; 46790 struct kmem_cache_order_objects min;
@@ -46627,9 +46794,9 @@ diff -urNp linux-2.6.32.12/include/linux/slub_def.h linux-2.6.32.12/include/linu
46627 void (*ctor)(void *); 46794 void (*ctor)(void *);
46628 int inuse; /* Offset to metadata */ 46795 int inuse; /* Offset to metadata */
46629 int align; /* Alignment */ 46796 int align; /* Alignment */
46630diff -urNp linux-2.6.32.12/include/linux/sonet.h linux-2.6.32.12/include/linux/sonet.h 46797diff -urNp linux-2.6.32.13/include/linux/sonet.h linux-2.6.32.13/include/linux/sonet.h
46631--- linux-2.6.32.12/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400 46798--- linux-2.6.32.13/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400
46632+++ linux-2.6.32.12/include/linux/sonet.h 2010-04-04 20:46:41.685762250 -0400 46799+++ linux-2.6.32.13/include/linux/sonet.h 2010-05-15 13:21:17.950606770 -0400
46633@@ -61,7 +61,7 @@ struct sonet_stats { 46800@@ -61,7 +61,7 @@ struct sonet_stats {
46634 #include <asm/atomic.h> 46801 #include <asm/atomic.h>
46635 46802
@@ -46639,9 +46806,9 @@ diff -urNp linux-2.6.32.12/include/linux/sonet.h linux-2.6.32.12/include/linux/s
46639 __SONET_ITEMS 46806 __SONET_ITEMS
46640 #undef __HANDLE_ITEM 46807 #undef __HANDLE_ITEM
46641 }; 46808 };
46642diff -urNp linux-2.6.32.12/include/linux/suspend.h linux-2.6.32.12/include/linux/suspend.h 46809diff -urNp linux-2.6.32.13/include/linux/suspend.h linux-2.6.32.13/include/linux/suspend.h
46643--- linux-2.6.32.12/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400 46810--- linux-2.6.32.13/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400
46644+++ linux-2.6.32.12/include/linux/suspend.h 2010-04-04 20:46:41.685762250 -0400 46811+++ linux-2.6.32.13/include/linux/suspend.h 2010-05-15 13:21:17.950606770 -0400
46645@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; 46812@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
46646 * which require special recovery actions in that situation. 46813 * which require special recovery actions in that situation.
46647 */ 46814 */
@@ -46730,9 +46897,9 @@ diff -urNp linux-2.6.32.12/include/linux/suspend.h linux-2.6.32.12/include/linux
46730 static inline int hibernate(void) { return -ENOSYS; } 46897 static inline int hibernate(void) { return -ENOSYS; }
46731 static inline bool system_entering_hibernation(void) { return false; } 46898 static inline bool system_entering_hibernation(void) { return false; }
46732 #endif /* CONFIG_HIBERNATION */ 46899 #endif /* CONFIG_HIBERNATION */
46733diff -urNp linux-2.6.32.12/include/linux/sysctl.h linux-2.6.32.12/include/linux/sysctl.h 46900diff -urNp linux-2.6.32.13/include/linux/sysctl.h linux-2.6.32.13/include/linux/sysctl.h
46734--- linux-2.6.32.12/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400 46901--- linux-2.6.32.13/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400
46735+++ linux-2.6.32.12/include/linux/sysctl.h 2010-04-04 20:46:41.685762250 -0400 46902+++ linux-2.6.32.13/include/linux/sysctl.h 2010-05-15 13:21:17.950606770 -0400
46736@@ -164,7 +164,11 @@ enum 46903@@ -164,7 +164,11 @@ enum
46737 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ 46904 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
46738 }; 46905 };
@@ -46746,9 +46913,9 @@ diff -urNp linux-2.6.32.12/include/linux/sysctl.h linux-2.6.32.12/include/linux/
46746 46913
46747 /* CTL_VM names: */ 46914 /* CTL_VM names: */
46748 enum 46915 enum
46749diff -urNp linux-2.6.32.12/include/linux/sysfs.h linux-2.6.32.12/include/linux/sysfs.h 46916diff -urNp linux-2.6.32.13/include/linux/sysfs.h linux-2.6.32.13/include/linux/sysfs.h
46750--- linux-2.6.32.12/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400 46917--- linux-2.6.32.13/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400
46751+++ linux-2.6.32.12/include/linux/sysfs.h 2010-04-04 20:46:41.685762250 -0400 46918+++ linux-2.6.32.13/include/linux/sysfs.h 2010-05-15 13:21:17.950606770 -0400
46752@@ -75,8 +75,8 @@ struct bin_attribute { 46919@@ -75,8 +75,8 @@ struct bin_attribute {
46753 }; 46920 };
46754 46921
@@ -46760,9 +46927,9 @@ diff -urNp linux-2.6.32.12/include/linux/sysfs.h linux-2.6.32.12/include/linux/s
46760 }; 46927 };
46761 46928
46762 struct sysfs_dirent; 46929 struct sysfs_dirent;
46763diff -urNp linux-2.6.32.12/include/linux/thread_info.h linux-2.6.32.12/include/linux/thread_info.h 46930diff -urNp linux-2.6.32.13/include/linux/thread_info.h linux-2.6.32.13/include/linux/thread_info.h
46764--- linux-2.6.32.12/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400 46931--- linux-2.6.32.13/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400
46765+++ linux-2.6.32.12/include/linux/thread_info.h 2010-04-04 20:46:41.685762250 -0400 46932+++ linux-2.6.32.13/include/linux/thread_info.h 2010-05-15 13:21:17.950606770 -0400
46766@@ -23,7 +23,7 @@ struct restart_block { 46933@@ -23,7 +23,7 @@ struct restart_block {
46767 }; 46934 };
46768 /* For futex_wait and futex_wait_requeue_pi */ 46935 /* For futex_wait and futex_wait_requeue_pi */
@@ -46772,9 +46939,9 @@ diff -urNp linux-2.6.32.12/include/linux/thread_info.h linux-2.6.32.12/include/l
46772 u32 val; 46939 u32 val;
46773 u32 flags; 46940 u32 flags;
46774 u32 bitset; 46941 u32 bitset;
46775diff -urNp linux-2.6.32.12/include/linux/tty.h linux-2.6.32.12/include/linux/tty.h 46942diff -urNp linux-2.6.32.13/include/linux/tty.h linux-2.6.32.13/include/linux/tty.h
46776--- linux-2.6.32.12/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400 46943--- linux-2.6.32.13/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400
46777+++ linux-2.6.32.12/include/linux/tty.h 2010-04-04 20:46:41.685762250 -0400 46944+++ linux-2.6.32.13/include/linux/tty.h 2010-05-15 13:21:17.950606770 -0400
46778@@ -13,6 +13,7 @@ 46945@@ -13,6 +13,7 @@
46779 #include <linux/tty_driver.h> 46946 #include <linux/tty_driver.h>
46780 #include <linux/tty_ldisc.h> 46947 #include <linux/tty_ldisc.h>
@@ -46810,9 +46977,9 @@ diff -urNp linux-2.6.32.12/include/linux/tty.h linux-2.6.32.12/include/linux/tty
46810 46977
46811 /* n_tty.c */ 46978 /* n_tty.c */
46812 extern struct tty_ldisc_ops tty_ldisc_N_TTY; 46979 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
46813diff -urNp linux-2.6.32.12/include/linux/tty_ldisc.h linux-2.6.32.12/include/linux/tty_ldisc.h 46980diff -urNp linux-2.6.32.13/include/linux/tty_ldisc.h linux-2.6.32.13/include/linux/tty_ldisc.h
46814--- linux-2.6.32.12/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400 46981--- linux-2.6.32.13/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400
46815+++ linux-2.6.32.12/include/linux/tty_ldisc.h 2010-04-04 20:46:41.685762250 -0400 46982+++ linux-2.6.32.13/include/linux/tty_ldisc.h 2010-05-15 13:21:17.950606770 -0400
46816@@ -139,7 +139,7 @@ struct tty_ldisc_ops { 46983@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
46817 46984
46818 struct module *owner; 46985 struct module *owner;
@@ -46822,9 +46989,9 @@ diff -urNp linux-2.6.32.12/include/linux/tty_ldisc.h linux-2.6.32.12/include/lin
46822 }; 46989 };
46823 46990
46824 struct tty_ldisc { 46991 struct tty_ldisc {
46825diff -urNp linux-2.6.32.12/include/linux/types.h linux-2.6.32.12/include/linux/types.h 46992diff -urNp linux-2.6.32.13/include/linux/types.h linux-2.6.32.13/include/linux/types.h
46826--- linux-2.6.32.12/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400 46993--- linux-2.6.32.13/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400
46827+++ linux-2.6.32.12/include/linux/types.h 2010-04-04 20:46:41.685762250 -0400 46994+++ linux-2.6.32.13/include/linux/types.h 2010-05-15 13:21:17.956129899 -0400
46828@@ -191,10 +191,26 @@ typedef struct { 46995@@ -191,10 +191,26 @@ typedef struct {
46829 volatile int counter; 46996 volatile int counter;
46830 } atomic_t; 46997 } atomic_t;
@@ -46852,9 +47019,9 @@ diff -urNp linux-2.6.32.12/include/linux/types.h linux-2.6.32.12/include/linux/t
46852 #endif 47019 #endif
46853 47020
46854 struct ustat { 47021 struct ustat {
46855diff -urNp linux-2.6.32.12/include/linux/uaccess.h linux-2.6.32.12/include/linux/uaccess.h 47022diff -urNp linux-2.6.32.13/include/linux/uaccess.h linux-2.6.32.13/include/linux/uaccess.h
46856--- linux-2.6.32.12/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400 47023--- linux-2.6.32.13/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400
46857+++ linux-2.6.32.12/include/linux/uaccess.h 2010-04-04 20:46:41.685762250 -0400 47024+++ linux-2.6.32.13/include/linux/uaccess.h 2010-05-15 13:21:17.956129899 -0400
46858@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ 47025@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
46859 long ret; \ 47026 long ret; \
46860 mm_segment_t old_fs = get_fs(); \ 47027 mm_segment_t old_fs = get_fs(); \
@@ -46886,15 +47053,15 @@ diff -urNp linux-2.6.32.12/include/linux/uaccess.h linux-2.6.32.12/include/linux
46886+extern long probe_kernel_write(void *dst, const void *src, size_t size); 47053+extern long probe_kernel_write(void *dst, const void *src, size_t size);
46887 47054
46888 #endif /* __LINUX_UACCESS_H__ */ 47055 #endif /* __LINUX_UACCESS_H__ */
46889diff -urNp linux-2.6.32.12/include/linux/vmalloc.h linux-2.6.32.12/include/linux/vmalloc.h 47056diff -urNp linux-2.6.32.13/include/linux/vmalloc.h linux-2.6.32.13/include/linux/vmalloc.h
46890--- linux-2.6.32.12/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400 47057--- linux-2.6.32.13/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400
46891+++ linux-2.6.32.12/include/linux/vmalloc.h 2010-04-04 20:46:41.685762250 -0400 47058+++ linux-2.6.32.13/include/linux/vmalloc.h 2010-05-15 13:23:38.934774262 -0400
46892@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining 47059@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
46893 #define VM_MAP 0x00000004 /* vmap()ed pages */ 47060 #define VM_MAP 0x00000004 /* vmap()ed pages */
46894 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ 47061 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
46895 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */ 47062 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
46896+ 47063+
46897+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) 47064+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
46898+#define VM_KERNEXEC 0x00000020 /* allocate from executable kernel memory range */ 47065+#define VM_KERNEXEC 0x00000020 /* allocate from executable kernel memory range */
46899+#endif 47066+#endif
46900+ 47067+
@@ -46983,9 +47150,9 @@ diff -urNp linux-2.6.32.12/include/linux/vmalloc.h linux-2.6.32.12/include/linux
46983+}) 47150+})
46984+ 47151+
46985 #endif /* _LINUX_VMALLOC_H */ 47152 #endif /* _LINUX_VMALLOC_H */
46986diff -urNp linux-2.6.32.12/include/net/irda/ircomm_tty.h linux-2.6.32.12/include/net/irda/ircomm_tty.h 47153diff -urNp linux-2.6.32.13/include/net/irda/ircomm_tty.h linux-2.6.32.13/include/net/irda/ircomm_tty.h
46987--- linux-2.6.32.12/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400 47154--- linux-2.6.32.13/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400
46988+++ linux-2.6.32.12/include/net/irda/ircomm_tty.h 2010-04-04 20:46:41.685762250 -0400 47155+++ linux-2.6.32.13/include/net/irda/ircomm_tty.h 2010-05-15 13:21:17.956129899 -0400
46989@@ -105,8 +105,8 @@ struct ircomm_tty_cb { 47156@@ -105,8 +105,8 @@ struct ircomm_tty_cb {
46990 unsigned short close_delay; 47157 unsigned short close_delay;
46991 unsigned short closing_wait; /* time to wait before closing */ 47158 unsigned short closing_wait; /* time to wait before closing */
@@ -46997,9 +47164,9 @@ diff -urNp linux-2.6.32.12/include/net/irda/ircomm_tty.h linux-2.6.32.12/include
46997 47164
46998 /* Protect concurent access to : 47165 /* Protect concurent access to :
46999 * o self->open_count 47166 * o self->open_count
47000diff -urNp linux-2.6.32.12/include/net/neighbour.h linux-2.6.32.12/include/net/neighbour.h 47167diff -urNp linux-2.6.32.13/include/net/neighbour.h linux-2.6.32.13/include/net/neighbour.h
47001--- linux-2.6.32.12/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400 47168--- linux-2.6.32.13/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400
47002+++ linux-2.6.32.12/include/net/neighbour.h 2010-04-04 20:46:41.685762250 -0400 47169+++ linux-2.6.32.13/include/net/neighbour.h 2010-05-15 13:21:17.956129899 -0400
47003@@ -125,12 +125,12 @@ struct neighbour 47170@@ -125,12 +125,12 @@ struct neighbour
47004 struct neigh_ops 47171 struct neigh_ops
47005 { 47172 {
@@ -47019,9 +47186,9 @@ diff -urNp linux-2.6.32.12/include/net/neighbour.h linux-2.6.32.12/include/net/n
47019 }; 47186 };
47020 47187
47021 struct pneigh_entry 47188 struct pneigh_entry
47022diff -urNp linux-2.6.32.12/include/net/sctp/sctp.h linux-2.6.32.12/include/net/sctp/sctp.h 47189diff -urNp linux-2.6.32.13/include/net/sctp/sctp.h linux-2.6.32.13/include/net/sctp/sctp.h
47023--- linux-2.6.32.12/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400 47190--- linux-2.6.32.13/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400
47024+++ linux-2.6.32.12/include/net/sctp/sctp.h 2010-04-04 20:46:41.685762250 -0400 47191+++ linux-2.6.32.13/include/net/sctp/sctp.h 2010-05-15 13:21:17.956129899 -0400
47025@@ -305,8 +305,8 @@ extern int sctp_debug_flag; 47192@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
47026 47193
47027 #else /* SCTP_DEBUG */ 47194 #else /* SCTP_DEBUG */
@@ -47033,9 +47200,9 @@ diff -urNp linux-2.6.32.12/include/net/sctp/sctp.h linux-2.6.32.12/include/net/s
47033 #define SCTP_ENABLE_DEBUG 47200 #define SCTP_ENABLE_DEBUG
47034 #define SCTP_DISABLE_DEBUG 47201 #define SCTP_DISABLE_DEBUG
47035 #define SCTP_ASSERT(expr, str, func) 47202 #define SCTP_ASSERT(expr, str, func)
47036diff -urNp linux-2.6.32.12/include/net/tcp.h linux-2.6.32.12/include/net/tcp.h 47203diff -urNp linux-2.6.32.13/include/net/tcp.h linux-2.6.32.13/include/net/tcp.h
47037--- linux-2.6.32.12/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400 47204--- linux-2.6.32.13/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400
47038+++ linux-2.6.32.12/include/net/tcp.h 2010-04-04 20:46:41.685762250 -0400 47205+++ linux-2.6.32.13/include/net/tcp.h 2010-05-15 13:21:17.956129899 -0400
47039@@ -1420,6 +1420,7 @@ enum tcp_seq_states { 47206@@ -1420,6 +1420,7 @@ enum tcp_seq_states {
47040 struct tcp_seq_afinfo { 47207 struct tcp_seq_afinfo {
47041 char *name; 47208 char *name;
@@ -47044,9 +47211,9 @@ diff -urNp linux-2.6.32.12/include/net/tcp.h linux-2.6.32.12/include/net/tcp.h
47044 struct file_operations seq_fops; 47211 struct file_operations seq_fops;
47045 struct seq_operations seq_ops; 47212 struct seq_operations seq_ops;
47046 }; 47213 };
47047diff -urNp linux-2.6.32.12/include/net/udp.h linux-2.6.32.12/include/net/udp.h 47214diff -urNp linux-2.6.32.13/include/net/udp.h linux-2.6.32.13/include/net/udp.h
47048--- linux-2.6.32.12/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400 47215--- linux-2.6.32.13/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400
47049+++ linux-2.6.32.12/include/net/udp.h 2010-04-04 20:46:41.685762250 -0400 47216+++ linux-2.6.32.13/include/net/udp.h 2010-05-15 13:21:17.956129899 -0400
47050@@ -187,6 +187,7 @@ struct udp_seq_afinfo { 47217@@ -187,6 +187,7 @@ struct udp_seq_afinfo {
47051 char *name; 47218 char *name;
47052 sa_family_t family; 47219 sa_family_t family;
@@ -47055,9 +47222,9 @@ diff -urNp linux-2.6.32.12/include/net/udp.h linux-2.6.32.12/include/net/udp.h
47055 struct file_operations seq_fops; 47222 struct file_operations seq_fops;
47056 struct seq_operations seq_ops; 47223 struct seq_operations seq_ops;
47057 }; 47224 };
47058diff -urNp linux-2.6.32.12/include/sound/ac97_codec.h linux-2.6.32.12/include/sound/ac97_codec.h 47225diff -urNp linux-2.6.32.13/include/sound/ac97_codec.h linux-2.6.32.13/include/sound/ac97_codec.h
47059--- linux-2.6.32.12/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400 47226--- linux-2.6.32.13/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400
47060+++ linux-2.6.32.12/include/sound/ac97_codec.h 2010-04-04 20:46:41.685762250 -0400 47227+++ linux-2.6.32.13/include/sound/ac97_codec.h 2010-05-15 13:21:17.956129899 -0400
47061@@ -419,15 +419,15 @@ 47228@@ -419,15 +419,15 @@
47062 struct snd_ac97; 47229 struct snd_ac97;
47063 47230
@@ -47090,9 +47257,9 @@ diff -urNp linux-2.6.32.12/include/sound/ac97_codec.h linux-2.6.32.12/include/so
47090 void *private_data; 47257 void *private_data;
47091 void (*private_free) (struct snd_ac97 *ac97); 47258 void (*private_free) (struct snd_ac97 *ac97);
47092 /* --- */ 47259 /* --- */
47093diff -urNp linux-2.6.32.12/include/trace/events/irq.h linux-2.6.32.12/include/trace/events/irq.h 47260diff -urNp linux-2.6.32.13/include/trace/events/irq.h linux-2.6.32.13/include/trace/events/irq.h
47094--- linux-2.6.32.12/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400 47261--- linux-2.6.32.13/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400
47095+++ linux-2.6.32.12/include/trace/events/irq.h 2010-04-04 20:46:41.685762250 -0400 47262+++ linux-2.6.32.13/include/trace/events/irq.h 2010-05-15 13:21:17.956129899 -0400
47096@@ -34,7 +34,7 @@ 47263@@ -34,7 +34,7 @@
47097 */ 47264 */
47098 TRACE_EVENT(irq_handler_entry, 47265 TRACE_EVENT(irq_handler_entry,
@@ -47129,9 +47296,9 @@ diff -urNp linux-2.6.32.12/include/trace/events/irq.h linux-2.6.32.12/include/tr
47129 47296
47130 TP_ARGS(h, vec), 47297 TP_ARGS(h, vec),
47131 47298
47132diff -urNp linux-2.6.32.12/include/video/uvesafb.h linux-2.6.32.12/include/video/uvesafb.h 47299diff -urNp linux-2.6.32.13/include/video/uvesafb.h linux-2.6.32.13/include/video/uvesafb.h
47133--- linux-2.6.32.12/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400 47300--- linux-2.6.32.13/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400
47134+++ linux-2.6.32.12/include/video/uvesafb.h 2010-04-04 20:46:41.685762250 -0400 47301+++ linux-2.6.32.13/include/video/uvesafb.h 2010-05-15 13:21:17.956129899 -0400
47135@@ -177,6 +177,7 @@ struct uvesafb_par { 47302@@ -177,6 +177,7 @@ struct uvesafb_par {
47136 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ 47303 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
47137 u8 pmi_setpal; /* PMI for palette changes */ 47304 u8 pmi_setpal; /* PMI for palette changes */
@@ -47140,9 +47307,9 @@ diff -urNp linux-2.6.32.12/include/video/uvesafb.h linux-2.6.32.12/include/video
47140 void *pmi_start; 47307 void *pmi_start;
47141 void *pmi_pal; 47308 void *pmi_pal;
47142 u8 *vbe_state_orig; /* 47309 u8 *vbe_state_orig; /*
47143diff -urNp linux-2.6.32.12/init/do_mounts.c linux-2.6.32.12/init/do_mounts.c 47310diff -urNp linux-2.6.32.13/init/do_mounts.c linux-2.6.32.13/init/do_mounts.c
47144--- linux-2.6.32.12/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400 47311--- linux-2.6.32.13/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400
47145+++ linux-2.6.32.12/init/do_mounts.c 2010-04-04 20:46:41.685762250 -0400 47312+++ linux-2.6.32.13/init/do_mounts.c 2010-05-15 13:21:17.956129899 -0400
47146@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa 47313@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
47147 47314
47148 static int __init do_mount_root(char *name, char *fs, int flags, void *data) 47315 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -47188,9 +47355,9 @@ diff -urNp linux-2.6.32.12/init/do_mounts.c linux-2.6.32.12/init/do_mounts.c
47188+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); 47355+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
47189+ sys_chroot((__force char __user *)"."); 47356+ sys_chroot((__force char __user *)".");
47190 } 47357 }
47191diff -urNp linux-2.6.32.12/init/do_mounts.h linux-2.6.32.12/init/do_mounts.h 47358diff -urNp linux-2.6.32.13/init/do_mounts.h linux-2.6.32.13/init/do_mounts.h
47192--- linux-2.6.32.12/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400 47359--- linux-2.6.32.13/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400
47193+++ linux-2.6.32.12/init/do_mounts.h 2010-04-04 20:46:41.685762250 -0400 47360+++ linux-2.6.32.13/init/do_mounts.h 2010-05-15 13:21:18.018620095 -0400
47194@@ -15,15 +15,15 @@ extern int root_mountflags; 47361@@ -15,15 +15,15 @@ extern int root_mountflags;
47195 47362
47196 static inline int create_dev(char *name, dev_t dev) 47363 static inline int create_dev(char *name, dev_t dev)
@@ -47210,9 +47377,9 @@ diff -urNp linux-2.6.32.12/init/do_mounts.h linux-2.6.32.12/init/do_mounts.h
47210 return 0; 47377 return 0;
47211 if (!S_ISBLK(stat.st_mode)) 47378 if (!S_ISBLK(stat.st_mode))
47212 return 0; 47379 return 0;
47213diff -urNp linux-2.6.32.12/init/do_mounts_initrd.c linux-2.6.32.12/init/do_mounts_initrd.c 47380diff -urNp linux-2.6.32.13/init/do_mounts_initrd.c linux-2.6.32.13/init/do_mounts_initrd.c
47214--- linux-2.6.32.12/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400 47381--- linux-2.6.32.13/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400
47215+++ linux-2.6.32.12/init/do_mounts_initrd.c 2010-04-04 20:46:41.685762250 -0400 47382+++ linux-2.6.32.13/init/do_mounts_initrd.c 2010-05-15 13:21:18.018620095 -0400
47216@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel 47383@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
47217 sys_close(old_fd);sys_close(root_fd); 47384 sys_close(old_fd);sys_close(root_fd);
47218 sys_close(0);sys_close(1);sys_close(2); 47385 sys_close(0);sys_close(1);sys_close(2);
@@ -47296,9 +47463,9 @@ diff -urNp linux-2.6.32.12/init/do_mounts_initrd.c linux-2.6.32.12/init/do_mount
47296+ sys_unlink((__force const char __user *)"/initrd.image"); 47463+ sys_unlink((__force const char __user *)"/initrd.image");
47297 return 0; 47464 return 0;
47298 } 47465 }
47299diff -urNp linux-2.6.32.12/init/do_mounts_md.c linux-2.6.32.12/init/do_mounts_md.c 47466diff -urNp linux-2.6.32.13/init/do_mounts_md.c linux-2.6.32.13/init/do_mounts_md.c
47300--- linux-2.6.32.12/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400 47467--- linux-2.6.32.13/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400
47301+++ linux-2.6.32.12/init/do_mounts_md.c 2010-04-04 20:46:41.689696132 -0400 47468+++ linux-2.6.32.13/init/do_mounts_md.c 2010-05-15 13:21:18.018620095 -0400
47302@@ -170,7 +170,7 @@ static void __init md_setup_drive(void) 47469@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
47303 partitioned ? "_d" : "", minor, 47470 partitioned ? "_d" : "", minor,
47304 md_setup_args[ent].device_names); 47471 md_setup_args[ent].device_names);
@@ -47326,9 +47493,9 @@ diff -urNp linux-2.6.32.12/init/do_mounts_md.c linux-2.6.32.12/init/do_mounts_md
47326 if (fd >= 0) { 47493 if (fd >= 0) {
47327 sys_ioctl(fd, RAID_AUTORUN, raid_autopart); 47494 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
47328 sys_close(fd); 47495 sys_close(fd);
47329diff -urNp linux-2.6.32.12/init/initramfs.c linux-2.6.32.12/init/initramfs.c 47496diff -urNp linux-2.6.32.13/init/initramfs.c linux-2.6.32.13/init/initramfs.c
47330--- linux-2.6.32.12/init/initramfs.c 2010-03-15 11:52:04.000000000 -0400 47497--- linux-2.6.32.13/init/initramfs.c 2010-05-15 13:20:19.362999772 -0400
47331+++ linux-2.6.32.12/init/initramfs.c 2010-04-04 20:46:41.689696132 -0400 47498+++ linux-2.6.32.13/init/initramfs.c 2010-05-15 13:21:18.018620095 -0400
47332@@ -74,7 +74,7 @@ static void __init free_hash(void) 47499@@ -74,7 +74,7 @@ static void __init free_hash(void)
47333 } 47500 }
47334 } 47501 }
@@ -47437,9 +47604,9 @@ diff -urNp linux-2.6.32.12/init/initramfs.c linux-2.6.32.12/init/initramfs.c
47437 state = SkipIt; 47604 state = SkipIt;
47438 next_state = Reset; 47605 next_state = Reset;
47439 return 0; 47606 return 0;
47440diff -urNp linux-2.6.32.12/init/Kconfig linux-2.6.32.12/init/Kconfig 47607diff -urNp linux-2.6.32.13/init/Kconfig linux-2.6.32.13/init/Kconfig
47441--- linux-2.6.32.12/init/Kconfig 2010-03-15 11:52:04.000000000 -0400 47608--- linux-2.6.32.13/init/Kconfig 2010-03-15 11:52:04.000000000 -0400
47442+++ linux-2.6.32.12/init/Kconfig 2010-04-04 20:46:41.689696132 -0400 47609+++ linux-2.6.32.13/init/Kconfig 2010-05-15 13:21:18.034611512 -0400
47443@@ -1026,7 +1026,7 @@ config SLUB_DEBUG 47610@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
47444 47611
47445 config COMPAT_BRK 47612 config COMPAT_BRK
@@ -47461,9 +47628,9 @@ diff -urNp linux-2.6.32.12/init/Kconfig linux-2.6.32.12/init/Kconfig
47461 47628
47462 config RT_MUTEXES 47629 config RT_MUTEXES
47463 boolean 47630 boolean
47464diff -urNp linux-2.6.32.12/init/main.c linux-2.6.32.12/init/main.c 47631diff -urNp linux-2.6.32.13/init/main.c linux-2.6.32.13/init/main.c
47465--- linux-2.6.32.12/init/main.c 2010-04-04 20:41:50.060586306 -0400 47632--- linux-2.6.32.13/init/main.c 2010-04-04 20:41:50.060586306 -0400
47466+++ linux-2.6.32.12/init/main.c 2010-04-04 20:58:33.225084964 -0400 47633+++ linux-2.6.32.13/init/main.c 2010-05-15 13:21:18.034611512 -0400
47467@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) 47634@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
47468 #ifdef CONFIG_TC 47635 #ifdef CONFIG_TC
47469 extern void tc_init(void); 47636 extern void tc_init(void);
@@ -47608,9 +47775,9 @@ diff -urNp linux-2.6.32.12/init/main.c linux-2.6.32.12/init/main.c
47608 /* 47775 /*
47609 * Ok, we have completed the initial bootup, and 47776 * Ok, we have completed the initial bootup, and
47610 * we're essentially up and running. Get rid of the 47777 * we're essentially up and running. Get rid of the
47611diff -urNp linux-2.6.32.12/init/noinitramfs.c linux-2.6.32.12/init/noinitramfs.c 47778diff -urNp linux-2.6.32.13/init/noinitramfs.c linux-2.6.32.13/init/noinitramfs.c
47612--- linux-2.6.32.12/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400 47779--- linux-2.6.32.13/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400
47613+++ linux-2.6.32.12/init/noinitramfs.c 2010-04-04 20:46:41.689696132 -0400 47780+++ linux-2.6.32.13/init/noinitramfs.c 2010-05-15 13:21:18.034611512 -0400
47614@@ -29,7 +29,7 @@ static int __init default_rootfs(void) 47781@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
47615 { 47782 {
47616 int err; 47783 int err;
@@ -47629,9 +47796,9 @@ diff -urNp linux-2.6.32.12/init/noinitramfs.c linux-2.6.32.12/init/noinitramfs.c
47629 if (err < 0) 47796 if (err < 0)
47630 goto out; 47797 goto out;
47631 47798
47632diff -urNp linux-2.6.32.12/ipc/ipc_sysctl.c linux-2.6.32.12/ipc/ipc_sysctl.c 47799diff -urNp linux-2.6.32.13/ipc/ipc_sysctl.c linux-2.6.32.13/ipc/ipc_sysctl.c
47633--- linux-2.6.32.12/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 47800--- linux-2.6.32.13/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400
47634+++ linux-2.6.32.12/ipc/ipc_sysctl.c 2010-04-04 20:46:41.689696132 -0400 47801+++ linux-2.6.32.13/ipc/ipc_sysctl.c 2010-05-15 13:21:18.060013842 -0400
47635@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] 47802@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
47636 .extra1 = &zero, 47803 .extra1 = &zero,
47637 .extra2 = &one, 47804 .extra2 = &one,
@@ -47650,9 +47817,9 @@ diff -urNp linux-2.6.32.12/ipc/ipc_sysctl.c linux-2.6.32.12/ipc/ipc_sysctl.c
47650 }; 47817 };
47651 47818
47652 static int __init ipc_sysctl_init(void) 47819 static int __init ipc_sysctl_init(void)
47653diff -urNp linux-2.6.32.12/ipc/mqueue.c linux-2.6.32.12/ipc/mqueue.c 47820diff -urNp linux-2.6.32.13/ipc/mqueue.c linux-2.6.32.13/ipc/mqueue.c
47654--- linux-2.6.32.12/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400 47821--- linux-2.6.32.13/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400
47655+++ linux-2.6.32.12/ipc/mqueue.c 2010-04-04 20:46:41.689696132 -0400 47822+++ linux-2.6.32.13/ipc/mqueue.c 2010-05-15 13:21:18.060013842 -0400
47656@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st 47823@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
47657 mq_bytes = (mq_msg_tblsz + 47824 mq_bytes = (mq_msg_tblsz +
47658 (info->attr.mq_maxmsg * info->attr.mq_msgsize)); 47825 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -47661,9 +47828,9 @@ diff -urNp linux-2.6.32.12/ipc/mqueue.c linux-2.6.32.12/ipc/mqueue.c
47661 spin_lock(&mq_lock); 47828 spin_lock(&mq_lock);
47662 if (u->mq_bytes + mq_bytes < u->mq_bytes || 47829 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
47663 u->mq_bytes + mq_bytes > 47830 u->mq_bytes + mq_bytes >
47664diff -urNp linux-2.6.32.12/ipc/shm.c linux-2.6.32.12/ipc/shm.c 47831diff -urNp linux-2.6.32.13/ipc/shm.c linux-2.6.32.13/ipc/shm.c
47665--- linux-2.6.32.12/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400 47832--- linux-2.6.32.13/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400
47666+++ linux-2.6.32.12/ipc/shm.c 2010-04-04 20:46:41.689696132 -0400 47833+++ linux-2.6.32.13/ipc/shm.c 2010-05-15 13:21:18.060013842 -0400
47667@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name 47834@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
47668 static int sysvipc_shm_proc_show(struct seq_file *s, void *it); 47835 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
47669 #endif 47836 #endif
@@ -47716,9 +47883,9 @@ diff -urNp linux-2.6.32.12/ipc/shm.c linux-2.6.32.12/ipc/shm.c
47716 size = i_size_read(path.dentry->d_inode); 47883 size = i_size_read(path.dentry->d_inode);
47717 shm_unlock(shp); 47884 shm_unlock(shp);
47718 47885
47719diff -urNp linux-2.6.32.12/kernel/acct.c linux-2.6.32.12/kernel/acct.c 47886diff -urNp linux-2.6.32.13/kernel/acct.c linux-2.6.32.13/kernel/acct.c
47720--- linux-2.6.32.12/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400 47887--- linux-2.6.32.13/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400
47721+++ linux-2.6.32.12/kernel/acct.c 2010-04-04 20:46:41.689696132 -0400 47888+++ linux-2.6.32.13/kernel/acct.c 2010-05-15 13:21:18.060013842 -0400
47722@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a 47889@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
47723 */ 47890 */
47724 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; 47891 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -47728,9 +47895,9 @@ diff -urNp linux-2.6.32.12/kernel/acct.c linux-2.6.32.12/kernel/acct.c
47728 sizeof(acct_t), &file->f_pos); 47895 sizeof(acct_t), &file->f_pos);
47729 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; 47896 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
47730 set_fs(fs); 47897 set_fs(fs);
47731diff -urNp linux-2.6.32.12/kernel/capability.c linux-2.6.32.12/kernel/capability.c 47898diff -urNp linux-2.6.32.13/kernel/capability.c linux-2.6.32.13/kernel/capability.c
47732--- linux-2.6.32.12/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400 47899--- linux-2.6.32.13/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400
47733+++ linux-2.6.32.12/kernel/capability.c 2010-04-04 20:46:41.689696132 -0400 47900+++ linux-2.6.32.13/kernel/capability.c 2010-05-15 13:21:18.079122751 -0400
47734@@ -306,10 +306,21 @@ int capable(int cap) 47901@@ -306,10 +306,21 @@ int capable(int cap)
47735 BUG(); 47902 BUG();
47736 } 47903 }
@@ -47754,9 +47921,9 @@ diff -urNp linux-2.6.32.12/kernel/capability.c linux-2.6.32.12/kernel/capability
47754+ 47921+
47755 EXPORT_SYMBOL(capable); 47922 EXPORT_SYMBOL(capable);
47756+EXPORT_SYMBOL(capable_nolog); 47923+EXPORT_SYMBOL(capable_nolog);
47757diff -urNp linux-2.6.32.12/kernel/configs.c linux-2.6.32.12/kernel/configs.c 47924diff -urNp linux-2.6.32.13/kernel/configs.c linux-2.6.32.13/kernel/configs.c
47758--- linux-2.6.32.12/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400 47925--- linux-2.6.32.13/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400
47759+++ linux-2.6.32.12/kernel/configs.c 2010-04-04 20:46:41.689696132 -0400 47926+++ linux-2.6.32.13/kernel/configs.c 2010-05-15 13:21:18.079122751 -0400
47760@@ -73,8 +73,19 @@ static int __init ikconfig_init(void) 47927@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
47761 struct proc_dir_entry *entry; 47928 struct proc_dir_entry *entry;
47762 47929
@@ -47777,9 +47944,9 @@ diff -urNp linux-2.6.32.12/kernel/configs.c linux-2.6.32.12/kernel/configs.c
47777 if (!entry) 47944 if (!entry)
47778 return -ENOMEM; 47945 return -ENOMEM;
47779 47946
47780diff -urNp linux-2.6.32.12/kernel/cpu.c linux-2.6.32.12/kernel/cpu.c 47947diff -urNp linux-2.6.32.13/kernel/cpu.c linux-2.6.32.13/kernel/cpu.c
47781--- linux-2.6.32.12/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400 47948--- linux-2.6.32.13/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400
47782+++ linux-2.6.32.12/kernel/cpu.c 2010-04-04 20:46:41.689696132 -0400 47949+++ linux-2.6.32.13/kernel/cpu.c 2010-05-15 13:21:18.079122751 -0400
47783@@ -19,7 +19,7 @@ 47950@@ -19,7 +19,7 @@
47784 /* Serializes the updates to cpu_online_mask, cpu_present_mask */ 47951 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
47785 static DEFINE_MUTEX(cpu_add_remove_lock); 47952 static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -47789,9 +47956,9 @@ diff -urNp linux-2.6.32.12/kernel/cpu.c linux-2.6.32.12/kernel/cpu.c
47789 47956
47790 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. 47957 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
47791 * Should always be manipulated under cpu_add_remove_lock 47958 * Should always be manipulated under cpu_add_remove_lock
47792diff -urNp linux-2.6.32.12/kernel/cred.c linux-2.6.32.12/kernel/cred.c 47959diff -urNp linux-2.6.32.13/kernel/cred.c linux-2.6.32.13/kernel/cred.c
47793--- linux-2.6.32.12/kernel/cred.c 2010-03-15 11:52:04.000000000 -0400 47960--- linux-2.6.32.13/kernel/cred.c 2010-05-15 13:20:19.362999772 -0400
47794+++ linux-2.6.32.12/kernel/cred.c 2010-04-04 20:46:41.689696132 -0400 47961+++ linux-2.6.32.13/kernel/cred.c 2010-05-15 13:21:18.079122751 -0400
47795@@ -520,6 +520,8 @@ int commit_creds(struct cred *new) 47962@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
47796 47963
47797 get_cred(new); /* we will require a ref for the subj creds too */ 47964 get_cred(new); /* we will require a ref for the subj creds too */
@@ -47801,9 +47968,9 @@ diff -urNp linux-2.6.32.12/kernel/cred.c linux-2.6.32.12/kernel/cred.c
47801 /* dumpability changes */ 47968 /* dumpability changes */
47802 if (old->euid != new->euid || 47969 if (old->euid != new->euid ||
47803 old->egid != new->egid || 47970 old->egid != new->egid ||
47804diff -urNp linux-2.6.32.12/kernel/exit.c linux-2.6.32.12/kernel/exit.c 47971diff -urNp linux-2.6.32.13/kernel/exit.c linux-2.6.32.13/kernel/exit.c
47805--- linux-2.6.32.12/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400 47972--- linux-2.6.32.13/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400
47806+++ linux-2.6.32.12/kernel/exit.c 2010-04-04 20:46:41.689696132 -0400 47973+++ linux-2.6.32.13/kernel/exit.c 2010-05-15 13:21:18.103069718 -0400
47807@@ -56,6 +56,10 @@ 47974@@ -56,6 +56,10 @@
47808 #include <asm/mmu_context.h> 47975 #include <asm/mmu_context.h>
47809 #include "cred-internals.h" 47976 #include "cred-internals.h"
@@ -47893,9 +48060,9 @@ diff -urNp linux-2.6.32.12/kernel/exit.c linux-2.6.32.12/kernel/exit.c
47893 48060
47894 get_task_struct(p); 48061 get_task_struct(p);
47895 read_unlock(&tasklist_lock); 48062 read_unlock(&tasklist_lock);
47896diff -urNp linux-2.6.32.12/kernel/fork.c linux-2.6.32.12/kernel/fork.c 48063diff -urNp linux-2.6.32.13/kernel/fork.c linux-2.6.32.13/kernel/fork.c
47897--- linux-2.6.32.12/kernel/fork.c 2010-03-15 11:52:04.000000000 -0400 48064--- linux-2.6.32.13/kernel/fork.c 2010-03-15 11:52:04.000000000 -0400
47898+++ linux-2.6.32.12/kernel/fork.c 2010-04-04 20:46:41.689696132 -0400 48065+++ linux-2.6.32.13/kernel/fork.c 2010-05-15 13:21:18.103069718 -0400
47899@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru 48066@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
47900 *stackend = STACK_END_MAGIC; /* for overflow detection */ 48067 *stackend = STACK_END_MAGIC; /* for overflow detection */
47901 48068
@@ -48048,9 +48215,9 @@ diff -urNp linux-2.6.32.12/kernel/fork.c linux-2.6.32.12/kernel/fork.c
48048 } 48215 }
48049 48216
48050 if (new_mm) { 48217 if (new_mm) {
48051diff -urNp linux-2.6.32.12/kernel/futex.c linux-2.6.32.12/kernel/futex.c 48218diff -urNp linux-2.6.32.13/kernel/futex.c linux-2.6.32.13/kernel/futex.c
48052--- linux-2.6.32.12/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400 48219--- linux-2.6.32.13/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400
48053+++ linux-2.6.32.12/kernel/futex.c 2010-04-04 20:46:41.689696132 -0400 48220+++ linux-2.6.32.13/kernel/futex.c 2010-05-15 13:21:18.106616956 -0400
48054@@ -54,6 +54,7 @@ 48221@@ -54,6 +54,7 @@
48055 #include <linux/mount.h> 48222 #include <linux/mount.h>
48056 #include <linux/pagemap.h> 48223 #include <linux/pagemap.h>
@@ -48118,9 +48285,9 @@ diff -urNp linux-2.6.32.12/kernel/futex.c linux-2.6.32.12/kernel/futex.c
48118 { 48285 {
48119 unsigned long uentry; 48286 unsigned long uentry;
48120 48287
48121diff -urNp linux-2.6.32.12/kernel/futex_compat.c linux-2.6.32.12/kernel/futex_compat.c 48288diff -urNp linux-2.6.32.13/kernel/futex_compat.c linux-2.6.32.13/kernel/futex_compat.c
48122--- linux-2.6.32.12/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400 48289--- linux-2.6.32.13/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400
48123+++ linux-2.6.32.12/kernel/futex_compat.c 2010-04-04 20:46:41.693491350 -0400 48290+++ linux-2.6.32.13/kernel/futex_compat.c 2010-05-15 13:21:18.106616956 -0400
48124@@ -10,6 +10,7 @@ 48291@@ -10,6 +10,7 @@
48125 #include <linux/compat.h> 48292 #include <linux/compat.h>
48126 #include <linux/nsproxy.h> 48293 #include <linux/nsproxy.h>
@@ -48158,9 +48325,9 @@ diff -urNp linux-2.6.32.12/kernel/futex_compat.c linux-2.6.32.12/kernel/futex_co
48158 head = p->compat_robust_list; 48325 head = p->compat_robust_list;
48159 read_unlock(&tasklist_lock); 48326 read_unlock(&tasklist_lock);
48160 } 48327 }
48161diff -urNp linux-2.6.32.12/kernel/gcov/base.c linux-2.6.32.12/kernel/gcov/base.c 48328diff -urNp linux-2.6.32.13/kernel/gcov/base.c linux-2.6.32.13/kernel/gcov/base.c
48162--- linux-2.6.32.12/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400 48329--- linux-2.6.32.13/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400
48163+++ linux-2.6.32.12/kernel/gcov/base.c 2010-04-04 20:46:41.693491350 -0400 48330+++ linux-2.6.32.13/kernel/gcov/base.c 2010-05-15 13:21:18.106616956 -0400
48164@@ -102,11 +102,6 @@ void gcov_enable_events(void) 48331@@ -102,11 +102,6 @@ void gcov_enable_events(void)
48165 } 48332 }
48166 48333
@@ -48182,9 +48349,9 @@ diff -urNp linux-2.6.32.12/kernel/gcov/base.c linux-2.6.32.12/kernel/gcov/base.c
48182 if (prev) 48349 if (prev)
48183 prev->next = info->next; 48350 prev->next = info->next;
48184 else 48351 else
48185diff -urNp linux-2.6.32.12/kernel/hrtimer.c linux-2.6.32.12/kernel/hrtimer.c 48352diff -urNp linux-2.6.32.13/kernel/hrtimer.c linux-2.6.32.13/kernel/hrtimer.c
48186--- linux-2.6.32.12/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400 48353--- linux-2.6.32.13/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400
48187+++ linux-2.6.32.12/kernel/hrtimer.c 2010-04-04 20:46:41.693491350 -0400 48354+++ linux-2.6.32.13/kernel/hrtimer.c 2010-05-15 13:21:18.118636223 -0400
48188@@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void) 48355@@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void)
48189 local_irq_restore(flags); 48356 local_irq_restore(flags);
48190 } 48357 }
@@ -48194,9 +48361,9 @@ diff -urNp linux-2.6.32.12/kernel/hrtimer.c linux-2.6.32.12/kernel/hrtimer.c
48194 { 48361 {
48195 hrtimer_peek_ahead_timers(); 48362 hrtimer_peek_ahead_timers();
48196 } 48363 }
48197diff -urNp linux-2.6.32.12/kernel/kallsyms.c linux-2.6.32.12/kernel/kallsyms.c 48364diff -urNp linux-2.6.32.13/kernel/kallsyms.c linux-2.6.32.13/kernel/kallsyms.c
48198--- linux-2.6.32.12/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 48365--- linux-2.6.32.13/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400
48199+++ linux-2.6.32.12/kernel/kallsyms.c 2010-04-06 22:21:53.692294722 -0400 48366+++ linux-2.6.32.13/kernel/kallsyms.c 2010-05-15 13:21:18.118636223 -0400
48200@@ -11,6 +11,9 @@ 48367@@ -11,6 +11,9 @@
48201 * Changed the compression method from stem compression to "table lookup" 48368 * Changed the compression method from stem compression to "table lookup"
48202 * compression (see scripts/kallsyms.c for a more complete description) 48369 * compression (see scripts/kallsyms.c for a more complete description)
@@ -48273,9 +48440,9 @@ diff -urNp linux-2.6.32.12/kernel/kallsyms.c linux-2.6.32.12/kernel/kallsyms.c
48273 if (!iter) 48440 if (!iter)
48274 return -ENOMEM; 48441 return -ENOMEM;
48275 reset_iter(iter, 0); 48442 reset_iter(iter, 0);
48276diff -urNp linux-2.6.32.12/kernel/kgdb.c linux-2.6.32.12/kernel/kgdb.c 48443diff -urNp linux-2.6.32.13/kernel/kgdb.c linux-2.6.32.13/kernel/kgdb.c
48277--- linux-2.6.32.12/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 48444--- linux-2.6.32.13/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
48278+++ linux-2.6.32.12/kernel/kgdb.c 2010-04-04 20:46:41.693491350 -0400 48445+++ linux-2.6.32.13/kernel/kgdb.c 2010-05-15 13:21:18.118636223 -0400
48279@@ -86,7 +86,7 @@ static int kgdb_io_module_registered; 48446@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
48280 /* Guard for recursive entry */ 48447 /* Guard for recursive entry */
48281 static int exception_level; 48448 static int exception_level;
@@ -48303,9 +48470,9 @@ diff -urNp linux-2.6.32.12/kernel/kgdb.c linux-2.6.32.12/kernel/kgdb.c
48303 { 48470 {
48304 BUG_ON(kgdb_connected); 48471 BUG_ON(kgdb_connected);
48305 48472
48306diff -urNp linux-2.6.32.12/kernel/kmod.c linux-2.6.32.12/kernel/kmod.c 48473diff -urNp linux-2.6.32.13/kernel/kmod.c linux-2.6.32.13/kernel/kmod.c
48307--- linux-2.6.32.12/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400 48474--- linux-2.6.32.13/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400
48308+++ linux-2.6.32.12/kernel/kmod.c 2010-04-04 20:46:41.693491350 -0400 48475+++ linux-2.6.32.13/kernel/kmod.c 2010-05-15 13:21:18.118636223 -0400
48309@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch 48476@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
48310 if (ret >= MODULE_NAME_LEN) 48477 if (ret >= MODULE_NAME_LEN)
48311 return -ENAMETOOLONG; 48478 return -ENAMETOOLONG;
@@ -48325,9 +48492,9 @@ diff -urNp linux-2.6.32.12/kernel/kmod.c linux-2.6.32.12/kernel/kmod.c
48325 /* If modprobe needs a service that is in a module, we get a recursive 48492 /* If modprobe needs a service that is in a module, we get a recursive
48326 * loop. Limit the number of running kmod threads to max_threads/2 or 48493 * loop. Limit the number of running kmod threads to max_threads/2 or
48327 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method 48494 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
48328diff -urNp linux-2.6.32.12/kernel/kprobes.c linux-2.6.32.12/kernel/kprobes.c 48495diff -urNp linux-2.6.32.13/kernel/kprobes.c linux-2.6.32.13/kernel/kprobes.c
48329--- linux-2.6.32.12/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 48496--- linux-2.6.32.13/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400
48330+++ linux-2.6.32.12/kernel/kprobes.c 2010-04-29 17:46:36.959467563 -0400 48497+++ linux-2.6.32.13/kernel/kprobes.c 2010-05-15 13:21:18.118636223 -0400
48331@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ 48498@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
48332 * kernel image and loaded module images reside. This is required 48499 * kernel image and loaded module images reside. This is required
48333 * so x86_64 can correctly handle the %rip-relative fixups. 48500 * so x86_64 can correctly handle the %rip-relative fixups.
@@ -48364,9 +48531,9 @@ diff -urNp linux-2.6.32.12/kernel/kprobes.c linux-2.6.32.12/kernel/kprobes.c
48364 48531
48365 head = &kprobe_table[i]; 48532 head = &kprobe_table[i];
48366 preempt_disable(); 48533 preempt_disable();
48367diff -urNp linux-2.6.32.12/kernel/lockdep.c linux-2.6.32.12/kernel/lockdep.c 48534diff -urNp linux-2.6.32.13/kernel/lockdep.c linux-2.6.32.13/kernel/lockdep.c
48368--- linux-2.6.32.12/kernel/lockdep.c 2010-04-29 17:49:38.578001941 -0400 48535--- linux-2.6.32.13/kernel/lockdep.c 2010-04-29 17:49:38.578001941 -0400
48369+++ linux-2.6.32.12/kernel/lockdep.c 2010-04-29 18:02:39.221319476 -0400 48536+++ linux-2.6.32.13/kernel/lockdep.c 2010-05-15 13:21:18.122615093 -0400
48370@@ -577,6 +577,10 @@ static int static_obj(void *obj) 48537@@ -577,6 +577,10 @@ static int static_obj(void *obj)
48371 int i; 48538 int i;
48372 #endif 48539 #endif
@@ -48396,9 +48563,9 @@ diff -urNp linux-2.6.32.12/kernel/lockdep.c linux-2.6.32.12/kernel/lockdep.c
48396 printk("the code is fine but needs lockdep annotation.\n"); 48563 printk("the code is fine but needs lockdep annotation.\n");
48397 printk("turning off the locking correctness validator.\n"); 48564 printk("turning off the locking correctness validator.\n");
48398 dump_stack(); 48565 dump_stack();
48399diff -urNp linux-2.6.32.12/kernel/lockdep_proc.c linux-2.6.32.12/kernel/lockdep_proc.c 48566diff -urNp linux-2.6.32.13/kernel/lockdep_proc.c linux-2.6.32.13/kernel/lockdep_proc.c
48400--- linux-2.6.32.12/kernel/lockdep_proc.c 2010-03-15 11:52:04.000000000 -0400 48567--- linux-2.6.32.13/kernel/lockdep_proc.c 2010-03-15 11:52:04.000000000 -0400
48401+++ linux-2.6.32.12/kernel/lockdep_proc.c 2010-04-29 17:46:37.305259446 -0400 48568+++ linux-2.6.32.13/kernel/lockdep_proc.c 2010-05-15 13:21:18.122615093 -0400
48402@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v 48569@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
48403 48570
48404 static void print_name(struct seq_file *m, struct lock_class *class) 48571 static void print_name(struct seq_file *m, struct lock_class *class)
@@ -48408,9 +48575,9 @@ diff -urNp linux-2.6.32.12/kernel/lockdep_proc.c linux-2.6.32.12/kernel/lockdep_
48408 const char *name = class->name; 48575 const char *name = class->name;
48409 48576
48410 if (!name) { 48577 if (!name) {
48411diff -urNp linux-2.6.32.12/kernel/module.c linux-2.6.32.12/kernel/module.c 48578diff -urNp linux-2.6.32.13/kernel/module.c linux-2.6.32.13/kernel/module.c
48412--- linux-2.6.32.12/kernel/module.c 2010-04-29 17:49:38.586002480 -0400 48579--- linux-2.6.32.13/kernel/module.c 2010-04-29 17:49:38.586002480 -0400
48413+++ linux-2.6.32.12/kernel/module.c 2010-04-29 17:49:58.693515313 -0400 48580+++ linux-2.6.32.13/kernel/module.c 2010-05-15 13:21:18.134612708 -0400
48414@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq 48581@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
48415 static BLOCKING_NOTIFIER_HEAD(module_notify_list); 48582 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
48416 48583
@@ -48950,9 +49117,9 @@ diff -urNp linux-2.6.32.12/kernel/module.c linux-2.6.32.12/kernel/module.c
48950 mod = NULL; 49117 mod = NULL;
48951 } 49118 }
48952 return mod; 49119 return mod;
48953diff -urNp linux-2.6.32.12/kernel/panic.c linux-2.6.32.12/kernel/panic.c 49120diff -urNp linux-2.6.32.13/kernel/panic.c linux-2.6.32.13/kernel/panic.c
48954--- linux-2.6.32.12/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400 49121--- linux-2.6.32.13/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400
48955+++ linux-2.6.32.12/kernel/panic.c 2010-04-04 20:46:41.693491350 -0400 49122+++ linux-2.6.32.13/kernel/panic.c 2010-05-15 13:21:18.146612793 -0400
48956@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); 49123@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
48957 */ 49124 */
48958 void __stack_chk_fail(void) 49125 void __stack_chk_fail(void)
@@ -48963,9 +49130,9 @@ diff -urNp linux-2.6.32.12/kernel/panic.c linux-2.6.32.12/kernel/panic.c
48963 __builtin_return_address(0)); 49130 __builtin_return_address(0));
48964 } 49131 }
48965 EXPORT_SYMBOL(__stack_chk_fail); 49132 EXPORT_SYMBOL(__stack_chk_fail);
48966diff -urNp linux-2.6.32.12/kernel/params.c linux-2.6.32.12/kernel/params.c 49133diff -urNp linux-2.6.32.13/kernel/params.c linux-2.6.32.13/kernel/params.c
48967--- linux-2.6.32.12/kernel/params.c 2010-03-15 11:52:04.000000000 -0400 49134--- linux-2.6.32.13/kernel/params.c 2010-03-15 11:52:04.000000000 -0400
48968+++ linux-2.6.32.12/kernel/params.c 2010-04-04 20:46:41.693491350 -0400 49135+++ linux-2.6.32.13/kernel/params.c 2010-05-15 13:21:18.146612793 -0400
48969@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct 49136@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
48970 return ret; 49137 return ret;
48971 } 49138 }
@@ -48984,9 +49151,9 @@ diff -urNp linux-2.6.32.12/kernel/params.c linux-2.6.32.12/kernel/params.c
48984 .filter = uevent_filter, 49151 .filter = uevent_filter,
48985 }; 49152 };
48986 49153
48987diff -urNp linux-2.6.32.12/kernel/pid.c linux-2.6.32.12/kernel/pid.c 49154diff -urNp linux-2.6.32.13/kernel/pid.c linux-2.6.32.13/kernel/pid.c
48988--- linux-2.6.32.12/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400 49155--- linux-2.6.32.13/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400
48989+++ linux-2.6.32.12/kernel/pid.c 2010-04-04 20:46:41.693491350 -0400 49156+++ linux-2.6.32.13/kernel/pid.c 2010-05-15 13:21:18.154611186 -0400
48990@@ -33,6 +33,7 @@ 49157@@ -33,6 +33,7 @@
48991 #include <linux/rculist.h> 49158 #include <linux/rculist.h>
48992 #include <linux/bootmem.h> 49159 #include <linux/bootmem.h>
@@ -49020,9 +49187,9 @@ diff -urNp linux-2.6.32.12/kernel/pid.c linux-2.6.32.12/kernel/pid.c
49020 } 49187 }
49021 49188
49022 struct task_struct *find_task_by_vpid(pid_t vnr) 49189 struct task_struct *find_task_by_vpid(pid_t vnr)
49023diff -urNp linux-2.6.32.12/kernel/posix-cpu-timers.c linux-2.6.32.12/kernel/posix-cpu-timers.c 49190diff -urNp linux-2.6.32.13/kernel/posix-cpu-timers.c linux-2.6.32.13/kernel/posix-cpu-timers.c
49024--- linux-2.6.32.12/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400 49191--- linux-2.6.32.13/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400
49025+++ linux-2.6.32.12/kernel/posix-cpu-timers.c 2010-04-04 20:46:41.697788265 -0400 49192+++ linux-2.6.32.13/kernel/posix-cpu-timers.c 2010-05-15 13:21:18.158615271 -0400
49026@@ -6,6 +6,7 @@ 49193@@ -6,6 +6,7 @@
49027 #include <linux/posix-timers.h> 49194 #include <linux/posix-timers.h>
49028 #include <linux/errno.h> 49195 #include <linux/errno.h>
@@ -49047,9 +49214,9 @@ diff -urNp linux-2.6.32.12/kernel/posix-cpu-timers.c linux-2.6.32.12/kernel/posi
49047 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { 49214 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) {
49048 /* 49215 /*
49049 * At the soft limit, send a SIGXCPU every second. 49216 * At the soft limit, send a SIGXCPU every second.
49050diff -urNp linux-2.6.32.12/kernel/power/hibernate.c linux-2.6.32.12/kernel/power/hibernate.c 49217diff -urNp linux-2.6.32.13/kernel/power/hibernate.c linux-2.6.32.13/kernel/power/hibernate.c
49051--- linux-2.6.32.12/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400 49218--- linux-2.6.32.13/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400
49052+++ linux-2.6.32.12/kernel/power/hibernate.c 2010-04-04 20:46:41.697788265 -0400 49219+++ linux-2.6.32.13/kernel/power/hibernate.c 2010-05-15 13:21:18.158615271 -0400
49053@@ -48,14 +48,14 @@ enum { 49220@@ -48,14 +48,14 @@ enum {
49054 49221
49055 static int hibernation_mode = HIBERNATION_SHUTDOWN; 49222 static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -49067,9 +49234,9 @@ diff -urNp linux-2.6.32.12/kernel/power/hibernate.c linux-2.6.32.12/kernel/power
49067 { 49234 {
49068 if (ops && !(ops->begin && ops->end && ops->pre_snapshot 49235 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
49069 && ops->prepare && ops->finish && ops->enter && ops->pre_restore 49236 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
49070diff -urNp linux-2.6.32.12/kernel/power/poweroff.c linux-2.6.32.12/kernel/power/poweroff.c 49237diff -urNp linux-2.6.32.13/kernel/power/poweroff.c linux-2.6.32.13/kernel/power/poweroff.c
49071--- linux-2.6.32.12/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400 49238--- linux-2.6.32.13/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400
49072+++ linux-2.6.32.12/kernel/power/poweroff.c 2010-04-04 20:46:41.697788265 -0400 49239+++ linux-2.6.32.13/kernel/power/poweroff.c 2010-05-15 13:21:18.158615271 -0400
49073@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof 49240@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
49074 .enable_mask = SYSRQ_ENABLE_BOOT, 49241 .enable_mask = SYSRQ_ENABLE_BOOT,
49075 }; 49242 };
@@ -49079,9 +49246,9 @@ diff -urNp linux-2.6.32.12/kernel/power/poweroff.c linux-2.6.32.12/kernel/power/
49079 { 49246 {
49080 register_sysrq_key('o', &sysrq_poweroff_op); 49247 register_sysrq_key('o', &sysrq_poweroff_op);
49081 return 0; 49248 return 0;
49082diff -urNp linux-2.6.32.12/kernel/power/process.c linux-2.6.32.12/kernel/power/process.c 49249diff -urNp linux-2.6.32.13/kernel/power/process.c linux-2.6.32.13/kernel/power/process.c
49083--- linux-2.6.32.12/kernel/power/process.c 2010-04-29 17:49:38.590000225 -0400 49250--- linux-2.6.32.13/kernel/power/process.c 2010-04-29 17:49:38.590000225 -0400
49084+++ linux-2.6.32.12/kernel/power/process.c 2010-04-29 17:49:58.697130575 -0400 49251+++ linux-2.6.32.13/kernel/power/process.c 2010-05-15 13:21:18.158615271 -0400
49085@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ 49252@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
49086 struct timeval start, end; 49253 struct timeval start, end;
49087 u64 elapsed_csecs64; 49254 u64 elapsed_csecs64;
@@ -49121,9 +49288,9 @@ diff -urNp linux-2.6.32.12/kernel/power/process.c linux-2.6.32.12/kernel/power/p
49121 49288
49122 do_gettimeofday(&end); 49289 do_gettimeofday(&end);
49123 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); 49290 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
49124diff -urNp linux-2.6.32.12/kernel/power/suspend.c linux-2.6.32.12/kernel/power/suspend.c 49291diff -urNp linux-2.6.32.13/kernel/power/suspend.c linux-2.6.32.13/kernel/power/suspend.c
49125--- linux-2.6.32.12/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400 49292--- linux-2.6.32.13/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400
49126+++ linux-2.6.32.12/kernel/power/suspend.c 2010-04-04 20:46:41.697788265 -0400 49293+++ linux-2.6.32.13/kernel/power/suspend.c 2010-05-15 13:21:18.158615271 -0400
49127@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M 49294@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
49128 [PM_SUSPEND_MEM] = "mem", 49295 [PM_SUSPEND_MEM] = "mem",
49129 }; 49296 };
@@ -49140,9 +49307,9 @@ diff -urNp linux-2.6.32.12/kernel/power/suspend.c linux-2.6.32.12/kernel/power/s
49140 { 49307 {
49141 mutex_lock(&pm_mutex); 49308 mutex_lock(&pm_mutex);
49142 suspend_ops = ops; 49309 suspend_ops = ops;
49143diff -urNp linux-2.6.32.12/kernel/printk.c linux-2.6.32.12/kernel/printk.c 49310diff -urNp linux-2.6.32.13/kernel/printk.c linux-2.6.32.13/kernel/printk.c
49144--- linux-2.6.32.12/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400 49311--- linux-2.6.32.13/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400
49145+++ linux-2.6.32.12/kernel/printk.c 2010-04-04 20:46:41.697788265 -0400 49312+++ linux-2.6.32.13/kernel/printk.c 2010-05-15 13:21:18.158615271 -0400
49146@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf 49313@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
49147 char c; 49314 char c;
49148 int error = 0; 49315 int error = 0;
@@ -49155,9 +49322,9 @@ diff -urNp linux-2.6.32.12/kernel/printk.c linux-2.6.32.12/kernel/printk.c
49155 error = security_syslog(type); 49322 error = security_syslog(type);
49156 if (error) 49323 if (error)
49157 return error; 49324 return error;
49158diff -urNp linux-2.6.32.12/kernel/ptrace.c linux-2.6.32.12/kernel/ptrace.c 49325diff -urNp linux-2.6.32.13/kernel/ptrace.c linux-2.6.32.13/kernel/ptrace.c
49159--- linux-2.6.32.12/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 49326--- linux-2.6.32.13/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400
49160+++ linux-2.6.32.12/kernel/ptrace.c 2010-04-04 20:46:41.697788265 -0400 49327+++ linux-2.6.32.13/kernel/ptrace.c 2010-05-15 13:21:18.158615271 -0400
49161@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru 49328@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
49162 cred->gid != tcred->egid || 49329 cred->gid != tcred->egid ||
49163 cred->gid != tcred->sgid || 49330 cred->gid != tcred->sgid ||
@@ -49239,9 +49406,9 @@ diff -urNp linux-2.6.32.12/kernel/ptrace.c linux-2.6.32.12/kernel/ptrace.c
49239 } 49406 }
49240 49407
49241 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) 49408 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
49242diff -urNp linux-2.6.32.12/kernel/rcutree.c linux-2.6.32.12/kernel/rcutree.c 49409diff -urNp linux-2.6.32.13/kernel/rcutree.c linux-2.6.32.13/kernel/rcutree.c
49243--- linux-2.6.32.12/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400 49410--- linux-2.6.32.13/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400
49244+++ linux-2.6.32.12/kernel/rcutree.c 2010-04-04 20:46:41.697788265 -0400 49411+++ linux-2.6.32.13/kernel/rcutree.c 2010-05-15 13:21:18.162587722 -0400
49245@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state 49412@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
49246 /* 49413 /*
49247 * Do softirq processing for the current CPU. 49414 * Do softirq processing for the current CPU.
@@ -49251,9 +49418,9 @@ diff -urNp linux-2.6.32.12/kernel/rcutree.c linux-2.6.32.12/kernel/rcutree.c
49251 { 49418 {
49252 /* 49419 /*
49253 * Memory references from any prior RCU read-side critical sections 49420 * Memory references from any prior RCU read-side critical sections
49254diff -urNp linux-2.6.32.12/kernel/relay.c linux-2.6.32.12/kernel/relay.c 49421diff -urNp linux-2.6.32.13/kernel/relay.c linux-2.6.32.13/kernel/relay.c
49255--- linux-2.6.32.12/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400 49422--- linux-2.6.32.13/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400
49256+++ linux-2.6.32.12/kernel/relay.c 2010-04-04 20:46:41.697788265 -0400 49423+++ linux-2.6.32.13/kernel/relay.c 2010-05-15 13:21:18.162587722 -0400
49257@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi 49424@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi
49258 return 0; 49425 return 0;
49259 49426
@@ -49263,9 +49430,9 @@ diff -urNp linux-2.6.32.12/kernel/relay.c linux-2.6.32.12/kernel/relay.c
49263 return ret; 49430 return ret;
49264 49431
49265 if (read_start + ret == nonpad_end) 49432 if (read_start + ret == nonpad_end)
49266diff -urNp linux-2.6.32.12/kernel/resource.c linux-2.6.32.12/kernel/resource.c 49433diff -urNp linux-2.6.32.13/kernel/resource.c linux-2.6.32.13/kernel/resource.c
49267--- linux-2.6.32.12/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400 49434--- linux-2.6.32.13/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400
49268+++ linux-2.6.32.12/kernel/resource.c 2010-04-04 20:46:41.697788265 -0400 49435+++ linux-2.6.32.13/kernel/resource.c 2010-05-15 13:21:18.162587722 -0400
49269@@ -132,8 +132,18 @@ static const struct file_operations proc 49436@@ -132,8 +132,18 @@ static const struct file_operations proc
49270 49437
49271 static int __init ioresources_init(void) 49438 static int __init ioresources_init(void)
@@ -49285,9 +49452,9 @@ diff -urNp linux-2.6.32.12/kernel/resource.c linux-2.6.32.12/kernel/resource.c
49285 return 0; 49452 return 0;
49286 } 49453 }
49287 __initcall(ioresources_init); 49454 __initcall(ioresources_init);
49288diff -urNp linux-2.6.32.12/kernel/sched.c linux-2.6.32.12/kernel/sched.c 49455diff -urNp linux-2.6.32.13/kernel/sched.c linux-2.6.32.13/kernel/sched.c
49289--- linux-2.6.32.12/kernel/sched.c 2010-04-29 17:49:38.609495328 -0400 49456--- linux-2.6.32.13/kernel/sched.c 2010-04-29 17:49:38.609495328 -0400
49290+++ linux-2.6.32.12/kernel/sched.c 2010-04-29 17:49:58.717524885 -0400 49457+++ linux-2.6.32.13/kernel/sched.c 2010-05-15 13:21:18.180350069 -0400
49291@@ -4841,7 +4841,7 @@ out: 49458@@ -4841,7 +4841,7 @@ out:
49292 * In CONFIG_NO_HZ case, the idle load balance owner will do the 49459 * In CONFIG_NO_HZ case, the idle load balance owner will do the
49293 * rebalancing for all the cpus for whom scheduler ticks are stopped. 49460 * rebalancing for all the cpus for whom scheduler ticks are stopped.
@@ -49343,9 +49510,9 @@ diff -urNp linux-2.6.32.12/kernel/sched.c linux-2.6.32.12/kernel/sched.c
49343 }; 49510 };
49344 49511
49345 static struct ctl_table *sd_alloc_ctl_entry(int n) 49512 static struct ctl_table *sd_alloc_ctl_entry(int n)
49346diff -urNp linux-2.6.32.12/kernel/signal.c linux-2.6.32.12/kernel/signal.c 49513diff -urNp linux-2.6.32.13/kernel/signal.c linux-2.6.32.13/kernel/signal.c
49347--- linux-2.6.32.12/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 49514--- linux-2.6.32.13/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400
49348+++ linux-2.6.32.12/kernel/signal.c 2010-04-29 17:46:37.333938325 -0400 49515+++ linux-2.6.32.13/kernel/signal.c 2010-05-15 13:21:18.180350069 -0400
49349@@ -41,12 +41,12 @@ 49516@@ -41,12 +41,12 @@
49350 49517
49351 static struct kmem_cache *sigqueue_cachep; 49518 static struct kmem_cache *sigqueue_cachep;
@@ -49431,9 +49598,9 @@ diff -urNp linux-2.6.32.12/kernel/signal.c linux-2.6.32.12/kernel/signal.c
49431 49598
49432 return ret; 49599 return ret;
49433 } 49600 }
49434diff -urNp linux-2.6.32.12/kernel/smp.c linux-2.6.32.12/kernel/smp.c 49601diff -urNp linux-2.6.32.13/kernel/smp.c linux-2.6.32.13/kernel/smp.c
49435--- linux-2.6.32.12/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400 49602--- linux-2.6.32.13/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400
49436+++ linux-2.6.32.12/kernel/smp.c 2010-04-04 20:46:41.701624986 -0400 49603+++ linux-2.6.32.13/kernel/smp.c 2010-05-15 13:21:18.180350069 -0400
49437@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void 49604@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void
49438 } 49605 }
49439 EXPORT_SYMBOL(smp_call_function); 49606 EXPORT_SYMBOL(smp_call_function);
@@ -49461,9 +49628,9 @@ diff -urNp linux-2.6.32.12/kernel/smp.c linux-2.6.32.12/kernel/smp.c
49461 { 49628 {
49462 spin_unlock_irq(&call_function.lock); 49629 spin_unlock_irq(&call_function.lock);
49463 } 49630 }
49464diff -urNp linux-2.6.32.12/kernel/softirq.c linux-2.6.32.12/kernel/softirq.c 49631diff -urNp linux-2.6.32.13/kernel/softirq.c linux-2.6.32.13/kernel/softirq.c
49465--- linux-2.6.32.12/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400 49632--- linux-2.6.32.13/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400
49466+++ linux-2.6.32.12/kernel/softirq.c 2010-04-04 20:46:41.701624986 -0400 49633+++ linux-2.6.32.13/kernel/softirq.c 2010-05-15 13:21:18.186622968 -0400
49467@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec 49634@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
49468 49635
49469 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); 49636 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -49518,9 +49685,9 @@ diff -urNp linux-2.6.32.12/kernel/softirq.c linux-2.6.32.12/kernel/softirq.c
49518 { 49685 {
49519 struct tasklet_struct *list; 49686 struct tasklet_struct *list;
49520 49687
49521diff -urNp linux-2.6.32.12/kernel/sys.c linux-2.6.32.12/kernel/sys.c 49688diff -urNp linux-2.6.32.13/kernel/sys.c linux-2.6.32.13/kernel/sys.c
49522--- linux-2.6.32.12/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400 49689--- linux-2.6.32.13/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400
49523+++ linux-2.6.32.12/kernel/sys.c 2010-04-04 20:46:41.701624986 -0400 49690+++ linux-2.6.32.13/kernel/sys.c 2010-05-15 13:21:18.223438230 -0400
49524@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru 49691@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
49525 error = -EACCES; 49692 error = -EACCES;
49526 goto out; 49693 goto out;
@@ -49656,9 +49823,9 @@ diff -urNp linux-2.6.32.12/kernel/sys.c linux-2.6.32.12/kernel/sys.c
49656 error = -EINVAL; 49823 error = -EINVAL;
49657 break; 49824 break;
49658 } 49825 }
49659diff -urNp linux-2.6.32.12/kernel/sysctl.c linux-2.6.32.12/kernel/sysctl.c 49826diff -urNp linux-2.6.32.13/kernel/sysctl.c linux-2.6.32.13/kernel/sysctl.c
49660--- linux-2.6.32.12/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400 49827--- linux-2.6.32.13/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400
49661+++ linux-2.6.32.12/kernel/sysctl.c 2010-04-04 20:46:41.701624986 -0400 49828+++ linux-2.6.32.13/kernel/sysctl.c 2010-05-15 13:21:18.258852946 -0400
49662@@ -63,6 +63,13 @@ 49829@@ -63,6 +63,13 @@
49663 static int deprecated_sysctl_warning(struct __sysctl_args *args); 49830 static int deprecated_sysctl_warning(struct __sysctl_args *args);
49664 49831
@@ -49780,9 +49947,9 @@ diff -urNp linux-2.6.32.12/kernel/sysctl.c linux-2.6.32.12/kernel/sysctl.c
49780 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); 49947 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
49781 if (error) 49948 if (error)
49782 return error; 49949 return error;
49783diff -urNp linux-2.6.32.12/kernel/taskstats.c linux-2.6.32.12/kernel/taskstats.c 49950diff -urNp linux-2.6.32.13/kernel/taskstats.c linux-2.6.32.13/kernel/taskstats.c
49784--- linux-2.6.32.12/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400 49951--- linux-2.6.32.13/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400
49785+++ linux-2.6.32.12/kernel/taskstats.c 2010-04-04 20:46:41.701624986 -0400 49952+++ linux-2.6.32.13/kernel/taskstats.c 2010-05-15 13:21:18.258852946 -0400
49786@@ -26,9 +26,12 @@ 49953@@ -26,9 +26,12 @@
49787 #include <linux/cgroup.h> 49954 #include <linux/cgroup.h>
49788 #include <linux/fs.h> 49955 #include <linux/fs.h>
@@ -49806,9 +49973,9 @@ diff -urNp linux-2.6.32.12/kernel/taskstats.c linux-2.6.32.12/kernel/taskstats.c
49806 if (!alloc_cpumask_var(&mask, GFP_KERNEL)) 49973 if (!alloc_cpumask_var(&mask, GFP_KERNEL))
49807 return -ENOMEM; 49974 return -ENOMEM;
49808 49975
49809diff -urNp linux-2.6.32.12/kernel/time/tick-broadcast.c linux-2.6.32.12/kernel/time/tick-broadcast.c 49976diff -urNp linux-2.6.32.13/kernel/time/tick-broadcast.c linux-2.6.32.13/kernel/time/tick-broadcast.c
49810--- linux-2.6.32.12/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400 49977--- linux-2.6.32.13/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400
49811+++ linux-2.6.32.12/kernel/time/tick-broadcast.c 2010-04-04 20:46:41.701624986 -0400 49978+++ linux-2.6.32.13/kernel/time/tick-broadcast.c 2010-05-15 13:21:18.258852946 -0400
49812@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl 49979@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
49813 * then clear the broadcast bit. 49980 * then clear the broadcast bit.
49814 */ 49981 */
@@ -49818,9 +49985,9 @@ diff -urNp linux-2.6.32.12/kernel/time/tick-broadcast.c linux-2.6.32.12/kernel/t
49818 49985
49819 cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); 49986 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
49820 tick_broadcast_clear_oneshot(cpu); 49987 tick_broadcast_clear_oneshot(cpu);
49821diff -urNp linux-2.6.32.12/kernel/time.c linux-2.6.32.12/kernel/time.c 49988diff -urNp linux-2.6.32.13/kernel/time.c linux-2.6.32.13/kernel/time.c
49822--- linux-2.6.32.12/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 49989--- linux-2.6.32.13/kernel/time.c 2010-03-15 11:52:04.000000000 -0400
49823+++ linux-2.6.32.12/kernel/time.c 2010-04-04 20:46:41.701624986 -0400 49990+++ linux-2.6.32.13/kernel/time.c 2010-05-15 13:21:18.262613670 -0400
49824@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, 49991@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *,
49825 return err; 49992 return err;
49826 49993
@@ -49858,9 +50025,9 @@ diff -urNp linux-2.6.32.12/kernel/time.c linux-2.6.32.12/kernel/time.c
49858 { 50025 {
49859 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) 50026 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
49860 return (USEC_PER_SEC / HZ) * j; 50027 return (USEC_PER_SEC / HZ) * j;
49861diff -urNp linux-2.6.32.12/kernel/timer.c linux-2.6.32.12/kernel/timer.c 50028diff -urNp linux-2.6.32.13/kernel/timer.c linux-2.6.32.13/kernel/timer.c
49862--- linux-2.6.32.12/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400 50029--- linux-2.6.32.13/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400
49863+++ linux-2.6.32.12/kernel/timer.c 2010-04-04 20:46:41.701624986 -0400 50030+++ linux-2.6.32.13/kernel/timer.c 2010-05-15 13:21:18.262613670 -0400
49864@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) 50031@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick)
49865 /* 50032 /*
49866 * This function runs timers and the timer-tq in bottom half context. 50033 * This function runs timers and the timer-tq in bottom half context.
@@ -49870,9 +50037,9 @@ diff -urNp linux-2.6.32.12/kernel/timer.c linux-2.6.32.12/kernel/timer.c
49870 { 50037 {
49871 struct tvec_base *base = __get_cpu_var(tvec_bases); 50038 struct tvec_base *base = __get_cpu_var(tvec_bases);
49872 50039
49873diff -urNp linux-2.6.32.12/kernel/trace/ftrace.c linux-2.6.32.12/kernel/trace/ftrace.c 50040diff -urNp linux-2.6.32.13/kernel/trace/ftrace.c linux-2.6.32.13/kernel/trace/ftrace.c
49874--- linux-2.6.32.12/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400 50041--- linux-2.6.32.13/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400
49875+++ linux-2.6.32.12/kernel/trace/ftrace.c 2010-04-04 20:46:41.701624986 -0400 50042+++ linux-2.6.32.13/kernel/trace/ftrace.c 2010-05-15 13:21:18.274619950 -0400
49876@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, 50043@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod,
49877 50044
49878 ip = rec->ip; 50045 ip = rec->ip;
@@ -49894,9 +50061,9 @@ diff -urNp linux-2.6.32.12/kernel/trace/ftrace.c linux-2.6.32.12/kernel/trace/ft
49894 } 50061 }
49895 50062
49896 /* 50063 /*
49897diff -urNp linux-2.6.32.12/kernel/trace/Kconfig linux-2.6.32.12/kernel/trace/Kconfig 50064diff -urNp linux-2.6.32.13/kernel/trace/Kconfig linux-2.6.32.13/kernel/trace/Kconfig
49898--- linux-2.6.32.12/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400 50065--- linux-2.6.32.13/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400
49899+++ linux-2.6.32.12/kernel/trace/Kconfig 2010-04-04 20:46:41.701624986 -0400 50066+++ linux-2.6.32.13/kernel/trace/Kconfig 2010-05-15 13:21:18.278715003 -0400
49900@@ -126,6 +126,7 @@ if FTRACE 50067@@ -126,6 +126,7 @@ if FTRACE
49901 config FUNCTION_TRACER 50068 config FUNCTION_TRACER
49902 bool "Kernel Function Tracer" 50069 bool "Kernel Function Tracer"
@@ -49913,9 +50080,9 @@ diff -urNp linux-2.6.32.12/kernel/trace/Kconfig linux-2.6.32.12/kernel/trace/Kco
49913 select FUNCTION_TRACER 50080 select FUNCTION_TRACER
49914 select STACKTRACE 50081 select STACKTRACE
49915 select KALLSYMS 50082 select KALLSYMS
49916diff -urNp linux-2.6.32.12/kernel/trace/ring_buffer.c linux-2.6.32.12/kernel/trace/ring_buffer.c 50083diff -urNp linux-2.6.32.13/kernel/trace/ring_buffer.c linux-2.6.32.13/kernel/trace/ring_buffer.c
49917--- linux-2.6.32.12/kernel/trace/ring_buffer.c 2010-04-04 20:41:50.072525146 -0400 50084--- linux-2.6.32.13/kernel/trace/ring_buffer.c 2010-04-04 20:41:50.072525146 -0400
49918+++ linux-2.6.32.12/kernel/trace/ring_buffer.c 2010-04-29 17:46:37.362529614 -0400 50085+++ linux-2.6.32.13/kernel/trace/ring_buffer.c 2010-05-15 13:21:18.278715003 -0400
49919@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st 50086@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st
49920 * the reader page). But if the next page is a header page, 50087 * the reader page). But if the next page is a header page,
49921 * its flags will be non zero. 50088 * its flags will be non zero.
@@ -49925,9 +50092,9 @@ diff -urNp linux-2.6.32.12/kernel/trace/ring_buffer.c linux-2.6.32.12/kernel/tra
49925 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, 50092 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
49926 struct buffer_page *page, struct list_head *list) 50093 struct buffer_page *page, struct list_head *list)
49927 { 50094 {
49928diff -urNp linux-2.6.32.12/kernel/trace/trace.c linux-2.6.32.12/kernel/trace/trace.c 50095diff -urNp linux-2.6.32.13/kernel/trace/trace.c linux-2.6.32.13/kernel/trace/trace.c
49929--- linux-2.6.32.12/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400 50096--- linux-2.6.32.13/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400
49930+++ linux-2.6.32.12/kernel/trace/trace.c 2010-04-04 20:46:41.705142860 -0400 50097+++ linux-2.6.32.13/kernel/trace/trace.c 2010-05-15 13:21:18.278715003 -0400
49931@@ -3808,10 +3808,9 @@ static const struct file_operations trac 50098@@ -3808,10 +3808,9 @@ static const struct file_operations trac
49932 }; 50099 };
49933 #endif 50100 #endif
@@ -49952,9 +50119,9 @@ diff -urNp linux-2.6.32.12/kernel/trace/trace.c linux-2.6.32.12/kernel/trace/tra
49952 static int once; 50119 static int once;
49953 struct dentry *d_tracer; 50120 struct dentry *d_tracer;
49954 50121
49955diff -urNp linux-2.6.32.12/kernel/trace/trace_events.c linux-2.6.32.12/kernel/trace/trace_events.c 50122diff -urNp linux-2.6.32.13/kernel/trace/trace_events.c linux-2.6.32.13/kernel/trace/trace_events.c
49956--- linux-2.6.32.12/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400 50123--- linux-2.6.32.13/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400
49957+++ linux-2.6.32.12/kernel/trace/trace_events.c 2010-04-04 20:46:41.705142860 -0400 50124+++ linux-2.6.32.13/kernel/trace/trace_events.c 2010-05-15 13:21:18.282652483 -0400
49958@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list 50125@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
49959 * Modules must own their file_operations to keep up with 50126 * Modules must own their file_operations to keep up with
49960 * reference counting. 50127 * reference counting.
@@ -49964,9 +50131,9 @@ diff -urNp linux-2.6.32.12/kernel/trace/trace_events.c linux-2.6.32.12/kernel/tr
49964 struct ftrace_module_file_ops { 50131 struct ftrace_module_file_ops {
49965 struct list_head list; 50132 struct list_head list;
49966 struct module *mod; 50133 struct module *mod;
49967diff -urNp linux-2.6.32.12/kernel/trace/trace_output.c linux-2.6.32.12/kernel/trace/trace_output.c 50134diff -urNp linux-2.6.32.13/kernel/trace/trace_output.c linux-2.6.32.13/kernel/trace/trace_output.c
49968--- linux-2.6.32.12/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400 50135--- linux-2.6.32.13/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400
49969+++ linux-2.6.32.12/kernel/trace/trace_output.c 2010-04-04 20:46:41.705142860 -0400 50136+++ linux-2.6.32.13/kernel/trace/trace_output.c 2010-05-15 13:21:18.282652483 -0400
49970@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, 50137@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
49971 return 0; 50138 return 0;
49972 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); 50139 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -49976,9 +50143,9 @@ diff -urNp linux-2.6.32.12/kernel/trace/trace_output.c linux-2.6.32.12/kernel/tr
49976 if (p) { 50143 if (p) {
49977 s->len = p - s->buffer; 50144 s->len = p - s->buffer;
49978 return 1; 50145 return 1;
49979diff -urNp linux-2.6.32.12/kernel/trace/trace_stack.c linux-2.6.32.12/kernel/trace/trace_stack.c 50146diff -urNp linux-2.6.32.13/kernel/trace/trace_stack.c linux-2.6.32.13/kernel/trace/trace_stack.c
49980--- linux-2.6.32.12/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400 50147--- linux-2.6.32.13/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400
49981+++ linux-2.6.32.12/kernel/trace/trace_stack.c 2010-04-04 20:46:41.705142860 -0400 50148+++ linux-2.6.32.13/kernel/trace/trace_stack.c 2010-05-15 13:21:18.282652483 -0400
49982@@ -50,7 +50,7 @@ static inline void check_stack(void) 50149@@ -50,7 +50,7 @@ static inline void check_stack(void)
49983 return; 50150 return;
49984 50151
@@ -49988,9 +50155,9 @@ diff -urNp linux-2.6.32.12/kernel/trace/trace_stack.c linux-2.6.32.12/kernel/tra
49988 return; 50155 return;
49989 50156
49990 local_irq_save(flags); 50157 local_irq_save(flags);
49991diff -urNp linux-2.6.32.12/kernel/utsname_sysctl.c linux-2.6.32.12/kernel/utsname_sysctl.c 50158diff -urNp linux-2.6.32.13/kernel/utsname_sysctl.c linux-2.6.32.13/kernel/utsname_sysctl.c
49992--- linux-2.6.32.12/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400 50159--- linux-2.6.32.13/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400
49993+++ linux-2.6.32.12/kernel/utsname_sysctl.c 2010-04-04 20:46:41.705142860 -0400 50160+++ linux-2.6.32.13/kernel/utsname_sysctl.c 2010-05-15 13:21:18.282652483 -0400
49994@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] 50161@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
49995 .proc_handler = proc_do_uts_string, 50162 .proc_handler = proc_do_uts_string,
49996 .strategy = sysctl_uts_string, 50163 .strategy = sysctl_uts_string,
@@ -50009,9 +50176,9 @@ diff -urNp linux-2.6.32.12/kernel/utsname_sysctl.c linux-2.6.32.12/kernel/utsnam
50009 }; 50176 };
50010 50177
50011 static int __init utsname_sysctl_init(void) 50178 static int __init utsname_sysctl_init(void)
50012diff -urNp linux-2.6.32.12/lib/bug.c linux-2.6.32.12/lib/bug.c 50179diff -urNp linux-2.6.32.13/lib/bug.c linux-2.6.32.13/lib/bug.c
50013--- linux-2.6.32.12/lib/bug.c 2010-03-15 11:52:04.000000000 -0400 50180--- linux-2.6.32.13/lib/bug.c 2010-03-15 11:52:04.000000000 -0400
50014+++ linux-2.6.32.12/lib/bug.c 2010-04-04 20:46:41.705142860 -0400 50181+++ linux-2.6.32.13/lib/bug.c 2010-05-15 13:21:18.282652483 -0400
50015@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l 50182@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
50016 return BUG_TRAP_TYPE_NONE; 50183 return BUG_TRAP_TYPE_NONE;
50017 50184
@@ -50021,9 +50188,9 @@ diff -urNp linux-2.6.32.12/lib/bug.c linux-2.6.32.12/lib/bug.c
50021 50188
50022 printk(KERN_EMERG "------------[ cut here ]------------\n"); 50189 printk(KERN_EMERG "------------[ cut here ]------------\n");
50023 50190
50024diff -urNp linux-2.6.32.12/lib/debugobjects.c linux-2.6.32.12/lib/debugobjects.c 50191diff -urNp linux-2.6.32.13/lib/debugobjects.c linux-2.6.32.13/lib/debugobjects.c
50025--- linux-2.6.32.12/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400 50192--- linux-2.6.32.13/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400
50026+++ linux-2.6.32.12/lib/debugobjects.c 2010-04-04 20:46:41.705142860 -0400 50193+++ linux-2.6.32.13/lib/debugobjects.c 2010-05-15 13:21:18.298622839 -0400
50027@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi 50194@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
50028 if (limit > 4) 50195 if (limit > 4)
50029 return; 50196 return;
@@ -50033,9 +50200,9 @@ diff -urNp linux-2.6.32.12/lib/debugobjects.c linux-2.6.32.12/lib/debugobjects.c
50033 if (is_on_stack == onstack) 50200 if (is_on_stack == onstack)
50034 return; 50201 return;
50035 50202
50036diff -urNp linux-2.6.32.12/lib/dma-debug.c linux-2.6.32.12/lib/dma-debug.c 50203diff -urNp linux-2.6.32.13/lib/dma-debug.c linux-2.6.32.13/lib/dma-debug.c
50037--- linux-2.6.32.12/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400 50204--- linux-2.6.32.13/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400
50038+++ linux-2.6.32.12/lib/dma-debug.c 2010-04-04 20:46:41.705142860 -0400 50205+++ linux-2.6.32.13/lib/dma-debug.c 2010-05-15 13:21:18.322629085 -0400
50039@@ -861,7 +861,7 @@ out: 50206@@ -861,7 +861,7 @@ out:
50040 50207
50041 static void check_for_stack(struct device *dev, void *addr) 50208 static void check_for_stack(struct device *dev, void *addr)
@@ -50045,9 +50212,9 @@ diff -urNp linux-2.6.32.12/lib/dma-debug.c linux-2.6.32.12/lib/dma-debug.c
50045 err_printk(dev, NULL, "DMA-API: device driver maps memory from" 50212 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
50046 "stack [addr=%p]\n", addr); 50213 "stack [addr=%p]\n", addr);
50047 } 50214 }
50048diff -urNp linux-2.6.32.12/lib/idr.c linux-2.6.32.12/lib/idr.c 50215diff -urNp linux-2.6.32.13/lib/idr.c linux-2.6.32.13/lib/idr.c
50049--- linux-2.6.32.12/lib/idr.c 2010-03-15 11:52:04.000000000 -0400 50216--- linux-2.6.32.13/lib/idr.c 2010-03-15 11:52:04.000000000 -0400
50050+++ linux-2.6.32.12/lib/idr.c 2010-04-04 20:46:41.705142860 -0400 50217+++ linux-2.6.32.13/lib/idr.c 2010-05-15 13:21:18.327545957 -0400
50051@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in 50218@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
50052 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; 50219 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
50053 50220
@@ -50057,9 +50224,9 @@ diff -urNp linux-2.6.32.12/lib/idr.c linux-2.6.32.12/lib/idr.c
50057 *starting_id = id; 50224 *starting_id = id;
50058 return IDR_NEED_TO_GROW; 50225 return IDR_NEED_TO_GROW;
50059 } 50226 }
50060diff -urNp linux-2.6.32.12/lib/inflate.c linux-2.6.32.12/lib/inflate.c 50227diff -urNp linux-2.6.32.13/lib/inflate.c linux-2.6.32.13/lib/inflate.c
50061--- linux-2.6.32.12/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400 50228--- linux-2.6.32.13/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400
50062+++ linux-2.6.32.12/lib/inflate.c 2010-04-04 20:46:41.705142860 -0400 50229+++ linux-2.6.32.13/lib/inflate.c 2010-05-15 13:21:18.327545957 -0400
50063@@ -266,7 +266,7 @@ static void free(void *where) 50230@@ -266,7 +266,7 @@ static void free(void *where)
50064 malloc_ptr = free_mem_ptr; 50231 malloc_ptr = free_mem_ptr;
50065 } 50232 }
@@ -50069,9 +50236,9 @@ diff -urNp linux-2.6.32.12/lib/inflate.c linux-2.6.32.12/lib/inflate.c
50069 #define free(a) kfree(a) 50236 #define free(a) kfree(a)
50070 #endif 50237 #endif
50071 50238
50072diff -urNp linux-2.6.32.12/lib/Kconfig.debug linux-2.6.32.12/lib/Kconfig.debug 50239diff -urNp linux-2.6.32.13/lib/Kconfig.debug linux-2.6.32.13/lib/Kconfig.debug
50073--- linux-2.6.32.12/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 50240--- linux-2.6.32.13/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400
50074+++ linux-2.6.32.12/lib/Kconfig.debug 2010-04-04 20:46:41.705142860 -0400 50241+++ linux-2.6.32.13/lib/Kconfig.debug 2010-05-15 13:21:18.339667096 -0400
50075@@ -905,7 +905,7 @@ config LATENCYTOP 50242@@ -905,7 +905,7 @@ config LATENCYTOP
50076 select STACKTRACE 50243 select STACKTRACE
50077 select SCHEDSTATS 50244 select SCHEDSTATS
@@ -50081,9 +50248,9 @@ diff -urNp linux-2.6.32.12/lib/Kconfig.debug linux-2.6.32.12/lib/Kconfig.debug
50081 help 50248 help
50082 Enable this option if you want to use the LatencyTOP tool 50249 Enable this option if you want to use the LatencyTOP tool
50083 to find out which userspace is blocking on what kernel operations. 50250 to find out which userspace is blocking on what kernel operations.
50084diff -urNp linux-2.6.32.12/lib/kobject.c linux-2.6.32.12/lib/kobject.c 50251diff -urNp linux-2.6.32.13/lib/kobject.c linux-2.6.32.13/lib/kobject.c
50085--- linux-2.6.32.12/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400 50252--- linux-2.6.32.13/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400
50086+++ linux-2.6.32.12/lib/kobject.c 2010-04-04 20:46:41.705142860 -0400 50253+++ linux-2.6.32.13/lib/kobject.c 2010-05-15 13:21:18.355221413 -0400
50087@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko 50254@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
50088 return ret; 50255 return ret;
50089 } 50256 }
@@ -50111,9 +50278,9 @@ diff -urNp linux-2.6.32.12/lib/kobject.c linux-2.6.32.12/lib/kobject.c
50111 struct kobject *parent_kobj) 50278 struct kobject *parent_kobj)
50112 { 50279 {
50113 struct kset *kset; 50280 struct kset *kset;
50114diff -urNp linux-2.6.32.12/lib/kobject_uevent.c linux-2.6.32.12/lib/kobject_uevent.c 50281diff -urNp linux-2.6.32.13/lib/kobject_uevent.c linux-2.6.32.13/lib/kobject_uevent.c
50115--- linux-2.6.32.12/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400 50282--- linux-2.6.32.13/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400
50116+++ linux-2.6.32.12/lib/kobject_uevent.c 2010-04-04 20:46:41.705142860 -0400 50283+++ linux-2.6.32.13/lib/kobject_uevent.c 2010-05-15 13:21:18.355221413 -0400
50117@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k 50284@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
50118 const char *subsystem; 50285 const char *subsystem;
50119 struct kobject *top_kobj; 50286 struct kobject *top_kobj;
@@ -50123,9 +50290,9 @@ diff -urNp linux-2.6.32.12/lib/kobject_uevent.c linux-2.6.32.12/lib/kobject_ueve
50123 u64 seq; 50290 u64 seq;
50124 int i = 0; 50291 int i = 0;
50125 int retval = 0; 50292 int retval = 0;
50126diff -urNp linux-2.6.32.12/lib/parser.c linux-2.6.32.12/lib/parser.c 50293diff -urNp linux-2.6.32.13/lib/parser.c linux-2.6.32.13/lib/parser.c
50127--- linux-2.6.32.12/lib/parser.c 2010-03-15 11:52:04.000000000 -0400 50294--- linux-2.6.32.13/lib/parser.c 2010-03-15 11:52:04.000000000 -0400
50128+++ linux-2.6.32.12/lib/parser.c 2010-04-04 20:46:41.705142860 -0400 50295+++ linux-2.6.32.13/lib/parser.c 2010-05-15 13:21:18.358625413 -0400
50129@@ -126,7 +126,7 @@ static int match_number(substring_t *s, 50296@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
50130 char *buf; 50297 char *buf;
50131 int ret; 50298 int ret;
@@ -50135,9 +50302,9 @@ diff -urNp linux-2.6.32.12/lib/parser.c linux-2.6.32.12/lib/parser.c
50135 if (!buf) 50302 if (!buf)
50136 return -ENOMEM; 50303 return -ENOMEM;
50137 memcpy(buf, s->from, s->to - s->from); 50304 memcpy(buf, s->from, s->to - s->from);
50138diff -urNp linux-2.6.32.12/lib/radix-tree.c linux-2.6.32.12/lib/radix-tree.c 50305diff -urNp linux-2.6.32.13/lib/radix-tree.c linux-2.6.32.13/lib/radix-tree.c
50139--- linux-2.6.32.12/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400 50306--- linux-2.6.32.13/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400
50140+++ linux-2.6.32.12/lib/radix-tree.c 2010-04-04 20:46:41.705142860 -0400 50307+++ linux-2.6.32.13/lib/radix-tree.c 2010-05-15 13:21:18.366643034 -0400
50141@@ -81,7 +81,7 @@ struct radix_tree_preload { 50308@@ -81,7 +81,7 @@ struct radix_tree_preload {
50142 int nr; 50309 int nr;
50143 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; 50310 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -50147,9 +50314,9 @@ diff -urNp linux-2.6.32.12/lib/radix-tree.c linux-2.6.32.12/lib/radix-tree.c
50147 50314
50148 static inline gfp_t root_gfp_mask(struct radix_tree_root *root) 50315 static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
50149 { 50316 {
50150diff -urNp linux-2.6.32.12/lib/random32.c linux-2.6.32.12/lib/random32.c 50317diff -urNp linux-2.6.32.13/lib/random32.c linux-2.6.32.13/lib/random32.c
50151--- linux-2.6.32.12/lib/random32.c 2010-03-15 11:52:04.000000000 -0400 50318--- linux-2.6.32.13/lib/random32.c 2010-03-15 11:52:04.000000000 -0400
50152+++ linux-2.6.32.12/lib/random32.c 2010-04-04 20:46:41.705142860 -0400 50319+++ linux-2.6.32.13/lib/random32.c 2010-05-15 13:21:18.370623064 -0400
50153@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * 50320@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
50154 */ 50321 */
50155 static inline u32 __seed(u32 x, u32 m) 50322 static inline u32 __seed(u32 x, u32 m)
@@ -50159,14 +50326,14 @@ diff -urNp linux-2.6.32.12/lib/random32.c linux-2.6.32.12/lib/random32.c
50159 } 50326 }
50160 50327
50161 /** 50328 /**
50162diff -urNp linux-2.6.32.12/localversion-grsec linux-2.6.32.12/localversion-grsec 50329diff -urNp linux-2.6.32.13/localversion-grsec linux-2.6.32.13/localversion-grsec
50163--- linux-2.6.32.12/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 50330--- linux-2.6.32.13/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
50164+++ linux-2.6.32.12/localversion-grsec 2010-04-04 20:46:41.705142860 -0400 50331+++ linux-2.6.32.13/localversion-grsec 2010-05-15 13:21:18.370623064 -0400
50165@@ -0,0 +1 @@ 50332@@ -0,0 +1 @@
50166+-grsec 50333+-grsec
50167diff -urNp linux-2.6.32.12/Makefile linux-2.6.32.12/Makefile 50334diff -urNp linux-2.6.32.13/Makefile linux-2.6.32.13/Makefile
50168--- linux-2.6.32.12/Makefile 2010-04-29 17:49:37.365428457 -0400 50335--- linux-2.6.32.13/Makefile 2010-05-15 13:20:18.396226636 -0400
50169+++ linux-2.6.32.12/Makefile 2010-04-29 17:49:57.861101311 -0400 50336+++ linux-2.6.32.13/Makefile 2010-05-15 13:21:18.370623064 -0400
50170@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" 50337@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
50171 50338
50172 HOSTCC = gcc 50339 HOSTCC = gcc
@@ -50187,9 +50354,9 @@ diff -urNp linux-2.6.32.12/Makefile linux-2.6.32.12/Makefile
50187 50354
50188 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ 50355 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
50189 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ 50356 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
50190diff -urNp linux-2.6.32.12/mm/filemap.c linux-2.6.32.12/mm/filemap.c 50357diff -urNp linux-2.6.32.13/mm/filemap.c linux-2.6.32.13/mm/filemap.c
50191--- linux-2.6.32.12/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400 50358--- linux-2.6.32.13/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400
50192+++ linux-2.6.32.12/mm/filemap.c 2010-04-04 20:46:41.708732353 -0400 50359+++ linux-2.6.32.13/mm/filemap.c 2010-05-15 13:21:18.370623064 -0400
50193@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file 50360@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file
50194 struct address_space *mapping = file->f_mapping; 50361 struct address_space *mapping = file->f_mapping;
50195 50362
@@ -50207,9 +50374,9 @@ diff -urNp linux-2.6.32.12/mm/filemap.c linux-2.6.32.12/mm/filemap.c
50207 if (*pos >= limit) { 50374 if (*pos >= limit) {
50208 send_sig(SIGXFSZ, current, 0); 50375 send_sig(SIGXFSZ, current, 0);
50209 return -EFBIG; 50376 return -EFBIG;
50210diff -urNp linux-2.6.32.12/mm/fremap.c linux-2.6.32.12/mm/fremap.c 50377diff -urNp linux-2.6.32.13/mm/fremap.c linux-2.6.32.13/mm/fremap.c
50211--- linux-2.6.32.12/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400 50378--- linux-2.6.32.13/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400
50212+++ linux-2.6.32.12/mm/fremap.c 2010-04-04 20:46:41.708732353 -0400 50379+++ linux-2.6.32.13/mm/fremap.c 2010-05-15 13:21:18.370623064 -0400
50213@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign 50380@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
50214 retry: 50381 retry:
50215 vma = find_vma(mm, start); 50382 vma = find_vma(mm, start);
@@ -50222,9 +50389,9 @@ diff -urNp linux-2.6.32.12/mm/fremap.c linux-2.6.32.12/mm/fremap.c
50222 /* 50389 /*
50223 * Make sure the vma is shared, that it supports prefaulting, 50390 * Make sure the vma is shared, that it supports prefaulting,
50224 * and that the remapped range is valid and fully within 50391 * and that the remapped range is valid and fully within
50225diff -urNp linux-2.6.32.12/mm/highmem.c linux-2.6.32.12/mm/highmem.c 50392diff -urNp linux-2.6.32.13/mm/highmem.c linux-2.6.32.13/mm/highmem.c
50226--- linux-2.6.32.12/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400 50393--- linux-2.6.32.13/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400
50227+++ linux-2.6.32.12/mm/highmem.c 2010-04-04 20:46:41.708732353 -0400 50394+++ linux-2.6.32.13/mm/highmem.c 2010-05-15 13:21:18.370623064 -0400
50228@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) 50395@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
50229 * So no dangers, even with speculative execution. 50396 * So no dangers, even with speculative execution.
50230 */ 50397 */
@@ -50250,10 +50417,10 @@ diff -urNp linux-2.6.32.12/mm/highmem.c linux-2.6.32.12/mm/highmem.c
50250 pkmap_count[last_pkmap_nr] = 1; 50417 pkmap_count[last_pkmap_nr] = 1;
50251 set_page_address(page, (void *)vaddr); 50418 set_page_address(page, (void *)vaddr);
50252 50419
50253diff -urNp linux-2.6.32.12/mm/hugetlb.c linux-2.6.32.12/mm/hugetlb.c 50420diff -urNp linux-2.6.32.13/mm/hugetlb.c linux-2.6.32.13/mm/hugetlb.c
50254--- linux-2.6.32.12/mm/hugetlb.c 2010-03-15 11:52:04.000000000 -0400 50421--- linux-2.6.32.13/mm/hugetlb.c 2010-05-15 13:20:19.411414284 -0400
50255+++ linux-2.6.32.12/mm/hugetlb.c 2010-04-04 20:46:41.708732353 -0400 50422+++ linux-2.6.32.13/mm/hugetlb.c 2010-05-15 13:21:18.370623064 -0400
50256@@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s 50423@@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s
50257 return 1; 50424 return 1;
50258 } 50425 }
50259 50426
@@ -50280,7 +50447,7 @@ diff -urNp linux-2.6.32.12/mm/hugetlb.c linux-2.6.32.12/mm/hugetlb.c
50280 static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma, 50447 static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
50281 unsigned long address, pte_t *ptep, pte_t pte, 50448 unsigned long address, pte_t *ptep, pte_t pte,
50282 struct page *pagecache_page) 50449 struct page *pagecache_page)
50283@@ -1995,6 +2015,11 @@ retry_avoidcopy: 50450@@ -1996,6 +2016,11 @@ retry_avoidcopy:
50284 huge_ptep_clear_flush(vma, address, ptep); 50451 huge_ptep_clear_flush(vma, address, ptep);
50285 set_huge_pte_at(mm, address, ptep, 50452 set_huge_pte_at(mm, address, ptep,
50286 make_huge_pte(vma, new_page, 1)); 50453 make_huge_pte(vma, new_page, 1));
@@ -50292,7 +50459,7 @@ diff -urNp linux-2.6.32.12/mm/hugetlb.c linux-2.6.32.12/mm/hugetlb.c
50292 /* Make the old page be freed below */ 50459 /* Make the old page be freed below */
50293 new_page = old_page; 50460 new_page = old_page;
50294 } 50461 }
50295@@ -2124,6 +2149,10 @@ retry: 50462@@ -2127,6 +2152,10 @@ retry:
50296 && (vma->vm_flags & VM_SHARED))); 50463 && (vma->vm_flags & VM_SHARED)));
50297 set_huge_pte_at(mm, address, ptep, new_pte); 50464 set_huge_pte_at(mm, address, ptep, new_pte);
50298 50465
@@ -50303,7 +50470,7 @@ diff -urNp linux-2.6.32.12/mm/hugetlb.c linux-2.6.32.12/mm/hugetlb.c
50303 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) { 50470 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
50304 /* Optimization, do the COW without a second fault */ 50471 /* Optimization, do the COW without a second fault */
50305 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page); 50472 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
50306@@ -2152,6 +2181,28 @@ int hugetlb_fault(struct mm_struct *mm, 50473@@ -2155,6 +2184,28 @@ int hugetlb_fault(struct mm_struct *mm,
50307 static DEFINE_MUTEX(hugetlb_instantiation_mutex); 50474 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
50308 struct hstate *h = hstate_vma(vma); 50475 struct hstate *h = hstate_vma(vma);
50309 50476
@@ -50332,9 +50499,9 @@ diff -urNp linux-2.6.32.12/mm/hugetlb.c linux-2.6.32.12/mm/hugetlb.c
50332 ptep = huge_pte_alloc(mm, address, huge_page_size(h)); 50499 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
50333 if (!ptep) 50500 if (!ptep)
50334 return VM_FAULT_OOM; 50501 return VM_FAULT_OOM;
50335diff -urNp linux-2.6.32.12/mm/Kconfig linux-2.6.32.12/mm/Kconfig 50502diff -urNp linux-2.6.32.13/mm/Kconfig linux-2.6.32.13/mm/Kconfig
50336--- linux-2.6.32.12/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400 50503--- linux-2.6.32.13/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400
50337+++ linux-2.6.32.12/mm/Kconfig 2010-04-04 20:46:41.708732353 -0400 50504+++ linux-2.6.32.13/mm/Kconfig 2010-05-15 13:21:18.370623064 -0400
50338@@ -228,7 +228,7 @@ config KSM 50505@@ -228,7 +228,7 @@ config KSM
50339 config DEFAULT_MMAP_MIN_ADDR 50506 config DEFAULT_MMAP_MIN_ADDR
50340 int "Low address space to protect from user allocation" 50507 int "Low address space to protect from user allocation"
@@ -50344,9 +50511,9 @@ diff -urNp linux-2.6.32.12/mm/Kconfig linux-2.6.32.12/mm/Kconfig
50344 help 50511 help
50345 This is the portion of low virtual memory which should be protected 50512 This is the portion of low virtual memory which should be protected
50346 from userspace allocation. Keeping a user from writing to low pages 50513 from userspace allocation. Keeping a user from writing to low pages
50347diff -urNp linux-2.6.32.12/mm/maccess.c linux-2.6.32.12/mm/maccess.c 50514diff -urNp linux-2.6.32.13/mm/maccess.c linux-2.6.32.13/mm/maccess.c
50348--- linux-2.6.32.12/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400 50515--- linux-2.6.32.13/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400
50349+++ linux-2.6.32.12/mm/maccess.c 2010-04-04 20:46:41.708732353 -0400 50516+++ linux-2.6.32.13/mm/maccess.c 2010-05-15 13:21:18.370623064 -0400
50350@@ -14,7 +14,7 @@ 50517@@ -14,7 +14,7 @@
50351 * Safely read from address @src to the buffer at @dst. If a kernel fault 50518 * Safely read from address @src to the buffer at @dst. If a kernel fault
50352 * happens, handle that and return -EFAULT. 50519 * happens, handle that and return -EFAULT.
@@ -50365,9 +50532,9 @@ diff -urNp linux-2.6.32.12/mm/maccess.c linux-2.6.32.12/mm/maccess.c
50365 { 50532 {
50366 long ret; 50533 long ret;
50367 mm_segment_t old_fs = get_fs(); 50534 mm_segment_t old_fs = get_fs();
50368diff -urNp linux-2.6.32.12/mm/madvise.c linux-2.6.32.12/mm/madvise.c 50535diff -urNp linux-2.6.32.13/mm/madvise.c linux-2.6.32.13/mm/madvise.c
50369--- linux-2.6.32.12/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400 50536--- linux-2.6.32.13/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400
50370+++ linux-2.6.32.12/mm/madvise.c 2010-04-04 20:46:41.708732353 -0400 50537+++ linux-2.6.32.13/mm/madvise.c 2010-05-15 13:21:18.378626814 -0400
50371@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a 50538@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
50372 pgoff_t pgoff; 50539 pgoff_t pgoff;
50373 unsigned long new_flags = vma->vm_flags; 50540 unsigned long new_flags = vma->vm_flags;
@@ -50444,9 +50611,9 @@ diff -urNp linux-2.6.32.12/mm/madvise.c linux-2.6.32.12/mm/madvise.c
50444 error = 0; 50611 error = 0;
50445 if (end == start) 50612 if (end == start)
50446 goto out; 50613 goto out;
50447diff -urNp linux-2.6.32.12/mm/memory.c linux-2.6.32.12/mm/memory.c 50614diff -urNp linux-2.6.32.13/mm/memory.c linux-2.6.32.13/mm/memory.c
50448--- linux-2.6.32.12/mm/memory.c 2010-03-15 11:52:04.000000000 -0400 50615--- linux-2.6.32.13/mm/memory.c 2010-03-15 11:52:04.000000000 -0400
50449+++ linux-2.6.32.12/mm/memory.c 2010-04-04 20:46:41.708732353 -0400 50616+++ linux-2.6.32.13/mm/memory.c 2010-05-15 13:21:18.394625565 -0400
50450@@ -48,6 +48,7 @@ 50617@@ -48,6 +48,7 @@
50451 #include <linux/ksm.h> 50618 #include <linux/ksm.h>
50452 #include <linux/rmap.h> 50619 #include <linux/rmap.h>
@@ -50851,9 +51018,9 @@ diff -urNp linux-2.6.32.12/mm/memory.c linux-2.6.32.12/mm/memory.c
50851 /* 51018 /*
50852 * Make sure the vDSO gets into every core dump. 51019 * Make sure the vDSO gets into every core dump.
50853 * Dumping its contents makes post-mortem fully interpretable later 51020 * Dumping its contents makes post-mortem fully interpretable later
50854diff -urNp linux-2.6.32.12/mm/memory-failure.c linux-2.6.32.12/mm/memory-failure.c 51021diff -urNp linux-2.6.32.13/mm/memory-failure.c linux-2.6.32.13/mm/memory-failure.c
50855--- linux-2.6.32.12/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400 51022--- linux-2.6.32.13/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400
50856+++ linux-2.6.32.12/mm/memory-failure.c 2010-04-04 20:46:41.708732353 -0400 51023+++ linux-2.6.32.13/mm/memory-failure.c 2010-05-15 13:21:18.394625565 -0400
50857@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r 51024@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
50858 51025
50859 int sysctl_memory_failure_recovery __read_mostly = 1; 51026 int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -50872,9 +51039,9 @@ diff -urNp linux-2.6.32.12/mm/memory-failure.c linux-2.6.32.12/mm/memory-failure
50872 51039
50873 /* 51040 /*
50874 * We need/can do nothing about count=0 pages. 51041 * We need/can do nothing about count=0 pages.
50875diff -urNp linux-2.6.32.12/mm/mempolicy.c linux-2.6.32.12/mm/mempolicy.c 51042diff -urNp linux-2.6.32.13/mm/mempolicy.c linux-2.6.32.13/mm/mempolicy.c
50876--- linux-2.6.32.12/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400 51043--- linux-2.6.32.13/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400
50877+++ linux-2.6.32.12/mm/mempolicy.c 2010-04-04 20:46:41.708732353 -0400 51044+++ linux-2.6.32.13/mm/mempolicy.c 2010-05-15 13:21:18.411130134 -0400
50878@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st 51045@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
50879 struct vm_area_struct *next; 51046 struct vm_area_struct *next;
50880 int err; 51047 int err;
@@ -50955,9 +51122,9 @@ diff -urNp linux-2.6.32.12/mm/mempolicy.c linux-2.6.32.12/mm/mempolicy.c
50955 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { 51122 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
50956 seq_printf(m, " heap"); 51123 seq_printf(m, " heap");
50957 } else if (vma->vm_start <= mm->start_stack && 51124 } else if (vma->vm_start <= mm->start_stack &&
50958diff -urNp linux-2.6.32.12/mm/migrate.c linux-2.6.32.12/mm/migrate.c 51125diff -urNp linux-2.6.32.13/mm/migrate.c linux-2.6.32.13/mm/migrate.c
50959--- linux-2.6.32.12/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400 51126--- linux-2.6.32.13/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400
50960+++ linux-2.6.32.12/mm/migrate.c 2010-04-04 20:46:41.708732353 -0400 51127+++ linux-2.6.32.13/mm/migrate.c 2010-05-15 13:21:18.411130134 -0400
50961@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 51128@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
50962 if (!mm) 51129 if (!mm)
50963 return -EINVAL; 51130 return -EINVAL;
@@ -50983,9 +51150,9 @@ diff -urNp linux-2.6.32.12/mm/migrate.c linux-2.6.32.12/mm/migrate.c
50983 rcu_read_unlock(); 51150 rcu_read_unlock();
50984 err = -EPERM; 51151 err = -EPERM;
50985 goto out; 51152 goto out;
50986diff -urNp linux-2.6.32.12/mm/mlock.c linux-2.6.32.12/mm/mlock.c 51153diff -urNp linux-2.6.32.13/mm/mlock.c linux-2.6.32.13/mm/mlock.c
50987--- linux-2.6.32.12/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400 51154--- linux-2.6.32.13/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400
50988+++ linux-2.6.32.12/mm/mlock.c 2010-04-04 20:46:41.708732353 -0400 51155+++ linux-2.6.32.13/mm/mlock.c 2010-05-15 13:21:18.411130134 -0400
50989@@ -13,6 +13,7 @@ 51156@@ -13,6 +13,7 @@
50990 #include <linux/pagemap.h> 51157 #include <linux/pagemap.h>
50991 #include <linux/mempolicy.h> 51158 #include <linux/mempolicy.h>
@@ -51054,9 +51221,9 @@ diff -urNp linux-2.6.32.12/mm/mlock.c linux-2.6.32.12/mm/mlock.c
51054 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || 51221 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
51055 capable(CAP_IPC_LOCK)) 51222 capable(CAP_IPC_LOCK))
51056 ret = do_mlockall(flags); 51223 ret = do_mlockall(flags);
51057diff -urNp linux-2.6.32.12/mm/mmap.c linux-2.6.32.12/mm/mmap.c 51224diff -urNp linux-2.6.32.13/mm/mmap.c linux-2.6.32.13/mm/mmap.c
51058--- linux-2.6.32.12/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 51225--- linux-2.6.32.13/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
51059+++ linux-2.6.32.12/mm/mmap.c 2010-04-04 20:46:41.713805609 -0400 51226+++ linux-2.6.32.13/mm/mmap.c 2010-05-15 13:21:18.411130134 -0400
51060@@ -45,6 +45,16 @@ 51227@@ -45,6 +45,16 @@
51061 #define arch_rebalance_pgtables(addr, len) (addr) 51228 #define arch_rebalance_pgtables(addr, len) (addr)
51062 #endif 51229 #endif
@@ -52145,9 +52312,9 @@ diff -urNp linux-2.6.32.12/mm/mmap.c linux-2.6.32.12/mm/mmap.c
52145 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; 52312 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
52146 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 52313 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
52147 52314
52148diff -urNp linux-2.6.32.12/mm/mprotect.c linux-2.6.32.12/mm/mprotect.c 52315diff -urNp linux-2.6.32.13/mm/mprotect.c linux-2.6.32.13/mm/mprotect.c
52149--- linux-2.6.32.12/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400 52316--- linux-2.6.32.13/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400
52150+++ linux-2.6.32.12/mm/mprotect.c 2010-04-04 20:46:41.713805609 -0400 52317+++ linux-2.6.32.13/mm/mprotect.c 2010-05-15 13:21:18.411130134 -0400
52151@@ -24,10 +24,16 @@ 52318@@ -24,10 +24,16 @@
52152 #include <linux/mmu_notifier.h> 52319 #include <linux/mmu_notifier.h>
52153 #include <linux/migrate.h> 52320 #include <linux/migrate.h>
@@ -52338,9 +52505,9 @@ diff -urNp linux-2.6.32.12/mm/mprotect.c linux-2.6.32.12/mm/mprotect.c
52338 nstart = tmp; 52505 nstart = tmp;
52339 52506
52340 if (nstart < prev->vm_end) 52507 if (nstart < prev->vm_end)
52341diff -urNp linux-2.6.32.12/mm/mremap.c linux-2.6.32.12/mm/mremap.c 52508diff -urNp linux-2.6.32.13/mm/mremap.c linux-2.6.32.13/mm/mremap.c
52342--- linux-2.6.32.12/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400 52509--- linux-2.6.32.13/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400
52343+++ linux-2.6.32.12/mm/mremap.c 2010-04-04 20:46:41.713805609 -0400 52510+++ linux-2.6.32.13/mm/mremap.c 2010-05-15 13:21:18.411130134 -0400
52344@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str 52511@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
52345 continue; 52512 continue;
52346 pte = ptep_clear_flush(vma, old_addr, old_pte); 52513 pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -52441,9 +52608,9 @@ diff -urNp linux-2.6.32.12/mm/mremap.c linux-2.6.32.12/mm/mremap.c
52441 } 52608 }
52442 out: 52609 out:
52443 if (ret & ~PAGE_MASK) 52610 if (ret & ~PAGE_MASK)
52444diff -urNp linux-2.6.32.12/mm/nommu.c linux-2.6.32.12/mm/nommu.c 52611diff -urNp linux-2.6.32.13/mm/nommu.c linux-2.6.32.13/mm/nommu.c
52445--- linux-2.6.32.12/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400 52612--- linux-2.6.32.13/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400
52446+++ linux-2.6.32.12/mm/nommu.c 2010-04-04 20:46:41.713805609 -0400 52613+++ linux-2.6.32.13/mm/nommu.c 2010-05-15 13:21:18.414629737 -0400
52447@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m 52614@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m
52448 EXPORT_SYMBOL(find_vma); 52615 EXPORT_SYMBOL(find_vma);
52449 52616
@@ -52460,9 +52627,9 @@ diff -urNp linux-2.6.32.12/mm/nommu.c linux-2.6.32.12/mm/nommu.c
52460 * expand a stack to a given address 52627 * expand a stack to a given address
52461 * - not supported under NOMMU conditions 52628 * - not supported under NOMMU conditions
52462 */ 52629 */
52463diff -urNp linux-2.6.32.12/mm/page_alloc.c linux-2.6.32.12/mm/page_alloc.c 52630diff -urNp linux-2.6.32.13/mm/page_alloc.c linux-2.6.32.13/mm/page_alloc.c
52464--- linux-2.6.32.12/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400 52631--- linux-2.6.32.13/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400
52465+++ linux-2.6.32.12/mm/page_alloc.c 2010-04-29 17:46:37.045244082 -0400 52632+++ linux-2.6.32.13/mm/page_alloc.c 2010-05-15 13:21:18.414629737 -0400
52466@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page 52633@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page
52467 int bad = 0; 52634 int bad = 0;
52468 int wasMlocked = __TestClearPageMlocked(page); 52635 int wasMlocked = __TestClearPageMlocked(page);
@@ -52519,9 +52686,9 @@ diff -urNp linux-2.6.32.12/mm/page_alloc.c linux-2.6.32.12/mm/page_alloc.c
52519 struct zone *zone, unsigned long zonesize) {} 52686 struct zone *zone, unsigned long zonesize) {}
52520 #endif /* CONFIG_SPARSEMEM */ 52687 #endif /* CONFIG_SPARSEMEM */
52521 52688
52522diff -urNp linux-2.6.32.12/mm/percpu.c linux-2.6.32.12/mm/percpu.c 52689diff -urNp linux-2.6.32.13/mm/percpu.c linux-2.6.32.13/mm/percpu.c
52523--- linux-2.6.32.12/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400 52690--- linux-2.6.32.13/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400
52524+++ linux-2.6.32.12/mm/percpu.c 2010-04-04 20:46:41.713805609 -0400 52691+++ linux-2.6.32.13/mm/percpu.c 2010-05-15 13:21:18.450640661 -0400
52525@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu 52692@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
52526 static unsigned int pcpu_last_unit_cpu __read_mostly; 52693 static unsigned int pcpu_last_unit_cpu __read_mostly;
52527 52694
@@ -52531,9 +52698,9 @@ diff -urNp linux-2.6.32.12/mm/percpu.c linux-2.6.32.12/mm/percpu.c
52531 EXPORT_SYMBOL_GPL(pcpu_base_addr); 52698 EXPORT_SYMBOL_GPL(pcpu_base_addr);
52532 52699
52533 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ 52700 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
52534diff -urNp linux-2.6.32.12/mm/rmap.c linux-2.6.32.12/mm/rmap.c 52701diff -urNp linux-2.6.32.13/mm/rmap.c linux-2.6.32.13/mm/rmap.c
52535--- linux-2.6.32.12/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400 52702--- linux-2.6.32.13/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400
52536+++ linux-2.6.32.12/mm/rmap.c 2010-04-04 20:46:41.713805609 -0400 52703+++ linux-2.6.32.13/mm/rmap.c 2010-05-15 13:21:18.454622314 -0400
52537@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru 52704@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru
52538 struct mm_struct *mm = vma->vm_mm; 52705 struct mm_struct *mm = vma->vm_mm;
52539 struct anon_vma *allocated; 52706 struct anon_vma *allocated;
@@ -52561,9 +52728,9 @@ diff -urNp linux-2.6.32.12/mm/rmap.c linux-2.6.32.12/mm/rmap.c
52561 vma->anon_vma = anon_vma; 52728 vma->anon_vma = anon_vma;
52562 list_add_tail(&vma->anon_vma_node, &anon_vma->head); 52729 list_add_tail(&vma->anon_vma_node, &anon_vma->head);
52563 allocated = NULL; 52730 allocated = NULL;
52564diff -urNp linux-2.6.32.12/mm/shmem.c linux-2.6.32.12/mm/shmem.c 52731diff -urNp linux-2.6.32.13/mm/shmem.c linux-2.6.32.13/mm/shmem.c
52565--- linux-2.6.32.12/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400 52732--- linux-2.6.32.13/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400
52566+++ linux-2.6.32.12/mm/shmem.c 2010-04-04 20:46:41.716811517 -0400 52733+++ linux-2.6.32.13/mm/shmem.c 2010-05-15 13:21:18.454622314 -0400
52567@@ -31,7 +31,7 @@ 52734@@ -31,7 +31,7 @@
52568 #include <linux/swap.h> 52735 #include <linux/swap.h>
52569 #include <linux/ima.h> 52736 #include <linux/ima.h>
@@ -52573,9 +52740,9 @@ diff -urNp linux-2.6.32.12/mm/shmem.c linux-2.6.32.12/mm/shmem.c
52573 52740
52574 #ifdef CONFIG_SHMEM 52741 #ifdef CONFIG_SHMEM
52575 /* 52742 /*
52576diff -urNp linux-2.6.32.12/mm/slab.c linux-2.6.32.12/mm/slab.c 52743diff -urNp linux-2.6.32.13/mm/slab.c linux-2.6.32.13/mm/slab.c
52577--- linux-2.6.32.12/mm/slab.c 2010-03-15 11:52:04.000000000 -0400 52744--- linux-2.6.32.13/mm/slab.c 2010-03-15 11:52:04.000000000 -0400
52578+++ linux-2.6.32.12/mm/slab.c 2010-04-04 20:46:41.716811517 -0400 52745+++ linux-2.6.32.13/mm/slab.c 2010-05-15 13:21:18.454622314 -0400
52579@@ -308,7 +308,7 @@ struct kmem_list3 { 52746@@ -308,7 +308,7 @@ struct kmem_list3 {
52580 * Need this for bootstrapping a per node allocator. 52747 * Need this for bootstrapping a per node allocator.
52581 */ 52748 */
@@ -52673,9 +52840,9 @@ diff -urNp linux-2.6.32.12/mm/slab.c linux-2.6.32.12/mm/slab.c
52673 /** 52840 /**
52674 * ksize - get the actual amount of memory allocated for a given object 52841 * ksize - get the actual amount of memory allocated for a given object
52675 * @objp: Pointer to the object 52842 * @objp: Pointer to the object
52676diff -urNp linux-2.6.32.12/mm/slob.c linux-2.6.32.12/mm/slob.c 52843diff -urNp linux-2.6.32.13/mm/slob.c linux-2.6.32.13/mm/slob.c
52677--- linux-2.6.32.12/mm/slob.c 2010-03-15 11:52:04.000000000 -0400 52844--- linux-2.6.32.13/mm/slob.c 2010-03-15 11:52:04.000000000 -0400
52678+++ linux-2.6.32.12/mm/slob.c 2010-04-04 20:46:41.716811517 -0400 52845+++ linux-2.6.32.13/mm/slob.c 2010-05-15 13:21:18.454622314 -0400
52679@@ -29,7 +29,7 @@ 52846@@ -29,7 +29,7 @@
52680 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls 52847 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
52681 * alloc_pages() directly, allocating compound pages so the page order 52848 * alloc_pages() directly, allocating compound pages so the page order
@@ -52996,9 +53163,9 @@ diff -urNp linux-2.6.32.12/mm/slob.c linux-2.6.32.12/mm/slob.c
52996 } 53163 }
52997 53164
52998 trace_kmem_cache_free(_RET_IP_, b); 53165 trace_kmem_cache_free(_RET_IP_, b);
52999diff -urNp linux-2.6.32.12/mm/slub.c linux-2.6.32.12/mm/slub.c 53166diff -urNp linux-2.6.32.13/mm/slub.c linux-2.6.32.13/mm/slub.c
53000--- linux-2.6.32.12/mm/slub.c 2010-03-15 11:52:04.000000000 -0400 53167--- linux-2.6.32.13/mm/slub.c 2010-03-15 11:52:04.000000000 -0400
53001+++ linux-2.6.32.12/mm/slub.c 2010-04-04 20:46:41.716811517 -0400 53168+++ linux-2.6.32.13/mm/slub.c 2010-05-15 13:21:18.454622314 -0400
53002@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * 53169@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *
53003 53170
53004 page = virt_to_head_page(x); 53171 page = virt_to_head_page(x);
@@ -53155,9 +53322,9 @@ diff -urNp linux-2.6.32.12/mm/slub.c linux-2.6.32.12/mm/slub.c
53155 static void print_slabinfo_header(struct seq_file *m) 53322 static void print_slabinfo_header(struct seq_file *m)
53156 { 53323 {
53157 seq_puts(m, "slabinfo - version: 2.1\n"); 53324 seq_puts(m, "slabinfo - version: 2.1\n");
53158diff -urNp linux-2.6.32.12/mm/util.c linux-2.6.32.12/mm/util.c 53325diff -urNp linux-2.6.32.13/mm/util.c linux-2.6.32.13/mm/util.c
53159--- linux-2.6.32.12/mm/util.c 2010-03-15 11:52:04.000000000 -0400 53326--- linux-2.6.32.13/mm/util.c 2010-03-15 11:52:04.000000000 -0400
53160+++ linux-2.6.32.12/mm/util.c 2010-04-04 20:46:41.716811517 -0400 53327+++ linux-2.6.32.13/mm/util.c 2010-05-15 13:21:18.454622314 -0400
53161@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); 53328@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
53162 void arch_pick_mmap_layout(struct mm_struct *mm) 53329 void arch_pick_mmap_layout(struct mm_struct *mm)
53163 { 53330 {
@@ -53171,9 +53338,9 @@ diff -urNp linux-2.6.32.12/mm/util.c linux-2.6.32.12/mm/util.c
53171 mm->get_unmapped_area = arch_get_unmapped_area; 53338 mm->get_unmapped_area = arch_get_unmapped_area;
53172 mm->unmap_area = arch_unmap_area; 53339 mm->unmap_area = arch_unmap_area;
53173 } 53340 }
53174diff -urNp linux-2.6.32.12/mm/vmalloc.c linux-2.6.32.12/mm/vmalloc.c 53341diff -urNp linux-2.6.32.13/mm/vmalloc.c linux-2.6.32.13/mm/vmalloc.c
53175--- linux-2.6.32.12/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400 53342--- linux-2.6.32.13/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400
53176+++ linux-2.6.32.12/mm/vmalloc.c 2010-04-04 20:46:41.716811517 -0400 53343+++ linux-2.6.32.13/mm/vmalloc.c 2010-05-15 13:23:38.946686210 -0400
53177@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, 53344@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
53178 53345
53179 pte = pte_offset_kernel(pmd, addr); 53346 pte = pte_offset_kernel(pmd, addr);
@@ -53285,12 +53452,12 @@ diff -urNp linux-2.6.32.12/mm/vmalloc.c linux-2.6.32.12/mm/vmalloc.c
53285 53452
53286 BUG_ON(in_interrupt()); 53453 BUG_ON(in_interrupt());
53287+ 53454+
53288+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) 53455+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
53289+ if (flags & VM_KERNEXEC) { 53456+ if (flags & VM_KERNEXEC) {
53290+ if (start != VMALLOC_START || end != VMALLOC_END) 53457+ if (start != VMALLOC_START || end != VMALLOC_END)
53291+ return NULL; 53458+ return NULL;
53292+ start = (unsigned long)&MODULES_EXEC_VADDR; 53459+ start = (unsigned long)MODULES_EXEC_VADDR;
53293+ end = (unsigned long)&MODULES_EXEC_END; 53460+ end = (unsigned long)MODULES_EXEC_END;
53294+ } 53461+ }
53295+#endif 53462+#endif
53296+ 53463+
@@ -53301,7 +53468,7 @@ diff -urNp linux-2.6.32.12/mm/vmalloc.c linux-2.6.32.12/mm/vmalloc.c
53301 if (count > totalram_pages) 53468 if (count > totalram_pages)
53302 return NULL; 53469 return NULL;
53303 53470
53304+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) 53471+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
53305+ if (!(pgprot_val(prot) & _PAGE_NX)) 53472+ if (!(pgprot_val(prot) & _PAGE_NX))
53306+ flags |= VM_KERNEXEC; 53473+ flags |= VM_KERNEXEC;
53307+#endif 53474+#endif
@@ -53313,7 +53480,7 @@ diff -urNp linux-2.6.32.12/mm/vmalloc.c linux-2.6.32.12/mm/vmalloc.c
53313 if (!size || (size >> PAGE_SHIFT) > totalram_pages) 53480 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
53314 return NULL; 53481 return NULL;
53315 53482
53316+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) 53483+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
53317+ if (!(pgprot_val(prot) & _PAGE_NX)) 53484+ if (!(pgprot_val(prot) & _PAGE_NX))
53318+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_KERNEXEC, VMALLOC_START, VMALLOC_END, 53485+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_KERNEXEC, VMALLOC_START, VMALLOC_END,
53319+ node, gfp_mask, caller); 53486+ node, gfp_mask, caller);
@@ -53384,9 +53551,9 @@ diff -urNp linux-2.6.32.12/mm/vmalloc.c linux-2.6.32.12/mm/vmalloc.c
53384 void *vmalloc_32_user(unsigned long size) 53551 void *vmalloc_32_user(unsigned long size)
53385 { 53552 {
53386 struct vm_struct *area; 53553 struct vm_struct *area;
53387diff -urNp linux-2.6.32.12/net/8021q/vlan.c linux-2.6.32.12/net/8021q/vlan.c 53554diff -urNp linux-2.6.32.13/net/8021q/vlan.c linux-2.6.32.13/net/8021q/vlan.c
53388--- linux-2.6.32.12/net/8021q/vlan.c 2010-03-15 11:52:04.000000000 -0400 53555--- linux-2.6.32.13/net/8021q/vlan.c 2010-03-15 11:52:04.000000000 -0400
53389+++ linux-2.6.32.12/net/8021q/vlan.c 2010-04-29 17:46:37.373258882 -0400 53556+++ linux-2.6.32.13/net/8021q/vlan.c 2010-05-15 13:21:18.454622314 -0400
53390@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net 53557@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
53391 err = -EPERM; 53558 err = -EPERM;
53392 if (!capable(CAP_NET_ADMIN)) 53559 if (!capable(CAP_NET_ADMIN))
@@ -53397,9 +53564,9 @@ diff -urNp linux-2.6.32.12/net/8021q/vlan.c linux-2.6.32.12/net/8021q/vlan.c
53397 struct vlan_net *vn; 53564 struct vlan_net *vn;
53398 53565
53399 vn = net_generic(net, vlan_net_id); 53566 vn = net_generic(net, vlan_net_id);
53400diff -urNp linux-2.6.32.12/net/atm/atm_misc.c linux-2.6.32.12/net/atm/atm_misc.c 53567diff -urNp linux-2.6.32.13/net/atm/atm_misc.c linux-2.6.32.13/net/atm/atm_misc.c
53401--- linux-2.6.32.12/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400 53568--- linux-2.6.32.13/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400
53402+++ linux-2.6.32.12/net/atm/atm_misc.c 2010-04-04 20:46:41.716811517 -0400 53569+++ linux-2.6.32.13/net/atm/atm_misc.c 2010-05-15 13:21:18.454622314 -0400
53403@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t 53570@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
53404 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) 53571 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
53405 return 1; 53572 return 1;
@@ -53436,9 +53603,9 @@ diff -urNp linux-2.6.32.12/net/atm/atm_misc.c linux-2.6.32.12/net/atm/atm_misc.c
53436 __SONET_ITEMS 53603 __SONET_ITEMS
53437 #undef __HANDLE_ITEM 53604 #undef __HANDLE_ITEM
53438 } 53605 }
53439diff -urNp linux-2.6.32.12/net/atm/proc.c linux-2.6.32.12/net/atm/proc.c 53606diff -urNp linux-2.6.32.13/net/atm/proc.c linux-2.6.32.13/net/atm/proc.c
53440--- linux-2.6.32.12/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400 53607--- linux-2.6.32.13/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400
53441+++ linux-2.6.32.12/net/atm/proc.c 2010-04-04 20:46:41.716811517 -0400 53608+++ linux-2.6.32.13/net/atm/proc.c 2010-05-15 13:21:18.466625554 -0400
53442@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s 53609@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
53443 const struct k_atm_aal_stats *stats) 53610 const struct k_atm_aal_stats *stats)
53444 { 53611 {
@@ -53452,9 +53619,9 @@ diff -urNp linux-2.6.32.12/net/atm/proc.c linux-2.6.32.12/net/atm/proc.c
53452 } 53619 }
53453 53620
53454 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) 53621 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
53455diff -urNp linux-2.6.32.12/net/atm/resources.c linux-2.6.32.12/net/atm/resources.c 53622diff -urNp linux-2.6.32.13/net/atm/resources.c linux-2.6.32.13/net/atm/resources.c
53456--- linux-2.6.32.12/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400 53623--- linux-2.6.32.13/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400
53457+++ linux-2.6.32.12/net/atm/resources.c 2010-04-04 20:46:41.716811517 -0400 53624+++ linux-2.6.32.13/net/atm/resources.c 2010-05-15 13:21:18.466625554 -0400
53458@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * 53625@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
53459 static void copy_aal_stats(struct k_atm_aal_stats *from, 53626 static void copy_aal_stats(struct k_atm_aal_stats *from,
53460 struct atm_aal_stats *to) 53627 struct atm_aal_stats *to)
@@ -53473,9 +53640,9 @@ diff -urNp linux-2.6.32.12/net/atm/resources.c linux-2.6.32.12/net/atm/resources
53473 __AAL_STAT_ITEMS 53640 __AAL_STAT_ITEMS
53474 #undef __HANDLE_ITEM 53641 #undef __HANDLE_ITEM
53475 } 53642 }
53476diff -urNp linux-2.6.32.12/net/bridge/br_private.h linux-2.6.32.12/net/bridge/br_private.h 53643diff -urNp linux-2.6.32.13/net/bridge/br_private.h linux-2.6.32.13/net/bridge/br_private.h
53477--- linux-2.6.32.12/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400 53644--- linux-2.6.32.13/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400
53478+++ linux-2.6.32.12/net/bridge/br_private.h 2010-04-04 20:46:41.716811517 -0400 53645+++ linux-2.6.32.13/net/bridge/br_private.h 2010-05-15 13:21:18.499638693 -0400
53479@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, 53646@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
53480 53647
53481 #ifdef CONFIG_SYSFS 53648 #ifdef CONFIG_SYSFS
@@ -53485,9 +53652,9 @@ diff -urNp linux-2.6.32.12/net/bridge/br_private.h linux-2.6.32.12/net/bridge/br
53485 extern int br_sysfs_addif(struct net_bridge_port *p); 53652 extern int br_sysfs_addif(struct net_bridge_port *p);
53486 53653
53487 /* br_sysfs_br.c */ 53654 /* br_sysfs_br.c */
53488diff -urNp linux-2.6.32.12/net/bridge/br_stp_if.c linux-2.6.32.12/net/bridge/br_stp_if.c 53655diff -urNp linux-2.6.32.13/net/bridge/br_stp_if.c linux-2.6.32.13/net/bridge/br_stp_if.c
53489--- linux-2.6.32.12/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400 53656--- linux-2.6.32.13/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400
53490+++ linux-2.6.32.12/net/bridge/br_stp_if.c 2010-04-04 20:46:41.716811517 -0400 53657+++ linux-2.6.32.13/net/bridge/br_stp_if.c 2010-05-15 13:21:18.499638693 -0400
53491@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg 53658@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
53492 char *envp[] = { NULL }; 53659 char *envp[] = { NULL };
53493 53660
@@ -53497,9 +53664,9 @@ diff -urNp linux-2.6.32.12/net/bridge/br_stp_if.c linux-2.6.32.12/net/bridge/br_
53497 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", 53664 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
53498 br->dev->name, r); 53665 br->dev->name, r);
53499 53666
53500diff -urNp linux-2.6.32.12/net/bridge/br_sysfs_if.c linux-2.6.32.12/net/bridge/br_sysfs_if.c 53667diff -urNp linux-2.6.32.13/net/bridge/br_sysfs_if.c linux-2.6.32.13/net/bridge/br_sysfs_if.c
53501--- linux-2.6.32.12/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400 53668--- linux-2.6.32.13/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400
53502+++ linux-2.6.32.12/net/bridge/br_sysfs_if.c 2010-04-04 20:46:41.716811517 -0400 53669+++ linux-2.6.32.13/net/bridge/br_sysfs_if.c 2010-05-15 13:21:18.499638693 -0400
53503@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje 53670@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
53504 return ret; 53671 return ret;
53505 } 53672 }
@@ -53509,9 +53676,9 @@ diff -urNp linux-2.6.32.12/net/bridge/br_sysfs_if.c linux-2.6.32.12/net/bridge/b
53509 .show = brport_show, 53676 .show = brport_show,
53510 .store = brport_store, 53677 .store = brport_store,
53511 }; 53678 };
53512diff -urNp linux-2.6.32.12/net/core/dev.c linux-2.6.32.12/net/core/dev.c 53679diff -urNp linux-2.6.32.13/net/core/dev.c linux-2.6.32.13/net/core/dev.c
53513--- linux-2.6.32.12/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400 53680--- linux-2.6.32.13/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400
53514+++ linux-2.6.32.12/net/core/dev.c 2010-04-04 20:46:41.721901011 -0400 53681+++ linux-2.6.32.13/net/core/dev.c 2010-05-15 13:21:18.499638693 -0400
53515@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) 53682@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb)
53516 } 53683 }
53517 EXPORT_SYMBOL(netif_rx_ni); 53684 EXPORT_SYMBOL(netif_rx_ni);
@@ -53530,9 +53697,9 @@ diff -urNp linux-2.6.32.12/net/core/dev.c linux-2.6.32.12/net/core/dev.c
53530 { 53697 {
53531 struct list_head *list = &__get_cpu_var(softnet_data).poll_list; 53698 struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
53532 unsigned long time_limit = jiffies + 2; 53699 unsigned long time_limit = jiffies + 2;
53533diff -urNp linux-2.6.32.12/net/core/flow.c linux-2.6.32.12/net/core/flow.c 53700diff -urNp linux-2.6.32.13/net/core/flow.c linux-2.6.32.13/net/core/flow.c
53534--- linux-2.6.32.12/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400 53701--- linux-2.6.32.13/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400
53535+++ linux-2.6.32.12/net/core/flow.c 2010-04-04 20:46:41.721901011 -0400 53702+++ linux-2.6.32.13/net/core/flow.c 2010-05-15 13:21:18.499638693 -0400
53536@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( 53703@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
53537 53704
53538 static u32 flow_hash_shift; 53705 static u32 flow_hash_shift;
@@ -53560,9 +53727,9 @@ diff -urNp linux-2.6.32.12/net/core/flow.c linux-2.6.32.12/net/core/flow.c
53560 53727
53561 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) 53728 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
53562 53729
53563diff -urNp linux-2.6.32.12/net/dccp/ccids/ccid3.c linux-2.6.32.12/net/dccp/ccids/ccid3.c 53730diff -urNp linux-2.6.32.13/net/dccp/ccids/ccid3.c linux-2.6.32.13/net/dccp/ccids/ccid3.c
53564--- linux-2.6.32.12/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400 53731--- linux-2.6.32.13/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400
53565+++ linux-2.6.32.12/net/dccp/ccids/ccid3.c 2010-04-04 20:46:41.721901011 -0400 53732+++ linux-2.6.32.13/net/dccp/ccids/ccid3.c 2010-05-15 13:21:18.502580406 -0400
53566@@ -41,7 +41,7 @@ 53733@@ -41,7 +41,7 @@
53567 static int ccid3_debug; 53734 static int ccid3_debug;
53568 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) 53735 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -53572,9 +53739,9 @@ diff -urNp linux-2.6.32.12/net/dccp/ccids/ccid3.c linux-2.6.32.12/net/dccp/ccids
53572 #endif 53739 #endif
53573 53740
53574 /* 53741 /*
53575diff -urNp linux-2.6.32.12/net/dccp/dccp.h linux-2.6.32.12/net/dccp/dccp.h 53742diff -urNp linux-2.6.32.13/net/dccp/dccp.h linux-2.6.32.13/net/dccp/dccp.h
53576--- linux-2.6.32.12/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400 53743--- linux-2.6.32.13/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400
53577+++ linux-2.6.32.12/net/dccp/dccp.h 2010-04-04 20:46:41.721901011 -0400 53744+++ linux-2.6.32.13/net/dccp/dccp.h 2010-05-15 13:21:18.502580406 -0400
53578@@ -44,9 +44,9 @@ extern int dccp_debug; 53745@@ -44,9 +44,9 @@ extern int dccp_debug;
53579 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) 53746 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
53580 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) 53747 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -53588,9 +53755,9 @@ diff -urNp linux-2.6.32.12/net/dccp/dccp.h linux-2.6.32.12/net/dccp/dccp.h
53588 #endif 53755 #endif
53589 53756
53590 extern struct inet_hashinfo dccp_hashinfo; 53757 extern struct inet_hashinfo dccp_hashinfo;
53591diff -urNp linux-2.6.32.12/net/decnet/sysctl_net_decnet.c linux-2.6.32.12/net/decnet/sysctl_net_decnet.c 53758diff -urNp linux-2.6.32.13/net/decnet/sysctl_net_decnet.c linux-2.6.32.13/net/decnet/sysctl_net_decnet.c
53592--- linux-2.6.32.12/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400 53759--- linux-2.6.32.13/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400
53593+++ linux-2.6.32.12/net/decnet/sysctl_net_decnet.c 2010-04-04 20:46:41.721901011 -0400 53760+++ linux-2.6.32.13/net/decnet/sysctl_net_decnet.c 2010-05-15 13:21:18.502580406 -0400
53594@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t 53761@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
53595 53762
53596 if (len > *lenp) len = *lenp; 53763 if (len > *lenp) len = *lenp;
@@ -53609,9 +53776,9 @@ diff -urNp linux-2.6.32.12/net/decnet/sysctl_net_decnet.c linux-2.6.32.12/net/de
53609 return -EFAULT; 53776 return -EFAULT;
53610 53777
53611 *lenp = len; 53778 *lenp = len;
53612diff -urNp linux-2.6.32.12/net/ipv4/inet_hashtables.c linux-2.6.32.12/net/ipv4/inet_hashtables.c 53779diff -urNp linux-2.6.32.13/net/ipv4/inet_hashtables.c linux-2.6.32.13/net/ipv4/inet_hashtables.c
53613--- linux-2.6.32.12/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400 53780--- linux-2.6.32.13/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400
53614+++ linux-2.6.32.12/net/ipv4/inet_hashtables.c 2010-04-04 20:46:41.721901011 -0400 53781+++ linux-2.6.32.13/net/ipv4/inet_hashtables.c 2010-05-15 13:21:18.502580406 -0400
53615@@ -18,11 +18,14 @@ 53782@@ -18,11 +18,14 @@
53616 #include <linux/sched.h> 53783 #include <linux/sched.h>
53617 #include <linux/slab.h> 53784 #include <linux/slab.h>
@@ -53636,9 +53803,9 @@ diff -urNp linux-2.6.32.12/net/ipv4/inet_hashtables.c linux-2.6.32.12/net/ipv4/i
53636 if (tw) { 53803 if (tw) {
53637 inet_twsk_deschedule(tw, death_row); 53804 inet_twsk_deschedule(tw, death_row);
53638 inet_twsk_put(tw); 53805 inet_twsk_put(tw);
53639diff -urNp linux-2.6.32.12/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.12/net/ipv4/netfilter/nf_nat_snmp_basic.c 53806diff -urNp linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c
53640--- linux-2.6.32.12/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400 53807--- linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400
53641+++ linux-2.6.32.12/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-04-04 20:46:41.721901011 -0400 53808+++ linux-2.6.32.13/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-05-15 13:21:18.502580406 -0400
53642@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( 53809@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
53643 53810
53644 *len = 0; 53811 *len = 0;
@@ -53648,9 +53815,9 @@ diff -urNp linux-2.6.32.12/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.1
53648 if (*octets == NULL) { 53815 if (*octets == NULL) {
53649 if (net_ratelimit()) 53816 if (net_ratelimit())
53650 printk("OOM in bsalg (%d)\n", __LINE__); 53817 printk("OOM in bsalg (%d)\n", __LINE__);
53651diff -urNp linux-2.6.32.12/net/ipv4/tcp_ipv4.c linux-2.6.32.12/net/ipv4/tcp_ipv4.c 53818diff -urNp linux-2.6.32.13/net/ipv4/tcp_ipv4.c linux-2.6.32.13/net/ipv4/tcp_ipv4.c
53652--- linux-2.6.32.12/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400 53819--- linux-2.6.32.13/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400
53653+++ linux-2.6.32.12/net/ipv4/tcp_ipv4.c 2010-04-04 20:46:41.721901011 -0400 53820+++ linux-2.6.32.13/net/ipv4/tcp_ipv4.c 2010-05-15 13:21:18.502580406 -0400
53654@@ -84,6 +84,9 @@ 53821@@ -84,6 +84,9 @@
53655 int sysctl_tcp_tw_reuse __read_mostly; 53822 int sysctl_tcp_tw_reuse __read_mostly;
53656 int sysctl_tcp_low_latency __read_mostly; 53823 int sysctl_tcp_low_latency __read_mostly;
@@ -53695,9 +53862,9 @@ diff -urNp linux-2.6.32.12/net/ipv4/tcp_ipv4.c linux-2.6.32.12/net/ipv4/tcp_ipv4
53695 tcp_v4_send_reset(NULL, skb); 53862 tcp_v4_send_reset(NULL, skb);
53696 } 53863 }
53697 53864
53698diff -urNp linux-2.6.32.12/net/ipv4/tcp_minisocks.c linux-2.6.32.12/net/ipv4/tcp_minisocks.c 53865diff -urNp linux-2.6.32.13/net/ipv4/tcp_minisocks.c linux-2.6.32.13/net/ipv4/tcp_minisocks.c
53699--- linux-2.6.32.12/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400 53866--- linux-2.6.32.13/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400
53700+++ linux-2.6.32.12/net/ipv4/tcp_minisocks.c 2010-04-04 20:46:41.721901011 -0400 53867+++ linux-2.6.32.13/net/ipv4/tcp_minisocks.c 2010-05-15 13:21:18.502580406 -0400
53701@@ -26,6 +26,10 @@ 53868@@ -26,6 +26,10 @@
53702 #include <net/inet_common.h> 53869 #include <net/inet_common.h>
53703 #include <net/xfrm.h> 53870 #include <net/xfrm.h>
@@ -53720,9 +53887,9 @@ diff -urNp linux-2.6.32.12/net/ipv4/tcp_minisocks.c linux-2.6.32.12/net/ipv4/tcp
53720 if (!(flg & TCP_FLAG_RST)) 53887 if (!(flg & TCP_FLAG_RST))
53721 req->rsk_ops->send_reset(sk, skb); 53888 req->rsk_ops->send_reset(sk, skb);
53722 53889
53723diff -urNp linux-2.6.32.12/net/ipv4/tcp_probe.c linux-2.6.32.12/net/ipv4/tcp_probe.c 53890diff -urNp linux-2.6.32.13/net/ipv4/tcp_probe.c linux-2.6.32.13/net/ipv4/tcp_probe.c
53724--- linux-2.6.32.12/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400 53891--- linux-2.6.32.13/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400
53725+++ linux-2.6.32.12/net/ipv4/tcp_probe.c 2010-04-04 20:46:41.721901011 -0400 53892+++ linux-2.6.32.13/net/ipv4/tcp_probe.c 2010-05-15 13:21:18.502580406 -0400
53726@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file 53893@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
53727 if (cnt + width >= len) 53894 if (cnt + width >= len)
53728 break; 53895 break;
@@ -53732,9 +53899,9 @@ diff -urNp linux-2.6.32.12/net/ipv4/tcp_probe.c linux-2.6.32.12/net/ipv4/tcp_pro
53732 return -EFAULT; 53899 return -EFAULT;
53733 cnt += width; 53900 cnt += width;
53734 } 53901 }
53735diff -urNp linux-2.6.32.12/net/ipv4/tcp_timer.c linux-2.6.32.12/net/ipv4/tcp_timer.c 53902diff -urNp linux-2.6.32.13/net/ipv4/tcp_timer.c linux-2.6.32.13/net/ipv4/tcp_timer.c
53736--- linux-2.6.32.12/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400 53903--- linux-2.6.32.13/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400
53737+++ linux-2.6.32.12/net/ipv4/tcp_timer.c 2010-04-04 20:46:41.721901011 -0400 53904+++ linux-2.6.32.13/net/ipv4/tcp_timer.c 2010-05-15 13:21:18.502580406 -0400
53738@@ -21,6 +21,10 @@ 53905@@ -21,6 +21,10 @@
53739 #include <linux/module.h> 53906 #include <linux/module.h>
53740 #include <net/tcp.h> 53907 #include <net/tcp.h>
@@ -53760,9 +53927,9 @@ diff -urNp linux-2.6.32.12/net/ipv4/tcp_timer.c linux-2.6.32.12/net/ipv4/tcp_tim
53760 if (retransmits_timed_out(sk, retry_until)) { 53927 if (retransmits_timed_out(sk, retry_until)) {
53761 /* Has it gone just too far? */ 53928 /* Has it gone just too far? */
53762 tcp_write_err(sk); 53929 tcp_write_err(sk);
53763diff -urNp linux-2.6.32.12/net/ipv4/udp.c linux-2.6.32.12/net/ipv4/udp.c 53930diff -urNp linux-2.6.32.13/net/ipv4/udp.c linux-2.6.32.13/net/ipv4/udp.c
53764--- linux-2.6.32.12/net/ipv4/udp.c 2010-03-15 11:52:04.000000000 -0400 53931--- linux-2.6.32.13/net/ipv4/udp.c 2010-03-15 11:52:04.000000000 -0400
53765+++ linux-2.6.32.12/net/ipv4/udp.c 2010-04-04 20:46:41.724917264 -0400 53932+++ linux-2.6.32.13/net/ipv4/udp.c 2010-05-15 13:21:18.502580406 -0400
53766@@ -86,6 +86,7 @@ 53933@@ -86,6 +86,7 @@
53767 #include <linux/types.h> 53934 #include <linux/types.h>
53768 #include <linux/fcntl.h> 53935 #include <linux/fcntl.h>
@@ -53832,9 +53999,9 @@ diff -urNp linux-2.6.32.12/net/ipv4/udp.c linux-2.6.32.12/net/ipv4/udp.c
53832 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); 53999 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
53833 54000
53834 /* 54001 /*
53835diff -urNp linux-2.6.32.12/net/ipv6/exthdrs.c linux-2.6.32.12/net/ipv6/exthdrs.c 54002diff -urNp linux-2.6.32.13/net/ipv6/exthdrs.c linux-2.6.32.13/net/ipv6/exthdrs.c
53836--- linux-2.6.32.12/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400 54003--- linux-2.6.32.13/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400
53837+++ linux-2.6.32.12/net/ipv6/exthdrs.c 2010-04-04 20:46:41.724917264 -0400 54004+++ linux-2.6.32.13/net/ipv6/exthdrs.c 2010-05-15 13:21:18.502580406 -0400
53838@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt 54005@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
53839 .type = IPV6_TLV_JUMBO, 54006 .type = IPV6_TLV_JUMBO,
53840 .func = ipv6_hop_jumbo, 54007 .func = ipv6_hop_jumbo,
@@ -53844,9 +54011,9 @@ diff -urNp linux-2.6.32.12/net/ipv6/exthdrs.c linux-2.6.32.12/net/ipv6/exthdrs.c
53844 }; 54011 };
53845 54012
53846 int ipv6_parse_hopopts(struct sk_buff *skb) 54013 int ipv6_parse_hopopts(struct sk_buff *skb)
53847diff -urNp linux-2.6.32.12/net/ipv6/raw.c linux-2.6.32.12/net/ipv6/raw.c 54014diff -urNp linux-2.6.32.13/net/ipv6/raw.c linux-2.6.32.13/net/ipv6/raw.c
53848--- linux-2.6.32.12/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400 54015--- linux-2.6.32.13/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400
53849+++ linux-2.6.32.12/net/ipv6/raw.c 2010-04-04 20:46:41.724917264 -0400 54016+++ linux-2.6.32.13/net/ipv6/raw.c 2010-05-15 13:21:18.523941597 -0400
53850@@ -600,7 +600,7 @@ out: 54017@@ -600,7 +600,7 @@ out:
53851 return err; 54018 return err;
53852 } 54019 }
@@ -53856,9 +54023,9 @@ diff -urNp linux-2.6.32.12/net/ipv6/raw.c linux-2.6.32.12/net/ipv6/raw.c
53856 struct flowi *fl, struct rt6_info *rt, 54023 struct flowi *fl, struct rt6_info *rt,
53857 unsigned int flags) 54024 unsigned int flags)
53858 { 54025 {
53859diff -urNp linux-2.6.32.12/net/ipv6/tcp_ipv6.c linux-2.6.32.12/net/ipv6/tcp_ipv6.c 54026diff -urNp linux-2.6.32.13/net/ipv6/tcp_ipv6.c linux-2.6.32.13/net/ipv6/tcp_ipv6.c
53860--- linux-2.6.32.12/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400 54027--- linux-2.6.32.13/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400
53861+++ linux-2.6.32.12/net/ipv6/tcp_ipv6.c 2010-04-04 20:46:41.724917264 -0400 54028+++ linux-2.6.32.13/net/ipv6/tcp_ipv6.c 2010-05-15 13:21:18.734776060 -0400
53862@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk 54029@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk
53863 return 0; 54030 return 0;
53864 54031
@@ -53879,9 +54046,9 @@ diff -urNp linux-2.6.32.12/net/ipv6/tcp_ipv6.c linux-2.6.32.12/net/ipv6/tcp_ipv6
53879 tcp_v6_send_reset(NULL, skb); 54046 tcp_v6_send_reset(NULL, skb);
53880 } 54047 }
53881 54048
53882diff -urNp linux-2.6.32.12/net/ipv6/udp.c linux-2.6.32.12/net/ipv6/udp.c 54049diff -urNp linux-2.6.32.13/net/ipv6/udp.c linux-2.6.32.13/net/ipv6/udp.c
53883--- linux-2.6.32.12/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400 54050--- linux-2.6.32.13/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400
53884+++ linux-2.6.32.12/net/ipv6/udp.c 2010-04-04 20:46:41.724917264 -0400 54051+++ linux-2.6.32.13/net/ipv6/udp.c 2010-05-15 13:21:18.734776060 -0400
53885@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, 54052@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb,
53886 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, 54053 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
53887 proto == IPPROTO_UDPLITE); 54054 proto == IPPROTO_UDPLITE);
@@ -53892,9 +54059,9 @@ diff -urNp linux-2.6.32.12/net/ipv6/udp.c linux-2.6.32.12/net/ipv6/udp.c
53892 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); 54059 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
53893 54060
53894 kfree_skb(skb); 54061 kfree_skb(skb);
53895diff -urNp linux-2.6.32.12/net/irda/ircomm/ircomm_tty.c linux-2.6.32.12/net/irda/ircomm/ircomm_tty.c 54062diff -urNp linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c
53896--- linux-2.6.32.12/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400 54063--- linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400
53897+++ linux-2.6.32.12/net/irda/ircomm/ircomm_tty.c 2010-04-04 20:46:41.724917264 -0400 54064+++ linux-2.6.32.13/net/irda/ircomm/ircomm_tty.c 2010-05-15 13:21:18.734776060 -0400
53898@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st 54065@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
53899 add_wait_queue(&self->open_wait, &wait); 54066 add_wait_queue(&self->open_wait, &wait);
53900 54067
@@ -54017,9 +54184,9 @@ diff -urNp linux-2.6.32.12/net/irda/ircomm/ircomm_tty.c linux-2.6.32.12/net/irda
54017 seq_printf(m, "Max data size: %d\n", self->max_data_size); 54184 seq_printf(m, "Max data size: %d\n", self->max_data_size);
54018 seq_printf(m, "Max header size: %d\n", self->max_header_size); 54185 seq_printf(m, "Max header size: %d\n", self->max_header_size);
54019 54186
54020diff -urNp linux-2.6.32.12/net/mac80211/ieee80211_i.h linux-2.6.32.12/net/mac80211/ieee80211_i.h 54187diff -urNp linux-2.6.32.13/net/mac80211/ieee80211_i.h linux-2.6.32.13/net/mac80211/ieee80211_i.h
54021--- linux-2.6.32.12/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400 54188--- linux-2.6.32.13/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400
54022+++ linux-2.6.32.12/net/mac80211/ieee80211_i.h 2010-04-04 20:46:41.724917264 -0400 54189+++ linux-2.6.32.13/net/mac80211/ieee80211_i.h 2010-05-15 13:21:18.734776060 -0400
54023@@ -635,7 +635,7 @@ struct ieee80211_local { 54190@@ -635,7 +635,7 @@ struct ieee80211_local {
54024 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ 54191 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
54025 spinlock_t queue_stop_reason_lock; 54192 spinlock_t queue_stop_reason_lock;
@@ -54029,9 +54196,9 @@ diff -urNp linux-2.6.32.12/net/mac80211/ieee80211_i.h linux-2.6.32.12/net/mac802
54029 int monitors, cooked_mntrs; 54196 int monitors, cooked_mntrs;
54030 /* number of interfaces with corresponding FIF_ flags */ 54197 /* number of interfaces with corresponding FIF_ flags */
54031 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; 54198 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
54032diff -urNp linux-2.6.32.12/net/mac80211/iface.c linux-2.6.32.12/net/mac80211/iface.c 54199diff -urNp linux-2.6.32.13/net/mac80211/iface.c linux-2.6.32.13/net/mac80211/iface.c
54033--- linux-2.6.32.12/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400 54200--- linux-2.6.32.13/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400
54034+++ linux-2.6.32.12/net/mac80211/iface.c 2010-04-04 20:46:41.724917264 -0400 54201+++ linux-2.6.32.13/net/mac80211/iface.c 2010-05-15 13:21:18.734776060 -0400
54035@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev 54202@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
54036 break; 54203 break;
54037 } 54204 }
@@ -54086,9 +54253,9 @@ diff -urNp linux-2.6.32.12/net/mac80211/iface.c linux-2.6.32.12/net/mac80211/ifa
54086 ieee80211_clear_tx_pending(local); 54253 ieee80211_clear_tx_pending(local);
54087 ieee80211_stop_device(local); 54254 ieee80211_stop_device(local);
54088 54255
54089diff -urNp linux-2.6.32.12/net/mac80211/main.c linux-2.6.32.12/net/mac80211/main.c 54256diff -urNp linux-2.6.32.13/net/mac80211/main.c linux-2.6.32.13/net/mac80211/main.c
54090--- linux-2.6.32.12/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400 54257--- linux-2.6.32.13/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400
54091+++ linux-2.6.32.12/net/mac80211/main.c 2010-04-04 20:46:41.724917264 -0400 54258+++ linux-2.6.32.13/net/mac80211/main.c 2010-05-15 13:21:18.734776060 -0400
54092@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 54259@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
54093 local->hw.conf.power_level = power; 54260 local->hw.conf.power_level = power;
54094 } 54261 }
@@ -54098,9 +54265,9 @@ diff -urNp linux-2.6.32.12/net/mac80211/main.c linux-2.6.32.12/net/mac80211/main
54098 ret = drv_config(local, changed); 54265 ret = drv_config(local, changed);
54099 /* 54266 /*
54100 * Goal: 54267 * Goal:
54101diff -urNp linux-2.6.32.12/net/mac80211/pm.c linux-2.6.32.12/net/mac80211/pm.c 54268diff -urNp linux-2.6.32.13/net/mac80211/pm.c linux-2.6.32.13/net/mac80211/pm.c
54102--- linux-2.6.32.12/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400 54269--- linux-2.6.32.13/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400
54103+++ linux-2.6.32.12/net/mac80211/pm.c 2010-04-04 20:46:41.724917264 -0400 54270+++ linux-2.6.32.13/net/mac80211/pm.c 2010-05-15 13:21:18.734776060 -0400
54104@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 54271@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
54105 } 54272 }
54106 54273
@@ -54110,9 +54277,9 @@ diff -urNp linux-2.6.32.12/net/mac80211/pm.c linux-2.6.32.12/net/mac80211/pm.c
54110 ieee80211_stop_device(local); 54277 ieee80211_stop_device(local);
54111 54278
54112 local->suspended = true; 54279 local->suspended = true;
54113diff -urNp linux-2.6.32.12/net/mac80211/rate.c linux-2.6.32.12/net/mac80211/rate.c 54280diff -urNp linux-2.6.32.13/net/mac80211/rate.c linux-2.6.32.13/net/mac80211/rate.c
54114--- linux-2.6.32.12/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400 54281--- linux-2.6.32.13/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400
54115+++ linux-2.6.32.12/net/mac80211/rate.c 2010-04-04 20:46:41.724917264 -0400 54282+++ linux-2.6.32.13/net/mac80211/rate.c 2010-05-15 13:21:18.734776060 -0400
54116@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct 54283@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
54117 struct rate_control_ref *ref, *old; 54284 struct rate_control_ref *ref, *old;
54118 54285
@@ -54122,9 +54289,9 @@ diff -urNp linux-2.6.32.12/net/mac80211/rate.c linux-2.6.32.12/net/mac80211/rate
54122 return -EBUSY; 54289 return -EBUSY;
54123 54290
54124 ref = rate_control_alloc(name, local); 54291 ref = rate_control_alloc(name, local);
54125diff -urNp linux-2.6.32.12/net/mac80211/tx.c linux-2.6.32.12/net/mac80211/tx.c 54292diff -urNp linux-2.6.32.13/net/mac80211/tx.c linux-2.6.32.13/net/mac80211/tx.c
54126--- linux-2.6.32.12/net/mac80211/tx.c 2010-04-29 17:49:38.690617032 -0400 54293--- linux-2.6.32.13/net/mac80211/tx.c 2010-04-29 17:49:38.690617032 -0400
54127+++ linux-2.6.32.12/net/mac80211/tx.c 2010-04-29 17:49:58.741536660 -0400 54294+++ linux-2.6.32.13/net/mac80211/tx.c 2010-05-15 13:21:18.734776060 -0400
54128@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct 54295@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
54129 return cpu_to_le16(dur); 54296 return cpu_to_le16(dur);
54130 } 54297 }
@@ -54134,9 +54301,9 @@ diff -urNp linux-2.6.32.12/net/mac80211/tx.c linux-2.6.32.12/net/mac80211/tx.c
54134 struct net_device *dev) 54301 struct net_device *dev)
54135 { 54302 {
54136 return local == wdev_priv(dev->ieee80211_ptr); 54303 return local == wdev_priv(dev->ieee80211_ptr);
54137diff -urNp linux-2.6.32.12/net/mac80211/util.c linux-2.6.32.12/net/mac80211/util.c 54304diff -urNp linux-2.6.32.13/net/mac80211/util.c linux-2.6.32.13/net/mac80211/util.c
54138--- linux-2.6.32.12/net/mac80211/util.c 2010-04-29 17:49:38.690617032 -0400 54305--- linux-2.6.32.13/net/mac80211/util.c 2010-04-29 17:49:38.690617032 -0400
54139+++ linux-2.6.32.12/net/mac80211/util.c 2010-04-29 17:49:58.749029456 -0400 54306+++ linux-2.6.32.13/net/mac80211/util.c 2010-05-15 13:21:18.734776060 -0400
54140@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ 54307@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_
54141 local->resuming = true; 54308 local->resuming = true;
54142 54309
@@ -54154,9 +54321,9 @@ diff -urNp linux-2.6.32.12/net/mac80211/util.c linux-2.6.32.12/net/mac80211/util
54154 if (res) { 54321 if (res) {
54155 WARN(local->suspended, "Harware became unavailable " 54322 WARN(local->suspended, "Harware became unavailable "
54156 "upon resume. This is could be a software issue" 54323 "upon resume. This is could be a software issue"
54157diff -urNp linux-2.6.32.12/net/sctp/socket.c linux-2.6.32.12/net/sctp/socket.c 54324diff -urNp linux-2.6.32.13/net/sctp/socket.c linux-2.6.32.13/net/sctp/socket.c
54158--- linux-2.6.32.12/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400 54325--- linux-2.6.32.13/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400
54159+++ linux-2.6.32.12/net/sctp/socket.c 2010-04-04 20:46:41.728797784 -0400 54326+++ linux-2.6.32.13/net/sctp/socket.c 2010-05-15 13:21:18.788974801 -0400
54160@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc 54327@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
54161 struct sctp_sndrcvinfo *sinfo; 54328 struct sctp_sndrcvinfo *sinfo;
54162 struct sctp_initmsg *sinit; 54329 struct sctp_initmsg *sinit;
@@ -54174,9 +54341,9 @@ diff -urNp linux-2.6.32.12/net/sctp/socket.c linux-2.6.32.12/net/sctp/socket.c
54174 54341
54175 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); 54342 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
54176 if (pp->fastreuse && sk->sk_reuse && 54343 if (pp->fastreuse && sk->sk_reuse &&
54177diff -urNp linux-2.6.32.12/net/socket.c linux-2.6.32.12/net/socket.c 54344diff -urNp linux-2.6.32.13/net/socket.c linux-2.6.32.13/net/socket.c
54178--- linux-2.6.32.12/net/socket.c 2010-03-15 11:52:04.000000000 -0400 54345--- linux-2.6.32.13/net/socket.c 2010-03-15 11:52:04.000000000 -0400
54179+++ linux-2.6.32.12/net/socket.c 2010-04-04 20:46:41.728797784 -0400 54346+++ linux-2.6.32.13/net/socket.c 2010-05-15 13:21:18.788974801 -0400
54180@@ -87,6 +87,7 @@ 54347@@ -87,6 +87,7 @@
54181 #include <linux/wireless.h> 54348 #include <linux/wireless.h>
54182 #include <linux/nsproxy.h> 54349 #include <linux/nsproxy.h>
@@ -54331,9 +54498,9 @@ diff -urNp linux-2.6.32.12/net/socket.c linux-2.6.32.12/net/socket.c
54331 err = 54498 err =
54332 security_socket_connect(sock, (struct sockaddr *)&address, addrlen); 54499 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
54333 if (err) 54500 if (err)
54334diff -urNp linux-2.6.32.12/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.12/net/sunrpc/xprtrdma/svc_rdma.c 54501diff -urNp linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c
54335--- linux-2.6.32.12/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400 54502--- linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400
54336+++ linux-2.6.32.12/net/sunrpc/xprtrdma/svc_rdma.c 2010-04-04 20:46:41.728797784 -0400 54503+++ linux-2.6.32.13/net/sunrpc/xprtrdma/svc_rdma.c 2010-05-15 13:21:18.790642809 -0400
54337@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta 54504@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
54338 len -= *ppos; 54505 len -= *ppos;
54339 if (len > *lenp) 54506 if (len > *lenp)
@@ -54343,9 +54510,9 @@ diff -urNp linux-2.6.32.12/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.12/net/su
54343 return -EFAULT; 54510 return -EFAULT;
54344 *lenp = len; 54511 *lenp = len;
54345 *ppos += len; 54512 *ppos += len;
54346diff -urNp linux-2.6.32.12/net/sysctl_net.c linux-2.6.32.12/net/sysctl_net.c 54513diff -urNp linux-2.6.32.13/net/sysctl_net.c linux-2.6.32.13/net/sysctl_net.c
54347--- linux-2.6.32.12/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400 54514--- linux-2.6.32.13/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400
54348+++ linux-2.6.32.12/net/sysctl_net.c 2010-04-04 20:46:41.728797784 -0400 54515+++ linux-2.6.32.13/net/sysctl_net.c 2010-05-15 13:21:18.790642809 -0400
54349@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct 54516@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
54350 struct ctl_table *table) 54517 struct ctl_table *table)
54351 { 54518 {
@@ -54355,9 +54522,9 @@ diff -urNp linux-2.6.32.12/net/sysctl_net.c linux-2.6.32.12/net/sysctl_net.c
54355 int mode = (table->mode >> 6) & 7; 54522 int mode = (table->mode >> 6) & 7;
54356 return (mode << 6) | (mode << 3) | mode; 54523 return (mode << 6) | (mode << 3) | mode;
54357 } 54524 }
54358diff -urNp linux-2.6.32.12/net/tipc/socket.c linux-2.6.32.12/net/tipc/socket.c 54525diff -urNp linux-2.6.32.13/net/tipc/socket.c linux-2.6.32.13/net/tipc/socket.c
54359--- linux-2.6.32.12/net/tipc/socket.c 2010-03-15 11:52:04.000000000 -0400 54526--- linux-2.6.32.13/net/tipc/socket.c 2010-03-15 11:52:04.000000000 -0400
54360+++ linux-2.6.32.12/net/tipc/socket.c 2010-04-29 17:46:37.401277007 -0400 54527+++ linux-2.6.32.13/net/tipc/socket.c 2010-05-15 13:21:18.790642809 -0400
54361@@ -1449,8 +1449,9 @@ static int connect(struct socket *sock, 54528@@ -1449,8 +1449,9 @@ static int connect(struct socket *sock,
54362 } else { 54529 } else {
54363 if (res == 0) 54530 if (res == 0)
@@ -54370,9 +54537,9 @@ diff -urNp linux-2.6.32.12/net/tipc/socket.c linux-2.6.32.12/net/tipc/socket.c
54370 sock->state = SS_DISCONNECTING; 54537 sock->state = SS_DISCONNECTING;
54371 } 54538 }
54372 54539
54373diff -urNp linux-2.6.32.12/net/unix/af_unix.c linux-2.6.32.12/net/unix/af_unix.c 54540diff -urNp linux-2.6.32.13/net/unix/af_unix.c linux-2.6.32.13/net/unix/af_unix.c
54374--- linux-2.6.32.12/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400 54541--- linux-2.6.32.13/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400
54375+++ linux-2.6.32.12/net/unix/af_unix.c 2010-04-04 20:46:41.728797784 -0400 54542+++ linux-2.6.32.13/net/unix/af_unix.c 2010-05-15 13:21:18.790642809 -0400
54376@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru 54543@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru
54377 err = -ECONNREFUSED; 54544 err = -ECONNREFUSED;
54378 if (!S_ISSOCK(inode->i_mode)) 54545 if (!S_ISSOCK(inode->i_mode))
@@ -54430,9 +54597,9 @@ diff -urNp linux-2.6.32.12/net/unix/af_unix.c linux-2.6.32.12/net/unix/af_unix.c
54430 list = &unix_socket_table[addr->hash]; 54597 list = &unix_socket_table[addr->hash];
54431 } else { 54598 } else {
54432 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; 54599 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
54433diff -urNp linux-2.6.32.12/net/xfrm/xfrm_policy.c linux-2.6.32.12/net/xfrm/xfrm_policy.c 54600diff -urNp linux-2.6.32.13/net/xfrm/xfrm_policy.c linux-2.6.32.13/net/xfrm/xfrm_policy.c
54434--- linux-2.6.32.12/net/xfrm/xfrm_policy.c 2010-03-15 11:52:04.000000000 -0400 54601--- linux-2.6.32.13/net/xfrm/xfrm_policy.c 2010-03-15 11:52:04.000000000 -0400
54435+++ linux-2.6.32.12/net/xfrm/xfrm_policy.c 2010-04-29 17:46:37.421275445 -0400 54602+++ linux-2.6.32.13/net/xfrm/xfrm_policy.c 2010-05-15 13:21:18.790642809 -0400
54436@@ -1477,7 +1477,7 @@ free_dst: 54603@@ -1477,7 +1477,7 @@ free_dst:
54437 goto out; 54604 goto out;
54438 } 54605 }
@@ -54460,9 +54627,9 @@ diff -urNp linux-2.6.32.12/net/xfrm/xfrm_policy.c linux-2.6.32.12/net/xfrm/xfrm_
54460 xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) 54627 xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
54461 { 54628 {
54462 #ifdef CONFIG_XFRM_SUB_POLICY 54629 #ifdef CONFIG_XFRM_SUB_POLICY
54463diff -urNp linux-2.6.32.12/samples/kobject/kset-example.c linux-2.6.32.12/samples/kobject/kset-example.c 54630diff -urNp linux-2.6.32.13/samples/kobject/kset-example.c linux-2.6.32.13/samples/kobject/kset-example.c
54464--- linux-2.6.32.12/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400 54631--- linux-2.6.32.13/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400
54465+++ linux-2.6.32.12/samples/kobject/kset-example.c 2010-04-04 20:46:41.728797784 -0400 54632+++ linux-2.6.32.13/samples/kobject/kset-example.c 2010-05-15 13:21:18.790642809 -0400
54466@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob 54633@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
54467 } 54634 }
54468 54635
@@ -54472,9 +54639,9 @@ diff -urNp linux-2.6.32.12/samples/kobject/kset-example.c linux-2.6.32.12/sample
54472 .show = foo_attr_show, 54639 .show = foo_attr_show,
54473 .store = foo_attr_store, 54640 .store = foo_attr_store,
54474 }; 54641 };
54475diff -urNp linux-2.6.32.12/scripts/basic/fixdep.c linux-2.6.32.12/scripts/basic/fixdep.c 54642diff -urNp linux-2.6.32.13/scripts/basic/fixdep.c linux-2.6.32.13/scripts/basic/fixdep.c
54476--- linux-2.6.32.12/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400 54643--- linux-2.6.32.13/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400
54477+++ linux-2.6.32.12/scripts/basic/fixdep.c 2010-04-04 20:46:41.728797784 -0400 54644+++ linux-2.6.32.13/scripts/basic/fixdep.c 2010-05-15 13:21:18.790642809 -0400
54478@@ -222,9 +222,9 @@ static void use_config(char *m, int slen 54645@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
54479 54646
54480 static void parse_config_file(char *map, size_t len) 54647 static void parse_config_file(char *map, size_t len)
@@ -54496,9 +54663,9 @@ diff -urNp linux-2.6.32.12/scripts/basic/fixdep.c linux-2.6.32.12/scripts/basic/
54496 54663
54497 if (*p != INT_CONF) { 54664 if (*p != INT_CONF) {
54498 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", 54665 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
54499diff -urNp linux-2.6.32.12/scripts/kallsyms.c linux-2.6.32.12/scripts/kallsyms.c 54666diff -urNp linux-2.6.32.13/scripts/kallsyms.c linux-2.6.32.13/scripts/kallsyms.c
54500--- linux-2.6.32.12/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 54667--- linux-2.6.32.13/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400
54501+++ linux-2.6.32.12/scripts/kallsyms.c 2010-04-04 20:46:41.728797784 -0400 54668+++ linux-2.6.32.13/scripts/kallsyms.c 2010-05-15 13:21:18.790642809 -0400
54502@@ -43,10 +43,10 @@ struct text_range { 54669@@ -43,10 +43,10 @@ struct text_range {
54503 54670
54504 static unsigned long long _text; 54671 static unsigned long long _text;
@@ -54514,9 +54681,9 @@ diff -urNp linux-2.6.32.12/scripts/kallsyms.c linux-2.6.32.12/scripts/kallsyms.c
54514 }; 54681 };
54515 #define text_range_text (&text_ranges[0]) 54682 #define text_range_text (&text_ranges[0])
54516 #define text_range_inittext (&text_ranges[1]) 54683 #define text_range_inittext (&text_ranges[1])
54517diff -urNp linux-2.6.32.12/scripts/mod/file2alias.c linux-2.6.32.12/scripts/mod/file2alias.c 54684diff -urNp linux-2.6.32.13/scripts/mod/file2alias.c linux-2.6.32.13/scripts/mod/file2alias.c
54518--- linux-2.6.32.12/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400 54685--- linux-2.6.32.13/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400
54519+++ linux-2.6.32.12/scripts/mod/file2alias.c 2010-04-04 20:46:41.728797784 -0400 54686+++ linux-2.6.32.13/scripts/mod/file2alias.c 2010-05-15 13:21:18.790642809 -0400
54520@@ -72,7 +72,7 @@ static void device_id_check(const char * 54687@@ -72,7 +72,7 @@ static void device_id_check(const char *
54521 unsigned long size, unsigned long id_size, 54688 unsigned long size, unsigned long id_size,
54522 void *symval) 54689 void *symval)
@@ -54571,9 +54738,9 @@ diff -urNp linux-2.6.32.12/scripts/mod/file2alias.c linux-2.6.32.12/scripts/mod/
54571 54738
54572 sprintf(alias, "dmi*"); 54739 sprintf(alias, "dmi*");
54573 54740
54574diff -urNp linux-2.6.32.12/scripts/mod/modpost.c linux-2.6.32.12/scripts/mod/modpost.c 54741diff -urNp linux-2.6.32.13/scripts/mod/modpost.c linux-2.6.32.13/scripts/mod/modpost.c
54575--- linux-2.6.32.12/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400 54742--- linux-2.6.32.13/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400
54576+++ linux-2.6.32.12/scripts/mod/modpost.c 2010-04-04 20:46:41.728797784 -0400 54743+++ linux-2.6.32.13/scripts/mod/modpost.c 2010-05-15 13:21:18.814648703 -0400
54577@@ -835,6 +835,7 @@ enum mismatch { 54744@@ -835,6 +835,7 @@ enum mismatch {
54578 INIT_TO_EXIT, 54745 INIT_TO_EXIT,
54579 EXIT_TO_INIT, 54746 EXIT_TO_INIT,
@@ -54641,9 +54808,9 @@ diff -urNp linux-2.6.32.12/scripts/mod/modpost.c linux-2.6.32.12/scripts/mod/mod
54641 goto close_write; 54808 goto close_write;
54642 54809
54643 tmp = NOFAIL(malloc(b->pos)); 54810 tmp = NOFAIL(malloc(b->pos));
54644diff -urNp linux-2.6.32.12/scripts/mod/modpost.h linux-2.6.32.12/scripts/mod/modpost.h 54811diff -urNp linux-2.6.32.13/scripts/mod/modpost.h linux-2.6.32.13/scripts/mod/modpost.h
54645--- linux-2.6.32.12/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400 54812--- linux-2.6.32.13/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400
54646+++ linux-2.6.32.12/scripts/mod/modpost.h 2010-04-04 20:46:41.728797784 -0400 54813+++ linux-2.6.32.13/scripts/mod/modpost.h 2010-05-15 13:21:18.814648703 -0400
54647@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e 54814@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
54648 54815
54649 struct buffer { 54816 struct buffer {
@@ -54663,9 +54830,9 @@ diff -urNp linux-2.6.32.12/scripts/mod/modpost.h linux-2.6.32.12/scripts/mod/mod
54663 54830
54664 struct module { 54831 struct module {
54665 struct module *next; 54832 struct module *next;
54666diff -urNp linux-2.6.32.12/scripts/mod/sumversion.c linux-2.6.32.12/scripts/mod/sumversion.c 54833diff -urNp linux-2.6.32.13/scripts/mod/sumversion.c linux-2.6.32.13/scripts/mod/sumversion.c
54667--- linux-2.6.32.12/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400 54834--- linux-2.6.32.13/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400
54668+++ linux-2.6.32.12/scripts/mod/sumversion.c 2010-04-04 20:46:41.728797784 -0400 54835+++ linux-2.6.32.13/scripts/mod/sumversion.c 2010-05-15 13:21:18.814648703 -0400
54669@@ -455,7 +455,7 @@ static void write_version(const char *fi 54836@@ -455,7 +455,7 @@ static void write_version(const char *fi
54670 goto out; 54837 goto out;
54671 } 54838 }
@@ -54675,9 +54842,9 @@ diff -urNp linux-2.6.32.12/scripts/mod/sumversion.c linux-2.6.32.12/scripts/mod/
54675 warn("writing sum in %s failed: %s\n", 54842 warn("writing sum in %s failed: %s\n",
54676 filename, strerror(errno)); 54843 filename, strerror(errno));
54677 goto out; 54844 goto out;
54678diff -urNp linux-2.6.32.12/scripts/pnmtologo.c linux-2.6.32.12/scripts/pnmtologo.c 54845diff -urNp linux-2.6.32.13/scripts/pnmtologo.c linux-2.6.32.13/scripts/pnmtologo.c
54679--- linux-2.6.32.12/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400 54846--- linux-2.6.32.13/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400
54680+++ linux-2.6.32.12/scripts/pnmtologo.c 2010-04-04 20:46:41.728797784 -0400 54847+++ linux-2.6.32.13/scripts/pnmtologo.c 2010-05-15 13:21:18.814648703 -0400
54681@@ -237,14 +237,14 @@ static void write_header(void) 54848@@ -237,14 +237,14 @@ static void write_header(void)
54682 fprintf(out, " * Linux logo %s\n", logoname); 54849 fprintf(out, " * Linux logo %s\n", logoname);
54683 fputs(" */\n\n", out); 54850 fputs(" */\n\n", out);
@@ -54704,9 +54871,9 @@ diff -urNp linux-2.6.32.12/scripts/pnmtologo.c linux-2.6.32.12/scripts/pnmtologo
54704 logoname); 54871 logoname);
54705 write_hex_cnt = 0; 54872 write_hex_cnt = 0;
54706 for (i = 0; i < logo_clutsize; i++) { 54873 for (i = 0; i < logo_clutsize; i++) {
54707diff -urNp linux-2.6.32.12/security/commoncap.c linux-2.6.32.12/security/commoncap.c 54874diff -urNp linux-2.6.32.13/security/commoncap.c linux-2.6.32.13/security/commoncap.c
54708--- linux-2.6.32.12/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400 54875--- linux-2.6.32.13/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400
54709+++ linux-2.6.32.12/security/commoncap.c 2010-04-04 20:46:41.728797784 -0400 54876+++ linux-2.6.32.13/security/commoncap.c 2010-05-15 13:21:18.814648703 -0400
54710@@ -27,7 +27,7 @@ 54877@@ -27,7 +27,7 @@
54711 #include <linux/sched.h> 54878 #include <linux/sched.h>
54712 #include <linux/prctl.h> 54879 #include <linux/prctl.h>
@@ -54729,9 +54896,9 @@ diff -urNp linux-2.6.32.12/security/commoncap.c linux-2.6.32.12/security/commonc
54729 return 0; 54896 return 0;
54730 } 54897 }
54731 54898
54732diff -urNp linux-2.6.32.12/security/integrity/ima/ima_api.c linux-2.6.32.12/security/integrity/ima/ima_api.c 54899diff -urNp linux-2.6.32.13/security/integrity/ima/ima_api.c linux-2.6.32.13/security/integrity/ima/ima_api.c
54733--- linux-2.6.32.12/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400 54900--- linux-2.6.32.13/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400
54734+++ linux-2.6.32.12/security/integrity/ima/ima_api.c 2010-04-04 20:46:41.728797784 -0400 54901+++ linux-2.6.32.13/security/integrity/ima/ima_api.c 2010-05-15 13:21:18.814648703 -0400
54735@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino 54902@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
54736 int result; 54903 int result;
54737 54904
@@ -54741,9 +54908,9 @@ diff -urNp linux-2.6.32.12/security/integrity/ima/ima_api.c linux-2.6.32.12/secu
54741 54908
54742 entry = kmalloc(sizeof(*entry), GFP_KERNEL); 54909 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
54743 if (!entry) { 54910 if (!entry) {
54744diff -urNp linux-2.6.32.12/security/integrity/ima/ima_fs.c linux-2.6.32.12/security/integrity/ima/ima_fs.c 54911diff -urNp linux-2.6.32.13/security/integrity/ima/ima_fs.c linux-2.6.32.13/security/integrity/ima/ima_fs.c
54745--- linux-2.6.32.12/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400 54912--- linux-2.6.32.13/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400
54746+++ linux-2.6.32.12/security/integrity/ima/ima_fs.c 2010-04-04 20:46:41.728797784 -0400 54913+++ linux-2.6.32.13/security/integrity/ima/ima_fs.c 2010-05-15 13:21:18.814648703 -0400
54747@@ -27,12 +27,12 @@ 54914@@ -27,12 +27,12 @@
54748 static int valid_policy = 1; 54915 static int valid_policy = 1;
54749 #define TMPBUFLEN 12 54916 #define TMPBUFLEN 12
@@ -54759,9 +54926,9 @@ diff -urNp linux-2.6.32.12/security/integrity/ima/ima_fs.c linux-2.6.32.12/secur
54759 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); 54926 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
54760 } 54927 }
54761 54928
54762diff -urNp linux-2.6.32.12/security/integrity/ima/ima.h linux-2.6.32.12/security/integrity/ima/ima.h 54929diff -urNp linux-2.6.32.13/security/integrity/ima/ima.h linux-2.6.32.13/security/integrity/ima/ima.h
54763--- linux-2.6.32.12/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400 54930--- linux-2.6.32.13/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400
54764+++ linux-2.6.32.12/security/integrity/ima/ima.h 2010-04-04 20:46:41.728797784 -0400 54931+++ linux-2.6.32.13/security/integrity/ima/ima.h 2010-05-15 13:21:18.814648703 -0400
54765@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino 54932@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
54766 extern spinlock_t ima_queue_lock; 54933 extern spinlock_t ima_queue_lock;
54767 54934
@@ -54773,9 +54940,9 @@ diff -urNp linux-2.6.32.12/security/integrity/ima/ima.h linux-2.6.32.12/security
54773 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; 54940 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
54774 }; 54941 };
54775 extern struct ima_h_table ima_htable; 54942 extern struct ima_h_table ima_htable;
54776diff -urNp linux-2.6.32.12/security/integrity/ima/ima_queue.c linux-2.6.32.12/security/integrity/ima/ima_queue.c 54943diff -urNp linux-2.6.32.13/security/integrity/ima/ima_queue.c linux-2.6.32.13/security/integrity/ima/ima_queue.c
54777--- linux-2.6.32.12/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400 54944--- linux-2.6.32.13/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400
54778+++ linux-2.6.32.12/security/integrity/ima/ima_queue.c 2010-04-04 20:46:41.728797784 -0400 54945+++ linux-2.6.32.13/security/integrity/ima/ima_queue.c 2010-05-15 13:21:18.814648703 -0400
54779@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i 54946@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
54780 INIT_LIST_HEAD(&qe->later); 54947 INIT_LIST_HEAD(&qe->later);
54781 list_add_tail_rcu(&qe->later, &ima_measurements); 54948 list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -54785,9 +54952,9 @@ diff -urNp linux-2.6.32.12/security/integrity/ima/ima_queue.c linux-2.6.32.12/se
54785 key = ima_hash_key(entry->digest); 54952 key = ima_hash_key(entry->digest);
54786 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); 54953 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
54787 return 0; 54954 return 0;
54788diff -urNp linux-2.6.32.12/security/Kconfig linux-2.6.32.12/security/Kconfig 54955diff -urNp linux-2.6.32.13/security/Kconfig linux-2.6.32.13/security/Kconfig
54789--- linux-2.6.32.12/security/Kconfig 2010-03-15 11:52:04.000000000 -0400 54956--- linux-2.6.32.13/security/Kconfig 2010-03-15 11:52:04.000000000 -0400
54790+++ linux-2.6.32.12/security/Kconfig 2010-04-29 17:46:37.065247062 -0400 54957+++ linux-2.6.32.13/security/Kconfig 2010-05-15 13:37:07.058702111 -0400
54791@@ -4,6 +4,499 @@ 54958@@ -4,6 +4,499 @@
54792 54959
54793 menu "Security options" 54960 menu "Security options"
@@ -55297,9 +55464,9 @@ diff -urNp linux-2.6.32.12/security/Kconfig linux-2.6.32.12/security/Kconfig
55297 help 55464 help
55298 This is the portion of low virtual memory which should be protected 55465 This is the portion of low virtual memory which should be protected
55299 from userspace allocation. Keeping a user from writing to low pages 55466 from userspace allocation. Keeping a user from writing to low pages
55300diff -urNp linux-2.6.32.12/security/min_addr.c linux-2.6.32.12/security/min_addr.c 55467diff -urNp linux-2.6.32.13/security/min_addr.c linux-2.6.32.13/security/min_addr.c
55301--- linux-2.6.32.12/security/min_addr.c 2010-04-04 20:41:50.084493253 -0400 55468--- linux-2.6.32.13/security/min_addr.c 2010-04-04 20:41:50.084493253 -0400
55302+++ linux-2.6.32.12/security/min_addr.c 2010-04-04 20:46:41.732880788 -0400 55469+++ linux-2.6.32.13/security/min_addr.c 2010-05-15 13:21:18.814648703 -0400
55303@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG 55470@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
55304 */ 55471 */
55305 static void update_mmap_min_addr(void) 55472 static void update_mmap_min_addr(void)
@@ -55316,9 +55483,9 @@ diff -urNp linux-2.6.32.12/security/min_addr.c linux-2.6.32.12/security/min_addr
55316 } 55483 }
55317 55484
55318 /* 55485 /*
55319diff -urNp linux-2.6.32.12/sound/aoa/codecs/onyx.c linux-2.6.32.12/sound/aoa/codecs/onyx.c 55486diff -urNp linux-2.6.32.13/sound/aoa/codecs/onyx.c linux-2.6.32.13/sound/aoa/codecs/onyx.c
55320--- linux-2.6.32.12/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400 55487--- linux-2.6.32.13/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400
55321+++ linux-2.6.32.12/sound/aoa/codecs/onyx.c 2010-04-04 20:46:41.732880788 -0400 55488+++ linux-2.6.32.13/sound/aoa/codecs/onyx.c 2010-05-15 13:21:18.814648703 -0400
55322@@ -53,7 +53,7 @@ struct onyx { 55489@@ -53,7 +53,7 @@ struct onyx {
55323 spdif_locked:1, 55490 spdif_locked:1,
55324 analog_locked:1, 55491 analog_locked:1,
@@ -55347,9 +55514,9 @@ diff -urNp linux-2.6.32.12/sound/aoa/codecs/onyx.c linux-2.6.32.12/sound/aoa/cod
55347 onyx->spdif_locked = onyx->analog_locked = 0; 55514 onyx->spdif_locked = onyx->analog_locked = 0;
55348 mutex_unlock(&onyx->mutex); 55515 mutex_unlock(&onyx->mutex);
55349 55516
55350diff -urNp linux-2.6.32.12/sound/core/oss/pcm_oss.c linux-2.6.32.12/sound/core/oss/pcm_oss.c 55517diff -urNp linux-2.6.32.13/sound/core/oss/pcm_oss.c linux-2.6.32.13/sound/core/oss/pcm_oss.c
55351--- linux-2.6.32.12/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400 55518--- linux-2.6.32.13/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400
55352+++ linux-2.6.32.12/sound/core/oss/pcm_oss.c 2010-04-04 20:46:41.732880788 -0400 55519+++ linux-2.6.32.13/sound/core/oss/pcm_oss.c 2010-05-15 13:21:18.814648703 -0400
55353@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct 55520@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
55354 } 55521 }
55355 } 55522 }
@@ -55361,9 +55528,9 @@ diff -urNp linux-2.6.32.12/sound/core/oss/pcm_oss.c linux-2.6.32.12/sound/core/o
55361 #endif /* CONFIG_SND_VERBOSE_PROCFS */ 55528 #endif /* CONFIG_SND_VERBOSE_PROCFS */
55362 55529
55363 /* 55530 /*
55364diff -urNp linux-2.6.32.12/sound/core/seq/seq_lock.h linux-2.6.32.12/sound/core/seq/seq_lock.h 55531diff -urNp linux-2.6.32.13/sound/core/seq/seq_lock.h linux-2.6.32.13/sound/core/seq/seq_lock.h
55365--- linux-2.6.32.12/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400 55532--- linux-2.6.32.13/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400
55366+++ linux-2.6.32.12/sound/core/seq/seq_lock.h 2010-04-04 20:46:41.732880788 -0400 55533+++ linux-2.6.32.13/sound/core/seq/seq_lock.h 2010-05-15 13:21:18.814648703 -0400
55367@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo 55534@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
55368 #else /* SMP || CONFIG_SND_DEBUG */ 55535 #else /* SMP || CONFIG_SND_DEBUG */
55369 55536
@@ -55379,9 +55546,9 @@ diff -urNp linux-2.6.32.12/sound/core/seq/seq_lock.h linux-2.6.32.12/sound/core/
55379 55546
55380 #endif /* SMP || CONFIG_SND_DEBUG */ 55547 #endif /* SMP || CONFIG_SND_DEBUG */
55381 55548
55382diff -urNp linux-2.6.32.12/sound/drivers/mts64.c linux-2.6.32.12/sound/drivers/mts64.c 55549diff -urNp linux-2.6.32.13/sound/drivers/mts64.c linux-2.6.32.13/sound/drivers/mts64.c
55383--- linux-2.6.32.12/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400 55550--- linux-2.6.32.13/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400
55384+++ linux-2.6.32.12/sound/drivers/mts64.c 2010-04-04 20:46:41.732880788 -0400 55551+++ linux-2.6.32.13/sound/drivers/mts64.c 2010-05-15 13:21:18.814648703 -0400
55385@@ -65,7 +65,7 @@ struct mts64 { 55552@@ -65,7 +65,7 @@ struct mts64 {
55386 struct pardevice *pardev; 55553 struct pardevice *pardev;
55387 int pardev_claimed; 55554 int pardev_claimed;
@@ -55430,9 +55597,9 @@ diff -urNp linux-2.6.32.12/sound/drivers/mts64.c linux-2.6.32.12/sound/drivers/m
55430 55597
55431 return 0; 55598 return 0;
55432 } 55599 }
55433diff -urNp linux-2.6.32.12/sound/drivers/portman2x4.c linux-2.6.32.12/sound/drivers/portman2x4.c 55600diff -urNp linux-2.6.32.13/sound/drivers/portman2x4.c linux-2.6.32.13/sound/drivers/portman2x4.c
55434--- linux-2.6.32.12/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400 55601--- linux-2.6.32.13/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400
55435+++ linux-2.6.32.12/sound/drivers/portman2x4.c 2010-04-04 20:46:41.732880788 -0400 55602+++ linux-2.6.32.13/sound/drivers/portman2x4.c 2010-05-15 13:21:18.818605087 -0400
55436@@ -83,7 +83,7 @@ struct portman { 55603@@ -83,7 +83,7 @@ struct portman {
55437 struct pardevice *pardev; 55604 struct pardevice *pardev;
55438 int pardev_claimed; 55605 int pardev_claimed;
@@ -55442,9 +55609,9 @@ diff -urNp linux-2.6.32.12/sound/drivers/portman2x4.c linux-2.6.32.12/sound/driv
55442 int mode[PORTMAN_NUM_INPUT_PORTS]; 55609 int mode[PORTMAN_NUM_INPUT_PORTS];
55443 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; 55610 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
55444 }; 55611 };
55445diff -urNp linux-2.6.32.12/sound/oss/sb_audio.c linux-2.6.32.12/sound/oss/sb_audio.c 55612diff -urNp linux-2.6.32.13/sound/oss/sb_audio.c linux-2.6.32.13/sound/oss/sb_audio.c
55446--- linux-2.6.32.12/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400 55613--- linux-2.6.32.13/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400
55447+++ linux-2.6.32.12/sound/oss/sb_audio.c 2010-04-04 20:46:41.732880788 -0400 55614+++ linux-2.6.32.13/sound/oss/sb_audio.c 2010-05-15 13:21:18.853427293 -0400
55448@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, 55615@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
55449 buf16 = (signed short *)(localbuf + localoffs); 55616 buf16 = (signed short *)(localbuf + localoffs);
55450 while (c) 55617 while (c)
@@ -55454,9 +55621,9 @@ diff -urNp linux-2.6.32.12/sound/oss/sb_audio.c linux-2.6.32.12/sound/oss/sb_aud
55454 if (copy_from_user(lbuf8, 55621 if (copy_from_user(lbuf8,
55455 userbuf+useroffs + p, 55622 userbuf+useroffs + p,
55456 locallen)) 55623 locallen))
55457diff -urNp linux-2.6.32.12/sound/pci/ac97/ac97_codec.c linux-2.6.32.12/sound/pci/ac97/ac97_codec.c 55624diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_codec.c linux-2.6.32.13/sound/pci/ac97/ac97_codec.c
55458--- linux-2.6.32.12/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400 55625--- linux-2.6.32.13/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400
55459+++ linux-2.6.32.12/sound/pci/ac97/ac97_codec.c 2010-04-04 20:46:41.732880788 -0400 55626+++ linux-2.6.32.13/sound/pci/ac97/ac97_codec.c 2010-05-15 13:21:18.897182507 -0400
55460@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc 55627@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
55461 } 55628 }
55462 55629
@@ -55466,9 +55633,9 @@ diff -urNp linux-2.6.32.12/sound/pci/ac97/ac97_codec.c linux-2.6.32.12/sound/pci
55466 55633
55467 #ifdef CONFIG_SND_AC97_POWER_SAVE 55634 #ifdef CONFIG_SND_AC97_POWER_SAVE
55468 static void do_update_power(struct work_struct *work) 55635 static void do_update_power(struct work_struct *work)
55469diff -urNp linux-2.6.32.12/sound/pci/ac97/ac97_patch.c linux-2.6.32.12/sound/pci/ac97/ac97_patch.c 55636diff -urNp linux-2.6.32.13/sound/pci/ac97/ac97_patch.c linux-2.6.32.13/sound/pci/ac97/ac97_patch.c
55470--- linux-2.6.32.12/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400 55637--- linux-2.6.32.13/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400
55471+++ linux-2.6.32.12/sound/pci/ac97/ac97_patch.c 2010-04-04 20:46:41.732880788 -0400 55638+++ linux-2.6.32.13/sound/pci/ac97/ac97_patch.c 2010-05-15 13:21:18.938590352 -0400
55472@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd 55639@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
55473 return 0; 55640 return 0;
55474 } 55641 }
@@ -55775,9 +55942,9 @@ diff -urNp linux-2.6.32.12/sound/pci/ac97/ac97_patch.c linux-2.6.32.12/sound/pci
55775 .build_specific = patch_ucb1400_specific, 55942 .build_specific = patch_ucb1400_specific,
55776 }; 55943 };
55777 55944
55778diff -urNp linux-2.6.32.12/sound/pci/ens1370.c linux-2.6.32.12/sound/pci/ens1370.c 55945diff -urNp linux-2.6.32.13/sound/pci/ens1370.c linux-2.6.32.13/sound/pci/ens1370.c
55779--- linux-2.6.32.12/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400 55946--- linux-2.6.32.13/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400
55780+++ linux-2.6.32.12/sound/pci/ens1370.c 2010-04-04 20:46:41.732880788 -0400 55947+++ linux-2.6.32.13/sound/pci/ens1370.c 2010-05-15 13:21:18.938590352 -0400
55781@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci 55948@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
55782 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ 55949 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
55783 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ 55950 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
@@ -55787,9 +55954,9 @@ diff -urNp linux-2.6.32.12/sound/pci/ens1370.c linux-2.6.32.12/sound/pci/ens1370
55787 }; 55954 };
55788 55955
55789 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); 55956 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
55790diff -urNp linux-2.6.32.12/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.12/sound/pci/hda/patch_intelhdmi.c 55957diff -urNp linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c
55791--- linux-2.6.32.12/sound/pci/hda/patch_intelhdmi.c 2010-03-15 11:52:04.000000000 -0400 55958--- linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c 2010-03-15 11:52:04.000000000 -0400
55792+++ linux-2.6.32.12/sound/pci/hda/patch_intelhdmi.c 2010-04-29 17:46:37.441762570 -0400 55959+++ linux-2.6.32.13/sound/pci/hda/patch_intelhdmi.c 2010-05-15 13:21:18.938590352 -0400
55793@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str 55960@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
55794 cp_ready); 55961 cp_ready);
55795 55962
@@ -55805,9 +55972,9 @@ diff -urNp linux-2.6.32.12/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.12/sound
55805 } 55972 }
55806 55973
55807 55974
55808diff -urNp linux-2.6.32.12/sound/pci/intel8x0.c linux-2.6.32.12/sound/pci/intel8x0.c 55975diff -urNp linux-2.6.32.13/sound/pci/intel8x0.c linux-2.6.32.13/sound/pci/intel8x0.c
55809--- linux-2.6.32.12/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400 55976--- linux-2.6.32.13/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400
55810+++ linux-2.6.32.12/sound/pci/intel8x0.c 2010-04-04 20:46:41.732880788 -0400 55977+++ linux-2.6.32.13/sound/pci/intel8x0.c 2010-05-15 13:21:18.938590352 -0400
55811@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 55978@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
55812 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 55979 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
55813 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ 55980 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
@@ -55826,9 +55993,9 @@ diff -urNp linux-2.6.32.12/sound/pci/intel8x0.c linux-2.6.32.12/sound/pci/intel8
55826 }; 55993 };
55827 55994
55828 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, 55995 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
55829diff -urNp linux-2.6.32.12/sound/pci/intel8x0m.c linux-2.6.32.12/sound/pci/intel8x0m.c 55996diff -urNp linux-2.6.32.13/sound/pci/intel8x0m.c linux-2.6.32.13/sound/pci/intel8x0m.c
55830--- linux-2.6.32.12/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400 55997--- linux-2.6.32.13/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400
55831+++ linux-2.6.32.12/sound/pci/intel8x0m.c 2010-04-04 20:46:41.737788480 -0400 55998+++ linux-2.6.32.13/sound/pci/intel8x0m.c 2010-05-15 13:21:18.997275588 -0400
55832@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 55999@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
55833 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 56000 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
55834 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ 56001 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
@@ -55847,9 +56014,9 @@ diff -urNp linux-2.6.32.12/sound/pci/intel8x0m.c linux-2.6.32.12/sound/pci/intel
55847 }; 56014 };
55848 56015
55849 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, 56016 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
55850diff -urNp linux-2.6.32.12/usr/gen_init_cpio.c linux-2.6.32.12/usr/gen_init_cpio.c 56017diff -urNp linux-2.6.32.13/usr/gen_init_cpio.c linux-2.6.32.13/usr/gen_init_cpio.c
55851--- linux-2.6.32.12/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400 56018--- linux-2.6.32.13/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400
55852+++ linux-2.6.32.12/usr/gen_init_cpio.c 2010-04-04 20:46:41.737788480 -0400 56019+++ linux-2.6.32.13/usr/gen_init_cpio.c 2010-05-15 13:21:18.997275588 -0400
55853@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, 56020@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
55854 int retval; 56021 int retval;
55855 int rc = -1; 56022 int rc = -1;
@@ -55872,9 +56039,9 @@ diff -urNp linux-2.6.32.12/usr/gen_init_cpio.c linux-2.6.32.12/usr/gen_init_cpio
55872 } else 56039 } else
55873 break; 56040 break;
55874 } 56041 }
55875diff -urNp linux-2.6.32.12/virt/kvm/kvm_main.c linux-2.6.32.12/virt/kvm/kvm_main.c 56042diff -urNp linux-2.6.32.13/virt/kvm/kvm_main.c linux-2.6.32.13/virt/kvm/kvm_main.c
55876--- linux-2.6.32.12/virt/kvm/kvm_main.c 2010-04-29 17:49:38.869035092 -0400 56043--- linux-2.6.32.13/virt/kvm/kvm_main.c 2010-04-29 17:49:38.869035092 -0400
55877+++ linux-2.6.32.12/virt/kvm/kvm_main.c 2010-04-29 17:49:58.805045845 -0400 56044+++ linux-2.6.32.13/virt/kvm/kvm_main.c 2010-05-15 13:21:19.058665704 -0400
55878@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode 56045@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode
55879 return 0; 56046 return 0;
55880 } 56047 }
© 2015 Mike Crute