aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-08-12 16:09:59 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-08-12 16:09:59 +0000
commit2b416d208af3177894e10e4753ab9300a5e9d80d (patch)
tree2a4d24cf5547365a32a930bd273b2f1a9340b1dc
parent966805d1e107151c1479109c7a36f863a706fdbe (diff)
downloadalpine_aports-2b416d208af3177894e10e4753ab9300a5e9d80d.tar.bz2
alpine_aports-2b416d208af3177894e10e4753ab9300a5e9d80d.tar.xz
alpine_aports-2b416d208af3177894e10e4753ab9300a5e9d80d.zip
main/linux-grsec: upgrade to grsecurity-2.2.0-2.6.32.18-201008112233
Diffstat
-rw-r--r--main/linux-grsec/APKBUILD12
-rw-r--r--main/linux-grsec/grsecurity-2.2.0-2.6.32.18-201008112233.patch (renamed from main/linux-grsec/grsecurity-2.2.0-2.6.32.16-201007162107.patch)7106
-rw-r--r--main/linux-grsec/kernelconfig.x867
3 files changed, 3595 insertions, 3530 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index d3fca9fad6..d486ff5793 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.16 5pkgver=2.6.32.18
6_kernver=2.6.32 6_kernver=2.6.32
7pkgrel=4 7pkgrel=0
8pkgdesc="Linux kernel with grsecurity" 8pkgdesc="Linux kernel with grsecurity"
9url=http://grsecurity.net 9url=http://grsecurity.net
10depends="mkinitfs linux-firmware" 10depends="mkinitfs linux-firmware"
@@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
14install= 14install=
15source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 15source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
16 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 16 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
17 grsecurity-2.2.0-2.6.32.16-201007162107.patch 17 grsecurity-2.2.0-2.6.32.18-201008112233.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
@@ -148,8 +148,8 @@ firmware() {
148} 148}
149 149
150md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 150md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
151744890f9651962ceae7663d44b19df65 patch-2.6.32.16.bz2 151dc2f0fab4d67f96e593708ba9158052b patch-2.6.32.18.bz2
152feb09c4053225d0d13272af504075636 grsecurity-2.2.0-2.6.32.16-201007162107.patch 1529a9c5721223e5ebe089dddc14a29935d grsecurity-2.2.0-2.6.32.18-201008112233.patch
1531d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch 1531d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch
154437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch 154437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch
155151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch 155151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
@@ -173,4 +173,4 @@ ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch
173b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch 173b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch
174a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch 174a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch
175bf14850a0036d14bc6177adbdec23a17 hv-grsec.patch 175bf14850a0036d14bc6177adbdec23a17 hv-grsec.patch
176758c074dc6979167f3113cbf101922ee kernelconfig.x86" 176ca9c63def600e77ca3cb7e822c239083 kernelconfig.x86"
diff --git a/main/linux-grsec/grsecurity-2.2.0-2.6.32.16-201007162107.patch b/main/linux-grsec/grsecurity-2.2.0-2.6.32.18-201008112233.patch
index e74253e175..7310c00b7b 100644
--- a/main/linux-grsec/grsecurity-2.2.0-2.6.32.16-201007162107.patch
+++ b/main/linux-grsec/grsecurity-2.2.0-2.6.32.18-201008112233.patch
@@ -1,6 +1,6 @@
1diff -urNp linux-2.6.32.16/arch/alpha/include/asm/elf.h linux-2.6.32.16/arch/alpha/include/asm/elf.h 1diff -urNp linux-2.6.32.18/arch/alpha/include/asm/elf.h linux-2.6.32.18/arch/alpha/include/asm/elf.h
2--- linux-2.6.32.16/arch/alpha/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 2--- linux-2.6.32.18/arch/alpha/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400
3+++ linux-2.6.32.16/arch/alpha/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 3+++ linux-2.6.32.18/arch/alpha/include/asm/elf.h 2010-08-11 18:57:28.000000000 -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.16/arch/alpha/include/asm/elf.h linux-2.6.32.16/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.16/arch/alpha/include/asm/pgtable.h linux-2.6.32.16/arch/alpha/include/asm/pgtable.h 18diff -urNp linux-2.6.32.18/arch/alpha/include/asm/pgtable.h linux-2.6.32.18/arch/alpha/include/asm/pgtable.h
19--- linux-2.6.32.16/arch/alpha/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 19--- linux-2.6.32.18/arch/alpha/include/asm/pgtable.h 2010-08-10 13:45:57.000000000 -0400
20+++ linux-2.6.32.16/arch/alpha/include/asm/pgtable.h 2010-07-09 14:50:34.000000000 -0400 20+++ linux-2.6.32.18/arch/alpha/include/asm/pgtable.h 2010-08-11 18:57:28.000000000 -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.16/arch/alpha/include/asm/pgtable.h linux-2.6.32.16/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.16/arch/alpha/kernel/module.c linux-2.6.32.16/arch/alpha/kernel/module.c 39diff -urNp linux-2.6.32.18/arch/alpha/kernel/module.c linux-2.6.32.18/arch/alpha/kernel/module.c
40--- linux-2.6.32.16/arch/alpha/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 40--- linux-2.6.32.18/arch/alpha/kernel/module.c 2010-08-10 13:45:57.000000000 -0400
41+++ linux-2.6.32.16/arch/alpha/kernel/module.c 2010-07-09 14:50:34.000000000 -0400 41+++ linux-2.6.32.18/arch/alpha/kernel/module.c 2010-08-11 18:57:28.000000000 -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.16/arch/alpha/kernel/module.c linux-2.6.32.16/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.16/arch/alpha/kernel/osf_sys.c linux-2.6.32.16/arch/alpha/kernel/osf_sys.c 51diff -urNp linux-2.6.32.18/arch/alpha/kernel/osf_sys.c linux-2.6.32.18/arch/alpha/kernel/osf_sys.c
52--- linux-2.6.32.16/arch/alpha/kernel/osf_sys.c 2010-07-05 14:14:00.000000000 -0400 52--- linux-2.6.32.18/arch/alpha/kernel/osf_sys.c 2010-08-10 13:45:57.000000000 -0400
53+++ linux-2.6.32.16/arch/alpha/kernel/osf_sys.c 2010-07-09 14:50:34.000000000 -0400 53+++ linux-2.6.32.18/arch/alpha/kernel/osf_sys.c 2010-08-11 18:57:28.000000000 -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.16/arch/alpha/kernel/osf_sys.c linux-2.6.32.16/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.16/arch/alpha/mm/fault.c linux-2.6.32.16/arch/alpha/mm/fault.c 76diff -urNp linux-2.6.32.18/arch/alpha/mm/fault.c linux-2.6.32.18/arch/alpha/mm/fault.c
77--- linux-2.6.32.16/arch/alpha/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 77--- linux-2.6.32.18/arch/alpha/mm/fault.c 2010-08-10 13:45:57.000000000 -0400
78+++ linux-2.6.32.16/arch/alpha/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 78+++ linux-2.6.32.18/arch/alpha/mm/fault.c 2010-08-11 18:57:28.000000000 -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.16/arch/alpha/mm/fault.c linux-2.6.32.16/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.16/arch/arm/include/asm/elf.h linux-2.6.32.16/arch/arm/include/asm/elf.h 235diff -urNp linux-2.6.32.18/arch/arm/include/asm/elf.h linux-2.6.32.18/arch/arm/include/asm/elf.h
236--- linux-2.6.32.16/arch/arm/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 236--- linux-2.6.32.18/arch/arm/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400
237+++ linux-2.6.32.16/arch/arm/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 237+++ linux-2.6.32.18/arch/arm/include/asm/elf.h 2010-08-11 18:57:28.000000000 -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.16/arch/arm/include/asm/elf.h linux-2.6.32.16/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.16/arch/arm/include/asm/kmap_types.h linux-2.6.32.16/arch/arm/include/asm/kmap_types.h 254diff -urNp linux-2.6.32.18/arch/arm/include/asm/kmap_types.h linux-2.6.32.18/arch/arm/include/asm/kmap_types.h
255--- linux-2.6.32.16/arch/arm/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 255--- linux-2.6.32.18/arch/arm/include/asm/kmap_types.h 2010-08-10 13:45:57.000000000 -0400
256+++ linux-2.6.32.16/arch/arm/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -0400 256+++ linux-2.6.32.18/arch/arm/include/asm/kmap_types.h 2010-08-11 18:57:28.000000000 -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.16/arch/arm/include/asm/kmap_types.h linux-2.6.32.16/arc
262 KM_TYPE_NR 262 KM_TYPE_NR
263 }; 263 };
264 264
265diff -urNp linux-2.6.32.16/arch/arm/include/asm/uaccess.h linux-2.6.32.16/arch/arm/include/asm/uaccess.h 265diff -urNp linux-2.6.32.18/arch/arm/include/asm/uaccess.h linux-2.6.32.18/arch/arm/include/asm/uaccess.h
266--- linux-2.6.32.16/arch/arm/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 266--- linux-2.6.32.18/arch/arm/include/asm/uaccess.h 2010-08-10 13:45:57.000000000 -0400
267+++ linux-2.6.32.16/arch/arm/include/asm/uaccess.h 2010-07-09 14:50:34.000000000 -0400 267+++ linux-2.6.32.18/arch/arm/include/asm/uaccess.h 2010-08-11 18:57:28.000000000 -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.16/arch/arm/include/asm/uaccess.h linux-2.6.32.16/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.16/arch/arm/kernel/kgdb.c linux-2.6.32.16/arch/arm/kernel/kgdb.c 288diff -urNp linux-2.6.32.18/arch/arm/kernel/kgdb.c linux-2.6.32.18/arch/arm/kernel/kgdb.c
289--- linux-2.6.32.16/arch/arm/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 289--- linux-2.6.32.18/arch/arm/kernel/kgdb.c 2010-08-10 13:45:57.000000000 -0400
290+++ linux-2.6.32.16/arch/arm/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -0400 290+++ linux-2.6.32.18/arch/arm/kernel/kgdb.c 2010-08-11 18:57:28.000000000 -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.16/arch/arm/kernel/kgdb.c linux-2.6.32.16/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.16/arch/arm/mach-at91/pm.c linux-2.6.32.16/arch/arm/mach-at91/pm.c 300diff -urNp linux-2.6.32.18/arch/arm/mach-at91/pm.c linux-2.6.32.18/arch/arm/mach-at91/pm.c
301--- linux-2.6.32.16/arch/arm/mach-at91/pm.c 2010-07-05 14:14:00.000000000 -0400 301--- linux-2.6.32.18/arch/arm/mach-at91/pm.c 2010-08-10 13:45:57.000000000 -0400
302+++ linux-2.6.32.16/arch/arm/mach-at91/pm.c 2010-07-09 14:50:34.000000000 -0400 302+++ linux-2.6.32.18/arch/arm/mach-at91/pm.c 2010-08-11 18:57:28.000000000 -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.16/arch/arm/mach-at91/pm.c linux-2.6.32.16/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.16/arch/arm/mach-omap1/pm.c linux-2.6.32.16/arch/arm/mach-omap1/pm.c 312diff -urNp linux-2.6.32.18/arch/arm/mach-omap1/pm.c linux-2.6.32.18/arch/arm/mach-omap1/pm.c
313--- linux-2.6.32.16/arch/arm/mach-omap1/pm.c 2010-07-05 14:14:00.000000000 -0400 313--- linux-2.6.32.18/arch/arm/mach-omap1/pm.c 2010-08-10 13:45:57.000000000 -0400
314+++ linux-2.6.32.16/arch/arm/mach-omap1/pm.c 2010-07-09 14:50:34.000000000 -0400 314+++ linux-2.6.32.18/arch/arm/mach-omap1/pm.c 2010-08-11 18:57:28.000000000 -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.16/arch/arm/mach-omap1/pm.c linux-2.6.32.16/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.16/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c 324diff -urNp linux-2.6.32.18/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.18/arch/arm/mach-omap2/pm24xx.c
325--- linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c 2010-07-05 14:14:00.000000000 -0400 325--- linux-2.6.32.18/arch/arm/mach-omap2/pm24xx.c 2010-08-10 13:45:57.000000000 -0400
326+++ linux-2.6.32.16/arch/arm/mach-omap2/pm24xx.c 2010-07-09 14:50:34.000000000 -0400 326+++ linux-2.6.32.18/arch/arm/mach-omap2/pm24xx.c 2010-08-11 18:57:28.000000000 -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.16/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.16/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.16/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c 336diff -urNp linux-2.6.32.18/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.18/arch/arm/mach-omap2/pm34xx.c
337--- linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c 2010-07-05 14:14:00.000000000 -0400 337--- linux-2.6.32.18/arch/arm/mach-omap2/pm34xx.c 2010-08-10 13:45:57.000000000 -0400
338+++ linux-2.6.32.16/arch/arm/mach-omap2/pm34xx.c 2010-07-09 14:50:34.000000000 -0400 338+++ linux-2.6.32.18/arch/arm/mach-omap2/pm34xx.c 2010-08-11 18:57:28.000000000 -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.16/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.16/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.16/arch/arm/mach-pnx4008/pm.c linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c 348diff -urNp linux-2.6.32.18/arch/arm/mach-pnx4008/pm.c linux-2.6.32.18/arch/arm/mach-pnx4008/pm.c
349--- linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c 2010-07-05 14:14:00.000000000 -0400 349--- linux-2.6.32.18/arch/arm/mach-pnx4008/pm.c 2010-08-10 13:45:57.000000000 -0400
350+++ linux-2.6.32.16/arch/arm/mach-pnx4008/pm.c 2010-07-09 14:50:34.000000000 -0400 350+++ linux-2.6.32.18/arch/arm/mach-pnx4008/pm.c 2010-08-11 18:57:28.000000000 -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.16/arch/arm/mach-pnx4008/pm.c linux-2.6.32.16/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.16/arch/arm/mach-pxa/pm.c linux-2.6.32.16/arch/arm/mach-pxa/pm.c 360diff -urNp linux-2.6.32.18/arch/arm/mach-pxa/pm.c linux-2.6.32.18/arch/arm/mach-pxa/pm.c
361--- linux-2.6.32.16/arch/arm/mach-pxa/pm.c 2010-07-05 14:14:00.000000000 -0400 361--- linux-2.6.32.18/arch/arm/mach-pxa/pm.c 2010-08-10 13:45:57.000000000 -0400
362+++ linux-2.6.32.16/arch/arm/mach-pxa/pm.c 2010-07-09 14:50:34.000000000 -0400 362+++ linux-2.6.32.18/arch/arm/mach-pxa/pm.c 2010-08-11 18:57:28.000000000 -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.16/arch/arm/mach-pxa/pm.c linux-2.6.32.16/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.16/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.16/arch/arm/mach-pxa/sharpsl_pm.c 372diff -urNp linux-2.6.32.18/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.18/arch/arm/mach-pxa/sharpsl_pm.c
373--- linux-2.6.32.16/arch/arm/mach-pxa/sharpsl_pm.c 2010-07-05 14:14:00.000000000 -0400 373--- linux-2.6.32.18/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-10 13:45:57.000000000 -0400
374+++ linux-2.6.32.16/arch/arm/mach-pxa/sharpsl_pm.c 2010-07-09 14:50:34.000000000 -0400 374+++ linux-2.6.32.18/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-11 18:57:28.000000000 -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.16/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.16/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.16/arch/arm/mach-sa1100/pm.c linux-2.6.32.16/arch/arm/mach-sa1100/pm.c 384diff -urNp linux-2.6.32.18/arch/arm/mach-sa1100/pm.c linux-2.6.32.18/arch/arm/mach-sa1100/pm.c
385--- linux-2.6.32.16/arch/arm/mach-sa1100/pm.c 2010-07-05 14:14:00.000000000 -0400 385--- linux-2.6.32.18/arch/arm/mach-sa1100/pm.c 2010-08-10 13:45:57.000000000 -0400
386+++ linux-2.6.32.16/arch/arm/mach-sa1100/pm.c 2010-07-09 14:50:34.000000000 -0400 386+++ linux-2.6.32.18/arch/arm/mach-sa1100/pm.c 2010-08-11 18:57:28.000000000 -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.16/arch/arm/mach-sa1100/pm.c linux-2.6.32.16/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.16/arch/arm/mm/fault.c linux-2.6.32.16/arch/arm/mm/fault.c 396diff -urNp linux-2.6.32.18/arch/arm/mm/fault.c linux-2.6.32.18/arch/arm/mm/fault.c
397--- linux-2.6.32.16/arch/arm/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 397--- linux-2.6.32.18/arch/arm/mm/fault.c 2010-08-10 13:45:57.000000000 -0400
398+++ linux-2.6.32.16/arch/arm/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 398+++ linux-2.6.32.18/arch/arm/mm/fault.c 2010-08-11 18:57:28.000000000 -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.16/arch/arm/mm/fault.c linux-2.6.32.16/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.16/arch/arm/mm/mmap.c linux-2.6.32.16/arch/arm/mm/mmap.c 447diff -urNp linux-2.6.32.18/arch/arm/mm/mmap.c linux-2.6.32.18/arch/arm/mm/mmap.c
448--- linux-2.6.32.16/arch/arm/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 448--- linux-2.6.32.18/arch/arm/mm/mmap.c 2010-08-10 13:45:57.000000000 -0400
449+++ linux-2.6.32.16/arch/arm/mm/mmap.c 2010-07-09 14:50:34.000000000 -0400 449+++ linux-2.6.32.18/arch/arm/mm/mmap.c 2010-08-11 18:57:28.000000000 -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.16/arch/arm/mm/mmap.c linux-2.6.32.16/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.16/arch/arm/plat-s3c/pm.c linux-2.6.32.16/arch/arm/plat-s3c/pm.c 486diff -urNp linux-2.6.32.18/arch/arm/plat-s3c/pm.c linux-2.6.32.18/arch/arm/plat-s3c/pm.c
487--- linux-2.6.32.16/arch/arm/plat-s3c/pm.c 2010-07-05 14:14:00.000000000 -0400 487--- linux-2.6.32.18/arch/arm/plat-s3c/pm.c 2010-08-10 13:45:57.000000000 -0400
488+++ linux-2.6.32.16/arch/arm/plat-s3c/pm.c 2010-07-09 14:50:34.000000000 -0400 488+++ linux-2.6.32.18/arch/arm/plat-s3c/pm.c 2010-08-11 18:57:28.000000000 -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.16/arch/arm/plat-s3c/pm.c linux-2.6.32.16/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.16/arch/avr32/include/asm/elf.h linux-2.6.32.16/arch/avr32/include/asm/elf.h 498diff -urNp linux-2.6.32.18/arch/avr32/include/asm/elf.h linux-2.6.32.18/arch/avr32/include/asm/elf.h
499--- linux-2.6.32.16/arch/avr32/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 499--- linux-2.6.32.18/arch/avr32/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400
500+++ linux-2.6.32.16/arch/avr32/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 500+++ linux-2.6.32.18/arch/avr32/include/asm/elf.h 2010-08-11 18:57:28.000000000 -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.16/arch/avr32/include/asm/elf.h linux-2.6.32.16/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.16/arch/avr32/include/asm/kmap_types.h linux-2.6.32.16/arch/avr32/include/asm/kmap_types.h 517diff -urNp linux-2.6.32.18/arch/avr32/include/asm/kmap_types.h linux-2.6.32.18/arch/avr32/include/asm/kmap_types.h
518--- linux-2.6.32.16/arch/avr32/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 518--- linux-2.6.32.18/arch/avr32/include/asm/kmap_types.h 2010-08-10 13:45:57.000000000 -0400
519+++ linux-2.6.32.16/arch/avr32/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -0400 519+++ linux-2.6.32.18/arch/avr32/include/asm/kmap_types.h 2010-08-11 18:57:28.000000000 -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.16/arch/avr32/include/asm/kmap_types.h linux-2.6.32.16/a
527 }; 527 };
528 528
529 #undef D 529 #undef D
530diff -urNp linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c 530diff -urNp linux-2.6.32.18/arch/avr32/mach-at32ap/pm.c linux-2.6.32.18/arch/avr32/mach-at32ap/pm.c
531--- linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c 2010-07-05 14:14:00.000000000 -0400 531--- linux-2.6.32.18/arch/avr32/mach-at32ap/pm.c 2010-08-10 13:45:57.000000000 -0400
532+++ linux-2.6.32.16/arch/avr32/mach-at32ap/pm.c 2010-07-09 14:50:34.000000000 -0400 532+++ linux-2.6.32.18/arch/avr32/mach-at32ap/pm.c 2010-08-11 18:57:28.000000000 -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.16/arch/avr32/mach-at32ap/pm.c linux-2.6.32.16/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.16/arch/avr32/mm/fault.c linux-2.6.32.16/arch/avr32/mm/fault.c 542diff -urNp linux-2.6.32.18/arch/avr32/mm/fault.c linux-2.6.32.18/arch/avr32/mm/fault.c
543--- linux-2.6.32.16/arch/avr32/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 543--- linux-2.6.32.18/arch/avr32/mm/fault.c 2010-08-10 13:45:57.000000000 -0400
544+++ linux-2.6.32.16/arch/avr32/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 544+++ linux-2.6.32.18/arch/avr32/mm/fault.c 2010-08-11 18:57:28.000000000 -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.16/arch/avr32/mm/fault.c linux-2.6.32.16/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.16/arch/blackfin/kernel/kgdb.c linux-2.6.32.16/arch/blackfin/kernel/kgdb.c 586diff -urNp linux-2.6.32.18/arch/blackfin/kernel/kgdb.c linux-2.6.32.18/arch/blackfin/kernel/kgdb.c
587--- linux-2.6.32.16/arch/blackfin/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 587--- linux-2.6.32.18/arch/blackfin/kernel/kgdb.c 2010-08-10 13:45:57.000000000 -0400
588+++ linux-2.6.32.16/arch/blackfin/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -0400 588+++ linux-2.6.32.18/arch/blackfin/kernel/kgdb.c 2010-08-11 18:57:28.000000000 -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.16/arch/blackfin/kernel/kgdb.c linux-2.6.32.16/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.16/arch/blackfin/mach-common/pm.c linux-2.6.32.16/arch/blackfin/mach-common/pm.c 598diff -urNp linux-2.6.32.18/arch/blackfin/mach-common/pm.c linux-2.6.32.18/arch/blackfin/mach-common/pm.c
599--- linux-2.6.32.16/arch/blackfin/mach-common/pm.c 2010-07-05 14:14:00.000000000 -0400 599--- linux-2.6.32.18/arch/blackfin/mach-common/pm.c 2010-08-10 13:45:57.000000000 -0400
600+++ linux-2.6.32.16/arch/blackfin/mach-common/pm.c 2010-07-09 14:50:34.000000000 -0400 600+++ linux-2.6.32.18/arch/blackfin/mach-common/pm.c 2010-08-11 18:57:28.000000000 -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.16/arch/blackfin/mach-common/pm.c linux-2.6.32.16/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.16/arch/frv/include/asm/kmap_types.h linux-2.6.32.16/arch/frv/include/asm/kmap_types.h 610diff -urNp linux-2.6.32.18/arch/frv/include/asm/kmap_types.h linux-2.6.32.18/arch/frv/include/asm/kmap_types.h
611--- linux-2.6.32.16/arch/frv/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 611--- linux-2.6.32.18/arch/frv/include/asm/kmap_types.h 2010-08-10 13:45:57.000000000 -0400
612+++ linux-2.6.32.16/arch/frv/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -0400 612+++ linux-2.6.32.18/arch/frv/include/asm/kmap_types.h 2010-08-11 18:57:28.000000000 -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.16/arch/frv/include/asm/kmap_types.h linux-2.6.32.16/arc
618 KM_TYPE_NR 618 KM_TYPE_NR
619 }; 619 };
620 620
621diff -urNp linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c 621diff -urNp linux-2.6.32.18/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.18/arch/ia64/hp/common/hwsw_iommu.c
622--- linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c 2010-07-05 14:14:00.000000000 -0400 622--- linux-2.6.32.18/arch/ia64/hp/common/hwsw_iommu.c 2010-08-10 13:45:57.000000000 -0400
623+++ linux-2.6.32.16/arch/ia64/hp/common/hwsw_iommu.c 2010-07-09 14:50:34.000000000 -0400 623+++ linux-2.6.32.18/arch/ia64/hp/common/hwsw_iommu.c 2010-08-11 18:57:28.000000000 -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.16/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.16/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.16/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.16/arch/ia64/hp/common/sba_iommu.c 642diff -urNp linux-2.6.32.18/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.18/arch/ia64/hp/common/sba_iommu.c
643--- linux-2.6.32.16/arch/ia64/hp/common/sba_iommu.c 2010-07-05 14:14:00.000000000 -0400 643--- linux-2.6.32.18/arch/ia64/hp/common/sba_iommu.c 2010-08-10 13:45:57.000000000 -0400
644+++ linux-2.6.32.16/arch/ia64/hp/common/sba_iommu.c 2010-07-09 14:50:34.000000000 -0400 644+++ linux-2.6.32.18/arch/ia64/hp/common/sba_iommu.c 2010-08-11 18:57:28.000000000 -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.16/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.16/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.16/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c 663diff -urNp linux-2.6.32.18/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.18/arch/ia64/ia32/binfmt_elf32.c
664--- linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c 2010-07-05 14:14:00.000000000 -0400 664--- linux-2.6.32.18/arch/ia64/ia32/binfmt_elf32.c 2010-08-10 13:45:57.000000000 -0400
665+++ linux-2.6.32.16/arch/ia64/ia32/binfmt_elf32.c 2010-07-09 14:50:34.000000000 -0400 665+++ linux-2.6.32.18/arch/ia64/ia32/binfmt_elf32.c 2010-08-11 18:57:28.000000000 -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.16/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.16/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.16/arch/ia64/ia32/ia32priv.h linux-2.6.32.16/arch/ia64/ia32/ia32priv.h 680diff -urNp linux-2.6.32.18/arch/ia64/ia32/ia32priv.h linux-2.6.32.18/arch/ia64/ia32/ia32priv.h
681--- linux-2.6.32.16/arch/ia64/ia32/ia32priv.h 2010-07-05 14:14:00.000000000 -0400 681--- linux-2.6.32.18/arch/ia64/ia32/ia32priv.h 2010-08-10 13:45:57.000000000 -0400
682+++ linux-2.6.32.16/arch/ia64/ia32/ia32priv.h 2010-07-09 14:50:34.000000000 -0400 682+++ linux-2.6.32.18/arch/ia64/ia32/ia32priv.h 2010-08-11 18:57:28.000000000 -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.16/arch/ia64/ia32/ia32priv.h linux-2.6.32.16/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.16/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.16/arch/ia64/include/asm/dma-mapping.h 699diff -urNp linux-2.6.32.18/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.18/arch/ia64/include/asm/dma-mapping.h
700--- linux-2.6.32.16/arch/ia64/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 700--- linux-2.6.32.18/arch/ia64/include/asm/dma-mapping.h 2010-08-10 13:45:57.000000000 -0400
701+++ linux-2.6.32.16/arch/ia64/include/asm/dma-mapping.h 2010-07-09 14:50:34.000000000 -0400 701+++ linux-2.6.32.18/arch/ia64/include/asm/dma-mapping.h 2010-08-11 18:57:28.000000000 -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.16/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.16/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.16/arch/ia64/include/asm/elf.h linux-2.6.32.16/arch/ia64/include/asm/elf.h 745diff -urNp linux-2.6.32.18/arch/ia64/include/asm/elf.h linux-2.6.32.18/arch/ia64/include/asm/elf.h
746--- linux-2.6.32.16/arch/ia64/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 746--- linux-2.6.32.18/arch/ia64/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400
747+++ linux-2.6.32.16/arch/ia64/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 747+++ linux-2.6.32.18/arch/ia64/include/asm/elf.h 2010-08-11 18:57:28.000000000 -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.16/arch/ia64/include/asm/elf.h linux-2.6.32.16/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.16/arch/ia64/include/asm/machvec.h linux-2.6.32.16/arch/ia64/include/asm/machvec.h 762diff -urNp linux-2.6.32.18/arch/ia64/include/asm/machvec.h linux-2.6.32.18/arch/ia64/include/asm/machvec.h
763--- linux-2.6.32.16/arch/ia64/include/asm/machvec.h 2010-07-05 14:14:00.000000000 -0400 763--- linux-2.6.32.18/arch/ia64/include/asm/machvec.h 2010-08-10 13:45:57.000000000 -0400
764+++ linux-2.6.32.16/arch/ia64/include/asm/machvec.h 2010-07-09 14:50:34.000000000 -0400 764+++ linux-2.6.32.18/arch/ia64/include/asm/machvec.h 2010-08-11 18:57:28.000000000 -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,18 @@ diff -urNp linux-2.6.32.16/arch/ia64/include/asm/machvec.h linux-2.6.32.16/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.16/arch/ia64/include/asm/pgtable.h linux-2.6.32.16/arch/ia64/include/asm/pgtable.h 783diff -urNp linux-2.6.32.18/arch/ia64/include/asm/pgtable.h linux-2.6.32.18/arch/ia64/include/asm/pgtable.h
784--- linux-2.6.32.16/arch/ia64/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 784--- linux-2.6.32.18/arch/ia64/include/asm/pgtable.h 2010-08-10 13:45:57.000000000 -0400
785+++ linux-2.6.32.16/arch/ia64/include/asm/pgtable.h 2010-07-09 14:50:34.000000000 -0400 785+++ linux-2.6.32.18/arch/ia64/include/asm/pgtable.h 2010-08-11 19:04:55.000000000 -0400
786@@ -12,7 +12,7 @@
787 * David Mosberger-Tang <davidm@hpl.hp.com>
788 */
789
790-
791+#include <linux/const.h>
792 #include <asm/mman.h>
793 #include <asm/page.h>
794 #include <asm/processor.h>
786@@ -143,6 +143,17 @@ 795@@ -143,6 +143,17 @@
787 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) 796 #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) 797 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
@@ -801,9 +810,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/include/asm/pgtable.h linux-2.6.32.16/arch/
801 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) 810 #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) 811 #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) 812 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
804diff -urNp linux-2.6.32.16/arch/ia64/include/asm/uaccess.h linux-2.6.32.16/arch/ia64/include/asm/uaccess.h 813diff -urNp linux-2.6.32.18/arch/ia64/include/asm/uaccess.h linux-2.6.32.18/arch/ia64/include/asm/uaccess.h
805--- linux-2.6.32.16/arch/ia64/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 814--- linux-2.6.32.18/arch/ia64/include/asm/uaccess.h 2010-08-10 13:45:57.000000000 -0400
806+++ linux-2.6.32.16/arch/ia64/include/asm/uaccess.h 2010-07-09 14:50:34.000000000 -0400 815+++ linux-2.6.32.18/arch/ia64/include/asm/uaccess.h 2010-08-11 18:57:28.000000000 -0400
807@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ 816@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
808 const void *__cu_from = (from); \ 817 const void *__cu_from = (from); \
809 long __cu_len = (n); \ 818 long __cu_len = (n); \
@@ -822,9 +831,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/include/asm/uaccess.h linux-2.6.32.16/arch/
822 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ 831 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
823 __cu_len; \ 832 __cu_len; \
824 }) 833 })
825diff -urNp linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c 834diff -urNp linux-2.6.32.18/arch/ia64/kernel/dma-mapping.c linux-2.6.32.18/arch/ia64/kernel/dma-mapping.c
826--- linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c 2010-07-05 14:14:00.000000000 -0400 835--- linux-2.6.32.18/arch/ia64/kernel/dma-mapping.c 2010-08-10 13:45:57.000000000 -0400
827+++ linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c 2010-07-09 14:50:34.000000000 -0400 836+++ linux-2.6.32.18/arch/ia64/kernel/dma-mapping.c 2010-08-11 18:57:28.000000000 -0400
828@@ -3,7 +3,7 @@ 837@@ -3,7 +3,7 @@
829 /* Set this to 1 if there is a HW IOMMU in the system */ 838 /* Set this to 1 if there is a HW IOMMU in the system */
830 int iommu_detected __read_mostly; 839 int iommu_detected __read_mostly;
@@ -843,9 +852,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/kernel/dma-mapping.c linux-2.6.32.16/arch/i
843 { 852 {
844 return dma_ops; 853 return dma_ops;
845 } 854 }
846diff -urNp linux-2.6.32.16/arch/ia64/kernel/module.c linux-2.6.32.16/arch/ia64/kernel/module.c 855diff -urNp linux-2.6.32.18/arch/ia64/kernel/module.c linux-2.6.32.18/arch/ia64/kernel/module.c
847--- linux-2.6.32.16/arch/ia64/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 856--- linux-2.6.32.18/arch/ia64/kernel/module.c 2010-08-10 13:45:57.000000000 -0400
848+++ linux-2.6.32.16/arch/ia64/kernel/module.c 2010-07-09 14:50:34.000000000 -0400 857+++ linux-2.6.32.18/arch/ia64/kernel/module.c 2010-08-11 18:57:28.000000000 -0400
849@@ -315,8 +315,7 @@ module_alloc (unsigned long size) 858@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
850 void 859 void
851 module_free (struct module *mod, void *module_region) 860 module_free (struct module *mod, void *module_region)
@@ -934,9 +943,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/kernel/module.c linux-2.6.32.16/arch/ia64/k
934 mod->arch.gp = gp; 943 mod->arch.gp = gp;
935 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); 944 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
936 } 945 }
937diff -urNp linux-2.6.32.16/arch/ia64/kernel/pci-dma.c linux-2.6.32.16/arch/ia64/kernel/pci-dma.c 946diff -urNp linux-2.6.32.18/arch/ia64/kernel/pci-dma.c linux-2.6.32.18/arch/ia64/kernel/pci-dma.c
938--- linux-2.6.32.16/arch/ia64/kernel/pci-dma.c 2010-07-05 14:14:00.000000000 -0400 947--- linux-2.6.32.18/arch/ia64/kernel/pci-dma.c 2010-08-10 13:45:57.000000000 -0400
939+++ linux-2.6.32.16/arch/ia64/kernel/pci-dma.c 2010-07-09 14:50:44.000000000 -0400 948+++ linux-2.6.32.18/arch/ia64/kernel/pci-dma.c 2010-08-11 18:57:28.000000000 -0400
940@@ -43,7 +43,7 @@ struct device fallback_dev = { 949@@ -43,7 +43,7 @@ struct device fallback_dev = {
941 .dma_mask = &fallback_dev.coherent_dma_mask, 950 .dma_mask = &fallback_dev.coherent_dma_mask,
942 }; 951 };
@@ -988,9 +997,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/kernel/pci-dma.c linux-2.6.32.16/arch/ia64/
988 997
989 /* 998 /*
990 * The order of these functions is important for 999 * The order of these functions is important for
991diff -urNp linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c 1000diff -urNp linux-2.6.32.18/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.18/arch/ia64/kernel/pci-swiotlb.c
992--- linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c 2010-07-05 14:14:00.000000000 -0400 1001--- linux-2.6.32.18/arch/ia64/kernel/pci-swiotlb.c 2010-08-10 13:45:57.000000000 -0400
993+++ linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c 2010-07-09 14:50:34.000000000 -0400 1002+++ linux-2.6.32.18/arch/ia64/kernel/pci-swiotlb.c 2010-08-11 18:57:28.000000000 -0400
994@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent 1003@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
995 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); 1004 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
996 } 1005 }
@@ -1000,9 +1009,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.16/arch/i
1000 .alloc_coherent = ia64_swiotlb_alloc_coherent, 1009 .alloc_coherent = ia64_swiotlb_alloc_coherent,
1001 .free_coherent = swiotlb_free_coherent, 1010 .free_coherent = swiotlb_free_coherent,
1002 .map_page = swiotlb_map_page, 1011 .map_page = swiotlb_map_page,
1003diff -urNp linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c 1012diff -urNp linux-2.6.32.18/arch/ia64/kernel/sys_ia64.c linux-2.6.32.18/arch/ia64/kernel/sys_ia64.c
1004--- linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c 2010-07-05 14:14:00.000000000 -0400 1013--- linux-2.6.32.18/arch/ia64/kernel/sys_ia64.c 2010-08-10 13:45:57.000000000 -0400
1005+++ linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c 2010-07-09 14:50:34.000000000 -0400 1014+++ linux-2.6.32.18/arch/ia64/kernel/sys_ia64.c 2010-08-11 18:57:28.000000000 -0400
1006@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil 1015@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
1007 if (REGION_NUMBER(addr) == RGN_HPAGE) 1016 if (REGION_NUMBER(addr) == RGN_HPAGE)
1008 addr = 0; 1017 addr = 0;
@@ -1029,9 +1038,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/kernel/sys_ia64.c linux-2.6.32.16/arch/ia64
1029 goto full_search; 1038 goto full_search;
1030 } 1039 }
1031 return -ENOMEM; 1040 return -ENOMEM;
1032diff -urNp linux-2.6.32.16/arch/ia64/kernel/topology.c linux-2.6.32.16/arch/ia64/kernel/topology.c 1041diff -urNp linux-2.6.32.18/arch/ia64/kernel/topology.c linux-2.6.32.18/arch/ia64/kernel/topology.c
1033--- linux-2.6.32.16/arch/ia64/kernel/topology.c 2010-07-05 14:14:00.000000000 -0400 1042--- linux-2.6.32.18/arch/ia64/kernel/topology.c 2010-08-10 13:45:57.000000000 -0400
1034+++ linux-2.6.32.16/arch/ia64/kernel/topology.c 2010-07-09 14:50:34.000000000 -0400 1043+++ linux-2.6.32.18/arch/ia64/kernel/topology.c 2010-08-11 18:57:28.000000000 -0400
1035@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject 1044@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
1036 return ret; 1045 return ret;
1037 } 1046 }
@@ -1041,9 +1050,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/kernel/topology.c linux-2.6.32.16/arch/ia64
1041 .show = cache_show 1050 .show = cache_show
1042 }; 1051 };
1043 1052
1044diff -urNp linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S 1053diff -urNp linux-2.6.32.18/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.18/arch/ia64/kernel/vmlinux.lds.S
1045--- linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S 2010-07-05 14:14:00.000000000 -0400 1054--- linux-2.6.32.18/arch/ia64/kernel/vmlinux.lds.S 2010-08-10 13:45:57.000000000 -0400
1046+++ linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S 2010-07-09 14:50:34.000000000 -0400 1055+++ linux-2.6.32.18/arch/ia64/kernel/vmlinux.lds.S 2010-08-11 18:57:28.000000000 -0400
1047@@ -190,7 +190,7 @@ SECTIONS 1056@@ -190,7 +190,7 @@ SECTIONS
1048 /* Per-cpu data: */ 1057 /* Per-cpu data: */
1049 . = ALIGN(PERCPU_PAGE_SIZE); 1058 . = ALIGN(PERCPU_PAGE_SIZE);
@@ -1053,9 +1062,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.16/arch/i
1053 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits 1062 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
1054 * into percpu page size 1063 * into percpu page size
1055 */ 1064 */
1056diff -urNp linux-2.6.32.16/arch/ia64/mm/fault.c linux-2.6.32.16/arch/ia64/mm/fault.c 1065diff -urNp linux-2.6.32.18/arch/ia64/mm/fault.c linux-2.6.32.18/arch/ia64/mm/fault.c
1057--- linux-2.6.32.16/arch/ia64/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 1066--- linux-2.6.32.18/arch/ia64/mm/fault.c 2010-08-10 13:45:57.000000000 -0400
1058+++ linux-2.6.32.16/arch/ia64/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 1067+++ linux-2.6.32.18/arch/ia64/mm/fault.c 2010-08-11 18:57:28.000000000 -0400
1059@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 1068@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
1060 return pte_present(pte); 1069 return pte_present(pte);
1061 } 1070 }
@@ -1105,9 +1114,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/mm/fault.c linux-2.6.32.16/arch/ia64/mm/fau
1105 survive: 1114 survive:
1106 /* 1115 /*
1107 * If for any reason at all we couldn't handle the fault, make 1116 * If for any reason at all we couldn't handle the fault, make
1108diff -urNp linux-2.6.32.16/arch/ia64/mm/init.c linux-2.6.32.16/arch/ia64/mm/init.c 1117diff -urNp linux-2.6.32.18/arch/ia64/mm/init.c linux-2.6.32.18/arch/ia64/mm/init.c
1109--- linux-2.6.32.16/arch/ia64/mm/init.c 2010-07-05 14:14:00.000000000 -0400 1118--- linux-2.6.32.18/arch/ia64/mm/init.c 2010-08-10 13:45:57.000000000 -0400
1110+++ linux-2.6.32.16/arch/ia64/mm/init.c 2010-07-09 14:50:34.000000000 -0400 1119+++ linux-2.6.32.18/arch/ia64/mm/init.c 2010-08-11 18:57:28.000000000 -0400
1111@@ -122,6 +122,19 @@ ia64_init_addr_space (void) 1120@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
1112 vma->vm_start = current->thread.rbs_bot & PAGE_MASK; 1121 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
1113 vma->vm_end = vma->vm_start + PAGE_SIZE; 1122 vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1128,9 +1137,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/mm/init.c linux-2.6.32.16/arch/ia64/mm/init
1128 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 1137 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
1129 down_write(&current->mm->mmap_sem); 1138 down_write(&current->mm->mmap_sem);
1130 if (insert_vm_struct(current->mm, vma)) { 1139 if (insert_vm_struct(current->mm, vma)) {
1131diff -urNp linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c 1140diff -urNp linux-2.6.32.18/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.18/arch/ia64/sn/pci/pci_dma.c
1132--- linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c 2010-07-05 14:14:00.000000000 -0400 1141--- linux-2.6.32.18/arch/ia64/sn/pci/pci_dma.c 2010-08-10 13:45:57.000000000 -0400
1133+++ linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c 2010-07-09 14:50:34.000000000 -0400 1142+++ linux-2.6.32.18/arch/ia64/sn/pci/pci_dma.c 2010-08-11 18:57:28.000000000 -0400
1134@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * 1143@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
1135 return ret; 1144 return ret;
1136 } 1145 }
@@ -1140,9 +1149,9 @@ diff -urNp linux-2.6.32.16/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.16/arch/ia64/
1140 .alloc_coherent = sn_dma_alloc_coherent, 1149 .alloc_coherent = sn_dma_alloc_coherent,
1141 .free_coherent = sn_dma_free_coherent, 1150 .free_coherent = sn_dma_free_coherent,
1142 .map_page = sn_dma_map_page, 1151 .map_page = sn_dma_map_page,
1143diff -urNp linux-2.6.32.16/arch/m32r/lib/usercopy.c linux-2.6.32.16/arch/m32r/lib/usercopy.c 1152diff -urNp linux-2.6.32.18/arch/m32r/lib/usercopy.c linux-2.6.32.18/arch/m32r/lib/usercopy.c
1144--- linux-2.6.32.16/arch/m32r/lib/usercopy.c 2010-07-05 14:14:00.000000000 -0400 1153--- linux-2.6.32.18/arch/m32r/lib/usercopy.c 2010-08-10 13:45:57.000000000 -0400
1145+++ linux-2.6.32.16/arch/m32r/lib/usercopy.c 2010-07-09 14:50:34.000000000 -0400 1154+++ linux-2.6.32.18/arch/m32r/lib/usercopy.c 2010-08-11 18:57:28.000000000 -0400
1146@@ -14,6 +14,9 @@ 1155@@ -14,6 +14,9 @@
1147 unsigned long 1156 unsigned long
1148 __generic_copy_to_user(void __user *to, const void *from, unsigned long n) 1157 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1163,9 +1172,9 @@ diff -urNp linux-2.6.32.16/arch/m32r/lib/usercopy.c linux-2.6.32.16/arch/m32r/li
1163 prefetchw(to); 1172 prefetchw(to);
1164 if (access_ok(VERIFY_READ, from, n)) 1173 if (access_ok(VERIFY_READ, from, n))
1165 __copy_user_zeroing(to,from,n); 1174 __copy_user_zeroing(to,from,n);
1166diff -urNp linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c 1175diff -urNp linux-2.6.32.18/arch/mips/alchemy/devboards/pm.c linux-2.6.32.18/arch/mips/alchemy/devboards/pm.c
1167--- linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c 2010-07-05 14:14:00.000000000 -0400 1176--- linux-2.6.32.18/arch/mips/alchemy/devboards/pm.c 2010-08-10 13:45:57.000000000 -0400
1168+++ linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c 2010-07-09 14:50:34.000000000 -0400 1177+++ linux-2.6.32.18/arch/mips/alchemy/devboards/pm.c 2010-08-11 18:57:28.000000000 -0400
1169@@ -78,7 +78,7 @@ static void db1x_pm_end(void) 1178@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
1170 1179
1171 } 1180 }
@@ -1175,9 +1184,9 @@ diff -urNp linux-2.6.32.16/arch/mips/alchemy/devboards/pm.c linux-2.6.32.16/arch
1175 .valid = suspend_valid_only_mem, 1184 .valid = suspend_valid_only_mem,
1176 .begin = db1x_pm_begin, 1185 .begin = db1x_pm_begin,
1177 .enter = db1x_pm_enter, 1186 .enter = db1x_pm_enter,
1178diff -urNp linux-2.6.32.16/arch/mips/include/asm/elf.h linux-2.6.32.16/arch/mips/include/asm/elf.h 1187diff -urNp linux-2.6.32.18/arch/mips/include/asm/elf.h linux-2.6.32.18/arch/mips/include/asm/elf.h
1179--- linux-2.6.32.16/arch/mips/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 1188--- linux-2.6.32.18/arch/mips/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400
1180+++ linux-2.6.32.16/arch/mips/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 1189+++ linux-2.6.32.18/arch/mips/include/asm/elf.h 2010-08-11 18:57:28.000000000 -0400
1181@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str 1190@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
1182 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) 1191 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1183 #endif 1192 #endif
@@ -1190,9 +1199,9 @@ diff -urNp linux-2.6.32.16/arch/mips/include/asm/elf.h linux-2.6.32.16/arch/mips
1190+#endif 1199+#endif
1191+ 1200+
1192 #endif /* _ASM_ELF_H */ 1201 #endif /* _ASM_ELF_H */
1193diff -urNp linux-2.6.32.16/arch/mips/include/asm/page.h linux-2.6.32.16/arch/mips/include/asm/page.h 1202diff -urNp linux-2.6.32.18/arch/mips/include/asm/page.h linux-2.6.32.18/arch/mips/include/asm/page.h
1194--- linux-2.6.32.16/arch/mips/include/asm/page.h 2010-07-05 14:14:00.000000000 -0400 1203--- linux-2.6.32.18/arch/mips/include/asm/page.h 2010-08-10 13:45:57.000000000 -0400
1195+++ linux-2.6.32.16/arch/mips/include/asm/page.h 2010-07-09 14:50:34.000000000 -0400 1204+++ linux-2.6.32.18/arch/mips/include/asm/page.h 2010-08-11 18:57:28.000000000 -0400
1196@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa 1205@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
1197 #ifdef CONFIG_CPU_MIPS32 1206 #ifdef CONFIG_CPU_MIPS32
1198 typedef struct { unsigned long pte_low, pte_high; } pte_t; 1207 typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1202,9 +1211,9 @@ diff -urNp linux-2.6.32.16/arch/mips/include/asm/page.h linux-2.6.32.16/arch/mip
1202 #else 1211 #else
1203 typedef struct { unsigned long long pte; } pte_t; 1212 typedef struct { unsigned long long pte; } pte_t;
1204 #define pte_val(x) ((x).pte) 1213 #define pte_val(x) ((x).pte)
1205diff -urNp linux-2.6.32.16/arch/mips/include/asm/system.h linux-2.6.32.16/arch/mips/include/asm/system.h 1214diff -urNp linux-2.6.32.18/arch/mips/include/asm/system.h linux-2.6.32.18/arch/mips/include/asm/system.h
1206--- linux-2.6.32.16/arch/mips/include/asm/system.h 2010-07-05 14:14:00.000000000 -0400 1215--- linux-2.6.32.18/arch/mips/include/asm/system.h 2010-08-10 13:45:57.000000000 -0400
1207+++ linux-2.6.32.16/arch/mips/include/asm/system.h 2010-07-09 14:50:34.000000000 -0400 1216+++ linux-2.6.32.18/arch/mips/include/asm/system.h 2010-08-11 18:57:28.000000000 -0400
1208@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); 1217@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
1209 */ 1218 */
1210 #define __ARCH_WANT_UNLOCKED_CTXSW 1219 #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1213,9 +1222,9 @@ diff -urNp linux-2.6.32.16/arch/mips/include/asm/system.h linux-2.6.32.16/arch/m
1213+#define arch_align_stack(x) ((x) & ALMASK) 1222+#define arch_align_stack(x) ((x) & ALMASK)
1214 1223
1215 #endif /* _ASM_SYSTEM_H */ 1224 #endif /* _ASM_SYSTEM_H */
1216diff -urNp linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c 1225diff -urNp linux-2.6.32.18/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.18/arch/mips/kernel/binfmt_elfn32.c
1217--- linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c 2010-07-05 14:14:00.000000000 -0400 1226--- linux-2.6.32.18/arch/mips/kernel/binfmt_elfn32.c 2010-08-10 13:45:57.000000000 -0400
1218+++ linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c 2010-07-09 14:50:34.000000000 -0400 1227+++ linux-2.6.32.18/arch/mips/kernel/binfmt_elfn32.c 2010-08-11 18:57:28.000000000 -0400
1219@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N 1228@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
1220 #undef ELF_ET_DYN_BASE 1229 #undef ELF_ET_DYN_BASE
1221 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) 1230 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1230,9 +1239,9 @@ diff -urNp linux-2.6.32.16/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.16/arch
1230 #include <asm/processor.h> 1239 #include <asm/processor.h>
1231 #include <linux/module.h> 1240 #include <linux/module.h>
1232 #include <linux/elfcore.h> 1241 #include <linux/elfcore.h>
1233diff -urNp linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c 1242diff -urNp linux-2.6.32.18/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.18/arch/mips/kernel/binfmt_elfo32.c
1234--- linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c 2010-07-05 14:14:00.000000000 -0400 1243--- linux-2.6.32.18/arch/mips/kernel/binfmt_elfo32.c 2010-08-10 13:45:57.000000000 -0400
1235+++ linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c 2010-07-09 14:50:34.000000000 -0400 1244+++ linux-2.6.32.18/arch/mips/kernel/binfmt_elfo32.c 2010-08-11 18:57:28.000000000 -0400
1236@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N 1245@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
1237 #undef ELF_ET_DYN_BASE 1246 #undef ELF_ET_DYN_BASE
1238 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) 1247 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1247,9 +1256,9 @@ diff -urNp linux-2.6.32.16/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.16/arch
1247 #include <asm/processor.h> 1256 #include <asm/processor.h>
1248 1257
1249 /* 1258 /*
1250diff -urNp linux-2.6.32.16/arch/mips/kernel/kgdb.c linux-2.6.32.16/arch/mips/kernel/kgdb.c 1259diff -urNp linux-2.6.32.18/arch/mips/kernel/kgdb.c linux-2.6.32.18/arch/mips/kernel/kgdb.c
1251--- linux-2.6.32.16/arch/mips/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 1260--- linux-2.6.32.18/arch/mips/kernel/kgdb.c 2010-08-10 13:45:57.000000000 -0400
1252+++ linux-2.6.32.16/arch/mips/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -0400 1261+++ linux-2.6.32.18/arch/mips/kernel/kgdb.c 2010-08-11 18:57:28.000000000 -0400
1253@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto 1262@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
1254 return -1; 1263 return -1;
1255 } 1264 }
@@ -1258,9 +1267,9 @@ diff -urNp linux-2.6.32.16/arch/mips/kernel/kgdb.c linux-2.6.32.16/arch/mips/ker
1258 struct kgdb_arch arch_kgdb_ops; 1267 struct kgdb_arch arch_kgdb_ops;
1259 1268
1260 /* 1269 /*
1261diff -urNp linux-2.6.32.16/arch/mips/kernel/process.c linux-2.6.32.16/arch/mips/kernel/process.c 1270diff -urNp linux-2.6.32.18/arch/mips/kernel/process.c linux-2.6.32.18/arch/mips/kernel/process.c
1262--- linux-2.6.32.16/arch/mips/kernel/process.c 2010-07-05 14:14:00.000000000 -0400 1271--- linux-2.6.32.18/arch/mips/kernel/process.c 2010-08-10 13:45:57.000000000 -0400
1263+++ linux-2.6.32.16/arch/mips/kernel/process.c 2010-07-09 14:50:34.000000000 -0400 1272+++ linux-2.6.32.18/arch/mips/kernel/process.c 2010-08-11 18:57:28.000000000 -0400
1264@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru 1273@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
1265 out: 1274 out:
1266 return pc; 1275 return pc;
@@ -1277,9 +1286,9 @@ diff -urNp linux-2.6.32.16/arch/mips/kernel/process.c linux-2.6.32.16/arch/mips/
1277- 1286-
1278- return sp & ALMASK; 1287- return sp & ALMASK;
1279-} 1288-}
1280diff -urNp linux-2.6.32.16/arch/mips/kernel/syscall.c linux-2.6.32.16/arch/mips/kernel/syscall.c 1289diff -urNp linux-2.6.32.18/arch/mips/kernel/syscall.c linux-2.6.32.18/arch/mips/kernel/syscall.c
1281--- linux-2.6.32.16/arch/mips/kernel/syscall.c 2010-07-05 14:14:00.000000000 -0400 1290--- linux-2.6.32.18/arch/mips/kernel/syscall.c 2010-08-10 13:45:57.000000000 -0400
1282+++ linux-2.6.32.16/arch/mips/kernel/syscall.c 2010-07-09 14:50:34.000000000 -0400 1291+++ linux-2.6.32.18/arch/mips/kernel/syscall.c 2010-08-11 18:57:28.000000000 -0400
1283@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str 1292@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str
1284 do_color_align = 0; 1293 do_color_align = 0;
1285 if (filp || (flags & MAP_SHARED)) 1294 if (filp || (flags & MAP_SHARED))
@@ -1301,9 +1310,9 @@ diff -urNp linux-2.6.32.16/arch/mips/kernel/syscall.c linux-2.6.32.16/arch/mips/
1301 if (do_color_align) 1310 if (do_color_align)
1302 addr = COLOUR_ALIGN(addr, pgoff); 1311 addr = COLOUR_ALIGN(addr, pgoff);
1303 else 1312 else
1304diff -urNp linux-2.6.32.16/arch/mips/mm/fault.c linux-2.6.32.16/arch/mips/mm/fault.c 1313diff -urNp linux-2.6.32.18/arch/mips/mm/fault.c linux-2.6.32.18/arch/mips/mm/fault.c
1305--- linux-2.6.32.16/arch/mips/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 1314--- linux-2.6.32.18/arch/mips/mm/fault.c 2010-08-10 13:45:57.000000000 -0400
1306+++ linux-2.6.32.16/arch/mips/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 1315+++ linux-2.6.32.18/arch/mips/mm/fault.c 2010-08-11 18:57:28.000000000 -0400
1307@@ -26,6 +26,23 @@ 1316@@ -26,6 +26,23 @@
1308 #include <asm/ptrace.h> 1317 #include <asm/ptrace.h>
1309 #include <asm/highmem.h> /* For VMALLOC_END */ 1318 #include <asm/highmem.h> /* For VMALLOC_END */
@@ -1328,9 +1337,9 @@ diff -urNp linux-2.6.32.16/arch/mips/mm/fault.c linux-2.6.32.16/arch/mips/mm/fau
1328 /* 1337 /*
1329 * This routine handles page faults. It determines the address, 1338 * This routine handles page faults. It determines the address,
1330 * and the problem, and then passes it off to one of the appropriate 1339 * and the problem, and then passes it off to one of the appropriate
1331diff -urNp linux-2.6.32.16/arch/parisc/include/asm/elf.h linux-2.6.32.16/arch/parisc/include/asm/elf.h 1340diff -urNp linux-2.6.32.18/arch/parisc/include/asm/elf.h linux-2.6.32.18/arch/parisc/include/asm/elf.h
1332--- linux-2.6.32.16/arch/parisc/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 1341--- linux-2.6.32.18/arch/parisc/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400
1333+++ linux-2.6.32.16/arch/parisc/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 1342+++ linux-2.6.32.18/arch/parisc/include/asm/elf.h 2010-08-11 18:57:28.000000000 -0400
1334@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. 1343@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
1335 1344
1336 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) 1345 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1345,9 +1354,9 @@ diff -urNp linux-2.6.32.16/arch/parisc/include/asm/elf.h linux-2.6.32.16/arch/pa
1345 /* This yields a mask that user programs can use to figure out what 1354 /* This yields a mask that user programs can use to figure out what
1346 instruction set this CPU supports. This could be done in user space, 1355 instruction set this CPU supports. This could be done in user space,
1347 but it's not easy, and we've already done it here. */ 1356 but it's not easy, and we've already done it here. */
1348diff -urNp linux-2.6.32.16/arch/parisc/include/asm/pgtable.h linux-2.6.32.16/arch/parisc/include/asm/pgtable.h 1357diff -urNp linux-2.6.32.18/arch/parisc/include/asm/pgtable.h linux-2.6.32.18/arch/parisc/include/asm/pgtable.h
1349--- linux-2.6.32.16/arch/parisc/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 1358--- linux-2.6.32.18/arch/parisc/include/asm/pgtable.h 2010-08-10 13:45:57.000000000 -0400
1350+++ linux-2.6.32.16/arch/parisc/include/asm/pgtable.h 2010-07-09 14:50:34.000000000 -0400 1359+++ linux-2.6.32.18/arch/parisc/include/asm/pgtable.h 2010-08-11 18:57:28.000000000 -0400
1351@@ -207,6 +207,17 @@ 1360@@ -207,6 +207,17 @@
1352 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) 1361 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
1353 #define PAGE_COPY PAGE_EXECREAD 1362 #define PAGE_COPY PAGE_EXECREAD
@@ -1366,9 +1375,9 @@ diff -urNp linux-2.6.32.16/arch/parisc/include/asm/pgtable.h linux-2.6.32.16/arc
1366 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) 1375 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
1367 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) 1376 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
1368 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) 1377 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
1369diff -urNp linux-2.6.32.16/arch/parisc/kernel/module.c linux-2.6.32.16/arch/parisc/kernel/module.c 1378diff -urNp linux-2.6.32.18/arch/parisc/kernel/module.c linux-2.6.32.18/arch/parisc/kernel/module.c
1370--- linux-2.6.32.16/arch/parisc/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 1379--- linux-2.6.32.18/arch/parisc/kernel/module.c 2010-08-10 13:45:57.000000000 -0400
1371+++ linux-2.6.32.16/arch/parisc/kernel/module.c 2010-07-09 14:50:34.000000000 -0400 1380+++ linux-2.6.32.18/arch/parisc/kernel/module.c 2010-08-11 18:57:28.000000000 -0400
1372@@ -95,16 +95,38 @@ 1381@@ -95,16 +95,38 @@
1373 1382
1374 /* three functions to determine where in the module core 1383 /* three functions to determine where in the module core
@@ -1469,9 +1478,9 @@ diff -urNp linux-2.6.32.16/arch/parisc/kernel/module.c linux-2.6.32.16/arch/pari
1469 1478
1470 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", 1479 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
1471 me->arch.unwind_section, table, end, gp); 1480 me->arch.unwind_section, table, end, gp);
1472diff -urNp linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c 1481diff -urNp linux-2.6.32.18/arch/parisc/kernel/sys_parisc.c linux-2.6.32.18/arch/parisc/kernel/sys_parisc.c
1473--- linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c 2010-07-05 14:14:00.000000000 -0400 1482--- linux-2.6.32.18/arch/parisc/kernel/sys_parisc.c 2010-08-10 13:45:57.000000000 -0400
1474+++ linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c 2010-07-09 14:50:34.000000000 -0400 1483+++ linux-2.6.32.18/arch/parisc/kernel/sys_parisc.c 2010-08-11 18:57:28.000000000 -0400
1475@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str 1484@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str
1476 if (flags & MAP_FIXED) 1485 if (flags & MAP_FIXED)
1477 return addr; 1486 return addr;
@@ -1481,9 +1490,9 @@ diff -urNp linux-2.6.32.16/arch/parisc/kernel/sys_parisc.c linux-2.6.32.16/arch/
1481 1490
1482 if (filp) { 1491 if (filp) {
1483 addr = get_shared_area(filp->f_mapping, addr, len, pgoff); 1492 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
1484diff -urNp linux-2.6.32.16/arch/parisc/kernel/traps.c linux-2.6.32.16/arch/parisc/kernel/traps.c 1493diff -urNp linux-2.6.32.18/arch/parisc/kernel/traps.c linux-2.6.32.18/arch/parisc/kernel/traps.c
1485--- linux-2.6.32.16/arch/parisc/kernel/traps.c 2010-07-05 14:14:00.000000000 -0400 1494--- linux-2.6.32.18/arch/parisc/kernel/traps.c 2010-08-10 13:45:57.000000000 -0400
1486+++ linux-2.6.32.16/arch/parisc/kernel/traps.c 2010-07-09 14:50:34.000000000 -0400 1495+++ linux-2.6.32.18/arch/parisc/kernel/traps.c 2010-08-11 18:57:28.000000000 -0400
1487@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod 1496@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
1488 1497
1489 down_read(&current->mm->mmap_sem); 1498 down_read(&current->mm->mmap_sem);
@@ -1495,9 +1504,9 @@ diff -urNp linux-2.6.32.16/arch/parisc/kernel/traps.c linux-2.6.32.16/arch/paris
1495 fault_address = regs->iaoq[0]; 1504 fault_address = regs->iaoq[0];
1496 fault_space = regs->iasq[0]; 1505 fault_space = regs->iasq[0];
1497 1506
1498diff -urNp linux-2.6.32.16/arch/parisc/mm/fault.c linux-2.6.32.16/arch/parisc/mm/fault.c 1507diff -urNp linux-2.6.32.18/arch/parisc/mm/fault.c linux-2.6.32.18/arch/parisc/mm/fault.c
1499--- linux-2.6.32.16/arch/parisc/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 1508--- linux-2.6.32.18/arch/parisc/mm/fault.c 2010-08-10 13:45:57.000000000 -0400
1500+++ linux-2.6.32.16/arch/parisc/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 1509+++ linux-2.6.32.18/arch/parisc/mm/fault.c 2010-08-11 18:57:28.000000000 -0400
1501@@ -15,6 +15,7 @@ 1510@@ -15,6 +15,7 @@
1502 #include <linux/sched.h> 1511 #include <linux/sched.h>
1503 #include <linux/interrupt.h> 1512 #include <linux/interrupt.h>
@@ -1667,9 +1676,9 @@ diff -urNp linux-2.6.32.16/arch/parisc/mm/fault.c linux-2.6.32.16/arch/parisc/mm
1667 1676
1668 /* 1677 /*
1669 * If for any reason at all we couldn't handle the fault, make 1678 * If for any reason at all we couldn't handle the fault, make
1670diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/device.h linux-2.6.32.16/arch/powerpc/include/asm/device.h 1679diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/device.h linux-2.6.32.18/arch/powerpc/include/asm/device.h
1671--- linux-2.6.32.16/arch/powerpc/include/asm/device.h 2010-07-05 14:14:00.000000000 -0400 1680--- linux-2.6.32.18/arch/powerpc/include/asm/device.h 2010-08-10 13:45:57.000000000 -0400
1672+++ linux-2.6.32.16/arch/powerpc/include/asm/device.h 2010-07-09 14:50:34.000000000 -0400 1681+++ linux-2.6.32.18/arch/powerpc/include/asm/device.h 2010-08-11 18:57:28.000000000 -0400
1673@@ -14,7 +14,7 @@ struct dev_archdata { 1682@@ -14,7 +14,7 @@ struct dev_archdata {
1674 struct device_node *of_node; 1683 struct device_node *of_node;
1675 1684
@@ -1679,9 +1688,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/device.h linux-2.6.32.16/arc
1679 1688
1680 /* 1689 /*
1681 * When an iommu is in use, dma_data is used as a ptr to the base of the 1690 * When an iommu is in use, dma_data is used as a ptr to the base of the
1682diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h 1691diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.18/arch/powerpc/include/asm/dma-mapping.h
1683--- linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 1692--- linux-2.6.32.18/arch/powerpc/include/asm/dma-mapping.h 2010-08-10 13:45:57.000000000 -0400
1684+++ linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h 2010-07-09 14:50:34.000000000 -0400 1693+++ linux-2.6.32.18/arch/powerpc/include/asm/dma-mapping.h 2010-08-11 18:57:28.000000000 -0400
1685@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma 1694@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
1686 #ifdef CONFIG_PPC64 1695 #ifdef CONFIG_PPC64
1687 extern struct dma_map_ops dma_iommu_ops; 1696 extern struct dma_map_ops dma_iommu_ops;
@@ -1748,9 +1757,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.1
1748 1757
1749 if (dma_ops->mapping_error) 1758 if (dma_ops->mapping_error)
1750 return dma_ops->mapping_error(dev, dma_addr); 1759 return dma_ops->mapping_error(dev, dma_addr);
1751diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/elf.h linux-2.6.32.16/arch/powerpc/include/asm/elf.h 1760diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/elf.h linux-2.6.32.18/arch/powerpc/include/asm/elf.h
1752--- linux-2.6.32.16/arch/powerpc/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 1761--- linux-2.6.32.18/arch/powerpc/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400
1753+++ linux-2.6.32.16/arch/powerpc/include/asm/elf.h 2010-07-09 14:50:34.000000000 -0400 1762+++ linux-2.6.32.18/arch/powerpc/include/asm/elf.h 2010-08-11 18:57:28.000000000 -0400
1754@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E 1763@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
1755 the loader. We need to make sure that it is out of the way of the program 1764 the loader. We need to make sure that it is out of the way of the program
1756 that it will "exec", and that there is sufficient room for the brk. */ 1765 that it will "exec", and that there is sufficient room for the brk. */
@@ -1783,9 +1792,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/elf.h linux-2.6.32.16/arch/p
1783 #endif /* __KERNEL__ */ 1792 #endif /* __KERNEL__ */
1784 1793
1785 /* 1794 /*
1786diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/iommu.h linux-2.6.32.16/arch/powerpc/include/asm/iommu.h 1795diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/iommu.h linux-2.6.32.18/arch/powerpc/include/asm/iommu.h
1787--- linux-2.6.32.16/arch/powerpc/include/asm/iommu.h 2010-07-05 14:14:00.000000000 -0400 1796--- linux-2.6.32.18/arch/powerpc/include/asm/iommu.h 2010-08-10 13:45:57.000000000 -0400
1788+++ linux-2.6.32.16/arch/powerpc/include/asm/iommu.h 2010-07-09 14:50:34.000000000 -0400 1797+++ linux-2.6.32.18/arch/powerpc/include/asm/iommu.h 2010-08-11 18:57:28.000000000 -0400
1789@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi 1798@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
1790 extern void iommu_init_early_dart(void); 1799 extern void iommu_init_early_dart(void);
1791 extern void iommu_init_early_pasemi(void); 1800 extern void iommu_init_early_pasemi(void);
@@ -1796,9 +1805,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/iommu.h linux-2.6.32.16/arch
1796 #ifdef CONFIG_PCI 1805 #ifdef CONFIG_PCI
1797 extern void pci_iommu_init(void); 1806 extern void pci_iommu_init(void);
1798 extern void pci_direct_iommu_init(void); 1807 extern void pci_direct_iommu_init(void);
1799diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h 1808diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.18/arch/powerpc/include/asm/kmap_types.h
1800--- linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 1809--- linux-2.6.32.18/arch/powerpc/include/asm/kmap_types.h 2010-08-10 13:45:57.000000000 -0400
1801+++ linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h 2010-07-09 14:50:34.000000000 -0400 1810+++ linux-2.6.32.18/arch/powerpc/include/asm/kmap_types.h 2010-08-11 18:57:28.000000000 -0400
1802@@ -26,6 +26,7 @@ enum km_type { 1811@@ -26,6 +26,7 @@ enum km_type {
1803 KM_SOFTIRQ1, 1812 KM_SOFTIRQ1,
1804 KM_PPC_SYNC_PAGE, 1813 KM_PPC_SYNC_PAGE,
@@ -1807,9 +1816,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.16
1807 KM_TYPE_NR 1816 KM_TYPE_NR
1808 }; 1817 };
1809 1818
1810diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/page_64.h linux-2.6.32.16/arch/powerpc/include/asm/page_64.h 1819diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/page_64.h linux-2.6.32.18/arch/powerpc/include/asm/page_64.h
1811--- linux-2.6.32.16/arch/powerpc/include/asm/page_64.h 2010-07-05 14:14:00.000000000 -0400 1820--- linux-2.6.32.18/arch/powerpc/include/asm/page_64.h 2010-08-10 13:45:57.000000000 -0400
1812+++ linux-2.6.32.16/arch/powerpc/include/asm/page_64.h 2010-07-09 14:50:34.000000000 -0400 1821+++ linux-2.6.32.18/arch/powerpc/include/asm/page_64.h 2010-08-11 18:57:28.000000000 -0400
1813@@ -180,15 +180,18 @@ do { \ 1822@@ -180,15 +180,18 @@ do { \
1814 * stack by default, so in the absense of a PT_GNU_STACK program header 1823 * stack by default, so in the absense of a PT_GNU_STACK program header
1815 * we turn execute permission off. 1824 * we turn execute permission off.
@@ -1831,9 +1840,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/page_64.h linux-2.6.32.16/ar
1831 1840
1832 #include <asm-generic/getorder.h> 1841 #include <asm-generic/getorder.h>
1833 1842
1834diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/page.h linux-2.6.32.16/arch/powerpc/include/asm/page.h 1843diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/page.h linux-2.6.32.18/arch/powerpc/include/asm/page.h
1835--- linux-2.6.32.16/arch/powerpc/include/asm/page.h 2010-07-05 14:14:00.000000000 -0400 1844--- linux-2.6.32.18/arch/powerpc/include/asm/page.h 2010-08-10 13:45:57.000000000 -0400
1836+++ linux-2.6.32.16/arch/powerpc/include/asm/page.h 2010-07-09 14:50:34.000000000 -0400 1845+++ linux-2.6.32.18/arch/powerpc/include/asm/page.h 2010-08-11 18:57:28.000000000 -0400
1837@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; 1846@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
1838 * and needs to be executable. This means the whole heap ends 1847 * and needs to be executable. This means the whole heap ends
1839 * up being executable. 1848 * up being executable.
@@ -1856,9 +1865,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/page.h linux-2.6.32.16/arch/
1856 #ifndef __ASSEMBLY__ 1865 #ifndef __ASSEMBLY__
1857 1866
1858 #undef STRICT_MM_TYPECHECKS 1867 #undef STRICT_MM_TYPECHECKS
1859diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/pci.h linux-2.6.32.16/arch/powerpc/include/asm/pci.h 1868diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/pci.h linux-2.6.32.18/arch/powerpc/include/asm/pci.h
1860--- linux-2.6.32.16/arch/powerpc/include/asm/pci.h 2010-07-05 14:14:00.000000000 -0400 1869--- linux-2.6.32.18/arch/powerpc/include/asm/pci.h 2010-08-10 13:45:57.000000000 -0400
1861+++ linux-2.6.32.16/arch/powerpc/include/asm/pci.h 2010-07-09 14:50:34.000000000 -0400 1870+++ linux-2.6.32.18/arch/powerpc/include/asm/pci.h 2010-08-11 18:57:28.000000000 -0400
1862@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq 1871@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
1863 } 1872 }
1864 1873
@@ -1870,9 +1879,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/pci.h linux-2.6.32.16/arch/p
1870 #else /* CONFIG_PCI */ 1879 #else /* CONFIG_PCI */
1871 #define set_pci_dma_ops(d) 1880 #define set_pci_dma_ops(d)
1872 #define get_pci_dma_ops() NULL 1881 #define get_pci_dma_ops() NULL
1873diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h 1882diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.18/arch/powerpc/include/asm/pte-hash32.h
1874--- linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h 2010-07-05 14:14:00.000000000 -0400 1883--- linux-2.6.32.18/arch/powerpc/include/asm/pte-hash32.h 2010-08-10 13:45:57.000000000 -0400
1875+++ linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h 2010-07-09 14:50:34.000000000 -0400 1884+++ linux-2.6.32.18/arch/powerpc/include/asm/pte-hash32.h 2010-08-11 18:57:28.000000000 -0400
1876@@ -21,6 +21,7 @@ 1885@@ -21,6 +21,7 @@
1877 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ 1886 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
1878 #define _PAGE_USER 0x004 /* usermode access allowed */ 1887 #define _PAGE_USER 0x004 /* usermode access allowed */
@@ -1881,9 +1890,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.16
1881 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ 1890 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
1882 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ 1891 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
1883 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ 1892 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
1884diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/reg.h linux-2.6.32.16/arch/powerpc/include/asm/reg.h 1893diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/reg.h linux-2.6.32.18/arch/powerpc/include/asm/reg.h
1885--- linux-2.6.32.16/arch/powerpc/include/asm/reg.h 2010-07-05 14:14:00.000000000 -0400 1894--- linux-2.6.32.18/arch/powerpc/include/asm/reg.h 2010-08-10 13:45:57.000000000 -0400
1886+++ linux-2.6.32.16/arch/powerpc/include/asm/reg.h 2010-07-09 14:50:34.000000000 -0400 1895+++ linux-2.6.32.18/arch/powerpc/include/asm/reg.h 2010-08-11 18:57:28.000000000 -0400
1887@@ -191,6 +191,7 @@ 1896@@ -191,6 +191,7 @@
1888 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ 1897 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
1889 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ 1898 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -1892,9 +1901,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/reg.h linux-2.6.32.16/arch/p
1892 #define DSISR_PROTFAULT 0x08000000 /* protection fault */ 1901 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
1893 #define DSISR_ISSTORE 0x02000000 /* access was a store */ 1902 #define DSISR_ISSTORE 0x02000000 /* access was a store */
1894 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ 1903 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
1895diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h 1904diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.18/arch/powerpc/include/asm/swiotlb.h
1896--- linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h 2010-07-05 14:14:00.000000000 -0400 1905--- linux-2.6.32.18/arch/powerpc/include/asm/swiotlb.h 2010-08-10 13:45:57.000000000 -0400
1897+++ linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h 2010-07-09 14:50:34.000000000 -0400 1906+++ linux-2.6.32.18/arch/powerpc/include/asm/swiotlb.h 2010-08-11 18:57:28.000000000 -0400
1898@@ -13,7 +13,7 @@ 1907@@ -13,7 +13,7 @@
1899 1908
1900 #include <linux/swiotlb.h> 1909 #include <linux/swiotlb.h>
@@ -1904,9 +1913,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.16/ar
1904 1913
1905 static inline void dma_mark_clean(void *addr, size_t size) {} 1914 static inline void dma_mark_clean(void *addr, size_t size) {}
1906 1915
1907diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h 1916diff -urNp linux-2.6.32.18/arch/powerpc/include/asm/uaccess.h linux-2.6.32.18/arch/powerpc/include/asm/uaccess.h
1908--- linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 1917--- linux-2.6.32.18/arch/powerpc/include/asm/uaccess.h 2010-08-10 13:45:57.000000000 -0400
1909+++ linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h 2010-07-09 14:50:34.000000000 -0400 1918+++ linux-2.6.32.18/arch/powerpc/include/asm/uaccess.h 2010-08-11 18:57:28.000000000 -0400
1910@@ -13,6 +13,8 @@ 1919@@ -13,6 +13,8 @@
1911 #define VERIFY_READ 0 1920 #define VERIFY_READ 0
1912 #define VERIFY_WRITE 1 1921 #define VERIFY_WRITE 1
@@ -2084,9 +2093,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/include/asm/uaccess.h linux-2.6.32.16/ar
2084 extern unsigned long __clear_user(void __user *addr, unsigned long size); 2093 extern unsigned long __clear_user(void __user *addr, unsigned long size);
2085 2094
2086 static inline unsigned long clear_user(void __user *addr, unsigned long size) 2095 static inline unsigned long clear_user(void __user *addr, unsigned long size)
2087diff -urNp linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c 2096diff -urNp linux-2.6.32.18/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.18/arch/powerpc/kernel/cacheinfo.c
2088--- linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c 2010-07-05 14:14:00.000000000 -0400 2097--- linux-2.6.32.18/arch/powerpc/kernel/cacheinfo.c 2010-08-10 13:45:57.000000000 -0400
2089+++ linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c 2010-07-09 14:50:34.000000000 -0400 2098+++ linux-2.6.32.18/arch/powerpc/kernel/cacheinfo.c 2010-08-11 18:57:28.000000000 -0400
2090@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde 2099@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
2091 &cache_assoc_attr, 2100 &cache_assoc_attr,
2092 }; 2101 };
@@ -2096,9 +2105,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.16/arch/
2096 .show = cache_index_show, 2105 .show = cache_index_show,
2097 }; 2106 };
2098 2107
2099diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma.c linux-2.6.32.16/arch/powerpc/kernel/dma.c 2108diff -urNp linux-2.6.32.18/arch/powerpc/kernel/dma.c linux-2.6.32.18/arch/powerpc/kernel/dma.c
2100--- linux-2.6.32.16/arch/powerpc/kernel/dma.c 2010-07-05 14:14:00.000000000 -0400 2109--- linux-2.6.32.18/arch/powerpc/kernel/dma.c 2010-08-10 13:45:57.000000000 -0400
2101+++ linux-2.6.32.16/arch/powerpc/kernel/dma.c 2010-07-09 14:50:34.000000000 -0400 2110+++ linux-2.6.32.18/arch/powerpc/kernel/dma.c 2010-08-11 18:57:28.000000000 -0400
2102@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl 2111@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
2103 } 2112 }
2104 #endif 2113 #endif
@@ -2108,9 +2117,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma.c linux-2.6.32.16/arch/powerp
2108 .alloc_coherent = dma_direct_alloc_coherent, 2117 .alloc_coherent = dma_direct_alloc_coherent,
2109 .free_coherent = dma_direct_free_coherent, 2118 .free_coherent = dma_direct_free_coherent,
2110 .map_sg = dma_direct_map_sg, 2119 .map_sg = dma_direct_map_sg,
2111diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c 2120diff -urNp linux-2.6.32.18/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.18/arch/powerpc/kernel/dma-iommu.c
2112--- linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c 2010-07-05 14:14:00.000000000 -0400 2121--- linux-2.6.32.18/arch/powerpc/kernel/dma-iommu.c 2010-08-10 13:45:57.000000000 -0400
2113+++ linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c 2010-07-09 14:50:34.000000000 -0400 2122+++ linux-2.6.32.18/arch/powerpc/kernel/dma-iommu.c 2010-08-11 18:57:28.000000000 -0400
2114@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de 2123@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
2115 } 2124 }
2116 2125
@@ -2120,9 +2129,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.16/arch/
2120 { 2129 {
2121 struct iommu_table *tbl = get_iommu_table_base(dev); 2130 struct iommu_table *tbl = get_iommu_table_base(dev);
2122 2131
2123diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c 2132diff -urNp linux-2.6.32.18/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.18/arch/powerpc/kernel/dma-swiotlb.c
2124--- linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c 2010-07-05 14:14:00.000000000 -0400 2133--- linux-2.6.32.18/arch/powerpc/kernel/dma-swiotlb.c 2010-08-10 13:45:57.000000000 -0400
2125+++ linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c 2010-07-09 14:50:34.000000000 -0400 2134+++ linux-2.6.32.18/arch/powerpc/kernel/dma-swiotlb.c 2010-08-11 18:57:28.000000000 -0400
2126@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; 2135@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
2127 * map_page, and unmap_page on highmem, use normal dma_ops 2136 * map_page, and unmap_page on highmem, use normal dma_ops
2128 * for everything else. 2137 * for everything else.
@@ -2132,9 +2141,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.16/arc
2132 .alloc_coherent = dma_direct_alloc_coherent, 2141 .alloc_coherent = dma_direct_alloc_coherent,
2133 .free_coherent = dma_direct_free_coherent, 2142 .free_coherent = dma_direct_free_coherent,
2134 .map_sg = swiotlb_map_sg_attrs, 2143 .map_sg = swiotlb_map_sg_attrs,
2135diff -urNp linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S 2144diff -urNp linux-2.6.32.18/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.18/arch/powerpc/kernel/exceptions-64e.S
2136--- linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S 2010-07-05 14:14:00.000000000 -0400 2145--- linux-2.6.32.18/arch/powerpc/kernel/exceptions-64e.S 2010-08-10 13:45:57.000000000 -0400
2137+++ linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S 2010-07-09 14:50:34.000000000 -0400 2146+++ linux-2.6.32.18/arch/powerpc/kernel/exceptions-64e.S 2010-08-11 18:57:28.000000000 -0400
2138@@ -455,6 +455,7 @@ storage_fault_common: 2147@@ -455,6 +455,7 @@ storage_fault_common:
2139 std r14,_DAR(r1) 2148 std r14,_DAR(r1)
2140 std r15,_DSISR(r1) 2149 std r15,_DSISR(r1)
@@ -2153,9 +2162,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.16/
2153 addi r3,r1,STACK_FRAME_OVERHEAD 2162 addi r3,r1,STACK_FRAME_OVERHEAD
2154 ld r4,_DAR(r1) 2163 ld r4,_DAR(r1)
2155 bl .bad_page_fault 2164 bl .bad_page_fault
2156diff -urNp linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S 2165diff -urNp linux-2.6.32.18/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.18/arch/powerpc/kernel/exceptions-64s.S
2157--- linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S 2010-07-05 14:14:00.000000000 -0400 2166--- linux-2.6.32.18/arch/powerpc/kernel/exceptions-64s.S 2010-08-10 13:45:57.000000000 -0400
2158+++ linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S 2010-07-09 14:50:34.000000000 -0400 2167+++ linux-2.6.32.18/arch/powerpc/kernel/exceptions-64s.S 2010-08-11 18:57:28.000000000 -0400
2159@@ -818,10 +818,10 @@ handle_page_fault: 2168@@ -818,10 +818,10 @@ handle_page_fault:
2160 11: ld r4,_DAR(r1) 2169 11: ld r4,_DAR(r1)
2161 ld r5,_DSISR(r1) 2170 ld r5,_DSISR(r1)
@@ -2168,9 +2177,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.16/
2168 mr r5,r3 2177 mr r5,r3
2169 addi r3,r1,STACK_FRAME_OVERHEAD 2178 addi r3,r1,STACK_FRAME_OVERHEAD
2170 lwz r4,_DAR(r1) 2179 lwz r4,_DAR(r1)
2171diff -urNp linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c 2180diff -urNp linux-2.6.32.18/arch/powerpc/kernel/ibmebus.c linux-2.6.32.18/arch/powerpc/kernel/ibmebus.c
2172--- linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c 2010-07-05 14:14:00.000000000 -0400 2181--- linux-2.6.32.18/arch/powerpc/kernel/ibmebus.c 2010-08-10 13:45:57.000000000 -0400
2173+++ linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c 2010-07-09 14:50:34.000000000 -0400 2182+++ linux-2.6.32.18/arch/powerpc/kernel/ibmebus.c 2010-08-11 18:57:28.000000000 -0400
2174@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct 2183@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
2175 return 1; 2184 return 1;
2176 } 2185 }
@@ -2180,9 +2189,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/ibmebus.c linux-2.6.32.16/arch/po
2180 .alloc_coherent = ibmebus_alloc_coherent, 2189 .alloc_coherent = ibmebus_alloc_coherent,
2181 .free_coherent = ibmebus_free_coherent, 2190 .free_coherent = ibmebus_free_coherent,
2182 .map_sg = ibmebus_map_sg, 2191 .map_sg = ibmebus_map_sg,
2183diff -urNp linux-2.6.32.16/arch/powerpc/kernel/kgdb.c linux-2.6.32.16/arch/powerpc/kernel/kgdb.c 2192diff -urNp linux-2.6.32.18/arch/powerpc/kernel/kgdb.c linux-2.6.32.18/arch/powerpc/kernel/kgdb.c
2184--- linux-2.6.32.16/arch/powerpc/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 2193--- linux-2.6.32.18/arch/powerpc/kernel/kgdb.c 2010-08-10 13:45:57.000000000 -0400
2185+++ linux-2.6.32.16/arch/powerpc/kernel/kgdb.c 2010-07-09 14:50:34.000000000 -0400 2194+++ linux-2.6.32.18/arch/powerpc/kernel/kgdb.c 2010-08-11 18:57:28.000000000 -0400
2186@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct 2195@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
2187 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) 2196 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
2188 return 0; 2197 return 0;
@@ -2201,9 +2210,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/kgdb.c linux-2.6.32.16/arch/power
2201 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, 2210 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
2202 }; 2211 };
2203 2212
2204diff -urNp linux-2.6.32.16/arch/powerpc/kernel/module_32.c linux-2.6.32.16/arch/powerpc/kernel/module_32.c 2213diff -urNp linux-2.6.32.18/arch/powerpc/kernel/module_32.c linux-2.6.32.18/arch/powerpc/kernel/module_32.c
2205--- linux-2.6.32.16/arch/powerpc/kernel/module_32.c 2010-07-05 14:14:00.000000000 -0400 2214--- linux-2.6.32.18/arch/powerpc/kernel/module_32.c 2010-08-10 13:45:57.000000000 -0400
2206+++ linux-2.6.32.16/arch/powerpc/kernel/module_32.c 2010-07-09 14:50:34.000000000 -0400 2215+++ linux-2.6.32.18/arch/powerpc/kernel/module_32.c 2010-08-11 18:57:28.000000000 -0400
2207@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr 2216@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
2208 me->arch.core_plt_section = i; 2217 me->arch.core_plt_section = i;
2209 } 2218 }
@@ -2233,9 +2242,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/module_32.c linux-2.6.32.16/arch/
2233 2242
2234 /* Find this entry, or if that fails, the next avail. entry */ 2243 /* Find this entry, or if that fails, the next avail. entry */
2235 while (entry->jump[0]) { 2244 while (entry->jump[0]) {
2236diff -urNp linux-2.6.32.16/arch/powerpc/kernel/module.c linux-2.6.32.16/arch/powerpc/kernel/module.c 2245diff -urNp linux-2.6.32.18/arch/powerpc/kernel/module.c linux-2.6.32.18/arch/powerpc/kernel/module.c
2237--- linux-2.6.32.16/arch/powerpc/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 2246--- linux-2.6.32.18/arch/powerpc/kernel/module.c 2010-08-10 13:45:57.000000000 -0400
2238+++ linux-2.6.32.16/arch/powerpc/kernel/module.c 2010-07-09 14:50:34.000000000 -0400 2247+++ linux-2.6.32.18/arch/powerpc/kernel/module.c 2010-08-11 18:57:28.000000000 -0400
2239@@ -31,11 +31,24 @@ 2248@@ -31,11 +31,24 @@
2240 2249
2241 LIST_HEAD(module_bug_list); 2250 LIST_HEAD(module_bug_list);
@@ -2275,9 +2284,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/module.c linux-2.6.32.16/arch/pow
2275 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, 2284 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
2276 const Elf_Shdr *sechdrs, 2285 const Elf_Shdr *sechdrs,
2277 const char *name) 2286 const char *name)
2278diff -urNp linux-2.6.32.16/arch/powerpc/kernel/pci-common.c linux-2.6.32.16/arch/powerpc/kernel/pci-common.c 2287diff -urNp linux-2.6.32.18/arch/powerpc/kernel/pci-common.c linux-2.6.32.18/arch/powerpc/kernel/pci-common.c
2279--- linux-2.6.32.16/arch/powerpc/kernel/pci-common.c 2010-07-05 14:14:00.000000000 -0400 2288--- linux-2.6.32.18/arch/powerpc/kernel/pci-common.c 2010-08-10 13:45:57.000000000 -0400
2280+++ linux-2.6.32.16/arch/powerpc/kernel/pci-common.c 2010-07-09 14:50:34.000000000 -0400 2289+++ linux-2.6.32.18/arch/powerpc/kernel/pci-common.c 2010-08-11 18:57:28.000000000 -0400
2281@@ -50,14 +50,14 @@ resource_size_t isa_mem_base; 2290@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
2282 unsigned int ppc_pci_flags = 0; 2291 unsigned int ppc_pci_flags = 0;
2283 2292
@@ -2296,9 +2305,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/pci-common.c linux-2.6.32.16/arch
2296 { 2305 {
2297 return pci_dma_ops; 2306 return pci_dma_ops;
2298 } 2307 }
2299diff -urNp linux-2.6.32.16/arch/powerpc/kernel/process.c linux-2.6.32.16/arch/powerpc/kernel/process.c 2308diff -urNp linux-2.6.32.18/arch/powerpc/kernel/process.c linux-2.6.32.18/arch/powerpc/kernel/process.c
2300--- linux-2.6.32.16/arch/powerpc/kernel/process.c 2010-07-05 14:14:00.000000000 -0400 2309--- linux-2.6.32.18/arch/powerpc/kernel/process.c 2010-08-10 13:45:57.000000000 -0400
2301+++ linux-2.6.32.16/arch/powerpc/kernel/process.c 2010-07-09 14:50:34.000000000 -0400 2310+++ linux-2.6.32.18/arch/powerpc/kernel/process.c 2010-08-11 18:57:28.000000000 -0400
2302@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned 2311@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned
2303 sp -= get_random_int() & ~PAGE_MASK; 2312 sp -= get_random_int() & ~PAGE_MASK;
2304 return sp & ~0xf; 2313 return sp & ~0xf;
@@ -2351,9 +2360,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/process.c linux-2.6.32.16/arch/po
2351- 2360-
2352- return ret; 2361- return ret;
2353-} 2362-}
2354diff -urNp linux-2.6.32.16/arch/powerpc/kernel/signal_32.c linux-2.6.32.16/arch/powerpc/kernel/signal_32.c 2363diff -urNp linux-2.6.32.18/arch/powerpc/kernel/signal_32.c linux-2.6.32.18/arch/powerpc/kernel/signal_32.c
2355--- linux-2.6.32.16/arch/powerpc/kernel/signal_32.c 2010-07-05 14:14:00.000000000 -0400 2364--- linux-2.6.32.18/arch/powerpc/kernel/signal_32.c 2010-08-10 13:45:57.000000000 -0400
2356+++ linux-2.6.32.16/arch/powerpc/kernel/signal_32.c 2010-07-09 14:50:34.000000000 -0400 2365+++ linux-2.6.32.18/arch/powerpc/kernel/signal_32.c 2010-08-11 18:57:28.000000000 -0400
2357@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig 2366@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
2358 /* Save user registers on the stack */ 2367 /* Save user registers on the stack */
2359 frame = &rt_sf->uc.uc_mcontext; 2368 frame = &rt_sf->uc.uc_mcontext;
@@ -2363,9 +2372,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/signal_32.c linux-2.6.32.16/arch/
2363 if (save_user_regs(regs, frame, 0, 1)) 2372 if (save_user_regs(regs, frame, 0, 1))
2364 goto badframe; 2373 goto badframe;
2365 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; 2374 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
2366diff -urNp linux-2.6.32.16/arch/powerpc/kernel/signal_64.c linux-2.6.32.16/arch/powerpc/kernel/signal_64.c 2375diff -urNp linux-2.6.32.18/arch/powerpc/kernel/signal_64.c linux-2.6.32.18/arch/powerpc/kernel/signal_64.c
2367--- linux-2.6.32.16/arch/powerpc/kernel/signal_64.c 2010-07-05 14:14:00.000000000 -0400 2376--- linux-2.6.32.18/arch/powerpc/kernel/signal_64.c 2010-08-10 13:45:57.000000000 -0400
2368+++ linux-2.6.32.16/arch/powerpc/kernel/signal_64.c 2010-07-09 14:50:34.000000000 -0400 2377+++ linux-2.6.32.18/arch/powerpc/kernel/signal_64.c 2010-08-11 18:57:28.000000000 -0400
2369@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct 2378@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
2370 current->thread.fpscr.val = 0; 2379 current->thread.fpscr.val = 0;
2371 2380
@@ -2375,9 +2384,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/signal_64.c linux-2.6.32.16/arch/
2375 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; 2384 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
2376 } else { 2385 } else {
2377 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); 2386 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
2378diff -urNp linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c 2387diff -urNp linux-2.6.32.18/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.18/arch/powerpc/kernel/sys_ppc32.c
2379--- linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c 2010-07-05 14:14:00.000000000 -0400 2388--- linux-2.6.32.18/arch/powerpc/kernel/sys_ppc32.c 2010-08-10 13:45:57.000000000 -0400
2380+++ linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c 2010-07-09 14:50:34.000000000 -0400 2389+++ linux-2.6.32.18/arch/powerpc/kernel/sys_ppc32.c 2010-08-11 18:57:28.000000000 -0400
2381@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct 2390@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
2382 if (oldlenp) { 2391 if (oldlenp) {
2383 if (!error) { 2392 if (!error) {
@@ -2391,9 +2400,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.16/arch/
2391 } 2400 }
2392 return error; 2401 return error;
2393 } 2402 }
2394diff -urNp linux-2.6.32.16/arch/powerpc/kernel/vdso.c linux-2.6.32.16/arch/powerpc/kernel/vdso.c 2403diff -urNp linux-2.6.32.18/arch/powerpc/kernel/vdso.c linux-2.6.32.18/arch/powerpc/kernel/vdso.c
2395--- linux-2.6.32.16/arch/powerpc/kernel/vdso.c 2010-07-05 14:14:00.000000000 -0400 2404--- linux-2.6.32.18/arch/powerpc/kernel/vdso.c 2010-08-10 13:45:57.000000000 -0400
2396+++ linux-2.6.32.16/arch/powerpc/kernel/vdso.c 2010-07-09 14:50:34.000000000 -0400 2405+++ linux-2.6.32.18/arch/powerpc/kernel/vdso.c 2010-08-11 18:57:28.000000000 -0400
2397@@ -36,6 +36,7 @@ 2406@@ -36,6 +36,7 @@
2398 #include <asm/firmware.h> 2407 #include <asm/firmware.h>
2399 #include <asm/vdso.h> 2408 #include <asm/vdso.h>
@@ -2420,9 +2429,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/vdso.c linux-2.6.32.16/arch/power
2420 if (IS_ERR_VALUE(vdso_base)) { 2429 if (IS_ERR_VALUE(vdso_base)) {
2421 rc = vdso_base; 2430 rc = vdso_base;
2422 goto fail_mmapsem; 2431 goto fail_mmapsem;
2423diff -urNp linux-2.6.32.16/arch/powerpc/kernel/vio.c linux-2.6.32.16/arch/powerpc/kernel/vio.c 2432diff -urNp linux-2.6.32.18/arch/powerpc/kernel/vio.c linux-2.6.32.18/arch/powerpc/kernel/vio.c
2424--- linux-2.6.32.16/arch/powerpc/kernel/vio.c 2010-07-05 14:14:00.000000000 -0400 2433--- linux-2.6.32.18/arch/powerpc/kernel/vio.c 2010-08-10 13:45:57.000000000 -0400
2425+++ linux-2.6.32.16/arch/powerpc/kernel/vio.c 2010-07-09 14:50:34.000000000 -0400 2434+++ linux-2.6.32.18/arch/powerpc/kernel/vio.c 2010-08-11 18:57:28.000000000 -0400
2426@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc 2435@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
2427 vio_cmo_dealloc(viodev, alloc_size); 2436 vio_cmo_dealloc(viodev, alloc_size);
2428 } 2437 }
@@ -2445,9 +2454,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/kernel/vio.c linux-2.6.32.16/arch/powerp
2445 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; 2454 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
2446 } 2455 }
2447 2456
2448diff -urNp linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c 2457diff -urNp linux-2.6.32.18/arch/powerpc/lib/usercopy_64.c linux-2.6.32.18/arch/powerpc/lib/usercopy_64.c
2449--- linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c 2010-07-05 14:14:00.000000000 -0400 2458--- linux-2.6.32.18/arch/powerpc/lib/usercopy_64.c 2010-08-10 13:45:57.000000000 -0400
2450+++ linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c 2010-07-09 14:50:34.000000000 -0400 2459+++ linux-2.6.32.18/arch/powerpc/lib/usercopy_64.c 2010-08-11 18:57:28.000000000 -0400
2451@@ -9,22 +9,6 @@ 2460@@ -9,22 +9,6 @@
2452 #include <linux/module.h> 2461 #include <linux/module.h>
2453 #include <asm/uaccess.h> 2462 #include <asm/uaccess.h>
@@ -2479,9 +2488,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/lib/usercopy_64.c linux-2.6.32.16/arch/p
2479-EXPORT_SYMBOL(copy_to_user); 2488-EXPORT_SYMBOL(copy_to_user);
2480 EXPORT_SYMBOL(copy_in_user); 2489 EXPORT_SYMBOL(copy_in_user);
2481 2490
2482diff -urNp linux-2.6.32.16/arch/powerpc/mm/fault.c linux-2.6.32.16/arch/powerpc/mm/fault.c 2491diff -urNp linux-2.6.32.18/arch/powerpc/mm/fault.c linux-2.6.32.18/arch/powerpc/mm/fault.c
2483--- linux-2.6.32.16/arch/powerpc/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 2492--- linux-2.6.32.18/arch/powerpc/mm/fault.c 2010-08-10 13:45:57.000000000 -0400
2484+++ linux-2.6.32.16/arch/powerpc/mm/fault.c 2010-07-09 14:50:34.000000000 -0400 2493+++ linux-2.6.32.18/arch/powerpc/mm/fault.c 2010-08-11 18:57:28.000000000 -0400
2485@@ -30,6 +30,10 @@ 2494@@ -30,6 +30,10 @@
2486 #include <linux/kprobes.h> 2495 #include <linux/kprobes.h>
2487 #include <linux/kdebug.h> 2496 #include <linux/kdebug.h>
@@ -2586,9 +2595,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/mm/fault.c linux-2.6.32.16/arch/powerpc/
2586 _exception(SIGSEGV, regs, code, address); 2595 _exception(SIGSEGV, regs, code, address);
2587 return 0; 2596 return 0;
2588 } 2597 }
2589diff -urNp linux-2.6.32.16/arch/powerpc/mm/mmap_64.c linux-2.6.32.16/arch/powerpc/mm/mmap_64.c 2598diff -urNp linux-2.6.32.18/arch/powerpc/mm/mmap_64.c linux-2.6.32.18/arch/powerpc/mm/mmap_64.c
2590--- linux-2.6.32.16/arch/powerpc/mm/mmap_64.c 2010-07-05 14:14:00.000000000 -0400 2599--- linux-2.6.32.18/arch/powerpc/mm/mmap_64.c 2010-08-10 13:45:57.000000000 -0400
2591+++ linux-2.6.32.16/arch/powerpc/mm/mmap_64.c 2010-07-09 14:50:34.000000000 -0400 2600+++ linux-2.6.32.18/arch/powerpc/mm/mmap_64.c 2010-08-11 18:57:28.000000000 -0400
2592@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str 2601@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
2593 */ 2602 */
2594 if (mmap_is_legacy()) { 2603 if (mmap_is_legacy()) {
@@ -2612,9 +2621,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/mm/mmap_64.c linux-2.6.32.16/arch/powerp
2612 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 2621 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
2613 mm->unmap_area = arch_unmap_area_topdown; 2622 mm->unmap_area = arch_unmap_area_topdown;
2614 } 2623 }
2615diff -urNp linux-2.6.32.16/arch/powerpc/mm/slice.c linux-2.6.32.16/arch/powerpc/mm/slice.c 2624diff -urNp linux-2.6.32.18/arch/powerpc/mm/slice.c linux-2.6.32.18/arch/powerpc/mm/slice.c
2616--- linux-2.6.32.16/arch/powerpc/mm/slice.c 2010-07-05 14:14:00.000000000 -0400 2625--- linux-2.6.32.18/arch/powerpc/mm/slice.c 2010-08-10 13:45:57.000000000 -0400
2617+++ linux-2.6.32.16/arch/powerpc/mm/slice.c 2010-07-09 14:50:34.000000000 -0400 2626+++ linux-2.6.32.18/arch/powerpc/mm/slice.c 2010-08-11 18:57:28.000000000 -0400
2618@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un 2627@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
2619 if (fixed && addr > (mm->task_size - len)) 2628 if (fixed && addr > (mm->task_size - len))
2620 return -EINVAL; 2629 return -EINVAL;
@@ -2627,9 +2636,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/mm/slice.c linux-2.6.32.16/arch/powerpc/
2627 /* If hint, make sure it matches our alignment restrictions */ 2636 /* If hint, make sure it matches our alignment restrictions */
2628 if (!fixed && addr) { 2637 if (!fixed && addr) {
2629 addr = _ALIGN_UP(addr, 1ul << pshift); 2638 addr = _ALIGN_UP(addr, 1ul << pshift);
2630diff -urNp linux-2.6.32.16/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.16/arch/powerpc/platforms/52xx/lite5200_pm.c 2639diff -urNp linux-2.6.32.18/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.18/arch/powerpc/platforms/52xx/lite5200_pm.c
2631--- linux-2.6.32.16/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-07-05 14:14:00.000000000 -0400 2640--- linux-2.6.32.18/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-10 13:45:57.000000000 -0400
2632+++ linux-2.6.32.16/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-07-09 14:50:34.000000000 -0400 2641+++ linux-2.6.32.18/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-11 18:57:28.000000000 -0400
2633@@ -235,7 +235,7 @@ static void lite5200_pm_end(void) 2642@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
2634 lite5200_pm_target_state = PM_SUSPEND_ON; 2643 lite5200_pm_target_state = PM_SUSPEND_ON;
2635 } 2644 }
@@ -2639,9 +2648,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
2639 .valid = lite5200_pm_valid, 2648 .valid = lite5200_pm_valid,
2640 .begin = lite5200_pm_begin, 2649 .begin = lite5200_pm_begin,
2641 .prepare = lite5200_pm_prepare, 2650 .prepare = lite5200_pm_prepare,
2642diff -urNp linux-2.6.32.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2651diff -urNp linux-2.6.32.18/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.18/arch/powerpc/platforms/52xx/mpc52xx_pm.c
2643--- linux-2.6.32.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-07-05 14:14:00.000000000 -0400 2652--- linux-2.6.32.18/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-10 13:45:57.000000000 -0400
2644+++ linux-2.6.32.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-07-09 14:50:34.000000000 -0400 2653+++ linux-2.6.32.18/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-11 18:57:29.000000000 -0400
2645@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) 2654@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
2646 iounmap(mbar); 2655 iounmap(mbar);
2647 } 2656 }
@@ -2651,9 +2660,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32
2651 .valid = mpc52xx_pm_valid, 2660 .valid = mpc52xx_pm_valid,
2652 .prepare = mpc52xx_pm_prepare, 2661 .prepare = mpc52xx_pm_prepare,
2653 .enter = mpc52xx_pm_enter, 2662 .enter = mpc52xx_pm_enter,
2654diff -urNp linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c 2663diff -urNp linux-2.6.32.18/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.18/arch/powerpc/platforms/83xx/suspend.c
2655--- linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c 2010-07-05 14:14:00.000000000 -0400 2664--- linux-2.6.32.18/arch/powerpc/platforms/83xx/suspend.c 2010-08-10 13:45:57.000000000 -0400
2656+++ linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c 2010-07-09 14:50:34.000000000 -0400 2665+++ linux-2.6.32.18/arch/powerpc/platforms/83xx/suspend.c 2010-08-11 18:57:29.000000000 -0400
2657@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) 2666@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
2658 return ret; 2667 return ret;
2659 } 2668 }
@@ -2663,9 +2672,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.16
2663 .valid = mpc83xx_suspend_valid, 2672 .valid = mpc83xx_suspend_valid,
2664 .begin = mpc83xx_suspend_begin, 2673 .begin = mpc83xx_suspend_begin,
2665 .enter = mpc83xx_suspend_enter, 2674 .enter = mpc83xx_suspend_enter,
2666diff -urNp linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c 2675diff -urNp linux-2.6.32.18/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.18/arch/powerpc/platforms/cell/iommu.c
2667--- linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c 2010-07-05 14:14:00.000000000 -0400 2676--- linux-2.6.32.18/arch/powerpc/platforms/cell/iommu.c 2010-08-10 13:45:57.000000000 -0400
2668+++ linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c 2010-07-09 14:50:34.000000000 -0400 2677+++ linux-2.6.32.18/arch/powerpc/platforms/cell/iommu.c 2010-08-11 18:57:29.000000000 -0400
2669@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc 2678@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
2670 2679
2671 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); 2680 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -2675,9 +2684,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.16/a
2675 .alloc_coherent = dma_fixed_alloc_coherent, 2684 .alloc_coherent = dma_fixed_alloc_coherent,
2676 .free_coherent = dma_fixed_free_coherent, 2685 .free_coherent = dma_fixed_free_coherent,
2677 .map_sg = dma_fixed_map_sg, 2686 .map_sg = dma_fixed_map_sg,
2678diff -urNp linux-2.6.32.16/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.16/arch/powerpc/platforms/ps3/system-bus.c 2687diff -urNp linux-2.6.32.18/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.18/arch/powerpc/platforms/ps3/system-bus.c
2679--- linux-2.6.32.16/arch/powerpc/platforms/ps3/system-bus.c 2010-07-05 14:14:00.000000000 -0400 2688--- linux-2.6.32.18/arch/powerpc/platforms/ps3/system-bus.c 2010-08-10 13:45:57.000000000 -0400
2680+++ linux-2.6.32.16/arch/powerpc/platforms/ps3/system-bus.c 2010-07-09 14:50:34.000000000 -0400 2689+++ linux-2.6.32.18/arch/powerpc/platforms/ps3/system-bus.c 2010-08-11 18:57:29.000000000 -0400
2681@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi 2690@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
2682 return mask >= DMA_BIT_MASK(32); 2691 return mask >= DMA_BIT_MASK(32);
2683 } 2692 }
@@ -2696,9 +2705,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
2696 .alloc_coherent = ps3_alloc_coherent, 2705 .alloc_coherent = ps3_alloc_coherent,
2697 .free_coherent = ps3_free_coherent, 2706 .free_coherent = ps3_free_coherent,
2698 .map_sg = ps3_ioc0_map_sg, 2707 .map_sg = ps3_ioc0_map_sg,
2699diff -urNp linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig 2708diff -urNp linux-2.6.32.18/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.18/arch/powerpc/platforms/pseries/Kconfig
2700--- linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig 2010-07-05 14:14:00.000000000 -0400 2709--- linux-2.6.32.18/arch/powerpc/platforms/pseries/Kconfig 2010-08-10 13:45:57.000000000 -0400
2701+++ linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig 2010-07-09 14:50:34.000000000 -0400 2710+++ linux-2.6.32.18/arch/powerpc/platforms/pseries/Kconfig 2010-08-11 18:57:29.000000000 -0400
2702@@ -2,6 +2,8 @@ config PPC_PSERIES 2711@@ -2,6 +2,8 @@ config PPC_PSERIES
2703 depends on PPC64 && PPC_BOOK3S 2712 depends on PPC64 && PPC_BOOK3S
2704 bool "IBM pSeries & new (POWER5-based) iSeries" 2713 bool "IBM pSeries & new (POWER5-based) iSeries"
@@ -2708,9 +2717,9 @@ diff -urNp linux-2.6.32.16/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.1
2708 select PPC_I8259 2717 select PPC_I8259
2709 select PPC_RTAS 2718 select PPC_RTAS
2710 select RTAS_ERROR_LOGGING 2719 select RTAS_ERROR_LOGGING
2711diff -urNp linux-2.6.32.16/arch/s390/include/asm/elf.h linux-2.6.32.16/arch/s390/include/asm/elf.h 2720diff -urNp linux-2.6.32.18/arch/s390/include/asm/elf.h linux-2.6.32.18/arch/s390/include/asm/elf.h
2712--- linux-2.6.32.16/arch/s390/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 2721--- linux-2.6.32.18/arch/s390/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400
2713+++ linux-2.6.32.16/arch/s390/include/asm/elf.h 2010-07-09 14:50:35.000000000 -0400 2722+++ linux-2.6.32.18/arch/s390/include/asm/elf.h 2010-08-11 18:57:29.000000000 -0400
2714@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; 2723@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
2715 that it will "exec", and that there is sufficient room for the brk. */ 2724 that it will "exec", and that there is sufficient room for the brk. */
2716 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) 2725 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
@@ -2725,9 +2734,9 @@ diff -urNp linux-2.6.32.16/arch/s390/include/asm/elf.h linux-2.6.32.16/arch/s390
2725 /* This yields a mask that user programs can use to figure out what 2734 /* This yields a mask that user programs can use to figure out what
2726 instruction set this CPU supports. */ 2735 instruction set this CPU supports. */
2727 2736
2728diff -urNp linux-2.6.32.16/arch/s390/include/asm/setup.h linux-2.6.32.16/arch/s390/include/asm/setup.h 2737diff -urNp linux-2.6.32.18/arch/s390/include/asm/setup.h linux-2.6.32.18/arch/s390/include/asm/setup.h
2729--- linux-2.6.32.16/arch/s390/include/asm/setup.h 2010-07-05 14:14:00.000000000 -0400 2738--- linux-2.6.32.18/arch/s390/include/asm/setup.h 2010-08-10 13:45:57.000000000 -0400
2730+++ linux-2.6.32.16/arch/s390/include/asm/setup.h 2010-07-09 14:50:35.000000000 -0400 2739+++ linux-2.6.32.18/arch/s390/include/asm/setup.h 2010-08-11 18:57:29.000000000 -0400
2731@@ -50,13 +50,13 @@ extern unsigned long memory_end; 2740@@ -50,13 +50,13 @@ extern unsigned long memory_end;
2732 void detect_memory_layout(struct mem_chunk chunk[]); 2741 void detect_memory_layout(struct mem_chunk chunk[]);
2733 2742
@@ -2744,9 +2753,9 @@ diff -urNp linux-2.6.32.16/arch/s390/include/asm/setup.h linux-2.6.32.16/arch/s3
2744 #else 2753 #else
2745 #define s390_noexec (0) 2754 #define s390_noexec (0)
2746 #endif 2755 #endif
2747diff -urNp linux-2.6.32.16/arch/s390/include/asm/uaccess.h linux-2.6.32.16/arch/s390/include/asm/uaccess.h 2756diff -urNp linux-2.6.32.18/arch/s390/include/asm/uaccess.h linux-2.6.32.18/arch/s390/include/asm/uaccess.h
2748--- linux-2.6.32.16/arch/s390/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 2757--- linux-2.6.32.18/arch/s390/include/asm/uaccess.h 2010-08-10 13:45:57.000000000 -0400
2749+++ linux-2.6.32.16/arch/s390/include/asm/uaccess.h 2010-07-09 14:50:35.000000000 -0400 2758+++ linux-2.6.32.18/arch/s390/include/asm/uaccess.h 2010-08-11 18:57:29.000000000 -0400
2750@@ -232,6 +232,10 @@ static inline unsigned long __must_check 2759@@ -232,6 +232,10 @@ static inline unsigned long __must_check
2751 copy_to_user(void __user *to, const void *from, unsigned long n) 2760 copy_to_user(void __user *to, const void *from, unsigned long n)
2752 { 2761 {
@@ -2779,9 +2788,9 @@ diff -urNp linux-2.6.32.16/arch/s390/include/asm/uaccess.h linux-2.6.32.16/arch/
2779 if (access_ok(VERIFY_READ, from, n)) 2788 if (access_ok(VERIFY_READ, from, n))
2780 n = __copy_from_user(to, from, n); 2789 n = __copy_from_user(to, from, n);
2781 else 2790 else
2782diff -urNp linux-2.6.32.16/arch/s390/Kconfig linux-2.6.32.16/arch/s390/Kconfig 2791diff -urNp linux-2.6.32.18/arch/s390/Kconfig linux-2.6.32.18/arch/s390/Kconfig
2783--- linux-2.6.32.16/arch/s390/Kconfig 2010-07-05 14:14:00.000000000 -0400 2792--- linux-2.6.32.18/arch/s390/Kconfig 2010-08-10 13:45:57.000000000 -0400
2784+++ linux-2.6.32.16/arch/s390/Kconfig 2010-07-09 14:50:35.000000000 -0400 2793+++ linux-2.6.32.18/arch/s390/Kconfig 2010-08-11 18:57:29.000000000 -0400
2785@@ -194,28 +194,26 @@ config AUDIT_ARCH 2794@@ -194,28 +194,26 @@ config AUDIT_ARCH
2786 2795
2787 config S390_SWITCH_AMODE 2796 config S390_SWITCH_AMODE
@@ -2819,9 +2828,9 @@ diff -urNp linux-2.6.32.16/arch/s390/Kconfig linux-2.6.32.16/arch/s390/Kconfig
2819 2828
2820 comment "Code generation options" 2829 comment "Code generation options"
2821 2830
2822diff -urNp linux-2.6.32.16/arch/s390/kernel/module.c linux-2.6.32.16/arch/s390/kernel/module.c 2831diff -urNp linux-2.6.32.18/arch/s390/kernel/module.c linux-2.6.32.18/arch/s390/kernel/module.c
2823--- linux-2.6.32.16/arch/s390/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 2832--- linux-2.6.32.18/arch/s390/kernel/module.c 2010-08-10 13:45:57.000000000 -0400
2824+++ linux-2.6.32.16/arch/s390/kernel/module.c 2010-07-09 14:50:35.000000000 -0400 2833+++ linux-2.6.32.18/arch/s390/kernel/module.c 2010-08-11 18:57:29.000000000 -0400
2825@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, 2834@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
2826 2835
2827 /* Increase core size by size of got & plt and set start 2836 /* Increase core size by size of got & plt and set start
@@ -2893,9 +2902,9 @@ diff -urNp linux-2.6.32.16/arch/s390/kernel/module.c linux-2.6.32.16/arch/s390/k
2893 rela->r_addend - loc; 2902 rela->r_addend - loc;
2894 if (r_type == R_390_GOTPC) 2903 if (r_type == R_390_GOTPC)
2895 *(unsigned int *) loc = val; 2904 *(unsigned int *) loc = val;
2896diff -urNp linux-2.6.32.16/arch/s390/kernel/setup.c linux-2.6.32.16/arch/s390/kernel/setup.c 2905diff -urNp linux-2.6.32.18/arch/s390/kernel/setup.c linux-2.6.32.18/arch/s390/kernel/setup.c
2897--- linux-2.6.32.16/arch/s390/kernel/setup.c 2010-07-05 14:14:00.000000000 -0400 2906--- linux-2.6.32.18/arch/s390/kernel/setup.c 2010-08-10 13:45:57.000000000 -0400
2898+++ linux-2.6.32.16/arch/s390/kernel/setup.c 2010-07-09 14:50:35.000000000 -0400 2907+++ linux-2.6.32.18/arch/s390/kernel/setup.c 2010-08-11 18:57:29.000000000 -0400
2899@@ -306,9 +306,6 @@ static int __init early_parse_mem(char * 2908@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
2900 early_param("mem", early_parse_mem); 2909 early_param("mem", early_parse_mem);
2901 2910
@@ -2949,9 +2958,9 @@ diff -urNp linux-2.6.32.16/arch/s390/kernel/setup.c linux-2.6.32.16/arch/s390/ke
2949 static void setup_addressing_mode(void) 2958 static void setup_addressing_mode(void)
2950 { 2959 {
2951 if (s390_noexec) { 2960 if (s390_noexec) {
2952diff -urNp linux-2.6.32.16/arch/s390/mm/mmap.c linux-2.6.32.16/arch/s390/mm/mmap.c 2961diff -urNp linux-2.6.32.18/arch/s390/mm/mmap.c linux-2.6.32.18/arch/s390/mm/mmap.c
2953--- linux-2.6.32.16/arch/s390/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 2962--- linux-2.6.32.18/arch/s390/mm/mmap.c 2010-08-10 13:45:57.000000000 -0400
2954+++ linux-2.6.32.16/arch/s390/mm/mmap.c 2010-07-09 14:50:35.000000000 -0400 2963+++ linux-2.6.32.18/arch/s390/mm/mmap.c 2010-08-11 18:57:29.000000000 -0400
2955@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str 2964@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
2956 */ 2965 */
2957 if (mmap_is_legacy()) { 2966 if (mmap_is_legacy()) {
@@ -2998,9 +3007,9 @@ diff -urNp linux-2.6.32.16/arch/s390/mm/mmap.c linux-2.6.32.16/arch/s390/mm/mmap
2998 mm->get_unmapped_area = s390_get_unmapped_area_topdown; 3007 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
2999 mm->unmap_area = arch_unmap_area_topdown; 3008 mm->unmap_area = arch_unmap_area_topdown;
3000 } 3009 }
3001diff -urNp linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c 3010diff -urNp linux-2.6.32.18/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.18/arch/sh/boards/mach-hp6xx/pm.c
3002--- linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c 2010-07-05 14:14:00.000000000 -0400 3011--- linux-2.6.32.18/arch/sh/boards/mach-hp6xx/pm.c 2010-08-10 13:45:57.000000000 -0400
3003+++ linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c 2010-07-09 14:50:35.000000000 -0400 3012+++ linux-2.6.32.18/arch/sh/boards/mach-hp6xx/pm.c 2010-08-11 18:57:29.000000000 -0400
3004@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ 3013@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
3005 return 0; 3014 return 0;
3006 } 3015 }
@@ -3010,9 +3019,9 @@ diff -urNp linux-2.6.32.16/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.16/arch/s
3010 .enter = hp6x0_pm_enter, 3019 .enter = hp6x0_pm_enter,
3011 .valid = suspend_valid_only_mem, 3020 .valid = suspend_valid_only_mem,
3012 }; 3021 };
3013diff -urNp linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c 3022diff -urNp linux-2.6.32.18/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.18/arch/sh/kernel/cpu/sh4/sq.c
3014--- linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c 2010-07-05 14:14:00.000000000 -0400 3023--- linux-2.6.32.18/arch/sh/kernel/cpu/sh4/sq.c 2010-08-10 13:45:57.000000000 -0400
3015+++ linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c 2010-07-09 14:50:35.000000000 -0400 3024+++ linux-2.6.32.18/arch/sh/kernel/cpu/sh4/sq.c 2010-08-11 18:57:29.000000000 -0400
3016@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ 3025@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
3017 NULL, 3026 NULL,
3018 }; 3027 };
@@ -3022,9 +3031,9 @@ diff -urNp linux-2.6.32.16/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.16/arch/sh/k
3022 .show = sq_sysfs_show, 3031 .show = sq_sysfs_show,
3023 .store = sq_sysfs_store, 3032 .store = sq_sysfs_store,
3024 }; 3033 };
3025diff -urNp linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c 3034diff -urNp linux-2.6.32.18/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.18/arch/sh/kernel/cpu/shmobile/pm.c
3026--- linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c 2010-07-05 14:14:00.000000000 -0400 3035--- linux-2.6.32.18/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-10 13:45:57.000000000 -0400
3027+++ linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c 2010-07-09 14:50:35.000000000 -0400 3036+++ linux-2.6.32.18/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-11 18:57:29.000000000 -0400
3028@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s 3037@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
3029 return 0; 3038 return 0;
3030 } 3039 }
@@ -3034,9 +3043,9 @@ diff -urNp linux-2.6.32.16/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.16/arch
3034 .enter = sh_pm_enter, 3043 .enter = sh_pm_enter,
3035 .valid = suspend_valid_only_mem, 3044 .valid = suspend_valid_only_mem,
3036 }; 3045 };
3037diff -urNp linux-2.6.32.16/arch/sh/kernel/kgdb.c linux-2.6.32.16/arch/sh/kernel/kgdb.c 3046diff -urNp linux-2.6.32.18/arch/sh/kernel/kgdb.c linux-2.6.32.18/arch/sh/kernel/kgdb.c
3038--- linux-2.6.32.16/arch/sh/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 3047--- linux-2.6.32.18/arch/sh/kernel/kgdb.c 2010-08-10 13:45:57.000000000 -0400
3039+++ linux-2.6.32.16/arch/sh/kernel/kgdb.c 2010-07-09 14:50:35.000000000 -0400 3048+++ linux-2.6.32.18/arch/sh/kernel/kgdb.c 2010-08-11 18:57:29.000000000 -0400
3040@@ -271,7 +271,7 @@ void kgdb_arch_exit(void) 3049@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
3041 { 3050 {
3042 } 3051 }
@@ -3046,9 +3055,9 @@ diff -urNp linux-2.6.32.16/arch/sh/kernel/kgdb.c linux-2.6.32.16/arch/sh/kernel/
3046 /* Breakpoint instruction: trapa #0x3c */ 3055 /* Breakpoint instruction: trapa #0x3c */
3047 #ifdef CONFIG_CPU_LITTLE_ENDIAN 3056 #ifdef CONFIG_CPU_LITTLE_ENDIAN
3048 .gdb_bpt_instr = { 0x3c, 0xc3 }, 3057 .gdb_bpt_instr = { 0x3c, 0xc3 },
3049diff -urNp linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h 3058diff -urNp linux-2.6.32.18/arch/sparc/include/asm/atomic_64.h linux-2.6.32.18/arch/sparc/include/asm/atomic_64.h
3050--- linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h 2010-07-05 14:14:00.000000000 -0400 3059--- linux-2.6.32.18/arch/sparc/include/asm/atomic_64.h 2010-08-10 13:45:57.000000000 -0400
3051+++ linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h 2010-07-09 14:50:35.000000000 -0400 3060+++ linux-2.6.32.18/arch/sparc/include/asm/atomic_64.h 2010-08-11 18:57:29.000000000 -0400
3052@@ -14,18 +14,39 @@ 3061@@ -14,18 +14,39 @@
3053 #define ATOMIC64_INIT(i) { (i) } 3062 #define ATOMIC64_INIT(i) { (i) }
3054 3063
@@ -3190,9 +3199,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/atomic_64.h linux-2.6.32.16/ar
3190 } 3199 }
3191 3200
3192 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) 3201 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3193diff -urNp linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h 3202diff -urNp linux-2.6.32.18/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.18/arch/sparc/include/asm/dma-mapping.h
3194--- linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 3203--- linux-2.6.32.18/arch/sparc/include/asm/dma-mapping.h 2010-08-10 13:45:57.000000000 -0400
3195+++ linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h 2010-07-09 14:50:35.000000000 -0400 3204+++ linux-2.6.32.18/arch/sparc/include/asm/dma-mapping.h 2010-08-11 18:57:29.000000000 -0400
3196@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d 3205@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
3197 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) 3206 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
3198 #define dma_is_consistent(d, h) (1) 3207 #define dma_is_consistent(d, h) (1)
@@ -3224,9 +3233,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.16/
3224 3233
3225 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); 3234 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
3226 ops->free_coherent(dev, size, cpu_addr, dma_handle); 3235 ops->free_coherent(dev, size, cpu_addr, dma_handle);
3227diff -urNp linux-2.6.32.16/arch/sparc/include/asm/elf_32.h linux-2.6.32.16/arch/sparc/include/asm/elf_32.h 3236diff -urNp linux-2.6.32.18/arch/sparc/include/asm/elf_32.h linux-2.6.32.18/arch/sparc/include/asm/elf_32.h
3228--- linux-2.6.32.16/arch/sparc/include/asm/elf_32.h 2010-07-05 14:14:00.000000000 -0400 3237--- linux-2.6.32.18/arch/sparc/include/asm/elf_32.h 2010-08-10 13:45:57.000000000 -0400
3229+++ linux-2.6.32.16/arch/sparc/include/asm/elf_32.h 2010-07-09 14:50:35.000000000 -0400 3238+++ linux-2.6.32.18/arch/sparc/include/asm/elf_32.h 2010-08-11 18:57:29.000000000 -0400
3230@@ -116,6 +116,13 @@ typedef struct { 3239@@ -116,6 +116,13 @@ typedef struct {
3231 3240
3232 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) 3241 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -3241,9 +3250,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/elf_32.h linux-2.6.32.16/arch/
3241 /* This yields a mask that user programs can use to figure out what 3250 /* This yields a mask that user programs can use to figure out what
3242 instruction set this cpu supports. This can NOT be done in userspace 3251 instruction set this cpu supports. This can NOT be done in userspace
3243 on Sparc. */ 3252 on Sparc. */
3244diff -urNp linux-2.6.32.16/arch/sparc/include/asm/elf_64.h linux-2.6.32.16/arch/sparc/include/asm/elf_64.h 3253diff -urNp linux-2.6.32.18/arch/sparc/include/asm/elf_64.h linux-2.6.32.18/arch/sparc/include/asm/elf_64.h
3245--- linux-2.6.32.16/arch/sparc/include/asm/elf_64.h 2010-07-05 14:14:00.000000000 -0400 3254--- linux-2.6.32.18/arch/sparc/include/asm/elf_64.h 2010-08-10 13:45:57.000000000 -0400
3246+++ linux-2.6.32.16/arch/sparc/include/asm/elf_64.h 2010-07-09 14:50:35.000000000 -0400 3255+++ linux-2.6.32.18/arch/sparc/include/asm/elf_64.h 2010-08-11 18:57:29.000000000 -0400
3247@@ -163,6 +163,12 @@ typedef struct { 3256@@ -163,6 +163,12 @@ typedef struct {
3248 #define ELF_ET_DYN_BASE 0x0000010000000000UL 3257 #define ELF_ET_DYN_BASE 0x0000010000000000UL
3249 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL 3258 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -3257,9 +3266,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/elf_64.h linux-2.6.32.16/arch/
3257 3266
3258 /* This yields a mask that user programs can use to figure out what 3267 /* This yields a mask that user programs can use to figure out what
3259 instruction set this cpu supports. */ 3268 instruction set this cpu supports. */
3260diff -urNp linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h 3269diff -urNp linux-2.6.32.18/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.18/arch/sparc/include/asm/pgtable_32.h
3261--- linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h 2010-07-05 14:14:00.000000000 -0400 3270--- linux-2.6.32.18/arch/sparc/include/asm/pgtable_32.h 2010-08-10 13:45:57.000000000 -0400
3262+++ linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h 2010-07-09 14:50:35.000000000 -0400 3271+++ linux-2.6.32.18/arch/sparc/include/asm/pgtable_32.h 2010-08-11 18:57:29.000000000 -0400
3263@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) 3272@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
3264 BTFIXUPDEF_INT(page_none) 3273 BTFIXUPDEF_INT(page_none)
3265 BTFIXUPDEF_INT(page_copy) 3274 BTFIXUPDEF_INT(page_copy)
@@ -3291,9 +3300,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.16/a
3291 extern unsigned long page_kernel; 3300 extern unsigned long page_kernel;
3292 3301
3293 #ifdef MODULE 3302 #ifdef MODULE
3294diff -urNp linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h 3303diff -urNp linux-2.6.32.18/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.18/arch/sparc/include/asm/pgtsrmmu.h
3295--- linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h 2010-07-05 14:14:00.000000000 -0400 3304--- linux-2.6.32.18/arch/sparc/include/asm/pgtsrmmu.h 2010-08-10 13:45:57.000000000 -0400
3296+++ linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h 2010-07-09 14:50:35.000000000 -0400 3305+++ linux-2.6.32.18/arch/sparc/include/asm/pgtsrmmu.h 2010-08-11 18:57:29.000000000 -0400
3297@@ -115,6 +115,13 @@ 3306@@ -115,6 +115,13 @@
3298 SRMMU_EXEC | SRMMU_REF) 3307 SRMMU_EXEC | SRMMU_REF)
3299 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ 3308 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3308,9 +3317,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.16/arc
3308 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ 3317 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
3309 SRMMU_DIRTY | SRMMU_REF) 3318 SRMMU_DIRTY | SRMMU_REF)
3310 3319
3311diff -urNp linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h 3320diff -urNp linux-2.6.32.18/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.18/arch/sparc/include/asm/spinlock_64.h
3312--- linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h 2010-07-05 14:14:00.000000000 -0400 3321--- linux-2.6.32.18/arch/sparc/include/asm/spinlock_64.h 2010-08-10 13:45:57.000000000 -0400
3313+++ linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h 2010-07-09 14:50:35.000000000 -0400 3322+++ linux-2.6.32.18/arch/sparc/include/asm/spinlock_64.h 2010-08-11 18:57:29.000000000 -0400
3314@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw 3323@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
3315 __asm__ __volatile__ ( 3324 __asm__ __volatile__ (
3316 "1: ldsw [%2], %0\n" 3325 "1: ldsw [%2], %0\n"
@@ -3362,9 +3371,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.16/
3362 " cas [%2], %0, %1\n" 3371 " cas [%2], %0, %1\n"
3363 " cmp %0, %1\n" 3372 " cmp %0, %1\n"
3364 " bne,pn %%xcc, 1b\n" 3373 " bne,pn %%xcc, 1b\n"
3365diff -urNp linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h 3374diff -urNp linux-2.6.32.18/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.18/arch/sparc/include/asm/uaccess_32.h
3366--- linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h 2010-07-05 14:14:00.000000000 -0400 3375--- linux-2.6.32.18/arch/sparc/include/asm/uaccess_32.h 2010-08-10 13:45:57.000000000 -0400
3367+++ linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h 2010-07-09 14:50:35.000000000 -0400 3376+++ linux-2.6.32.18/arch/sparc/include/asm/uaccess_32.h 2010-08-11 19:04:36.000000000 -0400
3368@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ 3377@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
3369 3378
3370 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) 3379 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3416,9 +3425,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.16/a
3416 return __copy_user((__force void __user *) to, from, n); 3425 return __copy_user((__force void __user *) to, from, n);
3417 } 3426 }
3418 3427
3419diff -urNp linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h 3428diff -urNp linux-2.6.32.18/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.18/arch/sparc/include/asm/uaccess_64.h
3420--- linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h 2010-07-05 14:14:00.000000000 -0400 3429--- linux-2.6.32.18/arch/sparc/include/asm/uaccess_64.h 2010-08-10 13:45:57.000000000 -0400
3421+++ linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h 2010-07-09 14:50:35.000000000 -0400 3430+++ linux-2.6.32.18/arch/sparc/include/asm/uaccess_64.h 2010-08-11 19:04:36.000000000 -0400
3422@@ -9,6 +9,7 @@ 3431@@ -9,6 +9,7 @@
3423 #include <linux/compiler.h> 3432 #include <linux/compiler.h>
3424 #include <linux/string.h> 3433 #include <linux/string.h>
@@ -3461,21 +3470,26 @@ diff -urNp linux-2.6.32.16/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.16/a
3461 if (unlikely(ret)) 3470 if (unlikely(ret))
3462 ret = copy_to_user_fixup(to, from, size); 3471 ret = copy_to_user_fixup(to, from, size);
3463 return ret; 3472 return ret;
3464diff -urNp linux-2.6.32.16/arch/sparc/include/asm/uaccess.h linux-2.6.32.16/arch/sparc/include/asm/uaccess.h 3473diff -urNp linux-2.6.32.18/arch/sparc/include/asm/uaccess.h linux-2.6.32.18/arch/sparc/include/asm/uaccess.h
3465--- linux-2.6.32.16/arch/sparc/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 3474--- linux-2.6.32.18/arch/sparc/include/asm/uaccess.h 2010-08-10 13:45:57.000000000 -0400
3466+++ linux-2.6.32.16/arch/sparc/include/asm/uaccess.h 2010-07-09 14:50:35.000000000 -0400 3475+++ linux-2.6.32.18/arch/sparc/include/asm/uaccess.h 2010-08-11 19:02:29.000000000 -0400
3467@@ -1,5 +1,8 @@ 3476@@ -1,5 +1,13 @@
3468 #ifndef ___ASM_SPARC_UACCESS_H 3477 #ifndef ___ASM_SPARC_UACCESS_H
3469 #define ___ASM_SPARC_UACCESS_H 3478 #define ___ASM_SPARC_UACCESS_H
3470+ 3479+
3480+#ifdef __KERNEL__
3481+#ifndef __ASSEMBLY__
3482+#include <linux/types.h>
3471+extern void check_object_size(const void *ptr, unsigned long n, bool to); 3483+extern void check_object_size(const void *ptr, unsigned long n, bool to);
3484+#endif
3485+#endif
3472+ 3486+
3473 #if defined(__sparc__) && defined(__arch64__) 3487 #if defined(__sparc__) && defined(__arch64__)
3474 #include <asm/uaccess_64.h> 3488 #include <asm/uaccess_64.h>
3475 #else 3489 #else
3476diff -urNp linux-2.6.32.16/arch/sparc/kernel/iommu.c linux-2.6.32.16/arch/sparc/kernel/iommu.c 3490diff -urNp linux-2.6.32.18/arch/sparc/kernel/iommu.c linux-2.6.32.18/arch/sparc/kernel/iommu.c
3477--- linux-2.6.32.16/arch/sparc/kernel/iommu.c 2010-07-05 14:14:00.000000000 -0400 3491--- linux-2.6.32.18/arch/sparc/kernel/iommu.c 2010-08-10 13:45:57.000000000 -0400
3478+++ linux-2.6.32.16/arch/sparc/kernel/iommu.c 2010-07-09 14:50:35.000000000 -0400 3492+++ linux-2.6.32.18/arch/sparc/kernel/iommu.c 2010-08-11 18:57:29.000000000 -0400
3479@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc 3493@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
3480 spin_unlock_irqrestore(&iommu->lock, flags); 3494 spin_unlock_irqrestore(&iommu->lock, flags);
3481 } 3495 }
@@ -3494,9 +3508,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/iommu.c linux-2.6.32.16/arch/sparc/
3494 EXPORT_SYMBOL(dma_ops); 3508 EXPORT_SYMBOL(dma_ops);
3495 3509
3496 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); 3510 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
3497diff -urNp linux-2.6.32.16/arch/sparc/kernel/ioport.c linux-2.6.32.16/arch/sparc/kernel/ioport.c 3511diff -urNp linux-2.6.32.18/arch/sparc/kernel/ioport.c linux-2.6.32.18/arch/sparc/kernel/ioport.c
3498--- linux-2.6.32.16/arch/sparc/kernel/ioport.c 2010-07-05 14:14:00.000000000 -0400 3512--- linux-2.6.32.18/arch/sparc/kernel/ioport.c 2010-08-10 13:45:57.000000000 -0400
3499+++ linux-2.6.32.16/arch/sparc/kernel/ioport.c 2010-07-09 14:50:35.000000000 -0400 3513+++ linux-2.6.32.18/arch/sparc/kernel/ioport.c 2010-08-11 18:57:29.000000000 -0400
3500@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru 3514@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
3501 BUG(); 3515 BUG();
3502 } 3516 }
@@ -3524,9 +3538,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/ioport.c linux-2.6.32.16/arch/sparc
3524 .alloc_coherent = pci32_alloc_coherent, 3538 .alloc_coherent = pci32_alloc_coherent,
3525 .free_coherent = pci32_free_coherent, 3539 .free_coherent = pci32_free_coherent,
3526 .map_page = pci32_map_page, 3540 .map_page = pci32_map_page,
3527diff -urNp linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c 3541diff -urNp linux-2.6.32.18/arch/sparc/kernel/kgdb_32.c linux-2.6.32.18/arch/sparc/kernel/kgdb_32.c
3528--- linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c 2010-07-05 14:14:00.000000000 -0400 3542--- linux-2.6.32.18/arch/sparc/kernel/kgdb_32.c 2010-08-10 13:45:57.000000000 -0400
3529+++ linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c 2010-07-09 14:50:35.000000000 -0400 3543+++ linux-2.6.32.18/arch/sparc/kernel/kgdb_32.c 2010-08-11 18:57:29.000000000 -0400
3530@@ -158,7 +158,7 @@ void kgdb_arch_exit(void) 3544@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
3531 { 3545 {
3532 } 3546 }
@@ -3536,9 +3550,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/kgdb_32.c linux-2.6.32.16/arch/spar
3536 /* Breakpoint instruction: ta 0x7d */ 3550 /* Breakpoint instruction: ta 0x7d */
3537 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, 3551 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
3538 }; 3552 };
3539diff -urNp linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c 3553diff -urNp linux-2.6.32.18/arch/sparc/kernel/kgdb_64.c linux-2.6.32.18/arch/sparc/kernel/kgdb_64.c
3540--- linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c 2010-07-05 14:14:00.000000000 -0400 3554--- linux-2.6.32.18/arch/sparc/kernel/kgdb_64.c 2010-08-10 13:45:57.000000000 -0400
3541+++ linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c 2010-07-09 14:50:35.000000000 -0400 3555+++ linux-2.6.32.18/arch/sparc/kernel/kgdb_64.c 2010-08-11 18:57:29.000000000 -0400
3542@@ -180,7 +180,7 @@ void kgdb_arch_exit(void) 3556@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
3543 { 3557 {
3544 } 3558 }
@@ -3548,9 +3562,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/kgdb_64.c linux-2.6.32.16/arch/spar
3548 /* Breakpoint instruction: ta 0x72 */ 3562 /* Breakpoint instruction: ta 0x72 */
3549 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, 3563 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
3550 }; 3564 };
3551diff -urNp linux-2.6.32.16/arch/sparc/kernel/Makefile linux-2.6.32.16/arch/sparc/kernel/Makefile 3565diff -urNp linux-2.6.32.18/arch/sparc/kernel/Makefile linux-2.6.32.18/arch/sparc/kernel/Makefile
3552--- linux-2.6.32.16/arch/sparc/kernel/Makefile 2010-07-05 14:14:00.000000000 -0400 3566--- linux-2.6.32.18/arch/sparc/kernel/Makefile 2010-08-10 13:45:57.000000000 -0400
3553+++ linux-2.6.32.16/arch/sparc/kernel/Makefile 2010-07-09 14:50:35.000000000 -0400 3567+++ linux-2.6.32.18/arch/sparc/kernel/Makefile 2010-08-11 18:57:29.000000000 -0400
3554@@ -3,7 +3,7 @@ 3568@@ -3,7 +3,7 @@
3555 # 3569 #
3556 3570
@@ -3560,9 +3574,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/Makefile linux-2.6.32.16/arch/sparc
3560 3574
3561 extra-y := head_$(BITS).o 3575 extra-y := head_$(BITS).o
3562 extra-y += init_task.o 3576 extra-y += init_task.o
3563diff -urNp linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c 3577diff -urNp linux-2.6.32.18/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.18/arch/sparc/kernel/pci_sun4v.c
3564--- linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c 2010-07-05 14:14:00.000000000 -0400 3578--- linux-2.6.32.18/arch/sparc/kernel/pci_sun4v.c 2010-08-10 13:45:57.000000000 -0400
3565+++ linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c 2010-07-09 14:50:35.000000000 -0400 3579+++ linux-2.6.32.18/arch/sparc/kernel/pci_sun4v.c 2010-08-11 18:57:29.000000000 -0400
3566@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic 3580@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
3567 spin_unlock_irqrestore(&iommu->lock, flags); 3581 spin_unlock_irqrestore(&iommu->lock, flags);
3568 } 3582 }
@@ -3572,9 +3586,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.16/arch/sp
3572 .alloc_coherent = dma_4v_alloc_coherent, 3586 .alloc_coherent = dma_4v_alloc_coherent,
3573 .free_coherent = dma_4v_free_coherent, 3587 .free_coherent = dma_4v_free_coherent,
3574 .map_page = dma_4v_map_page, 3588 .map_page = dma_4v_map_page,
3575diff -urNp linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c 3589diff -urNp linux-2.6.32.18/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.18/arch/sparc/kernel/sys_sparc_32.c
3576--- linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c 2010-07-05 14:14:00.000000000 -0400 3590--- linux-2.6.32.18/arch/sparc/kernel/sys_sparc_32.c 2010-08-10 13:45:57.000000000 -0400
3577+++ linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c 2010-07-09 14:50:35.000000000 -0400 3591+++ linux-2.6.32.18/arch/sparc/kernel/sys_sparc_32.c 2010-08-11 18:57:29.000000000 -0400
3578@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str 3592@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
3579 if (ARCH_SUN4C && len > 0x20000000) 3593 if (ARCH_SUN4C && len > 0x20000000)
3580 return -ENOMEM; 3594 return -ENOMEM;
@@ -3584,9 +3598,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.16/arch
3584 3598
3585 if (flags & MAP_SHARED) 3599 if (flags & MAP_SHARED)
3586 addr = COLOUR_ALIGN(addr); 3600 addr = COLOUR_ALIGN(addr);
3587diff -urNp linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c 3601diff -urNp linux-2.6.32.18/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.18/arch/sparc/kernel/sys_sparc_64.c
3588--- linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c 2010-07-05 14:14:00.000000000 -0400 3602--- linux-2.6.32.18/arch/sparc/kernel/sys_sparc_64.c 2010-08-10 13:45:57.000000000 -0400
3589+++ linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c 2010-07-09 14:50:35.000000000 -0400 3603+++ linux-2.6.32.18/arch/sparc/kernel/sys_sparc_64.c 2010-08-11 18:57:29.000000000 -0400
3590@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str 3604@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
3591 /* We do not accept a shared mapping if it would violate 3605 /* We do not accept a shared mapping if it would violate
3592 * cache aliasing constraints. 3606 * cache aliasing constraints.
@@ -3665,9 +3679,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.16/arch
3665 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 3679 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
3666 mm->unmap_area = arch_unmap_area_topdown; 3680 mm->unmap_area = arch_unmap_area_topdown;
3667 } 3681 }
3668diff -urNp linux-2.6.32.16/arch/sparc/kernel/traps_64.c linux-2.6.32.16/arch/sparc/kernel/traps_64.c 3682diff -urNp linux-2.6.32.18/arch/sparc/kernel/traps_64.c linux-2.6.32.18/arch/sparc/kernel/traps_64.c
3669--- linux-2.6.32.16/arch/sparc/kernel/traps_64.c 2010-07-05 14:14:00.000000000 -0400 3683--- linux-2.6.32.18/arch/sparc/kernel/traps_64.c 2010-08-10 13:45:57.000000000 -0400
3670+++ linux-2.6.32.16/arch/sparc/kernel/traps_64.c 2010-07-09 14:50:35.000000000 -0400 3684+++ linux-2.6.32.18/arch/sparc/kernel/traps_64.c 2010-08-11 18:57:29.000000000 -0400
3671@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long 3685@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long
3672 3686
3673 lvl -= 0x100; 3687 lvl -= 0x100;
@@ -3699,9 +3713,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/kernel/traps_64.c linux-2.6.32.16/arch/spa
3699 dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); 3713 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
3700 3714
3701 sprintf (buffer, "Bad trap %lx at tl>0", lvl); 3715 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
3702diff -urNp linux-2.6.32.16/arch/sparc/lib/atomic_64.S linux-2.6.32.16/arch/sparc/lib/atomic_64.S 3716diff -urNp linux-2.6.32.18/arch/sparc/lib/atomic_64.S linux-2.6.32.18/arch/sparc/lib/atomic_64.S
3703--- linux-2.6.32.16/arch/sparc/lib/atomic_64.S 2010-07-05 14:14:00.000000000 -0400 3717--- linux-2.6.32.18/arch/sparc/lib/atomic_64.S 2010-08-10 13:45:57.000000000 -0400
3704+++ linux-2.6.32.16/arch/sparc/lib/atomic_64.S 2010-07-09 14:50:35.000000000 -0400 3718+++ linux-2.6.32.18/arch/sparc/lib/atomic_64.S 2010-08-11 18:57:29.000000000 -0400
3705@@ -18,7 +18,12 @@ 3719@@ -18,7 +18,12 @@
3706 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ 3720 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
3707 BACKOFF_SETUP(%o2) 3721 BACKOFF_SETUP(%o2)
@@ -3915,9 +3929,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/lib/atomic_64.S linux-2.6.32.16/arch/sparc
3915 casx [%o1], %g1, %g7 3929 casx [%o1], %g1, %g7
3916 cmp %g1, %g7 3930 cmp %g1, %g7
3917 bne,pn %xcc, 2f 3931 bne,pn %xcc, 2f
3918diff -urNp linux-2.6.32.16/arch/sparc/lib/ksyms.c linux-2.6.32.16/arch/sparc/lib/ksyms.c 3932diff -urNp linux-2.6.32.18/arch/sparc/lib/ksyms.c linux-2.6.32.18/arch/sparc/lib/ksyms.c
3919--- linux-2.6.32.16/arch/sparc/lib/ksyms.c 2010-07-05 14:14:00.000000000 -0400 3933--- linux-2.6.32.18/arch/sparc/lib/ksyms.c 2010-08-10 13:45:57.000000000 -0400
3920+++ linux-2.6.32.16/arch/sparc/lib/ksyms.c 2010-07-09 14:50:35.000000000 -0400 3934+++ linux-2.6.32.18/arch/sparc/lib/ksyms.c 2010-08-11 18:57:29.000000000 -0400
3921@@ -144,12 +144,15 @@ EXPORT_SYMBOL(__downgrade_write); 3935@@ -144,12 +144,15 @@ EXPORT_SYMBOL(__downgrade_write);
3922 3936
3923 /* Atomic counter implementation. */ 3937 /* Atomic counter implementation. */
@@ -3934,9 +3948,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/lib/ksyms.c linux-2.6.32.16/arch/sparc/lib
3934 EXPORT_SYMBOL(atomic64_sub_ret); 3948 EXPORT_SYMBOL(atomic64_sub_ret);
3935 3949
3936 /* Atomic bit operations. */ 3950 /* Atomic bit operations. */
3937diff -urNp linux-2.6.32.16/arch/sparc/lib/rwsem_64.S linux-2.6.32.16/arch/sparc/lib/rwsem_64.S 3951diff -urNp linux-2.6.32.18/arch/sparc/lib/rwsem_64.S linux-2.6.32.18/arch/sparc/lib/rwsem_64.S
3938--- linux-2.6.32.16/arch/sparc/lib/rwsem_64.S 2010-07-05 14:14:00.000000000 -0400 3952--- linux-2.6.32.18/arch/sparc/lib/rwsem_64.S 2010-08-10 13:45:57.000000000 -0400
3939+++ linux-2.6.32.16/arch/sparc/lib/rwsem_64.S 2010-07-09 14:50:35.000000000 -0400 3953+++ linux-2.6.32.18/arch/sparc/lib/rwsem_64.S 2010-08-11 18:57:29.000000000 -0400
3940@@ -11,7 +11,12 @@ 3954@@ -11,7 +11,12 @@
3941 .globl __down_read 3955 .globl __down_read
3942 __down_read: 3956 __down_read:
@@ -4035,9 +4049,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/lib/rwsem_64.S linux-2.6.32.16/arch/sparc/
4035 cas [%o0], %g3, %g7 4049 cas [%o0], %g3, %g7
4036 cmp %g3, %g7 4050 cmp %g3, %g7
4037 bne,pn %icc, 1b 4051 bne,pn %icc, 1b
4038diff -urNp linux-2.6.32.16/arch/sparc/Makefile linux-2.6.32.16/arch/sparc/Makefile 4052diff -urNp linux-2.6.32.18/arch/sparc/Makefile linux-2.6.32.18/arch/sparc/Makefile
4039--- linux-2.6.32.16/arch/sparc/Makefile 2010-07-05 14:14:00.000000000 -0400 4053--- linux-2.6.32.18/arch/sparc/Makefile 2010-08-10 13:45:57.000000000 -0400
4040+++ linux-2.6.32.16/arch/sparc/Makefile 2010-07-09 14:50:35.000000000 -0400 4054+++ linux-2.6.32.18/arch/sparc/Makefile 2010-08-11 18:57:29.000000000 -0400
4041@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc 4055@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
4042 # Export what is needed by arch/sparc/boot/Makefile 4056 # Export what is needed by arch/sparc/boot/Makefile
4043 export VMLINUX_INIT VMLINUX_MAIN 4057 export VMLINUX_INIT VMLINUX_MAIN
@@ -4047,9 +4061,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/Makefile linux-2.6.32.16/arch/sparc/Makefi
4047 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) 4061 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
4048 VMLINUX_MAIN += $(drivers-y) $(net-y) 4062 VMLINUX_MAIN += $(drivers-y) $(net-y)
4049 4063
4050diff -urNp linux-2.6.32.16/arch/sparc/mm/fault_32.c linux-2.6.32.16/arch/sparc/mm/fault_32.c 4064diff -urNp linux-2.6.32.18/arch/sparc/mm/fault_32.c linux-2.6.32.18/arch/sparc/mm/fault_32.c
4051--- linux-2.6.32.16/arch/sparc/mm/fault_32.c 2010-07-05 14:14:00.000000000 -0400 4065--- linux-2.6.32.18/arch/sparc/mm/fault_32.c 2010-08-10 13:45:57.000000000 -0400
4052+++ linux-2.6.32.16/arch/sparc/mm/fault_32.c 2010-07-09 14:50:35.000000000 -0400 4066+++ linux-2.6.32.18/arch/sparc/mm/fault_32.c 2010-08-11 18:57:29.000000000 -0400
4053@@ -21,6 +21,9 @@ 4067@@ -21,6 +21,9 @@
4054 #include <linux/interrupt.h> 4068 #include <linux/interrupt.h>
4055 #include <linux/module.h> 4069 #include <linux/module.h>
@@ -4353,9 +4367,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/mm/fault_32.c linux-2.6.32.16/arch/sparc/m
4353 /* Allow reads even for write-only mappings */ 4367 /* Allow reads even for write-only mappings */
4354 if(!(vma->vm_flags & (VM_READ | VM_EXEC))) 4368 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
4355 goto bad_area; 4369 goto bad_area;
4356diff -urNp linux-2.6.32.16/arch/sparc/mm/fault_64.c linux-2.6.32.16/arch/sparc/mm/fault_64.c 4370diff -urNp linux-2.6.32.18/arch/sparc/mm/fault_64.c linux-2.6.32.18/arch/sparc/mm/fault_64.c
4357--- linux-2.6.32.16/arch/sparc/mm/fault_64.c 2010-07-05 14:14:00.000000000 -0400 4371--- linux-2.6.32.18/arch/sparc/mm/fault_64.c 2010-08-10 13:45:57.000000000 -0400
4358+++ linux-2.6.32.16/arch/sparc/mm/fault_64.c 2010-07-09 14:50:35.000000000 -0400 4372+++ linux-2.6.32.18/arch/sparc/mm/fault_64.c 2010-08-11 18:57:29.000000000 -0400
4359@@ -20,6 +20,9 @@ 4373@@ -20,6 +20,9 @@
4360 #include <linux/kprobes.h> 4374 #include <linux/kprobes.h>
4361 #include <linux/kdebug.h> 4375 #include <linux/kdebug.h>
@@ -4853,9 +4867,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/mm/fault_64.c linux-2.6.32.16/arch/sparc/m
4853 /* Pure DTLB misses do not tell us whether the fault causing 4867 /* Pure DTLB misses do not tell us whether the fault causing
4854 * load/store/atomic was a write or not, it only says that there 4868 * load/store/atomic was a write or not, it only says that there
4855 * was no match. So in such a case we (carefully) read the 4869 * was no match. So in such a case we (carefully) read the
4856diff -urNp linux-2.6.32.16/arch/sparc/mm/init_32.c linux-2.6.32.16/arch/sparc/mm/init_32.c 4870diff -urNp linux-2.6.32.18/arch/sparc/mm/init_32.c linux-2.6.32.18/arch/sparc/mm/init_32.c
4857--- linux-2.6.32.16/arch/sparc/mm/init_32.c 2010-07-05 14:14:00.000000000 -0400 4871--- linux-2.6.32.18/arch/sparc/mm/init_32.c 2010-08-10 13:45:57.000000000 -0400
4858+++ linux-2.6.32.16/arch/sparc/mm/init_32.c 2010-07-09 14:50:35.000000000 -0400 4872+++ linux-2.6.32.18/arch/sparc/mm/init_32.c 2010-08-11 18:57:29.000000000 -0400
4859@@ -317,6 +317,9 @@ extern void device_scan(void); 4873@@ -317,6 +317,9 @@ extern void device_scan(void);
4860 pgprot_t PAGE_SHARED __read_mostly; 4874 pgprot_t PAGE_SHARED __read_mostly;
4861 EXPORT_SYMBOL(PAGE_SHARED); 4875 EXPORT_SYMBOL(PAGE_SHARED);
@@ -4890,9 +4904,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/mm/init_32.c linux-2.6.32.16/arch/sparc/mm
4890 protection_map[12] = PAGE_READONLY; 4904 protection_map[12] = PAGE_READONLY;
4891 protection_map[13] = PAGE_READONLY; 4905 protection_map[13] = PAGE_READONLY;
4892 protection_map[14] = PAGE_SHARED; 4906 protection_map[14] = PAGE_SHARED;
4893diff -urNp linux-2.6.32.16/arch/sparc/mm/Makefile linux-2.6.32.16/arch/sparc/mm/Makefile 4907diff -urNp linux-2.6.32.18/arch/sparc/mm/Makefile linux-2.6.32.18/arch/sparc/mm/Makefile
4894--- linux-2.6.32.16/arch/sparc/mm/Makefile 2010-07-05 14:14:00.000000000 -0400 4908--- linux-2.6.32.18/arch/sparc/mm/Makefile 2010-08-10 13:45:57.000000000 -0400
4895+++ linux-2.6.32.16/arch/sparc/mm/Makefile 2010-07-09 14:50:35.000000000 -0400 4909+++ linux-2.6.32.18/arch/sparc/mm/Makefile 2010-08-11 18:57:29.000000000 -0400
4896@@ -2,7 +2,7 @@ 4910@@ -2,7 +2,7 @@
4897 # 4911 #
4898 4912
@@ -4902,9 +4916,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/mm/Makefile linux-2.6.32.16/arch/sparc/mm/
4902 4916
4903 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o 4917 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
4904 obj-y += fault_$(BITS).o 4918 obj-y += fault_$(BITS).o
4905diff -urNp linux-2.6.32.16/arch/sparc/mm/srmmu.c linux-2.6.32.16/arch/sparc/mm/srmmu.c 4919diff -urNp linux-2.6.32.18/arch/sparc/mm/srmmu.c linux-2.6.32.18/arch/sparc/mm/srmmu.c
4906--- linux-2.6.32.16/arch/sparc/mm/srmmu.c 2010-07-05 14:14:00.000000000 -0400 4920--- linux-2.6.32.18/arch/sparc/mm/srmmu.c 2010-08-10 13:45:57.000000000 -0400
4907+++ linux-2.6.32.16/arch/sparc/mm/srmmu.c 2010-07-09 14:50:35.000000000 -0400 4921+++ linux-2.6.32.18/arch/sparc/mm/srmmu.c 2010-08-11 18:57:29.000000000 -0400
4908@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) 4922@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
4909 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); 4923 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
4910 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); 4924 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -4919,9 +4933,9 @@ diff -urNp linux-2.6.32.16/arch/sparc/mm/srmmu.c linux-2.6.32.16/arch/sparc/mm/s
4919 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); 4933 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
4920 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); 4934 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
4921 4935
4922diff -urNp linux-2.6.32.16/arch/um/include/asm/kmap_types.h linux-2.6.32.16/arch/um/include/asm/kmap_types.h 4936diff -urNp linux-2.6.32.18/arch/um/include/asm/kmap_types.h linux-2.6.32.18/arch/um/include/asm/kmap_types.h
4923--- linux-2.6.32.16/arch/um/include/asm/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 4937--- linux-2.6.32.18/arch/um/include/asm/kmap_types.h 2010-08-10 13:45:57.000000000 -0400
4924+++ linux-2.6.32.16/arch/um/include/asm/kmap_types.h 2010-07-09 14:50:35.000000000 -0400 4938+++ linux-2.6.32.18/arch/um/include/asm/kmap_types.h 2010-08-11 18:57:29.000000000 -0400
4925@@ -23,6 +23,7 @@ enum km_type { 4939@@ -23,6 +23,7 @@ enum km_type {
4926 KM_IRQ1, 4940 KM_IRQ1,
4927 KM_SOFTIRQ0, 4941 KM_SOFTIRQ0,
@@ -4930,9 +4944,9 @@ diff -urNp linux-2.6.32.16/arch/um/include/asm/kmap_types.h linux-2.6.32.16/arch
4930 KM_TYPE_NR 4944 KM_TYPE_NR
4931 }; 4945 };
4932 4946
4933diff -urNp linux-2.6.32.16/arch/um/include/asm/page.h linux-2.6.32.16/arch/um/include/asm/page.h 4947diff -urNp linux-2.6.32.18/arch/um/include/asm/page.h linux-2.6.32.18/arch/um/include/asm/page.h
4934--- linux-2.6.32.16/arch/um/include/asm/page.h 2010-07-05 14:14:00.000000000 -0400 4948--- linux-2.6.32.18/arch/um/include/asm/page.h 2010-08-10 13:45:57.000000000 -0400
4935+++ linux-2.6.32.16/arch/um/include/asm/page.h 2010-07-09 14:50:35.000000000 -0400 4949+++ linux-2.6.32.18/arch/um/include/asm/page.h 2010-08-11 18:57:29.000000000 -0400
4936@@ -14,6 +14,9 @@ 4950@@ -14,6 +14,9 @@
4937 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) 4951 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
4938 #define PAGE_MASK (~(PAGE_SIZE-1)) 4952 #define PAGE_MASK (~(PAGE_SIZE-1))
@@ -4943,9 +4957,9 @@ diff -urNp linux-2.6.32.16/arch/um/include/asm/page.h linux-2.6.32.16/arch/um/in
4943 #ifndef __ASSEMBLY__ 4957 #ifndef __ASSEMBLY__
4944 4958
4945 struct page; 4959 struct page;
4946diff -urNp linux-2.6.32.16/arch/um/sys-i386/syscalls.c linux-2.6.32.16/arch/um/sys-i386/syscalls.c 4960diff -urNp linux-2.6.32.18/arch/um/sys-i386/syscalls.c linux-2.6.32.18/arch/um/sys-i386/syscalls.c
4947--- linux-2.6.32.16/arch/um/sys-i386/syscalls.c 2010-07-05 14:14:00.000000000 -0400 4961--- linux-2.6.32.18/arch/um/sys-i386/syscalls.c 2010-08-10 13:45:57.000000000 -0400
4948+++ linux-2.6.32.16/arch/um/sys-i386/syscalls.c 2010-07-09 14:50:35.000000000 -0400 4962+++ linux-2.6.32.18/arch/um/sys-i386/syscalls.c 2010-08-11 18:57:29.000000000 -0400
4949@@ -11,6 +11,21 @@ 4963@@ -11,6 +11,21 @@
4950 #include "asm/uaccess.h" 4964 #include "asm/uaccess.h"
4951 #include "asm/unistd.h" 4965 #include "asm/unistd.h"
@@ -4968,9 +4982,9 @@ diff -urNp linux-2.6.32.16/arch/um/sys-i386/syscalls.c linux-2.6.32.16/arch/um/s
4968 /* 4982 /*
4969 * Perform the select(nd, in, out, ex, tv) and mmap() system 4983 * Perform the select(nd, in, out, ex, tv) and mmap() system
4970 * calls. Linux/i386 didn't use to be able to handle more than 4984 * calls. Linux/i386 didn't use to be able to handle more than
4971diff -urNp linux-2.6.32.16/arch/x86/boot/bitops.h linux-2.6.32.16/arch/x86/boot/bitops.h 4985diff -urNp linux-2.6.32.18/arch/x86/boot/bitops.h linux-2.6.32.18/arch/x86/boot/bitops.h
4972--- linux-2.6.32.16/arch/x86/boot/bitops.h 2010-07-05 14:14:00.000000000 -0400 4986--- linux-2.6.32.18/arch/x86/boot/bitops.h 2010-08-10 13:45:57.000000000 -0400
4973+++ linux-2.6.32.16/arch/x86/boot/bitops.h 2010-07-09 14:50:35.000000000 -0400 4987+++ linux-2.6.32.18/arch/x86/boot/bitops.h 2010-08-11 18:57:29.000000000 -0400
4974@@ -26,7 +26,7 @@ static inline int variable_test_bit(int 4988@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
4975 u8 v; 4989 u8 v;
4976 const u32 *p = (const u32 *)addr; 4990 const u32 *p = (const u32 *)addr;
@@ -4989,9 +5003,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/bitops.h linux-2.6.32.16/arch/x86/boot/
4989 } 5003 }
4990 5004
4991 #endif /* BOOT_BITOPS_H */ 5005 #endif /* BOOT_BITOPS_H */
4992diff -urNp linux-2.6.32.16/arch/x86/boot/boot.h linux-2.6.32.16/arch/x86/boot/boot.h 5006diff -urNp linux-2.6.32.18/arch/x86/boot/boot.h linux-2.6.32.18/arch/x86/boot/boot.h
4993--- linux-2.6.32.16/arch/x86/boot/boot.h 2010-07-05 14:14:00.000000000 -0400 5007--- linux-2.6.32.18/arch/x86/boot/boot.h 2010-08-10 13:45:57.000000000 -0400
4994+++ linux-2.6.32.16/arch/x86/boot/boot.h 2010-07-09 14:50:35.000000000 -0400 5008+++ linux-2.6.32.18/arch/x86/boot/boot.h 2010-08-11 18:57:29.000000000 -0400
4995@@ -82,7 +82,7 @@ static inline void io_delay(void) 5009@@ -82,7 +82,7 @@ static inline void io_delay(void)
4996 static inline u16 ds(void) 5010 static inline u16 ds(void)
4997 { 5011 {
@@ -5010,9 +5024,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/boot.h linux-2.6.32.16/arch/x86/boot/bo
5010 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); 5024 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
5011 return diff; 5025 return diff;
5012 } 5026 }
5013diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/head_32.S linux-2.6.32.16/arch/x86/boot/compressed/head_32.S 5027diff -urNp linux-2.6.32.18/arch/x86/boot/compressed/head_32.S linux-2.6.32.18/arch/x86/boot/compressed/head_32.S
5014--- linux-2.6.32.16/arch/x86/boot/compressed/head_32.S 2010-07-05 14:14:00.000000000 -0400 5028--- linux-2.6.32.18/arch/x86/boot/compressed/head_32.S 2010-08-10 13:45:57.000000000 -0400
5015+++ linux-2.6.32.16/arch/x86/boot/compressed/head_32.S 2010-07-09 14:50:35.000000000 -0400 5029+++ linux-2.6.32.18/arch/x86/boot/compressed/head_32.S 2010-08-11 18:57:29.000000000 -0400
5016@@ -76,7 +76,7 @@ ENTRY(startup_32) 5030@@ -76,7 +76,7 @@ ENTRY(startup_32)
5017 notl %eax 5031 notl %eax
5018 andl %eax, %ebx 5032 andl %eax, %ebx
@@ -5041,9 +5055,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/head_32.S linux-2.6.32.16/ar
5041 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) 5055 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
5042 jmp 1b 5056 jmp 1b
5043 2: 5057 2:
5044diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/head_64.S linux-2.6.32.16/arch/x86/boot/compressed/head_64.S 5058diff -urNp linux-2.6.32.18/arch/x86/boot/compressed/head_64.S linux-2.6.32.18/arch/x86/boot/compressed/head_64.S
5045--- linux-2.6.32.16/arch/x86/boot/compressed/head_64.S 2010-07-05 14:14:00.000000000 -0400 5059--- linux-2.6.32.18/arch/x86/boot/compressed/head_64.S 2010-08-10 13:45:57.000000000 -0400
5046+++ linux-2.6.32.16/arch/x86/boot/compressed/head_64.S 2010-07-09 14:50:35.000000000 -0400 5060+++ linux-2.6.32.18/arch/x86/boot/compressed/head_64.S 2010-08-11 18:57:29.000000000 -0400
5047@@ -91,7 +91,7 @@ ENTRY(startup_32) 5061@@ -91,7 +91,7 @@ ENTRY(startup_32)
5048 notl %eax 5062 notl %eax
5049 andl %eax, %ebx 5063 andl %eax, %ebx
@@ -5062,9 +5076,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/head_64.S linux-2.6.32.16/ar
5062 #endif 5076 #endif
5063 5077
5064 /* Target address to relocate to for decompression */ 5078 /* Target address to relocate to for decompression */
5065diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/misc.c linux-2.6.32.16/arch/x86/boot/compressed/misc.c 5079diff -urNp linux-2.6.32.18/arch/x86/boot/compressed/misc.c linux-2.6.32.18/arch/x86/boot/compressed/misc.c
5066--- linux-2.6.32.16/arch/x86/boot/compressed/misc.c 2010-07-05 14:14:00.000000000 -0400 5080--- linux-2.6.32.18/arch/x86/boot/compressed/misc.c 2010-08-10 13:45:57.000000000 -0400
5067+++ linux-2.6.32.16/arch/x86/boot/compressed/misc.c 2010-07-09 14:50:35.000000000 -0400 5081+++ linux-2.6.32.18/arch/x86/boot/compressed/misc.c 2010-08-11 18:57:29.000000000 -0400
5068@@ -288,7 +288,7 @@ static void parse_elf(void *output) 5082@@ -288,7 +288,7 @@ static void parse_elf(void *output)
5069 case PT_LOAD: 5083 case PT_LOAD:
5070 #ifdef CONFIG_RELOCATABLE 5084 #ifdef CONFIG_RELOCATABLE
@@ -5083,9 +5097,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/misc.c linux-2.6.32.16/arch/
5083 error("Wrong destination address"); 5097 error("Wrong destination address");
5084 #endif 5098 #endif
5085 5099
5086diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c 5100diff -urNp linux-2.6.32.18/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.18/arch/x86/boot/compressed/mkpiggy.c
5087--- linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c 2010-07-05 14:14:00.000000000 -0400 5101--- linux-2.6.32.18/arch/x86/boot/compressed/mkpiggy.c 2010-08-10 13:45:57.000000000 -0400
5088+++ linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c 2010-07-09 14:50:35.000000000 -0400 5102+++ linux-2.6.32.18/arch/x86/boot/compressed/mkpiggy.c 2010-08-11 18:57:29.000000000 -0400
5089@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) 5103@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
5090 5104
5091 offs = (olen > ilen) ? olen - ilen : 0; 5105 offs = (olen > ilen) ? olen - ilen : 0;
@@ -5095,9 +5109,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.16/ar
5095 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ 5109 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
5096 5110
5097 printf(".section \".rodata.compressed\",\"a\",@progbits\n"); 5111 printf(".section \".rodata.compressed\",\"a\",@progbits\n");
5098diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/relocs.c linux-2.6.32.16/arch/x86/boot/compressed/relocs.c 5112diff -urNp linux-2.6.32.18/arch/x86/boot/compressed/relocs.c linux-2.6.32.18/arch/x86/boot/compressed/relocs.c
5099--- linux-2.6.32.16/arch/x86/boot/compressed/relocs.c 2010-07-05 14:14:00.000000000 -0400 5113--- linux-2.6.32.18/arch/x86/boot/compressed/relocs.c 2010-08-10 13:45:57.000000000 -0400
5100+++ linux-2.6.32.16/arch/x86/boot/compressed/relocs.c 2010-07-09 14:50:44.000000000 -0400 5114+++ linux-2.6.32.18/arch/x86/boot/compressed/relocs.c 2010-08-11 18:57:29.000000000 -0400
5101@@ -10,8 +10,11 @@ 5115@@ -10,8 +10,11 @@
5102 #define USE_BSD 5116 #define USE_BSD
5103 #include <endian.h> 5117 #include <endian.h>
@@ -5298,9 +5312,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/compressed/relocs.c linux-2.6.32.16/arc
5298 read_shdrs(fp); 5312 read_shdrs(fp);
5299 read_strtabs(fp); 5313 read_strtabs(fp);
5300 read_symtabs(fp); 5314 read_symtabs(fp);
5301diff -urNp linux-2.6.32.16/arch/x86/boot/cpucheck.c linux-2.6.32.16/arch/x86/boot/cpucheck.c 5315diff -urNp linux-2.6.32.18/arch/x86/boot/cpucheck.c linux-2.6.32.18/arch/x86/boot/cpucheck.c
5302--- linux-2.6.32.16/arch/x86/boot/cpucheck.c 2010-07-05 14:14:00.000000000 -0400 5316--- linux-2.6.32.18/arch/x86/boot/cpucheck.c 2010-08-10 13:45:57.000000000 -0400
5303+++ linux-2.6.32.16/arch/x86/boot/cpucheck.c 2010-07-09 14:50:35.000000000 -0400 5317+++ linux-2.6.32.18/arch/x86/boot/cpucheck.c 2010-08-11 18:57:29.000000000 -0400
5304@@ -74,7 +74,7 @@ static int has_fpu(void) 5318@@ -74,7 +74,7 @@ static int has_fpu(void)
5305 u16 fcw = -1, fsw = -1; 5319 u16 fcw = -1, fsw = -1;
5306 u32 cr0; 5320 u32 cr0;
@@ -5396,9 +5410,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/cpucheck.c linux-2.6.32.16/arch/x86/boo
5396 5410
5397 err = check_flags(); 5411 err = check_flags();
5398 } 5412 }
5399diff -urNp linux-2.6.32.16/arch/x86/boot/header.S linux-2.6.32.16/arch/x86/boot/header.S 5413diff -urNp linux-2.6.32.18/arch/x86/boot/header.S linux-2.6.32.18/arch/x86/boot/header.S
5400--- linux-2.6.32.16/arch/x86/boot/header.S 2010-07-05 14:14:00.000000000 -0400 5414--- linux-2.6.32.18/arch/x86/boot/header.S 2010-08-10 13:45:57.000000000 -0400
5401+++ linux-2.6.32.16/arch/x86/boot/header.S 2010-07-09 14:50:35.000000000 -0400 5415+++ linux-2.6.32.18/arch/x86/boot/header.S 2010-08-11 18:57:29.000000000 -0400
5402@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical 5416@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
5403 # single linked list of 5417 # single linked list of
5404 # struct setup_data 5418 # struct setup_data
@@ -5408,9 +5422,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/header.S linux-2.6.32.16/arch/x86/boot/
5408 5422
5409 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) 5423 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
5410 #define VO_INIT_SIZE (VO__end - VO__text) 5424 #define VO_INIT_SIZE (VO__end - VO__text)
5411diff -urNp linux-2.6.32.16/arch/x86/boot/memory.c linux-2.6.32.16/arch/x86/boot/memory.c 5425diff -urNp linux-2.6.32.18/arch/x86/boot/memory.c linux-2.6.32.18/arch/x86/boot/memory.c
5412--- linux-2.6.32.16/arch/x86/boot/memory.c 2010-07-05 14:14:00.000000000 -0400 5426--- linux-2.6.32.18/arch/x86/boot/memory.c 2010-08-10 13:45:57.000000000 -0400
5413+++ linux-2.6.32.16/arch/x86/boot/memory.c 2010-07-09 14:50:35.000000000 -0400 5427+++ linux-2.6.32.18/arch/x86/boot/memory.c 2010-08-11 18:57:29.000000000 -0400
5414@@ -19,7 +19,7 @@ 5428@@ -19,7 +19,7 @@
5415 5429
5416 static int detect_memory_e820(void) 5430 static int detect_memory_e820(void)
@@ -5420,9 +5434,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/memory.c linux-2.6.32.16/arch/x86/boot/
5420 struct biosregs ireg, oreg; 5434 struct biosregs ireg, oreg;
5421 struct e820entry *desc = boot_params.e820_map; 5435 struct e820entry *desc = boot_params.e820_map;
5422 static struct e820entry buf; /* static so it is zeroed */ 5436 static struct e820entry buf; /* static so it is zeroed */
5423diff -urNp linux-2.6.32.16/arch/x86/boot/video.c linux-2.6.32.16/arch/x86/boot/video.c 5437diff -urNp linux-2.6.32.18/arch/x86/boot/video.c linux-2.6.32.18/arch/x86/boot/video.c
5424--- linux-2.6.32.16/arch/x86/boot/video.c 2010-07-05 14:14:00.000000000 -0400 5438--- linux-2.6.32.18/arch/x86/boot/video.c 2010-08-10 13:45:57.000000000 -0400
5425+++ linux-2.6.32.16/arch/x86/boot/video.c 2010-07-09 14:50:35.000000000 -0400 5439+++ linux-2.6.32.18/arch/x86/boot/video.c 2010-08-11 18:57:29.000000000 -0400
5426@@ -90,7 +90,7 @@ static void store_mode_params(void) 5440@@ -90,7 +90,7 @@ static void store_mode_params(void)
5427 static unsigned int get_entry(void) 5441 static unsigned int get_entry(void)
5428 { 5442 {
@@ -5432,9 +5446,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/video.c linux-2.6.32.16/arch/x86/boot/v
5432 int key; 5446 int key;
5433 unsigned int v; 5447 unsigned int v;
5434 5448
5435diff -urNp linux-2.6.32.16/arch/x86/boot/video-vesa.c linux-2.6.32.16/arch/x86/boot/video-vesa.c 5449diff -urNp linux-2.6.32.18/arch/x86/boot/video-vesa.c linux-2.6.32.18/arch/x86/boot/video-vesa.c
5436--- linux-2.6.32.16/arch/x86/boot/video-vesa.c 2010-07-05 14:14:00.000000000 -0400 5450--- linux-2.6.32.18/arch/x86/boot/video-vesa.c 2010-08-10 13:45:57.000000000 -0400
5437+++ linux-2.6.32.16/arch/x86/boot/video-vesa.c 2010-07-09 14:50:35.000000000 -0400 5451+++ linux-2.6.32.18/arch/x86/boot/video-vesa.c 2010-08-11 18:57:29.000000000 -0400
5438@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) 5452@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
5439 5453
5440 boot_params.screen_info.vesapm_seg = oreg.es; 5454 boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5443,9 +5457,9 @@ diff -urNp linux-2.6.32.16/arch/x86/boot/video-vesa.c linux-2.6.32.16/arch/x86/b
5443 } 5457 }
5444 5458
5445 /* 5459 /*
5446diff -urNp linux-2.6.32.16/arch/x86/ia32/ia32entry.S linux-2.6.32.16/arch/x86/ia32/ia32entry.S 5460diff -urNp linux-2.6.32.18/arch/x86/ia32/ia32entry.S linux-2.6.32.18/arch/x86/ia32/ia32entry.S
5447--- linux-2.6.32.16/arch/x86/ia32/ia32entry.S 2010-07-05 14:14:00.000000000 -0400 5461--- linux-2.6.32.18/arch/x86/ia32/ia32entry.S 2010-08-10 13:45:57.000000000 -0400
5448+++ linux-2.6.32.16/arch/x86/ia32/ia32entry.S 2010-07-09 14:50:35.000000000 -0400 5462+++ linux-2.6.32.18/arch/x86/ia32/ia32entry.S 2010-08-11 18:57:29.000000000 -0400
5449@@ -13,6 +13,7 @@ 5463@@ -13,6 +13,7 @@
5450 #include <asm/thread_info.h> 5464 #include <asm/thread_info.h>
5451 #include <asm/segment.h> 5465 #include <asm/segment.h>
@@ -5540,9 +5554,9 @@ diff -urNp linux-2.6.32.16/arch/x86/ia32/ia32entry.S linux-2.6.32.16/arch/x86/ia
5540 /* 5554 /*
5541 * No need to follow this irqs on/off section: the syscall 5555 * No need to follow this irqs on/off section: the syscall
5542 * disabled irqs and here we enable it straight after entry: 5556 * disabled irqs and here we enable it straight after entry:
5543diff -urNp linux-2.6.32.16/arch/x86/ia32/ia32_signal.c linux-2.6.32.16/arch/x86/ia32/ia32_signal.c 5557diff -urNp linux-2.6.32.18/arch/x86/ia32/ia32_signal.c linux-2.6.32.18/arch/x86/ia32/ia32_signal.c
5544--- linux-2.6.32.16/arch/x86/ia32/ia32_signal.c 2010-07-05 14:14:00.000000000 -0400 5558--- linux-2.6.32.18/arch/x86/ia32/ia32_signal.c 2010-08-10 13:45:57.000000000 -0400
5545+++ linux-2.6.32.16/arch/x86/ia32/ia32_signal.c 2010-07-09 14:50:35.000000000 -0400 5559+++ linux-2.6.32.18/arch/x86/ia32/ia32_signal.c 2010-08-11 18:57:29.000000000 -0400
5546@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 5560@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
5547 sp -= frame_size; 5561 sp -= frame_size;
5548 /* Align the stack pointer according to the i386 ABI, 5562 /* Align the stack pointer according to the i386 ABI,
@@ -5561,9 +5575,9 @@ diff -urNp linux-2.6.32.16/arch/x86/ia32/ia32_signal.c linux-2.6.32.16/arch/x86/
5561 }; 5575 };
5562 5576
5563 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); 5577 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
5564diff -urNp linux-2.6.32.16/arch/x86/include/asm/alternative.h linux-2.6.32.16/arch/x86/include/asm/alternative.h 5578diff -urNp linux-2.6.32.18/arch/x86/include/asm/alternative.h linux-2.6.32.18/arch/x86/include/asm/alternative.h
5565--- linux-2.6.32.16/arch/x86/include/asm/alternative.h 2010-07-05 14:14:00.000000000 -0400 5579--- linux-2.6.32.18/arch/x86/include/asm/alternative.h 2010-08-10 13:45:57.000000000 -0400
5566+++ linux-2.6.32.16/arch/x86/include/asm/alternative.h 2010-07-09 14:50:35.000000000 -0400 5580+++ linux-2.6.32.18/arch/x86/include/asm/alternative.h 2010-08-11 18:57:29.000000000 -0400
5567@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit 5581@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
5568 " .byte 662b-661b\n" /* sourcelen */ \ 5582 " .byte 662b-661b\n" /* sourcelen */ \
5569 " .byte 664f-663f\n" /* replacementlen */ \ 5583 " .byte 664f-663f\n" /* replacementlen */ \
@@ -5573,9 +5587,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/alternative.h linux-2.6.32.16/ar
5573 "663:\n\t" newinstr "\n664:\n" /* replacement */ \ 5587 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
5574 ".previous" 5588 ".previous"
5575 5589
5576diff -urNp linux-2.6.32.16/arch/x86/include/asm/apm.h linux-2.6.32.16/arch/x86/include/asm/apm.h 5590diff -urNp linux-2.6.32.18/arch/x86/include/asm/apm.h linux-2.6.32.18/arch/x86/include/asm/apm.h
5577--- linux-2.6.32.16/arch/x86/include/asm/apm.h 2010-07-05 14:14:00.000000000 -0400 5591--- linux-2.6.32.18/arch/x86/include/asm/apm.h 2010-08-10 13:45:57.000000000 -0400
5578+++ linux-2.6.32.16/arch/x86/include/asm/apm.h 2010-07-09 14:50:35.000000000 -0400 5592+++ linux-2.6.32.18/arch/x86/include/asm/apm.h 2010-08-11 18:57:29.000000000 -0400
5579@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 5593@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
5580 __asm__ __volatile__(APM_DO_ZERO_SEGS 5594 __asm__ __volatile__(APM_DO_ZERO_SEGS
5581 "pushl %%edi\n\t" 5595 "pushl %%edi\n\t"
@@ -5594,9 +5608,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/apm.h linux-2.6.32.16/arch/x86/i
5594 "setc %%bl\n\t" 5608 "setc %%bl\n\t"
5595 "popl %%ebp\n\t" 5609 "popl %%ebp\n\t"
5596 "popl %%edi\n\t" 5610 "popl %%edi\n\t"
5597diff -urNp linux-2.6.32.16/arch/x86/include/asm/atomic_32.h linux-2.6.32.16/arch/x86/include/asm/atomic_32.h 5611diff -urNp linux-2.6.32.18/arch/x86/include/asm/atomic_32.h linux-2.6.32.18/arch/x86/include/asm/atomic_32.h
5598--- linux-2.6.32.16/arch/x86/include/asm/atomic_32.h 2010-07-05 14:14:00.000000000 -0400 5612--- linux-2.6.32.18/arch/x86/include/asm/atomic_32.h 2010-08-10 13:45:57.000000000 -0400
5599+++ linux-2.6.32.16/arch/x86/include/asm/atomic_32.h 2010-07-09 14:50:35.000000000 -0400 5613+++ linux-2.6.32.18/arch/x86/include/asm/atomic_32.h 2010-08-11 18:57:29.000000000 -0400
5600@@ -25,6 +25,17 @@ static inline int atomic_read(const atom 5614@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
5601 } 5615 }
5602 5616
@@ -5939,9 +5953,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/atomic_32.h linux-2.6.32.16/arch
5939 #define ATOMIC64_INIT(val) { (val) } 5953 #define ATOMIC64_INIT(val) { (val) }
5940 5954
5941 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); 5955 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
5942diff -urNp linux-2.6.32.16/arch/x86/include/asm/atomic_64.h linux-2.6.32.16/arch/x86/include/asm/atomic_64.h 5956diff -urNp linux-2.6.32.18/arch/x86/include/asm/atomic_64.h linux-2.6.32.18/arch/x86/include/asm/atomic_64.h
5943--- linux-2.6.32.16/arch/x86/include/asm/atomic_64.h 2010-07-05 14:14:00.000000000 -0400 5957--- linux-2.6.32.18/arch/x86/include/asm/atomic_64.h 2010-08-10 13:45:57.000000000 -0400
5944+++ linux-2.6.32.16/arch/x86/include/asm/atomic_64.h 2010-07-09 14:50:35.000000000 -0400 5958+++ linux-2.6.32.18/arch/x86/include/asm/atomic_64.h 2010-08-11 18:57:29.000000000 -0400
5945@@ -24,6 +24,17 @@ static inline int atomic_read(const atom 5959@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
5946 } 5960 }
5947 5961
@@ -6545,9 +6559,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/atomic_64.h linux-2.6.32.16/arch
6545 } 6559 }
6546 6560
6547 /** 6561 /**
6548diff -urNp linux-2.6.32.16/arch/x86/include/asm/boot.h linux-2.6.32.16/arch/x86/include/asm/boot.h 6562diff -urNp linux-2.6.32.18/arch/x86/include/asm/boot.h linux-2.6.32.18/arch/x86/include/asm/boot.h
6549--- linux-2.6.32.16/arch/x86/include/asm/boot.h 2010-07-05 14:14:00.000000000 -0400 6563--- linux-2.6.32.18/arch/x86/include/asm/boot.h 2010-08-10 13:45:57.000000000 -0400
6550+++ linux-2.6.32.16/arch/x86/include/asm/boot.h 2010-07-09 14:50:35.000000000 -0400 6564+++ linux-2.6.32.18/arch/x86/include/asm/boot.h 2010-08-11 18:57:29.000000000 -0400
6551@@ -11,10 +11,15 @@ 6565@@ -11,10 +11,15 @@
6552 #include <asm/pgtable_types.h> 6566 #include <asm/pgtable_types.h>
6553 6567
@@ -6565,9 +6579,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/boot.h linux-2.6.32.16/arch/x86/
6565 /* Minimum kernel alignment, as a power of two */ 6579 /* Minimum kernel alignment, as a power of two */
6566 #ifdef CONFIG_X86_64 6580 #ifdef CONFIG_X86_64
6567 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT 6581 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
6568diff -urNp linux-2.6.32.16/arch/x86/include/asm/cacheflush.h linux-2.6.32.16/arch/x86/include/asm/cacheflush.h 6582diff -urNp linux-2.6.32.18/arch/x86/include/asm/cacheflush.h linux-2.6.32.18/arch/x86/include/asm/cacheflush.h
6569--- linux-2.6.32.16/arch/x86/include/asm/cacheflush.h 2010-07-05 14:14:00.000000000 -0400 6583--- linux-2.6.32.18/arch/x86/include/asm/cacheflush.h 2010-08-10 13:45:57.000000000 -0400
6570+++ linux-2.6.32.16/arch/x86/include/asm/cacheflush.h 2010-07-09 14:50:35.000000000 -0400 6584+++ linux-2.6.32.18/arch/x86/include/asm/cacheflush.h 2010-08-11 18:57:29.000000000 -0400
6571@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) 6585@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
6572 static inline unsigned long get_page_memtype(struct page *pg) 6586 static inline unsigned long get_page_memtype(struct page *pg)
6573 { 6587 {
@@ -6586,9 +6600,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/cacheflush.h linux-2.6.32.16/arc
6586 ClearPageUncached(pg); 6600 ClearPageUncached(pg);
6587 ClearPageWC(pg); 6601 ClearPageWC(pg);
6588 break; 6602 break;
6589diff -urNp linux-2.6.32.16/arch/x86/include/asm/cache.h linux-2.6.32.16/arch/x86/include/asm/cache.h 6603diff -urNp linux-2.6.32.18/arch/x86/include/asm/cache.h linux-2.6.32.18/arch/x86/include/asm/cache.h
6590--- linux-2.6.32.16/arch/x86/include/asm/cache.h 2010-07-05 14:14:00.000000000 -0400 6604--- linux-2.6.32.18/arch/x86/include/asm/cache.h 2010-08-10 13:45:57.000000000 -0400
6591+++ linux-2.6.32.16/arch/x86/include/asm/cache.h 2010-07-09 14:50:35.000000000 -0400 6605+++ linux-2.6.32.18/arch/x86/include/asm/cache.h 2010-08-11 18:57:29.000000000 -0400
6592@@ -8,6 +8,7 @@ 6606@@ -8,6 +8,7 @@
6593 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) 6607 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6594 6608
@@ -6597,9 +6611,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/cache.h linux-2.6.32.16/arch/x86
6597 6611
6598 #ifdef CONFIG_X86_VSMP 6612 #ifdef CONFIG_X86_VSMP
6599 /* vSMP Internode cacheline shift */ 6613 /* vSMP Internode cacheline shift */
6600diff -urNp linux-2.6.32.16/arch/x86/include/asm/checksum_32.h linux-2.6.32.16/arch/x86/include/asm/checksum_32.h 6614diff -urNp linux-2.6.32.18/arch/x86/include/asm/checksum_32.h linux-2.6.32.18/arch/x86/include/asm/checksum_32.h
6601--- linux-2.6.32.16/arch/x86/include/asm/checksum_32.h 2010-07-05 14:14:00.000000000 -0400 6615--- linux-2.6.32.18/arch/x86/include/asm/checksum_32.h 2010-08-10 13:45:57.000000000 -0400
6602+++ linux-2.6.32.16/arch/x86/include/asm/checksum_32.h 2010-07-09 14:50:35.000000000 -0400 6616+++ linux-2.6.32.18/arch/x86/include/asm/checksum_32.h 2010-08-11 18:57:29.000000000 -0400
6603@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene 6617@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
6604 int len, __wsum sum, 6618 int len, __wsum sum,
6605 int *src_err_ptr, int *dst_err_ptr); 6619 int *src_err_ptr, int *dst_err_ptr);
@@ -6633,9 +6647,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/checksum_32.h linux-2.6.32.16/ar
6633 len, sum, NULL, err_ptr); 6647 len, sum, NULL, err_ptr);
6634 6648
6635 if (len) 6649 if (len)
6636diff -urNp linux-2.6.32.16/arch/x86/include/asm/desc.h linux-2.6.32.16/arch/x86/include/asm/desc.h 6650diff -urNp linux-2.6.32.18/arch/x86/include/asm/desc.h linux-2.6.32.18/arch/x86/include/asm/desc.h
6637--- linux-2.6.32.16/arch/x86/include/asm/desc.h 2010-07-05 14:14:00.000000000 -0400 6651--- linux-2.6.32.18/arch/x86/include/asm/desc.h 2010-08-10 13:45:57.000000000 -0400
6638+++ linux-2.6.32.16/arch/x86/include/asm/desc.h 2010-07-09 14:50:35.000000000 -0400 6652+++ linux-2.6.32.18/arch/x86/include/asm/desc.h 2010-08-11 18:57:29.000000000 -0400
6639@@ -4,6 +4,7 @@ 6653@@ -4,6 +4,7 @@
6640 #include <asm/desc_defs.h> 6654 #include <asm/desc_defs.h>
6641 #include <asm/ldt.h> 6655 #include <asm/ldt.h>
@@ -6805,9 +6819,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/desc.h linux-2.6.32.16/arch/x86/
6805+#endif 6819+#endif
6806+ 6820+
6807 #endif /* _ASM_X86_DESC_H */ 6821 #endif /* _ASM_X86_DESC_H */
6808diff -urNp linux-2.6.32.16/arch/x86/include/asm/device.h linux-2.6.32.16/arch/x86/include/asm/device.h 6822diff -urNp linux-2.6.32.18/arch/x86/include/asm/device.h linux-2.6.32.18/arch/x86/include/asm/device.h
6809--- linux-2.6.32.16/arch/x86/include/asm/device.h 2010-07-05 14:14:00.000000000 -0400 6823--- linux-2.6.32.18/arch/x86/include/asm/device.h 2010-08-10 13:45:57.000000000 -0400
6810+++ linux-2.6.32.16/arch/x86/include/asm/device.h 2010-07-09 14:50:35.000000000 -0400 6824+++ linux-2.6.32.18/arch/x86/include/asm/device.h 2010-08-11 18:57:29.000000000 -0400
6811@@ -6,7 +6,7 @@ struct dev_archdata { 6825@@ -6,7 +6,7 @@ struct dev_archdata {
6812 void *acpi_handle; 6826 void *acpi_handle;
6813 #endif 6827 #endif
@@ -6817,9 +6831,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/device.h linux-2.6.32.16/arch/x8
6817 #endif 6831 #endif
6818 #ifdef CONFIG_DMAR 6832 #ifdef CONFIG_DMAR
6819 void *iommu; /* hook for IOMMU specific extension */ 6833 void *iommu; /* hook for IOMMU specific extension */
6820diff -urNp linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h 6834diff -urNp linux-2.6.32.18/arch/x86/include/asm/dma-mapping.h linux-2.6.32.18/arch/x86/include/asm/dma-mapping.h
6821--- linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 6835--- linux-2.6.32.18/arch/x86/include/asm/dma-mapping.h 2010-08-10 13:45:57.000000000 -0400
6822+++ linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h 2010-07-09 14:50:35.000000000 -0400 6836+++ linux-2.6.32.18/arch/x86/include/asm/dma-mapping.h 2010-08-11 18:57:29.000000000 -0400
6823@@ -25,9 +25,9 @@ extern int iommu_merge; 6837@@ -25,9 +25,9 @@ extern int iommu_merge;
6824 extern struct device x86_dma_fallback_dev; 6838 extern struct device x86_dma_fallback_dev;
6825 extern int panic_on_overflow; 6839 extern int panic_on_overflow;
@@ -6859,9 +6873,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/dma-mapping.h linux-2.6.32.16/ar
6859 6873
6860 WARN_ON(irqs_disabled()); /* for portability */ 6874 WARN_ON(irqs_disabled()); /* for portability */
6861 6875
6862diff -urNp linux-2.6.32.16/arch/x86/include/asm/e820.h linux-2.6.32.16/arch/x86/include/asm/e820.h 6876diff -urNp linux-2.6.32.18/arch/x86/include/asm/e820.h linux-2.6.32.18/arch/x86/include/asm/e820.h
6863--- linux-2.6.32.16/arch/x86/include/asm/e820.h 2010-07-05 14:14:00.000000000 -0400 6877--- linux-2.6.32.18/arch/x86/include/asm/e820.h 2010-08-10 13:45:57.000000000 -0400
6864+++ linux-2.6.32.16/arch/x86/include/asm/e820.h 2010-07-09 14:50:35.000000000 -0400 6878+++ linux-2.6.32.18/arch/x86/include/asm/e820.h 2010-08-11 18:57:29.000000000 -0400
6865@@ -133,7 +133,7 @@ extern char *default_machine_specific_me 6879@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
6866 #define ISA_END_ADDRESS 0x100000 6880 #define ISA_END_ADDRESS 0x100000
6867 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) 6881 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
@@ -6871,9 +6885,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/e820.h linux-2.6.32.16/arch/x86/
6871 #define BIOS_END 0x00100000 6885 #define BIOS_END 0x00100000
6872 6886
6873 #ifdef __KERNEL__ 6887 #ifdef __KERNEL__
6874diff -urNp linux-2.6.32.16/arch/x86/include/asm/elf.h linux-2.6.32.16/arch/x86/include/asm/elf.h 6888diff -urNp linux-2.6.32.18/arch/x86/include/asm/elf.h linux-2.6.32.18/arch/x86/include/asm/elf.h
6875--- linux-2.6.32.16/arch/x86/include/asm/elf.h 2010-07-05 14:14:00.000000000 -0400 6889--- linux-2.6.32.18/arch/x86/include/asm/elf.h 2010-08-10 13:45:57.000000000 -0400
6876+++ linux-2.6.32.16/arch/x86/include/asm/elf.h 2010-07-09 14:50:35.000000000 -0400 6890+++ linux-2.6.32.18/arch/x86/include/asm/elf.h 2010-08-11 18:57:29.000000000 -0400
6877@@ -257,7 +257,25 @@ extern int force_personality32; 6891@@ -257,7 +257,25 @@ extern int force_personality32;
6878 the loader. We need to make sure that it is out of the way of the program 6892 the loader. We need to make sure that it is out of the way of the program
6879 that it will "exec", and that there is sufficient room for the brk. */ 6893 that it will "exec", and that there is sufficient room for the brk. */
@@ -6927,9 +6941,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/elf.h linux-2.6.32.16/arch/x86/i
6927-#define arch_randomize_brk arch_randomize_brk 6941-#define arch_randomize_brk arch_randomize_brk
6928- 6942-
6929 #endif /* _ASM_X86_ELF_H */ 6943 #endif /* _ASM_X86_ELF_H */
6930diff -urNp linux-2.6.32.16/arch/x86/include/asm/futex.h linux-2.6.32.16/arch/x86/include/asm/futex.h 6944diff -urNp linux-2.6.32.18/arch/x86/include/asm/futex.h linux-2.6.32.18/arch/x86/include/asm/futex.h
6931--- linux-2.6.32.16/arch/x86/include/asm/futex.h 2010-07-05 14:14:00.000000000 -0400 6945--- linux-2.6.32.18/arch/x86/include/asm/futex.h 2010-08-10 13:45:57.000000000 -0400
6932+++ linux-2.6.32.16/arch/x86/include/asm/futex.h 2010-07-09 14:50:35.000000000 -0400 6946+++ linux-2.6.32.18/arch/x86/include/asm/futex.h 2010-08-11 18:57:29.000000000 -0400
6933@@ -11,17 +11,54 @@ 6947@@ -11,17 +11,54 @@
6934 #include <asm/processor.h> 6948 #include <asm/processor.h>
6935 #include <asm/system.h> 6949 #include <asm/system.h>
@@ -7066,9 +7080,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/futex.h linux-2.6.32.16/arch/x86
7066 : "memory" 7080 : "memory"
7067 ); 7081 );
7068 7082
7069diff -urNp linux-2.6.32.16/arch/x86/include/asm/i387.h linux-2.6.32.16/arch/x86/include/asm/i387.h 7083diff -urNp linux-2.6.32.18/arch/x86/include/asm/i387.h linux-2.6.32.18/arch/x86/include/asm/i387.h
7070--- linux-2.6.32.16/arch/x86/include/asm/i387.h 2010-07-05 14:14:00.000000000 -0400 7084--- linux-2.6.32.18/arch/x86/include/asm/i387.h 2010-08-10 13:45:57.000000000 -0400
7071+++ linux-2.6.32.16/arch/x86/include/asm/i387.h 2010-07-09 14:50:35.000000000 -0400 7085+++ linux-2.6.32.18/arch/x86/include/asm/i387.h 2010-08-11 18:57:29.000000000 -0400
7072@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc 7086@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
7073 { 7087 {
7074 int err; 7088 int err;
@@ -7109,9 +7123,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/i387.h linux-2.6.32.16/arch/x86/
7109 7123
7110 /* 7124 /*
7111 * These must be called with preempt disabled 7125 * These must be called with preempt disabled
7112diff -urNp linux-2.6.32.16/arch/x86/include/asm/io_64.h linux-2.6.32.16/arch/x86/include/asm/io_64.h 7126diff -urNp linux-2.6.32.18/arch/x86/include/asm/io_64.h linux-2.6.32.18/arch/x86/include/asm/io_64.h
7113--- linux-2.6.32.16/arch/x86/include/asm/io_64.h 2010-07-05 14:14:00.000000000 -0400 7127--- linux-2.6.32.18/arch/x86/include/asm/io_64.h 2010-08-10 13:45:57.000000000 -0400
7114+++ linux-2.6.32.16/arch/x86/include/asm/io_64.h 2010-07-09 14:50:35.000000000 -0400 7128+++ linux-2.6.32.18/arch/x86/include/asm/io_64.h 2010-08-11 18:57:29.000000000 -0400
7115@@ -140,6 +140,17 @@ __OUTS(l) 7129@@ -140,6 +140,17 @@ __OUTS(l)
7116 7130
7117 #include <linux/vmalloc.h> 7131 #include <linux/vmalloc.h>
@@ -7130,9 +7144,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/io_64.h linux-2.6.32.16/arch/x86
7130 #include <asm-generic/iomap.h> 7144 #include <asm-generic/iomap.h>
7131 7145
7132 void __memcpy_fromio(void *, unsigned long, unsigned); 7146 void __memcpy_fromio(void *, unsigned long, unsigned);
7133diff -urNp linux-2.6.32.16/arch/x86/include/asm/iommu.h linux-2.6.32.16/arch/x86/include/asm/iommu.h 7147diff -urNp linux-2.6.32.18/arch/x86/include/asm/iommu.h linux-2.6.32.18/arch/x86/include/asm/iommu.h
7134--- linux-2.6.32.16/arch/x86/include/asm/iommu.h 2010-07-05 14:14:00.000000000 -0400 7148--- linux-2.6.32.18/arch/x86/include/asm/iommu.h 2010-08-10 13:45:57.000000000 -0400
7135+++ linux-2.6.32.16/arch/x86/include/asm/iommu.h 2010-07-09 14:50:35.000000000 -0400 7149+++ linux-2.6.32.18/arch/x86/include/asm/iommu.h 2010-08-11 18:57:29.000000000 -0400
7136@@ -3,7 +3,7 @@ 7150@@ -3,7 +3,7 @@
7137 7151
7138 extern void pci_iommu_shutdown(void); 7152 extern void pci_iommu_shutdown(void);
@@ -7142,9 +7156,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/iommu.h linux-2.6.32.16/arch/x86
7142 extern int force_iommu, no_iommu; 7156 extern int force_iommu, no_iommu;
7143 extern int iommu_detected; 7157 extern int iommu_detected;
7144 extern int iommu_pass_through; 7158 extern int iommu_pass_through;
7145diff -urNp linux-2.6.32.16/arch/x86/include/asm/irqflags.h linux-2.6.32.16/arch/x86/include/asm/irqflags.h 7159diff -urNp linux-2.6.32.18/arch/x86/include/asm/irqflags.h linux-2.6.32.18/arch/x86/include/asm/irqflags.h
7146--- linux-2.6.32.16/arch/x86/include/asm/irqflags.h 2010-07-05 14:14:00.000000000 -0400 7160--- linux-2.6.32.18/arch/x86/include/asm/irqflags.h 2010-08-10 13:45:57.000000000 -0400
7147+++ linux-2.6.32.16/arch/x86/include/asm/irqflags.h 2010-07-09 14:50:35.000000000 -0400 7161+++ linux-2.6.32.18/arch/x86/include/asm/irqflags.h 2010-08-11 18:57:29.000000000 -0400
7148@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ 7162@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
7149 sti; \ 7163 sti; \
7150 sysexit 7164 sysexit
@@ -7157,9 +7171,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/irqflags.h linux-2.6.32.16/arch/
7157 #else 7171 #else
7158 #define INTERRUPT_RETURN iret 7172 #define INTERRUPT_RETURN iret
7159 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit 7173 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
7160diff -urNp linux-2.6.32.16/arch/x86/include/asm/kvm_host.h linux-2.6.32.16/arch/x86/include/asm/kvm_host.h 7174diff -urNp linux-2.6.32.18/arch/x86/include/asm/kvm_host.h linux-2.6.32.18/arch/x86/include/asm/kvm_host.h
7161--- linux-2.6.32.16/arch/x86/include/asm/kvm_host.h 2010-07-05 14:14:00.000000000 -0400 7175--- linux-2.6.32.18/arch/x86/include/asm/kvm_host.h 2010-08-10 13:45:57.000000000 -0400
7162+++ linux-2.6.32.16/arch/x86/include/asm/kvm_host.h 2010-07-09 14:50:35.000000000 -0400 7176+++ linux-2.6.32.18/arch/x86/include/asm/kvm_host.h 2010-08-11 18:57:29.000000000 -0400
7163@@ -533,7 +533,7 @@ struct kvm_x86_ops { 7177@@ -533,7 +533,7 @@ struct kvm_x86_ops {
7164 const struct trace_print_flags *exit_reasons_str; 7178 const struct trace_print_flags *exit_reasons_str;
7165 }; 7179 };
@@ -7169,9 +7183,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/kvm_host.h linux-2.6.32.16/arch/
7169 7183
7170 int kvm_mmu_module_init(void); 7184 int kvm_mmu_module_init(void);
7171 void kvm_mmu_module_exit(void); 7185 void kvm_mmu_module_exit(void);
7172diff -urNp linux-2.6.32.16/arch/x86/include/asm/local.h linux-2.6.32.16/arch/x86/include/asm/local.h 7186diff -urNp linux-2.6.32.18/arch/x86/include/asm/local.h linux-2.6.32.18/arch/x86/include/asm/local.h
7173--- linux-2.6.32.16/arch/x86/include/asm/local.h 2010-07-05 14:14:00.000000000 -0400 7187--- linux-2.6.32.18/arch/x86/include/asm/local.h 2010-08-10 13:45:57.000000000 -0400
7174+++ linux-2.6.32.16/arch/x86/include/asm/local.h 2010-07-09 14:50:35.000000000 -0400 7188+++ linux-2.6.32.18/arch/x86/include/asm/local.h 2010-08-11 18:57:29.000000000 -0400
7175@@ -18,26 +18,90 @@ typedef struct { 7189@@ -18,26 +18,90 @@ typedef struct {
7176 7190
7177 static inline void local_inc(local_t *l) 7191 static inline void local_inc(local_t *l)
@@ -7396,9 +7410,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/local.h linux-2.6.32.16/arch/x86
7396 : "+r" (i), "+m" (l->a.counter) 7410 : "+r" (i), "+m" (l->a.counter)
7397 : : "memory"); 7411 : : "memory");
7398 return i + __i; 7412 return i + __i;
7399diff -urNp linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h 7413diff -urNp linux-2.6.32.18/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.18/arch/x86/include/asm/mc146818rtc.h
7400--- linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h 2010-07-05 14:14:00.000000000 -0400 7414--- linux-2.6.32.18/arch/x86/include/asm/mc146818rtc.h 2010-08-10 13:45:57.000000000 -0400
7401+++ linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h 2010-07-09 14:50:35.000000000 -0400 7415+++ linux-2.6.32.18/arch/x86/include/asm/mc146818rtc.h 2010-08-11 18:57:29.000000000 -0400
7402@@ -81,8 +81,8 @@ static inline unsigned char current_lock 7416@@ -81,8 +81,8 @@ static inline unsigned char current_lock
7403 #else 7417 #else
7404 #define lock_cmos_prefix(reg) do {} while (0) 7418 #define lock_cmos_prefix(reg) do {} while (0)
@@ -7410,9 +7424,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.16/ar
7410 #define do_i_have_lock_cmos() 0 7424 #define do_i_have_lock_cmos() 0
7411 #define current_lock_cmos_reg() 0 7425 #define current_lock_cmos_reg() 0
7412 #endif 7426 #endif
7413diff -urNp linux-2.6.32.16/arch/x86/include/asm/microcode.h linux-2.6.32.16/arch/x86/include/asm/microcode.h 7427diff -urNp linux-2.6.32.18/arch/x86/include/asm/microcode.h linux-2.6.32.18/arch/x86/include/asm/microcode.h
7414--- linux-2.6.32.16/arch/x86/include/asm/microcode.h 2010-07-05 14:14:00.000000000 -0400 7428--- linux-2.6.32.18/arch/x86/include/asm/microcode.h 2010-08-10 13:45:57.000000000 -0400
7415+++ linux-2.6.32.16/arch/x86/include/asm/microcode.h 2010-07-09 14:50:35.000000000 -0400 7429+++ linux-2.6.32.18/arch/x86/include/asm/microcode.h 2010-08-11 18:57:29.000000000 -0400
7416@@ -12,13 +12,13 @@ struct device; 7430@@ -12,13 +12,13 @@ struct device;
7417 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; 7431 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
7418 7432
@@ -7453,9 +7467,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/microcode.h linux-2.6.32.16/arch
7453 { 7467 {
7454 return NULL; 7468 return NULL;
7455 } 7469 }
7456diff -urNp linux-2.6.32.16/arch/x86/include/asm/mman.h linux-2.6.32.16/arch/x86/include/asm/mman.h 7470diff -urNp linux-2.6.32.18/arch/x86/include/asm/mman.h linux-2.6.32.18/arch/x86/include/asm/mman.h
7457--- linux-2.6.32.16/arch/x86/include/asm/mman.h 2010-07-05 14:14:00.000000000 -0400 7471--- linux-2.6.32.18/arch/x86/include/asm/mman.h 2010-08-10 13:45:57.000000000 -0400
7458+++ linux-2.6.32.16/arch/x86/include/asm/mman.h 2010-07-09 14:50:35.000000000 -0400 7472+++ linux-2.6.32.18/arch/x86/include/asm/mman.h 2010-08-11 18:57:29.000000000 -0400
7459@@ -5,4 +5,14 @@ 7473@@ -5,4 +5,14 @@
7460 7474
7461 #include <asm-generic/mman.h> 7475 #include <asm-generic/mman.h>
@@ -7471,9 +7485,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/mman.h linux-2.6.32.16/arch/x86/
7471+#endif 7485+#endif
7472+ 7486+
7473 #endif /* _ASM_X86_MMAN_H */ 7487 #endif /* _ASM_X86_MMAN_H */
7474diff -urNp linux-2.6.32.16/arch/x86/include/asm/mmu_context.h linux-2.6.32.16/arch/x86/include/asm/mmu_context.h 7488diff -urNp linux-2.6.32.18/arch/x86/include/asm/mmu_context.h linux-2.6.32.18/arch/x86/include/asm/mmu_context.h
7475--- linux-2.6.32.16/arch/x86/include/asm/mmu_context.h 2010-07-05 14:14:00.000000000 -0400 7489--- linux-2.6.32.18/arch/x86/include/asm/mmu_context.h 2010-08-10 13:45:57.000000000 -0400
7476+++ linux-2.6.32.16/arch/x86/include/asm/mmu_context.h 2010-07-09 14:50:35.000000000 -0400 7490+++ linux-2.6.32.18/arch/x86/include/asm/mmu_context.h 2010-08-11 18:57:29.000000000 -0400
7477@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m 7491@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
7478 7492
7479 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) 7493 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -7598,9 +7612,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/mmu_context.h linux-2.6.32.16/ar
7598 } 7612 }
7599 7613
7600 #define activate_mm(prev, next) \ 7614 #define activate_mm(prev, next) \
7601diff -urNp linux-2.6.32.16/arch/x86/include/asm/mmu.h linux-2.6.32.16/arch/x86/include/asm/mmu.h 7615diff -urNp linux-2.6.32.18/arch/x86/include/asm/mmu.h linux-2.6.32.18/arch/x86/include/asm/mmu.h
7602--- linux-2.6.32.16/arch/x86/include/asm/mmu.h 2010-07-05 14:14:00.000000000 -0400 7616--- linux-2.6.32.18/arch/x86/include/asm/mmu.h 2010-08-10 13:45:57.000000000 -0400
7603+++ linux-2.6.32.16/arch/x86/include/asm/mmu.h 2010-07-09 14:50:35.000000000 -0400 7617+++ linux-2.6.32.18/arch/x86/include/asm/mmu.h 2010-08-11 18:57:29.000000000 -0400
7604@@ -9,10 +9,23 @@ 7618@@ -9,10 +9,23 @@
7605 * we put the segment information here. 7619 * we put the segment information here.
7606 */ 7620 */
@@ -7627,9 +7641,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/mmu.h linux-2.6.32.16/arch/x86/i
7627 } mm_context_t; 7641 } mm_context_t;
7628 7642
7629 #ifdef CONFIG_SMP 7643 #ifdef CONFIG_SMP
7630diff -urNp linux-2.6.32.16/arch/x86/include/asm/module.h linux-2.6.32.16/arch/x86/include/asm/module.h 7644diff -urNp linux-2.6.32.18/arch/x86/include/asm/module.h linux-2.6.32.18/arch/x86/include/asm/module.h
7631--- linux-2.6.32.16/arch/x86/include/asm/module.h 2010-07-05 14:14:00.000000000 -0400 7645--- linux-2.6.32.18/arch/x86/include/asm/module.h 2010-08-10 13:45:57.000000000 -0400
7632+++ linux-2.6.32.16/arch/x86/include/asm/module.h 2010-07-09 14:50:35.000000000 -0400 7646+++ linux-2.6.32.18/arch/x86/include/asm/module.h 2010-08-11 18:57:29.000000000 -0400
7633@@ -59,13 +59,31 @@ 7647@@ -59,13 +59,31 @@
7634 #error unknown processor family 7648 #error unknown processor family
7635 #endif 7649 #endif
@@ -7663,9 +7677,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/module.h linux-2.6.32.16/arch/x8
7663 #endif 7677 #endif
7664 7678
7665 #endif /* _ASM_X86_MODULE_H */ 7679 #endif /* _ASM_X86_MODULE_H */
7666diff -urNp linux-2.6.32.16/arch/x86/include/asm/page_32_types.h linux-2.6.32.16/arch/x86/include/asm/page_32_types.h 7680diff -urNp linux-2.6.32.18/arch/x86/include/asm/page_32_types.h linux-2.6.32.18/arch/x86/include/asm/page_32_types.h
7667--- linux-2.6.32.16/arch/x86/include/asm/page_32_types.h 2010-07-05 14:14:00.000000000 -0400 7681--- linux-2.6.32.18/arch/x86/include/asm/page_32_types.h 2010-08-10 13:45:57.000000000 -0400
7668+++ linux-2.6.32.16/arch/x86/include/asm/page_32_types.h 2010-07-09 14:50:35.000000000 -0400 7682+++ linux-2.6.32.18/arch/x86/include/asm/page_32_types.h 2010-08-11 18:57:29.000000000 -0400
7669@@ -15,6 +15,10 @@ 7683@@ -15,6 +15,10 @@
7670 */ 7684 */
7671 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) 7685 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
@@ -7677,9 +7691,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/page_32_types.h linux-2.6.32.16/
7677 #ifdef CONFIG_4KSTACKS 7691 #ifdef CONFIG_4KSTACKS
7678 #define THREAD_ORDER 0 7692 #define THREAD_ORDER 0
7679 #else 7693 #else
7680diff -urNp linux-2.6.32.16/arch/x86/include/asm/page_64_types.h linux-2.6.32.16/arch/x86/include/asm/page_64_types.h 7694diff -urNp linux-2.6.32.18/arch/x86/include/asm/page_64_types.h linux-2.6.32.18/arch/x86/include/asm/page_64_types.h
7681--- linux-2.6.32.16/arch/x86/include/asm/page_64_types.h 2010-07-05 14:14:00.000000000 -0400 7695--- linux-2.6.32.18/arch/x86/include/asm/page_64_types.h 2010-08-10 13:45:57.000000000 -0400
7682+++ linux-2.6.32.16/arch/x86/include/asm/page_64_types.h 2010-07-09 14:50:35.000000000 -0400 7696+++ linux-2.6.32.18/arch/x86/include/asm/page_64_types.h 2010-08-11 18:57:29.000000000 -0400
7683@@ -39,6 +39,9 @@ 7697@@ -39,6 +39,9 @@
7684 #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) 7698 #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START)
7685 #define __START_KERNEL_map _AC(0xffffffff80000000, UL) 7699 #define __START_KERNEL_map _AC(0xffffffff80000000, UL)
@@ -7690,9 +7704,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/page_64_types.h linux-2.6.32.16/
7690 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ 7704 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
7691 #define __PHYSICAL_MASK_SHIFT 46 7705 #define __PHYSICAL_MASK_SHIFT 46
7692 #define __VIRTUAL_MASK_SHIFT 47 7706 #define __VIRTUAL_MASK_SHIFT 47
7693diff -urNp linux-2.6.32.16/arch/x86/include/asm/paravirt.h linux-2.6.32.16/arch/x86/include/asm/paravirt.h 7707diff -urNp linux-2.6.32.18/arch/x86/include/asm/paravirt.h linux-2.6.32.18/arch/x86/include/asm/paravirt.h
7694--- linux-2.6.32.16/arch/x86/include/asm/paravirt.h 2010-07-05 14:14:00.000000000 -0400 7708--- linux-2.6.32.18/arch/x86/include/asm/paravirt.h 2010-08-10 13:45:57.000000000 -0400
7695+++ linux-2.6.32.16/arch/x86/include/asm/paravirt.h 2010-07-09 14:50:35.000000000 -0400 7709+++ linux-2.6.32.18/arch/x86/include/asm/paravirt.h 2010-08-11 18:57:29.000000000 -0400
7696@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned 7710@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
7697 pv_mmu_ops.set_fixmap(idx, phys, flags); 7711 pv_mmu_ops.set_fixmap(idx, phys, flags);
7698 } 7712 }
@@ -7746,9 +7760,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/paravirt.h linux-2.6.32.16/arch/
7746 #endif /* CONFIG_X86_32 */ 7760 #endif /* CONFIG_X86_32 */
7747 7761
7748 #endif /* __ASSEMBLY__ */ 7762 #endif /* __ASSEMBLY__ */
7749diff -urNp linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h 7763diff -urNp linux-2.6.32.18/arch/x86/include/asm/paravirt_types.h linux-2.6.32.18/arch/x86/include/asm/paravirt_types.h
7750--- linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h 2010-07-05 14:14:00.000000000 -0400 7764--- linux-2.6.32.18/arch/x86/include/asm/paravirt_types.h 2010-08-10 13:45:57.000000000 -0400
7751+++ linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h 2010-07-09 14:50:35.000000000 -0400 7765+++ linux-2.6.32.18/arch/x86/include/asm/paravirt_types.h 2010-08-11 18:57:29.000000000 -0400
7752@@ -316,6 +316,12 @@ struct pv_mmu_ops { 7766@@ -316,6 +316,12 @@ struct pv_mmu_ops {
7753 an mfn. We can tell which is which from the index. */ 7767 an mfn. We can tell which is which from the index. */
7754 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, 7768 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
@@ -7762,9 +7776,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/paravirt_types.h linux-2.6.32.16
7762 }; 7776 };
7763 7777
7764 struct raw_spinlock; 7778 struct raw_spinlock;
7765diff -urNp linux-2.6.32.16/arch/x86/include/asm/pci_x86.h linux-2.6.32.16/arch/x86/include/asm/pci_x86.h 7779diff -urNp linux-2.6.32.18/arch/x86/include/asm/pci_x86.h linux-2.6.32.18/arch/x86/include/asm/pci_x86.h
7766--- linux-2.6.32.16/arch/x86/include/asm/pci_x86.h 2010-07-05 14:14:00.000000000 -0400 7780--- linux-2.6.32.18/arch/x86/include/asm/pci_x86.h 2010-08-10 13:45:57.000000000 -0400
7767+++ linux-2.6.32.16/arch/x86/include/asm/pci_x86.h 2010-07-09 14:50:35.000000000 -0400 7781+++ linux-2.6.32.18/arch/x86/include/asm/pci_x86.h 2010-08-11 18:57:29.000000000 -0400
7768@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct 7782@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
7769 extern void (*pcibios_disable_irq)(struct pci_dev *dev); 7783 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
7770 7784
@@ -7787,9 +7801,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pci_x86.h linux-2.6.32.16/arch/x
7787 extern bool port_cf9_safe; 7801 extern bool port_cf9_safe;
7788 7802
7789 /* arch_initcall level */ 7803 /* arch_initcall level */
7790diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgalloc.h linux-2.6.32.16/arch/x86/include/asm/pgalloc.h 7804diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgalloc.h linux-2.6.32.18/arch/x86/include/asm/pgalloc.h
7791--- linux-2.6.32.16/arch/x86/include/asm/pgalloc.h 2010-07-05 14:14:00.000000000 -0400 7805--- linux-2.6.32.18/arch/x86/include/asm/pgalloc.h 2010-08-10 13:45:57.000000000 -0400
7792+++ linux-2.6.32.16/arch/x86/include/asm/pgalloc.h 2010-07-09 14:50:35.000000000 -0400 7806+++ linux-2.6.32.18/arch/x86/include/asm/pgalloc.h 2010-08-11 18:57:29.000000000 -0400
7793@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s 7807@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
7794 pmd_t *pmd, pte_t *pte) 7808 pmd_t *pmd, pte_t *pte)
7795 { 7809 {
@@ -7804,9 +7818,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgalloc.h linux-2.6.32.16/arch/x
7804 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); 7818 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
7805 } 7819 }
7806 7820
7807diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h 7821diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.18/arch/x86/include/asm/pgtable-2level.h
7808--- linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h 2010-07-05 14:14:00.000000000 -0400 7822--- linux-2.6.32.18/arch/x86/include/asm/pgtable-2level.h 2010-08-10 13:45:57.000000000 -0400
7809+++ linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h 2010-07-09 14:50:35.000000000 -0400 7823+++ linux-2.6.32.18/arch/x86/include/asm/pgtable-2level.h 2010-08-11 18:57:29.000000000 -0400
7810@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 7824@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
7811 7825
7812 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7826 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7817,9 +7831,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.16
7817 } 7831 }
7818 7832
7819 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) 7833 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
7820diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h 7834diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable_32.h linux-2.6.32.18/arch/x86/include/asm/pgtable_32.h
7821--- linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h 2010-07-05 14:14:00.000000000 -0400 7835--- linux-2.6.32.18/arch/x86/include/asm/pgtable_32.h 2010-08-10 13:45:57.000000000 -0400
7822+++ linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h 2010-07-09 14:50:35.000000000 -0400 7836+++ linux-2.6.32.18/arch/x86/include/asm/pgtable_32.h 2010-08-11 18:57:29.000000000 -0400
7823@@ -26,8 +26,6 @@ 7837@@ -26,8 +26,6 @@
7824 struct mm_struct; 7838 struct mm_struct;
7825 struct vm_area_struct; 7839 struct vm_area_struct;
@@ -7861,9 +7875,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_32.h linux-2.6.32.16/arc
7861 /* 7875 /*
7862 * kern_addr_valid() is (1) for FLATMEM and (0) for 7876 * kern_addr_valid() is (1) for FLATMEM and (0) for
7863 * SPARSEMEM and DISCONTIGMEM 7877 * SPARSEMEM and DISCONTIGMEM
7864diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h 7878diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.18/arch/x86/include/asm/pgtable_32_types.h
7865--- linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h 2010-07-05 14:14:00.000000000 -0400 7879--- linux-2.6.32.18/arch/x86/include/asm/pgtable_32_types.h 2010-08-10 13:45:57.000000000 -0400
7866+++ linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h 2010-07-09 14:50:35.000000000 -0400 7880+++ linux-2.6.32.18/arch/x86/include/asm/pgtable_32_types.h 2010-08-11 18:57:29.000000000 -0400
7867@@ -8,7 +8,7 @@ 7881@@ -8,7 +8,7 @@
7868 */ 7882 */
7869 #ifdef CONFIG_X86_PAE 7883 #ifdef CONFIG_X86_PAE
@@ -7893,9 +7907,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.
7893 #define MODULES_VADDR VMALLOC_START 7907 #define MODULES_VADDR VMALLOC_START
7894 #define MODULES_END VMALLOC_END 7908 #define MODULES_END VMALLOC_END
7895 #define MODULES_LEN (MODULES_VADDR - MODULES_END) 7909 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
7896diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h 7910diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.18/arch/x86/include/asm/pgtable-3level.h
7897--- linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h 2010-07-05 14:14:00.000000000 -0400 7911--- linux-2.6.32.18/arch/x86/include/asm/pgtable-3level.h 2010-08-10 13:45:57.000000000 -0400
7898+++ linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h 2010-07-09 14:50:35.000000000 -0400 7912+++ linux-2.6.32.18/arch/x86/include/asm/pgtable-3level.h 2010-08-11 18:57:29.000000000 -0400
7899@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic 7913@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
7900 7914
7901 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7915 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7913,9 +7927,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.16
7913 } 7927 }
7914 7928
7915 /* 7929 /*
7916diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h 7930diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable_64.h linux-2.6.32.18/arch/x86/include/asm/pgtable_64.h
7917--- linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h 2010-07-05 14:14:00.000000000 -0400 7931--- linux-2.6.32.18/arch/x86/include/asm/pgtable_64.h 2010-08-10 13:45:57.000000000 -0400
7918+++ linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h 2010-07-09 14:50:35.000000000 -0400 7932+++ linux-2.6.32.18/arch/x86/include/asm/pgtable_64.h 2010-08-11 18:57:29.000000000 -0400
7919@@ -16,10 +16,13 @@ 7933@@ -16,10 +16,13 @@
7920 7934
7921 extern pud_t level3_kernel_pgt[512]; 7935 extern pud_t level3_kernel_pgt[512];
@@ -7952,9 +7966,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_64.h linux-2.6.32.16/arc
7952 } 7966 }
7953 7967
7954 static inline void native_pgd_clear(pgd_t *pgd) 7968 static inline void native_pgd_clear(pgd_t *pgd)
7955diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h 7969diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.18/arch/x86/include/asm/pgtable_64_types.h
7956--- linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h 2010-07-05 14:14:00.000000000 -0400 7970--- linux-2.6.32.18/arch/x86/include/asm/pgtable_64_types.h 2010-08-10 13:45:57.000000000 -0400
7957+++ linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h 2010-07-09 14:50:35.000000000 -0400 7971+++ linux-2.6.32.18/arch/x86/include/asm/pgtable_64_types.h 2010-08-11 18:57:29.000000000 -0400
7958@@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t; 7972@@ -59,5 +59,7 @@ typedef struct { pteval_t pte; } pte_t;
7959 #define MODULES_VADDR _AC(0xffffffffa0000000, UL) 7973 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
7960 #define MODULES_END _AC(0xffffffffff000000, UL) 7974 #define MODULES_END _AC(0xffffffffff000000, UL)
@@ -7963,9 +7977,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.
7963+#define MODULES_EXEC_END MODULES_END 7977+#define MODULES_EXEC_END MODULES_END
7964 7978
7965 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ 7979 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
7966diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable.h linux-2.6.32.16/arch/x86/include/asm/pgtable.h 7980diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable.h linux-2.6.32.18/arch/x86/include/asm/pgtable.h
7967--- linux-2.6.32.16/arch/x86/include/asm/pgtable.h 2010-07-05 14:14:00.000000000 -0400 7981--- linux-2.6.32.18/arch/x86/include/asm/pgtable.h 2010-08-10 13:45:57.000000000 -0400
7968+++ linux-2.6.32.16/arch/x86/include/asm/pgtable.h 2010-07-09 14:50:35.000000000 -0400 7982+++ linux-2.6.32.18/arch/x86/include/asm/pgtable.h 2010-08-11 18:57:29.000000000 -0400
7969@@ -74,12 +74,51 @@ extern struct list_head pgd_list; 7983@@ -74,12 +74,51 @@ extern struct list_head pgd_list;
7970 7984
7971 #define arch_end_context_switch(prev) do {} while(0) 7985 #define arch_end_context_switch(prev) do {} while(0)
@@ -8135,9 +8149,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable.h linux-2.6.32.16/arch/x
8135 8149
8136 #include <asm-generic/pgtable.h> 8150 #include <asm-generic/pgtable.h>
8137 #endif /* __ASSEMBLY__ */ 8151 #endif /* __ASSEMBLY__ */
8138diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h 8152diff -urNp linux-2.6.32.18/arch/x86/include/asm/pgtable_types.h linux-2.6.32.18/arch/x86/include/asm/pgtable_types.h
8139--- linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h 2010-07-05 14:14:00.000000000 -0400 8153--- linux-2.6.32.18/arch/x86/include/asm/pgtable_types.h 2010-08-10 13:45:57.000000000 -0400
8140+++ linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h 2010-07-16 21:06:43.000000000 -0400 8154+++ linux-2.6.32.18/arch/x86/include/asm/pgtable_types.h 2010-08-11 18:57:29.000000000 -0400
8141@@ -16,12 +16,11 @@ 8155@@ -16,12 +16,11 @@
8142 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ 8156 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
8143 #define _PAGE_BIT_PAT 7 /* on 4KB pages */ 8157 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -8258,9 +8272,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/pgtable_types.h linux-2.6.32.16/
8258 8272
8259 #define pgprot_writecombine pgprot_writecombine 8273 #define pgprot_writecombine pgprot_writecombine
8260 extern pgprot_t pgprot_writecombine(pgprot_t prot); 8274 extern pgprot_t pgprot_writecombine(pgprot_t prot);
8261diff -urNp linux-2.6.32.16/arch/x86/include/asm/processor.h linux-2.6.32.16/arch/x86/include/asm/processor.h 8275diff -urNp linux-2.6.32.18/arch/x86/include/asm/processor.h linux-2.6.32.18/arch/x86/include/asm/processor.h
8262--- linux-2.6.32.16/arch/x86/include/asm/processor.h 2010-07-05 14:14:00.000000000 -0400 8276--- linux-2.6.32.18/arch/x86/include/asm/processor.h 2010-08-10 13:45:57.000000000 -0400
8263+++ linux-2.6.32.16/arch/x86/include/asm/processor.h 2010-07-09 14:50:35.000000000 -0400 8277+++ linux-2.6.32.18/arch/x86/include/asm/processor.h 2010-08-11 18:57:29.000000000 -0400
8264@@ -272,7 +272,7 @@ struct tss_struct { 8278@@ -272,7 +272,7 @@ struct tss_struct {
8265 8279
8266 } ____cacheline_aligned; 8280 } ____cacheline_aligned;
@@ -8345,9 +8359,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/processor.h linux-2.6.32.16/arch
8345 #define KSTK_EIP(task) (task_pt_regs(task)->ip) 8359 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
8346 8360
8347 /* Get/set a process' ability to use the timestamp counter instruction */ 8361 /* Get/set a process' ability to use the timestamp counter instruction */
8348diff -urNp linux-2.6.32.16/arch/x86/include/asm/ptrace.h linux-2.6.32.16/arch/x86/include/asm/ptrace.h 8362diff -urNp linux-2.6.32.18/arch/x86/include/asm/ptrace.h linux-2.6.32.18/arch/x86/include/asm/ptrace.h
8349--- linux-2.6.32.16/arch/x86/include/asm/ptrace.h 2010-07-05 14:14:00.000000000 -0400 8363--- linux-2.6.32.18/arch/x86/include/asm/ptrace.h 2010-08-10 13:45:57.000000000 -0400
8350+++ linux-2.6.32.16/arch/x86/include/asm/ptrace.h 2010-07-09 14:50:35.000000000 -0400 8364+++ linux-2.6.32.18/arch/x86/include/asm/ptrace.h 2010-08-11 18:57:29.000000000 -0400
8351@@ -151,28 +151,29 @@ static inline unsigned long regs_return_ 8365@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
8352 } 8366 }
8353 8367
@@ -8384,9 +8398,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/ptrace.h linux-2.6.32.16/arch/x8
8384 #endif 8398 #endif
8385 } 8399 }
8386 8400
8387diff -urNp linux-2.6.32.16/arch/x86/include/asm/reboot.h linux-2.6.32.16/arch/x86/include/asm/reboot.h 8401diff -urNp linux-2.6.32.18/arch/x86/include/asm/reboot.h linux-2.6.32.18/arch/x86/include/asm/reboot.h
8388--- linux-2.6.32.16/arch/x86/include/asm/reboot.h 2010-07-05 14:14:00.000000000 -0400 8402--- linux-2.6.32.18/arch/x86/include/asm/reboot.h 2010-08-10 13:45:57.000000000 -0400
8389+++ linux-2.6.32.16/arch/x86/include/asm/reboot.h 2010-07-09 14:50:35.000000000 -0400 8403+++ linux-2.6.32.18/arch/x86/include/asm/reboot.h 2010-08-11 18:57:29.000000000 -0400
8390@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; 8404@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
8391 8405
8392 void native_machine_crash_shutdown(struct pt_regs *regs); 8406 void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -8396,9 +8410,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/reboot.h linux-2.6.32.16/arch/x8
8396 8410
8397 typedef void (*nmi_shootdown_cb)(int, struct die_args*); 8411 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
8398 void nmi_shootdown_cpus(nmi_shootdown_cb callback); 8412 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
8399diff -urNp linux-2.6.32.16/arch/x86/include/asm/rwsem.h linux-2.6.32.16/arch/x86/include/asm/rwsem.h 8413diff -urNp linux-2.6.32.18/arch/x86/include/asm/rwsem.h linux-2.6.32.18/arch/x86/include/asm/rwsem.h
8400--- linux-2.6.32.16/arch/x86/include/asm/rwsem.h 2010-07-05 14:14:00.000000000 -0400 8414--- linux-2.6.32.18/arch/x86/include/asm/rwsem.h 2010-08-10 13:45:57.000000000 -0400
8401+++ linux-2.6.32.16/arch/x86/include/asm/rwsem.h 2010-07-09 14:50:35.000000000 -0400 8415+++ linux-2.6.32.18/arch/x86/include/asm/rwsem.h 2010-08-11 18:57:29.000000000 -0400
8402@@ -118,10 +118,26 @@ static inline void __down_read(struct rw 8416@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
8403 { 8417 {
8404 asm volatile("# beginning down_read\n\t" 8418 asm volatile("# beginning down_read\n\t"
@@ -8634,9 +8648,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/rwsem.h linux-2.6.32.16/arch/x86
8634 : "+r" (tmp), "+m" (sem->count) 8648 : "+r" (tmp), "+m" (sem->count)
8635 : : "memory"); 8649 : : "memory");
8636 8650
8637diff -urNp linux-2.6.32.16/arch/x86/include/asm/segment.h linux-2.6.32.16/arch/x86/include/asm/segment.h 8651diff -urNp linux-2.6.32.18/arch/x86/include/asm/segment.h linux-2.6.32.18/arch/x86/include/asm/segment.h
8638--- linux-2.6.32.16/arch/x86/include/asm/segment.h 2010-07-05 14:14:00.000000000 -0400 8652--- linux-2.6.32.18/arch/x86/include/asm/segment.h 2010-08-10 13:45:57.000000000 -0400
8639+++ linux-2.6.32.16/arch/x86/include/asm/segment.h 2010-07-09 14:50:35.000000000 -0400 8653+++ linux-2.6.32.18/arch/x86/include/asm/segment.h 2010-08-11 18:57:29.000000000 -0400
8640@@ -62,8 +62,8 @@ 8654@@ -62,8 +62,8 @@
8641 * 26 - ESPFIX small SS 8655 * 26 - ESPFIX small SS
8642 * 27 - per-cpu [ offset to per-cpu data area ] 8656 * 27 - per-cpu [ offset to per-cpu data area ]
@@ -8705,9 +8719,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/segment.h linux-2.6.32.16/arch/x
8705 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) 8719 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
8706 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) 8720 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
8707 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) 8721 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
8708diff -urNp linux-2.6.32.16/arch/x86/include/asm/spinlock.h linux-2.6.32.16/arch/x86/include/asm/spinlock.h 8722diff -urNp linux-2.6.32.18/arch/x86/include/asm/spinlock.h linux-2.6.32.18/arch/x86/include/asm/spinlock.h
8709--- linux-2.6.32.16/arch/x86/include/asm/spinlock.h 2010-07-05 14:14:00.000000000 -0400 8723--- linux-2.6.32.18/arch/x86/include/asm/spinlock.h 2010-08-10 13:45:57.000000000 -0400
8710+++ linux-2.6.32.16/arch/x86/include/asm/spinlock.h 2010-07-09 14:50:35.000000000 -0400 8724+++ linux-2.6.32.18/arch/x86/include/asm/spinlock.h 2010-08-11 18:57:29.000000000 -0400
8711@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r 8725@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r
8712 static inline void __raw_read_lock(raw_rwlock_t *rw) 8726 static inline void __raw_read_lock(raw_rwlock_t *rw)
8713 { 8727 {
@@ -8811,9 +8825,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/spinlock.h linux-2.6.32.16/arch/
8811 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); 8825 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
8812 } 8826 }
8813 8827
8814diff -urNp linux-2.6.32.16/arch/x86/include/asm/system.h linux-2.6.32.16/arch/x86/include/asm/system.h 8828diff -urNp linux-2.6.32.18/arch/x86/include/asm/system.h linux-2.6.32.18/arch/x86/include/asm/system.h
8815--- linux-2.6.32.16/arch/x86/include/asm/system.h 2010-07-05 14:14:00.000000000 -0400 8829--- linux-2.6.32.18/arch/x86/include/asm/system.h 2010-08-10 13:45:57.000000000 -0400
8816+++ linux-2.6.32.16/arch/x86/include/asm/system.h 2010-07-09 14:50:35.000000000 -0400 8830+++ linux-2.6.32.18/arch/x86/include/asm/system.h 2010-08-11 18:57:29.000000000 -0400
8817@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un 8831@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
8818 { 8832 {
8819 unsigned long __limit; 8833 unsigned long __limit;
@@ -8832,9 +8846,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/system.h linux-2.6.32.16/arch/x8
8832 extern void free_init_pages(char *what, unsigned long begin, unsigned long end); 8846 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
8833 8847
8834 void default_idle(void); 8848 void default_idle(void);
8835diff -urNp linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h 8849diff -urNp linux-2.6.32.18/arch/x86/include/asm/uaccess_32.h linux-2.6.32.18/arch/x86/include/asm/uaccess_32.h
8836--- linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h 2010-07-05 14:14:00.000000000 -0400 8850--- linux-2.6.32.18/arch/x86/include/asm/uaccess_32.h 2010-08-10 13:45:57.000000000 -0400
8837+++ linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h 2010-07-09 14:50:35.000000000 -0400 8851+++ linux-2.6.32.18/arch/x86/include/asm/uaccess_32.h 2010-08-11 18:57:29.000000000 -0400
8838@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u 8852@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
8839 static __always_inline unsigned long __must_check 8853 static __always_inline unsigned long __must_check
8840 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) 8854 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -8964,9 +8978,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/uaccess_32.h linux-2.6.32.16/arc
8964 long __must_check strncpy_from_user(char *dst, const char __user *src, 8978 long __must_check strncpy_from_user(char *dst, const char __user *src,
8965 long count); 8979 long count);
8966 long __must_check __strncpy_from_user(char *dst, 8980 long __must_check __strncpy_from_user(char *dst,
8967diff -urNp linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h 8981diff -urNp linux-2.6.32.18/arch/x86/include/asm/uaccess_64.h linux-2.6.32.18/arch/x86/include/asm/uaccess_64.h
8968--- linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h 2010-07-05 14:14:00.000000000 -0400 8982--- linux-2.6.32.18/arch/x86/include/asm/uaccess_64.h 2010-08-10 13:45:57.000000000 -0400
8969+++ linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h 2010-07-09 14:50:35.000000000 -0400 8983+++ linux-2.6.32.18/arch/x86/include/asm/uaccess_64.h 2010-08-11 18:57:29.000000000 -0400
8970@@ -9,6 +9,9 @@ 8984@@ -9,6 +9,9 @@
8971 #include <linux/prefetch.h> 8985 #include <linux/prefetch.h>
8972 #include <linux/lockdep.h> 8986 #include <linux/lockdep.h>
@@ -9158,9 +9172,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/uaccess_64.h linux-2.6.32.16/arc
9158 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); 9172 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
9159 9173
9160 #endif /* _ASM_X86_UACCESS_64_H */ 9174 #endif /* _ASM_X86_UACCESS_64_H */
9161diff -urNp linux-2.6.32.16/arch/x86/include/asm/uaccess.h linux-2.6.32.16/arch/x86/include/asm/uaccess.h 9175diff -urNp linux-2.6.32.18/arch/x86/include/asm/uaccess.h linux-2.6.32.18/arch/x86/include/asm/uaccess.h
9162--- linux-2.6.32.16/arch/x86/include/asm/uaccess.h 2010-07-05 14:14:00.000000000 -0400 9176--- linux-2.6.32.18/arch/x86/include/asm/uaccess.h 2010-08-10 13:45:57.000000000 -0400
9163+++ linux-2.6.32.16/arch/x86/include/asm/uaccess.h 2010-07-11 21:16:08.000000000 -0400 9177+++ linux-2.6.32.18/arch/x86/include/asm/uaccess.h 2010-08-11 18:57:29.000000000 -0400
9164@@ -8,12 +8,15 @@ 9178@@ -8,12 +8,15 @@
9165 #include <linux/thread_info.h> 9179 #include <linux/thread_info.h>
9166 #include <linux/prefetch.h> 9180 #include <linux/prefetch.h>
@@ -9398,9 +9412,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/uaccess.h linux-2.6.32.16/arch/x
9398 #ifdef CONFIG_X86_32 9412 #ifdef CONFIG_X86_32
9399 # include "uaccess_32.h" 9413 # include "uaccess_32.h"
9400 #else 9414 #else
9401diff -urNp linux-2.6.32.16/arch/x86/include/asm/vgtod.h linux-2.6.32.16/arch/x86/include/asm/vgtod.h 9415diff -urNp linux-2.6.32.18/arch/x86/include/asm/vgtod.h linux-2.6.32.18/arch/x86/include/asm/vgtod.h
9402--- linux-2.6.32.16/arch/x86/include/asm/vgtod.h 2010-07-05 14:14:00.000000000 -0400 9416--- linux-2.6.32.18/arch/x86/include/asm/vgtod.h 2010-08-10 13:45:57.000000000 -0400
9403+++ linux-2.6.32.16/arch/x86/include/asm/vgtod.h 2010-07-09 14:50:35.000000000 -0400 9417+++ linux-2.6.32.18/arch/x86/include/asm/vgtod.h 2010-08-11 18:57:29.000000000 -0400
9404@@ -14,6 +14,7 @@ struct vsyscall_gtod_data { 9418@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
9405 int sysctl_enabled; 9419 int sysctl_enabled;
9406 struct timezone sys_tz; 9420 struct timezone sys_tz;
@@ -9409,9 +9423,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/vgtod.h linux-2.6.32.16/arch/x86
9409 cycle_t (*vread)(void); 9423 cycle_t (*vread)(void);
9410 cycle_t cycle_last; 9424 cycle_t cycle_last;
9411 cycle_t mask; 9425 cycle_t mask;
9412diff -urNp linux-2.6.32.16/arch/x86/include/asm/vmi.h linux-2.6.32.16/arch/x86/include/asm/vmi.h 9426diff -urNp linux-2.6.32.18/arch/x86/include/asm/vmi.h linux-2.6.32.18/arch/x86/include/asm/vmi.h
9413--- linux-2.6.32.16/arch/x86/include/asm/vmi.h 2010-07-05 14:14:00.000000000 -0400 9427--- linux-2.6.32.18/arch/x86/include/asm/vmi.h 2010-08-10 13:45:57.000000000 -0400
9414+++ linux-2.6.32.16/arch/x86/include/asm/vmi.h 2010-07-09 14:50:35.000000000 -0400 9428+++ linux-2.6.32.18/arch/x86/include/asm/vmi.h 2010-08-11 18:57:29.000000000 -0400
9415@@ -191,6 +191,7 @@ struct vrom_header { 9429@@ -191,6 +191,7 @@ struct vrom_header {
9416 u8 reserved[96]; /* Reserved for headers */ 9430 u8 reserved[96]; /* Reserved for headers */
9417 char vmi_init[8]; /* VMI_Init jump point */ 9431 char vmi_init[8]; /* VMI_Init jump point */
@@ -9420,9 +9434,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/vmi.h linux-2.6.32.16/arch/x86/i
9420 } __attribute__((packed)); 9434 } __attribute__((packed));
9421 9435
9422 struct pnp_header { 9436 struct pnp_header {
9423diff -urNp linux-2.6.32.16/arch/x86/include/asm/vsyscall.h linux-2.6.32.16/arch/x86/include/asm/vsyscall.h 9437diff -urNp linux-2.6.32.18/arch/x86/include/asm/vsyscall.h linux-2.6.32.18/arch/x86/include/asm/vsyscall.h
9424--- linux-2.6.32.16/arch/x86/include/asm/vsyscall.h 2010-07-05 14:14:00.000000000 -0400 9438--- linux-2.6.32.18/arch/x86/include/asm/vsyscall.h 2010-08-10 13:45:57.000000000 -0400
9425+++ linux-2.6.32.16/arch/x86/include/asm/vsyscall.h 2010-07-09 14:50:35.000000000 -0400 9439+++ linux-2.6.32.18/arch/x86/include/asm/vsyscall.h 2010-08-11 18:57:29.000000000 -0400
9426@@ -15,9 +15,10 @@ enum vsyscall_num { 9440@@ -15,9 +15,10 @@ enum vsyscall_num {
9427 9441
9428 #ifdef __KERNEL__ 9442 #ifdef __KERNEL__
@@ -9453,9 +9467,9 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/vsyscall.h linux-2.6.32.16/arch/
9453 #endif /* __KERNEL__ */ 9467 #endif /* __KERNEL__ */
9454 9468
9455 #endif /* _ASM_X86_VSYSCALL_H */ 9469 #endif /* _ASM_X86_VSYSCALL_H */
9456diff -urNp linux-2.6.32.16/arch/x86/include/asm/xsave.h linux-2.6.32.16/arch/x86/include/asm/xsave.h 9470diff -urNp linux-2.6.32.18/arch/x86/include/asm/xsave.h linux-2.6.32.18/arch/x86/include/asm/xsave.h
9457--- linux-2.6.32.16/arch/x86/include/asm/xsave.h 2010-07-05 14:14:00.000000000 -0400 9471--- linux-2.6.32.18/arch/x86/include/asm/xsave.h 2010-08-10 13:45:57.000000000 -0400
9458+++ linux-2.6.32.16/arch/x86/include/asm/xsave.h 2010-07-09 14:50:35.000000000 -0400 9472+++ linux-2.6.32.18/arch/x86/include/asm/xsave.h 2010-08-11 18:57:29.000000000 -0400
9459@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct 9473@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
9460 static inline int xsave_user(struct xsave_struct __user *buf) 9474 static inline int xsave_user(struct xsave_struct __user *buf)
9461 { 9475 {
@@ -9481,9 +9495,27 @@ diff -urNp linux-2.6.32.16/arch/x86/include/asm/xsave.h linux-2.6.32.16/arch/x86
9481 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" 9495 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
9482 "2:\n" 9496 "2:\n"
9483 ".section .fixup,\"ax\"\n" 9497 ".section .fixup,\"ax\"\n"
9484diff -urNp linux-2.6.32.16/arch/x86/Kconfig linux-2.6.32.16/arch/x86/Kconfig 9498diff -urNp linux-2.6.32.18/arch/x86/Kconfig linux-2.6.32.18/arch/x86/Kconfig
9485--- linux-2.6.32.16/arch/x86/Kconfig 2010-07-05 14:14:00.000000000 -0400 9499--- linux-2.6.32.18/arch/x86/Kconfig 2010-08-10 13:45:57.000000000 -0400
9486+++ linux-2.6.32.16/arch/x86/Kconfig 2010-07-09 14:50:35.000000000 -0400 9500+++ linux-2.6.32.18/arch/x86/Kconfig 2010-08-11 22:31:27.000000000 -0400
9501@@ -992,7 +992,7 @@ choice
9502
9503 config NOHIGHMEM
9504 bool "off"
9505- depends on !X86_NUMAQ
9506+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
9507 ---help---
9508 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
9509 However, the address space of 32-bit x86 processors is only 4
9510@@ -1029,7 +1029,7 @@ config NOHIGHMEM
9511
9512 config HIGHMEM4G
9513 bool "4GB"
9514- depends on !X86_NUMAQ
9515+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
9516 ---help---
9517 Select this if you have a 32-bit processor and between 1 and 4
9518 gigabytes of physical RAM.
9487@@ -1083,7 +1083,7 @@ config PAGE_OFFSET 9519@@ -1083,7 +1083,7 @@ config PAGE_OFFSET
9488 hex 9520 hex
9489 default 0xB0000000 if VMSPLIT_3G_OPT 9521 default 0xB0000000 if VMSPLIT_3G_OPT
@@ -9530,9 +9562,9 @@ diff -urNp linux-2.6.32.16/arch/x86/Kconfig linux-2.6.32.16/arch/x86/Kconfig
9530 ---help--- 9562 ---help---
9531 Map the 32-bit VDSO to the predictable old-style address too. 9563 Map the 32-bit VDSO to the predictable old-style address too.
9532 ---help--- 9564 ---help---
9533diff -urNp linux-2.6.32.16/arch/x86/Kconfig.cpu linux-2.6.32.16/arch/x86/Kconfig.cpu 9565diff -urNp linux-2.6.32.18/arch/x86/Kconfig.cpu linux-2.6.32.18/arch/x86/Kconfig.cpu
9534--- linux-2.6.32.16/arch/x86/Kconfig.cpu 2010-07-05 14:14:00.000000000 -0400 9566--- linux-2.6.32.18/arch/x86/Kconfig.cpu 2010-08-10 13:45:57.000000000 -0400
9535+++ linux-2.6.32.16/arch/x86/Kconfig.cpu 2010-07-09 14:50:35.000000000 -0400 9567+++ linux-2.6.32.18/arch/x86/Kconfig.cpu 2010-08-11 18:57:29.000000000 -0400
9536@@ -340,7 +340,7 @@ config X86_PPRO_FENCE 9568@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
9537 9569
9538 config X86_F00F_BUG 9570 config X86_F00F_BUG
@@ -9560,9 +9592,9 @@ diff -urNp linux-2.6.32.16/arch/x86/Kconfig.cpu linux-2.6.32.16/arch/x86/Kconfig
9560 9592
9561 config X86_MINIMUM_CPU_FAMILY 9593 config X86_MINIMUM_CPU_FAMILY
9562 int 9594 int
9563diff -urNp linux-2.6.32.16/arch/x86/Kconfig.debug linux-2.6.32.16/arch/x86/Kconfig.debug 9595diff -urNp linux-2.6.32.18/arch/x86/Kconfig.debug linux-2.6.32.18/arch/x86/Kconfig.debug
9564--- linux-2.6.32.16/arch/x86/Kconfig.debug 2010-07-05 14:14:00.000000000 -0400 9596--- linux-2.6.32.18/arch/x86/Kconfig.debug 2010-08-10 13:45:57.000000000 -0400
9565+++ linux-2.6.32.16/arch/x86/Kconfig.debug 2010-07-09 14:50:35.000000000 -0400 9597+++ linux-2.6.32.18/arch/x86/Kconfig.debug 2010-08-11 18:57:29.000000000 -0400
9566@@ -99,7 +99,7 @@ config X86_PTDUMP 9598@@ -99,7 +99,7 @@ config X86_PTDUMP
9567 config DEBUG_RODATA 9599 config DEBUG_RODATA
9568 bool "Write protect kernel read-only data structures" 9600 bool "Write protect kernel read-only data structures"
@@ -9572,9 +9604,9 @@ diff -urNp linux-2.6.32.16/arch/x86/Kconfig.debug linux-2.6.32.16/arch/x86/Kconf
9572 ---help--- 9604 ---help---
9573 Mark the kernel read-only data as write-protected in the pagetables, 9605 Mark the kernel read-only data as write-protected in the pagetables,
9574 in order to catch accidental (and incorrect) writes to such const 9606 in order to catch accidental (and incorrect) writes to such const
9575diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/boot.c linux-2.6.32.16/arch/x86/kernel/acpi/boot.c 9607diff -urNp linux-2.6.32.18/arch/x86/kernel/acpi/boot.c linux-2.6.32.18/arch/x86/kernel/acpi/boot.c
9576--- linux-2.6.32.16/arch/x86/kernel/acpi/boot.c 2010-07-05 14:14:00.000000000 -0400 9608--- linux-2.6.32.18/arch/x86/kernel/acpi/boot.c 2010-08-10 13:45:57.000000000 -0400
9577+++ linux-2.6.32.16/arch/x86/kernel/acpi/boot.c 2010-07-09 14:50:35.000000000 -0400 9609+++ linux-2.6.32.18/arch/x86/kernel/acpi/boot.c 2010-08-11 18:57:29.000000000 -0400
9578@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a 9610@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a
9579 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), 9611 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
9580 }, 9612 },
@@ -9584,9 +9616,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/boot.c linux-2.6.32.16/arch/x86/
9584 }; 9616 };
9585 9617
9586 /* 9618 /*
9587diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S 9619diff -urNp linux-2.6.32.18/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.18/arch/x86/kernel/acpi/realmode/wakeup.S
9588--- linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S 2010-07-05 14:14:00.000000000 -0400 9620--- linux-2.6.32.18/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-10 13:45:57.000000000 -0400
9589+++ linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S 2010-07-09 14:50:35.000000000 -0400 9621+++ linux-2.6.32.18/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-11 18:57:29.000000000 -0400
9590@@ -104,7 +104,7 @@ _start: 9622@@ -104,7 +104,7 @@ _start:
9591 movl %eax, %ecx 9623 movl %eax, %ecx
9592 orl %edx, %ecx 9624 orl %edx, %ecx
@@ -9596,9 +9628,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.1
9596 wrmsr 9628 wrmsr
9597 1: 9629 1:
9598 9630
9599diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c 9631diff -urNp linux-2.6.32.18/arch/x86/kernel/acpi/sleep.c linux-2.6.32.18/arch/x86/kernel/acpi/sleep.c
9600--- linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c 2010-07-05 14:14:00.000000000 -0400 9632--- linux-2.6.32.18/arch/x86/kernel/acpi/sleep.c 2010-08-10 13:45:57.000000000 -0400
9601+++ linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c 2010-07-09 14:50:35.000000000 -0400 9633+++ linux-2.6.32.18/arch/x86/kernel/acpi/sleep.c 2010-08-11 18:57:29.000000000 -0400
9602@@ -11,11 +11,12 @@ 9634@@ -11,11 +11,12 @@
9603 #include <linux/cpumask.h> 9635 #include <linux/cpumask.h>
9604 #include <asm/segment.h> 9636 #include <asm/segment.h>
@@ -9643,9 +9675,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/sleep.c linux-2.6.32.16/arch/x86
9643 } 9675 }
9644 9676
9645 9677
9646diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S 9678diff -urNp linux-2.6.32.18/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.18/arch/x86/kernel/acpi/wakeup_32.S
9647--- linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S 2010-07-05 14:14:00.000000000 -0400 9679--- linux-2.6.32.18/arch/x86/kernel/acpi/wakeup_32.S 2010-08-10 13:45:57.000000000 -0400
9648+++ linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S 2010-07-09 14:50:35.000000000 -0400 9680+++ linux-2.6.32.18/arch/x86/kernel/acpi/wakeup_32.S 2010-08-11 18:57:29.000000000 -0400
9649@@ -30,13 +30,11 @@ wakeup_pmode_return: 9681@@ -30,13 +30,11 @@ wakeup_pmode_return:
9650 # and restore the stack ... but you need gdt for this to work 9682 # and restore the stack ... but you need gdt for this to work
9651 movl saved_context_esp, %esp 9683 movl saved_context_esp, %esp
@@ -9662,9 +9694,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.16/arch
9662 9694
9663 bogus_magic: 9695 bogus_magic:
9664 jmp bogus_magic 9696 jmp bogus_magic
9665diff -urNp linux-2.6.32.16/arch/x86/kernel/alternative.c linux-2.6.32.16/arch/x86/kernel/alternative.c 9697diff -urNp linux-2.6.32.18/arch/x86/kernel/alternative.c linux-2.6.32.18/arch/x86/kernel/alternative.c
9666--- linux-2.6.32.16/arch/x86/kernel/alternative.c 2010-07-05 14:14:00.000000000 -0400 9698--- linux-2.6.32.18/arch/x86/kernel/alternative.c 2010-08-10 13:45:57.000000000 -0400
9667+++ linux-2.6.32.16/arch/x86/kernel/alternative.c 2010-07-09 14:50:35.000000000 -0400 9699+++ linux-2.6.32.18/arch/x86/kernel/alternative.c 2010-08-11 18:57:29.000000000 -0400
9668@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str 9700@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
9669 9701
9670 BUG_ON(p->len > MAX_PATCH_LEN); 9702 BUG_ON(p->len > MAX_PATCH_LEN);
@@ -9746,9 +9778,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/alternative.c linux-2.6.32.16/arch/x8
9746+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); 9778+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]);
9747 return addr; 9779 return addr;
9748 } 9780 }
9749diff -urNp linux-2.6.32.16/arch/x86/kernel/amd_iommu.c linux-2.6.32.16/arch/x86/kernel/amd_iommu.c 9781diff -urNp linux-2.6.32.18/arch/x86/kernel/amd_iommu.c linux-2.6.32.18/arch/x86/kernel/amd_iommu.c
9750--- linux-2.6.32.16/arch/x86/kernel/amd_iommu.c 2010-07-05 14:14:00.000000000 -0400 9782--- linux-2.6.32.18/arch/x86/kernel/amd_iommu.c 2010-08-10 13:45:57.000000000 -0400
9751+++ linux-2.6.32.16/arch/x86/kernel/amd_iommu.c 2010-07-09 14:50:35.000000000 -0400 9783+++ linux-2.6.32.18/arch/x86/kernel/amd_iommu.c 2010-08-11 18:57:29.000000000 -0400
9752@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( 9784@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains(
9753 } 9785 }
9754 } 9786 }
@@ -9758,9 +9790,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/amd_iommu.c linux-2.6.32.16/arch/x86/
9758 .alloc_coherent = alloc_coherent, 9790 .alloc_coherent = alloc_coherent,
9759 .free_coherent = free_coherent, 9791 .free_coherent = free_coherent,
9760 .map_page = map_page, 9792 .map_page = map_page,
9761diff -urNp linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c 9793diff -urNp linux-2.6.32.18/arch/x86/kernel/apic/io_apic.c linux-2.6.32.18/arch/x86/kernel/apic/io_apic.c
9762--- linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c 2010-07-05 14:14:00.000000000 -0400 9794--- linux-2.6.32.18/arch/x86/kernel/apic/io_apic.c 2010-08-10 13:45:57.000000000 -0400
9763+++ linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c 2010-07-09 14:50:35.000000000 -0400 9795+++ linux-2.6.32.18/arch/x86/kernel/apic/io_apic.c 2010-08-11 18:57:29.000000000 -0400
9764@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi 9796@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi
9765 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, 9797 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
9766 GFP_ATOMIC); 9798 GFP_ATOMIC);
@@ -9797,9 +9829,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/apic/io_apic.c linux-2.6.32.16/arch/x
9797 { 9829 {
9798 spin_unlock(&vector_lock); 9830 spin_unlock(&vector_lock);
9799 } 9831 }
9800diff -urNp linux-2.6.32.16/arch/x86/kernel/apm_32.c linux-2.6.32.16/arch/x86/kernel/apm_32.c 9832diff -urNp linux-2.6.32.18/arch/x86/kernel/apm_32.c linux-2.6.32.18/arch/x86/kernel/apm_32.c
9801--- linux-2.6.32.16/arch/x86/kernel/apm_32.c 2010-07-05 14:14:00.000000000 -0400 9833--- linux-2.6.32.18/arch/x86/kernel/apm_32.c 2010-08-10 13:45:57.000000000 -0400
9802+++ linux-2.6.32.16/arch/x86/kernel/apm_32.c 2010-07-09 14:50:35.000000000 -0400 9834+++ linux-2.6.32.18/arch/x86/kernel/apm_32.c 2010-08-11 18:57:29.000000000 -0400
9803@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); 9835@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
9804 * This is for buggy BIOS's that refer to (real mode) segment 0x40 9836 * This is for buggy BIOS's that refer to (real mode) segment 0x40
9805 * even though they are called in protected mode. 9837 * even though they are called in protected mode.
@@ -9901,9 +9933,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/apm_32.c linux-2.6.32.16/arch/x86/ker
9901 9933
9902 proc_create("apm", 0, NULL, &apm_file_ops); 9934 proc_create("apm", 0, NULL, &apm_file_ops);
9903 9935
9904diff -urNp linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c 9936diff -urNp linux-2.6.32.18/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.18/arch/x86/kernel/asm-offsets_32.c
9905--- linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c 2010-07-05 14:14:00.000000000 -0400 9937--- linux-2.6.32.18/arch/x86/kernel/asm-offsets_32.c 2010-08-10 13:45:57.000000000 -0400
9906+++ linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c 2010-07-09 14:50:35.000000000 -0400 9938+++ linux-2.6.32.18/arch/x86/kernel/asm-offsets_32.c 2010-08-11 18:57:29.000000000 -0400
9907@@ -115,6 +115,11 @@ void foo(void) 9939@@ -115,6 +115,11 @@ void foo(void)
9908 OFFSET(PV_CPU_iret, pv_cpu_ops, iret); 9940 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
9909 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 9941 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
@@ -9916,9 +9948,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.16/arch
9916 #endif 9948 #endif
9917 9949
9918 #ifdef CONFIG_XEN 9950 #ifdef CONFIG_XEN
9919diff -urNp linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c 9951diff -urNp linux-2.6.32.18/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.18/arch/x86/kernel/asm-offsets_64.c
9920--- linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c 2010-07-05 14:14:00.000000000 -0400 9952--- linux-2.6.32.18/arch/x86/kernel/asm-offsets_64.c 2010-08-10 13:45:57.000000000 -0400
9921+++ linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c 2010-07-09 14:50:35.000000000 -0400 9953+++ linux-2.6.32.18/arch/x86/kernel/asm-offsets_64.c 2010-08-11 18:57:29.000000000 -0400
9922@@ -63,6 +63,18 @@ int main(void) 9954@@ -63,6 +63,18 @@ int main(void)
9923 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 9955 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
9924 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); 9956 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
@@ -9946,9 +9978,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.16/arch
9946 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); 9978 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
9947 BLANK(); 9979 BLANK();
9948 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); 9980 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
9949diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/common.c linux-2.6.32.16/arch/x86/kernel/cpu/common.c 9981diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/common.c linux-2.6.32.18/arch/x86/kernel/cpu/common.c
9950--- linux-2.6.32.16/arch/x86/kernel/cpu/common.c 2010-07-05 14:14:00.000000000 -0400 9982--- linux-2.6.32.18/arch/x86/kernel/cpu/common.c 2010-08-10 13:45:57.000000000 -0400
9951+++ linux-2.6.32.16/arch/x86/kernel/cpu/common.c 2010-07-09 14:50:35.000000000 -0400 9983+++ linux-2.6.32.18/arch/x86/kernel/cpu/common.c 2010-08-11 18:57:29.000000000 -0400
9952@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon 9984@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
9953 9985
9954 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; 9986 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -10057,9 +10089,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/common.c linux-2.6.32.16/arch/x86
10057 struct thread_struct *thread = &curr->thread; 10089 struct thread_struct *thread = &curr->thread;
10058 10090
10059 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { 10091 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
10060diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 10092diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
10061--- linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-07-05 14:14:00.000000000 -0400 10093--- linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-10 13:45:57.000000000 -0400
10062+++ linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-07-09 14:50:35.000000000 -0400 10094+++ linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-11 18:57:29.000000000 -0400
10063@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any 10095@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
10064 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), 10096 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
10065 }, 10097 },
@@ -10069,9 +10101,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.
10069 }; 10101 };
10070 10102
10071 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) 10103 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
10072diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 10104diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
10073--- linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-07-05 14:14:00.000000000 -0400 10105--- linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-10 13:45:57.000000000 -0400
10074+++ linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-07-09 14:50:35.000000000 -0400 10106+++ linux-2.6.32.18/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-11 18:57:29.000000000 -0400
10075@@ -225,7 +225,7 @@ static struct cpu_model models[] = 10107@@ -225,7 +225,7 @@ static struct cpu_model models[] =
10076 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, 10108 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
10077 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, 10109 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
@@ -10081,9 +10113,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu
10081 }; 10113 };
10082 #undef _BANIAS 10114 #undef _BANIAS
10083 #undef BANIAS 10115 #undef BANIAS
10084diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/intel.c linux-2.6.32.16/arch/x86/kernel/cpu/intel.c 10116diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/intel.c linux-2.6.32.18/arch/x86/kernel/cpu/intel.c
10085--- linux-2.6.32.16/arch/x86/kernel/cpu/intel.c 2010-07-05 14:14:00.000000000 -0400 10117--- linux-2.6.32.18/arch/x86/kernel/cpu/intel.c 2010-08-10 13:45:57.000000000 -0400
10086+++ linux-2.6.32.16/arch/x86/kernel/cpu/intel.c 2010-07-09 14:50:35.000000000 -0400 10118+++ linux-2.6.32.18/arch/x86/kernel/cpu/intel.c 2010-08-11 18:57:29.000000000 -0400
10087@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug 10119@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug
10088 * Update the IDT descriptor and reload the IDT so that 10120 * Update the IDT descriptor and reload the IDT so that
10089 * it uses the read-only mapped virtual address. 10121 * it uses the read-only mapped virtual address.
@@ -10093,9 +10125,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/intel.c linux-2.6.32.16/arch/x86/
10093 load_idt(&idt_descr); 10125 load_idt(&idt_descr);
10094 } 10126 }
10095 #endif 10127 #endif
10096diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c 10128diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.18/arch/x86/kernel/cpu/intel_cacheinfo.c
10097--- linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-07-05 14:14:00.000000000 -0400 10129--- linux-2.6.32.18/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-10 13:45:57.000000000 -0400
10098+++ linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-07-09 14:50:35.000000000 -0400 10130+++ linux-2.6.32.18/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-11 18:57:29.000000000 -0400
10099@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob 10131@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob
10100 return ret; 10132 return ret;
10101 } 10133 }
@@ -10105,9 +10137,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.16
10105 .show = show, 10137 .show = show,
10106 .store = store, 10138 .store = store,
10107 }; 10139 };
10108diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/Makefile linux-2.6.32.16/arch/x86/kernel/cpu/Makefile 10140diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/Makefile linux-2.6.32.18/arch/x86/kernel/cpu/Makefile
10109--- linux-2.6.32.16/arch/x86/kernel/cpu/Makefile 2010-07-05 14:14:00.000000000 -0400 10141--- linux-2.6.32.18/arch/x86/kernel/cpu/Makefile 2010-08-10 13:45:57.000000000 -0400
10110+++ linux-2.6.32.16/arch/x86/kernel/cpu/Makefile 2010-07-09 14:50:35.000000000 -0400 10142+++ linux-2.6.32.18/arch/x86/kernel/cpu/Makefile 2010-08-11 18:57:29.000000000 -0400
10111@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER 10143@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
10112 CFLAGS_REMOVE_common.o = -pg 10144 CFLAGS_REMOVE_common.o = -pg
10113 endif 10145 endif
@@ -10119,9 +10151,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/Makefile linux-2.6.32.16/arch/x86
10119 obj-y := intel_cacheinfo.o addon_cpuid_features.o 10151 obj-y := intel_cacheinfo.o addon_cpuid_features.o
10120 obj-y += proc.o capflags.o powerflags.o common.o 10152 obj-y += proc.o capflags.o powerflags.o common.o
10121 obj-y += vmware.o hypervisor.o sched.o 10153 obj-y += vmware.o hypervisor.o sched.o
10122diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c 10154diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce_amd.c
10123--- linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-07-05 14:14:00.000000000 -0400 10155--- linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-08-10 13:45:57.000000000 -0400
10124+++ linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-07-09 14:50:35.000000000 -0400 10156+++ linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-08-11 18:57:29.000000000 -0400
10125@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob 10157@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob
10126 return ret; 10158 return ret;
10127 } 10159 }
@@ -10131,9 +10163,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.16/
10131 .show = show, 10163 .show = show,
10132 .store = store, 10164 .store = store,
10133 }; 10165 };
10134diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c 10166diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce.c
10135--- linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c 2010-07-05 14:14:00.000000000 -0400 10167--- linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-10 13:45:57.000000000 -0400
10136+++ linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c 2010-07-09 14:50:35.000000000 -0400 10168+++ linux-2.6.32.18/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-11 18:57:29.000000000 -0400
10137@@ -187,7 +187,7 @@ static void print_mce(struct mce *m) 10169@@ -187,7 +187,7 @@ static void print_mce(struct mce *m)
10138 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", 10170 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
10139 m->cs, m->ip); 10171 m->cs, m->ip);
@@ -10186,9 +10218,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.16/arch
10186 }; 10218 };
10187 10219
10188 /* 10220 /*
10189diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c 10221diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/amd.c
10190--- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c 2010-07-05 14:14:00.000000000 -0400 10222--- linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-10 13:45:57.000000000 -0400
10191+++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c 2010-07-09 14:50:35.000000000 -0400 10223+++ linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-11 18:57:29.000000000 -0400
10192@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base 10224@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
10193 return 0; 10225 return 0;
10194 } 10226 }
@@ -10198,9 +10230,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.16/arch/x
10198 .vendor = X86_VENDOR_AMD, 10230 .vendor = X86_VENDOR_AMD,
10199 .set = amd_set_mtrr, 10231 .set = amd_set_mtrr,
10200 .get = amd_get_mtrr, 10232 .get = amd_get_mtrr,
10201diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c 10233diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/centaur.c
10202--- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c 2010-07-05 14:14:00.000000000 -0400 10234--- linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-10 13:45:57.000000000 -0400
10203+++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c 2010-07-09 14:50:35.000000000 -0400 10235+++ linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-11 18:57:29.000000000 -0400
10204@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long 10236@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
10205 return 0; 10237 return 0;
10206 } 10238 }
@@ -10210,9 +10242,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.16/ar
10210 .vendor = X86_VENDOR_CENTAUR, 10242 .vendor = X86_VENDOR_CENTAUR,
10211 .set = centaur_set_mcr, 10243 .set = centaur_set_mcr,
10212 .get = centaur_get_mcr, 10244 .get = centaur_get_mcr,
10213diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c 10245diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/cyrix.c
10214--- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-07-05 14:14:00.000000000 -0400 10246--- linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-10 13:45:57.000000000 -0400
10215+++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-07-09 14:50:35.000000000 -0400 10247+++ linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-11 18:57:29.000000000 -0400
10216@@ -265,7 +265,7 @@ static void cyrix_set_all(void) 10248@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
10217 post_set(); 10249 post_set();
10218 } 10250 }
@@ -10222,9 +10254,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.16/arch
10222 .vendor = X86_VENDOR_CYRIX, 10254 .vendor = X86_VENDOR_CYRIX,
10223 .set_all = cyrix_set_all, 10255 .set_all = cyrix_set_all,
10224 .set = cyrix_set_arr, 10256 .set = cyrix_set_arr,
10225diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c 10257diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/generic.c
10226--- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c 2010-07-05 14:14:00.000000000 -0400 10258--- linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-10 13:45:57.000000000 -0400
10227+++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c 2010-07-09 14:50:35.000000000 -0400 10259+++ linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-11 18:57:29.000000000 -0400
10228@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra 10260@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
10229 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ 10261 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
10230 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ 10262 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
@@ -10243,9 +10275,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.16/ar
10243 .use_intel_if = 1, 10275 .use_intel_if = 1,
10244 .set_all = generic_set_all, 10276 .set_all = generic_set_all,
10245 .get = generic_get_mtrr, 10277 .get = generic_get_mtrr,
10246diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c 10278diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/main.c
10247--- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c 2010-07-05 14:14:00.000000000 -0400 10279--- linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/main.c 2010-08-10 13:45:57.000000000 -0400
10248+++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c 2010-07-09 14:50:35.000000000 -0400 10280+++ linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/main.c 2010-08-11 18:57:29.000000000 -0400
10249@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); 10281@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
10250 u64 size_or_mask, size_and_mask; 10282 u64 size_or_mask, size_and_mask;
10251 static bool mtrr_aps_delayed_init; 10283 static bool mtrr_aps_delayed_init;
@@ -10264,9 +10296,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.16/arch/
10264 { 10296 {
10265 if (ops->vendor && ops->vendor < X86_VENDOR_NUM) 10297 if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
10266 mtrr_ops[ops->vendor] = ops; 10298 mtrr_ops[ops->vendor] = ops;
10267diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h 10299diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/mtrr.h
10268--- linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-07-05 14:14:00.000000000 -0400 10300--- linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-10 13:45:57.000000000 -0400
10269+++ linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-07-09 14:50:35.000000000 -0400 10301+++ linux-2.6.32.18/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-11 18:57:29.000000000 -0400
10270@@ -12,19 +12,19 @@ 10302@@ -12,19 +12,19 @@
10271 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; 10303 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
10272 10304
@@ -10317,9 +10349,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.16/arch/
10317 10349
10318 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) 10350 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
10319 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) 10351 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
10320diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c 10352diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.18/arch/x86/kernel/cpu/perfctr-watchdog.c
10321--- linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-07-05 14:14:00.000000000 -0400 10353--- linux-2.6.32.18/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-10 13:45:57.000000000 -0400
10322+++ linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-07-09 14:50:35.000000000 -0400 10354+++ linux-2.6.32.18/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-11 18:57:29.000000000 -0400
10323@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { 10355@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
10324 10356
10325 /* Interface defining a CPU specific perfctr watchdog */ 10357 /* Interface defining a CPU specific perfctr watchdog */
@@ -10353,9 +10385,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.1
10353 static struct wd_ops intel_arch_wd_ops __read_mostly = { 10385 static struct wd_ops intel_arch_wd_ops __read_mostly = {
10354 .reserve = single_msr_reserve, 10386 .reserve = single_msr_reserve,
10355 .unreserve = single_msr_unreserve, 10387 .unreserve = single_msr_unreserve,
10356diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c 10388diff -urNp linux-2.6.32.18/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.18/arch/x86/kernel/cpu/perf_event.c
10357--- linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c 2010-07-05 14:14:00.000000000 -0400 10389--- linux-2.6.32.18/arch/x86/kernel/cpu/perf_event.c 2010-08-10 13:45:57.000000000 -0400
10358+++ linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c 2010-07-09 14:50:35.000000000 -0400 10390+++ linux-2.6.32.18/arch/x86/kernel/cpu/perf_event.c 2010-08-11 18:57:29.000000000 -0400
10359@@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs 10391@@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs
10360 break; 10392 break;
10361 10393
@@ -10365,9 +10397,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.16/arch
10365 } 10397 }
10366 } 10398 }
10367 10399
10368diff -urNp linux-2.6.32.16/arch/x86/kernel/crash.c linux-2.6.32.16/arch/x86/kernel/crash.c 10400diff -urNp linux-2.6.32.18/arch/x86/kernel/crash.c linux-2.6.32.18/arch/x86/kernel/crash.c
10369--- linux-2.6.32.16/arch/x86/kernel/crash.c 2010-07-05 14:14:00.000000000 -0400 10401--- linux-2.6.32.18/arch/x86/kernel/crash.c 2010-08-10 13:45:57.000000000 -0400
10370+++ linux-2.6.32.16/arch/x86/kernel/crash.c 2010-07-09 14:50:35.000000000 -0400 10402+++ linux-2.6.32.18/arch/x86/kernel/crash.c 2010-08-11 18:57:29.000000000 -0400
10371@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, 10403@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,
10372 regs = args->regs; 10404 regs = args->regs;
10373 10405
@@ -10377,9 +10409,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/crash.c linux-2.6.32.16/arch/x86/kern
10377 crash_fixup_ss_esp(&fixed_regs, regs); 10409 crash_fixup_ss_esp(&fixed_regs, regs);
10378 regs = &fixed_regs; 10410 regs = &fixed_regs;
10379 } 10411 }
10380diff -urNp linux-2.6.32.16/arch/x86/kernel/doublefault_32.c linux-2.6.32.16/arch/x86/kernel/doublefault_32.c 10412diff -urNp linux-2.6.32.18/arch/x86/kernel/doublefault_32.c linux-2.6.32.18/arch/x86/kernel/doublefault_32.c
10381--- linux-2.6.32.16/arch/x86/kernel/doublefault_32.c 2010-07-05 14:14:00.000000000 -0400 10413--- linux-2.6.32.18/arch/x86/kernel/doublefault_32.c 2010-08-10 13:45:57.000000000 -0400
10382+++ linux-2.6.32.16/arch/x86/kernel/doublefault_32.c 2010-07-09 14:50:35.000000000 -0400 10414+++ linux-2.6.32.18/arch/x86/kernel/doublefault_32.c 2010-08-11 18:57:29.000000000 -0400
10383@@ -11,7 +11,7 @@ 10415@@ -11,7 +11,7 @@
10384 10416
10385 #define DOUBLEFAULT_STACKSIZE (1024) 10417 #define DOUBLEFAULT_STACKSIZE (1024)
@@ -10411,9 +10443,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/doublefault_32.c linux-2.6.32.16/arch
10411 .fs = __KERNEL_PERCPU, 10443 .fs = __KERNEL_PERCPU,
10412 10444
10413 .__cr3 = __pa_nodebug(swapper_pg_dir), 10445 .__cr3 = __pa_nodebug(swapper_pg_dir),
10414diff -urNp linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c 10446diff -urNp linux-2.6.32.18/arch/x86/kernel/dumpstack_32.c linux-2.6.32.18/arch/x86/kernel/dumpstack_32.c
10415--- linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c 2010-07-05 14:14:00.000000000 -0400 10447--- linux-2.6.32.18/arch/x86/kernel/dumpstack_32.c 2010-08-10 13:45:57.000000000 -0400
10416+++ linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c 2010-07-09 14:50:35.000000000 -0400 10448+++ linux-2.6.32.18/arch/x86/kernel/dumpstack_32.c 2010-08-11 18:57:29.000000000 -0400
10417@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs 10449@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
10418 * When in-kernel, we also print out the stack and code at the 10450 * When in-kernel, we also print out the stack and code at the
10419 * time of the fault.. 10451 * time of the fault..
@@ -10458,9 +10490,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/dumpstack_32.c linux-2.6.32.16/arch/x
10458 if (ip < PAGE_OFFSET) 10490 if (ip < PAGE_OFFSET)
10459 return 0; 10491 return 0;
10460 if (probe_kernel_address((unsigned short *)ip, ud2)) 10492 if (probe_kernel_address((unsigned short *)ip, ud2))
10461diff -urNp linux-2.6.32.16/arch/x86/kernel/dumpstack.c linux-2.6.32.16/arch/x86/kernel/dumpstack.c 10493diff -urNp linux-2.6.32.18/arch/x86/kernel/dumpstack.c linux-2.6.32.18/arch/x86/kernel/dumpstack.c
10462--- linux-2.6.32.16/arch/x86/kernel/dumpstack.c 2010-07-05 14:14:00.000000000 -0400 10494--- linux-2.6.32.18/arch/x86/kernel/dumpstack.c 2010-08-10 13:45:57.000000000 -0400
10463+++ linux-2.6.32.16/arch/x86/kernel/dumpstack.c 2010-07-09 14:50:35.000000000 -0400 10495+++ linux-2.6.32.18/arch/x86/kernel/dumpstack.c 2010-08-11 18:57:29.000000000 -0400
10464@@ -180,7 +180,7 @@ void dump_stack(void) 10496@@ -180,7 +180,7 @@ void dump_stack(void)
10465 #endif 10497 #endif
10466 10498
@@ -10488,9 +10520,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/dumpstack.c linux-2.6.32.16/arch/x86/
10488 report_bug(regs->ip, regs); 10520 report_bug(regs->ip, regs);
10489 10521
10490 if (__die(str, regs, err)) 10522 if (__die(str, regs, err))
10491diff -urNp linux-2.6.32.16/arch/x86/kernel/e820.c linux-2.6.32.16/arch/x86/kernel/e820.c 10523diff -urNp linux-2.6.32.18/arch/x86/kernel/e820.c linux-2.6.32.18/arch/x86/kernel/e820.c
10492--- linux-2.6.32.16/arch/x86/kernel/e820.c 2010-07-05 14:14:00.000000000 -0400 10524--- linux-2.6.32.18/arch/x86/kernel/e820.c 2010-08-10 13:45:57.000000000 -0400
10493+++ linux-2.6.32.16/arch/x86/kernel/e820.c 2010-07-09 14:50:35.000000000 -0400 10525+++ linux-2.6.32.18/arch/x86/kernel/e820.c 2010-08-11 18:57:29.000000000 -0400
10494@@ -733,7 +733,7 @@ struct early_res { 10526@@ -733,7 +733,7 @@ struct early_res {
10495 }; 10527 };
10496 static struct early_res early_res[MAX_EARLY_RES] __initdata = { 10528 static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -10500,9 +10532,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/e820.c linux-2.6.32.16/arch/x86/kerne
10500 }; 10532 };
10501 10533
10502 static int __init find_overlapped_early(u64 start, u64 end) 10534 static int __init find_overlapped_early(u64 start, u64 end)
10503diff -urNp linux-2.6.32.16/arch/x86/kernel/efi_32.c linux-2.6.32.16/arch/x86/kernel/efi_32.c 10535diff -urNp linux-2.6.32.18/arch/x86/kernel/efi_32.c linux-2.6.32.18/arch/x86/kernel/efi_32.c
10504--- linux-2.6.32.16/arch/x86/kernel/efi_32.c 2010-07-05 14:14:00.000000000 -0400 10536--- linux-2.6.32.18/arch/x86/kernel/efi_32.c 2010-08-10 13:45:57.000000000 -0400
10505+++ linux-2.6.32.16/arch/x86/kernel/efi_32.c 2010-07-09 14:50:35.000000000 -0400 10537+++ linux-2.6.32.18/arch/x86/kernel/efi_32.c 2010-08-11 18:57:29.000000000 -0400
10506@@ -38,70 +38,38 @@ 10538@@ -38,70 +38,38 @@
10507 */ 10539 */
10508 10540
@@ -10583,9 +10615,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/efi_32.c linux-2.6.32.16/arch/x86/ker
10583 10615
10584 /* 10616 /*
10585 * After the lock is released, the original page table is restored. 10617 * After the lock is released, the original page table is restored.
10586diff -urNp linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S 10618diff -urNp linux-2.6.32.18/arch/x86/kernel/efi_stub_32.S linux-2.6.32.18/arch/x86/kernel/efi_stub_32.S
10587--- linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S 2010-07-05 14:14:00.000000000 -0400 10619--- linux-2.6.32.18/arch/x86/kernel/efi_stub_32.S 2010-08-10 13:45:57.000000000 -0400
10588+++ linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S 2010-07-09 14:50:35.000000000 -0400 10620+++ linux-2.6.32.18/arch/x86/kernel/efi_stub_32.S 2010-08-11 18:57:29.000000000 -0400
10589@@ -6,6 +6,7 @@ 10621@@ -6,6 +6,7 @@
10590 */ 10622 */
10591 10623
@@ -10684,9 +10716,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/efi_stub_32.S linux-2.6.32.16/arch/x8
10684 saved_return_addr: 10716 saved_return_addr:
10685 .long 0 10717 .long 0
10686 efi_rt_function_ptr: 10718 efi_rt_function_ptr:
10687diff -urNp linux-2.6.32.16/arch/x86/kernel/entry_32.S linux-2.6.32.16/arch/x86/kernel/entry_32.S 10719diff -urNp linux-2.6.32.18/arch/x86/kernel/entry_32.S linux-2.6.32.18/arch/x86/kernel/entry_32.S
10688--- linux-2.6.32.16/arch/x86/kernel/entry_32.S 2010-07-05 14:14:00.000000000 -0400 10720--- linux-2.6.32.18/arch/x86/kernel/entry_32.S 2010-08-10 13:45:57.000000000 -0400
10689+++ linux-2.6.32.16/arch/x86/kernel/entry_32.S 2010-07-09 14:50:35.000000000 -0400 10721+++ linux-2.6.32.18/arch/x86/kernel/entry_32.S 2010-08-11 18:57:29.000000000 -0400
10690@@ -191,7 +191,67 @@ 10722@@ -191,7 +191,67 @@
10691 10723
10692 #endif /* CONFIG_X86_32_LAZY_GS */ 10724 #endif /* CONFIG_X86_32_LAZY_GS */
@@ -10997,9 +11029,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/entry_32.S linux-2.6.32.16/arch/x86/k
10997 RESTORE_REGS 11029 RESTORE_REGS
10998 lss 12+4(%esp), %esp # back to espfix stack 11030 lss 12+4(%esp), %esp # back to espfix stack
10999 CFI_ADJUST_CFA_OFFSET -24 11031 CFI_ADJUST_CFA_OFFSET -24
11000diff -urNp linux-2.6.32.16/arch/x86/kernel/entry_64.S linux-2.6.32.16/arch/x86/kernel/entry_64.S 11032diff -urNp linux-2.6.32.18/arch/x86/kernel/entry_64.S linux-2.6.32.18/arch/x86/kernel/entry_64.S
11001--- linux-2.6.32.16/arch/x86/kernel/entry_64.S 2010-07-05 14:14:00.000000000 -0400 11033--- linux-2.6.32.18/arch/x86/kernel/entry_64.S 2010-08-10 13:45:57.000000000 -0400
11002+++ linux-2.6.32.16/arch/x86/kernel/entry_64.S 2010-07-09 14:50:35.000000000 -0400 11034+++ linux-2.6.32.18/arch/x86/kernel/entry_64.S 2010-08-11 18:57:29.000000000 -0400
11003@@ -53,6 +53,7 @@ 11035@@ -53,6 +53,7 @@
11004 #include <asm/paravirt.h> 11036 #include <asm/paravirt.h>
11005 #include <asm/ftrace.h> 11037 #include <asm/ftrace.h>
@@ -11457,9 +11489,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/entry_64.S linux-2.6.32.16/arch/x86/k
11457 RESTORE_ALL 8 11489 RESTORE_ALL 8
11458 jmp irq_return 11490 jmp irq_return
11459 nmi_userspace: 11491 nmi_userspace:
11460diff -urNp linux-2.6.32.16/arch/x86/kernel/ftrace.c linux-2.6.32.16/arch/x86/kernel/ftrace.c 11492diff -urNp linux-2.6.32.18/arch/x86/kernel/ftrace.c linux-2.6.32.18/arch/x86/kernel/ftrace.c
11461--- linux-2.6.32.16/arch/x86/kernel/ftrace.c 2010-07-05 14:14:00.000000000 -0400 11493--- linux-2.6.32.18/arch/x86/kernel/ftrace.c 2010-08-10 13:45:57.000000000 -0400
11462+++ linux-2.6.32.16/arch/x86/kernel/ftrace.c 2010-07-09 14:50:35.000000000 -0400 11494+++ linux-2.6.32.18/arch/x86/kernel/ftrace.c 2010-08-11 18:57:29.000000000 -0400
11463@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) 11495@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
11464 { 11496 {
11465 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { 11497 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -11525,9 +11557,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/ftrace.c linux-2.6.32.16/arch/x86/ker
11525 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) 11557 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
11526 return -EFAULT; 11558 return -EFAULT;
11527 11559
11528diff -urNp linux-2.6.32.16/arch/x86/kernel/head32.c linux-2.6.32.16/arch/x86/kernel/head32.c 11560diff -urNp linux-2.6.32.18/arch/x86/kernel/head32.c linux-2.6.32.18/arch/x86/kernel/head32.c
11529--- linux-2.6.32.16/arch/x86/kernel/head32.c 2010-07-05 14:14:00.000000000 -0400 11561--- linux-2.6.32.18/arch/x86/kernel/head32.c 2010-08-10 13:45:57.000000000 -0400
11530+++ linux-2.6.32.16/arch/x86/kernel/head32.c 2010-07-09 14:50:35.000000000 -0400 11562+++ linux-2.6.32.18/arch/x86/kernel/head32.c 2010-08-11 18:57:29.000000000 -0400
11531@@ -16,6 +16,7 @@ 11563@@ -16,6 +16,7 @@
11532 #include <asm/apic.h> 11564 #include <asm/apic.h>
11533 #include <asm/io_apic.h> 11565 #include <asm/io_apic.h>
@@ -11545,9 +11577,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/head32.c linux-2.6.32.16/arch/x86/ker
11545 11577
11546 #ifdef CONFIG_BLK_DEV_INITRD 11578 #ifdef CONFIG_BLK_DEV_INITRD
11547 /* Reserve INITRD */ 11579 /* Reserve INITRD */
11548diff -urNp linux-2.6.32.16/arch/x86/kernel/head_32.S linux-2.6.32.16/arch/x86/kernel/head_32.S 11580diff -urNp linux-2.6.32.18/arch/x86/kernel/head_32.S linux-2.6.32.18/arch/x86/kernel/head_32.S
11549--- linux-2.6.32.16/arch/x86/kernel/head_32.S 2010-07-05 14:14:00.000000000 -0400 11581--- linux-2.6.32.18/arch/x86/kernel/head_32.S 2010-08-10 13:45:57.000000000 -0400
11550+++ linux-2.6.32.16/arch/x86/kernel/head_32.S 2010-07-09 14:50:35.000000000 -0400 11582+++ linux-2.6.32.18/arch/x86/kernel/head_32.S 2010-08-11 18:57:29.000000000 -0400
11551@@ -19,10 +19,17 @@ 11583@@ -19,10 +19,17 @@
11552 #include <asm/setup.h> 11584 #include <asm/setup.h>
11553 #include <asm/processor-flags.h> 11585 #include <asm/processor-flags.h>
@@ -11994,9 +12026,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/head_32.S linux-2.6.32.16/arch/x86/ke
11994+ /* Be sure this is zeroed to avoid false validations in Xen */ 12026+ /* Be sure this is zeroed to avoid false validations in Xen */
11995+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0 12027+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
11996+ .endr 12028+ .endr
11997diff -urNp linux-2.6.32.16/arch/x86/kernel/head_64.S linux-2.6.32.16/arch/x86/kernel/head_64.S 12029diff -urNp linux-2.6.32.18/arch/x86/kernel/head_64.S linux-2.6.32.18/arch/x86/kernel/head_64.S
11998--- linux-2.6.32.16/arch/x86/kernel/head_64.S 2010-07-05 14:14:00.000000000 -0400 12030--- linux-2.6.32.18/arch/x86/kernel/head_64.S 2010-08-10 13:45:57.000000000 -0400
11999+++ linux-2.6.32.16/arch/x86/kernel/head_64.S 2010-07-09 14:50:35.000000000 -0400 12031+++ linux-2.6.32.18/arch/x86/kernel/head_64.S 2010-08-11 18:57:29.000000000 -0400
12000@@ -19,6 +19,7 @@ 12032@@ -19,6 +19,7 @@
12001 #include <asm/cache.h> 12033 #include <asm/cache.h>
12002 #include <asm/processor-flags.h> 12034 #include <asm/processor-flags.h>
@@ -12267,9 +12299,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/head_64.S linux-2.6.32.16/arch/x86/ke
12267 12299
12268 __PAGE_ALIGNED_BSS 12300 __PAGE_ALIGNED_BSS
12269 .align PAGE_SIZE 12301 .align PAGE_SIZE
12270diff -urNp linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c 12302diff -urNp linux-2.6.32.18/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.18/arch/x86/kernel/i386_ksyms_32.c
12271--- linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c 2010-07-05 14:14:00.000000000 -0400 12303--- linux-2.6.32.18/arch/x86/kernel/i386_ksyms_32.c 2010-08-10 13:45:57.000000000 -0400
12272+++ linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c 2010-07-09 14:50:35.000000000 -0400 12304+++ linux-2.6.32.18/arch/x86/kernel/i386_ksyms_32.c 2010-08-11 18:57:29.000000000 -0400
12273@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); 12305@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
12274 EXPORT_SYMBOL(cmpxchg8b_emu); 12306 EXPORT_SYMBOL(cmpxchg8b_emu);
12275 #endif 12307 #endif
@@ -12291,9 +12323,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.16/arch/
12291+#ifdef CONFIG_PAX_KERNEXEC 12323+#ifdef CONFIG_PAX_KERNEXEC
12292+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); 12324+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
12293+#endif 12325+#endif
12294diff -urNp linux-2.6.32.16/arch/x86/kernel/init_task.c linux-2.6.32.16/arch/x86/kernel/init_task.c 12326diff -urNp linux-2.6.32.18/arch/x86/kernel/init_task.c linux-2.6.32.18/arch/x86/kernel/init_task.c
12295--- linux-2.6.32.16/arch/x86/kernel/init_task.c 2010-07-05 14:14:00.000000000 -0400 12327--- linux-2.6.32.18/arch/x86/kernel/init_task.c 2010-08-10 13:45:57.000000000 -0400
12296+++ linux-2.6.32.16/arch/x86/kernel/init_task.c 2010-07-09 14:50:35.000000000 -0400 12328+++ linux-2.6.32.18/arch/x86/kernel/init_task.c 2010-08-11 18:57:29.000000000 -0400
12297@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); 12329@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
12298 * section. Since TSS's are completely CPU-local, we want them 12330 * section. Since TSS's are completely CPU-local, we want them
12299 * on exact cacheline boundaries, to eliminate cacheline ping-pong. 12331 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -12302,9 +12334,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/init_task.c linux-2.6.32.16/arch/x86/
12302- 12334-
12303+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; 12335+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
12304+EXPORT_SYMBOL(init_tss); 12336+EXPORT_SYMBOL(init_tss);
12305diff -urNp linux-2.6.32.16/arch/x86/kernel/ioport.c linux-2.6.32.16/arch/x86/kernel/ioport.c 12337diff -urNp linux-2.6.32.18/arch/x86/kernel/ioport.c linux-2.6.32.18/arch/x86/kernel/ioport.c
12306--- linux-2.6.32.16/arch/x86/kernel/ioport.c 2010-07-05 14:14:00.000000000 -0400 12338--- linux-2.6.32.18/arch/x86/kernel/ioport.c 2010-08-10 13:45:57.000000000 -0400
12307+++ linux-2.6.32.16/arch/x86/kernel/ioport.c 2010-07-09 14:50:35.000000000 -0400 12339+++ linux-2.6.32.18/arch/x86/kernel/ioport.c 2010-08-11 18:57:29.000000000 -0400
12308@@ -6,6 +6,7 @@ 12340@@ -6,6 +6,7 @@
12309 #include <linux/sched.h> 12341 #include <linux/sched.h>
12310 #include <linux/kernel.h> 12342 #include <linux/kernel.h>
@@ -12348,9 +12380,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/ioport.c linux-2.6.32.16/arch/x86/ker
12348 if (!capable(CAP_SYS_RAWIO)) 12380 if (!capable(CAP_SYS_RAWIO))
12349 return -EPERM; 12381 return -EPERM;
12350 } 12382 }
12351diff -urNp linux-2.6.32.16/arch/x86/kernel/irq_32.c linux-2.6.32.16/arch/x86/kernel/irq_32.c 12383diff -urNp linux-2.6.32.18/arch/x86/kernel/irq_32.c linux-2.6.32.18/arch/x86/kernel/irq_32.c
12352--- linux-2.6.32.16/arch/x86/kernel/irq_32.c 2010-07-05 14:14:00.000000000 -0400 12384--- linux-2.6.32.18/arch/x86/kernel/irq_32.c 2010-08-10 13:45:57.000000000 -0400
12353+++ linux-2.6.32.16/arch/x86/kernel/irq_32.c 2010-07-09 14:50:35.000000000 -0400 12385+++ linux-2.6.32.18/arch/x86/kernel/irq_32.c 2010-08-11 18:57:29.000000000 -0400
12354@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc 12386@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
12355 return 0; 12387 return 0;
12356 12388
@@ -12369,9 +12401,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/irq_32.c linux-2.6.32.16/arch/x86/ker
12369 12401
12370 call_on_stack(__do_softirq, isp); 12402 call_on_stack(__do_softirq, isp);
12371 /* 12403 /*
12372diff -urNp linux-2.6.32.16/arch/x86/kernel/kgdb.c linux-2.6.32.16/arch/x86/kernel/kgdb.c 12404diff -urNp linux-2.6.32.18/arch/x86/kernel/kgdb.c linux-2.6.32.18/arch/x86/kernel/kgdb.c
12373--- linux-2.6.32.16/arch/x86/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 12405--- linux-2.6.32.18/arch/x86/kernel/kgdb.c 2010-08-10 13:45:57.000000000 -0400
12374+++ linux-2.6.32.16/arch/x86/kernel/kgdb.c 2010-07-09 14:50:35.000000000 -0400 12406+++ linux-2.6.32.18/arch/x86/kernel/kgdb.c 2010-08-11 18:57:29.000000000 -0400
12375@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception 12407@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
12376 return instruction_pointer(regs); 12408 return instruction_pointer(regs);
12377 } 12409 }
@@ -12381,9 +12413,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/kgdb.c linux-2.6.32.16/arch/x86/kerne
12381 /* Breakpoint instruction: */ 12413 /* Breakpoint instruction: */
12382 .gdb_bpt_instr = { 0xcc }, 12414 .gdb_bpt_instr = { 0xcc },
12383 .flags = KGDB_HW_BREAKPOINT, 12415 .flags = KGDB_HW_BREAKPOINT,
12384diff -urNp linux-2.6.32.16/arch/x86/kernel/kprobes.c linux-2.6.32.16/arch/x86/kernel/kprobes.c 12416diff -urNp linux-2.6.32.18/arch/x86/kernel/kprobes.c linux-2.6.32.18/arch/x86/kernel/kprobes.c
12385--- linux-2.6.32.16/arch/x86/kernel/kprobes.c 2010-07-05 14:14:00.000000000 -0400 12417--- linux-2.6.32.18/arch/x86/kernel/kprobes.c 2010-08-10 13:45:57.000000000 -0400
12386+++ linux-2.6.32.16/arch/x86/kernel/kprobes.c 2010-07-09 14:50:35.000000000 -0400 12418+++ linux-2.6.32.18/arch/x86/kernel/kprobes.c 2010-08-11 18:57:29.000000000 -0400
12387@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f 12419@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
12388 char op; 12420 char op;
12389 s32 raddr; 12421 s32 raddr;
@@ -12476,9 +12508,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/kprobes.c linux-2.6.32.16/arch/x86/ke
12476 return ret; 12508 return ret;
12477 12509
12478 switch (val) { 12510 switch (val) {
12479diff -urNp linux-2.6.32.16/arch/x86/kernel/ldt.c linux-2.6.32.16/arch/x86/kernel/ldt.c 12511diff -urNp linux-2.6.32.18/arch/x86/kernel/ldt.c linux-2.6.32.18/arch/x86/kernel/ldt.c
12480--- linux-2.6.32.16/arch/x86/kernel/ldt.c 2010-07-05 14:14:00.000000000 -0400 12512--- linux-2.6.32.18/arch/x86/kernel/ldt.c 2010-08-10 13:45:57.000000000 -0400
12481+++ linux-2.6.32.16/arch/x86/kernel/ldt.c 2010-07-09 14:50:35.000000000 -0400 12513+++ linux-2.6.32.18/arch/x86/kernel/ldt.c 2010-08-11 18:57:29.000000000 -0400
12482@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i 12514@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
12483 if (reload) { 12515 if (reload) {
12484 #ifdef CONFIG_SMP 12516 #ifdef CONFIG_SMP
@@ -12543,9 +12575,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/ldt.c linux-2.6.32.16/arch/x86/kernel
12543 fill_ldt(&ldt, &ldt_info); 12575 fill_ldt(&ldt, &ldt_info);
12544 if (oldmode) 12576 if (oldmode)
12545 ldt.avl = 0; 12577 ldt.avl = 0;
12546diff -urNp linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c 12578diff -urNp linux-2.6.32.18/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.18/arch/x86/kernel/machine_kexec_32.c
12547--- linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c 2010-07-05 14:14:00.000000000 -0400 12579--- linux-2.6.32.18/arch/x86/kernel/machine_kexec_32.c 2010-08-10 13:45:57.000000000 -0400
12548+++ linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c 2010-07-09 14:50:35.000000000 -0400 12580+++ linux-2.6.32.18/arch/x86/kernel/machine_kexec_32.c 2010-08-11 18:57:29.000000000 -0400
12549@@ -26,7 +26,7 @@ 12581@@ -26,7 +26,7 @@
12550 #include <asm/system.h> 12582 #include <asm/system.h>
12551 #include <asm/cacheflush.h> 12583 #include <asm/cacheflush.h>
@@ -12573,9 +12605,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.16/ar
12573 12605
12574 relocate_kernel_ptr = control_page; 12606 relocate_kernel_ptr = control_page;
12575 page_list[PA_CONTROL_PAGE] = __pa(control_page); 12607 page_list[PA_CONTROL_PAGE] = __pa(control_page);
12576diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_amd.c linux-2.6.32.16/arch/x86/kernel/microcode_amd.c 12608diff -urNp linux-2.6.32.18/arch/x86/kernel/microcode_amd.c linux-2.6.32.18/arch/x86/kernel/microcode_amd.c
12577--- linux-2.6.32.16/arch/x86/kernel/microcode_amd.c 2010-07-05 14:14:00.000000000 -0400 12609--- linux-2.6.32.18/arch/x86/kernel/microcode_amd.c 2010-08-10 13:45:57.000000000 -0400
12578+++ linux-2.6.32.16/arch/x86/kernel/microcode_amd.c 2010-07-09 14:50:35.000000000 -0400 12610+++ linux-2.6.32.18/arch/x86/kernel/microcode_amd.c 2010-08-11 18:57:29.000000000 -0400
12579@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c 12611@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
12580 uci->mc = NULL; 12612 uci->mc = NULL;
12581 } 12613 }
@@ -12594,9 +12626,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_amd.c linux-2.6.32.16/arch/
12594 { 12626 {
12595 return &microcode_amd_ops; 12627 return &microcode_amd_ops;
12596 } 12628 }
12597diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_core.c linux-2.6.32.16/arch/x86/kernel/microcode_core.c 12629diff -urNp linux-2.6.32.18/arch/x86/kernel/microcode_core.c linux-2.6.32.18/arch/x86/kernel/microcode_core.c
12598--- linux-2.6.32.16/arch/x86/kernel/microcode_core.c 2010-07-05 14:14:00.000000000 -0400 12630--- linux-2.6.32.18/arch/x86/kernel/microcode_core.c 2010-08-10 13:45:57.000000000 -0400
12599+++ linux-2.6.32.16/arch/x86/kernel/microcode_core.c 2010-07-09 14:50:35.000000000 -0400 12631+++ linux-2.6.32.18/arch/x86/kernel/microcode_core.c 2010-08-11 18:57:29.000000000 -0400
12600@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); 12632@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
12601 12633
12602 #define MICROCODE_VERSION "2.00" 12634 #define MICROCODE_VERSION "2.00"
@@ -12606,9 +12638,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_core.c linux-2.6.32.16/arch
12606 12638
12607 /* 12639 /*
12608 * Synchronization. 12640 * Synchronization.
12609diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_intel.c linux-2.6.32.16/arch/x86/kernel/microcode_intel.c 12641diff -urNp linux-2.6.32.18/arch/x86/kernel/microcode_intel.c linux-2.6.32.18/arch/x86/kernel/microcode_intel.c
12610--- linux-2.6.32.16/arch/x86/kernel/microcode_intel.c 2010-07-05 14:14:00.000000000 -0400 12642--- linux-2.6.32.18/arch/x86/kernel/microcode_intel.c 2010-08-10 13:45:57.000000000 -0400
12611+++ linux-2.6.32.16/arch/x86/kernel/microcode_intel.c 2010-07-09 14:50:35.000000000 -0400 12643+++ linux-2.6.32.18/arch/x86/kernel/microcode_intel.c 2010-08-11 18:57:29.000000000 -0400
12612@@ -443,13 +443,13 @@ static enum ucode_state request_microcod 12644@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
12613 12645
12614 static int get_ucode_user(void *to, const void *from, size_t n) 12646 static int get_ucode_user(void *to, const void *from, size_t n)
@@ -12643,9 +12675,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/microcode_intel.c linux-2.6.32.16/arc
12643 { 12675 {
12644 return &microcode_intel_ops; 12676 return &microcode_intel_ops;
12645 } 12677 }
12646diff -urNp linux-2.6.32.16/arch/x86/kernel/module.c linux-2.6.32.16/arch/x86/kernel/module.c 12678diff -urNp linux-2.6.32.18/arch/x86/kernel/module.c linux-2.6.32.18/arch/x86/kernel/module.c
12647--- linux-2.6.32.16/arch/x86/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 12679--- linux-2.6.32.18/arch/x86/kernel/module.c 2010-08-10 13:45:57.000000000 -0400
12648+++ linux-2.6.32.16/arch/x86/kernel/module.c 2010-07-09 14:50:35.000000000 -0400 12680+++ linux-2.6.32.18/arch/x86/kernel/module.c 2010-08-11 18:57:29.000000000 -0400
12649@@ -34,7 +34,7 @@ 12681@@ -34,7 +34,7 @@
12650 #define DEBUGP(fmt...) 12682 #define DEBUGP(fmt...)
12651 #endif 12683 #endif
@@ -12786,9 +12818,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/module.c linux-2.6.32.16/arch/x86/ker
12786 #if 0 12818 #if 0
12787 if ((s64)val != *(s32 *)loc) 12819 if ((s64)val != *(s32 *)loc)
12788 goto overflow; 12820 goto overflow;
12789diff -urNp linux-2.6.32.16/arch/x86/kernel/paravirt.c linux-2.6.32.16/arch/x86/kernel/paravirt.c 12821diff -urNp linux-2.6.32.18/arch/x86/kernel/paravirt.c linux-2.6.32.18/arch/x86/kernel/paravirt.c
12790--- linux-2.6.32.16/arch/x86/kernel/paravirt.c 2010-07-05 14:14:00.000000000 -0400 12822--- linux-2.6.32.18/arch/x86/kernel/paravirt.c 2010-08-10 13:45:57.000000000 -0400
12791+++ linux-2.6.32.16/arch/x86/kernel/paravirt.c 2010-07-09 14:50:35.000000000 -0400 12823+++ linux-2.6.32.18/arch/x86/kernel/paravirt.c 2010-08-11 18:57:29.000000000 -0400
12792@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu 12824@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
12793 * corresponding structure. */ 12825 * corresponding structure. */
12794 static void *get_call_destination(u8 type) 12826 static void *get_call_destination(u8 type)
@@ -12892,9 +12924,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/paravirt.c linux-2.6.32.16/arch/x86/k
12892 }; 12924 };
12893 12925
12894 EXPORT_SYMBOL_GPL(pv_time_ops); 12926 EXPORT_SYMBOL_GPL(pv_time_ops);
12895diff -urNp linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c 12927diff -urNp linux-2.6.32.18/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.18/arch/x86/kernel/paravirt-spinlocks.c
12896--- linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c 2010-07-05 14:14:00.000000000 -0400 12928--- linux-2.6.32.18/arch/x86/kernel/paravirt-spinlocks.c 2010-08-10 13:45:57.000000000 -0400
12897+++ linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c 2010-07-09 14:50:35.000000000 -0400 12929+++ linux-2.6.32.18/arch/x86/kernel/paravirt-spinlocks.c 2010-08-11 18:57:29.000000000 -0400
12898@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * 12930@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
12899 __raw_spin_lock(lock); 12931 __raw_spin_lock(lock);
12900 } 12932 }
@@ -12904,10 +12936,10 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.16/
12904 #ifdef CONFIG_SMP 12936 #ifdef CONFIG_SMP
12905 .spin_is_locked = __ticket_spin_is_locked, 12937 .spin_is_locked = __ticket_spin_is_locked,
12906 .spin_is_contended = __ticket_spin_is_contended, 12938 .spin_is_contended = __ticket_spin_is_contended,
12907diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c 12939diff -urNp linux-2.6.32.18/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.18/arch/x86/kernel/pci-calgary_64.c
12908--- linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c 2010-07-05 14:14:00.000000000 -0400 12940--- linux-2.6.32.18/arch/x86/kernel/pci-calgary_64.c 2010-08-10 13:45:57.000000000 -0400
12909+++ linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c 2010-07-09 14:50:35.000000000 -0400 12941+++ linux-2.6.32.18/arch/x86/kernel/pci-calgary_64.c 2010-08-11 18:57:29.000000000 -0400
12910@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct 12942@@ -477,7 +477,7 @@ static void calgary_free_coherent(struct
12911 free_pages((unsigned long)vaddr, get_order(size)); 12943 free_pages((unsigned long)vaddr, get_order(size));
12912 } 12944 }
12913 12945
@@ -12916,9 +12948,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.16/arch
12916 .alloc_coherent = calgary_alloc_coherent, 12948 .alloc_coherent = calgary_alloc_coherent,
12917 .free_coherent = calgary_free_coherent, 12949 .free_coherent = calgary_free_coherent,
12918 .map_sg = calgary_map_sg, 12950 .map_sg = calgary_map_sg,
12919diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-dma.c linux-2.6.32.16/arch/x86/kernel/pci-dma.c 12951diff -urNp linux-2.6.32.18/arch/x86/kernel/pci-dma.c linux-2.6.32.18/arch/x86/kernel/pci-dma.c
12920--- linux-2.6.32.16/arch/x86/kernel/pci-dma.c 2010-07-05 14:14:00.000000000 -0400 12952--- linux-2.6.32.18/arch/x86/kernel/pci-dma.c 2010-08-10 13:45:57.000000000 -0400
12921+++ linux-2.6.32.16/arch/x86/kernel/pci-dma.c 2010-07-09 14:50:35.000000000 -0400 12953+++ linux-2.6.32.18/arch/x86/kernel/pci-dma.c 2010-08-11 18:57:29.000000000 -0400
12922@@ -14,7 +14,7 @@ 12954@@ -14,7 +14,7 @@
12923 12955
12924 static int forbid_dac __read_mostly; 12956 static int forbid_dac __read_mostly;
@@ -12937,9 +12969,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-dma.c linux-2.6.32.16/arch/x86/ke
12937 12969
12938 #ifdef CONFIG_PCI 12970 #ifdef CONFIG_PCI
12939 if (mask > 0xffffffff && forbid_dac > 0) { 12971 if (mask > 0xffffffff && forbid_dac > 0) {
12940diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c 12972diff -urNp linux-2.6.32.18/arch/x86/kernel/pci-gart_64.c linux-2.6.32.18/arch/x86/kernel/pci-gart_64.c
12941--- linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c 2010-07-05 14:14:00.000000000 -0400 12973--- linux-2.6.32.18/arch/x86/kernel/pci-gart_64.c 2010-08-10 13:45:57.000000000 -0400
12942+++ linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c 2010-07-09 14:50:35.000000000 -0400 12974+++ linux-2.6.32.18/arch/x86/kernel/pci-gart_64.c 2010-08-11 18:57:29.000000000 -0400
12943@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag 12975@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
12944 return -1; 12976 return -1;
12945 } 12977 }
@@ -12949,9 +12981,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-gart_64.c linux-2.6.32.16/arch/x8
12949 .map_sg = gart_map_sg, 12981 .map_sg = gart_map_sg,
12950 .unmap_sg = gart_unmap_sg, 12982 .unmap_sg = gart_unmap_sg,
12951 .map_page = gart_map_page, 12983 .map_page = gart_map_page,
12952diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-nommu.c linux-2.6.32.16/arch/x86/kernel/pci-nommu.c 12984diff -urNp linux-2.6.32.18/arch/x86/kernel/pci-nommu.c linux-2.6.32.18/arch/x86/kernel/pci-nommu.c
12953--- linux-2.6.32.16/arch/x86/kernel/pci-nommu.c 2010-07-05 14:14:00.000000000 -0400 12985--- linux-2.6.32.18/arch/x86/kernel/pci-nommu.c 2010-08-10 13:45:57.000000000 -0400
12954+++ linux-2.6.32.16/arch/x86/kernel/pci-nommu.c 2010-07-09 14:50:35.000000000 -0400 12986+++ linux-2.6.32.18/arch/x86/kernel/pci-nommu.c 2010-08-11 18:57:29.000000000 -0400
12955@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str 12987@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
12956 flush_write_buffers(); 12988 flush_write_buffers();
12957 } 12989 }
@@ -12961,9 +12993,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-nommu.c linux-2.6.32.16/arch/x86/
12961 .alloc_coherent = dma_generic_alloc_coherent, 12993 .alloc_coherent = dma_generic_alloc_coherent,
12962 .free_coherent = nommu_free_coherent, 12994 .free_coherent = nommu_free_coherent,
12963 .map_sg = nommu_map_sg, 12995 .map_sg = nommu_map_sg,
12964diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c 12996diff -urNp linux-2.6.32.18/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.18/arch/x86/kernel/pci-swiotlb.c
12965--- linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c 2010-07-05 14:14:00.000000000 -0400 12997--- linux-2.6.32.18/arch/x86/kernel/pci-swiotlb.c 2010-08-10 13:45:57.000000000 -0400
12966+++ linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c 2010-07-09 14:50:35.000000000 -0400 12998+++ linux-2.6.32.18/arch/x86/kernel/pci-swiotlb.c 2010-08-11 18:57:29.000000000 -0400
12967@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( 12999@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
12968 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); 13000 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
12969 } 13001 }
@@ -12973,9 +13005,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.16/arch/x8
12973 .mapping_error = swiotlb_dma_mapping_error, 13005 .mapping_error = swiotlb_dma_mapping_error,
12974 .alloc_coherent = x86_swiotlb_alloc_coherent, 13006 .alloc_coherent = x86_swiotlb_alloc_coherent,
12975 .free_coherent = swiotlb_free_coherent, 13007 .free_coherent = swiotlb_free_coherent,
12976diff -urNp linux-2.6.32.16/arch/x86/kernel/process_32.c linux-2.6.32.16/arch/x86/kernel/process_32.c 13008diff -urNp linux-2.6.32.18/arch/x86/kernel/process_32.c linux-2.6.32.18/arch/x86/kernel/process_32.c
12977--- linux-2.6.32.16/arch/x86/kernel/process_32.c 2010-07-05 14:14:00.000000000 -0400 13009--- linux-2.6.32.18/arch/x86/kernel/process_32.c 2010-08-10 13:45:57.000000000 -0400
12978+++ linux-2.6.32.16/arch/x86/kernel/process_32.c 2010-07-09 14:50:35.000000000 -0400 13010+++ linux-2.6.32.18/arch/x86/kernel/process_32.c 2010-08-11 18:57:29.000000000 -0400
12979@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as 13011@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
12980 unsigned long thread_saved_pc(struct task_struct *tsk) 13012 unsigned long thread_saved_pc(struct task_struct *tsk)
12981 { 13013 {
@@ -13070,9 +13102,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/process_32.c linux-2.6.32.16/arch/x86
13070+ load_sp0(init_tss + smp_processor_id(), thread); 13102+ load_sp0(init_tss + smp_processor_id(), thread);
13071+} 13103+}
13072+#endif 13104+#endif
13073diff -urNp linux-2.6.32.16/arch/x86/kernel/process_64.c linux-2.6.32.16/arch/x86/kernel/process_64.c 13105diff -urNp linux-2.6.32.18/arch/x86/kernel/process_64.c linux-2.6.32.18/arch/x86/kernel/process_64.c
13074--- linux-2.6.32.16/arch/x86/kernel/process_64.c 2010-07-05 14:14:00.000000000 -0400 13106--- linux-2.6.32.18/arch/x86/kernel/process_64.c 2010-08-10 13:45:57.000000000 -0400
13075+++ linux-2.6.32.16/arch/x86/kernel/process_64.c 2010-07-09 14:50:35.000000000 -0400 13107+++ linux-2.6.32.18/arch/x86/kernel/process_64.c 2010-08-11 18:57:29.000000000 -0400
13076@@ -91,7 +91,7 @@ static void __exit_idle(void) 13108@@ -91,7 +91,7 @@ static void __exit_idle(void)
13077 void exit_idle(void) 13109 void exit_idle(void)
13078 { 13110 {
@@ -13115,9 +13147,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/process_64.c linux-2.6.32.16/arch/x86
13115 return 0; 13147 return 0;
13116 ip = *(u64 *)(fp+8); 13148 ip = *(u64 *)(fp+8);
13117 if (!in_sched_functions(ip)) 13149 if (!in_sched_functions(ip))
13118diff -urNp linux-2.6.32.16/arch/x86/kernel/process.c linux-2.6.32.16/arch/x86/kernel/process.c 13150diff -urNp linux-2.6.32.18/arch/x86/kernel/process.c linux-2.6.32.18/arch/x86/kernel/process.c
13119--- linux-2.6.32.16/arch/x86/kernel/process.c 2010-07-05 14:14:00.000000000 -0400 13151--- linux-2.6.32.18/arch/x86/kernel/process.c 2010-08-10 13:45:57.000000000 -0400
13120+++ linux-2.6.32.16/arch/x86/kernel/process.c 2010-07-09 14:50:35.000000000 -0400 13152+++ linux-2.6.32.18/arch/x86/kernel/process.c 2010-08-11 18:57:29.000000000 -0400
13121@@ -73,7 +73,7 @@ void exit_thread(void) 13153@@ -73,7 +73,7 @@ void exit_thread(void)
13122 unsigned long *bp = t->io_bitmap_ptr; 13154 unsigned long *bp = t->io_bitmap_ptr;
13123 13155
@@ -13155,9 +13187,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/process.c linux-2.6.32.16/arch/x86/ke
13155- return randomize_range(mm->brk, range_end, 0) ? : mm->brk; 13187- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
13156-} 13188-}
13157- 13189-
13158diff -urNp linux-2.6.32.16/arch/x86/kernel/ptrace.c linux-2.6.32.16/arch/x86/kernel/ptrace.c 13190diff -urNp linux-2.6.32.18/arch/x86/kernel/ptrace.c linux-2.6.32.18/arch/x86/kernel/ptrace.c
13159--- linux-2.6.32.16/arch/x86/kernel/ptrace.c 2010-07-05 14:14:00.000000000 -0400 13191--- linux-2.6.32.18/arch/x86/kernel/ptrace.c 2010-08-10 13:45:57.000000000 -0400
13160+++ linux-2.6.32.16/arch/x86/kernel/ptrace.c 2010-07-09 14:50:35.000000000 -0400 13192+++ linux-2.6.32.18/arch/x86/kernel/ptrace.c 2010-08-11 18:57:29.000000000 -0400
13161@@ -925,7 +925,7 @@ static const struct user_regset_view use 13193@@ -925,7 +925,7 @@ static const struct user_regset_view use
13162 long arch_ptrace(struct task_struct *child, long request, long addr, long data) 13194 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
13163 { 13195 {
@@ -13226,9 +13258,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/ptrace.c linux-2.6.32.16/arch/x86/ker
13226 13258
13227 /* Send us the fake SIGTRAP */ 13259 /* Send us the fake SIGTRAP */
13228 force_sig_info(SIGTRAP, &info, tsk); 13260 force_sig_info(SIGTRAP, &info, tsk);
13229diff -urNp linux-2.6.32.16/arch/x86/kernel/reboot.c linux-2.6.32.16/arch/x86/kernel/reboot.c 13261diff -urNp linux-2.6.32.18/arch/x86/kernel/reboot.c linux-2.6.32.18/arch/x86/kernel/reboot.c
13230--- linux-2.6.32.16/arch/x86/kernel/reboot.c 2010-07-05 14:14:00.000000000 -0400 13262--- linux-2.6.32.18/arch/x86/kernel/reboot.c 2010-08-10 13:45:57.000000000 -0400
13231+++ linux-2.6.32.16/arch/x86/kernel/reboot.c 2010-07-09 14:50:35.000000000 -0400 13263+++ linux-2.6.32.18/arch/x86/kernel/reboot.c 2010-08-11 18:57:29.000000000 -0400
13232@@ -33,7 +33,7 @@ void (*pm_power_off)(void); 13264@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
13233 EXPORT_SYMBOL(pm_power_off); 13265 EXPORT_SYMBOL(pm_power_off);
13234 13266
@@ -13305,9 +13337,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/reboot.c linux-2.6.32.16/arch/x86/ker
13305 13337
13306 /* Set up the IDT for real mode. */ 13338 /* Set up the IDT for real mode. */
13307 load_idt(&real_mode_idt); 13339 load_idt(&real_mode_idt);
13308diff -urNp linux-2.6.32.16/arch/x86/kernel/setup.c linux-2.6.32.16/arch/x86/kernel/setup.c 13340diff -urNp linux-2.6.32.18/arch/x86/kernel/setup.c linux-2.6.32.18/arch/x86/kernel/setup.c
13309--- linux-2.6.32.16/arch/x86/kernel/setup.c 2010-07-05 14:14:00.000000000 -0400 13341--- linux-2.6.32.18/arch/x86/kernel/setup.c 2010-08-10 13:45:57.000000000 -0400
13310+++ linux-2.6.32.16/arch/x86/kernel/setup.c 2010-07-09 14:50:35.000000000 -0400 13342+++ linux-2.6.32.18/arch/x86/kernel/setup.c 2010-08-11 18:57:29.000000000 -0400
13311@@ -782,14 +782,14 @@ void __init setup_arch(char **cmdline_p) 13343@@ -782,14 +782,14 @@ void __init setup_arch(char **cmdline_p)
13312 13344
13313 if (!boot_params.hdr.root_flags) 13345 if (!boot_params.hdr.root_flags)
@@ -13328,9 +13360,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/setup.c linux-2.6.32.16/arch/x86/kern
13328 data_resource.end = virt_to_phys(_edata)-1; 13360 data_resource.end = virt_to_phys(_edata)-1;
13329 bss_resource.start = virt_to_phys(&__bss_start); 13361 bss_resource.start = virt_to_phys(&__bss_start);
13330 bss_resource.end = virt_to_phys(&__bss_stop)-1; 13362 bss_resource.end = virt_to_phys(&__bss_stop)-1;
13331diff -urNp linux-2.6.32.16/arch/x86/kernel/setup_percpu.c linux-2.6.32.16/arch/x86/kernel/setup_percpu.c 13363diff -urNp linux-2.6.32.18/arch/x86/kernel/setup_percpu.c linux-2.6.32.18/arch/x86/kernel/setup_percpu.c
13332--- linux-2.6.32.16/arch/x86/kernel/setup_percpu.c 2010-07-05 14:14:00.000000000 -0400 13364--- linux-2.6.32.18/arch/x86/kernel/setup_percpu.c 2010-08-10 13:45:57.000000000 -0400
13333+++ linux-2.6.32.16/arch/x86/kernel/setup_percpu.c 2010-07-09 14:50:35.000000000 -0400 13365+++ linux-2.6.32.18/arch/x86/kernel/setup_percpu.c 2010-08-11 18:57:29.000000000 -0400
13334@@ -25,19 +25,17 @@ 13366@@ -25,19 +25,17 @@
13335 # define DBG(x...) 13367 # define DBG(x...)
13336 #endif 13368 #endif
@@ -13393,9 +13425,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/setup_percpu.c linux-2.6.32.16/arch/x
13393 /* 13425 /*
13394 * Up to this point, the boot CPU has been using .data.init 13426 * Up to this point, the boot CPU has been using .data.init
13395 * area. Reload any changed state for the boot CPU. 13427 * area. Reload any changed state for the boot CPU.
13396diff -urNp linux-2.6.32.16/arch/x86/kernel/signal.c linux-2.6.32.16/arch/x86/kernel/signal.c 13428diff -urNp linux-2.6.32.18/arch/x86/kernel/signal.c linux-2.6.32.18/arch/x86/kernel/signal.c
13397--- linux-2.6.32.16/arch/x86/kernel/signal.c 2010-07-05 14:14:00.000000000 -0400 13429--- linux-2.6.32.18/arch/x86/kernel/signal.c 2010-08-10 13:45:57.000000000 -0400
13398+++ linux-2.6.32.16/arch/x86/kernel/signal.c 2010-07-09 14:50:35.000000000 -0400 13430+++ linux-2.6.32.18/arch/x86/kernel/signal.c 2010-08-11 18:57:29.000000000 -0400
13399@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi 13431@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
13400 * Align the stack pointer according to the i386 ABI, 13432 * Align the stack pointer according to the i386 ABI,
13401 * i.e. so that on function entry ((sp + 4) & 15) == 0. 13433 * i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -13467,9 +13499,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/signal.c linux-2.6.32.16/arch/x86/ker
13467 return; 13499 return;
13468 13500
13469 if (current_thread_info()->status & TS_RESTORE_SIGMASK) 13501 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
13470diff -urNp linux-2.6.32.16/arch/x86/kernel/smpboot.c linux-2.6.32.16/arch/x86/kernel/smpboot.c 13502diff -urNp linux-2.6.32.18/arch/x86/kernel/smpboot.c linux-2.6.32.18/arch/x86/kernel/smpboot.c
13471--- linux-2.6.32.16/arch/x86/kernel/smpboot.c 2010-07-05 14:14:00.000000000 -0400 13503--- linux-2.6.32.18/arch/x86/kernel/smpboot.c 2010-08-10 13:45:57.000000000 -0400
13472+++ linux-2.6.32.16/arch/x86/kernel/smpboot.c 2010-07-09 14:50:35.000000000 -0400 13504+++ linux-2.6.32.18/arch/x86/kernel/smpboot.c 2010-08-11 18:57:29.000000000 -0400
13473@@ -729,7 +729,11 @@ do_rest: 13505@@ -729,7 +729,11 @@ do_rest:
13474 (unsigned long)task_stack_page(c_idle.idle) - 13506 (unsigned long)task_stack_page(c_idle.idle) -
13475 KERNEL_STACK_OFFSET + THREAD_SIZE; 13507 KERNEL_STACK_OFFSET + THREAD_SIZE;
@@ -13495,9 +13527,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/smpboot.c linux-2.6.32.16/arch/x86/ke
13495 #ifdef CONFIG_X86_32 13527 #ifdef CONFIG_X86_32
13496 /* init low mem mapping */ 13528 /* init low mem mapping */
13497 clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, 13529 clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
13498diff -urNp linux-2.6.32.16/arch/x86/kernel/step.c linux-2.6.32.16/arch/x86/kernel/step.c 13530diff -urNp linux-2.6.32.18/arch/x86/kernel/step.c linux-2.6.32.18/arch/x86/kernel/step.c
13499--- linux-2.6.32.16/arch/x86/kernel/step.c 2010-07-05 14:14:00.000000000 -0400 13531--- linux-2.6.32.18/arch/x86/kernel/step.c 2010-08-10 13:45:57.000000000 -0400
13500+++ linux-2.6.32.16/arch/x86/kernel/step.c 2010-07-09 14:50:35.000000000 -0400 13532+++ linux-2.6.32.18/arch/x86/kernel/step.c 2010-08-11 18:57:29.000000000 -0400
13501@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc 13533@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
13502 struct desc_struct *desc; 13534 struct desc_struct *desc;
13503 unsigned long base; 13535 unsigned long base;
@@ -13530,17 +13562,17 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/step.c linux-2.6.32.16/arch/x86/kerne
13530 /* 32-bit mode: register increment */ 13562 /* 32-bit mode: register increment */
13531 return 0; 13563 return 0;
13532 /* 64-bit mode: REX prefix */ 13564 /* 64-bit mode: REX prefix */
13533diff -urNp linux-2.6.32.16/arch/x86/kernel/syscall_table_32.S linux-2.6.32.16/arch/x86/kernel/syscall_table_32.S 13565diff -urNp linux-2.6.32.18/arch/x86/kernel/syscall_table_32.S linux-2.6.32.18/arch/x86/kernel/syscall_table_32.S
13534--- linux-2.6.32.16/arch/x86/kernel/syscall_table_32.S 2010-07-05 14:14:00.000000000 -0400 13566--- linux-2.6.32.18/arch/x86/kernel/syscall_table_32.S 2010-08-10 13:45:57.000000000 -0400
13535+++ linux-2.6.32.16/arch/x86/kernel/syscall_table_32.S 2010-07-09 14:50:35.000000000 -0400 13567+++ linux-2.6.32.18/arch/x86/kernel/syscall_table_32.S 2010-08-11 18:57:29.000000000 -0400
13536@@ -1,3 +1,4 @@ 13568@@ -1,3 +1,4 @@
13537+.section .rodata,"a",@progbits 13569+.section .rodata,"a",@progbits
13538 ENTRY(sys_call_table) 13570 ENTRY(sys_call_table)
13539 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ 13571 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
13540 .long sys_exit 13572 .long sys_exit
13541diff -urNp linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c 13573diff -urNp linux-2.6.32.18/arch/x86/kernel/sys_i386_32.c linux-2.6.32.18/arch/x86/kernel/sys_i386_32.c
13542--- linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c 2010-07-05 14:14:00.000000000 -0400 13574--- linux-2.6.32.18/arch/x86/kernel/sys_i386_32.c 2010-08-10 13:45:57.000000000 -0400
13543+++ linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c 2010-07-09 14:50:35.000000000 -0400 13575+++ linux-2.6.32.18/arch/x86/kernel/sys_i386_32.c 2010-08-11 18:57:29.000000000 -0400
13544@@ -24,6 +24,21 @@ 13576@@ -24,6 +24,21 @@
13545 13577
13546 #include <asm/syscalls.h> 13578 #include <asm/syscalls.h>
@@ -13787,9 +13819,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/sys_i386_32.c linux-2.6.32.16/arch/x8
13787 } 13819 }
13788 case 1: /* iBCS2 emulator entry point */ 13820 case 1: /* iBCS2 emulator entry point */
13789 if (!segment_eq(get_fs(), get_ds())) 13821 if (!segment_eq(get_fs(), get_ds()))
13790diff -urNp linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c 13822diff -urNp linux-2.6.32.18/arch/x86/kernel/sys_x86_64.c linux-2.6.32.18/arch/x86/kernel/sys_x86_64.c
13791--- linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c 2010-07-05 14:14:00.000000000 -0400 13823--- linux-2.6.32.18/arch/x86/kernel/sys_x86_64.c 2010-08-10 13:45:57.000000000 -0400
13792+++ linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c 2010-07-09 14:50:35.000000000 -0400 13824+++ linux-2.6.32.18/arch/x86/kernel/sys_x86_64.c 2010-08-11 18:57:29.000000000 -0400
13793@@ -32,8 +32,8 @@ out: 13825@@ -32,8 +32,8 @@ out:
13794 return error; 13826 return error;
13795 } 13827 }
@@ -13871,9 +13903,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/sys_x86_64.c linux-2.6.32.16/arch/x86
13871 mm->cached_hole_size = ~0UL; 13903 mm->cached_hole_size = ~0UL;
13872 13904
13873 return addr; 13905 return addr;
13874diff -urNp linux-2.6.32.16/arch/x86/kernel/time.c linux-2.6.32.16/arch/x86/kernel/time.c 13906diff -urNp linux-2.6.32.18/arch/x86/kernel/time.c linux-2.6.32.18/arch/x86/kernel/time.c
13875--- linux-2.6.32.16/arch/x86/kernel/time.c 2010-07-05 14:14:00.000000000 -0400 13907--- linux-2.6.32.18/arch/x86/kernel/time.c 2010-08-10 13:45:57.000000000 -0400
13876+++ linux-2.6.32.16/arch/x86/kernel/time.c 2010-07-09 14:50:35.000000000 -0400 13908+++ linux-2.6.32.18/arch/x86/kernel/time.c 2010-08-11 18:57:29.000000000 -0400
13877@@ -26,17 +26,13 @@ 13909@@ -26,17 +26,13 @@
13878 int timer_ack; 13910 int timer_ack;
13879 #endif 13911 #endif
@@ -13912,9 +13944,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/time.c linux-2.6.32.16/arch/x86/kerne
13912 } 13944 }
13913 return pc; 13945 return pc;
13914 } 13946 }
13915diff -urNp linux-2.6.32.16/arch/x86/kernel/tls.c linux-2.6.32.16/arch/x86/kernel/tls.c 13947diff -urNp linux-2.6.32.18/arch/x86/kernel/tls.c linux-2.6.32.18/arch/x86/kernel/tls.c
13916--- linux-2.6.32.16/arch/x86/kernel/tls.c 2010-07-05 14:14:00.000000000 -0400 13948--- linux-2.6.32.18/arch/x86/kernel/tls.c 2010-08-10 13:45:57.000000000 -0400
13917+++ linux-2.6.32.16/arch/x86/kernel/tls.c 2010-07-09 14:50:35.000000000 -0400 13949+++ linux-2.6.32.18/arch/x86/kernel/tls.c 2010-08-11 18:57:29.000000000 -0400
13918@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc 13950@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
13919 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) 13951 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
13920 return -EINVAL; 13952 return -EINVAL;
@@ -13927,9 +13959,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/tls.c linux-2.6.32.16/arch/x86/kernel
13927 set_tls_desc(p, idx, &info, 1); 13959 set_tls_desc(p, idx, &info, 1);
13928 13960
13929 return 0; 13961 return 0;
13930diff -urNp linux-2.6.32.16/arch/x86/kernel/trampoline_32.S linux-2.6.32.16/arch/x86/kernel/trampoline_32.S 13962diff -urNp linux-2.6.32.18/arch/x86/kernel/trampoline_32.S linux-2.6.32.18/arch/x86/kernel/trampoline_32.S
13931--- linux-2.6.32.16/arch/x86/kernel/trampoline_32.S 2010-07-05 14:14:00.000000000 -0400 13963--- linux-2.6.32.18/arch/x86/kernel/trampoline_32.S 2010-08-10 13:45:57.000000000 -0400
13932+++ linux-2.6.32.16/arch/x86/kernel/trampoline_32.S 2010-07-09 14:50:35.000000000 -0400 13964+++ linux-2.6.32.18/arch/x86/kernel/trampoline_32.S 2010-08-11 18:57:29.000000000 -0400
13933@@ -32,6 +32,12 @@ 13965@@ -32,6 +32,12 @@
13934 #include <asm/segment.h> 13966 #include <asm/segment.h>
13935 #include <asm/page_types.h> 13967 #include <asm/page_types.h>
@@ -13952,9 +13984,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/trampoline_32.S linux-2.6.32.16/arch/
13952 13984
13953 # These need to be in the same 64K segment as the above; 13985 # These need to be in the same 64K segment as the above;
13954 # hence we don't use the boot_gdt_descr defined in head.S 13986 # hence we don't use the boot_gdt_descr defined in head.S
13955diff -urNp linux-2.6.32.16/arch/x86/kernel/traps.c linux-2.6.32.16/arch/x86/kernel/traps.c 13987diff -urNp linux-2.6.32.18/arch/x86/kernel/traps.c linux-2.6.32.18/arch/x86/kernel/traps.c
13956--- linux-2.6.32.16/arch/x86/kernel/traps.c 2010-07-05 14:14:00.000000000 -0400 13988--- linux-2.6.32.18/arch/x86/kernel/traps.c 2010-08-10 13:45:57.000000000 -0400
13957+++ linux-2.6.32.16/arch/x86/kernel/traps.c 2010-07-09 14:50:35.000000000 -0400 13989+++ linux-2.6.32.18/arch/x86/kernel/traps.c 2010-08-11 18:57:29.000000000 -0400
13958@@ -69,12 +69,6 @@ asmlinkage int system_call(void); 13990@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
13959 13991
13960 /* Do we ignore FPU interrupts ? */ 13992 /* Do we ignore FPU interrupts ? */
@@ -14104,9 +14136,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/traps.c linux-2.6.32.16/arch/x86/kern
14104 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); 14136 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
14105 return; 14137 return;
14106 } 14138 }
14107diff -urNp linux-2.6.32.16/arch/x86/kernel/tsc.c linux-2.6.32.16/arch/x86/kernel/tsc.c 14139diff -urNp linux-2.6.32.18/arch/x86/kernel/tsc.c linux-2.6.32.18/arch/x86/kernel/tsc.c
14108--- linux-2.6.32.16/arch/x86/kernel/tsc.c 2010-07-05 14:14:00.000000000 -0400 14140--- linux-2.6.32.18/arch/x86/kernel/tsc.c 2010-08-10 13:45:57.000000000 -0400
14109+++ linux-2.6.32.16/arch/x86/kernel/tsc.c 2010-07-09 14:50:35.000000000 -0400 14141+++ linux-2.6.32.18/arch/x86/kernel/tsc.c 2010-08-11 18:57:29.000000000 -0400
14110@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b 14142@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b
14111 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), 14143 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
14112 }, 14144 },
@@ -14116,9 +14148,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/tsc.c linux-2.6.32.16/arch/x86/kernel
14116 }; 14148 };
14117 14149
14118 static void __init check_system_tsc_reliable(void) 14150 static void __init check_system_tsc_reliable(void)
14119diff -urNp linux-2.6.32.16/arch/x86/kernel/vm86_32.c linux-2.6.32.16/arch/x86/kernel/vm86_32.c 14151diff -urNp linux-2.6.32.18/arch/x86/kernel/vm86_32.c linux-2.6.32.18/arch/x86/kernel/vm86_32.c
14120--- linux-2.6.32.16/arch/x86/kernel/vm86_32.c 2010-07-05 14:14:00.000000000 -0400 14152--- linux-2.6.32.18/arch/x86/kernel/vm86_32.c 2010-08-10 13:45:57.000000000 -0400
14121+++ linux-2.6.32.16/arch/x86/kernel/vm86_32.c 2010-07-09 14:50:35.000000000 -0400 14153+++ linux-2.6.32.18/arch/x86/kernel/vm86_32.c 2010-08-11 18:57:29.000000000 -0400
14122@@ -41,6 +41,7 @@ 14154@@ -41,6 +41,7 @@
14123 #include <linux/ptrace.h> 14155 #include <linux/ptrace.h>
14124 #include <linux/audit.h> 14156 #include <linux/audit.h>
@@ -14183,9 +14215,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/vm86_32.c linux-2.6.32.16/arch/x86/ke
14183 if (get_user(segoffs, intr_ptr)) 14215 if (get_user(segoffs, intr_ptr))
14184 goto cannot_handle; 14216 goto cannot_handle;
14185 if ((segoffs >> 16) == BIOSSEG) 14217 if ((segoffs >> 16) == BIOSSEG)
14186diff -urNp linux-2.6.32.16/arch/x86/kernel/vmi_32.c linux-2.6.32.16/arch/x86/kernel/vmi_32.c 14218diff -urNp linux-2.6.32.18/arch/x86/kernel/vmi_32.c linux-2.6.32.18/arch/x86/kernel/vmi_32.c
14187--- linux-2.6.32.16/arch/x86/kernel/vmi_32.c 2010-07-05 14:14:00.000000000 -0400 14219--- linux-2.6.32.18/arch/x86/kernel/vmi_32.c 2010-08-10 13:45:57.000000000 -0400
14188+++ linux-2.6.32.16/arch/x86/kernel/vmi_32.c 2010-07-09 14:50:35.000000000 -0400 14220+++ linux-2.6.32.18/arch/x86/kernel/vmi_32.c 2010-08-11 18:57:29.000000000 -0400
14189@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) 14221@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
14190 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); 14222 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
14191 14223
@@ -14345,9 +14377,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/vmi_32.c linux-2.6.32.16/arch/x86/ker
14345 return; 14377 return;
14346 14378
14347 local_irq_save(flags); 14379 local_irq_save(flags);
14348diff -urNp linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S 14380diff -urNp linux-2.6.32.18/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.18/arch/x86/kernel/vmlinux.lds.S
14349--- linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S 2010-07-05 14:14:00.000000000 -0400 14381--- linux-2.6.32.18/arch/x86/kernel/vmlinux.lds.S 2010-08-10 13:45:57.000000000 -0400
14350+++ linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S 2010-07-10 08:19:32.000000000 -0400 14382+++ linux-2.6.32.18/arch/x86/kernel/vmlinux.lds.S 2010-08-11 18:57:29.000000000 -0400
14351@@ -26,6 +26,22 @@ 14383@@ -26,6 +26,22 @@
14352 #include <asm/page_types.h> 14384 #include <asm/page_types.h>
14353 #include <asm/cache.h> 14385 #include <asm/cache.h>
@@ -14640,9 +14672,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.16/arch/x8
14640 "kernel image bigger than KERNEL_IMAGE_SIZE"); 14672 "kernel image bigger than KERNEL_IMAGE_SIZE");
14641 14673
14642 #ifdef CONFIG_SMP 14674 #ifdef CONFIG_SMP
14643diff -urNp linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c 14675diff -urNp linux-2.6.32.18/arch/x86/kernel/vsyscall_64.c linux-2.6.32.18/arch/x86/kernel/vsyscall_64.c
14644--- linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c 2010-07-05 14:14:00.000000000 -0400 14676--- linux-2.6.32.18/arch/x86/kernel/vsyscall_64.c 2010-08-10 13:45:57.000000000 -0400
14645+++ linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c 2010-07-09 14:50:35.000000000 -0400 14677+++ linux-2.6.32.18/arch/x86/kernel/vsyscall_64.c 2010-08-11 18:57:29.000000000 -0400
14646@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa 14678@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa
14647 14679
14648 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); 14680 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -14676,9 +14708,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/vsyscall_64.c linux-2.6.32.16/arch/x8
14676 }; 14708 };
14677 #endif 14709 #endif
14678 14710
14679diff -urNp linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c 14711diff -urNp linux-2.6.32.18/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.18/arch/x86/kernel/x8664_ksyms_64.c
14680--- linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c 2010-07-05 14:14:00.000000000 -0400 14712--- linux-2.6.32.18/arch/x86/kernel/x8664_ksyms_64.c 2010-08-10 13:45:57.000000000 -0400
14681+++ linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c 2010-07-09 14:50:35.000000000 -0400 14713+++ linux-2.6.32.18/arch/x86/kernel/x8664_ksyms_64.c 2010-08-11 18:57:29.000000000 -0400
14682@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); 14714@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
14683 14715
14684 EXPORT_SYMBOL(copy_user_generic); 14716 EXPORT_SYMBOL(copy_user_generic);
@@ -14688,9 +14720,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.16/arch
14688 EXPORT_SYMBOL(__copy_from_user_inatomic); 14720 EXPORT_SYMBOL(__copy_from_user_inatomic);
14689 14721
14690 EXPORT_SYMBOL(copy_page); 14722 EXPORT_SYMBOL(copy_page);
14691diff -urNp linux-2.6.32.16/arch/x86/kernel/xsave.c linux-2.6.32.16/arch/x86/kernel/xsave.c 14723diff -urNp linux-2.6.32.18/arch/x86/kernel/xsave.c linux-2.6.32.18/arch/x86/kernel/xsave.c
14692--- linux-2.6.32.16/arch/x86/kernel/xsave.c 2010-07-05 14:14:00.000000000 -0400 14724--- linux-2.6.32.18/arch/x86/kernel/xsave.c 2010-08-10 13:45:57.000000000 -0400
14693+++ linux-2.6.32.16/arch/x86/kernel/xsave.c 2010-07-09 14:50:35.000000000 -0400 14725+++ linux-2.6.32.18/arch/x86/kernel/xsave.c 2010-08-11 18:57:29.000000000 -0400
14694@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ 14726@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
14695 fx_sw_user->xstate_size > fx_sw_user->extended_size) 14727 fx_sw_user->xstate_size > fx_sw_user->extended_size)
14696 return -1; 14728 return -1;
@@ -14718,9 +14750,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kernel/xsave.c linux-2.6.32.16/arch/x86/kern
14718 buf); 14750 buf);
14719 if (unlikely(err)) { 14751 if (unlikely(err)) {
14720 /* 14752 /*
14721diff -urNp linux-2.6.32.16/arch/x86/kvm/emulate.c linux-2.6.32.16/arch/x86/kvm/emulate.c 14753diff -urNp linux-2.6.32.18/arch/x86/kvm/emulate.c linux-2.6.32.18/arch/x86/kvm/emulate.c
14722--- linux-2.6.32.16/arch/x86/kvm/emulate.c 2010-07-05 14:14:00.000000000 -0400 14754--- linux-2.6.32.18/arch/x86/kvm/emulate.c 2010-08-10 13:45:57.000000000 -0400
14723+++ linux-2.6.32.16/arch/x86/kvm/emulate.c 2010-07-09 14:50:35.000000000 -0400 14755+++ linux-2.6.32.18/arch/x86/kvm/emulate.c 2010-08-11 18:57:29.000000000 -0400
14724@@ -81,8 +81,8 @@ 14756@@ -81,8 +81,8 @@
14725 #define Src2CL (1<<29) 14757 #define Src2CL (1<<29)
14726 #define Src2ImmByte (2<<29) 14758 #define Src2ImmByte (2<<29)
@@ -14757,9 +14789,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kvm/emulate.c linux-2.6.32.16/arch/x86/kvm/e
14757 switch ((_dst).bytes) { \ 14789 switch ((_dst).bytes) { \
14758 case 1: \ 14790 case 1: \
14759 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ 14791 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
14760diff -urNp linux-2.6.32.16/arch/x86/kvm/lapic.c linux-2.6.32.16/arch/x86/kvm/lapic.c 14792diff -urNp linux-2.6.32.18/arch/x86/kvm/lapic.c linux-2.6.32.18/arch/x86/kvm/lapic.c
14761--- linux-2.6.32.16/arch/x86/kvm/lapic.c 2010-07-05 14:14:00.000000000 -0400 14793--- linux-2.6.32.18/arch/x86/kvm/lapic.c 2010-08-10 13:45:57.000000000 -0400
14762+++ linux-2.6.32.16/arch/x86/kvm/lapic.c 2010-07-09 14:50:35.000000000 -0400 14794+++ linux-2.6.32.18/arch/x86/kvm/lapic.c 2010-08-11 18:57:29.000000000 -0400
14763@@ -52,7 +52,7 @@ 14795@@ -52,7 +52,7 @@
14764 #define APIC_BUS_CYCLE_NS 1 14796 #define APIC_BUS_CYCLE_NS 1
14765 14797
@@ -14769,10 +14801,10 @@ diff -urNp linux-2.6.32.16/arch/x86/kvm/lapic.c linux-2.6.32.16/arch/x86/kvm/lap
14769 14801
14770 #define APIC_LVT_NUM 6 14802 #define APIC_LVT_NUM 6
14771 /* 14 is the version for Xeon and Pentium 8.4.8*/ 14803 /* 14 is the version for Xeon and Pentium 8.4.8*/
14772diff -urNp linux-2.6.32.16/arch/x86/kvm/svm.c linux-2.6.32.16/arch/x86/kvm/svm.c 14804diff -urNp linux-2.6.32.18/arch/x86/kvm/svm.c linux-2.6.32.18/arch/x86/kvm/svm.c
14773--- linux-2.6.32.16/arch/x86/kvm/svm.c 2010-07-05 14:14:00.000000000 -0400 14805--- linux-2.6.32.18/arch/x86/kvm/svm.c 2010-08-10 13:45:57.000000000 -0400
14774+++ linux-2.6.32.16/arch/x86/kvm/svm.c 2010-07-09 14:50:35.000000000 -0400 14806+++ linux-2.6.32.18/arch/x86/kvm/svm.c 2010-08-11 18:57:29.000000000 -0400
14775@@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k 14807@@ -2482,9 +2482,12 @@ static int handle_exit(struct kvm_run *k
14776 static void reload_tss(struct kvm_vcpu *vcpu) 14808 static void reload_tss(struct kvm_vcpu *vcpu)
14777 { 14809 {
14778 int cpu = raw_smp_processor_id(); 14810 int cpu = raw_smp_processor_id();
@@ -14786,7 +14818,7 @@ diff -urNp linux-2.6.32.16/arch/x86/kvm/svm.c linux-2.6.32.16/arch/x86/kvm/svm.c
14786 load_TR_desc(); 14818 load_TR_desc();
14787 } 14819 }
14788 14820
14789@@ -2845,7 +2848,7 @@ static bool svm_gb_page_enable(void) 14821@@ -2940,7 +2943,7 @@ static bool svm_gb_page_enable(void)
14790 return true; 14822 return true;
14791 } 14823 }
14792 14824
@@ -14795,9 +14827,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kvm/svm.c linux-2.6.32.16/arch/x86/kvm/svm.c
14795 .cpu_has_kvm_support = has_svm, 14827 .cpu_has_kvm_support = has_svm,
14796 .disabled_by_bios = is_disabled, 14828 .disabled_by_bios = is_disabled,
14797 .hardware_setup = svm_hardware_setup, 14829 .hardware_setup = svm_hardware_setup,
14798diff -urNp linux-2.6.32.16/arch/x86/kvm/vmx.c linux-2.6.32.16/arch/x86/kvm/vmx.c 14830diff -urNp linux-2.6.32.18/arch/x86/kvm/vmx.c linux-2.6.32.18/arch/x86/kvm/vmx.c
14799--- linux-2.6.32.16/arch/x86/kvm/vmx.c 2010-07-05 14:14:00.000000000 -0400 14831--- linux-2.6.32.18/arch/x86/kvm/vmx.c 2010-08-10 13:45:57.000000000 -0400
14800+++ linux-2.6.32.16/arch/x86/kvm/vmx.c 2010-07-09 14:50:35.000000000 -0400 14832+++ linux-2.6.32.18/arch/x86/kvm/vmx.c 2010-08-11 18:57:29.000000000 -0400
14801@@ -569,7 +569,11 @@ static void reload_tss(void) 14833@@ -569,7 +569,11 @@ static void reload_tss(void)
14802 14834
14803 kvm_get_gdt(&gdt); 14835 kvm_get_gdt(&gdt);
@@ -14879,9 +14911,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kvm/vmx.c linux-2.6.32.16/arch/x86/kvm/vmx.c
14879 .cpu_has_kvm_support = cpu_has_kvm_support, 14911 .cpu_has_kvm_support = cpu_has_kvm_support,
14880 .disabled_by_bios = vmx_disabled_by_bios, 14912 .disabled_by_bios = vmx_disabled_by_bios,
14881 .hardware_setup = hardware_setup, 14913 .hardware_setup = hardware_setup,
14882diff -urNp linux-2.6.32.16/arch/x86/kvm/x86.c linux-2.6.32.16/arch/x86/kvm/x86.c 14914diff -urNp linux-2.6.32.18/arch/x86/kvm/x86.c linux-2.6.32.18/arch/x86/kvm/x86.c
14883--- linux-2.6.32.16/arch/x86/kvm/x86.c 2010-07-05 14:14:00.000000000 -0400 14915--- linux-2.6.32.18/arch/x86/kvm/x86.c 2010-08-10 13:45:57.000000000 -0400
14884+++ linux-2.6.32.16/arch/x86/kvm/x86.c 2010-07-09 14:50:35.000000000 -0400 14916+++ linux-2.6.32.18/arch/x86/kvm/x86.c 2010-08-11 18:57:29.000000000 -0400
14885@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct 14917@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct
14886 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, 14918 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
14887 struct kvm_cpuid_entry2 __user *entries); 14919 struct kvm_cpuid_entry2 __user *entries);
@@ -14983,9 +15015,9 @@ diff -urNp linux-2.6.32.16/arch/x86/kvm/x86.c linux-2.6.32.16/arch/x86/kvm/x86.c
14983 15015
14984 if (kvm_x86_ops) { 15016 if (kvm_x86_ops) {
14985 printk(KERN_ERR "kvm: already loaded the other module\n"); 15017 printk(KERN_ERR "kvm: already loaded the other module\n");
14986diff -urNp linux-2.6.32.16/arch/x86/lib/checksum_32.S linux-2.6.32.16/arch/x86/lib/checksum_32.S 15018diff -urNp linux-2.6.32.18/arch/x86/lib/checksum_32.S linux-2.6.32.18/arch/x86/lib/checksum_32.S
14987--- linux-2.6.32.16/arch/x86/lib/checksum_32.S 2010-07-05 14:14:00.000000000 -0400 15019--- linux-2.6.32.18/arch/x86/lib/checksum_32.S 2010-08-10 13:45:57.000000000 -0400
14988+++ linux-2.6.32.16/arch/x86/lib/checksum_32.S 2010-07-09 14:50:35.000000000 -0400 15020+++ linux-2.6.32.18/arch/x86/lib/checksum_32.S 2010-08-11 18:57:29.000000000 -0400
14989@@ -28,7 +28,8 @@ 15021@@ -28,7 +28,8 @@
14990 #include <linux/linkage.h> 15022 #include <linux/linkage.h>
14991 #include <asm/dwarf2.h> 15023 #include <asm/dwarf2.h>
@@ -15231,9 +15263,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/checksum_32.S linux-2.6.32.16/arch/x86/l
15231 15263
15232 #undef ROUND 15264 #undef ROUND
15233 #undef ROUND1 15265 #undef ROUND1
15234diff -urNp linux-2.6.32.16/arch/x86/lib/clear_page_64.S linux-2.6.32.16/arch/x86/lib/clear_page_64.S 15266diff -urNp linux-2.6.32.18/arch/x86/lib/clear_page_64.S linux-2.6.32.18/arch/x86/lib/clear_page_64.S
15235--- linux-2.6.32.16/arch/x86/lib/clear_page_64.S 2010-07-05 14:14:00.000000000 -0400 15267--- linux-2.6.32.18/arch/x86/lib/clear_page_64.S 2010-08-10 13:45:57.000000000 -0400
15236+++ linux-2.6.32.16/arch/x86/lib/clear_page_64.S 2010-07-09 14:50:35.000000000 -0400 15268+++ linux-2.6.32.18/arch/x86/lib/clear_page_64.S 2010-08-11 18:57:29.000000000 -0400
15237@@ -43,7 +43,7 @@ ENDPROC(clear_page) 15269@@ -43,7 +43,7 @@ ENDPROC(clear_page)
15238 15270
15239 #include <asm/cpufeature.h> 15271 #include <asm/cpufeature.h>
@@ -15243,9 +15275,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/clear_page_64.S linux-2.6.32.16/arch/x86
15243 1: .byte 0xeb /* jmp <disp8> */ 15275 1: .byte 0xeb /* jmp <disp8> */
15244 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 15276 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
15245 2: 15277 2:
15246diff -urNp linux-2.6.32.16/arch/x86/lib/copy_page_64.S linux-2.6.32.16/arch/x86/lib/copy_page_64.S 15278diff -urNp linux-2.6.32.18/arch/x86/lib/copy_page_64.S linux-2.6.32.18/arch/x86/lib/copy_page_64.S
15247--- linux-2.6.32.16/arch/x86/lib/copy_page_64.S 2010-07-05 14:14:00.000000000 -0400 15279--- linux-2.6.32.18/arch/x86/lib/copy_page_64.S 2010-08-10 13:45:57.000000000 -0400
15248+++ linux-2.6.32.16/arch/x86/lib/copy_page_64.S 2010-07-09 14:50:35.000000000 -0400 15280+++ linux-2.6.32.18/arch/x86/lib/copy_page_64.S 2010-08-11 18:57:29.000000000 -0400
15249@@ -104,7 +104,7 @@ ENDPROC(copy_page) 15281@@ -104,7 +104,7 @@ ENDPROC(copy_page)
15250 15282
15251 #include <asm/cpufeature.h> 15283 #include <asm/cpufeature.h>
@@ -15255,9 +15287,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/copy_page_64.S linux-2.6.32.16/arch/x86/
15255 1: .byte 0xeb /* jmp <disp8> */ 15287 1: .byte 0xeb /* jmp <disp8> */
15256 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 15288 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
15257 2: 15289 2:
15258diff -urNp linux-2.6.32.16/arch/x86/lib/copy_user_64.S linux-2.6.32.16/arch/x86/lib/copy_user_64.S 15290diff -urNp linux-2.6.32.18/arch/x86/lib/copy_user_64.S linux-2.6.32.18/arch/x86/lib/copy_user_64.S
15259--- linux-2.6.32.16/arch/x86/lib/copy_user_64.S 2010-07-05 14:14:00.000000000 -0400 15291--- linux-2.6.32.18/arch/x86/lib/copy_user_64.S 2010-08-10 13:45:57.000000000 -0400
15260+++ linux-2.6.32.16/arch/x86/lib/copy_user_64.S 2010-07-09 14:50:35.000000000 -0400 15292+++ linux-2.6.32.18/arch/x86/lib/copy_user_64.S 2010-08-11 18:57:29.000000000 -0400
15261@@ -15,13 +15,14 @@ 15293@@ -15,13 +15,14 @@
15262 #include <asm/asm-offsets.h> 15294 #include <asm/asm-offsets.h>
15263 #include <asm/thread_info.h> 15295 #include <asm/thread_info.h>
@@ -15332,9 +15364,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/copy_user_64.S linux-2.6.32.16/arch/x86/
15332 movl %edx,%ecx 15364 movl %edx,%ecx
15333 xorl %eax,%eax 15365 xorl %eax,%eax
15334 rep 15366 rep
15335diff -urNp linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S 15367diff -urNp linux-2.6.32.18/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.18/arch/x86/lib/copy_user_nocache_64.S
15336--- linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S 2010-07-05 14:14:00.000000000 -0400 15368--- linux-2.6.32.18/arch/x86/lib/copy_user_nocache_64.S 2010-08-10 13:45:57.000000000 -0400
15337+++ linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S 2010-07-09 14:50:35.000000000 -0400 15369+++ linux-2.6.32.18/arch/x86/lib/copy_user_nocache_64.S 2010-08-11 18:57:29.000000000 -0400
15338@@ -14,6 +14,7 @@ 15370@@ -14,6 +14,7 @@
15339 #include <asm/current.h> 15371 #include <asm/current.h>
15340 #include <asm/asm-offsets.h> 15372 #include <asm/asm-offsets.h>
@@ -15359,9 +15391,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.16/a
15359 cmpl $8,%edx 15391 cmpl $8,%edx
15360 jb 20f /* less then 8 bytes, go to byte copy loop */ 15392 jb 20f /* less then 8 bytes, go to byte copy loop */
15361 ALIGN_DESTINATION 15393 ALIGN_DESTINATION
15362diff -urNp linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c 15394diff -urNp linux-2.6.32.18/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.18/arch/x86/lib/csum-wrappers_64.c
15363--- linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c 2010-07-05 14:14:00.000000000 -0400 15395--- linux-2.6.32.18/arch/x86/lib/csum-wrappers_64.c 2010-08-10 13:45:57.000000000 -0400
15364+++ linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c 2010-07-09 14:50:35.000000000 -0400 15396+++ linux-2.6.32.18/arch/x86/lib/csum-wrappers_64.c 2010-08-11 18:57:29.000000000 -0400
15365@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ 15397@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
15366 len -= 2; 15398 len -= 2;
15367 } 15399 }
@@ -15380,9 +15412,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.16/arch/
15380 return csum_partial_copy_generic(src, (void __force *)dst, 15412 return csum_partial_copy_generic(src, (void __force *)dst,
15381 len, isum, NULL, errp); 15413 len, isum, NULL, errp);
15382 } 15414 }
15383diff -urNp linux-2.6.32.16/arch/x86/lib/getuser.S linux-2.6.32.16/arch/x86/lib/getuser.S 15415diff -urNp linux-2.6.32.18/arch/x86/lib/getuser.S linux-2.6.32.18/arch/x86/lib/getuser.S
15384--- linux-2.6.32.16/arch/x86/lib/getuser.S 2010-07-05 14:14:00.000000000 -0400 15416--- linux-2.6.32.18/arch/x86/lib/getuser.S 2010-08-10 13:45:57.000000000 -0400
15385+++ linux-2.6.32.16/arch/x86/lib/getuser.S 2010-07-09 14:50:35.000000000 -0400 15417+++ linux-2.6.32.18/arch/x86/lib/getuser.S 2010-08-11 18:57:29.000000000 -0400
15386@@ -33,14 +33,38 @@ 15418@@ -33,14 +33,38 @@
15387 #include <asm/asm-offsets.h> 15419 #include <asm/asm-offsets.h>
15388 #include <asm/thread_info.h> 15420 #include <asm/thread_info.h>
@@ -15519,9 +15551,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/getuser.S linux-2.6.32.16/arch/x86/lib/g
15519 xor %edx,%edx 15551 xor %edx,%edx
15520 mov $(-EFAULT),%_ASM_AX 15552 mov $(-EFAULT),%_ASM_AX
15521 ret 15553 ret
15522diff -urNp linux-2.6.32.16/arch/x86/lib/memcpy_64.S linux-2.6.32.16/arch/x86/lib/memcpy_64.S 15554diff -urNp linux-2.6.32.18/arch/x86/lib/memcpy_64.S linux-2.6.32.18/arch/x86/lib/memcpy_64.S
15523--- linux-2.6.32.16/arch/x86/lib/memcpy_64.S 2010-07-05 14:14:00.000000000 -0400 15555--- linux-2.6.32.18/arch/x86/lib/memcpy_64.S 2010-08-10 13:45:57.000000000 -0400
15524+++ linux-2.6.32.16/arch/x86/lib/memcpy_64.S 2010-07-09 14:50:35.000000000 -0400 15556+++ linux-2.6.32.18/arch/x86/lib/memcpy_64.S 2010-08-11 18:57:29.000000000 -0400
15525@@ -128,7 +128,7 @@ ENDPROC(__memcpy) 15557@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
15526 * It is also a lot simpler. Use this when possible: 15558 * It is also a lot simpler. Use this when possible:
15527 */ 15559 */
@@ -15531,9 +15563,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/memcpy_64.S linux-2.6.32.16/arch/x86/lib
15531 1: .byte 0xeb /* jmp <disp8> */ 15563 1: .byte 0xeb /* jmp <disp8> */
15532 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 15564 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
15533 2: 15565 2:
15534diff -urNp linux-2.6.32.16/arch/x86/lib/memset_64.S linux-2.6.32.16/arch/x86/lib/memset_64.S 15566diff -urNp linux-2.6.32.18/arch/x86/lib/memset_64.S linux-2.6.32.18/arch/x86/lib/memset_64.S
15535--- linux-2.6.32.16/arch/x86/lib/memset_64.S 2010-07-05 14:14:00.000000000 -0400 15567--- linux-2.6.32.18/arch/x86/lib/memset_64.S 2010-08-10 13:45:57.000000000 -0400
15536+++ linux-2.6.32.16/arch/x86/lib/memset_64.S 2010-07-09 14:50:35.000000000 -0400 15568+++ linux-2.6.32.18/arch/x86/lib/memset_64.S 2010-08-11 18:57:29.000000000 -0400
15537@@ -118,7 +118,7 @@ ENDPROC(__memset) 15569@@ -118,7 +118,7 @@ ENDPROC(__memset)
15538 15570
15539 #include <asm/cpufeature.h> 15571 #include <asm/cpufeature.h>
@@ -15543,9 +15575,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/memset_64.S linux-2.6.32.16/arch/x86/lib
15543 1: .byte 0xeb /* jmp <disp8> */ 15575 1: .byte 0xeb /* jmp <disp8> */
15544 .byte (memset_c - memset) - (2f - 1b) /* offset */ 15576 .byte (memset_c - memset) - (2f - 1b) /* offset */
15545 2: 15577 2:
15546diff -urNp linux-2.6.32.16/arch/x86/lib/mmx_32.c linux-2.6.32.16/arch/x86/lib/mmx_32.c 15578diff -urNp linux-2.6.32.18/arch/x86/lib/mmx_32.c linux-2.6.32.18/arch/x86/lib/mmx_32.c
15547--- linux-2.6.32.16/arch/x86/lib/mmx_32.c 2010-07-05 14:14:00.000000000 -0400 15579--- linux-2.6.32.18/arch/x86/lib/mmx_32.c 2010-08-10 13:45:57.000000000 -0400
15548+++ linux-2.6.32.16/arch/x86/lib/mmx_32.c 2010-07-09 14:50:35.000000000 -0400 15580+++ linux-2.6.32.18/arch/x86/lib/mmx_32.c 2010-08-11 18:57:29.000000000 -0400
15549@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * 15581@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
15550 { 15582 {
15551 void *p; 15583 void *p;
@@ -15861,9 +15893,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/mmx_32.c linux-2.6.32.16/arch/x86/lib/mm
15861 15893
15862 from += 64; 15894 from += 64;
15863 to += 64; 15895 to += 64;
15864diff -urNp linux-2.6.32.16/arch/x86/lib/putuser.S linux-2.6.32.16/arch/x86/lib/putuser.S 15896diff -urNp linux-2.6.32.18/arch/x86/lib/putuser.S linux-2.6.32.18/arch/x86/lib/putuser.S
15865--- linux-2.6.32.16/arch/x86/lib/putuser.S 2010-07-05 14:14:00.000000000 -0400 15897--- linux-2.6.32.18/arch/x86/lib/putuser.S 2010-08-10 13:45:57.000000000 -0400
15866+++ linux-2.6.32.16/arch/x86/lib/putuser.S 2010-07-16 21:06:43.000000000 -0400 15898+++ linux-2.6.32.18/arch/x86/lib/putuser.S 2010-08-11 18:57:29.000000000 -0400
15867@@ -15,7 +15,8 @@ 15899@@ -15,7 +15,8 @@
15868 #include <asm/thread_info.h> 15900 #include <asm/thread_info.h>
15869 #include <asm/errno.h> 15901 #include <asm/errno.h>
@@ -16044,9 +16076,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/putuser.S linux-2.6.32.16/arch/x86/lib/p
16044 movl $-EFAULT,%eax 16076 movl $-EFAULT,%eax
16045 EXIT 16077 EXIT
16046 END(bad_put_user) 16078 END(bad_put_user)
16047diff -urNp linux-2.6.32.16/arch/x86/lib/usercopy_32.c linux-2.6.32.16/arch/x86/lib/usercopy_32.c 16079diff -urNp linux-2.6.32.18/arch/x86/lib/usercopy_32.c linux-2.6.32.18/arch/x86/lib/usercopy_32.c
16048--- linux-2.6.32.16/arch/x86/lib/usercopy_32.c 2010-07-05 14:14:00.000000000 -0400 16080--- linux-2.6.32.18/arch/x86/lib/usercopy_32.c 2010-08-10 13:45:57.000000000 -0400
16049+++ linux-2.6.32.16/arch/x86/lib/usercopy_32.c 2010-07-09 14:50:35.000000000 -0400 16081+++ linux-2.6.32.18/arch/x86/lib/usercopy_32.c 2010-08-11 18:57:29.000000000 -0400
16050@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned 16082@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
16051 * Copy a null terminated string from userspace. 16083 * Copy a null terminated string from userspace.
16052 */ 16084 */
@@ -17015,9 +17047,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/usercopy_32.c linux-2.6.32.16/arch/x86/l
17015+#endif 17047+#endif
17016+ 17048+
17017+EXPORT_SYMBOL(set_fs); 17049+EXPORT_SYMBOL(set_fs);
17018diff -urNp linux-2.6.32.16/arch/x86/lib/usercopy_64.c linux-2.6.32.16/arch/x86/lib/usercopy_64.c 17050diff -urNp linux-2.6.32.18/arch/x86/lib/usercopy_64.c linux-2.6.32.18/arch/x86/lib/usercopy_64.c
17019--- linux-2.6.32.16/arch/x86/lib/usercopy_64.c 2010-07-05 14:14:00.000000000 -0400 17051--- linux-2.6.32.18/arch/x86/lib/usercopy_64.c 2010-08-10 13:45:57.000000000 -0400
17020+++ linux-2.6.32.16/arch/x86/lib/usercopy_64.c 2010-07-09 14:50:35.000000000 -0400 17052+++ linux-2.6.32.18/arch/x86/lib/usercopy_64.c 2010-08-11 18:57:29.000000000 -0400
17021@@ -42,6 +42,8 @@ long 17053@@ -42,6 +42,8 @@ long
17022 __strncpy_from_user(char *dst, const char __user *src, long count) 17054 __strncpy_from_user(char *dst, const char __user *src, long count)
17023 { 17055 {
@@ -17054,9 +17086,9 @@ diff -urNp linux-2.6.32.16/arch/x86/lib/usercopy_64.c linux-2.6.32.16/arch/x86/l
17054 } 17086 }
17055 EXPORT_SYMBOL(copy_in_user); 17087 EXPORT_SYMBOL(copy_in_user);
17056 17088
17057diff -urNp linux-2.6.32.16/arch/x86/Makefile linux-2.6.32.16/arch/x86/Makefile 17089diff -urNp linux-2.6.32.18/arch/x86/Makefile linux-2.6.32.18/arch/x86/Makefile
17058--- linux-2.6.32.16/arch/x86/Makefile 2010-07-05 14:14:00.000000000 -0400 17090--- linux-2.6.32.18/arch/x86/Makefile 2010-08-10 13:45:57.000000000 -0400
17059+++ linux-2.6.32.16/arch/x86/Makefile 2010-07-09 14:50:35.000000000 -0400 17091+++ linux-2.6.32.18/arch/x86/Makefile 2010-08-11 18:57:29.000000000 -0400
17060@@ -189,3 +189,12 @@ define archhelp 17092@@ -189,3 +189,12 @@ define archhelp
17061 echo ' FDARGS="..." arguments for the booted kernel' 17093 echo ' FDARGS="..." arguments for the booted kernel'
17062 echo ' FDINITRD=file initrd for the booted kernel' 17094 echo ' FDINITRD=file initrd for the booted kernel'
@@ -17070,9 +17102,9 @@ diff -urNp linux-2.6.32.16/arch/x86/Makefile linux-2.6.32.16/arch/x86/Makefile
17070+ 17102+
17071+archprepare: 17103+archprepare:
17072+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) 17104+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
17073diff -urNp linux-2.6.32.16/arch/x86/mm/extable.c linux-2.6.32.16/arch/x86/mm/extable.c 17105diff -urNp linux-2.6.32.18/arch/x86/mm/extable.c linux-2.6.32.18/arch/x86/mm/extable.c
17074--- linux-2.6.32.16/arch/x86/mm/extable.c 2010-07-05 14:14:00.000000000 -0400 17106--- linux-2.6.32.18/arch/x86/mm/extable.c 2010-08-10 13:45:57.000000000 -0400
17075+++ linux-2.6.32.16/arch/x86/mm/extable.c 2010-07-09 14:50:35.000000000 -0400 17107+++ linux-2.6.32.18/arch/x86/mm/extable.c 2010-08-11 18:57:29.000000000 -0400
17076@@ -1,14 +1,71 @@ 17108@@ -1,14 +1,71 @@
17077 #include <linux/module.h> 17109 #include <linux/module.h>
17078 #include <linux/spinlock.h> 17110 #include <linux/spinlock.h>
@@ -17146,9 +17178,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/extable.c linux-2.6.32.16/arch/x86/mm/ext
17146 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; 17178 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
17147 extern u32 pnp_bios_is_utter_crap; 17179 extern u32 pnp_bios_is_utter_crap;
17148 pnp_bios_is_utter_crap = 1; 17180 pnp_bios_is_utter_crap = 1;
17149diff -urNp linux-2.6.32.16/arch/x86/mm/fault.c linux-2.6.32.16/arch/x86/mm/fault.c 17181diff -urNp linux-2.6.32.18/arch/x86/mm/fault.c linux-2.6.32.18/arch/x86/mm/fault.c
17150--- linux-2.6.32.16/arch/x86/mm/fault.c 2010-07-05 14:14:00.000000000 -0400 17182--- linux-2.6.32.18/arch/x86/mm/fault.c 2010-08-10 13:45:57.000000000 -0400
17151+++ linux-2.6.32.16/arch/x86/mm/fault.c 2010-07-09 14:50:35.000000000 -0400 17183+++ linux-2.6.32.18/arch/x86/mm/fault.c 2010-08-11 18:57:29.000000000 -0400
17152@@ -11,10 +11,19 @@ 17184@@ -11,10 +11,19 @@
17153 #include <linux/kprobes.h> /* __kprobes, ... */ 17185 #include <linux/kprobes.h> /* __kprobes, ... */
17154 #include <linux/mmiotrace.h> /* kmmio_handler, ... */ 17186 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
@@ -17816,9 +17848,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/fault.c linux-2.6.32.16/arch/x86/mm/fault
17816+ 17848+
17817+ return ret ? -EFAULT : 0; 17849+ return ret ? -EFAULT : 0;
17818+} 17850+}
17819diff -urNp linux-2.6.32.16/arch/x86/mm/gup.c linux-2.6.32.16/arch/x86/mm/gup.c 17851diff -urNp linux-2.6.32.18/arch/x86/mm/gup.c linux-2.6.32.18/arch/x86/mm/gup.c
17820--- linux-2.6.32.16/arch/x86/mm/gup.c 2010-07-05 14:14:00.000000000 -0400 17852--- linux-2.6.32.18/arch/x86/mm/gup.c 2010-08-10 13:45:57.000000000 -0400
17821+++ linux-2.6.32.16/arch/x86/mm/gup.c 2010-07-09 14:50:35.000000000 -0400 17853+++ linux-2.6.32.18/arch/x86/mm/gup.c 2010-08-11 18:57:29.000000000 -0400
17822@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long 17854@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
17823 addr = start; 17855 addr = start;
17824 len = (unsigned long) nr_pages << PAGE_SHIFT; 17856 len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -17828,9 +17860,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/gup.c linux-2.6.32.16/arch/x86/mm/gup.c
17828 (void __user *)start, len))) 17860 (void __user *)start, len)))
17829 return 0; 17861 return 0;
17830 17862
17831diff -urNp linux-2.6.32.16/arch/x86/mm/highmem_32.c linux-2.6.32.16/arch/x86/mm/highmem_32.c 17863diff -urNp linux-2.6.32.18/arch/x86/mm/highmem_32.c linux-2.6.32.18/arch/x86/mm/highmem_32.c
17832--- linux-2.6.32.16/arch/x86/mm/highmem_32.c 2010-07-05 14:14:00.000000000 -0400 17864--- linux-2.6.32.18/arch/x86/mm/highmem_32.c 2010-08-10 13:45:57.000000000 -0400
17833+++ linux-2.6.32.16/arch/x86/mm/highmem_32.c 2010-07-09 14:50:35.000000000 -0400 17865+++ linux-2.6.32.18/arch/x86/mm/highmem_32.c 2010-08-11 18:57:29.000000000 -0400
17834@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page 17866@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
17835 idx = type + KM_TYPE_NR*smp_processor_id(); 17867 idx = type + KM_TYPE_NR*smp_processor_id();
17836 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); 17868 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -17842,9 +17874,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/highmem_32.c linux-2.6.32.16/arch/x86/mm/
17842 17874
17843 return (void *)vaddr; 17875 return (void *)vaddr;
17844 } 17876 }
17845diff -urNp linux-2.6.32.16/arch/x86/mm/hugetlbpage.c linux-2.6.32.16/arch/x86/mm/hugetlbpage.c 17877diff -urNp linux-2.6.32.18/arch/x86/mm/hugetlbpage.c linux-2.6.32.18/arch/x86/mm/hugetlbpage.c
17846--- linux-2.6.32.16/arch/x86/mm/hugetlbpage.c 2010-07-05 14:14:00.000000000 -0400 17878--- linux-2.6.32.18/arch/x86/mm/hugetlbpage.c 2010-08-10 13:45:57.000000000 -0400
17847+++ linux-2.6.32.16/arch/x86/mm/hugetlbpage.c 2010-07-09 14:50:35.000000000 -0400 17879+++ linux-2.6.32.18/arch/x86/mm/hugetlbpage.c 2010-08-11 18:57:29.000000000 -0400
17848@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe 17880@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe
17849 struct hstate *h = hstate_file(file); 17881 struct hstate *h = hstate_file(file);
17850 struct mm_struct *mm = current->mm; 17882 struct mm_struct *mm = current->mm;
@@ -17979,9 +18011,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/hugetlbpage.c linux-2.6.32.16/arch/x86/mm
17979 (!vma || addr + len <= vma->vm_start)) 18011 (!vma || addr + len <= vma->vm_start))
17980 return addr; 18012 return addr;
17981 } 18013 }
17982diff -urNp linux-2.6.32.16/arch/x86/mm/init_32.c linux-2.6.32.16/arch/x86/mm/init_32.c 18014diff -urNp linux-2.6.32.18/arch/x86/mm/init_32.c linux-2.6.32.18/arch/x86/mm/init_32.c
17983--- linux-2.6.32.16/arch/x86/mm/init_32.c 2010-07-05 14:14:00.000000000 -0400 18015--- linux-2.6.32.18/arch/x86/mm/init_32.c 2010-08-10 13:45:57.000000000 -0400
17984+++ linux-2.6.32.16/arch/x86/mm/init_32.c 2010-07-09 14:50:35.000000000 -0400 18016+++ linux-2.6.32.18/arch/x86/mm/init_32.c 2010-08-11 18:57:29.000000000 -0400
17985@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) 18017@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
17986 } 18018 }
17987 18019
@@ -18285,9 +18317,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/init_32.c linux-2.6.32.16/arch/x86/mm/ini
18285 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); 18317 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
18286 printk(KERN_INFO "Write protecting the kernel text: %luk\n", 18318 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
18287 size >> 10); 18319 size >> 10);
18288diff -urNp linux-2.6.32.16/arch/x86/mm/init_64.c linux-2.6.32.16/arch/x86/mm/init_64.c 18320diff -urNp linux-2.6.32.18/arch/x86/mm/init_64.c linux-2.6.32.18/arch/x86/mm/init_64.c
18289--- linux-2.6.32.16/arch/x86/mm/init_64.c 2010-07-05 14:14:00.000000000 -0400 18321--- linux-2.6.32.18/arch/x86/mm/init_64.c 2010-08-10 13:45:57.000000000 -0400
18290+++ linux-2.6.32.16/arch/x86/mm/init_64.c 2010-07-09 14:50:35.000000000 -0400 18322+++ linux-2.6.32.18/arch/x86/mm/init_64.c 2010-08-11 18:57:29.000000000 -0400
18291@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 18323@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
18292 pmd = fill_pmd(pud, vaddr); 18324 pmd = fill_pmd(pud, vaddr);
18293 pte = fill_pte(pmd, vaddr); 18325 pte = fill_pte(pmd, vaddr);
@@ -18348,9 +18380,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/init_64.c linux-2.6.32.16/arch/x86/mm/ini
18348 return "[vdso]"; 18380 return "[vdso]";
18349 if (vma == &gate_vma) 18381 if (vma == &gate_vma)
18350 return "[vsyscall]"; 18382 return "[vsyscall]";
18351diff -urNp linux-2.6.32.16/arch/x86/mm/init.c linux-2.6.32.16/arch/x86/mm/init.c 18383diff -urNp linux-2.6.32.18/arch/x86/mm/init.c linux-2.6.32.18/arch/x86/mm/init.c
18352--- linux-2.6.32.16/arch/x86/mm/init.c 2010-07-05 14:14:00.000000000 -0400 18384--- linux-2.6.32.18/arch/x86/mm/init.c 2010-08-10 13:45:57.000000000 -0400
18353+++ linux-2.6.32.16/arch/x86/mm/init.c 2010-07-09 14:50:35.000000000 -0400 18385+++ linux-2.6.32.18/arch/x86/mm/init.c 2010-08-11 18:57:29.000000000 -0400
18354@@ -69,11 +69,7 @@ static void __init find_early_table_spac 18386@@ -69,11 +69,7 @@ static void __init find_early_table_spac
18355 * cause a hotspot and fill up ZONE_DMA. The page tables 18387 * cause a hotspot and fill up ZONE_DMA. The page tables
18356 * need roughly 0.5KB per GB. 18388 * need roughly 0.5KB per GB.
@@ -18468,9 +18500,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/init.c linux-2.6.32.16/arch/x86/mm/init.c
18468 free_init_pages("unused kernel memory", 18500 free_init_pages("unused kernel memory",
18469 (unsigned long)(&__init_begin), 18501 (unsigned long)(&__init_begin),
18470 (unsigned long)(&__init_end)); 18502 (unsigned long)(&__init_end));
18471diff -urNp linux-2.6.32.16/arch/x86/mm/iomap_32.c linux-2.6.32.16/arch/x86/mm/iomap_32.c 18503diff -urNp linux-2.6.32.18/arch/x86/mm/iomap_32.c linux-2.6.32.18/arch/x86/mm/iomap_32.c
18472--- linux-2.6.32.16/arch/x86/mm/iomap_32.c 2010-07-05 14:14:00.000000000 -0400 18504--- linux-2.6.32.18/arch/x86/mm/iomap_32.c 2010-08-10 13:45:57.000000000 -0400
18473+++ linux-2.6.32.16/arch/x86/mm/iomap_32.c 2010-07-09 14:50:35.000000000 -0400 18505+++ linux-2.6.32.18/arch/x86/mm/iomap_32.c 2010-08-11 18:57:29.000000000 -0400
18474@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long 18506@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
18475 debug_kmap_atomic(type); 18507 debug_kmap_atomic(type);
18476 idx = type + KM_TYPE_NR * smp_processor_id(); 18508 idx = type + KM_TYPE_NR * smp_processor_id();
@@ -18483,9 +18515,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/iomap_32.c linux-2.6.32.16/arch/x86/mm/io
18483 arch_flush_lazy_mmu_mode(); 18515 arch_flush_lazy_mmu_mode();
18484 18516
18485 return (void *)vaddr; 18517 return (void *)vaddr;
18486diff -urNp linux-2.6.32.16/arch/x86/mm/ioremap.c linux-2.6.32.16/arch/x86/mm/ioremap.c 18518diff -urNp linux-2.6.32.18/arch/x86/mm/ioremap.c linux-2.6.32.18/arch/x86/mm/ioremap.c
18487--- linux-2.6.32.16/arch/x86/mm/ioremap.c 2010-07-05 14:14:00.000000000 -0400 18519--- linux-2.6.32.18/arch/x86/mm/ioremap.c 2010-08-10 13:45:57.000000000 -0400
18488+++ linux-2.6.32.16/arch/x86/mm/ioremap.c 2010-07-09 14:50:35.000000000 -0400 18520+++ linux-2.6.32.18/arch/x86/mm/ioremap.c 2010-08-11 18:57:29.000000000 -0400
18489@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) 18521@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
18490 * Second special case: Some BIOSen report the PC BIOS 18522 * Second special case: Some BIOSen report the PC BIOS
18491 * area (640->1Mb) as ram even though it is not. 18523 * area (640->1Mb) as ram even though it is not.
@@ -18532,9 +18564,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/ioremap.c linux-2.6.32.16/arch/x86/mm/ior
18532 18564
18533 /* 18565 /*
18534 * The boot-ioremap range spans multiple pmds, for which 18566 * The boot-ioremap range spans multiple pmds, for which
18535diff -urNp linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c 18567diff -urNp linux-2.6.32.18/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.18/arch/x86/mm/kmemcheck/kmemcheck.c
18536--- linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c 2010-07-05 14:14:00.000000000 -0400 18568--- linux-2.6.32.18/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-10 13:45:57.000000000 -0400
18537+++ linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c 2010-07-09 14:50:35.000000000 -0400 18569+++ linux-2.6.32.18/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-11 18:57:29.000000000 -0400
18538@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg 18570@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
18539 * memory (e.g. tracked pages)? For now, we need this to avoid 18571 * memory (e.g. tracked pages)? For now, we need this to avoid
18540 * invoking kmemcheck for PnP BIOS calls. 18572 * invoking kmemcheck for PnP BIOS calls.
@@ -18547,9 +18579,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.16/arc
18547 return false; 18579 return false;
18548 18580
18549 pte = kmemcheck_pte_lookup(address); 18581 pte = kmemcheck_pte_lookup(address);
18550diff -urNp linux-2.6.32.16/arch/x86/mm/mmap.c linux-2.6.32.16/arch/x86/mm/mmap.c 18582diff -urNp linux-2.6.32.18/arch/x86/mm/mmap.c linux-2.6.32.18/arch/x86/mm/mmap.c
18551--- linux-2.6.32.16/arch/x86/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 18583--- linux-2.6.32.18/arch/x86/mm/mmap.c 2010-08-10 13:45:57.000000000 -0400
18552+++ linux-2.6.32.16/arch/x86/mm/mmap.c 2010-07-09 14:50:35.000000000 -0400 18584+++ linux-2.6.32.18/arch/x86/mm/mmap.c 2010-08-11 18:57:29.000000000 -0400
18553@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size 18585@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
18554 * Leave an at least ~128 MB hole with possible stack randomization. 18586 * Leave an at least ~128 MB hole with possible stack randomization.
18555 */ 18587 */
@@ -18631,9 +18663,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/mmap.c linux-2.6.32.16/arch/x86/mm/mmap.c
18631 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 18663 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
18632 mm->unmap_area = arch_unmap_area_topdown; 18664 mm->unmap_area = arch_unmap_area_topdown;
18633 } 18665 }
18634diff -urNp linux-2.6.32.16/arch/x86/mm/numa_32.c linux-2.6.32.16/arch/x86/mm/numa_32.c 18666diff -urNp linux-2.6.32.18/arch/x86/mm/numa_32.c linux-2.6.32.18/arch/x86/mm/numa_32.c
18635--- linux-2.6.32.16/arch/x86/mm/numa_32.c 2010-07-05 14:14:00.000000000 -0400 18667--- linux-2.6.32.18/arch/x86/mm/numa_32.c 2010-08-10 13:45:57.000000000 -0400
18636+++ linux-2.6.32.16/arch/x86/mm/numa_32.c 2010-07-09 14:50:35.000000000 -0400 18668+++ linux-2.6.32.18/arch/x86/mm/numa_32.c 2010-08-11 18:57:29.000000000 -0400
18637@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int 18669@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
18638 } 18670 }
18639 #endif 18671 #endif
@@ -18642,9 +18674,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/numa_32.c linux-2.6.32.16/arch/x86/mm/num
18642 extern unsigned long highend_pfn, highstart_pfn; 18674 extern unsigned long highend_pfn, highstart_pfn;
18643 18675
18644 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) 18676 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
18645diff -urNp linux-2.6.32.16/arch/x86/mm/pageattr.c linux-2.6.32.16/arch/x86/mm/pageattr.c 18677diff -urNp linux-2.6.32.18/arch/x86/mm/pageattr.c linux-2.6.32.18/arch/x86/mm/pageattr.c
18646--- linux-2.6.32.16/arch/x86/mm/pageattr.c 2010-07-05 14:14:00.000000000 -0400 18678--- linux-2.6.32.18/arch/x86/mm/pageattr.c 2010-08-10 13:45:57.000000000 -0400
18647+++ linux-2.6.32.16/arch/x86/mm/pageattr.c 2010-07-09 14:50:35.000000000 -0400 18679+++ linux-2.6.32.18/arch/x86/mm/pageattr.c 2010-08-11 18:57:29.000000000 -0400
18648@@ -261,16 +261,17 @@ static inline pgprot_t static_protection 18680@@ -261,16 +261,17 @@ static inline pgprot_t static_protection
18649 * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support. 18681 * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
18650 */ 18682 */
@@ -18721,9 +18753,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/pageattr.c linux-2.6.32.16/arch/x86/mm/pa
18721 } 18753 }
18722 18754
18723 static int 18755 static int
18724diff -urNp linux-2.6.32.16/arch/x86/mm/pageattr-test.c linux-2.6.32.16/arch/x86/mm/pageattr-test.c 18756diff -urNp linux-2.6.32.18/arch/x86/mm/pageattr-test.c linux-2.6.32.18/arch/x86/mm/pageattr-test.c
18725--- linux-2.6.32.16/arch/x86/mm/pageattr-test.c 2010-07-05 14:14:00.000000000 -0400 18757--- linux-2.6.32.18/arch/x86/mm/pageattr-test.c 2010-08-10 13:45:57.000000000 -0400
18726+++ linux-2.6.32.16/arch/x86/mm/pageattr-test.c 2010-07-09 14:50:35.000000000 -0400 18758+++ linux-2.6.32.18/arch/x86/mm/pageattr-test.c 2010-08-11 18:57:29.000000000 -0400
18727@@ -36,7 +36,7 @@ enum { 18759@@ -36,7 +36,7 @@ enum {
18728 18760
18729 static int pte_testbit(pte_t pte) 18761 static int pte_testbit(pte_t pte)
@@ -18733,9 +18765,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/pageattr-test.c linux-2.6.32.16/arch/x86/
18733 } 18765 }
18734 18766
18735 struct split_state { 18767 struct split_state {
18736diff -urNp linux-2.6.32.16/arch/x86/mm/pat.c linux-2.6.32.16/arch/x86/mm/pat.c 18768diff -urNp linux-2.6.32.18/arch/x86/mm/pat.c linux-2.6.32.18/arch/x86/mm/pat.c
18737--- linux-2.6.32.16/arch/x86/mm/pat.c 2010-07-05 14:14:00.000000000 -0400 18769--- linux-2.6.32.18/arch/x86/mm/pat.c 2010-08-10 13:45:57.000000000 -0400
18738+++ linux-2.6.32.16/arch/x86/mm/pat.c 2010-07-16 21:06:43.000000000 -0400 18770+++ linux-2.6.32.18/arch/x86/mm/pat.c 2010-08-11 18:57:29.000000000 -0400
18739@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct 18771@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
18740 18772
18741 conflict: 18773 conflict:
@@ -18783,9 +18815,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/pat.c linux-2.6.32.16/arch/x86/mm/pat.c
18783 cattr_name(want_flags), 18815 cattr_name(want_flags),
18784 (unsigned long long)paddr, 18816 (unsigned long long)paddr,
18785 (unsigned long long)(paddr + size), 18817 (unsigned long long)(paddr + size),
18786diff -urNp linux-2.6.32.16/arch/x86/mm/pgtable_32.c linux-2.6.32.16/arch/x86/mm/pgtable_32.c 18818diff -urNp linux-2.6.32.18/arch/x86/mm/pgtable_32.c linux-2.6.32.18/arch/x86/mm/pgtable_32.c
18787--- linux-2.6.32.16/arch/x86/mm/pgtable_32.c 2010-07-05 14:14:00.000000000 -0400 18819--- linux-2.6.32.18/arch/x86/mm/pgtable_32.c 2010-08-10 13:45:57.000000000 -0400
18788+++ linux-2.6.32.16/arch/x86/mm/pgtable_32.c 2010-07-09 14:50:35.000000000 -0400 18820+++ linux-2.6.32.18/arch/x86/mm/pgtable_32.c 2010-08-11 18:57:29.000000000 -0400
18789@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 18821@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
18790 return; 18822 return;
18791 } 18823 }
@@ -18800,9 +18832,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/pgtable_32.c linux-2.6.32.16/arch/x86/mm/
18800 18832
18801 /* 18833 /*
18802 * It's enough to flush this one mapping. 18834 * It's enough to flush this one mapping.
18803diff -urNp linux-2.6.32.16/arch/x86/mm/pgtable.c linux-2.6.32.16/arch/x86/mm/pgtable.c 18835diff -urNp linux-2.6.32.18/arch/x86/mm/pgtable.c linux-2.6.32.18/arch/x86/mm/pgtable.c
18804--- linux-2.6.32.16/arch/x86/mm/pgtable.c 2010-07-05 14:14:00.000000000 -0400 18836--- linux-2.6.32.18/arch/x86/mm/pgtable.c 2010-08-10 13:45:57.000000000 -0400
18805+++ linux-2.6.32.16/arch/x86/mm/pgtable.c 2010-07-09 14:50:35.000000000 -0400 18837+++ linux-2.6.32.18/arch/x86/mm/pgtable.c 2010-08-11 18:57:29.000000000 -0400
18806@@ -83,8 +83,59 @@ static inline void pgd_list_del(pgd_t *p 18838@@ -83,8 +83,59 @@ static inline void pgd_list_del(pgd_t *p
18807 list_del(&page->lru); 18839 list_del(&page->lru);
18808 } 18840 }
@@ -19056,9 +19088,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/pgtable.c linux-2.6.32.16/arch/x86/mm/pgt
19056 pgd_dtor(pgd); 19088 pgd_dtor(pgd);
19057 paravirt_pgd_free(mm, pgd); 19089 paravirt_pgd_free(mm, pgd);
19058 free_page((unsigned long)pgd); 19090 free_page((unsigned long)pgd);
19059diff -urNp linux-2.6.32.16/arch/x86/mm/setup_nx.c linux-2.6.32.16/arch/x86/mm/setup_nx.c 19091diff -urNp linux-2.6.32.18/arch/x86/mm/setup_nx.c linux-2.6.32.18/arch/x86/mm/setup_nx.c
19060--- linux-2.6.32.16/arch/x86/mm/setup_nx.c 2010-07-05 14:14:00.000000000 -0400 19092--- linux-2.6.32.18/arch/x86/mm/setup_nx.c 2010-08-10 13:45:57.000000000 -0400
19061+++ linux-2.6.32.16/arch/x86/mm/setup_nx.c 2010-07-09 14:50:35.000000000 -0400 19093+++ linux-2.6.32.18/arch/x86/mm/setup_nx.c 2010-08-11 18:57:29.000000000 -0400
19062@@ -4,11 +4,10 @@ 19094@@ -4,11 +4,10 @@
19063 19095
19064 #include <asm/pgtable.h> 19096 #include <asm/pgtable.h>
@@ -19124,9 +19156,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/setup_nx.c linux-2.6.32.16/arch/x86/mm/se
19124 __supported_pte_mask &= ~_PAGE_NX; 19156 __supported_pte_mask &= ~_PAGE_NX;
19125 } 19157 }
19126 #endif 19158 #endif
19127diff -urNp linux-2.6.32.16/arch/x86/mm/tlb.c linux-2.6.32.16/arch/x86/mm/tlb.c 19159diff -urNp linux-2.6.32.18/arch/x86/mm/tlb.c linux-2.6.32.18/arch/x86/mm/tlb.c
19128--- linux-2.6.32.16/arch/x86/mm/tlb.c 2010-07-05 14:14:00.000000000 -0400 19160--- linux-2.6.32.18/arch/x86/mm/tlb.c 2010-08-10 13:45:57.000000000 -0400
19129+++ linux-2.6.32.16/arch/x86/mm/tlb.c 2010-07-09 14:50:35.000000000 -0400 19161+++ linux-2.6.32.18/arch/x86/mm/tlb.c 2010-08-11 18:57:29.000000000 -0400
19130@@ -12,7 +12,7 @@ 19162@@ -12,7 +12,7 @@
19131 #include <asm/uv/uv.h> 19163 #include <asm/uv/uv.h>
19132 19164
@@ -19148,9 +19180,9 @@ diff -urNp linux-2.6.32.16/arch/x86/mm/tlb.c linux-2.6.32.16/arch/x86/mm/tlb.c
19148 } 19180 }
19149 EXPORT_SYMBOL_GPL(leave_mm); 19181 EXPORT_SYMBOL_GPL(leave_mm);
19150 19182
19151diff -urNp linux-2.6.32.16/arch/x86/oprofile/backtrace.c linux-2.6.32.16/arch/x86/oprofile/backtrace.c 19183diff -urNp linux-2.6.32.18/arch/x86/oprofile/backtrace.c linux-2.6.32.18/arch/x86/oprofile/backtrace.c
19152--- linux-2.6.32.16/arch/x86/oprofile/backtrace.c 2010-07-05 14:14:00.000000000 -0400 19184--- linux-2.6.32.18/arch/x86/oprofile/backtrace.c 2010-08-10 13:45:57.000000000 -0400
19153+++ linux-2.6.32.16/arch/x86/oprofile/backtrace.c 2010-07-09 14:50:35.000000000 -0400 19185+++ linux-2.6.32.18/arch/x86/oprofile/backtrace.c 2010-08-11 18:57:29.000000000 -0400
19154@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back 19186@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
19155 struct frame_head bufhead[2]; 19187 struct frame_head bufhead[2];
19156 19188
@@ -19169,9 +19201,9 @@ diff -urNp linux-2.6.32.16/arch/x86/oprofile/backtrace.c linux-2.6.32.16/arch/x8
19169 unsigned long stack = kernel_stack_pointer(regs); 19201 unsigned long stack = kernel_stack_pointer(regs);
19170 if (depth) 19202 if (depth)
19171 dump_trace(NULL, regs, (unsigned long *)stack, 0, 19203 dump_trace(NULL, regs, (unsigned long *)stack, 0,
19172diff -urNp linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c 19204diff -urNp linux-2.6.32.18/arch/x86/oprofile/op_model_p4.c linux-2.6.32.18/arch/x86/oprofile/op_model_p4.c
19173--- linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c 2010-07-05 14:14:00.000000000 -0400 19205--- linux-2.6.32.18/arch/x86/oprofile/op_model_p4.c 2010-08-10 13:45:57.000000000 -0400
19174+++ linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c 2010-07-09 14:50:35.000000000 -0400 19206+++ linux-2.6.32.18/arch/x86/oprofile/op_model_p4.c 2010-08-11 18:57:29.000000000 -0400
19175@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo 19207@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
19176 #endif 19208 #endif
19177 } 19209 }
@@ -19181,9 +19213,9 @@ diff -urNp linux-2.6.32.16/arch/x86/oprofile/op_model_p4.c linux-2.6.32.16/arch/
19181 { 19213 {
19182 #ifdef CONFIG_SMP 19214 #ifdef CONFIG_SMP
19183 return smp_num_siblings == 2 ? 2 : 1; 19215 return smp_num_siblings == 2 ? 2 : 1;
19184diff -urNp linux-2.6.32.16/arch/x86/pci/common.c linux-2.6.32.16/arch/x86/pci/common.c 19216diff -urNp linux-2.6.32.18/arch/x86/pci/common.c linux-2.6.32.18/arch/x86/pci/common.c
19185--- linux-2.6.32.16/arch/x86/pci/common.c 2010-07-05 14:14:00.000000000 -0400 19217--- linux-2.6.32.18/arch/x86/pci/common.c 2010-08-10 13:45:57.000000000 -0400
19186+++ linux-2.6.32.16/arch/x86/pci/common.c 2010-07-09 14:50:35.000000000 -0400 19218+++ linux-2.6.32.18/arch/x86/pci/common.c 2010-08-11 18:57:29.000000000 -0400
19187@@ -31,8 +31,8 @@ int noioapicreroute = 1; 19219@@ -31,8 +31,8 @@ int noioapicreroute = 1;
19188 int pcibios_last_bus = -1; 19220 int pcibios_last_bus = -1;
19189 unsigned long pirq_table_addr; 19221 unsigned long pirq_table_addr;
@@ -19204,9 +19236,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/common.c linux-2.6.32.16/arch/x86/pci/co
19204 }; 19236 };
19205 19237
19206 void __init dmi_check_pciprobe(void) 19238 void __init dmi_check_pciprobe(void)
19207diff -urNp linux-2.6.32.16/arch/x86/pci/direct.c linux-2.6.32.16/arch/x86/pci/direct.c 19239diff -urNp linux-2.6.32.18/arch/x86/pci/direct.c linux-2.6.32.18/arch/x86/pci/direct.c
19208--- linux-2.6.32.16/arch/x86/pci/direct.c 2010-07-05 14:14:00.000000000 -0400 19240--- linux-2.6.32.18/arch/x86/pci/direct.c 2010-08-10 13:45:57.000000000 -0400
19209+++ linux-2.6.32.16/arch/x86/pci/direct.c 2010-07-09 14:50:35.000000000 -0400 19241+++ linux-2.6.32.18/arch/x86/pci/direct.c 2010-08-11 18:57:29.000000000 -0400
19210@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 19242@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
19211 19243
19212 #undef PCI_CONF1_ADDRESS 19244 #undef PCI_CONF1_ADDRESS
@@ -19234,9 +19266,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/direct.c linux-2.6.32.16/arch/x86/pci/di
19234 { 19266 {
19235 u32 x = 0; 19267 u32 x = 0;
19236 int year, devfn; 19268 int year, devfn;
19237diff -urNp linux-2.6.32.16/arch/x86/pci/fixup.c linux-2.6.32.16/arch/x86/pci/fixup.c 19269diff -urNp linux-2.6.32.18/arch/x86/pci/fixup.c linux-2.6.32.18/arch/x86/pci/fixup.c
19238--- linux-2.6.32.16/arch/x86/pci/fixup.c 2010-07-05 14:14:00.000000000 -0400 19270--- linux-2.6.32.18/arch/x86/pci/fixup.c 2010-08-10 13:45:57.000000000 -0400
19239+++ linux-2.6.32.16/arch/x86/pci/fixup.c 2010-07-09 14:50:35.000000000 -0400 19271+++ linux-2.6.32.18/arch/x86/pci/fixup.c 2010-08-11 18:57:29.000000000 -0400
19240@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi 19272@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
19241 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), 19273 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
19242 }, 19274 },
@@ -19255,9 +19287,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/fixup.c linux-2.6.32.16/arch/x86/pci/fix
19255 }; 19287 };
19256 19288
19257 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) 19289 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
19258diff -urNp linux-2.6.32.16/arch/x86/pci/irq.c linux-2.6.32.16/arch/x86/pci/irq.c 19290diff -urNp linux-2.6.32.18/arch/x86/pci/irq.c linux-2.6.32.18/arch/x86/pci/irq.c
19259--- linux-2.6.32.16/arch/x86/pci/irq.c 2010-07-05 14:14:00.000000000 -0400 19291--- linux-2.6.32.18/arch/x86/pci/irq.c 2010-08-10 13:45:57.000000000 -0400
19260+++ linux-2.6.32.16/arch/x86/pci/irq.c 2010-07-09 14:50:35.000000000 -0400 19292+++ linux-2.6.32.18/arch/x86/pci/irq.c 2010-08-11 18:57:29.000000000 -0400
19261@@ -543,7 +543,7 @@ static __init int intel_router_probe(str 19293@@ -543,7 +543,7 @@ static __init int intel_router_probe(str
19262 static struct pci_device_id __initdata pirq_440gx[] = { 19294 static struct pci_device_id __initdata pirq_440gx[] = {
19263 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, 19295 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
@@ -19276,9 +19308,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/irq.c linux-2.6.32.16/arch/x86/pci/irq.c
19276 }; 19308 };
19277 19309
19278 int __init pcibios_irq_init(void) 19310 int __init pcibios_irq_init(void)
19279diff -urNp linux-2.6.32.16/arch/x86/pci/mmconfig_32.c linux-2.6.32.16/arch/x86/pci/mmconfig_32.c 19311diff -urNp linux-2.6.32.18/arch/x86/pci/mmconfig_32.c linux-2.6.32.18/arch/x86/pci/mmconfig_32.c
19280--- linux-2.6.32.16/arch/x86/pci/mmconfig_32.c 2010-07-05 14:14:00.000000000 -0400 19312--- linux-2.6.32.18/arch/x86/pci/mmconfig_32.c 2010-08-10 13:45:57.000000000 -0400
19281+++ linux-2.6.32.16/arch/x86/pci/mmconfig_32.c 2010-07-09 14:50:35.000000000 -0400 19313+++ linux-2.6.32.18/arch/x86/pci/mmconfig_32.c 2010-08-11 18:57:29.000000000 -0400
19282@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int 19314@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
19283 return 0; 19315 return 0;
19284 } 19316 }
@@ -19288,9 +19320,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/mmconfig_32.c linux-2.6.32.16/arch/x86/p
19288 .read = pci_mmcfg_read, 19320 .read = pci_mmcfg_read,
19289 .write = pci_mmcfg_write, 19321 .write = pci_mmcfg_write,
19290 }; 19322 };
19291diff -urNp linux-2.6.32.16/arch/x86/pci/mmconfig_64.c linux-2.6.32.16/arch/x86/pci/mmconfig_64.c 19323diff -urNp linux-2.6.32.18/arch/x86/pci/mmconfig_64.c linux-2.6.32.18/arch/x86/pci/mmconfig_64.c
19292--- linux-2.6.32.16/arch/x86/pci/mmconfig_64.c 2010-07-05 14:14:00.000000000 -0400 19324--- linux-2.6.32.18/arch/x86/pci/mmconfig_64.c 2010-08-10 13:45:57.000000000 -0400
19293+++ linux-2.6.32.16/arch/x86/pci/mmconfig_64.c 2010-07-09 14:50:35.000000000 -0400 19325+++ linux-2.6.32.18/arch/x86/pci/mmconfig_64.c 2010-08-11 18:57:29.000000000 -0400
19294@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int 19326@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
19295 return 0; 19327 return 0;
19296 } 19328 }
@@ -19300,9 +19332,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/mmconfig_64.c linux-2.6.32.16/arch/x86/p
19300 .read = pci_mmcfg_read, 19332 .read = pci_mmcfg_read,
19301 .write = pci_mmcfg_write, 19333 .write = pci_mmcfg_write,
19302 }; 19334 };
19303diff -urNp linux-2.6.32.16/arch/x86/pci/numaq_32.c linux-2.6.32.16/arch/x86/pci/numaq_32.c 19335diff -urNp linux-2.6.32.18/arch/x86/pci/numaq_32.c linux-2.6.32.18/arch/x86/pci/numaq_32.c
19304--- linux-2.6.32.16/arch/x86/pci/numaq_32.c 2010-07-05 14:14:00.000000000 -0400 19336--- linux-2.6.32.18/arch/x86/pci/numaq_32.c 2010-08-10 13:45:57.000000000 -0400
19305+++ linux-2.6.32.16/arch/x86/pci/numaq_32.c 2010-07-09 14:50:35.000000000 -0400 19337+++ linux-2.6.32.18/arch/x86/pci/numaq_32.c 2010-08-11 18:57:29.000000000 -0400
19306@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i 19338@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
19307 19339
19308 #undef PCI_CONF1_MQ_ADDRESS 19340 #undef PCI_CONF1_MQ_ADDRESS
@@ -19312,9 +19344,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/numaq_32.c linux-2.6.32.16/arch/x86/pci/
19312 .read = pci_conf1_mq_read, 19344 .read = pci_conf1_mq_read,
19313 .write = pci_conf1_mq_write 19345 .write = pci_conf1_mq_write
19314 }; 19346 };
19315diff -urNp linux-2.6.32.16/arch/x86/pci/olpc.c linux-2.6.32.16/arch/x86/pci/olpc.c 19347diff -urNp linux-2.6.32.18/arch/x86/pci/olpc.c linux-2.6.32.18/arch/x86/pci/olpc.c
19316--- linux-2.6.32.16/arch/x86/pci/olpc.c 2010-07-05 14:14:00.000000000 -0400 19348--- linux-2.6.32.18/arch/x86/pci/olpc.c 2010-08-10 13:45:57.000000000 -0400
19317+++ linux-2.6.32.16/arch/x86/pci/olpc.c 2010-07-09 14:50:35.000000000 -0400 19349+++ linux-2.6.32.18/arch/x86/pci/olpc.c 2010-08-11 18:57:29.000000000 -0400
19318@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s 19350@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
19319 return 0; 19351 return 0;
19320 } 19352 }
@@ -19324,9 +19356,9 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/olpc.c linux-2.6.32.16/arch/x86/pci/olpc
19324 .read = pci_olpc_read, 19356 .read = pci_olpc_read,
19325 .write = pci_olpc_write, 19357 .write = pci_olpc_write,
19326 }; 19358 };
19327diff -urNp linux-2.6.32.16/arch/x86/pci/pcbios.c linux-2.6.32.16/arch/x86/pci/pcbios.c 19359diff -urNp linux-2.6.32.18/arch/x86/pci/pcbios.c linux-2.6.32.18/arch/x86/pci/pcbios.c
19328--- linux-2.6.32.16/arch/x86/pci/pcbios.c 2010-07-05 14:14:00.000000000 -0400 19360--- linux-2.6.32.18/arch/x86/pci/pcbios.c 2010-08-10 13:45:57.000000000 -0400
19329+++ linux-2.6.32.16/arch/x86/pci/pcbios.c 2010-07-09 14:50:35.000000000 -0400 19361+++ linux-2.6.32.18/arch/x86/pci/pcbios.c 2010-08-11 18:57:29.000000000 -0400
19330@@ -56,50 +56,93 @@ union bios32 { 19362@@ -56,50 +56,93 @@ union bios32 {
19331 static struct { 19363 static struct {
19332 unsigned long address; 19364 unsigned long address;
@@ -19649,10 +19681,10 @@ diff -urNp linux-2.6.32.16/arch/x86/pci/pcbios.c linux-2.6.32.16/arch/x86/pci/pc
19649 return !(ret & 0xff00); 19681 return !(ret & 0xff00);
19650 } 19682 }
19651 EXPORT_SYMBOL(pcibios_set_irq_routing); 19683 EXPORT_SYMBOL(pcibios_set_irq_routing);
19652diff -urNp linux-2.6.32.16/arch/x86/power/cpu.c linux-2.6.32.16/arch/x86/power/cpu.c 19684diff -urNp linux-2.6.32.18/arch/x86/power/cpu.c linux-2.6.32.18/arch/x86/power/cpu.c
19653--- linux-2.6.32.16/arch/x86/power/cpu.c 2010-07-05 14:14:00.000000000 -0400 19685--- linux-2.6.32.18/arch/x86/power/cpu.c 2010-08-10 13:45:57.000000000 -0400
19654+++ linux-2.6.32.16/arch/x86/power/cpu.c 2010-07-09 14:50:35.000000000 -0400 19686+++ linux-2.6.32.18/arch/x86/power/cpu.c 2010-08-11 18:57:29.000000000 -0400
19655@@ -126,7 +126,7 @@ static void do_fpu_end(void) 19687@@ -128,7 +128,7 @@ static void do_fpu_end(void)
19656 static void fix_processor_context(void) 19688 static void fix_processor_context(void)
19657 { 19689 {
19658 int cpu = smp_processor_id(); 19690 int cpu = smp_processor_id();
@@ -19661,7 +19693,7 @@ diff -urNp linux-2.6.32.16/arch/x86/power/cpu.c linux-2.6.32.16/arch/x86/power/c
19661 19693
19662 set_tss_desc(cpu, t); /* 19694 set_tss_desc(cpu, t); /*
19663 * This just modifies memory; should not be 19695 * This just modifies memory; should not be
19664@@ -136,7 +136,9 @@ static void fix_processor_context(void) 19696@@ -138,7 +138,9 @@ static void fix_processor_context(void)
19665 */ 19697 */
19666 19698
19667 #ifdef CONFIG_X86_64 19699 #ifdef CONFIG_X86_64
@@ -19671,9 +19703,9 @@ diff -urNp linux-2.6.32.16/arch/x86/power/cpu.c linux-2.6.32.16/arch/x86/power/c
19671 19703
19672 syscall_init(); /* This sets MSR_*STAR and related */ 19704 syscall_init(); /* This sets MSR_*STAR and related */
19673 #endif 19705 #endif
19674diff -urNp linux-2.6.32.16/arch/x86/vdso/Makefile linux-2.6.32.16/arch/x86/vdso/Makefile 19706diff -urNp linux-2.6.32.18/arch/x86/vdso/Makefile linux-2.6.32.18/arch/x86/vdso/Makefile
19675--- linux-2.6.32.16/arch/x86/vdso/Makefile 2010-07-05 14:14:00.000000000 -0400 19707--- linux-2.6.32.18/arch/x86/vdso/Makefile 2010-08-10 13:45:57.000000000 -0400
19676+++ linux-2.6.32.16/arch/x86/vdso/Makefile 2010-07-09 14:50:35.000000000 -0400 19708+++ linux-2.6.32.18/arch/x86/vdso/Makefile 2010-08-11 18:57:29.000000000 -0400
19677@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ 19709@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
19678 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ 19710 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
19679 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) 19711 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -19683,9 +19715,9 @@ diff -urNp linux-2.6.32.16/arch/x86/vdso/Makefile linux-2.6.32.16/arch/x86/vdso/
19683 GCOV_PROFILE := n 19715 GCOV_PROFILE := n
19684 19716
19685 # 19717 #
19686diff -urNp linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c 19718diff -urNp linux-2.6.32.18/arch/x86/vdso/vclock_gettime.c linux-2.6.32.18/arch/x86/vdso/vclock_gettime.c
19687--- linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c 2010-07-05 14:14:00.000000000 -0400 19719--- linux-2.6.32.18/arch/x86/vdso/vclock_gettime.c 2010-08-10 13:45:57.000000000 -0400
19688+++ linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c 2010-07-09 14:50:35.000000000 -0400 19720+++ linux-2.6.32.18/arch/x86/vdso/vclock_gettime.c 2010-08-11 18:57:29.000000000 -0400
19689@@ -22,24 +22,48 @@ 19721@@ -22,24 +22,48 @@
19690 #include <asm/hpet.h> 19722 #include <asm/hpet.h>
19691 #include <asm/unistd.h> 19723 #include <asm/unistd.h>
@@ -19784,9 +19816,9 @@ diff -urNp linux-2.6.32.16/arch/x86/vdso/vclock_gettime.c linux-2.6.32.16/arch/x
19784 } 19816 }
19785 int gettimeofday(struct timeval *, struct timezone *) 19817 int gettimeofday(struct timeval *, struct timezone *)
19786 __attribute__((weak, alias("__vdso_gettimeofday"))); 19818 __attribute__((weak, alias("__vdso_gettimeofday")));
19787diff -urNp linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c 19819diff -urNp linux-2.6.32.18/arch/x86/vdso/vdso32-setup.c linux-2.6.32.18/arch/x86/vdso/vdso32-setup.c
19788--- linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c 2010-07-05 14:14:00.000000000 -0400 19820--- linux-2.6.32.18/arch/x86/vdso/vdso32-setup.c 2010-08-10 13:45:57.000000000 -0400
19789+++ linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c 2010-07-09 14:50:35.000000000 -0400 19821+++ linux-2.6.32.18/arch/x86/vdso/vdso32-setup.c 2010-08-11 18:57:29.000000000 -0400
19790@@ -25,6 +25,7 @@ 19822@@ -25,6 +25,7 @@
19791 #include <asm/tlbflush.h> 19823 #include <asm/tlbflush.h>
19792 #include <asm/vdso.h> 19824 #include <asm/vdso.h>
@@ -19887,9 +19919,9 @@ diff -urNp linux-2.6.32.16/arch/x86/vdso/vdso32-setup.c linux-2.6.32.16/arch/x86
19887 return &gate_vma; 19919 return &gate_vma;
19888 return NULL; 19920 return NULL;
19889 } 19921 }
19890diff -urNp linux-2.6.32.16/arch/x86/vdso/vdso.lds.S linux-2.6.32.16/arch/x86/vdso/vdso.lds.S 19922diff -urNp linux-2.6.32.18/arch/x86/vdso/vdso.lds.S linux-2.6.32.18/arch/x86/vdso/vdso.lds.S
19891--- linux-2.6.32.16/arch/x86/vdso/vdso.lds.S 2010-07-05 14:14:00.000000000 -0400 19923--- linux-2.6.32.18/arch/x86/vdso/vdso.lds.S 2010-08-10 13:45:57.000000000 -0400
19892+++ linux-2.6.32.16/arch/x86/vdso/vdso.lds.S 2010-07-09 14:50:35.000000000 -0400 19924+++ linux-2.6.32.18/arch/x86/vdso/vdso.lds.S 2010-08-11 18:57:29.000000000 -0400
19893@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; 19925@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
19894 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; 19926 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
19895 #include "vextern.h" 19927 #include "vextern.h"
@@ -19900,9 +19932,9 @@ diff -urNp linux-2.6.32.16/arch/x86/vdso/vdso.lds.S linux-2.6.32.16/arch/x86/vds
19900+VEXTERN(fallback_time) 19932+VEXTERN(fallback_time)
19901+VEXTERN(getcpu) 19933+VEXTERN(getcpu)
19902+#undef VEXTERN 19934+#undef VEXTERN
19903diff -urNp linux-2.6.32.16/arch/x86/vdso/vextern.h linux-2.6.32.16/arch/x86/vdso/vextern.h 19935diff -urNp linux-2.6.32.18/arch/x86/vdso/vextern.h linux-2.6.32.18/arch/x86/vdso/vextern.h
19904--- linux-2.6.32.16/arch/x86/vdso/vextern.h 2010-07-05 14:14:00.000000000 -0400 19936--- linux-2.6.32.18/arch/x86/vdso/vextern.h 2010-08-10 13:45:57.000000000 -0400
19905+++ linux-2.6.32.16/arch/x86/vdso/vextern.h 2010-07-09 14:50:35.000000000 -0400 19937+++ linux-2.6.32.18/arch/x86/vdso/vextern.h 2010-08-11 18:57:29.000000000 -0400
19906@@ -11,6 +11,5 @@ 19938@@ -11,6 +11,5 @@
19907 put into vextern.h and be referenced as a pointer with vdso prefix. 19939 put into vextern.h and be referenced as a pointer with vdso prefix.
19908 The main kernel later fills in the values. */ 19940 The main kernel later fills in the values. */
@@ -19910,9 +19942,9 @@ diff -urNp linux-2.6.32.16/arch/x86/vdso/vextern.h linux-2.6.32.16/arch/x86/vdso
19910-VEXTERN(jiffies) 19942-VEXTERN(jiffies)
19911 VEXTERN(vgetcpu_mode) 19943 VEXTERN(vgetcpu_mode)
19912 VEXTERN(vsyscall_gtod_data) 19944 VEXTERN(vsyscall_gtod_data)
19913diff -urNp linux-2.6.32.16/arch/x86/vdso/vma.c linux-2.6.32.16/arch/x86/vdso/vma.c 19945diff -urNp linux-2.6.32.18/arch/x86/vdso/vma.c linux-2.6.32.18/arch/x86/vdso/vma.c
19914--- linux-2.6.32.16/arch/x86/vdso/vma.c 2010-07-05 14:14:00.000000000 -0400 19946--- linux-2.6.32.18/arch/x86/vdso/vma.c 2010-08-10 13:45:57.000000000 -0400
19915+++ linux-2.6.32.16/arch/x86/vdso/vma.c 2010-07-09 14:50:35.000000000 -0400 19947+++ linux-2.6.32.18/arch/x86/vdso/vma.c 2010-08-11 18:57:29.000000000 -0400
19916@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) 19948@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
19917 if (!vbase) 19949 if (!vbase)
19918 goto oom; 19950 goto oom;
@@ -19959,9 +19991,9 @@ diff -urNp linux-2.6.32.16/arch/x86/vdso/vma.c linux-2.6.32.16/arch/x86/vdso/vma
19959- return 0; 19991- return 0;
19960-} 19992-}
19961-__setup("vdso=", vdso_setup); 19993-__setup("vdso=", vdso_setup);
19962diff -urNp linux-2.6.32.16/arch/x86/xen/enlighten.c linux-2.6.32.16/arch/x86/xen/enlighten.c 19994diff -urNp linux-2.6.32.18/arch/x86/xen/enlighten.c linux-2.6.32.18/arch/x86/xen/enlighten.c
19963--- linux-2.6.32.16/arch/x86/xen/enlighten.c 2010-07-05 14:14:00.000000000 -0400 19995--- linux-2.6.32.18/arch/x86/xen/enlighten.c 2010-08-10 13:45:57.000000000 -0400
19964+++ linux-2.6.32.16/arch/x86/xen/enlighten.c 2010-07-09 14:50:35.000000000 -0400 19996+++ linux-2.6.32.18/arch/x86/xen/enlighten.c 2010-08-11 18:57:29.000000000 -0400
19965@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); 19997@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
19966 19998
19967 struct shared_info xen_dummy_shared_info; 19999 struct shared_info xen_dummy_shared_info;
@@ -20017,9 +20049,9 @@ diff -urNp linux-2.6.32.16/arch/x86/xen/enlighten.c linux-2.6.32.16/arch/x86/xen
20017 xen_smp_init(); 20049 xen_smp_init();
20018 20050
20019 pgd = (pgd_t *)xen_start_info->pt_base; 20051 pgd = (pgd_t *)xen_start_info->pt_base;
20020diff -urNp linux-2.6.32.16/arch/x86/xen/mmu.c linux-2.6.32.16/arch/x86/xen/mmu.c 20052diff -urNp linux-2.6.32.18/arch/x86/xen/mmu.c linux-2.6.32.18/arch/x86/xen/mmu.c
20021--- linux-2.6.32.16/arch/x86/xen/mmu.c 2010-07-05 14:14:00.000000000 -0400 20053--- linux-2.6.32.18/arch/x86/xen/mmu.c 2010-08-10 13:45:57.000000000 -0400
20022+++ linux-2.6.32.16/arch/x86/xen/mmu.c 2010-07-09 14:50:35.000000000 -0400 20054+++ linux-2.6.32.18/arch/x86/xen/mmu.c 2010-08-11 18:57:29.000000000 -0400
20023@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable 20055@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
20024 convert_pfn_mfn(init_level4_pgt); 20056 convert_pfn_mfn(init_level4_pgt);
20025 convert_pfn_mfn(level3_ident_pgt); 20057 convert_pfn_mfn(level3_ident_pgt);
@@ -20040,9 +20072,9 @@ diff -urNp linux-2.6.32.16/arch/x86/xen/mmu.c linux-2.6.32.16/arch/x86/xen/mmu.c
20040 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); 20072 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
20041 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); 20073 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
20042 20074
20043diff -urNp linux-2.6.32.16/arch/x86/xen/smp.c linux-2.6.32.16/arch/x86/xen/smp.c 20075diff -urNp linux-2.6.32.18/arch/x86/xen/smp.c linux-2.6.32.18/arch/x86/xen/smp.c
20044--- linux-2.6.32.16/arch/x86/xen/smp.c 2010-07-05 14:14:00.000000000 -0400 20076--- linux-2.6.32.18/arch/x86/xen/smp.c 2010-08-10 13:45:57.000000000 -0400
20045+++ linux-2.6.32.16/arch/x86/xen/smp.c 2010-07-09 14:50:35.000000000 -0400 20077+++ linux-2.6.32.18/arch/x86/xen/smp.c 2010-08-11 18:57:29.000000000 -0400
20046@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ 20078@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
20047 { 20079 {
20048 BUG_ON(smp_processor_id() != 0); 20080 BUG_ON(smp_processor_id() != 0);
@@ -20066,9 +20098,9 @@ diff -urNp linux-2.6.32.16/arch/x86/xen/smp.c linux-2.6.32.16/arch/x86/xen/smp.c
20066 ctxt->user_regs.ss = __KERNEL_DS; 20098 ctxt->user_regs.ss = __KERNEL_DS;
20067 #ifdef CONFIG_X86_32 20099 #ifdef CONFIG_X86_32
20068 ctxt->user_regs.fs = __KERNEL_PERCPU; 20100 ctxt->user_regs.fs = __KERNEL_PERCPU;
20069diff -urNp linux-2.6.32.16/arch/x86/xen/xen-head.S linux-2.6.32.16/arch/x86/xen/xen-head.S 20101diff -urNp linux-2.6.32.18/arch/x86/xen/xen-head.S linux-2.6.32.18/arch/x86/xen/xen-head.S
20070--- linux-2.6.32.16/arch/x86/xen/xen-head.S 2010-07-05 14:14:00.000000000 -0400 20102--- linux-2.6.32.18/arch/x86/xen/xen-head.S 2010-08-10 13:45:57.000000000 -0400
20071+++ linux-2.6.32.16/arch/x86/xen/xen-head.S 2010-07-09 14:50:35.000000000 -0400 20103+++ linux-2.6.32.18/arch/x86/xen/xen-head.S 2010-08-11 18:57:29.000000000 -0400
20072@@ -19,6 +19,17 @@ ENTRY(startup_xen) 20104@@ -19,6 +19,17 @@ ENTRY(startup_xen)
20073 #ifdef CONFIG_X86_32 20105 #ifdef CONFIG_X86_32
20074 mov %esi,xen_start_info 20106 mov %esi,xen_start_info
@@ -20087,9 +20119,9 @@ diff -urNp linux-2.6.32.16/arch/x86/xen/xen-head.S linux-2.6.32.16/arch/x86/xen/
20087 #else 20119 #else
20088 mov %rsi,xen_start_info 20120 mov %rsi,xen_start_info
20089 mov $init_thread_union+THREAD_SIZE,%rsp 20121 mov $init_thread_union+THREAD_SIZE,%rsp
20090diff -urNp linux-2.6.32.16/arch/x86/xen/xen-ops.h linux-2.6.32.16/arch/x86/xen/xen-ops.h 20122diff -urNp linux-2.6.32.18/arch/x86/xen/xen-ops.h linux-2.6.32.18/arch/x86/xen/xen-ops.h
20091--- linux-2.6.32.16/arch/x86/xen/xen-ops.h 2010-07-05 14:14:00.000000000 -0400 20123--- linux-2.6.32.18/arch/x86/xen/xen-ops.h 2010-08-10 13:45:57.000000000 -0400
20092+++ linux-2.6.32.16/arch/x86/xen/xen-ops.h 2010-07-09 14:50:35.000000000 -0400 20124+++ linux-2.6.32.18/arch/x86/xen/xen-ops.h 2010-08-11 18:57:29.000000000 -0400
20093@@ -10,8 +10,6 @@ 20125@@ -10,8 +10,6 @@
20094 extern const char xen_hypervisor_callback[]; 20126 extern const char xen_hypervisor_callback[];
20095 extern const char xen_failsafe_callback[]; 20127 extern const char xen_failsafe_callback[];
@@ -20099,9 +20131,9 @@ diff -urNp linux-2.6.32.16/arch/x86/xen/xen-ops.h linux-2.6.32.16/arch/x86/xen/x
20099 struct trap_info; 20131 struct trap_info;
20100 void xen_copy_trap_info(struct trap_info *traps); 20132 void xen_copy_trap_info(struct trap_info *traps);
20101 20133
20102diff -urNp linux-2.6.32.16/block/blk-integrity.c linux-2.6.32.16/block/blk-integrity.c 20134diff -urNp linux-2.6.32.18/block/blk-integrity.c linux-2.6.32.18/block/blk-integrity.c
20103--- linux-2.6.32.16/block/blk-integrity.c 2010-07-05 14:14:00.000000000 -0400 20135--- linux-2.6.32.18/block/blk-integrity.c 2010-08-10 13:45:57.000000000 -0400
20104+++ linux-2.6.32.16/block/blk-integrity.c 2010-07-09 14:50:35.000000000 -0400 20136+++ linux-2.6.32.18/block/blk-integrity.c 2010-08-11 18:57:29.000000000 -0400
20105@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs 20137@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
20106 NULL, 20138 NULL,
20107 }; 20139 };
@@ -20111,9 +20143,9 @@ diff -urNp linux-2.6.32.16/block/blk-integrity.c linux-2.6.32.16/block/blk-integ
20111 .show = &integrity_attr_show, 20143 .show = &integrity_attr_show,
20112 .store = &integrity_attr_store, 20144 .store = &integrity_attr_store,
20113 }; 20145 };
20114diff -urNp linux-2.6.32.16/block/blk-iopoll.c linux-2.6.32.16/block/blk-iopoll.c 20146diff -urNp linux-2.6.32.18/block/blk-iopoll.c linux-2.6.32.18/block/blk-iopoll.c
20115--- linux-2.6.32.16/block/blk-iopoll.c 2010-07-05 14:14:00.000000000 -0400 20147--- linux-2.6.32.18/block/blk-iopoll.c 2010-08-10 13:45:57.000000000 -0400
20116+++ linux-2.6.32.16/block/blk-iopoll.c 2010-07-09 14:50:35.000000000 -0400 20148+++ linux-2.6.32.18/block/blk-iopoll.c 2010-08-11 18:57:29.000000000 -0400
20117@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo 20149@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
20118 } 20150 }
20119 EXPORT_SYMBOL(blk_iopoll_complete); 20151 EXPORT_SYMBOL(blk_iopoll_complete);
@@ -20123,9 +20155,9 @@ diff -urNp linux-2.6.32.16/block/blk-iopoll.c linux-2.6.32.16/block/blk-iopoll.c
20123 { 20155 {
20124 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); 20156 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
20125 int rearm = 0, budget = blk_iopoll_budget; 20157 int rearm = 0, budget = blk_iopoll_budget;
20126diff -urNp linux-2.6.32.16/block/blk-map.c linux-2.6.32.16/block/blk-map.c 20158diff -urNp linux-2.6.32.18/block/blk-map.c linux-2.6.32.18/block/blk-map.c
20127--- linux-2.6.32.16/block/blk-map.c 2010-07-05 14:14:00.000000000 -0400 20159--- linux-2.6.32.18/block/blk-map.c 2010-08-10 13:45:57.000000000 -0400
20128+++ linux-2.6.32.16/block/blk-map.c 2010-07-09 14:50:35.000000000 -0400 20160+++ linux-2.6.32.18/block/blk-map.c 2010-08-11 18:57:29.000000000 -0400
20129@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ 20161@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
20130 * direct dma. else, set up kernel bounce buffers 20162 * direct dma. else, set up kernel bounce buffers
20131 */ 20163 */
@@ -20144,9 +20176,9 @@ diff -urNp linux-2.6.32.16/block/blk-map.c linux-2.6.32.16/block/blk-map.c
20144 if (do_copy) 20176 if (do_copy)
20145 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); 20177 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
20146 else 20178 else
20147diff -urNp linux-2.6.32.16/block/blk-softirq.c linux-2.6.32.16/block/blk-softirq.c 20179diff -urNp linux-2.6.32.18/block/blk-softirq.c linux-2.6.32.18/block/blk-softirq.c
20148--- linux-2.6.32.16/block/blk-softirq.c 2010-07-05 14:14:00.000000000 -0400 20180--- linux-2.6.32.18/block/blk-softirq.c 2010-08-10 13:45:57.000000000 -0400
20149+++ linux-2.6.32.16/block/blk-softirq.c 2010-07-09 14:50:35.000000000 -0400 20181+++ linux-2.6.32.18/block/blk-softirq.c 2010-08-11 18:57:29.000000000 -0400
20150@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 20182@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
20151 * Softirq action handler - move entries to local list and loop over them 20183 * Softirq action handler - move entries to local list and loop over them
20152 * while passing them to the queue registered handler. 20184 * while passing them to the queue registered handler.
@@ -20156,9 +20188,9 @@ diff -urNp linux-2.6.32.16/block/blk-softirq.c linux-2.6.32.16/block/blk-softirq
20156 { 20188 {
20157 struct list_head *cpu_list, local_list; 20189 struct list_head *cpu_list, local_list;
20158 20190
20159diff -urNp linux-2.6.32.16/block/blk-sysfs.c linux-2.6.32.16/block/blk-sysfs.c 20191diff -urNp linux-2.6.32.18/block/blk-sysfs.c linux-2.6.32.18/block/blk-sysfs.c
20160--- linux-2.6.32.16/block/blk-sysfs.c 2010-07-05 14:14:00.000000000 -0400 20192--- linux-2.6.32.18/block/blk-sysfs.c 2010-08-10 13:45:57.000000000 -0400
20161+++ linux-2.6.32.16/block/blk-sysfs.c 2010-07-09 14:50:35.000000000 -0400 20193+++ linux-2.6.32.18/block/blk-sysfs.c 2010-08-11 18:57:29.000000000 -0400
20162@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob 20194@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
20163 kmem_cache_free(blk_requestq_cachep, q); 20195 kmem_cache_free(blk_requestq_cachep, q);
20164 } 20196 }
@@ -20168,9 +20200,9 @@ diff -urNp linux-2.6.32.16/block/blk-sysfs.c linux-2.6.32.16/block/blk-sysfs.c
20168 .show = queue_attr_show, 20200 .show = queue_attr_show,
20169 .store = queue_attr_store, 20201 .store = queue_attr_store,
20170 }; 20202 };
20171diff -urNp linux-2.6.32.16/block/elevator.c linux-2.6.32.16/block/elevator.c 20203diff -urNp linux-2.6.32.18/block/elevator.c linux-2.6.32.18/block/elevator.c
20172--- linux-2.6.32.16/block/elevator.c 2010-07-05 14:14:00.000000000 -0400 20204--- linux-2.6.32.18/block/elevator.c 2010-08-10 13:45:57.000000000 -0400
20173+++ linux-2.6.32.16/block/elevator.c 2010-07-09 14:50:35.000000000 -0400 20205+++ linux-2.6.32.18/block/elevator.c 2010-08-11 18:57:29.000000000 -0400
20174@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str 20206@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
20175 return error; 20207 return error;
20176 } 20208 }
@@ -20180,9 +20212,9 @@ diff -urNp linux-2.6.32.16/block/elevator.c linux-2.6.32.16/block/elevator.c
20180 .show = elv_attr_show, 20212 .show = elv_attr_show,
20181 .store = elv_attr_store, 20213 .store = elv_attr_store,
20182 }; 20214 };
20183diff -urNp linux-2.6.32.16/crypto/lrw.c linux-2.6.32.16/crypto/lrw.c 20215diff -urNp linux-2.6.32.18/crypto/lrw.c linux-2.6.32.18/crypto/lrw.c
20184--- linux-2.6.32.16/crypto/lrw.c 2010-07-05 14:14:00.000000000 -0400 20216--- linux-2.6.32.18/crypto/lrw.c 2010-08-10 13:45:57.000000000 -0400
20185+++ linux-2.6.32.16/crypto/lrw.c 2010-07-09 14:50:35.000000000 -0400 20217+++ linux-2.6.32.18/crypto/lrw.c 2010-08-11 18:57:29.000000000 -0400
20186@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par 20218@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
20187 struct priv *ctx = crypto_tfm_ctx(parent); 20219 struct priv *ctx = crypto_tfm_ctx(parent);
20188 struct crypto_cipher *child = ctx->child; 20220 struct crypto_cipher *child = ctx->child;
@@ -20192,9 +20224,9 @@ diff -urNp linux-2.6.32.16/crypto/lrw.c linux-2.6.32.16/crypto/lrw.c
20192 int bsize = crypto_cipher_blocksize(child); 20224 int bsize = crypto_cipher_blocksize(child);
20193 20225
20194 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); 20226 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
20195diff -urNp linux-2.6.32.16/Documentation/dontdiff linux-2.6.32.16/Documentation/dontdiff 20227diff -urNp linux-2.6.32.18/Documentation/dontdiff linux-2.6.32.18/Documentation/dontdiff
20196--- linux-2.6.32.16/Documentation/dontdiff 2010-07-05 14:14:00.000000000 -0400 20228--- linux-2.6.32.18/Documentation/dontdiff 2010-08-10 13:45:57.000000000 -0400
20197+++ linux-2.6.32.16/Documentation/dontdiff 2010-07-16 21:06:43.000000000 -0400 20229+++ linux-2.6.32.18/Documentation/dontdiff 2010-08-11 18:57:29.000000000 -0400
20198@@ -3,6 +3,7 @@ 20230@@ -3,6 +3,7 @@
20199 *.bin 20231 *.bin
20200 *.cpio 20232 *.cpio
@@ -20312,9 +20344,9 @@ diff -urNp linux-2.6.32.16/Documentation/dontdiff linux-2.6.32.16/Documentation/
20312 zImage* 20344 zImage*
20313 zconf.hash.c 20345 zconf.hash.c
20314+zoffset.h 20346+zoffset.h
20315diff -urNp linux-2.6.32.16/Documentation/kernel-parameters.txt linux-2.6.32.16/Documentation/kernel-parameters.txt 20347diff -urNp linux-2.6.32.18/Documentation/kernel-parameters.txt linux-2.6.32.18/Documentation/kernel-parameters.txt
20316--- linux-2.6.32.16/Documentation/kernel-parameters.txt 2010-07-05 14:14:00.000000000 -0400 20348--- linux-2.6.32.18/Documentation/kernel-parameters.txt 2010-08-10 13:45:57.000000000 -0400
20317+++ linux-2.6.32.16/Documentation/kernel-parameters.txt 2010-07-09 14:50:35.000000000 -0400 20349+++ linux-2.6.32.18/Documentation/kernel-parameters.txt 2010-08-11 18:57:29.000000000 -0400
20318@@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters. 20350@@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters.
20319 the specified number of seconds. This is to be used if 20351 the specified number of seconds. This is to be used if
20320 your oopses keep scrolling off the screen. 20352 your oopses keep scrolling off the screen.
@@ -20328,9 +20360,9 @@ diff -urNp linux-2.6.32.16/Documentation/kernel-parameters.txt linux-2.6.32.16/D
20328 pcbit= [HW,ISDN] 20360 pcbit= [HW,ISDN]
20329 20361
20330 pcd. [PARIDE] 20362 pcd. [PARIDE]
20331diff -urNp linux-2.6.32.16/drivers/acpi/acpi_pad.c linux-2.6.32.16/drivers/acpi/acpi_pad.c 20363diff -urNp linux-2.6.32.18/drivers/acpi/acpi_pad.c linux-2.6.32.18/drivers/acpi/acpi_pad.c
20332--- linux-2.6.32.16/drivers/acpi/acpi_pad.c 2010-07-05 14:14:00.000000000 -0400 20364--- linux-2.6.32.18/drivers/acpi/acpi_pad.c 2010-08-10 13:45:57.000000000 -0400
20333+++ linux-2.6.32.16/drivers/acpi/acpi_pad.c 2010-07-09 14:50:35.000000000 -0400 20365+++ linux-2.6.32.18/drivers/acpi/acpi_pad.c 2010-08-11 18:57:29.000000000 -0400
20334@@ -30,7 +30,7 @@ 20366@@ -30,7 +30,7 @@
20335 #include <acpi/acpi_bus.h> 20367 #include <acpi/acpi_bus.h>
20336 #include <acpi/acpi_drivers.h> 20368 #include <acpi/acpi_drivers.h>
@@ -20340,9 +20372,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/acpi_pad.c linux-2.6.32.16/drivers/acpi/
20340 #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" 20372 #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
20341 #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 20373 #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
20342 static DEFINE_MUTEX(isolated_cpus_lock); 20374 static DEFINE_MUTEX(isolated_cpus_lock);
20343diff -urNp linux-2.6.32.16/drivers/acpi/battery.c linux-2.6.32.16/drivers/acpi/battery.c 20375diff -urNp linux-2.6.32.18/drivers/acpi/battery.c linux-2.6.32.18/drivers/acpi/battery.c
20344--- linux-2.6.32.16/drivers/acpi/battery.c 2010-07-05 14:14:00.000000000 -0400 20376--- linux-2.6.32.18/drivers/acpi/battery.c 2010-08-10 13:45:57.000000000 -0400
20345+++ linux-2.6.32.16/drivers/acpi/battery.c 2010-07-09 14:50:35.000000000 -0400 20377+++ linux-2.6.32.18/drivers/acpi/battery.c 2010-08-11 18:57:29.000000000 -0400
20346@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); 20378@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
20347 } 20379 }
20348 20380
@@ -20352,9 +20384,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/battery.c linux-2.6.32.16/drivers/acpi/b
20352 mode_t mode; 20384 mode_t mode;
20353 const char *name; 20385 const char *name;
20354 } acpi_battery_file[] = { 20386 } acpi_battery_file[] = {
20355diff -urNp linux-2.6.32.16/drivers/acpi/blacklist.c linux-2.6.32.16/drivers/acpi/blacklist.c 20387diff -urNp linux-2.6.32.18/drivers/acpi/blacklist.c linux-2.6.32.18/drivers/acpi/blacklist.c
20356--- linux-2.6.32.16/drivers/acpi/blacklist.c 2010-07-05 14:14:00.000000000 -0400 20388--- linux-2.6.32.18/drivers/acpi/blacklist.c 2010-08-10 13:45:57.000000000 -0400
20357+++ linux-2.6.32.16/drivers/acpi/blacklist.c 2010-07-09 14:50:35.000000000 -0400 20389+++ linux-2.6.32.18/drivers/acpi/blacklist.c 2010-08-11 18:57:29.000000000 -0400
20358@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b 20390@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
20359 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, 20391 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
20360 "Incorrect _ADR", 1}, 20392 "Incorrect _ADR", 1},
@@ -20364,9 +20396,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/blacklist.c linux-2.6.32.16/drivers/acpi
20364 }; 20396 };
20365 20397
20366 #if CONFIG_ACPI_BLACKLIST_YEAR 20398 #if CONFIG_ACPI_BLACKLIST_YEAR
20367diff -urNp linux-2.6.32.16/drivers/acpi/dock.c linux-2.6.32.16/drivers/acpi/dock.c 20399diff -urNp linux-2.6.32.18/drivers/acpi/dock.c linux-2.6.32.18/drivers/acpi/dock.c
20368--- linux-2.6.32.16/drivers/acpi/dock.c 2010-07-05 14:14:00.000000000 -0400 20400--- linux-2.6.32.18/drivers/acpi/dock.c 2010-08-10 13:45:57.000000000 -0400
20369+++ linux-2.6.32.16/drivers/acpi/dock.c 2010-07-09 14:50:35.000000000 -0400 20401+++ linux-2.6.32.18/drivers/acpi/dock.c 2010-08-11 18:57:29.000000000 -0400
20370@@ -77,7 +77,7 @@ struct dock_dependent_device { 20402@@ -77,7 +77,7 @@ struct dock_dependent_device {
20371 struct list_head list; 20403 struct list_head list;
20372 struct list_head hotplug_list; 20404 struct list_head hotplug_list;
@@ -20385,9 +20417,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/dock.c linux-2.6.32.16/drivers/acpi/dock
20385 void *context) 20417 void *context)
20386 { 20418 {
20387 struct dock_dependent_device *dd; 20419 struct dock_dependent_device *dd;
20388diff -urNp linux-2.6.32.16/drivers/acpi/osl.c linux-2.6.32.16/drivers/acpi/osl.c 20420diff -urNp linux-2.6.32.18/drivers/acpi/osl.c linux-2.6.32.18/drivers/acpi/osl.c
20389--- linux-2.6.32.16/drivers/acpi/osl.c 2010-07-05 14:14:00.000000000 -0400 20421--- linux-2.6.32.18/drivers/acpi/osl.c 2010-08-10 13:45:57.000000000 -0400
20390+++ linux-2.6.32.16/drivers/acpi/osl.c 2010-07-09 14:50:35.000000000 -0400 20422+++ linux-2.6.32.18/drivers/acpi/osl.c 2010-08-11 18:57:29.000000000 -0400
20391@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres 20423@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
20392 void __iomem *virt_addr; 20424 void __iomem *virt_addr;
20393 20425
@@ -20406,9 +20438,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/osl.c linux-2.6.32.16/drivers/acpi/osl.c
20406 20438
20407 switch (width) { 20439 switch (width) {
20408 case 8: 20440 case 8:
20409diff -urNp linux-2.6.32.16/drivers/acpi/power_meter.c linux-2.6.32.16/drivers/acpi/power_meter.c 20441diff -urNp linux-2.6.32.18/drivers/acpi/power_meter.c linux-2.6.32.18/drivers/acpi/power_meter.c
20410--- linux-2.6.32.16/drivers/acpi/power_meter.c 2010-07-05 14:14:00.000000000 -0400 20442--- linux-2.6.32.18/drivers/acpi/power_meter.c 2010-08-10 13:45:57.000000000 -0400
20411+++ linux-2.6.32.16/drivers/acpi/power_meter.c 2010-07-09 14:50:35.000000000 -0400 20443+++ linux-2.6.32.18/drivers/acpi/power_meter.c 2010-08-11 18:57:29.000000000 -0400
20412@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d 20444@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
20413 return res; 20445 return res;
20414 20446
@@ -20418,9 +20450,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/power_meter.c linux-2.6.32.16/drivers/ac
20418 20450
20419 mutex_lock(&resource->lock); 20451 mutex_lock(&resource->lock);
20420 resource->trip[attr->index - 7] = temp; 20452 resource->trip[attr->index - 7] = temp;
20421diff -urNp linux-2.6.32.16/drivers/acpi/proc.c linux-2.6.32.16/drivers/acpi/proc.c 20453diff -urNp linux-2.6.32.18/drivers/acpi/proc.c linux-2.6.32.18/drivers/acpi/proc.c
20422--- linux-2.6.32.16/drivers/acpi/proc.c 2010-07-05 14:14:00.000000000 -0400 20454--- linux-2.6.32.18/drivers/acpi/proc.c 2010-08-10 13:45:57.000000000 -0400
20423+++ linux-2.6.32.16/drivers/acpi/proc.c 2010-07-09 14:50:35.000000000 -0400 20455+++ linux-2.6.32.18/drivers/acpi/proc.c 2010-08-11 18:57:29.000000000 -0400
20424@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f 20456@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
20425 size_t count, loff_t * ppos) 20457 size_t count, loff_t * ppos)
20426 { 20458 {
@@ -20456,9 +20488,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/proc.c linux-2.6.32.16/drivers/acpi/proc
20456 dev->wakeup.state.enabled = 20488 dev->wakeup.state.enabled =
20457 dev->wakeup.state.enabled ? 0 : 1; 20489 dev->wakeup.state.enabled ? 0 : 1;
20458 found_dev = dev; 20490 found_dev = dev;
20459diff -urNp linux-2.6.32.16/drivers/acpi/processor_core.c linux-2.6.32.16/drivers/acpi/processor_core.c 20491diff -urNp linux-2.6.32.18/drivers/acpi/processor_core.c linux-2.6.32.18/drivers/acpi/processor_core.c
20460--- linux-2.6.32.16/drivers/acpi/processor_core.c 2010-07-05 14:14:00.000000000 -0400 20492--- linux-2.6.32.18/drivers/acpi/processor_core.c 2010-08-10 13:45:57.000000000 -0400
20461+++ linux-2.6.32.16/drivers/acpi/processor_core.c 2010-07-09 14:50:35.000000000 -0400 20493+++ linux-2.6.32.18/drivers/acpi/processor_core.c 2010-08-11 18:57:29.000000000 -0400
20462@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( 20494@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add(
20463 return 0; 20495 return 0;
20464 } 20496 }
@@ -20468,9 +20500,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/processor_core.c linux-2.6.32.16/drivers
20468 20500
20469 /* 20501 /*
20470 * Buggy BIOS check 20502 * Buggy BIOS check
20471diff -urNp linux-2.6.32.16/drivers/acpi/processor_idle.c linux-2.6.32.16/drivers/acpi/processor_idle.c 20503diff -urNp linux-2.6.32.18/drivers/acpi/processor_idle.c linux-2.6.32.18/drivers/acpi/processor_idle.c
20472--- linux-2.6.32.16/drivers/acpi/processor_idle.c 2010-07-05 14:14:00.000000000 -0400 20504--- linux-2.6.32.18/drivers/acpi/processor_idle.c 2010-08-10 13:45:57.000000000 -0400
20473+++ linux-2.6.32.16/drivers/acpi/processor_idle.c 2010-07-09 14:50:35.000000000 -0400 20505+++ linux-2.6.32.18/drivers/acpi/processor_idle.c 2010-08-11 18:57:29.000000000 -0400
20474@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat 20506@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
20475 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), 20507 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
20476 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, 20508 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
@@ -20480,9 +20512,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/processor_idle.c linux-2.6.32.16/drivers
20480 }; 20512 };
20481 20513
20482 20514
20483diff -urNp linux-2.6.32.16/drivers/acpi/sbshc.c linux-2.6.32.16/drivers/acpi/sbshc.c 20515diff -urNp linux-2.6.32.18/drivers/acpi/sbshc.c linux-2.6.32.18/drivers/acpi/sbshc.c
20484--- linux-2.6.32.16/drivers/acpi/sbshc.c 2010-07-05 14:14:00.000000000 -0400 20516--- linux-2.6.32.18/drivers/acpi/sbshc.c 2010-08-10 13:45:57.000000000 -0400
20485+++ linux-2.6.32.16/drivers/acpi/sbshc.c 2010-07-09 14:50:35.000000000 -0400 20517+++ linux-2.6.32.18/drivers/acpi/sbshc.c 2010-08-11 18:57:29.000000000 -0400
20486@@ -17,7 +17,7 @@ 20518@@ -17,7 +17,7 @@
20487 20519
20488 #define PREFIX "ACPI: " 20520 #define PREFIX "ACPI: "
@@ -20492,10 +20524,10 @@ diff -urNp linux-2.6.32.16/drivers/acpi/sbshc.c linux-2.6.32.16/drivers/acpi/sbs
20492 #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC" 20524 #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC"
20493 20525
20494 struct acpi_smb_hc { 20526 struct acpi_smb_hc {
20495diff -urNp linux-2.6.32.16/drivers/acpi/sleep.c linux-2.6.32.16/drivers/acpi/sleep.c 20527diff -urNp linux-2.6.32.18/drivers/acpi/sleep.c linux-2.6.32.18/drivers/acpi/sleep.c
20496--- linux-2.6.32.16/drivers/acpi/sleep.c 2010-07-05 14:14:00.000000000 -0400 20528--- linux-2.6.32.18/drivers/acpi/sleep.c 2010-08-10 13:45:57.000000000 -0400
20497+++ linux-2.6.32.16/drivers/acpi/sleep.c 2010-07-09 14:50:35.000000000 -0400 20529+++ linux-2.6.32.18/drivers/acpi/sleep.c 2010-08-11 18:57:29.000000000 -0400
20498@@ -302,7 +302,7 @@ static int acpi_suspend_state_valid(susp 20530@@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp
20499 } 20531 }
20500 } 20532 }
20501 20533
@@ -20504,7 +20536,7 @@ diff -urNp linux-2.6.32.16/drivers/acpi/sleep.c linux-2.6.32.16/drivers/acpi/sle
20504 .valid = acpi_suspend_state_valid, 20536 .valid = acpi_suspend_state_valid,
20505 .begin = acpi_suspend_begin, 20537 .begin = acpi_suspend_begin,
20506 .prepare_late = acpi_pm_prepare, 20538 .prepare_late = acpi_pm_prepare,
20507@@ -330,7 +330,7 @@ static int acpi_suspend_begin_old(suspen 20539@@ -311,7 +311,7 @@ static int acpi_suspend_begin_old(suspen
20508 * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has 20540 * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
20509 * been requested. 20541 * been requested.
20510 */ 20542 */
@@ -20513,7 +20545,7 @@ diff -urNp linux-2.6.32.16/drivers/acpi/sleep.c linux-2.6.32.16/drivers/acpi/sle
20513 .valid = acpi_suspend_state_valid, 20545 .valid = acpi_suspend_state_valid,
20514 .begin = acpi_suspend_begin_old, 20546 .begin = acpi_suspend_begin_old,
20515 .prepare_late = acpi_pm_disable_gpes, 20547 .prepare_late = acpi_pm_disable_gpes,
20516@@ -613,7 +613,7 @@ static void acpi_pm_enable_gpes(void) 20548@@ -460,7 +460,7 @@ static void acpi_pm_enable_gpes(void)
20517 acpi_enable_all_runtime_gpes(); 20549 acpi_enable_all_runtime_gpes();
20518 } 20550 }
20519 20551
@@ -20522,7 +20554,7 @@ diff -urNp linux-2.6.32.16/drivers/acpi/sleep.c linux-2.6.32.16/drivers/acpi/sle
20522 .begin = acpi_hibernation_begin, 20554 .begin = acpi_hibernation_begin,
20523 .end = acpi_pm_end, 20555 .end = acpi_pm_end,
20524 .pre_snapshot = acpi_hibernation_pre_snapshot, 20556 .pre_snapshot = acpi_hibernation_pre_snapshot,
20525@@ -666,7 +666,7 @@ static int acpi_hibernation_pre_snapshot 20557@@ -513,7 +513,7 @@ static int acpi_hibernation_pre_snapshot
20526 * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has 20558 * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
20527 * been requested. 20559 * been requested.
20528 */ 20560 */
@@ -20531,9 +20563,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/sleep.c linux-2.6.32.16/drivers/acpi/sle
20531 .begin = acpi_hibernation_begin_old, 20563 .begin = acpi_hibernation_begin_old,
20532 .end = acpi_pm_end, 20564 .end = acpi_pm_end,
20533 .pre_snapshot = acpi_hibernation_pre_snapshot_old, 20565 .pre_snapshot = acpi_hibernation_pre_snapshot_old,
20534diff -urNp linux-2.6.32.16/drivers/acpi/video.c linux-2.6.32.16/drivers/acpi/video.c 20566diff -urNp linux-2.6.32.18/drivers/acpi/video.c linux-2.6.32.18/drivers/acpi/video.c
20535--- linux-2.6.32.16/drivers/acpi/video.c 2010-07-05 14:14:00.000000000 -0400 20567--- linux-2.6.32.18/drivers/acpi/video.c 2010-08-10 13:45:57.000000000 -0400
20536+++ linux-2.6.32.16/drivers/acpi/video.c 2010-07-09 14:50:35.000000000 -0400 20568+++ linux-2.6.32.18/drivers/acpi/video.c 2010-08-11 18:57:29.000000000 -0400
20537@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str 20569@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
20538 vd->brightness->levels[request_level]); 20570 vd->brightness->levels[request_level]);
20539 } 20571 }
@@ -20543,9 +20575,9 @@ diff -urNp linux-2.6.32.16/drivers/acpi/video.c linux-2.6.32.16/drivers/acpi/vid
20543 .get_brightness = acpi_video_get_brightness, 20575 .get_brightness = acpi_video_get_brightness,
20544 .update_status = acpi_video_set_brightness, 20576 .update_status = acpi_video_set_brightness,
20545 }; 20577 };
20546diff -urNp linux-2.6.32.16/drivers/ata/ahci.c linux-2.6.32.16/drivers/ata/ahci.c 20578diff -urNp linux-2.6.32.18/drivers/ata/ahci.c linux-2.6.32.18/drivers/ata/ahci.c
20547--- linux-2.6.32.16/drivers/ata/ahci.c 2010-07-05 14:14:00.000000000 -0400 20579--- linux-2.6.32.18/drivers/ata/ahci.c 2010-08-10 13:45:57.000000000 -0400
20548+++ linux-2.6.32.16/drivers/ata/ahci.c 2010-07-09 14:50:35.000000000 -0400 20580+++ linux-2.6.32.18/drivers/ata/ahci.c 2010-08-11 18:57:29.000000000 -0400
20549@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh 20581@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
20550 .sdev_attrs = ahci_sdev_attrs, 20582 .sdev_attrs = ahci_sdev_attrs,
20551 }; 20583 };
@@ -20585,9 +20617,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/ahci.c linux-2.6.32.16/drivers/ata/ahci.c
20585 }; 20617 };
20586 20618
20587 20619
20588diff -urNp linux-2.6.32.16/drivers/ata/ata_generic.c linux-2.6.32.16/drivers/ata/ata_generic.c 20620diff -urNp linux-2.6.32.18/drivers/ata/ata_generic.c linux-2.6.32.18/drivers/ata/ata_generic.c
20589--- linux-2.6.32.16/drivers/ata/ata_generic.c 2010-07-05 14:14:00.000000000 -0400 20621--- linux-2.6.32.18/drivers/ata/ata_generic.c 2010-08-10 13:45:57.000000000 -0400
20590+++ linux-2.6.32.16/drivers/ata/ata_generic.c 2010-07-09 14:50:35.000000000 -0400 20622+++ linux-2.6.32.18/drivers/ata/ata_generic.c 2010-08-11 18:57:29.000000000 -0400
20591@@ -95,7 +95,7 @@ static struct scsi_host_template generic 20623@@ -95,7 +95,7 @@ static struct scsi_host_template generic
20592 ATA_BMDMA_SHT(DRV_NAME), 20624 ATA_BMDMA_SHT(DRV_NAME),
20593 }; 20625 };
@@ -20597,9 +20629,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/ata_generic.c linux-2.6.32.16/drivers/ata
20597 .inherits = &ata_bmdma_port_ops, 20629 .inherits = &ata_bmdma_port_ops,
20598 .cable_detect = ata_cable_unknown, 20630 .cable_detect = ata_cable_unknown,
20599 .set_mode = generic_set_mode, 20631 .set_mode = generic_set_mode,
20600diff -urNp linux-2.6.32.16/drivers/ata/ata_piix.c linux-2.6.32.16/drivers/ata/ata_piix.c 20632diff -urNp linux-2.6.32.18/drivers/ata/ata_piix.c linux-2.6.32.18/drivers/ata/ata_piix.c
20601--- linux-2.6.32.16/drivers/ata/ata_piix.c 2010-07-05 14:14:00.000000000 -0400 20633--- linux-2.6.32.18/drivers/ata/ata_piix.c 2010-08-10 13:45:57.000000000 -0400
20602+++ linux-2.6.32.16/drivers/ata/ata_piix.c 2010-07-09 14:50:35.000000000 -0400 20634+++ linux-2.6.32.18/drivers/ata/ata_piix.c 2010-08-11 18:57:29.000000000 -0400
20603@@ -299,7 +299,7 @@ static const struct pci_device_id piix_p 20635@@ -299,7 +299,7 @@ static const struct pci_device_id piix_p
20604 { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, 20636 { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
20605 /* SATA Controller IDE (CPT) */ 20637 /* SATA Controller IDE (CPT) */
@@ -20663,9 +20695,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/ata_piix.c linux-2.6.32.16/drivers/ata/at
20663 }; 20695 };
20664 static const char *oemstrs[] = { 20696 static const char *oemstrs[] = {
20665 "Tecra M3,", 20697 "Tecra M3,",
20666diff -urNp linux-2.6.32.16/drivers/ata/libata-acpi.c linux-2.6.32.16/drivers/ata/libata-acpi.c 20698diff -urNp linux-2.6.32.18/drivers/ata/libata-acpi.c linux-2.6.32.18/drivers/ata/libata-acpi.c
20667--- linux-2.6.32.16/drivers/ata/libata-acpi.c 2010-07-05 14:14:00.000000000 -0400 20699--- linux-2.6.32.18/drivers/ata/libata-acpi.c 2010-08-10 13:45:57.000000000 -0400
20668+++ linux-2.6.32.16/drivers/ata/libata-acpi.c 2010-07-09 14:50:35.000000000 -0400 20700+++ linux-2.6.32.18/drivers/ata/libata-acpi.c 2010-08-11 18:57:29.000000000 -0400
20669@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han 20701@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
20670 ata_acpi_uevent(dev->link->ap, dev, event); 20702 ata_acpi_uevent(dev->link->ap, dev, event);
20671 } 20703 }
@@ -20681,9 +20713,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/libata-acpi.c linux-2.6.32.16/drivers/ata
20681 .handler = ata_acpi_ap_notify_dock, 20713 .handler = ata_acpi_ap_notify_dock,
20682 .uevent = ata_acpi_ap_uevent, 20714 .uevent = ata_acpi_ap_uevent,
20683 }; 20715 };
20684diff -urNp linux-2.6.32.16/drivers/ata/libata-core.c linux-2.6.32.16/drivers/ata/libata-core.c 20716diff -urNp linux-2.6.32.18/drivers/ata/libata-core.c linux-2.6.32.18/drivers/ata/libata-core.c
20685--- linux-2.6.32.16/drivers/ata/libata-core.c 2010-07-05 14:14:00.000000000 -0400 20717--- linux-2.6.32.18/drivers/ata/libata-core.c 2010-08-10 13:45:57.000000000 -0400
20686+++ linux-2.6.32.16/drivers/ata/libata-core.c 2010-07-09 14:50:35.000000000 -0400 20718+++ linux-2.6.32.18/drivers/ata/libata-core.c 2010-08-11 18:57:29.000000000 -0400
20687@@ -900,7 +900,7 @@ static const struct ata_xfer_ent { 20719@@ -900,7 +900,7 @@ static const struct ata_xfer_ent {
20688 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, 20720 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
20689 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, 20721 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
@@ -20757,9 +20789,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/libata-core.c linux-2.6.32.16/drivers/ata
20757 .qc_prep = ata_noop_qc_prep, 20789 .qc_prep = ata_noop_qc_prep,
20758 .qc_issue = ata_dummy_qc_issue, 20790 .qc_issue = ata_dummy_qc_issue,
20759 .error_handler = ata_dummy_error_handler, 20791 .error_handler = ata_dummy_error_handler,
20760diff -urNp linux-2.6.32.16/drivers/ata/libata-eh.c linux-2.6.32.16/drivers/ata/libata-eh.c 20792diff -urNp linux-2.6.32.18/drivers/ata/libata-eh.c linux-2.6.32.18/drivers/ata/libata-eh.c
20761--- linux-2.6.32.16/drivers/ata/libata-eh.c 2010-07-05 14:14:00.000000000 -0400 20793--- linux-2.6.32.18/drivers/ata/libata-eh.c 2010-08-10 13:45:57.000000000 -0400
20762+++ linux-2.6.32.16/drivers/ata/libata-eh.c 2010-07-09 14:50:35.000000000 -0400 20794+++ linux-2.6.32.18/drivers/ata/libata-eh.c 2010-08-11 18:57:29.000000000 -0400
20763@@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_ 20795@@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_
20764 */ 20796 */
20765 void ata_std_error_handler(struct ata_port *ap) 20797 void ata_std_error_handler(struct ata_port *ap)
@@ -20769,9 +20801,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/libata-eh.c linux-2.6.32.16/drivers/ata/l
20769 ata_reset_fn_t hardreset = ops->hardreset; 20801 ata_reset_fn_t hardreset = ops->hardreset;
20770 20802
20771 /* ignore built-in hardreset if SCR access is not available */ 20803 /* ignore built-in hardreset if SCR access is not available */
20772diff -urNp linux-2.6.32.16/drivers/ata/libata-pmp.c linux-2.6.32.16/drivers/ata/libata-pmp.c 20804diff -urNp linux-2.6.32.18/drivers/ata/libata-pmp.c linux-2.6.32.18/drivers/ata/libata-pmp.c
20773--- linux-2.6.32.16/drivers/ata/libata-pmp.c 2010-07-05 14:14:00.000000000 -0400 20805--- linux-2.6.32.18/drivers/ata/libata-pmp.c 2010-08-10 13:45:57.000000000 -0400
20774+++ linux-2.6.32.16/drivers/ata/libata-pmp.c 2010-07-09 14:50:35.000000000 -0400 20806+++ linux-2.6.32.18/drivers/ata/libata-pmp.c 2010-08-11 18:57:29.000000000 -0400
20775@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str 20807@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
20776 */ 20808 */
20777 static int sata_pmp_eh_recover(struct ata_port *ap) 20809 static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -20781,9 +20813,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/libata-pmp.c linux-2.6.32.16/drivers/ata/
20781 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; 20813 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
20782 struct ata_link *pmp_link = &ap->link; 20814 struct ata_link *pmp_link = &ap->link;
20783 struct ata_device *pmp_dev = pmp_link->device; 20815 struct ata_device *pmp_dev = pmp_link->device;
20784diff -urNp linux-2.6.32.16/drivers/ata/pata_acpi.c linux-2.6.32.16/drivers/ata/pata_acpi.c 20816diff -urNp linux-2.6.32.18/drivers/ata/pata_acpi.c linux-2.6.32.18/drivers/ata/pata_acpi.c
20785--- linux-2.6.32.16/drivers/ata/pata_acpi.c 2010-07-05 14:14:00.000000000 -0400 20817--- linux-2.6.32.18/drivers/ata/pata_acpi.c 2010-08-10 13:45:57.000000000 -0400
20786+++ linux-2.6.32.16/drivers/ata/pata_acpi.c 2010-07-09 14:50:35.000000000 -0400 20818+++ linux-2.6.32.18/drivers/ata/pata_acpi.c 2010-08-11 18:57:29.000000000 -0400
20787@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s 20819@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
20788 ATA_BMDMA_SHT(DRV_NAME), 20820 ATA_BMDMA_SHT(DRV_NAME),
20789 }; 20821 };
@@ -20793,9 +20825,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_acpi.c linux-2.6.32.16/drivers/ata/p
20793 .inherits = &ata_bmdma_port_ops, 20825 .inherits = &ata_bmdma_port_ops,
20794 .qc_issue = pacpi_qc_issue, 20826 .qc_issue = pacpi_qc_issue,
20795 .cable_detect = pacpi_cable_detect, 20827 .cable_detect = pacpi_cable_detect,
20796diff -urNp linux-2.6.32.16/drivers/ata/pata_ali.c linux-2.6.32.16/drivers/ata/pata_ali.c 20828diff -urNp linux-2.6.32.18/drivers/ata/pata_ali.c linux-2.6.32.18/drivers/ata/pata_ali.c
20797--- linux-2.6.32.16/drivers/ata/pata_ali.c 2010-07-05 14:14:00.000000000 -0400 20829--- linux-2.6.32.18/drivers/ata/pata_ali.c 2010-08-10 13:45:57.000000000 -0400
20798+++ linux-2.6.32.16/drivers/ata/pata_ali.c 2010-07-09 14:50:35.000000000 -0400 20830+++ linux-2.6.32.18/drivers/ata/pata_ali.c 2010-08-11 18:57:29.000000000 -0400
20799@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht 20831@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
20800 * Port operations for PIO only ALi 20832 * Port operations for PIO only ALi
20801 */ 20833 */
@@ -20841,9 +20873,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_ali.c linux-2.6.32.16/drivers/ata/pa
20841 .inherits = &ali_dma_base_ops, 20873 .inherits = &ali_dma_base_ops,
20842 .check_atapi_dma = ali_check_atapi_dma, 20874 .check_atapi_dma = ali_check_atapi_dma,
20843 .dev_config = ali_warn_atapi_dma, 20875 .dev_config = ali_warn_atapi_dma,
20844diff -urNp linux-2.6.32.16/drivers/ata/pata_amd.c linux-2.6.32.16/drivers/ata/pata_amd.c 20876diff -urNp linux-2.6.32.18/drivers/ata/pata_amd.c linux-2.6.32.18/drivers/ata/pata_amd.c
20845--- linux-2.6.32.16/drivers/ata/pata_amd.c 2010-07-05 14:14:00.000000000 -0400 20877--- linux-2.6.32.18/drivers/ata/pata_amd.c 2010-08-10 13:45:57.000000000 -0400
20846+++ linux-2.6.32.16/drivers/ata/pata_amd.c 2010-07-09 14:50:35.000000000 -0400 20878+++ linux-2.6.32.18/drivers/ata/pata_amd.c 2010-08-11 18:57:29.000000000 -0400
20847@@ -397,28 +397,28 @@ static const struct ata_port_operations 20879@@ -397,28 +397,28 @@ static const struct ata_port_operations
20848 .prereset = amd_pre_reset, 20880 .prereset = amd_pre_reset,
20849 }; 20881 };
@@ -20893,9 +20925,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_amd.c linux-2.6.32.16/drivers/ata/pa
20893 .inherits = &nv_base_port_ops, 20925 .inherits = &nv_base_port_ops,
20894 .set_piomode = nv133_set_piomode, 20926 .set_piomode = nv133_set_piomode,
20895 .set_dmamode = nv133_set_dmamode, 20927 .set_dmamode = nv133_set_dmamode,
20896diff -urNp linux-2.6.32.16/drivers/ata/pata_artop.c linux-2.6.32.16/drivers/ata/pata_artop.c 20928diff -urNp linux-2.6.32.18/drivers/ata/pata_artop.c linux-2.6.32.18/drivers/ata/pata_artop.c
20897--- linux-2.6.32.16/drivers/ata/pata_artop.c 2010-07-05 14:14:00.000000000 -0400 20929--- linux-2.6.32.18/drivers/ata/pata_artop.c 2010-08-10 13:45:57.000000000 -0400
20898+++ linux-2.6.32.16/drivers/ata/pata_artop.c 2010-07-09 14:50:35.000000000 -0400 20930+++ linux-2.6.32.18/drivers/ata/pata_artop.c 2010-08-11 18:57:29.000000000 -0400
20899@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s 20931@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
20900 ATA_BMDMA_SHT(DRV_NAME), 20932 ATA_BMDMA_SHT(DRV_NAME),
20901 }; 20933 };
@@ -20914,9 +20946,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_artop.c linux-2.6.32.16/drivers/ata/
20914 .inherits = &ata_bmdma_port_ops, 20946 .inherits = &ata_bmdma_port_ops,
20915 .cable_detect = artop6260_cable_detect, 20947 .cable_detect = artop6260_cable_detect,
20916 .set_piomode = artop6260_set_piomode, 20948 .set_piomode = artop6260_set_piomode,
20917diff -urNp linux-2.6.32.16/drivers/ata/pata_at32.c linux-2.6.32.16/drivers/ata/pata_at32.c 20949diff -urNp linux-2.6.32.18/drivers/ata/pata_at32.c linux-2.6.32.18/drivers/ata/pata_at32.c
20918--- linux-2.6.32.16/drivers/ata/pata_at32.c 2010-07-05 14:14:00.000000000 -0400 20950--- linux-2.6.32.18/drivers/ata/pata_at32.c 2010-08-10 13:45:57.000000000 -0400
20919+++ linux-2.6.32.16/drivers/ata/pata_at32.c 2010-07-09 14:50:35.000000000 -0400 20951+++ linux-2.6.32.18/drivers/ata/pata_at32.c 2010-08-11 18:57:29.000000000 -0400
20920@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh 20952@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
20921 ATA_PIO_SHT(DRV_NAME), 20953 ATA_PIO_SHT(DRV_NAME),
20922 }; 20954 };
@@ -20926,9 +20958,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_at32.c linux-2.6.32.16/drivers/ata/p
20926 .inherits = &ata_sff_port_ops, 20958 .inherits = &ata_sff_port_ops,
20927 .cable_detect = ata_cable_40wire, 20959 .cable_detect = ata_cable_40wire,
20928 .set_piomode = pata_at32_set_piomode, 20960 .set_piomode = pata_at32_set_piomode,
20929diff -urNp linux-2.6.32.16/drivers/ata/pata_at91.c linux-2.6.32.16/drivers/ata/pata_at91.c 20961diff -urNp linux-2.6.32.18/drivers/ata/pata_at91.c linux-2.6.32.18/drivers/ata/pata_at91.c
20930--- linux-2.6.32.16/drivers/ata/pata_at91.c 2010-07-05 14:14:00.000000000 -0400 20962--- linux-2.6.32.18/drivers/ata/pata_at91.c 2010-08-10 13:45:57.000000000 -0400
20931+++ linux-2.6.32.16/drivers/ata/pata_at91.c 2010-07-09 14:50:35.000000000 -0400 20963+++ linux-2.6.32.18/drivers/ata/pata_at91.c 2010-08-11 18:57:29.000000000 -0400
20932@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at 20964@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
20933 ATA_PIO_SHT(DRV_NAME), 20965 ATA_PIO_SHT(DRV_NAME),
20934 }; 20966 };
@@ -20938,9 +20970,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_at91.c linux-2.6.32.16/drivers/ata/p
20938 .inherits = &ata_sff_port_ops, 20970 .inherits = &ata_sff_port_ops,
20939 20971
20940 .sff_data_xfer = pata_at91_data_xfer_noirq, 20972 .sff_data_xfer = pata_at91_data_xfer_noirq,
20941diff -urNp linux-2.6.32.16/drivers/ata/pata_atiixp.c linux-2.6.32.16/drivers/ata/pata_atiixp.c 20973diff -urNp linux-2.6.32.18/drivers/ata/pata_atiixp.c linux-2.6.32.18/drivers/ata/pata_atiixp.c
20942--- linux-2.6.32.16/drivers/ata/pata_atiixp.c 2010-07-05 14:14:00.000000000 -0400 20974--- linux-2.6.32.18/drivers/ata/pata_atiixp.c 2010-08-10 13:45:57.000000000 -0400
20943+++ linux-2.6.32.16/drivers/ata/pata_atiixp.c 2010-07-09 14:50:35.000000000 -0400 20975+++ linux-2.6.32.18/drivers/ata/pata_atiixp.c 2010-08-11 18:57:29.000000000 -0400
20944@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ 20976@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
20945 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 20977 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
20946 }; 20978 };
@@ -20950,9 +20982,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_atiixp.c linux-2.6.32.16/drivers/ata
20950 .inherits = &ata_bmdma_port_ops, 20982 .inherits = &ata_bmdma_port_ops,
20951 20983
20952 .qc_prep = ata_sff_dumb_qc_prep, 20984 .qc_prep = ata_sff_dumb_qc_prep,
20953diff -urNp linux-2.6.32.16/drivers/ata/pata_atp867x.c linux-2.6.32.16/drivers/ata/pata_atp867x.c 20985diff -urNp linux-2.6.32.18/drivers/ata/pata_atp867x.c linux-2.6.32.18/drivers/ata/pata_atp867x.c
20954--- linux-2.6.32.16/drivers/ata/pata_atp867x.c 2010-07-05 14:14:00.000000000 -0400 20986--- linux-2.6.32.18/drivers/ata/pata_atp867x.c 2010-08-10 13:45:57.000000000 -0400
20955+++ linux-2.6.32.16/drivers/ata/pata_atp867x.c 2010-07-09 14:50:35.000000000 -0400 20987+++ linux-2.6.32.18/drivers/ata/pata_atp867x.c 2010-08-11 18:57:29.000000000 -0400
20956@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x 20988@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
20957 ATA_BMDMA_SHT(DRV_NAME), 20989 ATA_BMDMA_SHT(DRV_NAME),
20958 }; 20990 };
@@ -20962,9 +20994,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_atp867x.c linux-2.6.32.16/drivers/at
20962 .inherits = &ata_bmdma_port_ops, 20994 .inherits = &ata_bmdma_port_ops,
20963 .cable_detect = atp867x_cable_detect, 20995 .cable_detect = atp867x_cable_detect,
20964 .set_piomode = atp867x_set_piomode, 20996 .set_piomode = atp867x_set_piomode,
20965diff -urNp linux-2.6.32.16/drivers/ata/pata_bf54x.c linux-2.6.32.16/drivers/ata/pata_bf54x.c 20997diff -urNp linux-2.6.32.18/drivers/ata/pata_bf54x.c linux-2.6.32.18/drivers/ata/pata_bf54x.c
20966--- linux-2.6.32.16/drivers/ata/pata_bf54x.c 2010-07-05 14:14:00.000000000 -0400 20998--- linux-2.6.32.18/drivers/ata/pata_bf54x.c 2010-08-10 13:45:57.000000000 -0400
20967+++ linux-2.6.32.16/drivers/ata/pata_bf54x.c 2010-07-09 14:50:35.000000000 -0400 20999+++ linux-2.6.32.18/drivers/ata/pata_bf54x.c 2010-08-11 18:57:29.000000000 -0400
20968@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh 21000@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
20969 .dma_boundary = ATA_DMA_BOUNDARY, 21001 .dma_boundary = ATA_DMA_BOUNDARY,
20970 }; 21002 };
@@ -20974,9 +21006,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_bf54x.c linux-2.6.32.16/drivers/ata/
20974 .inherits = &ata_sff_port_ops, 21006 .inherits = &ata_sff_port_ops,
20975 21007
20976 .set_piomode = bfin_set_piomode, 21008 .set_piomode = bfin_set_piomode,
20977diff -urNp linux-2.6.32.16/drivers/ata/pata_cmd640.c linux-2.6.32.16/drivers/ata/pata_cmd640.c 21009diff -urNp linux-2.6.32.18/drivers/ata/pata_cmd640.c linux-2.6.32.18/drivers/ata/pata_cmd640.c
20978--- linux-2.6.32.16/drivers/ata/pata_cmd640.c 2010-07-05 14:14:00.000000000 -0400 21010--- linux-2.6.32.18/drivers/ata/pata_cmd640.c 2010-08-10 13:45:57.000000000 -0400
20979+++ linux-2.6.32.16/drivers/ata/pata_cmd640.c 2010-07-09 14:50:35.000000000 -0400 21011+++ linux-2.6.32.18/drivers/ata/pata_cmd640.c 2010-08-11 18:57:29.000000000 -0400
20980@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ 21012@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
20981 ATA_BMDMA_SHT(DRV_NAME), 21013 ATA_BMDMA_SHT(DRV_NAME),
20982 }; 21014 };
@@ -20986,9 +21018,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_cmd640.c linux-2.6.32.16/drivers/ata
20986 .inherits = &ata_bmdma_port_ops, 21018 .inherits = &ata_bmdma_port_ops,
20987 /* In theory xfer_noirq is not needed once we kill the prefetcher */ 21019 /* In theory xfer_noirq is not needed once we kill the prefetcher */
20988 .sff_data_xfer = ata_sff_data_xfer_noirq, 21020 .sff_data_xfer = ata_sff_data_xfer_noirq,
20989diff -urNp linux-2.6.32.16/drivers/ata/pata_cmd64x.c linux-2.6.32.16/drivers/ata/pata_cmd64x.c 21021diff -urNp linux-2.6.32.18/drivers/ata/pata_cmd64x.c linux-2.6.32.18/drivers/ata/pata_cmd64x.c
20990--- linux-2.6.32.16/drivers/ata/pata_cmd64x.c 2010-07-05 14:14:00.000000000 -0400 21022--- linux-2.6.32.18/drivers/ata/pata_cmd64x.c 2010-08-10 13:45:57.000000000 -0400
20991+++ linux-2.6.32.16/drivers/ata/pata_cmd64x.c 2010-07-09 14:50:35.000000000 -0400 21023+++ linux-2.6.32.18/drivers/ata/pata_cmd64x.c 2010-08-11 18:57:29.000000000 -0400
20992@@ -275,18 +275,18 @@ static const struct ata_port_operations 21024@@ -275,18 +275,18 @@ static const struct ata_port_operations
20993 .set_dmamode = cmd64x_set_dmamode, 21025 .set_dmamode = cmd64x_set_dmamode,
20994 }; 21026 };
@@ -21011,9 +21043,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_cmd64x.c linux-2.6.32.16/drivers/ata
21011 .inherits = &cmd64x_base_ops, 21043 .inherits = &cmd64x_base_ops,
21012 .bmdma_stop = cmd648_bmdma_stop, 21044 .bmdma_stop = cmd648_bmdma_stop,
21013 .cable_detect = cmd648_cable_detect, 21045 .cable_detect = cmd648_cable_detect,
21014diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5520.c linux-2.6.32.16/drivers/ata/pata_cs5520.c 21046diff -urNp linux-2.6.32.18/drivers/ata/pata_cs5520.c linux-2.6.32.18/drivers/ata/pata_cs5520.c
21015--- linux-2.6.32.16/drivers/ata/pata_cs5520.c 2010-07-05 14:14:00.000000000 -0400 21047--- linux-2.6.32.18/drivers/ata/pata_cs5520.c 2010-08-10 13:45:57.000000000 -0400
21016+++ linux-2.6.32.16/drivers/ata/pata_cs5520.c 2010-07-09 14:50:35.000000000 -0400 21048+++ linux-2.6.32.18/drivers/ata/pata_cs5520.c 2010-08-11 18:57:29.000000000 -0400
21017@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ 21049@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
21018 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 21050 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
21019 }; 21051 };
@@ -21023,9 +21055,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5520.c linux-2.6.32.16/drivers/ata
21023 .inherits = &ata_bmdma_port_ops, 21055 .inherits = &ata_bmdma_port_ops,
21024 .qc_prep = ata_sff_dumb_qc_prep, 21056 .qc_prep = ata_sff_dumb_qc_prep,
21025 .cable_detect = ata_cable_40wire, 21057 .cable_detect = ata_cable_40wire,
21026diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5530.c linux-2.6.32.16/drivers/ata/pata_cs5530.c 21058diff -urNp linux-2.6.32.18/drivers/ata/pata_cs5530.c linux-2.6.32.18/drivers/ata/pata_cs5530.c
21027--- linux-2.6.32.16/drivers/ata/pata_cs5530.c 2010-07-05 14:14:00.000000000 -0400 21059--- linux-2.6.32.18/drivers/ata/pata_cs5530.c 2010-08-10 13:45:57.000000000 -0400
21028+++ linux-2.6.32.16/drivers/ata/pata_cs5530.c 2010-07-09 14:50:35.000000000 -0400 21060+++ linux-2.6.32.18/drivers/ata/pata_cs5530.c 2010-08-11 18:57:29.000000000 -0400
21029@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ 21061@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
21030 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 21062 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
21031 }; 21063 };
@@ -21035,9 +21067,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5530.c linux-2.6.32.16/drivers/ata
21035 .inherits = &ata_bmdma_port_ops, 21067 .inherits = &ata_bmdma_port_ops,
21036 21068
21037 .qc_prep = ata_sff_dumb_qc_prep, 21069 .qc_prep = ata_sff_dumb_qc_prep,
21038diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5535.c linux-2.6.32.16/drivers/ata/pata_cs5535.c 21070diff -urNp linux-2.6.32.18/drivers/ata/pata_cs5535.c linux-2.6.32.18/drivers/ata/pata_cs5535.c
21039--- linux-2.6.32.16/drivers/ata/pata_cs5535.c 2010-07-05 14:14:00.000000000 -0400 21071--- linux-2.6.32.18/drivers/ata/pata_cs5535.c 2010-08-10 13:45:57.000000000 -0400
21040+++ linux-2.6.32.16/drivers/ata/pata_cs5535.c 2010-07-09 14:50:35.000000000 -0400 21072+++ linux-2.6.32.18/drivers/ata/pata_cs5535.c 2010-08-11 18:57:29.000000000 -0400
21041@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ 21073@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
21042 ATA_BMDMA_SHT(DRV_NAME), 21074 ATA_BMDMA_SHT(DRV_NAME),
21043 }; 21075 };
@@ -21047,9 +21079,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5535.c linux-2.6.32.16/drivers/ata
21047 .inherits = &ata_bmdma_port_ops, 21079 .inherits = &ata_bmdma_port_ops,
21048 .cable_detect = cs5535_cable_detect, 21080 .cable_detect = cs5535_cable_detect,
21049 .set_piomode = cs5535_set_piomode, 21081 .set_piomode = cs5535_set_piomode,
21050diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5536.c linux-2.6.32.16/drivers/ata/pata_cs5536.c 21082diff -urNp linux-2.6.32.18/drivers/ata/pata_cs5536.c linux-2.6.32.18/drivers/ata/pata_cs5536.c
21051--- linux-2.6.32.16/drivers/ata/pata_cs5536.c 2010-07-05 14:14:00.000000000 -0400 21083--- linux-2.6.32.18/drivers/ata/pata_cs5536.c 2010-08-10 13:45:57.000000000 -0400
21052+++ linux-2.6.32.16/drivers/ata/pata_cs5536.c 2010-07-09 14:50:35.000000000 -0400 21084+++ linux-2.6.32.18/drivers/ata/pata_cs5536.c 2010-08-11 18:57:29.000000000 -0400
21053@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ 21085@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
21054 ATA_BMDMA_SHT(DRV_NAME), 21086 ATA_BMDMA_SHT(DRV_NAME),
21055 }; 21087 };
@@ -21059,9 +21091,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_cs5536.c linux-2.6.32.16/drivers/ata
21059 .inherits = &ata_bmdma_port_ops, 21091 .inherits = &ata_bmdma_port_ops,
21060 .cable_detect = cs5536_cable_detect, 21092 .cable_detect = cs5536_cable_detect,
21061 .set_piomode = cs5536_set_piomode, 21093 .set_piomode = cs5536_set_piomode,
21062diff -urNp linux-2.6.32.16/drivers/ata/pata_cypress.c linux-2.6.32.16/drivers/ata/pata_cypress.c 21094diff -urNp linux-2.6.32.18/drivers/ata/pata_cypress.c linux-2.6.32.18/drivers/ata/pata_cypress.c
21063--- linux-2.6.32.16/drivers/ata/pata_cypress.c 2010-07-05 14:14:00.000000000 -0400 21095--- linux-2.6.32.18/drivers/ata/pata_cypress.c 2010-08-10 13:45:57.000000000 -0400
21064+++ linux-2.6.32.16/drivers/ata/pata_cypress.c 2010-07-09 14:50:35.000000000 -0400 21096+++ linux-2.6.32.18/drivers/ata/pata_cypress.c 2010-08-11 18:57:29.000000000 -0400
21065@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 21097@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
21066 ATA_BMDMA_SHT(DRV_NAME), 21098 ATA_BMDMA_SHT(DRV_NAME),
21067 }; 21099 };
@@ -21071,9 +21103,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_cypress.c linux-2.6.32.16/drivers/at
21071 .inherits = &ata_bmdma_port_ops, 21103 .inherits = &ata_bmdma_port_ops,
21072 .cable_detect = ata_cable_40wire, 21104 .cable_detect = ata_cable_40wire,
21073 .set_piomode = cy82c693_set_piomode, 21105 .set_piomode = cy82c693_set_piomode,
21074diff -urNp linux-2.6.32.16/drivers/ata/pata_efar.c linux-2.6.32.16/drivers/ata/pata_efar.c 21106diff -urNp linux-2.6.32.18/drivers/ata/pata_efar.c linux-2.6.32.18/drivers/ata/pata_efar.c
21075--- linux-2.6.32.16/drivers/ata/pata_efar.c 2010-07-05 14:14:00.000000000 -0400 21107--- linux-2.6.32.18/drivers/ata/pata_efar.c 2010-08-10 13:45:57.000000000 -0400
21076+++ linux-2.6.32.16/drivers/ata/pata_efar.c 2010-07-09 14:50:35.000000000 -0400 21108+++ linux-2.6.32.18/drivers/ata/pata_efar.c 2010-08-11 18:57:29.000000000 -0400
21077@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh 21109@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
21078 ATA_BMDMA_SHT(DRV_NAME), 21110 ATA_BMDMA_SHT(DRV_NAME),
21079 }; 21111 };
@@ -21083,9 +21115,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_efar.c linux-2.6.32.16/drivers/ata/p
21083 .inherits = &ata_bmdma_port_ops, 21115 .inherits = &ata_bmdma_port_ops,
21084 .cable_detect = efar_cable_detect, 21116 .cable_detect = efar_cable_detect,
21085 .set_piomode = efar_set_piomode, 21117 .set_piomode = efar_set_piomode,
21086diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt366.c linux-2.6.32.16/drivers/ata/pata_hpt366.c 21118diff -urNp linux-2.6.32.18/drivers/ata/pata_hpt366.c linux-2.6.32.18/drivers/ata/pata_hpt366.c
21087--- linux-2.6.32.16/drivers/ata/pata_hpt366.c 2010-07-05 14:14:00.000000000 -0400 21119--- linux-2.6.32.18/drivers/ata/pata_hpt366.c 2010-08-10 13:45:57.000000000 -0400
21088+++ linux-2.6.32.16/drivers/ata/pata_hpt366.c 2010-07-09 14:50:35.000000000 -0400 21120+++ linux-2.6.32.18/drivers/ata/pata_hpt366.c 2010-08-11 18:57:29.000000000 -0400
21089@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ 21121@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
21090 * Configuration for HPT366/68 21122 * Configuration for HPT366/68
21091 */ 21123 */
@@ -21095,9 +21127,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt366.c linux-2.6.32.16/drivers/ata
21095 .inherits = &ata_bmdma_port_ops, 21127 .inherits = &ata_bmdma_port_ops,
21096 .cable_detect = hpt36x_cable_detect, 21128 .cable_detect = hpt36x_cable_detect,
21097 .mode_filter = hpt366_filter, 21129 .mode_filter = hpt366_filter,
21098diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt37x.c linux-2.6.32.16/drivers/ata/pata_hpt37x.c 21130diff -urNp linux-2.6.32.18/drivers/ata/pata_hpt37x.c linux-2.6.32.18/drivers/ata/pata_hpt37x.c
21099--- linux-2.6.32.16/drivers/ata/pata_hpt37x.c 2010-07-05 14:14:00.000000000 -0400 21131--- linux-2.6.32.18/drivers/ata/pata_hpt37x.c 2010-08-10 13:45:57.000000000 -0400
21100+++ linux-2.6.32.16/drivers/ata/pata_hpt37x.c 2010-07-09 14:50:35.000000000 -0400 21132+++ linux-2.6.32.18/drivers/ata/pata_hpt37x.c 2010-08-11 18:57:29.000000000 -0400
21101@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ 21133@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
21102 * Configuration for HPT370 21134 * Configuration for HPT370
21103 */ 21135 */
@@ -21134,9 +21166,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt37x.c linux-2.6.32.16/drivers/ata
21134 .inherits = &hpt372_port_ops, 21166 .inherits = &hpt372_port_ops,
21135 .prereset = hpt374_fn1_pre_reset, 21167 .prereset = hpt374_fn1_pre_reset,
21136 }; 21168 };
21137diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c 21169diff -urNp linux-2.6.32.18/drivers/ata/pata_hpt3x2n.c linux-2.6.32.18/drivers/ata/pata_hpt3x2n.c
21138--- linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c 2010-07-05 14:14:00.000000000 -0400 21170--- linux-2.6.32.18/drivers/ata/pata_hpt3x2n.c 2010-08-10 13:45:57.000000000 -0400
21139+++ linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c 2010-07-09 14:50:35.000000000 -0400 21171+++ linux-2.6.32.18/drivers/ata/pata_hpt3x2n.c 2010-08-11 18:57:29.000000000 -0400
21140@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n 21172@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
21141 * Configuration for HPT3x2n. 21173 * Configuration for HPT3x2n.
21142 */ 21174 */
@@ -21146,9 +21178,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt3x2n.c linux-2.6.32.16/drivers/at
21146 .inherits = &ata_bmdma_port_ops, 21178 .inherits = &ata_bmdma_port_ops,
21147 21179
21148 .bmdma_stop = hpt3x2n_bmdma_stop, 21180 .bmdma_stop = hpt3x2n_bmdma_stop,
21149diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt3x3.c linux-2.6.32.16/drivers/ata/pata_hpt3x3.c 21181diff -urNp linux-2.6.32.18/drivers/ata/pata_hpt3x3.c linux-2.6.32.18/drivers/ata/pata_hpt3x3.c
21150--- linux-2.6.32.16/drivers/ata/pata_hpt3x3.c 2010-07-05 14:14:00.000000000 -0400 21182--- linux-2.6.32.18/drivers/ata/pata_hpt3x3.c 2010-08-10 13:45:57.000000000 -0400
21151+++ linux-2.6.32.16/drivers/ata/pata_hpt3x3.c 2010-07-09 14:50:35.000000000 -0400 21183+++ linux-2.6.32.18/drivers/ata/pata_hpt3x3.c 2010-08-11 18:57:29.000000000 -0400
21152@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ 21184@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
21153 ATA_BMDMA_SHT(DRV_NAME), 21185 ATA_BMDMA_SHT(DRV_NAME),
21154 }; 21186 };
@@ -21158,9 +21190,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_hpt3x3.c linux-2.6.32.16/drivers/ata
21158 .inherits = &ata_bmdma_port_ops, 21190 .inherits = &ata_bmdma_port_ops,
21159 .cable_detect = ata_cable_40wire, 21191 .cable_detect = ata_cable_40wire,
21160 .set_piomode = hpt3x3_set_piomode, 21192 .set_piomode = hpt3x3_set_piomode,
21161diff -urNp linux-2.6.32.16/drivers/ata/pata_icside.c linux-2.6.32.16/drivers/ata/pata_icside.c 21193diff -urNp linux-2.6.32.18/drivers/ata/pata_icside.c linux-2.6.32.18/drivers/ata/pata_icside.c
21162--- linux-2.6.32.16/drivers/ata/pata_icside.c 2010-07-05 14:14:00.000000000 -0400 21194--- linux-2.6.32.18/drivers/ata/pata_icside.c 2010-08-10 13:45:57.000000000 -0400
21163+++ linux-2.6.32.16/drivers/ata/pata_icside.c 2010-07-09 14:50:35.000000000 -0400 21195+++ linux-2.6.32.18/drivers/ata/pata_icside.c 2010-08-11 18:57:29.000000000 -0400
21164@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct 21196@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
21165 } 21197 }
21166 } 21198 }
@@ -21170,9 +21202,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_icside.c linux-2.6.32.16/drivers/ata
21170 .inherits = &ata_sff_port_ops, 21202 .inherits = &ata_sff_port_ops,
21171 /* no need to build any PRD tables for DMA */ 21203 /* no need to build any PRD tables for DMA */
21172 .qc_prep = ata_noop_qc_prep, 21204 .qc_prep = ata_noop_qc_prep,
21173diff -urNp linux-2.6.32.16/drivers/ata/pata_isapnp.c linux-2.6.32.16/drivers/ata/pata_isapnp.c 21205diff -urNp linux-2.6.32.18/drivers/ata/pata_isapnp.c linux-2.6.32.18/drivers/ata/pata_isapnp.c
21174--- linux-2.6.32.16/drivers/ata/pata_isapnp.c 2010-07-05 14:14:00.000000000 -0400 21206--- linux-2.6.32.18/drivers/ata/pata_isapnp.c 2010-08-10 13:45:57.000000000 -0400
21175+++ linux-2.6.32.16/drivers/ata/pata_isapnp.c 2010-07-09 14:50:35.000000000 -0400 21207+++ linux-2.6.32.18/drivers/ata/pata_isapnp.c 2010-08-11 18:57:29.000000000 -0400
21176@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ 21208@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
21177 ATA_PIO_SHT(DRV_NAME), 21209 ATA_PIO_SHT(DRV_NAME),
21178 }; 21210 };
@@ -21188,9 +21220,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_isapnp.c linux-2.6.32.16/drivers/ata
21188 .inherits = &ata_sff_port_ops, 21220 .inherits = &ata_sff_port_ops,
21189 .cable_detect = ata_cable_40wire, 21221 .cable_detect = ata_cable_40wire,
21190 /* No altstatus so we don't want to use the lost interrupt poll */ 21222 /* No altstatus so we don't want to use the lost interrupt poll */
21191diff -urNp linux-2.6.32.16/drivers/ata/pata_it8213.c linux-2.6.32.16/drivers/ata/pata_it8213.c 21223diff -urNp linux-2.6.32.18/drivers/ata/pata_it8213.c linux-2.6.32.18/drivers/ata/pata_it8213.c
21192--- linux-2.6.32.16/drivers/ata/pata_it8213.c 2010-07-05 14:14:00.000000000 -0400 21224--- linux-2.6.32.18/drivers/ata/pata_it8213.c 2010-08-10 13:45:57.000000000 -0400
21193+++ linux-2.6.32.16/drivers/ata/pata_it8213.c 2010-07-09 14:50:35.000000000 -0400 21225+++ linux-2.6.32.18/drivers/ata/pata_it8213.c 2010-08-11 18:57:29.000000000 -0400
21194@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ 21226@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
21195 }; 21227 };
21196 21228
@@ -21200,9 +21232,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_it8213.c linux-2.6.32.16/drivers/ata
21200 .inherits = &ata_bmdma_port_ops, 21232 .inherits = &ata_bmdma_port_ops,
21201 .cable_detect = it8213_cable_detect, 21233 .cable_detect = it8213_cable_detect,
21202 .set_piomode = it8213_set_piomode, 21234 .set_piomode = it8213_set_piomode,
21203diff -urNp linux-2.6.32.16/drivers/ata/pata_it821x.c linux-2.6.32.16/drivers/ata/pata_it821x.c 21235diff -urNp linux-2.6.32.18/drivers/ata/pata_it821x.c linux-2.6.32.18/drivers/ata/pata_it821x.c
21204--- linux-2.6.32.16/drivers/ata/pata_it821x.c 2010-07-05 14:14:00.000000000 -0400 21236--- linux-2.6.32.18/drivers/ata/pata_it821x.c 2010-08-10 13:45:57.000000000 -0400
21205+++ linux-2.6.32.16/drivers/ata/pata_it821x.c 2010-07-09 14:50:35.000000000 -0400 21237+++ linux-2.6.32.18/drivers/ata/pata_it821x.c 2010-08-11 18:57:29.000000000 -0400
21206@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ 21238@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
21207 ATA_BMDMA_SHT(DRV_NAME), 21239 ATA_BMDMA_SHT(DRV_NAME),
21208 }; 21240 };
@@ -21230,9 +21262,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_it821x.c linux-2.6.32.16/drivers/ata
21230 .inherits = &ata_bmdma_port_ops, 21262 .inherits = &ata_bmdma_port_ops,
21231 21263
21232 .check_atapi_dma= it821x_check_atapi_dma, 21264 .check_atapi_dma= it821x_check_atapi_dma,
21233diff -urNp linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c 21265diff -urNp linux-2.6.32.18/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.18/drivers/ata/pata_ixp4xx_cf.c
21234--- linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c 2010-07-05 14:14:00.000000000 -0400 21266--- linux-2.6.32.18/drivers/ata/pata_ixp4xx_cf.c 2010-08-10 13:45:57.000000000 -0400
21235+++ linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c 2010-07-09 14:50:35.000000000 -0400 21267+++ linux-2.6.32.18/drivers/ata/pata_ixp4xx_cf.c 2010-08-11 18:57:29.000000000 -0400
21236@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ 21268@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
21237 ATA_PIO_SHT(DRV_NAME), 21269 ATA_PIO_SHT(DRV_NAME),
21238 }; 21270 };
@@ -21242,9 +21274,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.16/drivers/
21242 .inherits = &ata_sff_port_ops, 21274 .inherits = &ata_sff_port_ops,
21243 .sff_data_xfer = ixp4xx_mmio_data_xfer, 21275 .sff_data_xfer = ixp4xx_mmio_data_xfer,
21244 .cable_detect = ata_cable_40wire, 21276 .cable_detect = ata_cable_40wire,
21245diff -urNp linux-2.6.32.16/drivers/ata/pata_jmicron.c linux-2.6.32.16/drivers/ata/pata_jmicron.c 21277diff -urNp linux-2.6.32.18/drivers/ata/pata_jmicron.c linux-2.6.32.18/drivers/ata/pata_jmicron.c
21246--- linux-2.6.32.16/drivers/ata/pata_jmicron.c 2010-07-05 14:14:00.000000000 -0400 21278--- linux-2.6.32.18/drivers/ata/pata_jmicron.c 2010-08-10 13:45:57.000000000 -0400
21247+++ linux-2.6.32.16/drivers/ata/pata_jmicron.c 2010-07-09 14:50:35.000000000 -0400 21279+++ linux-2.6.32.18/drivers/ata/pata_jmicron.c 2010-08-11 18:57:29.000000000 -0400
21248@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron 21280@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
21249 ATA_BMDMA_SHT(DRV_NAME), 21281 ATA_BMDMA_SHT(DRV_NAME),
21250 }; 21282 };
@@ -21254,9 +21286,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_jmicron.c linux-2.6.32.16/drivers/at
21254 .inherits = &ata_bmdma_port_ops, 21286 .inherits = &ata_bmdma_port_ops,
21255 .prereset = jmicron_pre_reset, 21287 .prereset = jmicron_pre_reset,
21256 }; 21288 };
21257diff -urNp linux-2.6.32.16/drivers/ata/pata_legacy.c linux-2.6.32.16/drivers/ata/pata_legacy.c 21289diff -urNp linux-2.6.32.18/drivers/ata/pata_legacy.c linux-2.6.32.18/drivers/ata/pata_legacy.c
21258--- linux-2.6.32.16/drivers/ata/pata_legacy.c 2010-07-05 14:14:00.000000000 -0400 21290--- linux-2.6.32.18/drivers/ata/pata_legacy.c 2010-08-10 13:45:57.000000000 -0400
21259+++ linux-2.6.32.16/drivers/ata/pata_legacy.c 2010-07-09 14:50:35.000000000 -0400 21291+++ linux-2.6.32.18/drivers/ata/pata_legacy.c 2010-08-11 18:57:29.000000000 -0400
21260@@ -106,7 +106,7 @@ struct legacy_probe { 21292@@ -106,7 +106,7 @@ struct legacy_probe {
21261 21293
21262 struct legacy_controller { 21294 struct legacy_controller {
@@ -21368,9 +21400,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_legacy.c linux-2.6.32.16/drivers/ata
21368 struct legacy_data *ld = &legacy_data[probe->slot]; 21400 struct legacy_data *ld = &legacy_data[probe->slot];
21369 struct ata_host *host = NULL; 21401 struct ata_host *host = NULL;
21370 struct ata_port *ap; 21402 struct ata_port *ap;
21371diff -urNp linux-2.6.32.16/drivers/ata/pata_marvell.c linux-2.6.32.16/drivers/ata/pata_marvell.c 21403diff -urNp linux-2.6.32.18/drivers/ata/pata_marvell.c linux-2.6.32.18/drivers/ata/pata_marvell.c
21372--- linux-2.6.32.16/drivers/ata/pata_marvell.c 2010-07-05 14:14:00.000000000 -0400 21404--- linux-2.6.32.18/drivers/ata/pata_marvell.c 2010-08-10 13:45:57.000000000 -0400
21373+++ linux-2.6.32.16/drivers/ata/pata_marvell.c 2010-07-09 14:50:35.000000000 -0400 21405+++ linux-2.6.32.18/drivers/ata/pata_marvell.c 2010-08-11 18:57:29.000000000 -0400
21374@@ -100,7 +100,7 @@ static struct scsi_host_template marvell 21406@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
21375 ATA_BMDMA_SHT(DRV_NAME), 21407 ATA_BMDMA_SHT(DRV_NAME),
21376 }; 21408 };
@@ -21380,9 +21412,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_marvell.c linux-2.6.32.16/drivers/at
21380 .inherits = &ata_bmdma_port_ops, 21412 .inherits = &ata_bmdma_port_ops,
21381 .cable_detect = marvell_cable_detect, 21413 .cable_detect = marvell_cable_detect,
21382 .prereset = marvell_pre_reset, 21414 .prereset = marvell_pre_reset,
21383diff -urNp linux-2.6.32.16/drivers/ata/pata_mpc52xx.c linux-2.6.32.16/drivers/ata/pata_mpc52xx.c 21415diff -urNp linux-2.6.32.18/drivers/ata/pata_mpc52xx.c linux-2.6.32.18/drivers/ata/pata_mpc52xx.c
21384--- linux-2.6.32.16/drivers/ata/pata_mpc52xx.c 2010-07-05 14:14:00.000000000 -0400 21416--- linux-2.6.32.18/drivers/ata/pata_mpc52xx.c 2010-08-10 13:45:57.000000000 -0400
21385+++ linux-2.6.32.16/drivers/ata/pata_mpc52xx.c 2010-07-09 14:50:35.000000000 -0400 21417+++ linux-2.6.32.18/drivers/ata/pata_mpc52xx.c 2010-08-11 18:57:29.000000000 -0400
21386@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx 21418@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
21387 ATA_PIO_SHT(DRV_NAME), 21419 ATA_PIO_SHT(DRV_NAME),
21388 }; 21420 };
@@ -21392,9 +21424,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_mpc52xx.c linux-2.6.32.16/drivers/at
21392 .inherits = &ata_sff_port_ops, 21424 .inherits = &ata_sff_port_ops,
21393 .sff_dev_select = mpc52xx_ata_dev_select, 21425 .sff_dev_select = mpc52xx_ata_dev_select,
21394 .set_piomode = mpc52xx_ata_set_piomode, 21426 .set_piomode = mpc52xx_ata_set_piomode,
21395diff -urNp linux-2.6.32.16/drivers/ata/pata_mpiix.c linux-2.6.32.16/drivers/ata/pata_mpiix.c 21427diff -urNp linux-2.6.32.18/drivers/ata/pata_mpiix.c linux-2.6.32.18/drivers/ata/pata_mpiix.c
21396--- linux-2.6.32.16/drivers/ata/pata_mpiix.c 2010-07-05 14:14:00.000000000 -0400 21428--- linux-2.6.32.18/drivers/ata/pata_mpiix.c 2010-08-10 13:45:57.000000000 -0400
21397+++ linux-2.6.32.16/drivers/ata/pata_mpiix.c 2010-07-09 14:50:35.000000000 -0400 21429+++ linux-2.6.32.18/drivers/ata/pata_mpiix.c 2010-08-11 18:57:29.000000000 -0400
21398@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s 21430@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
21399 ATA_PIO_SHT(DRV_NAME), 21431 ATA_PIO_SHT(DRV_NAME),
21400 }; 21432 };
@@ -21404,9 +21436,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_mpiix.c linux-2.6.32.16/drivers/ata/
21404 .inherits = &ata_sff_port_ops, 21436 .inherits = &ata_sff_port_ops,
21405 .qc_issue = mpiix_qc_issue, 21437 .qc_issue = mpiix_qc_issue,
21406 .cable_detect = ata_cable_40wire, 21438 .cable_detect = ata_cable_40wire,
21407diff -urNp linux-2.6.32.16/drivers/ata/pata_netcell.c linux-2.6.32.16/drivers/ata/pata_netcell.c 21439diff -urNp linux-2.6.32.18/drivers/ata/pata_netcell.c linux-2.6.32.18/drivers/ata/pata_netcell.c
21408--- linux-2.6.32.16/drivers/ata/pata_netcell.c 2010-07-05 14:14:00.000000000 -0400 21440--- linux-2.6.32.18/drivers/ata/pata_netcell.c 2010-08-10 13:45:57.000000000 -0400
21409+++ linux-2.6.32.16/drivers/ata/pata_netcell.c 2010-07-09 14:50:35.000000000 -0400 21441+++ linux-2.6.32.18/drivers/ata/pata_netcell.c 2010-08-11 18:57:29.000000000 -0400
21410@@ -34,7 +34,7 @@ static struct scsi_host_template netcell 21442@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
21411 ATA_BMDMA_SHT(DRV_NAME), 21443 ATA_BMDMA_SHT(DRV_NAME),
21412 }; 21444 };
@@ -21416,9 +21448,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_netcell.c linux-2.6.32.16/drivers/at
21416 .inherits = &ata_bmdma_port_ops, 21448 .inherits = &ata_bmdma_port_ops,
21417 .cable_detect = ata_cable_80wire, 21449 .cable_detect = ata_cable_80wire,
21418 .read_id = netcell_read_id, 21450 .read_id = netcell_read_id,
21419diff -urNp linux-2.6.32.16/drivers/ata/pata_ninja32.c linux-2.6.32.16/drivers/ata/pata_ninja32.c 21451diff -urNp linux-2.6.32.18/drivers/ata/pata_ninja32.c linux-2.6.32.18/drivers/ata/pata_ninja32.c
21420--- linux-2.6.32.16/drivers/ata/pata_ninja32.c 2010-07-05 14:14:00.000000000 -0400 21452--- linux-2.6.32.18/drivers/ata/pata_ninja32.c 2010-08-10 13:45:57.000000000 -0400
21421+++ linux-2.6.32.16/drivers/ata/pata_ninja32.c 2010-07-09 14:50:35.000000000 -0400 21453+++ linux-2.6.32.18/drivers/ata/pata_ninja32.c 2010-08-11 18:57:29.000000000 -0400
21422@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 21454@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
21423 ATA_BMDMA_SHT(DRV_NAME), 21455 ATA_BMDMA_SHT(DRV_NAME),
21424 }; 21456 };
@@ -21428,9 +21460,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_ninja32.c linux-2.6.32.16/drivers/at
21428 .inherits = &ata_bmdma_port_ops, 21460 .inherits = &ata_bmdma_port_ops,
21429 .sff_dev_select = ninja32_dev_select, 21461 .sff_dev_select = ninja32_dev_select,
21430 .cable_detect = ata_cable_40wire, 21462 .cable_detect = ata_cable_40wire,
21431diff -urNp linux-2.6.32.16/drivers/ata/pata_ns87410.c linux-2.6.32.16/drivers/ata/pata_ns87410.c 21463diff -urNp linux-2.6.32.18/drivers/ata/pata_ns87410.c linux-2.6.32.18/drivers/ata/pata_ns87410.c
21432--- linux-2.6.32.16/drivers/ata/pata_ns87410.c 2010-07-05 14:14:00.000000000 -0400 21464--- linux-2.6.32.18/drivers/ata/pata_ns87410.c 2010-08-10 13:45:57.000000000 -0400
21433+++ linux-2.6.32.16/drivers/ata/pata_ns87410.c 2010-07-09 14:50:35.000000000 -0400 21465+++ linux-2.6.32.18/drivers/ata/pata_ns87410.c 2010-08-11 18:57:29.000000000 -0400
21434@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 21466@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
21435 ATA_PIO_SHT(DRV_NAME), 21467 ATA_PIO_SHT(DRV_NAME),
21436 }; 21468 };
@@ -21440,9 +21472,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_ns87410.c linux-2.6.32.16/drivers/at
21440 .inherits = &ata_sff_port_ops, 21472 .inherits = &ata_sff_port_ops,
21441 .qc_issue = ns87410_qc_issue, 21473 .qc_issue = ns87410_qc_issue,
21442 .cable_detect = ata_cable_40wire, 21474 .cable_detect = ata_cable_40wire,
21443diff -urNp linux-2.6.32.16/drivers/ata/pata_ns87415.c linux-2.6.32.16/drivers/ata/pata_ns87415.c 21475diff -urNp linux-2.6.32.18/drivers/ata/pata_ns87415.c linux-2.6.32.18/drivers/ata/pata_ns87415.c
21444--- linux-2.6.32.16/drivers/ata/pata_ns87415.c 2010-07-05 14:14:00.000000000 -0400 21476--- linux-2.6.32.18/drivers/ata/pata_ns87415.c 2010-08-10 13:45:57.000000000 -0400
21445+++ linux-2.6.32.16/drivers/ata/pata_ns87415.c 2010-07-09 14:50:35.000000000 -0400 21477+++ linux-2.6.32.18/drivers/ata/pata_ns87415.c 2010-08-11 18:57:29.000000000 -0400
21446@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at 21478@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
21447 } 21479 }
21448 #endif /* 87560 SuperIO Support */ 21480 #endif /* 87560 SuperIO Support */
@@ -21461,9 +21493,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_ns87415.c linux-2.6.32.16/drivers/at
21461 .inherits = &ns87415_pata_ops, 21493 .inherits = &ns87415_pata_ops,
21462 .sff_tf_read = ns87560_tf_read, 21494 .sff_tf_read = ns87560_tf_read,
21463 .sff_check_status = ns87560_check_status, 21495 .sff_check_status = ns87560_check_status,
21464diff -urNp linux-2.6.32.16/drivers/ata/pata_octeon_cf.c linux-2.6.32.16/drivers/ata/pata_octeon_cf.c 21496diff -urNp linux-2.6.32.18/drivers/ata/pata_octeon_cf.c linux-2.6.32.18/drivers/ata/pata_octeon_cf.c
21465--- linux-2.6.32.16/drivers/ata/pata_octeon_cf.c 2010-07-05 14:14:00.000000000 -0400 21497--- linux-2.6.32.18/drivers/ata/pata_octeon_cf.c 2010-08-10 13:45:57.000000000 -0400
21466+++ linux-2.6.32.16/drivers/ata/pata_octeon_cf.c 2010-07-09 14:50:35.000000000 -0400 21498+++ linux-2.6.32.18/drivers/ata/pata_octeon_cf.c 2010-08-11 18:57:29.000000000 -0400
21467@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s 21499@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
21468 return 0; 21500 return 0;
21469 } 21501 }
@@ -21472,9 +21504,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_octeon_cf.c linux-2.6.32.16/drivers/
21472 static struct ata_port_operations octeon_cf_ops = { 21504 static struct ata_port_operations octeon_cf_ops = {
21473 .inherits = &ata_sff_port_ops, 21505 .inherits = &ata_sff_port_ops,
21474 .check_atapi_dma = octeon_cf_check_atapi_dma, 21506 .check_atapi_dma = octeon_cf_check_atapi_dma,
21475diff -urNp linux-2.6.32.16/drivers/ata/pata_oldpiix.c linux-2.6.32.16/drivers/ata/pata_oldpiix.c 21507diff -urNp linux-2.6.32.18/drivers/ata/pata_oldpiix.c linux-2.6.32.18/drivers/ata/pata_oldpiix.c
21476--- linux-2.6.32.16/drivers/ata/pata_oldpiix.c 2010-07-05 14:14:00.000000000 -0400 21508--- linux-2.6.32.18/drivers/ata/pata_oldpiix.c 2010-08-10 13:45:57.000000000 -0400
21477+++ linux-2.6.32.16/drivers/ata/pata_oldpiix.c 2010-07-09 14:50:35.000000000 -0400 21509+++ linux-2.6.32.18/drivers/ata/pata_oldpiix.c 2010-08-11 18:57:29.000000000 -0400
21478@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix 21510@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
21479 ATA_BMDMA_SHT(DRV_NAME), 21511 ATA_BMDMA_SHT(DRV_NAME),
21480 }; 21512 };
@@ -21484,9 +21516,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_oldpiix.c linux-2.6.32.16/drivers/at
21484 .inherits = &ata_bmdma_port_ops, 21516 .inherits = &ata_bmdma_port_ops,
21485 .qc_issue = oldpiix_qc_issue, 21517 .qc_issue = oldpiix_qc_issue,
21486 .cable_detect = ata_cable_40wire, 21518 .cable_detect = ata_cable_40wire,
21487diff -urNp linux-2.6.32.16/drivers/ata/pata_opti.c linux-2.6.32.16/drivers/ata/pata_opti.c 21519diff -urNp linux-2.6.32.18/drivers/ata/pata_opti.c linux-2.6.32.18/drivers/ata/pata_opti.c
21488--- linux-2.6.32.16/drivers/ata/pata_opti.c 2010-07-05 14:14:00.000000000 -0400 21520--- linux-2.6.32.18/drivers/ata/pata_opti.c 2010-08-10 13:45:57.000000000 -0400
21489+++ linux-2.6.32.16/drivers/ata/pata_opti.c 2010-07-09 14:50:35.000000000 -0400 21521+++ linux-2.6.32.18/drivers/ata/pata_opti.c 2010-08-11 18:57:29.000000000 -0400
21490@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh 21522@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
21491 ATA_PIO_SHT(DRV_NAME), 21523 ATA_PIO_SHT(DRV_NAME),
21492 }; 21524 };
@@ -21496,9 +21528,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_opti.c linux-2.6.32.16/drivers/ata/p
21496 .inherits = &ata_sff_port_ops, 21528 .inherits = &ata_sff_port_ops,
21497 .cable_detect = ata_cable_40wire, 21529 .cable_detect = ata_cable_40wire,
21498 .set_piomode = opti_set_piomode, 21530 .set_piomode = opti_set_piomode,
21499diff -urNp linux-2.6.32.16/drivers/ata/pata_optidma.c linux-2.6.32.16/drivers/ata/pata_optidma.c 21531diff -urNp linux-2.6.32.18/drivers/ata/pata_optidma.c linux-2.6.32.18/drivers/ata/pata_optidma.c
21500--- linux-2.6.32.16/drivers/ata/pata_optidma.c 2010-07-05 14:14:00.000000000 -0400 21532--- linux-2.6.32.18/drivers/ata/pata_optidma.c 2010-08-10 13:45:57.000000000 -0400
21501+++ linux-2.6.32.16/drivers/ata/pata_optidma.c 2010-07-09 14:50:35.000000000 -0400 21533+++ linux-2.6.32.18/drivers/ata/pata_optidma.c 2010-08-11 18:57:29.000000000 -0400
21502@@ -337,7 +337,7 @@ static struct scsi_host_template optidma 21534@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
21503 ATA_BMDMA_SHT(DRV_NAME), 21535 ATA_BMDMA_SHT(DRV_NAME),
21504 }; 21536 };
@@ -21517,9 +21549,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_optidma.c linux-2.6.32.16/drivers/at
21517 .inherits = &optidma_port_ops, 21549 .inherits = &optidma_port_ops,
21518 .set_piomode = optiplus_set_pio_mode, 21550 .set_piomode = optiplus_set_pio_mode,
21519 .set_dmamode = optiplus_set_dma_mode, 21551 .set_dmamode = optiplus_set_dma_mode,
21520diff -urNp linux-2.6.32.16/drivers/ata/pata_palmld.c linux-2.6.32.16/drivers/ata/pata_palmld.c 21552diff -urNp linux-2.6.32.18/drivers/ata/pata_palmld.c linux-2.6.32.18/drivers/ata/pata_palmld.c
21521--- linux-2.6.32.16/drivers/ata/pata_palmld.c 2010-07-05 14:14:00.000000000 -0400 21553--- linux-2.6.32.18/drivers/ata/pata_palmld.c 2010-08-10 13:45:57.000000000 -0400
21522+++ linux-2.6.32.16/drivers/ata/pata_palmld.c 2010-07-09 14:50:35.000000000 -0400 21554+++ linux-2.6.32.18/drivers/ata/pata_palmld.c 2010-08-11 18:57:29.000000000 -0400
21523@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ 21555@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
21524 ATA_PIO_SHT(DRV_NAME), 21556 ATA_PIO_SHT(DRV_NAME),
21525 }; 21557 };
@@ -21529,9 +21561,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_palmld.c linux-2.6.32.16/drivers/ata
21529 .inherits = &ata_sff_port_ops, 21561 .inherits = &ata_sff_port_ops,
21530 .sff_data_xfer = ata_sff_data_xfer_noirq, 21562 .sff_data_xfer = ata_sff_data_xfer_noirq,
21531 .cable_detect = ata_cable_40wire, 21563 .cable_detect = ata_cable_40wire,
21532diff -urNp linux-2.6.32.16/drivers/ata/pata_pcmcia.c linux-2.6.32.16/drivers/ata/pata_pcmcia.c 21564diff -urNp linux-2.6.32.18/drivers/ata/pata_pcmcia.c linux-2.6.32.18/drivers/ata/pata_pcmcia.c
21533--- linux-2.6.32.16/drivers/ata/pata_pcmcia.c 2010-07-05 14:14:00.000000000 -0400 21565--- linux-2.6.32.18/drivers/ata/pata_pcmcia.c 2010-08-10 13:45:57.000000000 -0400
21534+++ linux-2.6.32.16/drivers/ata/pata_pcmcia.c 2010-07-09 14:50:35.000000000 -0400 21566+++ linux-2.6.32.18/drivers/ata/pata_pcmcia.c 2010-08-11 18:57:29.000000000 -0400
21535@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ 21567@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
21536 ATA_PIO_SHT(DRV_NAME), 21568 ATA_PIO_SHT(DRV_NAME),
21537 }; 21569 };
@@ -21558,9 +21590,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_pcmcia.c linux-2.6.32.16/drivers/ata
21558 21590
21559 info = kzalloc(sizeof(*info), GFP_KERNEL); 21591 info = kzalloc(sizeof(*info), GFP_KERNEL);
21560 if (info == NULL) 21592 if (info == NULL)
21561diff -urNp linux-2.6.32.16/drivers/ata/pata_pdc2027x.c linux-2.6.32.16/drivers/ata/pata_pdc2027x.c 21593diff -urNp linux-2.6.32.18/drivers/ata/pata_pdc2027x.c linux-2.6.32.18/drivers/ata/pata_pdc2027x.c
21562--- linux-2.6.32.16/drivers/ata/pata_pdc2027x.c 2010-07-05 14:14:00.000000000 -0400 21594--- linux-2.6.32.18/drivers/ata/pata_pdc2027x.c 2010-08-10 13:45:57.000000000 -0400
21563+++ linux-2.6.32.16/drivers/ata/pata_pdc2027x.c 2010-07-09 14:50:35.000000000 -0400 21595+++ linux-2.6.32.18/drivers/ata/pata_pdc2027x.c 2010-08-11 18:57:29.000000000 -0400
21564@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 21596@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
21565 ATA_BMDMA_SHT(DRV_NAME), 21597 ATA_BMDMA_SHT(DRV_NAME),
21566 }; 21598 };
@@ -21578,9 +21610,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_pdc2027x.c linux-2.6.32.16/drivers/a
21578 .inherits = &pdc2027x_pata100_ops, 21610 .inherits = &pdc2027x_pata100_ops,
21579 .mode_filter = pdc2027x_mode_filter, 21611 .mode_filter = pdc2027x_mode_filter,
21580 .set_piomode = pdc2027x_set_piomode, 21612 .set_piomode = pdc2027x_set_piomode,
21581diff -urNp linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c 21613diff -urNp linux-2.6.32.18/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.18/drivers/ata/pata_pdc202xx_old.c
21582--- linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c 2010-07-05 14:14:00.000000000 -0400 21614--- linux-2.6.32.18/drivers/ata/pata_pdc202xx_old.c 2010-08-10 13:45:57.000000000 -0400
21583+++ linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c 2010-07-09 14:50:35.000000000 -0400 21615+++ linux-2.6.32.18/drivers/ata/pata_pdc202xx_old.c 2010-08-11 18:57:29.000000000 -0400
21584@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x 21616@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x
21585 ATA_BMDMA_SHT(DRV_NAME), 21617 ATA_BMDMA_SHT(DRV_NAME),
21586 }; 21618 };
@@ -21599,9 +21631,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.16/drive
21599 .inherits = &pdc2024x_port_ops, 21631 .inherits = &pdc2024x_port_ops,
21600 21632
21601 .check_atapi_dma = pdc2026x_check_atapi_dma, 21633 .check_atapi_dma = pdc2026x_check_atapi_dma,
21602diff -urNp linux-2.6.32.16/drivers/ata/pata_platform.c linux-2.6.32.16/drivers/ata/pata_platform.c 21634diff -urNp linux-2.6.32.18/drivers/ata/pata_platform.c linux-2.6.32.18/drivers/ata/pata_platform.c
21603--- linux-2.6.32.16/drivers/ata/pata_platform.c 2010-07-05 14:14:00.000000000 -0400 21635--- linux-2.6.32.18/drivers/ata/pata_platform.c 2010-08-10 13:45:57.000000000 -0400
21604+++ linux-2.6.32.16/drivers/ata/pata_platform.c 2010-07-09 14:50:35.000000000 -0400 21636+++ linux-2.6.32.18/drivers/ata/pata_platform.c 2010-08-11 18:57:29.000000000 -0400
21605@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl 21637@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
21606 ATA_PIO_SHT(DRV_NAME), 21638 ATA_PIO_SHT(DRV_NAME),
21607 }; 21639 };
@@ -21611,9 +21643,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_platform.c linux-2.6.32.16/drivers/a
21611 .inherits = &ata_sff_port_ops, 21643 .inherits = &ata_sff_port_ops,
21612 .sff_data_xfer = ata_sff_data_xfer_noirq, 21644 .sff_data_xfer = ata_sff_data_xfer_noirq,
21613 .cable_detect = ata_cable_unknown, 21645 .cable_detect = ata_cable_unknown,
21614diff -urNp linux-2.6.32.16/drivers/ata/pata_qdi.c linux-2.6.32.16/drivers/ata/pata_qdi.c 21646diff -urNp linux-2.6.32.18/drivers/ata/pata_qdi.c linux-2.6.32.18/drivers/ata/pata_qdi.c
21615--- linux-2.6.32.16/drivers/ata/pata_qdi.c 2010-07-05 14:14:00.000000000 -0400 21647--- linux-2.6.32.18/drivers/ata/pata_qdi.c 2010-08-10 13:45:57.000000000 -0400
21616+++ linux-2.6.32.16/drivers/ata/pata_qdi.c 2010-07-09 14:50:35.000000000 -0400 21648+++ linux-2.6.32.18/drivers/ata/pata_qdi.c 2010-08-11 18:57:29.000000000 -0400
21617@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht 21649@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
21618 ATA_PIO_SHT(DRV_NAME), 21650 ATA_PIO_SHT(DRV_NAME),
21619 }; 21651 };
@@ -21632,9 +21664,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_qdi.c linux-2.6.32.16/drivers/ata/pa
21632 .inherits = &qdi6500_port_ops, 21664 .inherits = &qdi6500_port_ops,
21633 .set_piomode = qdi6580_set_piomode, 21665 .set_piomode = qdi6580_set_piomode,
21634 }; 21666 };
21635diff -urNp linux-2.6.32.16/drivers/ata/pata_radisys.c linux-2.6.32.16/drivers/ata/pata_radisys.c 21667diff -urNp linux-2.6.32.18/drivers/ata/pata_radisys.c linux-2.6.32.18/drivers/ata/pata_radisys.c
21636--- linux-2.6.32.16/drivers/ata/pata_radisys.c 2010-07-05 14:14:00.000000000 -0400 21668--- linux-2.6.32.18/drivers/ata/pata_radisys.c 2010-08-10 13:45:57.000000000 -0400
21637+++ linux-2.6.32.16/drivers/ata/pata_radisys.c 2010-07-09 14:50:35.000000000 -0400 21669+++ linux-2.6.32.18/drivers/ata/pata_radisys.c 2010-08-11 18:57:29.000000000 -0400
21638@@ -187,7 +187,7 @@ static struct scsi_host_template radisys 21670@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
21639 ATA_BMDMA_SHT(DRV_NAME), 21671 ATA_BMDMA_SHT(DRV_NAME),
21640 }; 21672 };
@@ -21644,9 +21676,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_radisys.c linux-2.6.32.16/drivers/at
21644 .inherits = &ata_bmdma_port_ops, 21676 .inherits = &ata_bmdma_port_ops,
21645 .qc_issue = radisys_qc_issue, 21677 .qc_issue = radisys_qc_issue,
21646 .cable_detect = ata_cable_unknown, 21678 .cable_detect = ata_cable_unknown,
21647diff -urNp linux-2.6.32.16/drivers/ata/pata_rb532_cf.c linux-2.6.32.16/drivers/ata/pata_rb532_cf.c 21679diff -urNp linux-2.6.32.18/drivers/ata/pata_rb532_cf.c linux-2.6.32.18/drivers/ata/pata_rb532_cf.c
21648--- linux-2.6.32.16/drivers/ata/pata_rb532_cf.c 2010-07-05 14:14:00.000000000 -0400 21680--- linux-2.6.32.18/drivers/ata/pata_rb532_cf.c 2010-08-10 13:45:57.000000000 -0400
21649+++ linux-2.6.32.16/drivers/ata/pata_rb532_cf.c 2010-07-09 14:50:35.000000000 -0400 21681+++ linux-2.6.32.18/drivers/ata/pata_rb532_cf.c 2010-08-11 18:57:29.000000000 -0400
21650@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle 21682@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
21651 return IRQ_HANDLED; 21683 return IRQ_HANDLED;
21652 } 21684 }
@@ -21656,9 +21688,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_rb532_cf.c linux-2.6.32.16/drivers/a
21656 .inherits = &ata_sff_port_ops, 21688 .inherits = &ata_sff_port_ops,
21657 .sff_data_xfer = ata_sff_data_xfer32, 21689 .sff_data_xfer = ata_sff_data_xfer32,
21658 }; 21690 };
21659diff -urNp linux-2.6.32.16/drivers/ata/pata_rdc.c linux-2.6.32.16/drivers/ata/pata_rdc.c 21691diff -urNp linux-2.6.32.18/drivers/ata/pata_rdc.c linux-2.6.32.18/drivers/ata/pata_rdc.c
21660--- linux-2.6.32.16/drivers/ata/pata_rdc.c 2010-07-05 14:14:00.000000000 -0400 21692--- linux-2.6.32.18/drivers/ata/pata_rdc.c 2010-08-10 13:45:57.000000000 -0400
21661+++ linux-2.6.32.16/drivers/ata/pata_rdc.c 2010-07-09 14:50:35.000000000 -0400 21693+++ linux-2.6.32.18/drivers/ata/pata_rdc.c 2010-08-11 18:57:29.000000000 -0400
21662@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p 21694@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
21663 pci_write_config_byte(dev, 0x48, udma_enable); 21695 pci_write_config_byte(dev, 0x48, udma_enable);
21664 } 21696 }
@@ -21668,9 +21700,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_rdc.c linux-2.6.32.16/drivers/ata/pa
21668 .inherits = &ata_bmdma32_port_ops, 21700 .inherits = &ata_bmdma32_port_ops,
21669 .cable_detect = rdc_pata_cable_detect, 21701 .cable_detect = rdc_pata_cable_detect,
21670 .set_piomode = rdc_set_piomode, 21702 .set_piomode = rdc_set_piomode,
21671diff -urNp linux-2.6.32.16/drivers/ata/pata_rz1000.c linux-2.6.32.16/drivers/ata/pata_rz1000.c 21703diff -urNp linux-2.6.32.18/drivers/ata/pata_rz1000.c linux-2.6.32.18/drivers/ata/pata_rz1000.c
21672--- linux-2.6.32.16/drivers/ata/pata_rz1000.c 2010-07-05 14:14:00.000000000 -0400 21704--- linux-2.6.32.18/drivers/ata/pata_rz1000.c 2010-08-10 13:45:57.000000000 -0400
21673+++ linux-2.6.32.16/drivers/ata/pata_rz1000.c 2010-07-09 14:50:35.000000000 -0400 21705+++ linux-2.6.32.18/drivers/ata/pata_rz1000.c 2010-08-11 18:57:29.000000000 -0400
21674@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ 21706@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
21675 ATA_PIO_SHT(DRV_NAME), 21707 ATA_PIO_SHT(DRV_NAME),
21676 }; 21708 };
@@ -21680,9 +21712,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_rz1000.c linux-2.6.32.16/drivers/ata
21680 .inherits = &ata_sff_port_ops, 21712 .inherits = &ata_sff_port_ops,
21681 .cable_detect = ata_cable_40wire, 21713 .cable_detect = ata_cable_40wire,
21682 .set_mode = rz1000_set_mode, 21714 .set_mode = rz1000_set_mode,
21683diff -urNp linux-2.6.32.16/drivers/ata/pata_sc1200.c linux-2.6.32.16/drivers/ata/pata_sc1200.c 21715diff -urNp linux-2.6.32.18/drivers/ata/pata_sc1200.c linux-2.6.32.18/drivers/ata/pata_sc1200.c
21684--- linux-2.6.32.16/drivers/ata/pata_sc1200.c 2010-07-05 14:14:00.000000000 -0400 21716--- linux-2.6.32.18/drivers/ata/pata_sc1200.c 2010-08-10 13:45:57.000000000 -0400
21685+++ linux-2.6.32.16/drivers/ata/pata_sc1200.c 2010-07-09 14:50:35.000000000 -0400 21717+++ linux-2.6.32.18/drivers/ata/pata_sc1200.c 2010-08-11 18:57:29.000000000 -0400
21686@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ 21718@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
21687 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 21719 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
21688 }; 21720 };
@@ -21692,9 +21724,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_sc1200.c linux-2.6.32.16/drivers/ata
21692 .inherits = &ata_bmdma_port_ops, 21724 .inherits = &ata_bmdma_port_ops,
21693 .qc_prep = ata_sff_dumb_qc_prep, 21725 .qc_prep = ata_sff_dumb_qc_prep,
21694 .qc_issue = sc1200_qc_issue, 21726 .qc_issue = sc1200_qc_issue,
21695diff -urNp linux-2.6.32.16/drivers/ata/pata_scc.c linux-2.6.32.16/drivers/ata/pata_scc.c 21727diff -urNp linux-2.6.32.18/drivers/ata/pata_scc.c linux-2.6.32.18/drivers/ata/pata_scc.c
21696--- linux-2.6.32.16/drivers/ata/pata_scc.c 2010-07-05 14:14:00.000000000 -0400 21728--- linux-2.6.32.18/drivers/ata/pata_scc.c 2010-08-10 13:45:57.000000000 -0400
21697+++ linux-2.6.32.16/drivers/ata/pata_scc.c 2010-07-09 14:50:35.000000000 -0400 21729+++ linux-2.6.32.18/drivers/ata/pata_scc.c 2010-08-11 18:57:29.000000000 -0400
21698@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht 21730@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
21699 ATA_BMDMA_SHT(DRV_NAME), 21731 ATA_BMDMA_SHT(DRV_NAME),
21700 }; 21732 };
@@ -21704,9 +21736,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_scc.c linux-2.6.32.16/drivers/ata/pa
21704 .inherits = &ata_bmdma_port_ops, 21736 .inherits = &ata_bmdma_port_ops,
21705 21737
21706 .set_piomode = scc_set_piomode, 21738 .set_piomode = scc_set_piomode,
21707diff -urNp linux-2.6.32.16/drivers/ata/pata_sch.c linux-2.6.32.16/drivers/ata/pata_sch.c 21739diff -urNp linux-2.6.32.18/drivers/ata/pata_sch.c linux-2.6.32.18/drivers/ata/pata_sch.c
21708--- linux-2.6.32.16/drivers/ata/pata_sch.c 2010-07-05 14:14:00.000000000 -0400 21740--- linux-2.6.32.18/drivers/ata/pata_sch.c 2010-08-10 13:45:57.000000000 -0400
21709+++ linux-2.6.32.16/drivers/ata/pata_sch.c 2010-07-09 14:50:35.000000000 -0400 21741+++ linux-2.6.32.18/drivers/ata/pata_sch.c 2010-08-11 18:57:29.000000000 -0400
21710@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht 21742@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
21711 ATA_BMDMA_SHT(DRV_NAME), 21743 ATA_BMDMA_SHT(DRV_NAME),
21712 }; 21744 };
@@ -21716,9 +21748,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_sch.c linux-2.6.32.16/drivers/ata/pa
21716 .inherits = &ata_bmdma_port_ops, 21748 .inherits = &ata_bmdma_port_ops,
21717 .cable_detect = ata_cable_unknown, 21749 .cable_detect = ata_cable_unknown,
21718 .set_piomode = sch_set_piomode, 21750 .set_piomode = sch_set_piomode,
21719diff -urNp linux-2.6.32.16/drivers/ata/pata_serverworks.c linux-2.6.32.16/drivers/ata/pata_serverworks.c 21751diff -urNp linux-2.6.32.18/drivers/ata/pata_serverworks.c linux-2.6.32.18/drivers/ata/pata_serverworks.c
21720--- linux-2.6.32.16/drivers/ata/pata_serverworks.c 2010-07-05 14:14:00.000000000 -0400 21752--- linux-2.6.32.18/drivers/ata/pata_serverworks.c 2010-08-10 13:45:57.000000000 -0400
21721+++ linux-2.6.32.16/drivers/ata/pata_serverworks.c 2010-07-09 14:50:35.000000000 -0400 21753+++ linux-2.6.32.18/drivers/ata/pata_serverworks.c 2010-08-11 18:57:29.000000000 -0400
21722@@ -299,7 +299,7 @@ static struct scsi_host_template serverw 21754@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
21723 ATA_BMDMA_SHT(DRV_NAME), 21755 ATA_BMDMA_SHT(DRV_NAME),
21724 }; 21756 };
@@ -21737,9 +21769,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_serverworks.c linux-2.6.32.16/driver
21737 .inherits = &serverworks_osb4_port_ops, 21769 .inherits = &serverworks_osb4_port_ops,
21738 .mode_filter = serverworks_csb_filter, 21770 .mode_filter = serverworks_csb_filter,
21739 }; 21771 };
21740diff -urNp linux-2.6.32.16/drivers/ata/pata_sil680.c linux-2.6.32.16/drivers/ata/pata_sil680.c 21772diff -urNp linux-2.6.32.18/drivers/ata/pata_sil680.c linux-2.6.32.18/drivers/ata/pata_sil680.c
21741--- linux-2.6.32.16/drivers/ata/pata_sil680.c 2010-07-05 14:14:00.000000000 -0400 21773--- linux-2.6.32.18/drivers/ata/pata_sil680.c 2010-08-10 13:45:57.000000000 -0400
21742+++ linux-2.6.32.16/drivers/ata/pata_sil680.c 2010-07-09 14:50:35.000000000 -0400 21774+++ linux-2.6.32.18/drivers/ata/pata_sil680.c 2010-08-11 18:57:29.000000000 -0400
21743@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ 21775@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
21744 ATA_BMDMA_SHT(DRV_NAME), 21776 ATA_BMDMA_SHT(DRV_NAME),
21745 }; 21777 };
@@ -21749,9 +21781,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_sil680.c linux-2.6.32.16/drivers/ata
21749 .inherits = &ata_bmdma32_port_ops, 21781 .inherits = &ata_bmdma32_port_ops,
21750 .cable_detect = sil680_cable_detect, 21782 .cable_detect = sil680_cable_detect,
21751 .set_piomode = sil680_set_piomode, 21783 .set_piomode = sil680_set_piomode,
21752diff -urNp linux-2.6.32.16/drivers/ata/pata_sis.c linux-2.6.32.16/drivers/ata/pata_sis.c 21784diff -urNp linux-2.6.32.18/drivers/ata/pata_sis.c linux-2.6.32.18/drivers/ata/pata_sis.c
21753--- linux-2.6.32.16/drivers/ata/pata_sis.c 2010-07-05 14:14:00.000000000 -0400 21785--- linux-2.6.32.18/drivers/ata/pata_sis.c 2010-08-10 13:45:57.000000000 -0400
21754+++ linux-2.6.32.16/drivers/ata/pata_sis.c 2010-07-09 14:50:35.000000000 -0400 21786+++ linux-2.6.32.18/drivers/ata/pata_sis.c 2010-08-11 18:57:29.000000000 -0400
21755@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht 21787@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
21756 ATA_BMDMA_SHT(DRV_NAME), 21788 ATA_BMDMA_SHT(DRV_NAME),
21757 }; 21789 };
@@ -21807,9 +21839,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_sis.c linux-2.6.32.16/drivers/ata/pa
21807 .inherits = &sis_base_ops, 21839 .inherits = &sis_base_ops,
21808 .set_piomode = sis_old_set_piomode, 21840 .set_piomode = sis_old_set_piomode,
21809 .set_dmamode = sis_old_set_dmamode, 21841 .set_dmamode = sis_old_set_dmamode,
21810diff -urNp linux-2.6.32.16/drivers/ata/pata_sl82c105.c linux-2.6.32.16/drivers/ata/pata_sl82c105.c 21842diff -urNp linux-2.6.32.18/drivers/ata/pata_sl82c105.c linux-2.6.32.18/drivers/ata/pata_sl82c105.c
21811--- linux-2.6.32.16/drivers/ata/pata_sl82c105.c 2010-07-05 14:14:00.000000000 -0400 21843--- linux-2.6.32.18/drivers/ata/pata_sl82c105.c 2010-08-10 13:45:57.000000000 -0400
21812+++ linux-2.6.32.16/drivers/ata/pata_sl82c105.c 2010-07-09 14:50:35.000000000 -0400 21844+++ linux-2.6.32.18/drivers/ata/pata_sl82c105.c 2010-08-11 18:57:29.000000000 -0400
21813@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 21845@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
21814 ATA_BMDMA_SHT(DRV_NAME), 21846 ATA_BMDMA_SHT(DRV_NAME),
21815 }; 21847 };
@@ -21819,9 +21851,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_sl82c105.c linux-2.6.32.16/drivers/a
21819 .inherits = &ata_bmdma_port_ops, 21851 .inherits = &ata_bmdma_port_ops,
21820 .qc_defer = sl82c105_qc_defer, 21852 .qc_defer = sl82c105_qc_defer,
21821 .bmdma_start = sl82c105_bmdma_start, 21853 .bmdma_start = sl82c105_bmdma_start,
21822diff -urNp linux-2.6.32.16/drivers/ata/pata_triflex.c linux-2.6.32.16/drivers/ata/pata_triflex.c 21854diff -urNp linux-2.6.32.18/drivers/ata/pata_triflex.c linux-2.6.32.18/drivers/ata/pata_triflex.c
21823--- linux-2.6.32.16/drivers/ata/pata_triflex.c 2010-07-05 14:14:00.000000000 -0400 21855--- linux-2.6.32.18/drivers/ata/pata_triflex.c 2010-08-10 13:45:57.000000000 -0400
21824+++ linux-2.6.32.16/drivers/ata/pata_triflex.c 2010-07-09 14:50:35.000000000 -0400 21856+++ linux-2.6.32.18/drivers/ata/pata_triflex.c 2010-08-11 18:57:29.000000000 -0400
21825@@ -178,7 +178,7 @@ static struct scsi_host_template triflex 21857@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
21826 ATA_BMDMA_SHT(DRV_NAME), 21858 ATA_BMDMA_SHT(DRV_NAME),
21827 }; 21859 };
@@ -21831,9 +21863,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_triflex.c linux-2.6.32.16/drivers/at
21831 .inherits = &ata_bmdma_port_ops, 21863 .inherits = &ata_bmdma_port_ops,
21832 .bmdma_start = triflex_bmdma_start, 21864 .bmdma_start = triflex_bmdma_start,
21833 .bmdma_stop = triflex_bmdma_stop, 21865 .bmdma_stop = triflex_bmdma_stop,
21834diff -urNp linux-2.6.32.16/drivers/ata/pata_via.c linux-2.6.32.16/drivers/ata/pata_via.c 21866diff -urNp linux-2.6.32.18/drivers/ata/pata_via.c linux-2.6.32.18/drivers/ata/pata_via.c
21835--- linux-2.6.32.16/drivers/ata/pata_via.c 2010-07-05 14:14:00.000000000 -0400 21867--- linux-2.6.32.18/drivers/ata/pata_via.c 2010-08-10 13:45:57.000000000 -0400
21836+++ linux-2.6.32.16/drivers/ata/pata_via.c 2010-07-09 14:50:35.000000000 -0400 21868+++ linux-2.6.32.18/drivers/ata/pata_via.c 2010-08-11 18:57:29.000000000 -0400
21837@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht 21869@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
21838 ATA_BMDMA_SHT(DRV_NAME), 21870 ATA_BMDMA_SHT(DRV_NAME),
21839 }; 21871 };
@@ -21852,9 +21884,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_via.c linux-2.6.32.16/drivers/ata/pa
21852 .inherits = &via_port_ops, 21884 .inherits = &via_port_ops,
21853 .sff_data_xfer = ata_sff_data_xfer_noirq, 21885 .sff_data_xfer = ata_sff_data_xfer_noirq,
21854 }; 21886 };
21855diff -urNp linux-2.6.32.16/drivers/ata/pata_winbond.c linux-2.6.32.16/drivers/ata/pata_winbond.c 21887diff -urNp linux-2.6.32.18/drivers/ata/pata_winbond.c linux-2.6.32.18/drivers/ata/pata_winbond.c
21856--- linux-2.6.32.16/drivers/ata/pata_winbond.c 2010-07-05 14:14:00.000000000 -0400 21888--- linux-2.6.32.18/drivers/ata/pata_winbond.c 2010-08-10 13:45:57.000000000 -0400
21857+++ linux-2.6.32.16/drivers/ata/pata_winbond.c 2010-07-09 14:50:35.000000000 -0400 21889+++ linux-2.6.32.18/drivers/ata/pata_winbond.c 2010-08-11 18:57:29.000000000 -0400
21858@@ -125,7 +125,7 @@ static struct scsi_host_template winbond 21890@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
21859 ATA_PIO_SHT(DRV_NAME), 21891 ATA_PIO_SHT(DRV_NAME),
21860 }; 21892 };
@@ -21864,9 +21896,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pata_winbond.c linux-2.6.32.16/drivers/at
21864 .inherits = &ata_sff_port_ops, 21896 .inherits = &ata_sff_port_ops,
21865 .sff_data_xfer = winbond_data_xfer, 21897 .sff_data_xfer = winbond_data_xfer,
21866 .cable_detect = ata_cable_40wire, 21898 .cable_detect = ata_cable_40wire,
21867diff -urNp linux-2.6.32.16/drivers/ata/pdc_adma.c linux-2.6.32.16/drivers/ata/pdc_adma.c 21899diff -urNp linux-2.6.32.18/drivers/ata/pdc_adma.c linux-2.6.32.18/drivers/ata/pdc_adma.c
21868--- linux-2.6.32.16/drivers/ata/pdc_adma.c 2010-07-05 14:14:00.000000000 -0400 21900--- linux-2.6.32.18/drivers/ata/pdc_adma.c 2010-08-10 13:45:57.000000000 -0400
21869+++ linux-2.6.32.16/drivers/ata/pdc_adma.c 2010-07-09 14:50:35.000000000 -0400 21901+++ linux-2.6.32.18/drivers/ata/pdc_adma.c 2010-08-11 18:57:29.000000000 -0400
21870@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at 21902@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
21871 .dma_boundary = ADMA_DMA_BOUNDARY, 21903 .dma_boundary = ADMA_DMA_BOUNDARY,
21872 }; 21904 };
@@ -21876,9 +21908,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/pdc_adma.c linux-2.6.32.16/drivers/ata/pd
21876 .inherits = &ata_sff_port_ops, 21908 .inherits = &ata_sff_port_ops,
21877 21909
21878 .lost_interrupt = ATA_OP_NULL, 21910 .lost_interrupt = ATA_OP_NULL,
21879diff -urNp linux-2.6.32.16/drivers/ata/sata_fsl.c linux-2.6.32.16/drivers/ata/sata_fsl.c 21911diff -urNp linux-2.6.32.18/drivers/ata/sata_fsl.c linux-2.6.32.18/drivers/ata/sata_fsl.c
21880--- linux-2.6.32.16/drivers/ata/sata_fsl.c 2010-07-05 14:14:00.000000000 -0400 21912--- linux-2.6.32.18/drivers/ata/sata_fsl.c 2010-08-10 13:45:57.000000000 -0400
21881+++ linux-2.6.32.16/drivers/ata/sata_fsl.c 2010-07-09 14:50:35.000000000 -0400 21913+++ linux-2.6.32.18/drivers/ata/sata_fsl.c 2010-08-11 18:57:29.000000000 -0400
21882@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs 21914@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
21883 .dma_boundary = ATA_DMA_BOUNDARY, 21915 .dma_boundary = ATA_DMA_BOUNDARY,
21884 }; 21916 };
@@ -21888,9 +21920,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_fsl.c linux-2.6.32.16/drivers/ata/sa
21888 .inherits = &sata_pmp_port_ops, 21920 .inherits = &sata_pmp_port_ops,
21889 21921
21890 .qc_defer = ata_std_qc_defer, 21922 .qc_defer = ata_std_qc_defer,
21891diff -urNp linux-2.6.32.16/drivers/ata/sata_inic162x.c linux-2.6.32.16/drivers/ata/sata_inic162x.c 21923diff -urNp linux-2.6.32.18/drivers/ata/sata_inic162x.c linux-2.6.32.18/drivers/ata/sata_inic162x.c
21892--- linux-2.6.32.16/drivers/ata/sata_inic162x.c 2010-07-05 14:14:00.000000000 -0400 21924--- linux-2.6.32.18/drivers/ata/sata_inic162x.c 2010-08-10 13:45:57.000000000 -0400
21893+++ linux-2.6.32.16/drivers/ata/sata_inic162x.c 2010-07-09 14:50:35.000000000 -0400 21925+++ linux-2.6.32.18/drivers/ata/sata_inic162x.c 2010-08-11 18:57:29.000000000 -0400
21894@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po 21926@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
21895 return 0; 21927 return 0;
21896 } 21928 }
@@ -21900,9 +21932,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_inic162x.c linux-2.6.32.16/drivers/a
21900 .inherits = &sata_port_ops, 21932 .inherits = &sata_port_ops,
21901 21933
21902 .check_atapi_dma = inic_check_atapi_dma, 21934 .check_atapi_dma = inic_check_atapi_dma,
21903diff -urNp linux-2.6.32.16/drivers/ata/sata_mv.c linux-2.6.32.16/drivers/ata/sata_mv.c 21935diff -urNp linux-2.6.32.18/drivers/ata/sata_mv.c linux-2.6.32.18/drivers/ata/sata_mv.c
21904--- linux-2.6.32.16/drivers/ata/sata_mv.c 2010-07-05 14:14:00.000000000 -0400 21936--- linux-2.6.32.18/drivers/ata/sata_mv.c 2010-08-10 13:45:57.000000000 -0400
21905+++ linux-2.6.32.16/drivers/ata/sata_mv.c 2010-07-09 14:50:35.000000000 -0400 21937+++ linux-2.6.32.18/drivers/ata/sata_mv.c 2010-08-11 18:57:29.000000000 -0400
21906@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht 21938@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
21907 .dma_boundary = MV_DMA_BOUNDARY, 21939 .dma_boundary = MV_DMA_BOUNDARY,
21908 }; 21940 };
@@ -21930,9 +21962,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_mv.c linux-2.6.32.16/drivers/ata/sat
21930 .inherits = &mv6_ops, 21962 .inherits = &mv6_ops,
21931 .dev_config = ATA_OP_NULL, 21963 .dev_config = ATA_OP_NULL,
21932 .qc_prep = mv_qc_prep_iie, 21964 .qc_prep = mv_qc_prep_iie,
21933diff -urNp linux-2.6.32.16/drivers/ata/sata_nv.c linux-2.6.32.16/drivers/ata/sata_nv.c 21965diff -urNp linux-2.6.32.18/drivers/ata/sata_nv.c linux-2.6.32.18/drivers/ata/sata_nv.c
21934--- linux-2.6.32.16/drivers/ata/sata_nv.c 2010-07-05 14:14:00.000000000 -0400 21966--- linux-2.6.32.18/drivers/ata/sata_nv.c 2010-08-10 13:45:57.000000000 -0400
21935+++ linux-2.6.32.16/drivers/ata/sata_nv.c 2010-07-09 14:50:35.000000000 -0400 21967+++ linux-2.6.32.18/drivers/ata/sata_nv.c 2010-08-11 18:57:29.000000000 -0400
21936@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc 21968@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
21937 * cases. Define nv_hardreset() which only kicks in for post-boot 21969 * cases. Define nv_hardreset() which only kicks in for post-boot
21938 * probing and use it for all variants. 21970 * probing and use it for all variants.
@@ -21975,9 +22007,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_nv.c linux-2.6.32.16/drivers/ata/sat
21975 .inherits = &nv_generic_ops, 22007 .inherits = &nv_generic_ops,
21976 22008
21977 .qc_defer = ata_std_qc_defer, 22009 .qc_defer = ata_std_qc_defer,
21978diff -urNp linux-2.6.32.16/drivers/ata/sata_promise.c linux-2.6.32.16/drivers/ata/sata_promise.c 22010diff -urNp linux-2.6.32.18/drivers/ata/sata_promise.c linux-2.6.32.18/drivers/ata/sata_promise.c
21979--- linux-2.6.32.16/drivers/ata/sata_promise.c 2010-07-05 14:14:00.000000000 -0400 22011--- linux-2.6.32.18/drivers/ata/sata_promise.c 2010-08-10 13:45:57.000000000 -0400
21980+++ linux-2.6.32.16/drivers/ata/sata_promise.c 2010-07-09 14:50:35.000000000 -0400 22012+++ linux-2.6.32.18/drivers/ata/sata_promise.c 2010-08-11 18:57:29.000000000 -0400
21981@@ -195,7 +195,7 @@ static const struct ata_port_operations 22013@@ -195,7 +195,7 @@ static const struct ata_port_operations
21982 .error_handler = pdc_error_handler, 22014 .error_handler = pdc_error_handler,
21983 }; 22015 };
@@ -22004,9 +22036,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_promise.c linux-2.6.32.16/drivers/at
22004 .inherits = &pdc_common_ops, 22036 .inherits = &pdc_common_ops,
22005 .cable_detect = pdc_pata_cable_detect, 22037 .cable_detect = pdc_pata_cable_detect,
22006 .freeze = pdc_freeze, 22038 .freeze = pdc_freeze,
22007diff -urNp linux-2.6.32.16/drivers/ata/sata_qstor.c linux-2.6.32.16/drivers/ata/sata_qstor.c 22039diff -urNp linux-2.6.32.18/drivers/ata/sata_qstor.c linux-2.6.32.18/drivers/ata/sata_qstor.c
22008--- linux-2.6.32.16/drivers/ata/sata_qstor.c 2010-07-05 14:14:00.000000000 -0400 22040--- linux-2.6.32.18/drivers/ata/sata_qstor.c 2010-08-10 13:45:57.000000000 -0400
22009+++ linux-2.6.32.16/drivers/ata/sata_qstor.c 2010-07-09 14:50:35.000000000 -0400 22041+++ linux-2.6.32.18/drivers/ata/sata_qstor.c 2010-08-11 18:57:29.000000000 -0400
22010@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ 22042@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
22011 .dma_boundary = QS_DMA_BOUNDARY, 22043 .dma_boundary = QS_DMA_BOUNDARY,
22012 }; 22044 };
@@ -22016,9 +22048,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_qstor.c linux-2.6.32.16/drivers/ata/
22016 .inherits = &ata_sff_port_ops, 22048 .inherits = &ata_sff_port_ops,
22017 22049
22018 .check_atapi_dma = qs_check_atapi_dma, 22050 .check_atapi_dma = qs_check_atapi_dma,
22019diff -urNp linux-2.6.32.16/drivers/ata/sata_sil24.c linux-2.6.32.16/drivers/ata/sata_sil24.c 22051diff -urNp linux-2.6.32.18/drivers/ata/sata_sil24.c linux-2.6.32.18/drivers/ata/sata_sil24.c
22020--- linux-2.6.32.16/drivers/ata/sata_sil24.c 2010-07-05 14:14:00.000000000 -0400 22052--- linux-2.6.32.18/drivers/ata/sata_sil24.c 2010-08-10 13:45:57.000000000 -0400
22021+++ linux-2.6.32.16/drivers/ata/sata_sil24.c 2010-07-09 14:50:35.000000000 -0400 22053+++ linux-2.6.32.18/drivers/ata/sata_sil24.c 2010-08-11 18:57:29.000000000 -0400
22022@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s 22054@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
22023 .dma_boundary = ATA_DMA_BOUNDARY, 22055 .dma_boundary = ATA_DMA_BOUNDARY,
22024 }; 22056 };
@@ -22028,9 +22060,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_sil24.c linux-2.6.32.16/drivers/ata/
22028 .inherits = &sata_pmp_port_ops, 22060 .inherits = &sata_pmp_port_ops,
22029 22061
22030 .qc_defer = sil24_qc_defer, 22062 .qc_defer = sil24_qc_defer,
22031diff -urNp linux-2.6.32.16/drivers/ata/sata_sil.c linux-2.6.32.16/drivers/ata/sata_sil.c 22063diff -urNp linux-2.6.32.18/drivers/ata/sata_sil.c linux-2.6.32.18/drivers/ata/sata_sil.c
22032--- linux-2.6.32.16/drivers/ata/sata_sil.c 2010-07-05 14:14:00.000000000 -0400 22064--- linux-2.6.32.18/drivers/ata/sata_sil.c 2010-08-10 13:45:57.000000000 -0400
22033+++ linux-2.6.32.16/drivers/ata/sata_sil.c 2010-07-09 14:50:35.000000000 -0400 22065+++ linux-2.6.32.18/drivers/ata/sata_sil.c 2010-08-11 18:57:29.000000000 -0400
22034@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht 22066@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
22035 .sg_tablesize = ATA_MAX_PRD 22067 .sg_tablesize = ATA_MAX_PRD
22036 }; 22068 };
@@ -22040,9 +22072,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_sil.c linux-2.6.32.16/drivers/ata/sa
22040 .inherits = &ata_bmdma32_port_ops, 22072 .inherits = &ata_bmdma32_port_ops,
22041 .dev_config = sil_dev_config, 22073 .dev_config = sil_dev_config,
22042 .set_mode = sil_set_mode, 22074 .set_mode = sil_set_mode,
22043diff -urNp linux-2.6.32.16/drivers/ata/sata_sis.c linux-2.6.32.16/drivers/ata/sata_sis.c 22075diff -urNp linux-2.6.32.18/drivers/ata/sata_sis.c linux-2.6.32.18/drivers/ata/sata_sis.c
22044--- linux-2.6.32.16/drivers/ata/sata_sis.c 2010-07-05 14:14:00.000000000 -0400 22076--- linux-2.6.32.18/drivers/ata/sata_sis.c 2010-08-10 13:45:57.000000000 -0400
22045+++ linux-2.6.32.16/drivers/ata/sata_sis.c 2010-07-09 14:50:35.000000000 -0400 22077+++ linux-2.6.32.18/drivers/ata/sata_sis.c 2010-08-11 18:57:29.000000000 -0400
22046@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht 22078@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
22047 ATA_BMDMA_SHT(DRV_NAME), 22079 ATA_BMDMA_SHT(DRV_NAME),
22048 }; 22080 };
@@ -22052,9 +22084,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_sis.c linux-2.6.32.16/drivers/ata/sa
22052 .inherits = &ata_bmdma_port_ops, 22084 .inherits = &ata_bmdma_port_ops,
22053 .scr_read = sis_scr_read, 22085 .scr_read = sis_scr_read,
22054 .scr_write = sis_scr_write, 22086 .scr_write = sis_scr_write,
22055diff -urNp linux-2.6.32.16/drivers/ata/sata_svw.c linux-2.6.32.16/drivers/ata/sata_svw.c 22087diff -urNp linux-2.6.32.18/drivers/ata/sata_svw.c linux-2.6.32.18/drivers/ata/sata_svw.c
22056--- linux-2.6.32.16/drivers/ata/sata_svw.c 2010-07-05 14:14:00.000000000 -0400 22088--- linux-2.6.32.18/drivers/ata/sata_svw.c 2010-08-10 13:45:57.000000000 -0400
22057+++ linux-2.6.32.16/drivers/ata/sata_svw.c 2010-07-09 14:50:35.000000000 -0400 22089+++ linux-2.6.32.18/drivers/ata/sata_svw.c 2010-08-11 18:57:29.000000000 -0400
22058@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata 22090@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
22059 }; 22091 };
22060 22092
@@ -22064,9 +22096,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_svw.c linux-2.6.32.16/drivers/ata/sa
22064 .inherits = &ata_bmdma_port_ops, 22096 .inherits = &ata_bmdma_port_ops,
22065 .sff_tf_load = k2_sata_tf_load, 22097 .sff_tf_load = k2_sata_tf_load,
22066 .sff_tf_read = k2_sata_tf_read, 22098 .sff_tf_read = k2_sata_tf_read,
22067diff -urNp linux-2.6.32.16/drivers/ata/sata_sx4.c linux-2.6.32.16/drivers/ata/sata_sx4.c 22099diff -urNp linux-2.6.32.18/drivers/ata/sata_sx4.c linux-2.6.32.18/drivers/ata/sata_sx4.c
22068--- linux-2.6.32.16/drivers/ata/sata_sx4.c 2010-07-05 14:14:00.000000000 -0400 22100--- linux-2.6.32.18/drivers/ata/sata_sx4.c 2010-08-10 13:45:57.000000000 -0400
22069+++ linux-2.6.32.16/drivers/ata/sata_sx4.c 2010-07-09 14:50:35.000000000 -0400 22101+++ linux-2.6.32.18/drivers/ata/sata_sx4.c 2010-08-11 18:57:29.000000000 -0400
22070@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat 22102@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
22071 }; 22103 };
22072 22104
@@ -22076,9 +22108,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_sx4.c linux-2.6.32.16/drivers/ata/sa
22076 .inherits = &ata_sff_port_ops, 22108 .inherits = &ata_sff_port_ops,
22077 22109
22078 .check_atapi_dma = pdc_check_atapi_dma, 22110 .check_atapi_dma = pdc_check_atapi_dma,
22079diff -urNp linux-2.6.32.16/drivers/ata/sata_uli.c linux-2.6.32.16/drivers/ata/sata_uli.c 22111diff -urNp linux-2.6.32.18/drivers/ata/sata_uli.c linux-2.6.32.18/drivers/ata/sata_uli.c
22080--- linux-2.6.32.16/drivers/ata/sata_uli.c 2010-07-05 14:14:00.000000000 -0400 22112--- linux-2.6.32.18/drivers/ata/sata_uli.c 2010-08-10 13:45:57.000000000 -0400
22081+++ linux-2.6.32.16/drivers/ata/sata_uli.c 2010-07-09 14:50:35.000000000 -0400 22113+++ linux-2.6.32.18/drivers/ata/sata_uli.c 2010-08-11 18:57:29.000000000 -0400
22082@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht 22114@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
22083 ATA_BMDMA_SHT(DRV_NAME), 22115 ATA_BMDMA_SHT(DRV_NAME),
22084 }; 22116 };
@@ -22088,9 +22120,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_uli.c linux-2.6.32.16/drivers/ata/sa
22088 .inherits = &ata_bmdma_port_ops, 22120 .inherits = &ata_bmdma_port_ops,
22089 .scr_read = uli_scr_read, 22121 .scr_read = uli_scr_read,
22090 .scr_write = uli_scr_write, 22122 .scr_write = uli_scr_write,
22091diff -urNp linux-2.6.32.16/drivers/ata/sata_via.c linux-2.6.32.16/drivers/ata/sata_via.c 22123diff -urNp linux-2.6.32.18/drivers/ata/sata_via.c linux-2.6.32.18/drivers/ata/sata_via.c
22092--- linux-2.6.32.16/drivers/ata/sata_via.c 2010-07-05 14:14:00.000000000 -0400 22124--- linux-2.6.32.18/drivers/ata/sata_via.c 2010-08-10 13:45:57.000000000 -0400
22093+++ linux-2.6.32.16/drivers/ata/sata_via.c 2010-07-09 14:50:35.000000000 -0400 22125+++ linux-2.6.32.18/drivers/ata/sata_via.c 2010-08-11 18:57:29.000000000 -0400
22094@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh 22126@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
22095 ATA_BMDMA_SHT(DRV_NAME), 22127 ATA_BMDMA_SHT(DRV_NAME),
22096 }; 22128 };
@@ -22128,9 +22160,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_via.c linux-2.6.32.16/drivers/ata/sa
22128 .inherits = &svia_base_ops, 22160 .inherits = &svia_base_ops,
22129 .hardreset = sata_std_hardreset, 22161 .hardreset = sata_std_hardreset,
22130 .scr_read = vt8251_scr_read, 22162 .scr_read = vt8251_scr_read,
22131diff -urNp linux-2.6.32.16/drivers/ata/sata_vsc.c linux-2.6.32.16/drivers/ata/sata_vsc.c 22163diff -urNp linux-2.6.32.18/drivers/ata/sata_vsc.c linux-2.6.32.18/drivers/ata/sata_vsc.c
22132--- linux-2.6.32.16/drivers/ata/sata_vsc.c 2010-07-05 14:14:00.000000000 -0400 22164--- linux-2.6.32.18/drivers/ata/sata_vsc.c 2010-08-10 13:45:57.000000000 -0400
22133+++ linux-2.6.32.16/drivers/ata/sata_vsc.c 2010-07-09 14:50:35.000000000 -0400 22165+++ linux-2.6.32.18/drivers/ata/sata_vsc.c 2010-08-11 18:57:29.000000000 -0400
22134@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat 22166@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
22135 }; 22167 };
22136 22168
@@ -22140,9 +22172,9 @@ diff -urNp linux-2.6.32.16/drivers/ata/sata_vsc.c linux-2.6.32.16/drivers/ata/sa
22140 .inherits = &ata_bmdma_port_ops, 22172 .inherits = &ata_bmdma_port_ops,
22141 /* The IRQ handling is not quite standard SFF behaviour so we 22173 /* The IRQ handling is not quite standard SFF behaviour so we
22142 cannot use the default lost interrupt handler */ 22174 cannot use the default lost interrupt handler */
22143diff -urNp linux-2.6.32.16/drivers/atm/adummy.c linux-2.6.32.16/drivers/atm/adummy.c 22175diff -urNp linux-2.6.32.18/drivers/atm/adummy.c linux-2.6.32.18/drivers/atm/adummy.c
22144--- linux-2.6.32.16/drivers/atm/adummy.c 2010-07-05 14:14:00.000000000 -0400 22176--- linux-2.6.32.18/drivers/atm/adummy.c 2010-08-10 13:45:57.000000000 -0400
22145+++ linux-2.6.32.16/drivers/atm/adummy.c 2010-07-09 14:50:35.000000000 -0400 22177+++ linux-2.6.32.18/drivers/atm/adummy.c 2010-08-11 18:57:29.000000000 -0400
22146@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct 22178@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
22147 vcc->pop(vcc, skb); 22179 vcc->pop(vcc, skb);
22148 else 22180 else
@@ -22152,9 +22184,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/adummy.c linux-2.6.32.16/drivers/atm/adum
22152 22184
22153 return 0; 22185 return 0;
22154 } 22186 }
22155diff -urNp linux-2.6.32.16/drivers/atm/ambassador.c linux-2.6.32.16/drivers/atm/ambassador.c 22187diff -urNp linux-2.6.32.18/drivers/atm/ambassador.c linux-2.6.32.18/drivers/atm/ambassador.c
22156--- linux-2.6.32.16/drivers/atm/ambassador.c 2010-07-05 14:14:00.000000000 -0400 22188--- linux-2.6.32.18/drivers/atm/ambassador.c 2010-08-10 13:45:57.000000000 -0400
22157+++ linux-2.6.32.16/drivers/atm/ambassador.c 2010-07-09 14:50:35.000000000 -0400 22189+++ linux-2.6.32.18/drivers/atm/ambassador.c 2010-08-11 18:57:29.000000000 -0400
22158@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, 22190@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
22159 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); 22191 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
22160 22192
@@ -22191,9 +22223,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/ambassador.c linux-2.6.32.16/drivers/atm/
22191 return -ENOMEM; // ? 22223 return -ENOMEM; // ?
22192 } 22224 }
22193 22225
22194diff -urNp linux-2.6.32.16/drivers/atm/atmtcp.c linux-2.6.32.16/drivers/atm/atmtcp.c 22226diff -urNp linux-2.6.32.18/drivers/atm/atmtcp.c linux-2.6.32.18/drivers/atm/atmtcp.c
22195--- linux-2.6.32.16/drivers/atm/atmtcp.c 2010-07-05 14:14:00.000000000 -0400 22227--- linux-2.6.32.18/drivers/atm/atmtcp.c 2010-08-10 13:45:57.000000000 -0400
22196+++ linux-2.6.32.16/drivers/atm/atmtcp.c 2010-07-09 14:50:35.000000000 -0400 22228+++ linux-2.6.32.18/drivers/atm/atmtcp.c 2010-08-11 18:57:29.000000000 -0400
22197@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc 22229@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc
22198 if (vcc->pop) vcc->pop(vcc,skb); 22230 if (vcc->pop) vcc->pop(vcc,skb);
22199 else dev_kfree_skb(skb); 22231 else dev_kfree_skb(skb);
@@ -22243,9 +22275,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/atmtcp.c linux-2.6.32.16/drivers/atm/atmt
22243 done: 22275 done:
22244 if (vcc->pop) vcc->pop(vcc,skb); 22276 if (vcc->pop) vcc->pop(vcc,skb);
22245 else dev_kfree_skb(skb); 22277 else dev_kfree_skb(skb);
22246diff -urNp linux-2.6.32.16/drivers/atm/eni.c linux-2.6.32.16/drivers/atm/eni.c 22278diff -urNp linux-2.6.32.18/drivers/atm/eni.c linux-2.6.32.18/drivers/atm/eni.c
22247--- linux-2.6.32.16/drivers/atm/eni.c 2010-07-05 14:14:00.000000000 -0400 22279--- linux-2.6.32.18/drivers/atm/eni.c 2010-08-10 13:45:57.000000000 -0400
22248+++ linux-2.6.32.16/drivers/atm/eni.c 2010-07-09 14:50:35.000000000 -0400 22280+++ linux-2.6.32.18/drivers/atm/eni.c 2010-08-11 18:57:29.000000000 -0400
22249@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) 22281@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
22250 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", 22282 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
22251 vcc->dev->number); 22283 vcc->dev->number);
@@ -22291,9 +22323,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/eni.c linux-2.6.32.16/drivers/atm/eni.c
22291 wake_up(&eni_dev->tx_wait); 22323 wake_up(&eni_dev->tx_wait);
22292 dma_complete++; 22324 dma_complete++;
22293 } 22325 }
22294diff -urNp linux-2.6.32.16/drivers/atm/firestream.c linux-2.6.32.16/drivers/atm/firestream.c 22326diff -urNp linux-2.6.32.18/drivers/atm/firestream.c linux-2.6.32.18/drivers/atm/firestream.c
22295--- linux-2.6.32.16/drivers/atm/firestream.c 2010-07-05 14:14:00.000000000 -0400 22327--- linux-2.6.32.18/drivers/atm/firestream.c 2010-08-10 13:45:57.000000000 -0400
22296+++ linux-2.6.32.16/drivers/atm/firestream.c 2010-07-09 14:50:35.000000000 -0400 22328+++ linux-2.6.32.18/drivers/atm/firestream.c 2010-08-11 18:57:29.000000000 -0400
22297@@ -748,7 +748,7 @@ static void process_txdone_queue (struct 22329@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
22298 } 22330 }
22299 } 22331 }
@@ -22327,9 +22359,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/firestream.c linux-2.6.32.16/drivers/atm/
22327 break; 22359 break;
22328 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ 22360 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
22329 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 22361 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
22330diff -urNp linux-2.6.32.16/drivers/atm/fore200e.c linux-2.6.32.16/drivers/atm/fore200e.c 22362diff -urNp linux-2.6.32.18/drivers/atm/fore200e.c linux-2.6.32.18/drivers/atm/fore200e.c
22331--- linux-2.6.32.16/drivers/atm/fore200e.c 2010-07-05 14:14:00.000000000 -0400 22363--- linux-2.6.32.18/drivers/atm/fore200e.c 2010-08-10 13:45:57.000000000 -0400
22332+++ linux-2.6.32.16/drivers/atm/fore200e.c 2010-07-09 14:50:35.000000000 -0400 22364+++ linux-2.6.32.18/drivers/atm/fore200e.c 2010-08-11 18:57:29.000000000 -0400
22333@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 22365@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
22334 #endif 22366 #endif
22335 /* check error condition */ 22367 /* check error condition */
@@ -22386,9 +22418,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/fore200e.c linux-2.6.32.16/drivers/atm/fo
22386 22418
22387 fore200e->tx_sat++; 22419 fore200e->tx_sat++;
22388 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", 22420 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
22389diff -urNp linux-2.6.32.16/drivers/atm/he.c linux-2.6.32.16/drivers/atm/he.c 22421diff -urNp linux-2.6.32.18/drivers/atm/he.c linux-2.6.32.18/drivers/atm/he.c
22390--- linux-2.6.32.16/drivers/atm/he.c 2010-07-05 14:14:00.000000000 -0400 22422--- linux-2.6.32.18/drivers/atm/he.c 2010-08-10 13:45:57.000000000 -0400
22391+++ linux-2.6.32.16/drivers/atm/he.c 2010-07-09 14:50:35.000000000 -0400 22423+++ linux-2.6.32.18/drivers/atm/he.c 2010-08-11 18:57:29.000000000 -0400
22392@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i 22424@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
22393 22425
22394 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { 22426 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -22470,9 +22502,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/he.c linux-2.6.32.16/drivers/atm/he.c
22470 22502
22471 return 0; 22503 return 0;
22472 } 22504 }
22473diff -urNp linux-2.6.32.16/drivers/atm/horizon.c linux-2.6.32.16/drivers/atm/horizon.c 22505diff -urNp linux-2.6.32.18/drivers/atm/horizon.c linux-2.6.32.18/drivers/atm/horizon.c
22474--- linux-2.6.32.16/drivers/atm/horizon.c 2010-07-05 14:14:00.000000000 -0400 22506--- linux-2.6.32.18/drivers/atm/horizon.c 2010-08-10 13:45:57.000000000 -0400
22475+++ linux-2.6.32.16/drivers/atm/horizon.c 2010-07-09 14:50:35.000000000 -0400 22507+++ linux-2.6.32.18/drivers/atm/horizon.c 2010-08-11 18:57:29.000000000 -0400
22476@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, 22508@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
22477 { 22509 {
22478 struct atm_vcc * vcc = ATM_SKB(skb)->vcc; 22510 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -22491,9 +22523,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/horizon.c linux-2.6.32.16/drivers/atm/hor
22491 22523
22492 // free the skb 22524 // free the skb
22493 hrz_kfree_skb (skb); 22525 hrz_kfree_skb (skb);
22494diff -urNp linux-2.6.32.16/drivers/atm/idt77252.c linux-2.6.32.16/drivers/atm/idt77252.c 22526diff -urNp linux-2.6.32.18/drivers/atm/idt77252.c linux-2.6.32.18/drivers/atm/idt77252.c
22495--- linux-2.6.32.16/drivers/atm/idt77252.c 2010-07-05 14:14:00.000000000 -0400 22527--- linux-2.6.32.18/drivers/atm/idt77252.c 2010-08-10 13:45:57.000000000 -0400
22496+++ linux-2.6.32.16/drivers/atm/idt77252.c 2010-07-09 14:50:35.000000000 -0400 22528+++ linux-2.6.32.18/drivers/atm/idt77252.c 2010-08-11 18:57:29.000000000 -0400
22497@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str 22529@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
22498 else 22530 else
22499 dev_kfree_skb(skb); 22531 dev_kfree_skb(skb);
@@ -22648,9 +22680,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/idt77252.c linux-2.6.32.16/drivers/atm/id
22648 return -ENOMEM; 22680 return -ENOMEM;
22649 } 22681 }
22650 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); 22682 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
22651diff -urNp linux-2.6.32.16/drivers/atm/iphase.c linux-2.6.32.16/drivers/atm/iphase.c 22683diff -urNp linux-2.6.32.18/drivers/atm/iphase.c linux-2.6.32.18/drivers/atm/iphase.c
22652--- linux-2.6.32.16/drivers/atm/iphase.c 2010-07-05 14:14:00.000000000 -0400 22684--- linux-2.6.32.18/drivers/atm/iphase.c 2010-08-10 13:45:57.000000000 -0400
22653+++ linux-2.6.32.16/drivers/atm/iphase.c 2010-07-09 14:50:35.000000000 -0400 22685+++ linux-2.6.32.18/drivers/atm/iphase.c 2010-08-11 18:57:29.000000000 -0400
22654@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) 22686@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
22655 status = (u_short) (buf_desc_ptr->desc_mode); 22687 status = (u_short) (buf_desc_ptr->desc_mode);
22656 if (status & (RX_CER | RX_PTE | RX_OFL)) 22688 if (status & (RX_CER | RX_PTE | RX_OFL))
@@ -22747,9 +22779,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/iphase.c linux-2.6.32.16/drivers/atm/ipha
22747 if (iavcc->vc_desc_cnt > 10) { 22779 if (iavcc->vc_desc_cnt > 10) {
22748 vcc->tx_quota = vcc->tx_quota * 3 / 4; 22780 vcc->tx_quota = vcc->tx_quota * 3 / 4;
22749 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); 22781 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
22750diff -urNp linux-2.6.32.16/drivers/atm/lanai.c linux-2.6.32.16/drivers/atm/lanai.c 22782diff -urNp linux-2.6.32.18/drivers/atm/lanai.c linux-2.6.32.18/drivers/atm/lanai.c
22751--- linux-2.6.32.16/drivers/atm/lanai.c 2010-07-05 14:14:00.000000000 -0400 22783--- linux-2.6.32.18/drivers/atm/lanai.c 2010-08-10 13:45:57.000000000 -0400
22752+++ linux-2.6.32.16/drivers/atm/lanai.c 2010-07-09 14:50:35.000000000 -0400 22784+++ linux-2.6.32.18/drivers/atm/lanai.c 2010-08-11 18:57:29.000000000 -0400
22753@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l 22785@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
22754 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); 22786 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
22755 lanai_endtx(lanai, lvcc); 22787 lanai_endtx(lanai, lvcc);
@@ -22804,9 +22836,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/lanai.c linux-2.6.32.16/drivers/atm/lanai
22804 lvcc->stats.x.aal5.service_rxcrc++; 22836 lvcc->stats.x.aal5.service_rxcrc++;
22805 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; 22837 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
22806 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); 22838 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
22807diff -urNp linux-2.6.32.16/drivers/atm/nicstar.c linux-2.6.32.16/drivers/atm/nicstar.c 22839diff -urNp linux-2.6.32.18/drivers/atm/nicstar.c linux-2.6.32.18/drivers/atm/nicstar.c
22808--- linux-2.6.32.16/drivers/atm/nicstar.c 2010-07-05 14:14:00.000000000 -0400 22840--- linux-2.6.32.18/drivers/atm/nicstar.c 2010-08-10 13:45:57.000000000 -0400
22809+++ linux-2.6.32.16/drivers/atm/nicstar.c 2010-07-09 14:50:35.000000000 -0400 22841+++ linux-2.6.32.18/drivers/atm/nicstar.c 2010-08-11 18:57:29.000000000 -0400
22810@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, 22842@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
22811 if ((vc = (vc_map *) vcc->dev_data) == NULL) 22843 if ((vc = (vc_map *) vcc->dev_data) == NULL)
22812 { 22844 {
@@ -23009,9 +23041,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/nicstar.c linux-2.6.32.16/drivers/atm/nic
23009 } 23041 }
23010 } 23042 }
23011 23043
23012diff -urNp linux-2.6.32.16/drivers/atm/solos-pci.c linux-2.6.32.16/drivers/atm/solos-pci.c 23044diff -urNp linux-2.6.32.18/drivers/atm/solos-pci.c linux-2.6.32.18/drivers/atm/solos-pci.c
23013--- linux-2.6.32.16/drivers/atm/solos-pci.c 2010-07-05 14:14:00.000000000 -0400 23045--- linux-2.6.32.18/drivers/atm/solos-pci.c 2010-08-10 13:45:57.000000000 -0400
23014+++ linux-2.6.32.16/drivers/atm/solos-pci.c 2010-07-09 14:50:35.000000000 -0400 23046+++ linux-2.6.32.18/drivers/atm/solos-pci.c 2010-08-11 18:57:29.000000000 -0400
23015@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) 23047@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
23016 } 23048 }
23017 atm_charge(vcc, skb->truesize); 23049 atm_charge(vcc, skb->truesize);
@@ -23030,9 +23062,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/solos-pci.c linux-2.6.32.16/drivers/atm/s
23030 solos_pop(vcc, oldskb); 23062 solos_pop(vcc, oldskb);
23031 } else 23063 } else
23032 dev_kfree_skb_irq(oldskb); 23064 dev_kfree_skb_irq(oldskb);
23033diff -urNp linux-2.6.32.16/drivers/atm/suni.c linux-2.6.32.16/drivers/atm/suni.c 23065diff -urNp linux-2.6.32.18/drivers/atm/suni.c linux-2.6.32.18/drivers/atm/suni.c
23034--- linux-2.6.32.16/drivers/atm/suni.c 2010-07-05 14:14:00.000000000 -0400 23066--- linux-2.6.32.18/drivers/atm/suni.c 2010-08-10 13:45:57.000000000 -0400
23035+++ linux-2.6.32.16/drivers/atm/suni.c 2010-07-09 14:50:35.000000000 -0400 23067+++ linux-2.6.32.18/drivers/atm/suni.c 2010-08-11 18:57:29.000000000 -0400
23036@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); 23068@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
23037 23069
23038 23070
@@ -23044,9 +23076,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/suni.c linux-2.6.32.16/drivers/atm/suni.c
23044 23076
23045 23077
23046 static void suni_hz(unsigned long from_timer) 23078 static void suni_hz(unsigned long from_timer)
23047diff -urNp linux-2.6.32.16/drivers/atm/uPD98402.c linux-2.6.32.16/drivers/atm/uPD98402.c 23079diff -urNp linux-2.6.32.18/drivers/atm/uPD98402.c linux-2.6.32.18/drivers/atm/uPD98402.c
23048--- linux-2.6.32.16/drivers/atm/uPD98402.c 2010-07-05 14:14:00.000000000 -0400 23080--- linux-2.6.32.18/drivers/atm/uPD98402.c 2010-08-10 13:45:57.000000000 -0400
23049+++ linux-2.6.32.16/drivers/atm/uPD98402.c 2010-07-09 14:50:35.000000000 -0400 23081+++ linux-2.6.32.18/drivers/atm/uPD98402.c 2010-08-11 18:57:29.000000000 -0400
23050@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d 23082@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
23051 struct sonet_stats tmp; 23083 struct sonet_stats tmp;
23052 int error = 0; 23084 int error = 0;
@@ -23091,9 +23123,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/uPD98402.c linux-2.6.32.16/drivers/atm/uP
23091 return 0; 23123 return 0;
23092 } 23124 }
23093 23125
23094diff -urNp linux-2.6.32.16/drivers/atm/zatm.c linux-2.6.32.16/drivers/atm/zatm.c 23126diff -urNp linux-2.6.32.18/drivers/atm/zatm.c linux-2.6.32.18/drivers/atm/zatm.c
23095--- linux-2.6.32.16/drivers/atm/zatm.c 2010-07-05 14:14:00.000000000 -0400 23127--- linux-2.6.32.18/drivers/atm/zatm.c 2010-08-10 13:45:57.000000000 -0400
23096+++ linux-2.6.32.16/drivers/atm/zatm.c 2010-07-09 14:50:35.000000000 -0400 23128+++ linux-2.6.32.18/drivers/atm/zatm.c 2010-08-11 18:57:29.000000000 -0400
23097@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy 23129@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
23098 } 23130 }
23099 if (!size) { 23131 if (!size) {
@@ -23121,9 +23153,9 @@ diff -urNp linux-2.6.32.16/drivers/atm/zatm.c linux-2.6.32.16/drivers/atm/zatm.c
23121 wake_up(&zatm_vcc->tx_wait); 23153 wake_up(&zatm_vcc->tx_wait);
23122 } 23154 }
23123 23155
23124diff -urNp linux-2.6.32.16/drivers/base/bus.c linux-2.6.32.16/drivers/base/bus.c 23156diff -urNp linux-2.6.32.18/drivers/base/bus.c linux-2.6.32.18/drivers/base/bus.c
23125--- linux-2.6.32.16/drivers/base/bus.c 2010-07-05 14:14:00.000000000 -0400 23157--- linux-2.6.32.18/drivers/base/bus.c 2010-08-10 13:45:57.000000000 -0400
23126+++ linux-2.6.32.16/drivers/base/bus.c 2010-07-09 14:50:36.000000000 -0400 23158+++ linux-2.6.32.18/drivers/base/bus.c 2010-08-11 18:57:29.000000000 -0400
23127@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob 23159@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
23128 return ret; 23160 return ret;
23129 } 23161 }
@@ -23151,9 +23183,9 @@ diff -urNp linux-2.6.32.16/drivers/base/bus.c linux-2.6.32.16/drivers/base/bus.c
23151 .filter = bus_uevent_filter, 23183 .filter = bus_uevent_filter,
23152 }; 23184 };
23153 23185
23154diff -urNp linux-2.6.32.16/drivers/base/class.c linux-2.6.32.16/drivers/base/class.c 23186diff -urNp linux-2.6.32.18/drivers/base/class.c linux-2.6.32.18/drivers/base/class.c
23155--- linux-2.6.32.16/drivers/base/class.c 2010-07-05 14:14:00.000000000 -0400 23187--- linux-2.6.32.18/drivers/base/class.c 2010-08-10 13:45:57.000000000 -0400
23156+++ linux-2.6.32.16/drivers/base/class.c 2010-07-09 14:50:36.000000000 -0400 23188+++ linux-2.6.32.18/drivers/base/class.c 2010-08-11 18:57:29.000000000 -0400
23157@@ -63,7 +63,7 @@ static void class_release(struct kobject 23189@@ -63,7 +63,7 @@ static void class_release(struct kobject
23158 kfree(cp); 23190 kfree(cp);
23159 } 23191 }
@@ -23163,9 +23195,9 @@ diff -urNp linux-2.6.32.16/drivers/base/class.c linux-2.6.32.16/drivers/base/cla
23163 .show = class_attr_show, 23195 .show = class_attr_show,
23164 .store = class_attr_store, 23196 .store = class_attr_store,
23165 }; 23197 };
23166diff -urNp linux-2.6.32.16/drivers/base/core.c linux-2.6.32.16/drivers/base/core.c 23198diff -urNp linux-2.6.32.18/drivers/base/core.c linux-2.6.32.18/drivers/base/core.c
23167--- linux-2.6.32.16/drivers/base/core.c 2010-07-05 14:14:00.000000000 -0400 23199--- linux-2.6.32.18/drivers/base/core.c 2010-08-10 13:45:57.000000000 -0400
23168+++ linux-2.6.32.16/drivers/base/core.c 2010-07-09 14:50:36.000000000 -0400 23200+++ linux-2.6.32.18/drivers/base/core.c 2010-08-11 18:57:29.000000000 -0400
23169@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob 23201@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
23170 return ret; 23202 return ret;
23171 } 23203 }
@@ -23184,9 +23216,9 @@ diff -urNp linux-2.6.32.16/drivers/base/core.c linux-2.6.32.16/drivers/base/core
23184 .filter = dev_uevent_filter, 23216 .filter = dev_uevent_filter,
23185 .name = dev_uevent_name, 23217 .name = dev_uevent_name,
23186 .uevent = dev_uevent, 23218 .uevent = dev_uevent,
23187diff -urNp linux-2.6.32.16/drivers/base/memory.c linux-2.6.32.16/drivers/base/memory.c 23219diff -urNp linux-2.6.32.18/drivers/base/memory.c linux-2.6.32.18/drivers/base/memory.c
23188--- linux-2.6.32.16/drivers/base/memory.c 2010-07-05 14:14:00.000000000 -0400 23220--- linux-2.6.32.18/drivers/base/memory.c 2010-08-10 13:45:57.000000000 -0400
23189+++ linux-2.6.32.16/drivers/base/memory.c 2010-07-09 14:50:36.000000000 -0400 23221+++ linux-2.6.32.18/drivers/base/memory.c 2010-08-11 18:57:29.000000000 -0400
23190@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks 23222@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
23191 return retval; 23223 return retval;
23192 } 23224 }
@@ -23196,9 +23228,9 @@ diff -urNp linux-2.6.32.16/drivers/base/memory.c linux-2.6.32.16/drivers/base/me
23196 .name = memory_uevent_name, 23228 .name = memory_uevent_name,
23197 .uevent = memory_uevent, 23229 .uevent = memory_uevent,
23198 }; 23230 };
23199diff -urNp linux-2.6.32.16/drivers/base/sys.c linux-2.6.32.16/drivers/base/sys.c 23231diff -urNp linux-2.6.32.18/drivers/base/sys.c linux-2.6.32.18/drivers/base/sys.c
23200--- linux-2.6.32.16/drivers/base/sys.c 2010-07-05 14:14:00.000000000 -0400 23232--- linux-2.6.32.18/drivers/base/sys.c 2010-08-10 13:45:57.000000000 -0400
23201+++ linux-2.6.32.16/drivers/base/sys.c 2010-07-09 14:50:36.000000000 -0400 23233+++ linux-2.6.32.18/drivers/base/sys.c 2010-08-11 18:57:29.000000000 -0400
23202@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc 23234@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
23203 return -EIO; 23235 return -EIO;
23204 } 23236 }
@@ -23217,9 +23249,9 @@ diff -urNp linux-2.6.32.16/drivers/base/sys.c linux-2.6.32.16/drivers/base/sys.c
23217 .show = sysdev_class_show, 23249 .show = sysdev_class_show,
23218 .store = sysdev_class_store, 23250 .store = sysdev_class_store,
23219 }; 23251 };
23220diff -urNp linux-2.6.32.16/drivers/block/pktcdvd.c linux-2.6.32.16/drivers/block/pktcdvd.c 23252diff -urNp linux-2.6.32.18/drivers/block/pktcdvd.c linux-2.6.32.18/drivers/block/pktcdvd.c
23221--- linux-2.6.32.16/drivers/block/pktcdvd.c 2010-07-05 14:14:00.000000000 -0400 23253--- linux-2.6.32.18/drivers/block/pktcdvd.c 2010-08-10 13:45:57.000000000 -0400
23222+++ linux-2.6.32.16/drivers/block/pktcdvd.c 2010-07-09 14:50:36.000000000 -0400 23254+++ linux-2.6.32.18/drivers/block/pktcdvd.c 2010-08-11 18:57:29.000000000 -0400
23223@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob 23255@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
23224 return len; 23256 return len;
23225 } 23257 }
@@ -23229,9 +23261,9 @@ diff -urNp linux-2.6.32.16/drivers/block/pktcdvd.c linux-2.6.32.16/drivers/block
23229 .show = kobj_pkt_show, 23261 .show = kobj_pkt_show,
23230 .store = kobj_pkt_store 23262 .store = kobj_pkt_store
23231 }; 23263 };
23232diff -urNp linux-2.6.32.16/drivers/char/agp/frontend.c linux-2.6.32.16/drivers/char/agp/frontend.c 23264diff -urNp linux-2.6.32.18/drivers/char/agp/frontend.c linux-2.6.32.18/drivers/char/agp/frontend.c
23233--- linux-2.6.32.16/drivers/char/agp/frontend.c 2010-07-05 14:14:00.000000000 -0400 23265--- linux-2.6.32.18/drivers/char/agp/frontend.c 2010-08-10 13:45:57.000000000 -0400
23234+++ linux-2.6.32.16/drivers/char/agp/frontend.c 2010-07-09 14:50:36.000000000 -0400 23266+++ linux-2.6.32.18/drivers/char/agp/frontend.c 2010-08-11 18:57:29.000000000 -0400
23235@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag 23267@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
23236 if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) 23268 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
23237 return -EFAULT; 23269 return -EFAULT;
@@ -23241,9 +23273,9 @@ diff -urNp linux-2.6.32.16/drivers/char/agp/frontend.c linux-2.6.32.16/drivers/c
23241 return -EFAULT; 23273 return -EFAULT;
23242 23274
23243 client = agp_find_client_by_pid(reserve.pid); 23275 client = agp_find_client_by_pid(reserve.pid);
23244diff -urNp linux-2.6.32.16/drivers/char/agp/intel-agp.c linux-2.6.32.16/drivers/char/agp/intel-agp.c 23276diff -urNp linux-2.6.32.18/drivers/char/agp/intel-agp.c linux-2.6.32.18/drivers/char/agp/intel-agp.c
23245--- linux-2.6.32.16/drivers/char/agp/intel-agp.c 2010-07-05 14:14:00.000000000 -0400 23277--- linux-2.6.32.18/drivers/char/agp/intel-agp.c 2010-08-10 13:45:57.000000000 -0400
23246+++ linux-2.6.32.16/drivers/char/agp/intel-agp.c 2010-07-09 14:50:36.000000000 -0400 23278+++ linux-2.6.32.18/drivers/char/agp/intel-agp.c 2010-08-11 18:57:29.000000000 -0400
23247@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc 23279@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc
23248 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), 23280 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
23249 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), 23281 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
@@ -23253,9 +23285,9 @@ diff -urNp linux-2.6.32.16/drivers/char/agp/intel-agp.c linux-2.6.32.16/drivers/
23253 }; 23285 };
23254 23286
23255 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); 23287 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
23256diff -urNp linux-2.6.32.16/drivers/char/hpet.c linux-2.6.32.16/drivers/char/hpet.c 23288diff -urNp linux-2.6.32.18/drivers/char/hpet.c linux-2.6.32.18/drivers/char/hpet.c
23257--- linux-2.6.32.16/drivers/char/hpet.c 2010-07-05 14:14:00.000000000 -0400 23289--- linux-2.6.32.18/drivers/char/hpet.c 2010-08-10 13:45:57.000000000 -0400
23258+++ linux-2.6.32.16/drivers/char/hpet.c 2010-07-09 14:50:36.000000000 -0400 23290+++ linux-2.6.32.18/drivers/char/hpet.c 2010-08-11 18:57:29.000000000 -0400
23259@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in 23291@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
23260 return 0; 23292 return 0;
23261 } 23293 }
@@ -23283,9 +23315,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hpet.c linux-2.6.32.16/drivers/char/hpet
23283 23315
23284 static int __init hpet_init(void) 23316 static int __init hpet_init(void)
23285 { 23317 {
23286diff -urNp linux-2.6.32.16/drivers/char/hvc_beat.c linux-2.6.32.16/drivers/char/hvc_beat.c 23318diff -urNp linux-2.6.32.18/drivers/char/hvc_beat.c linux-2.6.32.18/drivers/char/hvc_beat.c
23287--- linux-2.6.32.16/drivers/char/hvc_beat.c 2010-07-05 14:14:00.000000000 -0400 23319--- linux-2.6.32.18/drivers/char/hvc_beat.c 2010-08-10 13:45:57.000000000 -0400
23288+++ linux-2.6.32.16/drivers/char/hvc_beat.c 2010-07-09 14:50:36.000000000 -0400 23320+++ linux-2.6.32.18/drivers/char/hvc_beat.c 2010-08-11 18:57:29.000000000 -0400
23289@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v 23321@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
23290 return cnt; 23322 return cnt;
23291 } 23323 }
@@ -23295,9 +23327,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_beat.c linux-2.6.32.16/drivers/char/
23295 .get_chars = hvc_beat_get_chars, 23327 .get_chars = hvc_beat_get_chars,
23296 .put_chars = hvc_beat_put_chars, 23328 .put_chars = hvc_beat_put_chars,
23297 }; 23329 };
23298diff -urNp linux-2.6.32.16/drivers/char/hvc_console.c linux-2.6.32.16/drivers/char/hvc_console.c 23330diff -urNp linux-2.6.32.18/drivers/char/hvc_console.c linux-2.6.32.18/drivers/char/hvc_console.c
23299--- linux-2.6.32.16/drivers/char/hvc_console.c 2010-07-05 14:14:00.000000000 -0400 23331--- linux-2.6.32.18/drivers/char/hvc_console.c 2010-08-10 13:45:57.000000000 -0400
23300+++ linux-2.6.32.16/drivers/char/hvc_console.c 2010-07-09 14:50:36.000000000 -0400 23332+++ linux-2.6.32.18/drivers/char/hvc_console.c 2010-08-11 18:57:29.000000000 -0400
23301@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind 23333@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
23302 * console interfaces but can still be used as a tty device. This has to be 23334 * console interfaces but can still be used as a tty device. This has to be
23303 * static because kmalloc will not work during early console init. 23335 * static because kmalloc will not work during early console init.
@@ -23325,9 +23357,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_console.c linux-2.6.32.16/drivers/ch
23325 { 23357 {
23326 struct hvc_struct *hp; 23358 struct hvc_struct *hp;
23327 int i; 23359 int i;
23328diff -urNp linux-2.6.32.16/drivers/char/hvc_console.h linux-2.6.32.16/drivers/char/hvc_console.h 23360diff -urNp linux-2.6.32.18/drivers/char/hvc_console.h linux-2.6.32.18/drivers/char/hvc_console.h
23329--- linux-2.6.32.16/drivers/char/hvc_console.h 2010-07-05 14:14:00.000000000 -0400 23361--- linux-2.6.32.18/drivers/char/hvc_console.h 2010-08-10 13:45:57.000000000 -0400
23330+++ linux-2.6.32.16/drivers/char/hvc_console.h 2010-07-09 14:50:36.000000000 -0400 23362+++ linux-2.6.32.18/drivers/char/hvc_console.h 2010-08-11 18:57:29.000000000 -0400
23331@@ -55,7 +55,7 @@ struct hvc_struct { 23363@@ -55,7 +55,7 @@ struct hvc_struct {
23332 int outbuf_size; 23364 int outbuf_size;
23333 int n_outbuf; 23365 int n_outbuf;
@@ -23351,9 +23383,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_console.h linux-2.6.32.16/drivers/ch
23351 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ 23383 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
23352 extern int hvc_remove(struct hvc_struct *hp); 23384 extern int hvc_remove(struct hvc_struct *hp);
23353 23385
23354diff -urNp linux-2.6.32.16/drivers/char/hvc_iseries.c linux-2.6.32.16/drivers/char/hvc_iseries.c 23386diff -urNp linux-2.6.32.18/drivers/char/hvc_iseries.c linux-2.6.32.18/drivers/char/hvc_iseries.c
23355--- linux-2.6.32.16/drivers/char/hvc_iseries.c 2010-07-05 14:14:00.000000000 -0400 23387--- linux-2.6.32.18/drivers/char/hvc_iseries.c 2010-08-10 13:45:57.000000000 -0400
23356+++ linux-2.6.32.16/drivers/char/hvc_iseries.c 2010-07-09 14:50:36.000000000 -0400 23388+++ linux-2.6.32.18/drivers/char/hvc_iseries.c 2010-08-11 18:57:29.000000000 -0400
23357@@ -197,7 +197,7 @@ done: 23389@@ -197,7 +197,7 @@ done:
23358 return sent; 23390 return sent;
23359 } 23391 }
@@ -23363,9 +23395,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_iseries.c linux-2.6.32.16/drivers/ch
23363 .get_chars = get_chars, 23395 .get_chars = get_chars,
23364 .put_chars = put_chars, 23396 .put_chars = put_chars,
23365 .notifier_add = notifier_add_irq, 23397 .notifier_add = notifier_add_irq,
23366diff -urNp linux-2.6.32.16/drivers/char/hvc_iucv.c linux-2.6.32.16/drivers/char/hvc_iucv.c 23398diff -urNp linux-2.6.32.18/drivers/char/hvc_iucv.c linux-2.6.32.18/drivers/char/hvc_iucv.c
23367--- linux-2.6.32.16/drivers/char/hvc_iucv.c 2010-07-05 14:14:00.000000000 -0400 23399--- linux-2.6.32.18/drivers/char/hvc_iucv.c 2010-08-10 13:45:57.000000000 -0400
23368+++ linux-2.6.32.16/drivers/char/hvc_iucv.c 2010-07-09 14:50:36.000000000 -0400 23400+++ linux-2.6.32.18/drivers/char/hvc_iucv.c 2010-08-11 18:57:29.000000000 -0400
23369@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru 23401@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
23370 23402
23371 23403
@@ -23375,9 +23407,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_iucv.c linux-2.6.32.16/drivers/char/
23375 .get_chars = hvc_iucv_get_chars, 23407 .get_chars = hvc_iucv_get_chars,
23376 .put_chars = hvc_iucv_put_chars, 23408 .put_chars = hvc_iucv_put_chars,
23377 .notifier_add = hvc_iucv_notifier_add, 23409 .notifier_add = hvc_iucv_notifier_add,
23378diff -urNp linux-2.6.32.16/drivers/char/hvc_rtas.c linux-2.6.32.16/drivers/char/hvc_rtas.c 23410diff -urNp linux-2.6.32.18/drivers/char/hvc_rtas.c linux-2.6.32.18/drivers/char/hvc_rtas.c
23379--- linux-2.6.32.16/drivers/char/hvc_rtas.c 2010-07-05 14:14:00.000000000 -0400 23411--- linux-2.6.32.18/drivers/char/hvc_rtas.c 2010-08-10 13:45:57.000000000 -0400
23380+++ linux-2.6.32.16/drivers/char/hvc_rtas.c 2010-07-09 14:50:36.000000000 -0400 23412+++ linux-2.6.32.18/drivers/char/hvc_rtas.c 2010-08-11 18:57:29.000000000 -0400
23381@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ 23413@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
23382 return i; 23414 return i;
23383 } 23415 }
@@ -23387,9 +23419,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_rtas.c linux-2.6.32.16/drivers/char/
23387 .get_chars = hvc_rtas_read_console, 23419 .get_chars = hvc_rtas_read_console,
23388 .put_chars = hvc_rtas_write_console, 23420 .put_chars = hvc_rtas_write_console,
23389 }; 23421 };
23390diff -urNp linux-2.6.32.16/drivers/char/hvcs.c linux-2.6.32.16/drivers/char/hvcs.c 23422diff -urNp linux-2.6.32.18/drivers/char/hvcs.c linux-2.6.32.18/drivers/char/hvcs.c
23391--- linux-2.6.32.16/drivers/char/hvcs.c 2010-07-05 14:14:00.000000000 -0400 23423--- linux-2.6.32.18/drivers/char/hvcs.c 2010-08-10 13:45:57.000000000 -0400
23392+++ linux-2.6.32.16/drivers/char/hvcs.c 2010-07-09 14:50:36.000000000 -0400 23424+++ linux-2.6.32.18/drivers/char/hvcs.c 2010-08-11 18:57:29.000000000 -0400
23393@@ -269,7 +269,7 @@ struct hvcs_struct { 23425@@ -269,7 +269,7 @@ struct hvcs_struct {
23394 unsigned int index; 23426 unsigned int index;
23395 23427
@@ -23484,9 +23516,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvcs.c linux-2.6.32.16/drivers/char/hvcs
23484 return 0; 23516 return 0;
23485 23517
23486 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; 23518 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
23487diff -urNp linux-2.6.32.16/drivers/char/hvc_udbg.c linux-2.6.32.16/drivers/char/hvc_udbg.c 23519diff -urNp linux-2.6.32.18/drivers/char/hvc_udbg.c linux-2.6.32.18/drivers/char/hvc_udbg.c
23488--- linux-2.6.32.16/drivers/char/hvc_udbg.c 2010-07-05 14:14:00.000000000 -0400 23520--- linux-2.6.32.18/drivers/char/hvc_udbg.c 2010-08-10 13:45:57.000000000 -0400
23489+++ linux-2.6.32.16/drivers/char/hvc_udbg.c 2010-07-09 14:50:36.000000000 -0400 23521+++ linux-2.6.32.18/drivers/char/hvc_udbg.c 2010-08-11 18:57:29.000000000 -0400
23490@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno 23522@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
23491 return i; 23523 return i;
23492 } 23524 }
@@ -23496,9 +23528,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_udbg.c linux-2.6.32.16/drivers/char/
23496 .get_chars = hvc_udbg_get, 23528 .get_chars = hvc_udbg_get,
23497 .put_chars = hvc_udbg_put, 23529 .put_chars = hvc_udbg_put,
23498 }; 23530 };
23499diff -urNp linux-2.6.32.16/drivers/char/hvc_vio.c linux-2.6.32.16/drivers/char/hvc_vio.c 23531diff -urNp linux-2.6.32.18/drivers/char/hvc_vio.c linux-2.6.32.18/drivers/char/hvc_vio.c
23500--- linux-2.6.32.16/drivers/char/hvc_vio.c 2010-07-05 14:14:00.000000000 -0400 23532--- linux-2.6.32.18/drivers/char/hvc_vio.c 2010-08-10 13:45:57.000000000 -0400
23501+++ linux-2.6.32.16/drivers/char/hvc_vio.c 2010-07-09 14:50:36.000000000 -0400 23533+++ linux-2.6.32.18/drivers/char/hvc_vio.c 2010-08-11 18:57:29.000000000 -0400
23502@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v 23534@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
23503 return got; 23535 return got;
23504 } 23536 }
@@ -23508,9 +23540,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_vio.c linux-2.6.32.16/drivers/char/h
23508 .get_chars = filtered_get_chars, 23540 .get_chars = filtered_get_chars,
23509 .put_chars = hvc_put_chars, 23541 .put_chars = hvc_put_chars,
23510 .notifier_add = notifier_add_irq, 23542 .notifier_add = notifier_add_irq,
23511diff -urNp linux-2.6.32.16/drivers/char/hvc_xen.c linux-2.6.32.16/drivers/char/hvc_xen.c 23543diff -urNp linux-2.6.32.18/drivers/char/hvc_xen.c linux-2.6.32.18/drivers/char/hvc_xen.c
23512--- linux-2.6.32.16/drivers/char/hvc_xen.c 2010-07-05 14:14:00.000000000 -0400 23544--- linux-2.6.32.18/drivers/char/hvc_xen.c 2010-08-10 13:45:57.000000000 -0400
23513+++ linux-2.6.32.16/drivers/char/hvc_xen.c 2010-07-09 14:50:36.000000000 -0400 23545+++ linux-2.6.32.18/drivers/char/hvc_xen.c 2010-08-11 18:57:29.000000000 -0400
23514@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno 23546@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
23515 return recv; 23547 return recv;
23516 } 23548 }
@@ -23520,9 +23552,9 @@ diff -urNp linux-2.6.32.16/drivers/char/hvc_xen.c linux-2.6.32.16/drivers/char/h
23520 .get_chars = read_console, 23552 .get_chars = read_console,
23521 .put_chars = write_console, 23553 .put_chars = write_console,
23522 .notifier_add = notifier_add_irq, 23554 .notifier_add = notifier_add_irq,
23523diff -urNp linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c 23555diff -urNp linux-2.6.32.18/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.18/drivers/char/ipmi/ipmi_msghandler.c
23524--- linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c 2010-07-05 14:14:00.000000000 -0400 23556--- linux-2.6.32.18/drivers/char/ipmi/ipmi_msghandler.c 2010-08-10 13:45:57.000000000 -0400
23525+++ linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c 2010-07-09 14:50:36.000000000 -0400 23557+++ linux-2.6.32.18/drivers/char/ipmi/ipmi_msghandler.c 2010-08-11 18:57:29.000000000 -0400
23526@@ -414,7 +414,7 @@ struct ipmi_smi { 23558@@ -414,7 +414,7 @@ struct ipmi_smi {
23527 struct proc_dir_entry *proc_dir; 23559 struct proc_dir_entry *proc_dir;
23528 char proc_dir_name[10]; 23560 char proc_dir_name[10];
@@ -23553,9 +23585,9 @@ diff -urNp linux-2.6.32.16/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.16/d
23553 23585
23554 intf->proc_dir = NULL; 23586 intf->proc_dir = NULL;
23555 23587
23556diff -urNp linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c 23588diff -urNp linux-2.6.32.18/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.18/drivers/char/ipmi/ipmi_si_intf.c
23557--- linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c 2010-07-05 14:14:00.000000000 -0400 23589--- linux-2.6.32.18/drivers/char/ipmi/ipmi_si_intf.c 2010-08-10 13:45:57.000000000 -0400
23558+++ linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c 2010-07-09 14:50:36.000000000 -0400 23590+++ linux-2.6.32.18/drivers/char/ipmi/ipmi_si_intf.c 2010-08-11 18:57:29.000000000 -0400
23559@@ -277,7 +277,7 @@ struct smi_info { 23591@@ -277,7 +277,7 @@ struct smi_info {
23560 unsigned char slave_addr; 23592 unsigned char slave_addr;
23561 23593
@@ -23586,9 +23618,9 @@ diff -urNp linux-2.6.32.16/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.16/driv
23586 23618
23587 new_smi->interrupt_disabled = 0; 23619 new_smi->interrupt_disabled = 0;
23588 atomic_set(&new_smi->stop_operation, 0); 23620 atomic_set(&new_smi->stop_operation, 0);
23589diff -urNp linux-2.6.32.16/drivers/char/keyboard.c linux-2.6.32.16/drivers/char/keyboard.c 23621diff -urNp linux-2.6.32.18/drivers/char/keyboard.c linux-2.6.32.18/drivers/char/keyboard.c
23590--- linux-2.6.32.16/drivers/char/keyboard.c 2010-07-05 14:14:00.000000000 -0400 23622--- linux-2.6.32.18/drivers/char/keyboard.c 2010-08-10 13:45:57.000000000 -0400
23591+++ linux-2.6.32.16/drivers/char/keyboard.c 2010-07-09 14:50:36.000000000 -0400 23623+++ linux-2.6.32.18/drivers/char/keyboard.c 2010-08-11 18:57:29.000000000 -0400
23592@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u 23624@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
23593 kbd->kbdmode == VC_MEDIUMRAW) && 23625 kbd->kbdmode == VC_MEDIUMRAW) &&
23594 value != KVAL(K_SAK)) 23626 value != KVAL(K_SAK))
@@ -23615,9 +23647,9 @@ diff -urNp linux-2.6.32.16/drivers/char/keyboard.c linux-2.6.32.16/drivers/char/
23615 }; 23647 };
23616 23648
23617 MODULE_DEVICE_TABLE(input, kbd_ids); 23649 MODULE_DEVICE_TABLE(input, kbd_ids);
23618diff -urNp linux-2.6.32.16/drivers/char/mem.c linux-2.6.32.16/drivers/char/mem.c 23650diff -urNp linux-2.6.32.18/drivers/char/mem.c linux-2.6.32.18/drivers/char/mem.c
23619--- linux-2.6.32.16/drivers/char/mem.c 2010-07-05 14:14:00.000000000 -0400 23651--- linux-2.6.32.18/drivers/char/mem.c 2010-08-10 13:45:57.000000000 -0400
23620+++ linux-2.6.32.16/drivers/char/mem.c 2010-07-09 14:50:36.000000000 -0400 23652+++ linux-2.6.32.18/drivers/char/mem.c 2010-08-11 18:57:29.000000000 -0400
23621@@ -18,6 +18,7 @@ 23653@@ -18,6 +18,7 @@
23622 #include <linux/raw.h> 23654 #include <linux/raw.h>
23623 #include <linux/tty.h> 23655 #include <linux/tty.h>
@@ -23708,9 +23740,9 @@ diff -urNp linux-2.6.32.16/drivers/char/mem.c linux-2.6.32.16/drivers/char/mem.c
23708 }; 23740 };
23709 23741
23710 static int memory_open(struct inode *inode, struct file *filp) 23742 static int memory_open(struct inode *inode, struct file *filp)
23711diff -urNp linux-2.6.32.16/drivers/char/nvram.c linux-2.6.32.16/drivers/char/nvram.c 23743diff -urNp linux-2.6.32.18/drivers/char/nvram.c linux-2.6.32.18/drivers/char/nvram.c
23712--- linux-2.6.32.16/drivers/char/nvram.c 2010-07-05 14:14:00.000000000 -0400 23744--- linux-2.6.32.18/drivers/char/nvram.c 2010-08-10 13:45:57.000000000 -0400
23713+++ linux-2.6.32.16/drivers/char/nvram.c 2010-07-09 14:50:36.000000000 -0400 23745+++ linux-2.6.32.18/drivers/char/nvram.c 2010-08-11 18:57:29.000000000 -0400
23714@@ -429,7 +429,10 @@ static const struct file_operations nvra 23746@@ -429,7 +429,10 @@ static const struct file_operations nvra
23715 static struct miscdevice nvram_dev = { 23747 static struct miscdevice nvram_dev = {
23716 NVRAM_MINOR, 23748 NVRAM_MINOR,
@@ -23723,9 +23755,9 @@ diff -urNp linux-2.6.32.16/drivers/char/nvram.c linux-2.6.32.16/drivers/char/nvr
23723 }; 23755 };
23724 23756
23725 static int __init nvram_init(void) 23757 static int __init nvram_init(void)
23726diff -urNp linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c 23758diff -urNp linux-2.6.32.18/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.18/drivers/char/pcmcia/ipwireless/tty.c
23727--- linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c 2010-07-05 14:14:00.000000000 -0400 23759--- linux-2.6.32.18/drivers/char/pcmcia/ipwireless/tty.c 2010-08-10 13:45:57.000000000 -0400
23728+++ linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c 2010-07-09 14:50:36.000000000 -0400 23760+++ linux-2.6.32.18/drivers/char/pcmcia/ipwireless/tty.c 2010-08-11 18:57:29.000000000 -0400
23729@@ -51,7 +51,7 @@ struct ipw_tty { 23761@@ -51,7 +51,7 @@ struct ipw_tty {
23730 int tty_type; 23762 int tty_type;
23731 struct ipw_network *network; 23763 struct ipw_network *network;
@@ -23840,9 +23872,9 @@ diff -urNp linux-2.6.32.16/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.16/
23840 do_ipw_close(ttyj); 23872 do_ipw_close(ttyj);
23841 ipwireless_disassociate_network_ttys(network, 23873 ipwireless_disassociate_network_ttys(network,
23842 ttyj->channel_idx); 23874 ttyj->channel_idx);
23843diff -urNp linux-2.6.32.16/drivers/char/pty.c linux-2.6.32.16/drivers/char/pty.c 23875diff -urNp linux-2.6.32.18/drivers/char/pty.c linux-2.6.32.18/drivers/char/pty.c
23844--- linux-2.6.32.16/drivers/char/pty.c 2010-07-05 14:14:00.000000000 -0400 23876--- linux-2.6.32.18/drivers/char/pty.c 2010-08-10 13:45:57.000000000 -0400
23845+++ linux-2.6.32.16/drivers/char/pty.c 2010-07-09 14:50:36.000000000 -0400 23877+++ linux-2.6.32.18/drivers/char/pty.c 2010-08-11 18:57:29.000000000 -0400
23846@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode 23878@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
23847 return ret; 23879 return ret;
23848 } 23880 }
@@ -23873,9 +23905,9 @@ diff -urNp linux-2.6.32.16/drivers/char/pty.c linux-2.6.32.16/drivers/char/pty.c
23873 cdev_init(&ptmx_cdev, &ptmx_fops); 23905 cdev_init(&ptmx_cdev, &ptmx_fops);
23874 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || 23906 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
23875 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) 23907 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
23876diff -urNp linux-2.6.32.16/drivers/char/random.c linux-2.6.32.16/drivers/char/random.c 23908diff -urNp linux-2.6.32.18/drivers/char/random.c linux-2.6.32.18/drivers/char/random.c
23877--- linux-2.6.32.16/drivers/char/random.c 2010-07-05 14:14:00.000000000 -0400 23909--- linux-2.6.32.18/drivers/char/random.c 2010-08-10 13:45:57.000000000 -0400
23878+++ linux-2.6.32.16/drivers/char/random.c 2010-07-09 14:50:36.000000000 -0400 23910+++ linux-2.6.32.18/drivers/char/random.c 2010-08-11 18:57:29.000000000 -0400
23879@@ -254,8 +254,13 @@ 23911@@ -254,8 +254,13 @@
23880 /* 23912 /*
23881 * Configuration information 23913 * Configuration information
@@ -23917,9 +23949,9 @@ diff -urNp linux-2.6.32.16/drivers/char/random.c linux-2.6.32.16/drivers/char/ra
23917 static int max_write_thresh = INPUT_POOL_WORDS * 32; 23949 static int max_write_thresh = INPUT_POOL_WORDS * 32;
23918 static char sysctl_bootid[16]; 23950 static char sysctl_bootid[16];
23919 23951
23920diff -urNp linux-2.6.32.16/drivers/char/sonypi.c linux-2.6.32.16/drivers/char/sonypi.c 23952diff -urNp linux-2.6.32.18/drivers/char/sonypi.c linux-2.6.32.18/drivers/char/sonypi.c
23921--- linux-2.6.32.16/drivers/char/sonypi.c 2010-07-05 14:14:00.000000000 -0400 23953--- linux-2.6.32.18/drivers/char/sonypi.c 2010-08-10 13:45:57.000000000 -0400
23922+++ linux-2.6.32.16/drivers/char/sonypi.c 2010-07-09 14:50:36.000000000 -0400 23954+++ linux-2.6.32.18/drivers/char/sonypi.c 2010-08-11 18:57:29.000000000 -0400
23923@@ -491,7 +491,7 @@ static struct sonypi_device { 23955@@ -491,7 +491,7 @@ static struct sonypi_device {
23924 spinlock_t fifo_lock; 23956 spinlock_t fifo_lock;
23925 wait_queue_head_t fifo_proc_list; 23957 wait_queue_head_t fifo_proc_list;
@@ -23950,9 +23982,9 @@ diff -urNp linux-2.6.32.16/drivers/char/sonypi.c linux-2.6.32.16/drivers/char/so
23950 mutex_unlock(&sonypi_device.lock); 23982 mutex_unlock(&sonypi_device.lock);
23951 unlock_kernel(); 23983 unlock_kernel();
23952 return 0; 23984 return 0;
23953diff -urNp linux-2.6.32.16/drivers/char/tpm/tpm_bios.c linux-2.6.32.16/drivers/char/tpm/tpm_bios.c 23985diff -urNp linux-2.6.32.18/drivers/char/tpm/tpm_bios.c linux-2.6.32.18/drivers/char/tpm/tpm_bios.c
23954--- linux-2.6.32.16/drivers/char/tpm/tpm_bios.c 2010-07-05 14:14:00.000000000 -0400 23986--- linux-2.6.32.18/drivers/char/tpm/tpm_bios.c 2010-08-10 13:45:57.000000000 -0400
23955+++ linux-2.6.32.16/drivers/char/tpm/tpm_bios.c 2010-07-09 14:50:36.000000000 -0400 23987+++ linux-2.6.32.18/drivers/char/tpm/tpm_bios.c 2010-08-11 18:57:29.000000000 -0400
23956@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start 23988@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
23957 event = addr; 23989 event = addr;
23958 23990
@@ -23993,9 +24025,9 @@ diff -urNp linux-2.6.32.16/drivers/char/tpm/tpm_bios.c linux-2.6.32.16/drivers/c
23993 24025
23994 memcpy(log->bios_event_log, virt, len); 24026 memcpy(log->bios_event_log, virt, len);
23995 24027
23996diff -urNp linux-2.6.32.16/drivers/char/tty_io.c linux-2.6.32.16/drivers/char/tty_io.c 24028diff -urNp linux-2.6.32.18/drivers/char/tty_io.c linux-2.6.32.18/drivers/char/tty_io.c
23997--- linux-2.6.32.16/drivers/char/tty_io.c 2010-07-05 14:14:00.000000000 -0400 24029--- linux-2.6.32.18/drivers/char/tty_io.c 2010-08-10 13:45:57.000000000 -0400
23998+++ linux-2.6.32.16/drivers/char/tty_io.c 2010-07-09 14:50:36.000000000 -0400 24030+++ linux-2.6.32.18/drivers/char/tty_io.c 2010-08-11 18:57:29.000000000 -0400
23999@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list 24031@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
24000 DEFINE_MUTEX(tty_mutex); 24032 DEFINE_MUTEX(tty_mutex);
24001 EXPORT_SYMBOL(tty_mutex); 24033 EXPORT_SYMBOL(tty_mutex);
@@ -24134,9 +24166,9 @@ diff -urNp linux-2.6.32.16/drivers/char/tty_io.c linux-2.6.32.16/drivers/char/tt
24134 /* 24166 /*
24135 * Initialize the console device. This is called *early*, so 24167 * Initialize the console device. This is called *early*, so
24136 * we can't necessarily depend on lots of kernel help here. 24168 * we can't necessarily depend on lots of kernel help here.
24137diff -urNp linux-2.6.32.16/drivers/char/tty_ldisc.c linux-2.6.32.16/drivers/char/tty_ldisc.c 24169diff -urNp linux-2.6.32.18/drivers/char/tty_ldisc.c linux-2.6.32.18/drivers/char/tty_ldisc.c
24138--- linux-2.6.32.16/drivers/char/tty_ldisc.c 2010-07-05 14:14:00.000000000 -0400 24170--- linux-2.6.32.18/drivers/char/tty_ldisc.c 2010-08-10 13:45:57.000000000 -0400
24139+++ linux-2.6.32.16/drivers/char/tty_ldisc.c 2010-07-09 14:50:36.000000000 -0400 24171+++ linux-2.6.32.18/drivers/char/tty_ldisc.c 2010-08-11 18:57:29.000000000 -0400
24140@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * 24172@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc *
24141 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { 24173 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
24142 struct tty_ldisc_ops *ldo = ld->ops; 24174 struct tty_ldisc_ops *ldo = ld->ops;
@@ -24182,9 +24214,9 @@ diff -urNp linux-2.6.32.16/drivers/char/tty_ldisc.c linux-2.6.32.16/drivers/char
24182 module_put(ldops->owner); 24214 module_put(ldops->owner);
24183 spin_unlock_irqrestore(&tty_ldisc_lock, flags); 24215 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
24184 } 24216 }
24185diff -urNp linux-2.6.32.16/drivers/char/virtio_console.c linux-2.6.32.16/drivers/char/virtio_console.c 24217diff -urNp linux-2.6.32.18/drivers/char/virtio_console.c linux-2.6.32.18/drivers/char/virtio_console.c
24186--- linux-2.6.32.16/drivers/char/virtio_console.c 2010-07-05 14:14:00.000000000 -0400 24218--- linux-2.6.32.18/drivers/char/virtio_console.c 2010-08-10 13:45:57.000000000 -0400
24187+++ linux-2.6.32.16/drivers/char/virtio_console.c 2010-07-09 14:50:36.000000000 -0400 24219+++ linux-2.6.32.18/drivers/char/virtio_console.c 2010-08-11 18:57:29.000000000 -0400
24188@@ -44,6 +44,7 @@ static unsigned int in_len; 24220@@ -44,6 +44,7 @@ static unsigned int in_len;
24189 static char *in, *inbuf; 24221 static char *in, *inbuf;
24190 24222
@@ -24193,9 +24225,9 @@ diff -urNp linux-2.6.32.16/drivers/char/virtio_console.c linux-2.6.32.16/drivers
24193 static struct hv_ops virtio_cons; 24225 static struct hv_ops virtio_cons;
24194 24226
24195 /* The hvc device */ 24227 /* The hvc device */
24196diff -urNp linux-2.6.32.16/drivers/char/vt_ioctl.c linux-2.6.32.16/drivers/char/vt_ioctl.c 24228diff -urNp linux-2.6.32.18/drivers/char/vt_ioctl.c linux-2.6.32.18/drivers/char/vt_ioctl.c
24197--- linux-2.6.32.16/drivers/char/vt_ioctl.c 2010-07-05 14:14:00.000000000 -0400 24229--- linux-2.6.32.18/drivers/char/vt_ioctl.c 2010-08-10 13:45:57.000000000 -0400
24198+++ linux-2.6.32.16/drivers/char/vt_ioctl.c 2010-07-11 12:11:58.000000000 -0400 24230+++ linux-2.6.32.18/drivers/char/vt_ioctl.c 2010-08-11 18:57:29.000000000 -0400
24199@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ 24231@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
24200 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) 24232 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
24201 return -EFAULT; 24233 return -EFAULT;
@@ -24239,9 +24271,9 @@ diff -urNp linux-2.6.32.16/drivers/char/vt_ioctl.c linux-2.6.32.16/drivers/char/
24239 if (!perm) { 24271 if (!perm) {
24240 ret = -EPERM; 24272 ret = -EPERM;
24241 goto reterr; 24273 goto reterr;
24242diff -urNp linux-2.6.32.16/drivers/cpufreq/cpufreq.c linux-2.6.32.16/drivers/cpufreq/cpufreq.c 24274diff -urNp linux-2.6.32.18/drivers/cpufreq/cpufreq.c linux-2.6.32.18/drivers/cpufreq/cpufreq.c
24243--- linux-2.6.32.16/drivers/cpufreq/cpufreq.c 2010-07-05 14:14:00.000000000 -0400 24275--- linux-2.6.32.18/drivers/cpufreq/cpufreq.c 2010-08-10 13:45:57.000000000 -0400
24244+++ linux-2.6.32.16/drivers/cpufreq/cpufreq.c 2010-07-09 14:50:36.000000000 -0400 24276+++ linux-2.6.32.18/drivers/cpufreq/cpufreq.c 2010-08-11 18:57:29.000000000 -0400
24245@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct 24277@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
24246 complete(&policy->kobj_unregister); 24278 complete(&policy->kobj_unregister);
24247 } 24279 }
@@ -24251,9 +24283,9 @@ diff -urNp linux-2.6.32.16/drivers/cpufreq/cpufreq.c linux-2.6.32.16/drivers/cpu
24251 .show = show, 24283 .show = show,
24252 .store = store, 24284 .store = store,
24253 }; 24285 };
24254diff -urNp linux-2.6.32.16/drivers/cpuidle/sysfs.c linux-2.6.32.16/drivers/cpuidle/sysfs.c 24286diff -urNp linux-2.6.32.18/drivers/cpuidle/sysfs.c linux-2.6.32.18/drivers/cpuidle/sysfs.c
24255--- linux-2.6.32.16/drivers/cpuidle/sysfs.c 2010-07-05 14:14:00.000000000 -0400 24287--- linux-2.6.32.18/drivers/cpuidle/sysfs.c 2010-08-10 13:45:57.000000000 -0400
24256+++ linux-2.6.32.16/drivers/cpuidle/sysfs.c 2010-07-09 14:50:36.000000000 -0400 24288+++ linux-2.6.32.18/drivers/cpuidle/sysfs.c 2010-08-11 18:57:29.000000000 -0400
24257@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj 24289@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
24258 return ret; 24290 return ret;
24259 } 24291 }
@@ -24281,9 +24313,9 @@ diff -urNp linux-2.6.32.16/drivers/cpuidle/sysfs.c linux-2.6.32.16/drivers/cpuid
24281 { 24313 {
24282 kobject_put(&device->kobjs[i]->kobj); 24314 kobject_put(&device->kobjs[i]->kobj);
24283 wait_for_completion(&device->kobjs[i]->kobj_unregister); 24315 wait_for_completion(&device->kobjs[i]->kobj_unregister);
24284diff -urNp linux-2.6.32.16/drivers/dma/ioat/dma.c linux-2.6.32.16/drivers/dma/ioat/dma.c 24316diff -urNp linux-2.6.32.18/drivers/dma/ioat/dma.c linux-2.6.32.18/drivers/dma/ioat/dma.c
24285--- linux-2.6.32.16/drivers/dma/ioat/dma.c 2010-07-05 14:14:00.000000000 -0400 24317--- linux-2.6.32.18/drivers/dma/ioat/dma.c 2010-08-10 13:45:57.000000000 -0400
24286+++ linux-2.6.32.16/drivers/dma/ioat/dma.c 2010-07-09 14:50:36.000000000 -0400 24318+++ linux-2.6.32.18/drivers/dma/ioat/dma.c 2010-08-11 18:57:29.000000000 -0400
24287@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str 24319@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
24288 return entry->show(&chan->common, page); 24320 return entry->show(&chan->common, page);
24289 } 24321 }
@@ -24293,9 +24325,9 @@ diff -urNp linux-2.6.32.16/drivers/dma/ioat/dma.c linux-2.6.32.16/drivers/dma/io
24293 .show = ioat_attr_show, 24325 .show = ioat_attr_show,
24294 }; 24326 };
24295 24327
24296diff -urNp linux-2.6.32.16/drivers/dma/ioat/dma.h linux-2.6.32.16/drivers/dma/ioat/dma.h 24328diff -urNp linux-2.6.32.18/drivers/dma/ioat/dma.h linux-2.6.32.18/drivers/dma/ioat/dma.h
24297--- linux-2.6.32.16/drivers/dma/ioat/dma.h 2010-07-05 14:14:00.000000000 -0400 24329--- linux-2.6.32.18/drivers/dma/ioat/dma.h 2010-08-10 13:45:57.000000000 -0400
24298+++ linux-2.6.32.16/drivers/dma/ioat/dma.h 2010-07-09 14:50:36.000000000 -0400 24330+++ linux-2.6.32.18/drivers/dma/ioat/dma.h 2010-08-11 18:57:29.000000000 -0400
24299@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c 24331@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
24300 unsigned long *phys_complete); 24332 unsigned long *phys_complete);
24301 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); 24333 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
@@ -24305,9 +24337,9 @@ diff -urNp linux-2.6.32.16/drivers/dma/ioat/dma.h linux-2.6.32.16/drivers/dma/io
24305 extern struct ioat_sysfs_entry ioat_version_attr; 24337 extern struct ioat_sysfs_entry ioat_version_attr;
24306 extern struct ioat_sysfs_entry ioat_cap_attr; 24338 extern struct ioat_sysfs_entry ioat_cap_attr;
24307 #endif /* IOATDMA_H */ 24339 #endif /* IOATDMA_H */
24308diff -urNp linux-2.6.32.16/drivers/edac/edac_core.h linux-2.6.32.16/drivers/edac/edac_core.h 24340diff -urNp linux-2.6.32.18/drivers/edac/edac_core.h linux-2.6.32.18/drivers/edac/edac_core.h
24309--- linux-2.6.32.16/drivers/edac/edac_core.h 2010-07-05 14:14:00.000000000 -0400 24341--- linux-2.6.32.18/drivers/edac/edac_core.h 2010-08-10 13:45:57.000000000 -0400
24310+++ linux-2.6.32.16/drivers/edac/edac_core.h 2010-07-09 14:50:36.000000000 -0400 24342+++ linux-2.6.32.18/drivers/edac/edac_core.h 2010-08-11 18:57:29.000000000 -0400
24311@@ -99,11 +99,11 @@ extern int edac_debug_level; 24343@@ -99,11 +99,11 @@ extern int edac_debug_level;
24312 24344
24313 #else /* !CONFIG_EDAC_DEBUG */ 24345 #else /* !CONFIG_EDAC_DEBUG */
@@ -24325,9 +24357,9 @@ diff -urNp linux-2.6.32.16/drivers/edac/edac_core.h linux-2.6.32.16/drivers/edac
24325 24357
24326 #endif /* !CONFIG_EDAC_DEBUG */ 24358 #endif /* !CONFIG_EDAC_DEBUG */
24327 24359
24328diff -urNp linux-2.6.32.16/drivers/edac/edac_device_sysfs.c linux-2.6.32.16/drivers/edac/edac_device_sysfs.c 24360diff -urNp linux-2.6.32.18/drivers/edac/edac_device_sysfs.c linux-2.6.32.18/drivers/edac/edac_device_sysfs.c
24329--- linux-2.6.32.16/drivers/edac/edac_device_sysfs.c 2010-07-05 14:14:00.000000000 -0400 24361--- linux-2.6.32.18/drivers/edac/edac_device_sysfs.c 2010-08-10 13:45:57.000000000 -0400
24330+++ linux-2.6.32.16/drivers/edac/edac_device_sysfs.c 2010-07-09 14:50:36.000000000 -0400 24362+++ linux-2.6.32.18/drivers/edac/edac_device_sysfs.c 2010-08-11 18:57:29.000000000 -0400
24331@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s 24363@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
24332 } 24364 }
24333 24365
@@ -24355,9 +24387,9 @@ diff -urNp linux-2.6.32.16/drivers/edac/edac_device_sysfs.c linux-2.6.32.16/driv
24355 .show = edac_dev_block_show, 24387 .show = edac_dev_block_show,
24356 .store = edac_dev_block_store 24388 .store = edac_dev_block_store
24357 }; 24389 };
24358diff -urNp linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c 24390diff -urNp linux-2.6.32.18/drivers/edac/edac_mc_sysfs.c linux-2.6.32.18/drivers/edac/edac_mc_sysfs.c
24359--- linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c 2010-07-05 14:14:00.000000000 -0400 24391--- linux-2.6.32.18/drivers/edac/edac_mc_sysfs.c 2010-08-10 13:45:57.000000000 -0400
24360+++ linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c 2010-07-09 14:50:36.000000000 -0400 24392+++ linux-2.6.32.18/drivers/edac/edac_mc_sysfs.c 2010-08-11 18:57:29.000000000 -0400
24361@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob 24393@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
24362 return -EIO; 24394 return -EIO;
24363 } 24395 }
@@ -24376,9 +24408,9 @@ diff -urNp linux-2.6.32.16/drivers/edac/edac_mc_sysfs.c linux-2.6.32.16/drivers/
24376 .show = mcidev_show, 24408 .show = mcidev_show,
24377 .store = mcidev_store 24409 .store = mcidev_store
24378 }; 24410 };
24379diff -urNp linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c 24411diff -urNp linux-2.6.32.18/drivers/edac/edac_pci_sysfs.c linux-2.6.32.18/drivers/edac/edac_pci_sysfs.c
24380--- linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c 2010-07-05 14:14:00.000000000 -0400 24412--- linux-2.6.32.18/drivers/edac/edac_pci_sysfs.c 2010-08-10 13:45:57.000000000 -0400
24381+++ linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c 2010-07-09 14:50:36.000000000 -0400 24413+++ linux-2.6.32.18/drivers/edac/edac_pci_sysfs.c 2010-08-11 18:57:29.000000000 -0400
24382@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s 24414@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
24383 } 24415 }
24384 24416
@@ -24397,9 +24429,9 @@ diff -urNp linux-2.6.32.16/drivers/edac/edac_pci_sysfs.c linux-2.6.32.16/drivers
24397 .show = edac_pci_dev_show, 24429 .show = edac_pci_dev_show,
24398 .store = edac_pci_dev_store 24430 .store = edac_pci_dev_store
24399 }; 24431 };
24400diff -urNp linux-2.6.32.16/drivers/firewire/core-cdev.c linux-2.6.32.16/drivers/firewire/core-cdev.c 24432diff -urNp linux-2.6.32.18/drivers/firewire/core-cdev.c linux-2.6.32.18/drivers/firewire/core-cdev.c
24401--- linux-2.6.32.16/drivers/firewire/core-cdev.c 2010-07-05 14:14:00.000000000 -0400 24433--- linux-2.6.32.18/drivers/firewire/core-cdev.c 2010-08-10 13:45:57.000000000 -0400
24402+++ linux-2.6.32.16/drivers/firewire/core-cdev.c 2010-07-09 14:50:36.000000000 -0400 24434+++ linux-2.6.32.18/drivers/firewire/core-cdev.c 2010-08-11 18:57:29.000000000 -0400
24403@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie 24435@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
24404 int ret; 24436 int ret;
24405 24437
@@ -24410,9 +24442,9 @@ diff -urNp linux-2.6.32.16/drivers/firewire/core-cdev.c linux-2.6.32.16/drivers/
24410 return -EINVAL; 24442 return -EINVAL;
24411 24443
24412 r = kmalloc(sizeof(*r), GFP_KERNEL); 24444 r = kmalloc(sizeof(*r), GFP_KERNEL);
24413diff -urNp linux-2.6.32.16/drivers/firmware/dmi_scan.c linux-2.6.32.16/drivers/firmware/dmi_scan.c 24445diff -urNp linux-2.6.32.18/drivers/firmware/dmi_scan.c linux-2.6.32.18/drivers/firmware/dmi_scan.c
24414--- linux-2.6.32.16/drivers/firmware/dmi_scan.c 2010-07-05 14:14:00.000000000 -0400 24446--- linux-2.6.32.18/drivers/firmware/dmi_scan.c 2010-08-10 13:45:57.000000000 -0400
24415+++ linux-2.6.32.16/drivers/firmware/dmi_scan.c 2010-07-09 14:50:36.000000000 -0400 24447+++ linux-2.6.32.18/drivers/firmware/dmi_scan.c 2010-08-11 18:57:30.000000000 -0400
24416@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) 24448@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
24417 } 24449 }
24418 } 24450 }
@@ -24425,9 +24457,9 @@ diff -urNp linux-2.6.32.16/drivers/firmware/dmi_scan.c linux-2.6.32.16/drivers/f
24425 p = dmi_ioremap(0xF0000, 0x10000); 24457 p = dmi_ioremap(0xF0000, 0x10000);
24426 if (p == NULL) 24458 if (p == NULL)
24427 goto error; 24459 goto error;
24428diff -urNp linux-2.6.32.16/drivers/firmware/edd.c linux-2.6.32.16/drivers/firmware/edd.c 24460diff -urNp linux-2.6.32.18/drivers/firmware/edd.c linux-2.6.32.18/drivers/firmware/edd.c
24429--- linux-2.6.32.16/drivers/firmware/edd.c 2010-07-05 14:14:00.000000000 -0400 24461--- linux-2.6.32.18/drivers/firmware/edd.c 2010-08-10 13:45:57.000000000 -0400
24430+++ linux-2.6.32.16/drivers/firmware/edd.c 2010-07-09 14:50:36.000000000 -0400 24462+++ linux-2.6.32.18/drivers/firmware/edd.c 2010-08-11 18:57:30.000000000 -0400
24431@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str 24463@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
24432 return ret; 24464 return ret;
24433 } 24465 }
@@ -24437,9 +24469,9 @@ diff -urNp linux-2.6.32.16/drivers/firmware/edd.c linux-2.6.32.16/drivers/firmwa
24437 .show = edd_attr_show, 24469 .show = edd_attr_show,
24438 }; 24470 };
24439 24471
24440diff -urNp linux-2.6.32.16/drivers/firmware/efivars.c linux-2.6.32.16/drivers/firmware/efivars.c 24472diff -urNp linux-2.6.32.18/drivers/firmware/efivars.c linux-2.6.32.18/drivers/firmware/efivars.c
24441--- linux-2.6.32.16/drivers/firmware/efivars.c 2010-07-05 14:14:00.000000000 -0400 24473--- linux-2.6.32.18/drivers/firmware/efivars.c 2010-08-10 13:45:57.000000000 -0400
24442+++ linux-2.6.32.16/drivers/firmware/efivars.c 2010-07-09 14:50:36.000000000 -0400 24474+++ linux-2.6.32.18/drivers/firmware/efivars.c 2010-08-11 18:57:30.000000000 -0400
24443@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct 24475@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
24444 return ret; 24476 return ret;
24445 } 24477 }
@@ -24449,9 +24481,9 @@ diff -urNp linux-2.6.32.16/drivers/firmware/efivars.c linux-2.6.32.16/drivers/fi
24449 .show = efivar_attr_show, 24481 .show = efivar_attr_show,
24450 .store = efivar_attr_store, 24482 .store = efivar_attr_store,
24451 }; 24483 };
24452diff -urNp linux-2.6.32.16/drivers/firmware/iscsi_ibft.c linux-2.6.32.16/drivers/firmware/iscsi_ibft.c 24484diff -urNp linux-2.6.32.18/drivers/firmware/iscsi_ibft.c linux-2.6.32.18/drivers/firmware/iscsi_ibft.c
24453--- linux-2.6.32.16/drivers/firmware/iscsi_ibft.c 2010-07-05 14:14:00.000000000 -0400 24485--- linux-2.6.32.18/drivers/firmware/iscsi_ibft.c 2010-08-10 13:45:57.000000000 -0400
24454+++ linux-2.6.32.16/drivers/firmware/iscsi_ibft.c 2010-07-09 14:50:36.000000000 -0400 24486+++ linux-2.6.32.18/drivers/firmware/iscsi_ibft.c 2010-08-11 18:57:30.000000000 -0400
24455@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc 24487@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
24456 return ret; 24488 return ret;
24457 } 24489 }
@@ -24461,9 +24493,9 @@ diff -urNp linux-2.6.32.16/drivers/firmware/iscsi_ibft.c linux-2.6.32.16/drivers
24461 .show = ibft_show_attribute, 24493 .show = ibft_show_attribute,
24462 }; 24494 };
24463 24495
24464diff -urNp linux-2.6.32.16/drivers/firmware/memmap.c linux-2.6.32.16/drivers/firmware/memmap.c 24496diff -urNp linux-2.6.32.18/drivers/firmware/memmap.c linux-2.6.32.18/drivers/firmware/memmap.c
24465--- linux-2.6.32.16/drivers/firmware/memmap.c 2010-07-05 14:14:00.000000000 -0400 24497--- linux-2.6.32.18/drivers/firmware/memmap.c 2010-08-10 13:45:57.000000000 -0400
24466+++ linux-2.6.32.16/drivers/firmware/memmap.c 2010-07-09 14:50:36.000000000 -0400 24498+++ linux-2.6.32.18/drivers/firmware/memmap.c 2010-08-11 18:57:30.000000000 -0400
24467@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { 24499@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
24468 NULL 24500 NULL
24469 }; 24501 };
@@ -24473,9 +24505,9 @@ diff -urNp linux-2.6.32.16/drivers/firmware/memmap.c linux-2.6.32.16/drivers/fir
24473 .show = memmap_attr_show, 24505 .show = memmap_attr_show,
24474 }; 24506 };
24475 24507
24476diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_drv.c linux-2.6.32.16/drivers/gpu/drm/drm_drv.c 24508diff -urNp linux-2.6.32.18/drivers/gpu/drm/drm_drv.c linux-2.6.32.18/drivers/gpu/drm/drm_drv.c
24477--- linux-2.6.32.16/drivers/gpu/drm/drm_drv.c 2010-07-05 14:14:00.000000000 -0400 24509--- linux-2.6.32.18/drivers/gpu/drm/drm_drv.c 2010-08-10 13:45:57.000000000 -0400
24478+++ linux-2.6.32.16/drivers/gpu/drm/drm_drv.c 2010-07-09 14:50:36.000000000 -0400 24510+++ linux-2.6.32.18/drivers/gpu/drm/drm_drv.c 2010-08-11 18:57:30.000000000 -0400
24479@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc 24511@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
24480 char *kdata = NULL; 24512 char *kdata = NULL;
24481 24513
@@ -24485,9 +24517,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_drv.c linux-2.6.32.16/drivers/gpu
24485 ++file_priv->ioctl_count; 24517 ++file_priv->ioctl_count;
24486 24518
24487 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", 24519 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
24488diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_fops.c linux-2.6.32.16/drivers/gpu/drm/drm_fops.c 24520diff -urNp linux-2.6.32.18/drivers/gpu/drm/drm_fops.c linux-2.6.32.18/drivers/gpu/drm/drm_fops.c
24489--- linux-2.6.32.16/drivers/gpu/drm/drm_fops.c 2010-07-05 14:14:00.000000000 -0400 24521--- linux-2.6.32.18/drivers/gpu/drm/drm_fops.c 2010-08-10 13:45:57.000000000 -0400
24490+++ linux-2.6.32.16/drivers/gpu/drm/drm_fops.c 2010-07-09 14:50:36.000000000 -0400 24522+++ linux-2.6.32.18/drivers/gpu/drm/drm_fops.c 2010-08-11 18:57:30.000000000 -0400
24491@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * 24523@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
24492 } 24524 }
24493 24525
@@ -24539,9 +24571,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_fops.c linux-2.6.32.16/drivers/gp
24539 if (atomic_read(&dev->ioctl_count)) { 24571 if (atomic_read(&dev->ioctl_count)) {
24540 DRM_ERROR("Device busy: %d\n", 24572 DRM_ERROR("Device busy: %d\n",
24541 atomic_read(&dev->ioctl_count)); 24573 atomic_read(&dev->ioctl_count));
24542diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c 24574diff -urNp linux-2.6.32.18/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.18/drivers/gpu/drm/drm_ioctl.c
24543--- linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c 2010-07-05 14:14:00.000000000 -0400 24575--- linux-2.6.32.18/drivers/gpu/drm/drm_ioctl.c 2010-08-10 13:45:57.000000000 -0400
24544+++ linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c 2010-07-09 14:50:36.000000000 -0400 24576+++ linux-2.6.32.18/drivers/gpu/drm/drm_ioctl.c 2010-08-11 18:57:30.000000000 -0400
24545@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, 24577@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
24546 stats->data[i].value = 24578 stats->data[i].value =
24547 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); 24579 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -24551,9 +24583,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.16/drivers/g
24551 stats->data[i].type = dev->types[i]; 24583 stats->data[i].type = dev->types[i];
24552 } 24584 }
24553 24585
24554diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_lock.c linux-2.6.32.16/drivers/gpu/drm/drm_lock.c 24586diff -urNp linux-2.6.32.18/drivers/gpu/drm/drm_lock.c linux-2.6.32.18/drivers/gpu/drm/drm_lock.c
24555--- linux-2.6.32.16/drivers/gpu/drm/drm_lock.c 2010-07-05 14:14:00.000000000 -0400 24587--- linux-2.6.32.18/drivers/gpu/drm/drm_lock.c 2010-08-10 13:45:57.000000000 -0400
24556+++ linux-2.6.32.16/drivers/gpu/drm/drm_lock.c 2010-07-09 14:50:36.000000000 -0400 24588+++ linux-2.6.32.18/drivers/gpu/drm/drm_lock.c 2010-08-11 18:57:30.000000000 -0400
24557@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi 24589@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
24558 if (drm_lock_take(&master->lock, lock->context)) { 24590 if (drm_lock_take(&master->lock, lock->context)) {
24559 master->lock.file_priv = file_priv; 24591 master->lock.file_priv = file_priv;
@@ -24572,9 +24604,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/drm_lock.c linux-2.6.32.16/drivers/gp
24572 24604
24573 /* kernel_context_switch isn't used by any of the x86 drm 24605 /* kernel_context_switch isn't used by any of the x86 drm
24574 * modules but is required by the Sparc driver. 24606 * modules but is required by the Sparc driver.
24575diff -urNp linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c 24607diff -urNp linux-2.6.32.18/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.18/drivers/gpu/drm/i810/i810_dma.c
24576--- linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c 2010-07-05 14:14:00.000000000 -0400 24608--- linux-2.6.32.18/drivers/gpu/drm/i810/i810_dma.c 2010-08-10 13:45:57.000000000 -0400
24577+++ linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c 2010-07-09 14:50:36.000000000 -0400 24609+++ linux-2.6.32.18/drivers/gpu/drm/i810/i810_dma.c 2010-08-11 18:57:30.000000000 -0400
24578@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de 24610@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
24579 dma->buflist[vertex->idx], 24611 dma->buflist[vertex->idx],
24580 vertex->discard, vertex->used); 24612 vertex->discard, vertex->used);
@@ -24597,9 +24629,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.16/drive
24597 sarea_priv->last_enqueue = dev_priv->counter - 1; 24629 sarea_priv->last_enqueue = dev_priv->counter - 1;
24598 sarea_priv->last_dispatch = (int)hw_status[5]; 24630 sarea_priv->last_dispatch = (int)hw_status[5];
24599 24631
24600diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c 24632diff -urNp linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7017.c
24601--- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c 2010-07-05 14:14:00.000000000 -0400 24633--- linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-10 13:45:57.000000000 -0400
24602+++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c 2010-07-09 14:50:36.000000000 -0400 24634+++ linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-11 18:57:30.000000000 -0400
24603@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ 24635@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
24604 } 24636 }
24605 } 24637 }
@@ -24609,9 +24641,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.16/dri
24609 .init = ch7017_init, 24641 .init = ch7017_init,
24610 .detect = ch7017_detect, 24642 .detect = ch7017_detect,
24611 .mode_valid = ch7017_mode_valid, 24643 .mode_valid = ch7017_mode_valid,
24612diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c 24644diff -urNp linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7xxx.c
24613--- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-07-05 14:14:00.000000000 -0400 24645--- linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-10 13:45:57.000000000 -0400
24614+++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-07-09 14:50:36.000000000 -0400 24646+++ linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-11 18:57:30.000000000 -0400
24615@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ 24647@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
24616 } 24648 }
24617 } 24649 }
@@ -24621,9 +24653,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.16/dri
24621 .init = ch7xxx_init, 24653 .init = ch7xxx_init,
24622 .detect = ch7xxx_detect, 24654 .detect = ch7xxx_detect,
24623 .mode_valid = ch7xxx_mode_valid, 24655 .mode_valid = ch7xxx_mode_valid,
24624diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h 24656diff -urNp linux-2.6.32.18/drivers/gpu/drm/i915/dvo.h linux-2.6.32.18/drivers/gpu/drm/i915/dvo.h
24625--- linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h 2010-07-05 14:14:00.000000000 -0400 24657--- linux-2.6.32.18/drivers/gpu/drm/i915/dvo.h 2010-08-10 13:45:57.000000000 -0400
24626+++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h 2010-07-09 14:50:36.000000000 -0400 24658+++ linux-2.6.32.18/drivers/gpu/drm/i915/dvo.h 2010-08-11 18:57:30.000000000 -0400
24627@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { 24659@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
24628 * 24660 *
24629 * \return singly-linked list of modes or NULL if no modes found. 24661 * \return singly-linked list of modes or NULL if no modes found.
@@ -24656,9 +24688,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo.h linux-2.6.32.16/drivers/gp
24656+extern const struct intel_dvo_dev_ops ch7017_ops; 24688+extern const struct intel_dvo_dev_ops ch7017_ops;
24657 24689
24658 #endif /* _INTEL_DVO_H */ 24690 #endif /* _INTEL_DVO_H */
24659diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c 24691diff -urNp linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ivch.c
24660--- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c 2010-07-05 14:14:00.000000000 -0400 24692--- linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-10 13:45:57.000000000 -0400
24661+++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c 2010-07-09 14:50:36.000000000 -0400 24693+++ linux-2.6.32.18/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-11 18:57:30.000000000 -0400
24662@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv 24694@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
24663 } 24695 }
24664 } 24696 }
@@ -24668,9 +24700,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.16/drive
24668 .init = ivch_init, 24700 .init = ivch_init,
24669 .dpms = ivch_dpms, 24701 .dpms = ivch_dpms,
24670 .save = ivch_save, 24702 .save = ivch_save,
24671diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c 24703diff -urNp linux-2.6.32.18/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.18/drivers/gpu/drm/i915/dvo_sil164.c
24672--- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c 2010-07-05 14:14:00.000000000 -0400 24704--- linux-2.6.32.18/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-10 13:45:57.000000000 -0400
24673+++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c 2010-07-09 14:50:36.000000000 -0400 24705+++ linux-2.6.32.18/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-11 18:57:30.000000000 -0400
24674@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ 24706@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
24675 } 24707 }
24676 } 24708 }
@@ -24680,9 +24712,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.16/dri
24680 .init = sil164_init, 24712 .init = sil164_init,
24681 .detect = sil164_detect, 24713 .detect = sil164_detect,
24682 .mode_valid = sil164_mode_valid, 24714 .mode_valid = sil164_mode_valid,
24683diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c 24715diff -urNp linux-2.6.32.18/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.18/drivers/gpu/drm/i915/dvo_tfp410.c
24684--- linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c 2010-07-05 14:14:00.000000000 -0400 24716--- linux-2.6.32.18/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-10 13:45:57.000000000 -0400
24685+++ linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c 2010-07-09 14:50:36.000000000 -0400 24717+++ linux-2.6.32.18/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-11 18:57:30.000000000 -0400
24686@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ 24718@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
24687 } 24719 }
24688 } 24720 }
@@ -24692,10 +24724,10 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.16/dri
24692 .init = tfp410_init, 24724 .init = tfp410_init,
24693 .detect = tfp410_detect, 24725 .detect = tfp410_detect,
24694 .mode_valid = tfp410_mode_valid, 24726 .mode_valid = tfp410_mode_valid,
24695diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c 24727diff -urNp linux-2.6.32.18/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.18/drivers/gpu/drm/i915/i915_drv.c
24696--- linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c 2010-07-05 14:14:00.000000000 -0400 24728--- linux-2.6.32.18/drivers/gpu/drm/i915/i915_drv.c 2010-08-10 13:45:57.000000000 -0400
24697+++ linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c 2010-07-09 14:50:36.000000000 -0400 24729+++ linux-2.6.32.18/drivers/gpu/drm/i915/i915_drv.c 2010-08-11 18:57:30.000000000 -0400
24698@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) 24730@@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev)
24699 return i915_resume(dev); 24731 return i915_resume(dev);
24700 } 24732 }
24701 24733
@@ -24704,9 +24736,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.16/drive
24704 .fault = i915_gem_fault, 24736 .fault = i915_gem_fault,
24705 .open = drm_gem_vm_open, 24737 .open = drm_gem_vm_open,
24706 .close = drm_gem_vm_close, 24738 .close = drm_gem_vm_close,
24707diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c 24739diff -urNp linux-2.6.32.18/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.18/drivers/gpu/drm/radeon/mkregtable.c
24708--- linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c 2010-07-05 14:14:00.000000000 -0400 24740--- linux-2.6.32.18/drivers/gpu/drm/radeon/mkregtable.c 2010-08-10 13:45:57.000000000 -0400
24709+++ linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c 2010-07-09 14:50:36.000000000 -0400 24741+++ linux-2.6.32.18/drivers/gpu/drm/radeon/mkregtable.c 2010-08-11 18:57:30.000000000 -0400
24710@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 24742@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
24711 regex_t mask_rex; 24743 regex_t mask_rex;
24712 regmatch_t match[4]; 24744 regmatch_t match[4];
@@ -24724,10 +24756,10 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.16/d
24724 24756
24725 if (regcomp 24757 if (regcomp
24726 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { 24758 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
24727diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c 24759diff -urNp linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_atombios.c
24728--- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c 2010-07-05 14:14:00.000000000 -0400 24760--- linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_atombios.c 2010-08-10 13:45:57.000000000 -0400
24729+++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c 2010-07-09 14:50:36.000000000 -0400 24761+++ linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_atombios.c 2010-08-11 18:57:30.000000000 -0400
24730@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o 24762@@ -513,13 +513,13 @@ static uint16_t atombios_get_connector_o
24731 } 24763 }
24732 } 24764 }
24733 24765
@@ -24743,7 +24775,7 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32
24743 24775
24744 bool radeon_get_atom_connector_info_from_supported_devices_table(struct 24776 bool radeon_get_atom_connector_info_from_supported_devices_table(struct
24745 drm_device 24777 drm_device
24746@@ -526,7 +526,6 @@ bool radeon_get_atom_connector_info_from 24778@@ -535,7 +535,6 @@ bool radeon_get_atom_connector_info_from
24747 uint8_t dac; 24779 uint8_t dac;
24748 union atom_supported_devices *supported_devices; 24780 union atom_supported_devices *supported_devices;
24749 int i, j; 24781 int i, j;
@@ -24751,9 +24783,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32
24751 24783
24752 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); 24784 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
24753 24785
24754diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_display.c 24786diff -urNp linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_display.c
24755--- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_display.c 2010-07-05 14:14:00.000000000 -0400 24787--- linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_display.c 2010-08-10 13:45:57.000000000 -0400
24756+++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_display.c 2010-07-09 14:50:36.000000000 -0400 24788+++ linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_display.c 2010-08-11 18:57:30.000000000 -0400
24757@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl 24789@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
24758 24790
24759 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { 24791 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
@@ -24763,9 +24795,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.
24763 } else 24795 } else
24764 error = abs(current_freq - freq); 24796 error = abs(current_freq - freq);
24765 vco_diff = abs(vco - best_vco); 24797 vco_diff = abs(vco - best_vco);
24766diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c 24798diff -urNp linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_state.c
24767--- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c 2010-07-05 14:14:00.000000000 -0400 24799--- linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_state.c 2010-08-10 13:45:57.000000000 -0400
24768+++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c 2010-07-09 14:50:36.000000000 -0400 24800+++ linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_state.c 2010-08-11 18:57:30.000000000 -0400
24769@@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm 24801@@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm
24770 { 24802 {
24771 drm_radeon_private_t *dev_priv = dev->dev_private; 24803 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -24775,9 +24807,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.16
24775 24807
24776 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); 24808 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
24777 24809
24778diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c 24810diff -urNp linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_ttm.c
24779--- linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c 2010-07-05 14:14:00.000000000 -0400 24811--- linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-10 13:45:57.000000000 -0400
24780+++ linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c 2010-07-09 14:50:36.000000000 -0400 24812+++ linux-2.6.32.18/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-11 18:57:30.000000000 -0400
24781@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic 24813@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
24782 DRM_INFO("radeon: ttm finalized\n"); 24814 DRM_INFO("radeon: ttm finalized\n");
24783 } 24815 }
@@ -24829,9 +24861,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.16/d
24829 } 24861 }
24830 24862
24831 24863
24832diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c 24864diff -urNp linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo.c
24833--- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c 2010-07-05 14:14:00.000000000 -0400 24865--- linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-10 13:45:57.000000000 -0400
24834+++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c 2010-07-09 14:50:36.000000000 -0400 24866+++ linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-11 18:57:30.000000000 -0400
24835@@ -39,7 +39,7 @@ 24867@@ -39,7 +39,7 @@
24836 #include <linux/module.h> 24868 #include <linux/module.h>
24837 24869
@@ -24850,9 +24882,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.16/drivers/
24850 .show = &ttm_bo_global_show 24882 .show = &ttm_bo_global_show
24851 }; 24883 };
24852 24884
24853diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c 24885diff -urNp linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo_vm.c
24854--- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-07-05 14:14:00.000000000 -0400 24886--- linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-10 13:45:57.000000000 -0400
24855+++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-07-09 14:50:36.000000000 -0400 24887+++ linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-11 18:57:30.000000000 -0400
24856@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are 24888@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
24857 { 24889 {
24858 struct ttm_buffer_object *bo = (struct ttm_buffer_object *) 24890 struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -24873,9 +24905,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.16/drive
24873 /* 24905 /*
24874 * Work around locking order reversal in fault / nopfn 24906 * Work around locking order reversal in fault / nopfn
24875 * between mmap_sem and bo_reserve: Perform a trylock operation 24907 * between mmap_sem and bo_reserve: Perform a trylock operation
24876diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c 24908diff -urNp linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_global.c
24877--- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c 2010-07-05 14:14:00.000000000 -0400 24909--- linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_global.c 2010-08-10 13:45:57.000000000 -0400
24878+++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c 2010-07-09 14:50:36.000000000 -0400 24910+++ linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_global.c 2010-08-11 18:57:30.000000000 -0400
24879@@ -36,7 +36,7 @@ 24911@@ -36,7 +36,7 @@
24880 struct ttm_global_item { 24912 struct ttm_global_item {
24881 struct mutex mutex; 24913 struct mutex mutex;
@@ -24933,9 +24965,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.16/driv
24933 ref->release(ref); 24965 ref->release(ref);
24934 item->object = NULL; 24966 item->object = NULL;
24935 } 24967 }
24936diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c 24968diff -urNp linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_memory.c
24937--- linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c 2010-07-05 14:14:00.000000000 -0400 24969--- linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-10 13:45:57.000000000 -0400
24938+++ linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c 2010-07-09 14:50:36.000000000 -0400 24970+++ linux-2.6.32.18/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-11 18:57:30.000000000 -0400
24939@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at 24971@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
24940 NULL 24972 NULL
24941 }; 24973 };
@@ -24945,9 +24977,9 @@ diff -urNp linux-2.6.32.16/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.16/driv
24945 .show = &ttm_mem_zone_show, 24977 .show = &ttm_mem_zone_show,
24946 .store = &ttm_mem_zone_store 24978 .store = &ttm_mem_zone_store
24947 }; 24979 };
24948diff -urNp linux-2.6.32.16/drivers/hid/usbhid/hiddev.c linux-2.6.32.16/drivers/hid/usbhid/hiddev.c 24980diff -urNp linux-2.6.32.18/drivers/hid/usbhid/hiddev.c linux-2.6.32.18/drivers/hid/usbhid/hiddev.c
24949--- linux-2.6.32.16/drivers/hid/usbhid/hiddev.c 2010-07-05 14:14:00.000000000 -0400 24981--- linux-2.6.32.18/drivers/hid/usbhid/hiddev.c 2010-08-10 13:45:57.000000000 -0400
24950+++ linux-2.6.32.16/drivers/hid/usbhid/hiddev.c 2010-07-09 14:50:36.000000000 -0400 24982+++ linux-2.6.32.18/drivers/hid/usbhid/hiddev.c 2010-08-11 18:57:30.000000000 -0400
24951@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi 24983@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
24952 return put_user(HID_VERSION, (int __user *)arg); 24984 return put_user(HID_VERSION, (int __user *)arg);
24953 24985
@@ -24957,9 +24989,9 @@ diff -urNp linux-2.6.32.16/drivers/hid/usbhid/hiddev.c linux-2.6.32.16/drivers/h
24957 return -EINVAL; 24989 return -EINVAL;
24958 24990
24959 for (i = 0; i < hid->maxcollection; i++) 24991 for (i = 0; i < hid->maxcollection; i++)
24960diff -urNp linux-2.6.32.16/drivers/hwmon/k8temp.c linux-2.6.32.16/drivers/hwmon/k8temp.c 24992diff -urNp linux-2.6.32.18/drivers/hwmon/k8temp.c linux-2.6.32.18/drivers/hwmon/k8temp.c
24961--- linux-2.6.32.16/drivers/hwmon/k8temp.c 2010-07-05 14:14:00.000000000 -0400 24993--- linux-2.6.32.18/drivers/hwmon/k8temp.c 2010-08-10 13:45:57.000000000 -0400
24962+++ linux-2.6.32.16/drivers/hwmon/k8temp.c 2010-07-09 14:50:36.000000000 -0400 24994+++ linux-2.6.32.18/drivers/hwmon/k8temp.c 2010-08-11 18:57:30.000000000 -0400
24963@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n 24995@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
24964 24996
24965 static struct pci_device_id k8temp_ids[] = { 24997 static struct pci_device_id k8temp_ids[] = {
@@ -24969,9 +25001,9 @@ diff -urNp linux-2.6.32.16/drivers/hwmon/k8temp.c linux-2.6.32.16/drivers/hwmon/
24969 }; 25001 };
24970 25002
24971 MODULE_DEVICE_TABLE(pci, k8temp_ids); 25003 MODULE_DEVICE_TABLE(pci, k8temp_ids);
24972diff -urNp linux-2.6.32.16/drivers/hwmon/sis5595.c linux-2.6.32.16/drivers/hwmon/sis5595.c 25004diff -urNp linux-2.6.32.18/drivers/hwmon/sis5595.c linux-2.6.32.18/drivers/hwmon/sis5595.c
24973--- linux-2.6.32.16/drivers/hwmon/sis5595.c 2010-07-05 14:14:00.000000000 -0400 25005--- linux-2.6.32.18/drivers/hwmon/sis5595.c 2010-08-10 13:45:57.000000000 -0400
24974+++ linux-2.6.32.16/drivers/hwmon/sis5595.c 2010-07-09 14:50:36.000000000 -0400 25006+++ linux-2.6.32.18/drivers/hwmon/sis5595.c 2010-08-11 18:57:30.000000000 -0400
24975@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda 25007@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
24976 25008
24977 static struct pci_device_id sis5595_pci_ids[] = { 25009 static struct pci_device_id sis5595_pci_ids[] = {
@@ -24981,9 +25013,9 @@ diff -urNp linux-2.6.32.16/drivers/hwmon/sis5595.c linux-2.6.32.16/drivers/hwmon
24981 }; 25013 };
24982 25014
24983 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); 25015 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
24984diff -urNp linux-2.6.32.16/drivers/hwmon/via686a.c linux-2.6.32.16/drivers/hwmon/via686a.c 25016diff -urNp linux-2.6.32.18/drivers/hwmon/via686a.c linux-2.6.32.18/drivers/hwmon/via686a.c
24985--- linux-2.6.32.16/drivers/hwmon/via686a.c 2010-07-05 14:14:00.000000000 -0400 25017--- linux-2.6.32.18/drivers/hwmon/via686a.c 2010-08-10 13:45:57.000000000 -0400
24986+++ linux-2.6.32.16/drivers/hwmon/via686a.c 2010-07-09 14:50:36.000000000 -0400 25018+++ linux-2.6.32.18/drivers/hwmon/via686a.c 2010-08-11 18:57:30.000000000 -0400
24987@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda 25019@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
24988 25020
24989 static struct pci_device_id via686a_pci_ids[] = { 25021 static struct pci_device_id via686a_pci_ids[] = {
@@ -24993,9 +25025,9 @@ diff -urNp linux-2.6.32.16/drivers/hwmon/via686a.c linux-2.6.32.16/drivers/hwmon
24993 }; 25025 };
24994 25026
24995 MODULE_DEVICE_TABLE(pci, via686a_pci_ids); 25027 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
24996diff -urNp linux-2.6.32.16/drivers/hwmon/vt8231.c linux-2.6.32.16/drivers/hwmon/vt8231.c 25028diff -urNp linux-2.6.32.18/drivers/hwmon/vt8231.c linux-2.6.32.18/drivers/hwmon/vt8231.c
24997--- linux-2.6.32.16/drivers/hwmon/vt8231.c 2010-07-05 14:14:00.000000000 -0400 25029--- linux-2.6.32.18/drivers/hwmon/vt8231.c 2010-08-10 13:45:57.000000000 -0400
24998+++ linux-2.6.32.16/drivers/hwmon/vt8231.c 2010-07-09 14:50:36.000000000 -0400 25030+++ linux-2.6.32.18/drivers/hwmon/vt8231.c 2010-08-11 18:57:30.000000000 -0400
24999@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri 25031@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
25000 25032
25001 static struct pci_device_id vt8231_pci_ids[] = { 25033 static struct pci_device_id vt8231_pci_ids[] = {
@@ -25005,9 +25037,9 @@ diff -urNp linux-2.6.32.16/drivers/hwmon/vt8231.c linux-2.6.32.16/drivers/hwmon/
25005 }; 25037 };
25006 25038
25007 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); 25039 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
25008diff -urNp linux-2.6.32.16/drivers/hwmon/w83791d.c linux-2.6.32.16/drivers/hwmon/w83791d.c 25040diff -urNp linux-2.6.32.18/drivers/hwmon/w83791d.c linux-2.6.32.18/drivers/hwmon/w83791d.c
25009--- linux-2.6.32.16/drivers/hwmon/w83791d.c 2010-07-05 14:14:00.000000000 -0400 25041--- linux-2.6.32.18/drivers/hwmon/w83791d.c 2010-08-10 13:45:57.000000000 -0400
25010+++ linux-2.6.32.16/drivers/hwmon/w83791d.c 2010-07-09 14:50:36.000000000 -0400 25042+++ linux-2.6.32.18/drivers/hwmon/w83791d.c 2010-08-11 18:57:30.000000000 -0400
25011@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli 25043@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
25012 struct i2c_board_info *info); 25044 struct i2c_board_info *info);
25013 static int w83791d_remove(struct i2c_client *client); 25045 static int w83791d_remove(struct i2c_client *client);
@@ -25019,9 +25051,9 @@ diff -urNp linux-2.6.32.16/drivers/hwmon/w83791d.c linux-2.6.32.16/drivers/hwmon
25019 static struct w83791d_data *w83791d_update_device(struct device *dev); 25051 static struct w83791d_data *w83791d_update_device(struct device *dev);
25020 25052
25021 #ifdef DEBUG 25053 #ifdef DEBUG
25022diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c 25054diff -urNp linux-2.6.32.18/drivers/i2c/busses/i2c-i801.c linux-2.6.32.18/drivers/i2c/busses/i2c-i801.c
25023--- linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c 2010-07-05 14:14:00.000000000 -0400 25055--- linux-2.6.32.18/drivers/i2c/busses/i2c-i801.c 2010-08-10 13:45:57.000000000 -0400
25024+++ linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c 2010-07-09 14:50:36.000000000 -0400 25056+++ linux-2.6.32.18/drivers/i2c/busses/i2c-i801.c 2010-08-11 18:57:30.000000000 -0400
25025@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] = 25057@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] =
25026 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, 25058 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
25027 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, 25059 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
@@ -25031,9 +25063,9 @@ diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-i801.c linux-2.6.32.16/drivers
25031 }; 25063 };
25032 25064
25033 MODULE_DEVICE_TABLE (pci, i801_ids); 25065 MODULE_DEVICE_TABLE (pci, i801_ids);
25034diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c 25066diff -urNp linux-2.6.32.18/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.18/drivers/i2c/busses/i2c-piix4.c
25035--- linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c 2010-07-05 14:14:00.000000000 -0400 25067--- linux-2.6.32.18/drivers/i2c/busses/i2c-piix4.c 2010-08-10 13:45:57.000000000 -0400
25036+++ linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c 2010-07-09 14:50:36.000000000 -0400 25068+++ linux-2.6.32.18/drivers/i2c/busses/i2c-piix4.c 2010-08-11 18:57:30.000000000 -0400
25037@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat 25069@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
25038 .ident = "IBM", 25070 .ident = "IBM",
25039 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, 25071 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -25052,9 +25084,9 @@ diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.16/driver
25052 }; 25084 };
25053 25085
25054 MODULE_DEVICE_TABLE (pci, piix4_ids); 25086 MODULE_DEVICE_TABLE (pci, piix4_ids);
25055diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c 25087diff -urNp linux-2.6.32.18/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.18/drivers/i2c/busses/i2c-sis630.c
25056--- linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c 2010-07-05 14:14:00.000000000 -0400 25088--- linux-2.6.32.18/drivers/i2c/busses/i2c-sis630.c 2010-08-10 13:45:57.000000000 -0400
25057+++ linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c 2010-07-09 14:50:36.000000000 -0400 25089+++ linux-2.6.32.18/drivers/i2c/busses/i2c-sis630.c 2010-08-11 18:57:30.000000000 -0400
25058@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter 25090@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
25059 static struct pci_device_id sis630_ids[] __devinitdata = { 25091 static struct pci_device_id sis630_ids[] __devinitdata = {
25060 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 25092 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
@@ -25064,9 +25096,9 @@ diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.16/drive
25064 }; 25096 };
25065 25097
25066 MODULE_DEVICE_TABLE (pci, sis630_ids); 25098 MODULE_DEVICE_TABLE (pci, sis630_ids);
25067diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c 25099diff -urNp linux-2.6.32.18/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.18/drivers/i2c/busses/i2c-sis96x.c
25068--- linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c 2010-07-05 14:14:00.000000000 -0400 25100--- linux-2.6.32.18/drivers/i2c/busses/i2c-sis96x.c 2010-08-10 13:45:57.000000000 -0400
25069+++ linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c 2010-07-09 14:50:36.000000000 -0400 25101+++ linux-2.6.32.18/drivers/i2c/busses/i2c-sis96x.c 2010-08-11 18:57:30.000000000 -0400
25070@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter 25102@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
25071 25103
25072 static struct pci_device_id sis96x_ids[] = { 25104 static struct pci_device_id sis96x_ids[] = {
@@ -25076,9 +25108,9 @@ diff -urNp linux-2.6.32.16/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.16/drive
25076 }; 25108 };
25077 25109
25078 MODULE_DEVICE_TABLE (pci, sis96x_ids); 25110 MODULE_DEVICE_TABLE (pci, sis96x_ids);
25079diff -urNp linux-2.6.32.16/drivers/ide/ide-cd.c linux-2.6.32.16/drivers/ide/ide-cd.c 25111diff -urNp linux-2.6.32.18/drivers/ide/ide-cd.c linux-2.6.32.18/drivers/ide/ide-cd.c
25080--- linux-2.6.32.16/drivers/ide/ide-cd.c 2010-07-05 14:14:00.000000000 -0400 25112--- linux-2.6.32.18/drivers/ide/ide-cd.c 2010-08-10 13:45:57.000000000 -0400
25081+++ linux-2.6.32.16/drivers/ide/ide-cd.c 2010-07-09 14:50:36.000000000 -0400 25113+++ linux-2.6.32.18/drivers/ide/ide-cd.c 2010-08-11 18:57:30.000000000 -0400
25082@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ 25114@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_
25083 alignment = queue_dma_alignment(q) | q->dma_pad_mask; 25115 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
25084 if ((unsigned long)buf & alignment 25116 if ((unsigned long)buf & alignment
@@ -25088,9 +25120,9 @@ diff -urNp linux-2.6.32.16/drivers/ide/ide-cd.c linux-2.6.32.16/drivers/ide/ide-
25088 drive->dma = 0; 25120 drive->dma = 0;
25089 } 25121 }
25090 } 25122 }
25091diff -urNp linux-2.6.32.16/drivers/ieee1394/dv1394.c linux-2.6.32.16/drivers/ieee1394/dv1394.c 25123diff -urNp linux-2.6.32.18/drivers/ieee1394/dv1394.c linux-2.6.32.18/drivers/ieee1394/dv1394.c
25092--- linux-2.6.32.16/drivers/ieee1394/dv1394.c 2010-07-05 14:14:00.000000000 -0400 25124--- linux-2.6.32.18/drivers/ieee1394/dv1394.c 2010-08-10 13:45:57.000000000 -0400
25093+++ linux-2.6.32.16/drivers/ieee1394/dv1394.c 2010-07-09 14:50:36.000000000 -0400 25125+++ linux-2.6.32.18/drivers/ieee1394/dv1394.c 2010-08-11 18:57:30.000000000 -0400
25094@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c 25126@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
25095 based upon DIF section and sequence 25127 based upon DIF section and sequence
25096 */ 25128 */
@@ -25109,9 +25141,9 @@ diff -urNp linux-2.6.32.16/drivers/ieee1394/dv1394.c linux-2.6.32.16/drivers/iee
25109 }; 25141 };
25110 25142
25111 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); 25143 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
25112diff -urNp linux-2.6.32.16/drivers/ieee1394/eth1394.c linux-2.6.32.16/drivers/ieee1394/eth1394.c 25144diff -urNp linux-2.6.32.18/drivers/ieee1394/eth1394.c linux-2.6.32.18/drivers/ieee1394/eth1394.c
25113--- linux-2.6.32.16/drivers/ieee1394/eth1394.c 2010-07-05 14:14:00.000000000 -0400 25145--- linux-2.6.32.18/drivers/ieee1394/eth1394.c 2010-08-10 13:45:57.000000000 -0400
25114+++ linux-2.6.32.16/drivers/ieee1394/eth1394.c 2010-07-09 14:50:36.000000000 -0400 25146+++ linux-2.6.32.18/drivers/ieee1394/eth1394.c 2010-08-11 18:57:30.000000000 -0400
25115@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e 25147@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
25116 .specifier_id = ETHER1394_GASP_SPECIFIER_ID, 25148 .specifier_id = ETHER1394_GASP_SPECIFIER_ID,
25117 .version = ETHER1394_GASP_VERSION, 25149 .version = ETHER1394_GASP_VERSION,
@@ -25121,9 +25153,9 @@ diff -urNp linux-2.6.32.16/drivers/ieee1394/eth1394.c linux-2.6.32.16/drivers/ie
25121 }; 25153 };
25122 25154
25123 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); 25155 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
25124diff -urNp linux-2.6.32.16/drivers/ieee1394/hosts.c linux-2.6.32.16/drivers/ieee1394/hosts.c 25156diff -urNp linux-2.6.32.18/drivers/ieee1394/hosts.c linux-2.6.32.18/drivers/ieee1394/hosts.c
25125--- linux-2.6.32.16/drivers/ieee1394/hosts.c 2010-07-05 14:14:00.000000000 -0400 25157--- linux-2.6.32.18/drivers/ieee1394/hosts.c 2010-08-10 13:45:57.000000000 -0400
25126+++ linux-2.6.32.16/drivers/ieee1394/hosts.c 2010-07-09 14:50:36.000000000 -0400 25158+++ linux-2.6.32.18/drivers/ieee1394/hosts.c 2010-08-11 18:57:30.000000000 -0400
25127@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso 25159@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
25128 } 25160 }
25129 25161
@@ -25132,9 +25164,9 @@ diff -urNp linux-2.6.32.16/drivers/ieee1394/hosts.c linux-2.6.32.16/drivers/ieee
25132 .transmit_packet = dummy_transmit_packet, 25164 .transmit_packet = dummy_transmit_packet,
25133 .devctl = dummy_devctl, 25165 .devctl = dummy_devctl,
25134 .isoctl = dummy_isoctl 25166 .isoctl = dummy_isoctl
25135diff -urNp linux-2.6.32.16/drivers/ieee1394/ohci1394.c linux-2.6.32.16/drivers/ieee1394/ohci1394.c 25167diff -urNp linux-2.6.32.18/drivers/ieee1394/ohci1394.c linux-2.6.32.18/drivers/ieee1394/ohci1394.c
25136--- linux-2.6.32.16/drivers/ieee1394/ohci1394.c 2010-07-05 14:14:00.000000000 -0400 25168--- linux-2.6.32.18/drivers/ieee1394/ohci1394.c 2010-08-10 13:45:57.000000000 -0400
25137+++ linux-2.6.32.16/drivers/ieee1394/ohci1394.c 2010-07-09 14:50:36.000000000 -0400 25169+++ linux-2.6.32.18/drivers/ieee1394/ohci1394.c 2010-08-11 18:57:30.000000000 -0400
25138@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ 25170@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
25139 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) 25171 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
25140 25172
@@ -25156,9 +25188,9 @@ diff -urNp linux-2.6.32.16/drivers/ieee1394/ohci1394.c linux-2.6.32.16/drivers/i
25156 }; 25188 };
25157 25189
25158 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); 25190 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
25159diff -urNp linux-2.6.32.16/drivers/ieee1394/raw1394.c linux-2.6.32.16/drivers/ieee1394/raw1394.c 25191diff -urNp linux-2.6.32.18/drivers/ieee1394/raw1394.c linux-2.6.32.18/drivers/ieee1394/raw1394.c
25160--- linux-2.6.32.16/drivers/ieee1394/raw1394.c 2010-07-05 14:14:00.000000000 -0400 25192--- linux-2.6.32.18/drivers/ieee1394/raw1394.c 2010-08-10 13:45:57.000000000 -0400
25161+++ linux-2.6.32.16/drivers/ieee1394/raw1394.c 2010-07-09 14:50:36.000000000 -0400 25193+++ linux-2.6.32.18/drivers/ieee1394/raw1394.c 2010-08-11 18:57:30.000000000 -0400
25162@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r 25194@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
25163 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 25195 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
25164 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 25196 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -25168,9 +25200,9 @@ diff -urNp linux-2.6.32.16/drivers/ieee1394/raw1394.c linux-2.6.32.16/drivers/ie
25168 }; 25200 };
25169 25201
25170 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); 25202 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
25171diff -urNp linux-2.6.32.16/drivers/ieee1394/sbp2.c linux-2.6.32.16/drivers/ieee1394/sbp2.c 25203diff -urNp linux-2.6.32.18/drivers/ieee1394/sbp2.c linux-2.6.32.18/drivers/ieee1394/sbp2.c
25172--- linux-2.6.32.16/drivers/ieee1394/sbp2.c 2010-07-05 14:14:00.000000000 -0400 25204--- linux-2.6.32.18/drivers/ieee1394/sbp2.c 2010-08-10 13:45:57.000000000 -0400
25173+++ linux-2.6.32.16/drivers/ieee1394/sbp2.c 2010-07-09 14:50:36.000000000 -0400 25205+++ linux-2.6.32.18/drivers/ieee1394/sbp2.c 2010-08-11 18:57:30.000000000 -0400
25174@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s 25206@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
25175 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 25207 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
25176 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, 25208 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -25189,9 +25221,9 @@ diff -urNp linux-2.6.32.16/drivers/ieee1394/sbp2.c linux-2.6.32.16/drivers/ieee1
25189 { 25221 {
25190 int ret; 25222 int ret;
25191 25223
25192diff -urNp linux-2.6.32.16/drivers/ieee1394/video1394.c linux-2.6.32.16/drivers/ieee1394/video1394.c 25224diff -urNp linux-2.6.32.18/drivers/ieee1394/video1394.c linux-2.6.32.18/drivers/ieee1394/video1394.c
25193--- linux-2.6.32.16/drivers/ieee1394/video1394.c 2010-07-05 14:14:00.000000000 -0400 25225--- linux-2.6.32.18/drivers/ieee1394/video1394.c 2010-08-10 13:45:57.000000000 -0400
25194+++ linux-2.6.32.16/drivers/ieee1394/video1394.c 2010-07-09 14:50:36.000000000 -0400 25226+++ linux-2.6.32.18/drivers/ieee1394/video1394.c 2010-08-11 18:57:30.000000000 -0400
25195@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v 25227@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
25196 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 25228 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
25197 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff 25229 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
@@ -25201,9 +25233,9 @@ diff -urNp linux-2.6.32.16/drivers/ieee1394/video1394.c linux-2.6.32.16/drivers/
25201 }; 25233 };
25202 25234
25203 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); 25235 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
25204diff -urNp linux-2.6.32.16/drivers/infiniband/core/cm.c linux-2.6.32.16/drivers/infiniband/core/cm.c 25236diff -urNp linux-2.6.32.18/drivers/infiniband/core/cm.c linux-2.6.32.18/drivers/infiniband/core/cm.c
25205--- linux-2.6.32.16/drivers/infiniband/core/cm.c 2010-07-05 14:14:00.000000000 -0400 25237--- linux-2.6.32.18/drivers/infiniband/core/cm.c 2010-08-10 13:45:57.000000000 -0400
25206+++ linux-2.6.32.16/drivers/infiniband/core/cm.c 2010-07-09 14:50:36.000000000 -0400 25238+++ linux-2.6.32.18/drivers/infiniband/core/cm.c 2010-08-11 18:57:30.000000000 -0400
25207@@ -112,7 +112,7 @@ static char const counter_group_names[CM 25239@@ -112,7 +112,7 @@ static char const counter_group_names[CM
25208 25240
25209 struct cm_counter_group { 25241 struct cm_counter_group {
@@ -25347,9 +25379,9 @@ diff -urNp linux-2.6.32.16/drivers/infiniband/core/cm.c linux-2.6.32.16/drivers/
25347 .show = cm_show_counter 25379 .show = cm_show_counter
25348 }; 25380 };
25349 25381
25350diff -urNp linux-2.6.32.16/drivers/infiniband/core/sysfs.c linux-2.6.32.16/drivers/infiniband/core/sysfs.c 25382diff -urNp linux-2.6.32.18/drivers/infiniband/core/sysfs.c linux-2.6.32.18/drivers/infiniband/core/sysfs.c
25351--- linux-2.6.32.16/drivers/infiniband/core/sysfs.c 2010-07-05 14:14:00.000000000 -0400 25383--- linux-2.6.32.18/drivers/infiniband/core/sysfs.c 2010-08-10 13:45:57.000000000 -0400
25352+++ linux-2.6.32.16/drivers/infiniband/core/sysfs.c 2010-07-09 14:50:36.000000000 -0400 25384+++ linux-2.6.32.18/drivers/infiniband/core/sysfs.c 2010-08-11 18:57:30.000000000 -0400
25353@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob 25385@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
25354 return port_attr->show(p, port_attr, buf); 25386 return port_attr->show(p, port_attr, buf);
25355 } 25387 }
@@ -25359,9 +25391,9 @@ diff -urNp linux-2.6.32.16/drivers/infiniband/core/sysfs.c linux-2.6.32.16/drive
25359 .show = port_attr_show 25391 .show = port_attr_show
25360 }; 25392 };
25361 25393
25362diff -urNp linux-2.6.32.16/drivers/input/keyboard/atkbd.c linux-2.6.32.16/drivers/input/keyboard/atkbd.c 25394diff -urNp linux-2.6.32.18/drivers/input/keyboard/atkbd.c linux-2.6.32.18/drivers/input/keyboard/atkbd.c
25363--- linux-2.6.32.16/drivers/input/keyboard/atkbd.c 2010-07-05 14:14:00.000000000 -0400 25395--- linux-2.6.32.18/drivers/input/keyboard/atkbd.c 2010-08-10 13:45:57.000000000 -0400
25364+++ linux-2.6.32.16/drivers/input/keyboard/atkbd.c 2010-07-09 14:50:36.000000000 -0400 25396+++ linux-2.6.32.18/drivers/input/keyboard/atkbd.c 2010-08-11 18:57:30.000000000 -0400
25365@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri 25397@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
25366 .id = SERIO_ANY, 25398 .id = SERIO_ANY,
25367 .extra = SERIO_ANY, 25399 .extra = SERIO_ANY,
@@ -25371,9 +25403,9 @@ diff -urNp linux-2.6.32.16/drivers/input/keyboard/atkbd.c linux-2.6.32.16/driver
25371 }; 25403 };
25372 25404
25373 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); 25405 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
25374diff -urNp linux-2.6.32.16/drivers/input/mouse/lifebook.c linux-2.6.32.16/drivers/input/mouse/lifebook.c 25406diff -urNp linux-2.6.32.18/drivers/input/mouse/lifebook.c linux-2.6.32.18/drivers/input/mouse/lifebook.c
25375--- linux-2.6.32.16/drivers/input/mouse/lifebook.c 2010-07-05 14:14:00.000000000 -0400 25407--- linux-2.6.32.18/drivers/input/mouse/lifebook.c 2010-08-10 13:45:57.000000000 -0400
25376+++ linux-2.6.32.16/drivers/input/mouse/lifebook.c 2010-07-09 14:50:36.000000000 -0400 25408+++ linux-2.6.32.18/drivers/input/mouse/lifebook.c 2010-08-11 18:57:30.000000000 -0400
25377@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo 25409@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
25378 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), 25410 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
25379 }, 25411 },
@@ -25383,9 +25415,9 @@ diff -urNp linux-2.6.32.16/drivers/input/mouse/lifebook.c linux-2.6.32.16/driver
25383 }; 25415 };
25384 25416
25385 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) 25417 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
25386diff -urNp linux-2.6.32.16/drivers/input/mouse/psmouse-base.c linux-2.6.32.16/drivers/input/mouse/psmouse-base.c 25418diff -urNp linux-2.6.32.18/drivers/input/mouse/psmouse-base.c linux-2.6.32.18/drivers/input/mouse/psmouse-base.c
25387--- linux-2.6.32.16/drivers/input/mouse/psmouse-base.c 2010-07-05 14:14:00.000000000 -0400 25419--- linux-2.6.32.18/drivers/input/mouse/psmouse-base.c 2010-08-10 13:45:57.000000000 -0400
25388+++ linux-2.6.32.16/drivers/input/mouse/psmouse-base.c 2010-07-09 14:50:36.000000000 -0400 25420+++ linux-2.6.32.18/drivers/input/mouse/psmouse-base.c 2010-08-11 18:57:30.000000000 -0400
25389@@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se 25421@@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se
25390 .id = SERIO_ANY, 25422 .id = SERIO_ANY,
25391 .extra = SERIO_ANY, 25423 .extra = SERIO_ANY,
@@ -25395,9 +25427,9 @@ diff -urNp linux-2.6.32.16/drivers/input/mouse/psmouse-base.c linux-2.6.32.16/dr
25395 }; 25427 };
25396 25428
25397 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); 25429 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
25398diff -urNp linux-2.6.32.16/drivers/input/mouse/synaptics.c linux-2.6.32.16/drivers/input/mouse/synaptics.c 25430diff -urNp linux-2.6.32.18/drivers/input/mouse/synaptics.c linux-2.6.32.18/drivers/input/mouse/synaptics.c
25399--- linux-2.6.32.16/drivers/input/mouse/synaptics.c 2010-07-05 14:14:00.000000000 -0400 25431--- linux-2.6.32.18/drivers/input/mouse/synaptics.c 2010-08-10 13:45:57.000000000 -0400
25400+++ linux-2.6.32.16/drivers/input/mouse/synaptics.c 2010-07-09 14:50:36.000000000 -0400 25432+++ linux-2.6.32.18/drivers/input/mouse/synaptics.c 2010-08-11 18:57:30.000000000 -0400
25401@@ -437,7 +437,7 @@ static void synaptics_process_packet(str 25433@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
25402 break; 25434 break;
25403 case 2: 25435 case 2:
@@ -25426,9 +25458,9 @@ diff -urNp linux-2.6.32.16/drivers/input/mouse/synaptics.c linux-2.6.32.16/drive
25426 }; 25458 };
25427 #endif 25459 #endif
25428 25460
25429diff -urNp linux-2.6.32.16/drivers/input/mousedev.c linux-2.6.32.16/drivers/input/mousedev.c 25461diff -urNp linux-2.6.32.18/drivers/input/mousedev.c linux-2.6.32.18/drivers/input/mousedev.c
25430--- linux-2.6.32.16/drivers/input/mousedev.c 2010-07-05 14:14:00.000000000 -0400 25462--- linux-2.6.32.18/drivers/input/mousedev.c 2010-08-10 13:45:57.000000000 -0400
25431+++ linux-2.6.32.16/drivers/input/mousedev.c 2010-07-09 14:50:36.000000000 -0400 25463+++ linux-2.6.32.18/drivers/input/mousedev.c 2010-08-11 18:57:30.000000000 -0400
25432@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han 25464@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
25433 25465
25434 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX 25466 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -25438,10 +25470,10 @@ diff -urNp linux-2.6.32.16/drivers/input/mousedev.c linux-2.6.32.16/drivers/inpu
25438 }; 25470 };
25439 static int psaux_registered; 25471 static int psaux_registered;
25440 #endif 25472 #endif
25441diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h 25473diff -urNp linux-2.6.32.18/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.18/drivers/input/serio/i8042-x86ia64io.h
25442--- linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h 2010-07-05 14:14:00.000000000 -0400 25474--- linux-2.6.32.18/drivers/input/serio/i8042-x86ia64io.h 2010-08-10 13:45:57.000000000 -0400
25443+++ linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h 2010-07-09 14:50:36.000000000 -0400 25475+++ linux-2.6.32.18/drivers/input/serio/i8042-x86ia64io.h 2010-08-11 18:57:30.000000000 -0400
25444@@ -172,7 +172,7 @@ static const struct dmi_system_id __init 25476@@ -179,7 +179,7 @@ static const struct dmi_system_id __init
25445 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), 25477 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
25446 }, 25478 },
25447 }, 25479 },
@@ -25450,7 +25482,7 @@ diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16
25450 }; 25482 };
25451 25483
25452 /* 25484 /*
25453@@ -402,7 +402,7 @@ static const struct dmi_system_id __init 25485@@ -409,7 +409,7 @@ static const struct dmi_system_id __init
25454 DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), 25486 DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),
25455 }, 25487 },
25456 }, 25488 },
@@ -25459,7 +25491,7 @@ diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16
25459 }; 25491 };
25460 25492
25461 static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = { 25493 static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
25462@@ -476,7 +476,7 @@ static const struct dmi_system_id __init 25494@@ -483,7 +483,7 @@ static const struct dmi_system_id __init
25463 DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"), 25495 DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"),
25464 }, 25496 },
25465 }, 25497 },
@@ -25468,7 +25500,7 @@ diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16
25468 }; 25500 };
25469 25501
25470 #ifdef CONFIG_PNP 25502 #ifdef CONFIG_PNP
25471@@ -495,7 +495,7 @@ static const struct dmi_system_id __init 25503@@ -502,7 +502,7 @@ static const struct dmi_system_id __init
25472 DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), 25504 DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
25473 }, 25505 },
25474 }, 25506 },
@@ -25477,7 +25509,7 @@ diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16
25477 }; 25509 };
25478 25510
25479 static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = { 25511 static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = {
25480@@ -519,7 +519,7 @@ static const struct dmi_system_id __init 25512@@ -526,7 +526,7 @@ static const struct dmi_system_id __init
25481 DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */ 25513 DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */
25482 }, 25514 },
25483 }, 25515 },
@@ -25486,7 +25518,7 @@ diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16
25486 }; 25518 };
25487 #endif 25519 #endif
25488 25520
25489@@ -593,7 +593,7 @@ static const struct dmi_system_id __init 25521@@ -600,7 +600,7 @@ static const struct dmi_system_id __init
25490 DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"), 25522 DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"),
25491 }, 25523 },
25492 }, 25524 },
@@ -25495,9 +25527,9 @@ diff -urNp linux-2.6.32.16/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.16
25495 }; 25527 };
25496 25528
25497 #endif /* CONFIG_X86 */ 25529 #endif /* CONFIG_X86 */
25498diff -urNp linux-2.6.32.16/drivers/input/serio/serio_raw.c linux-2.6.32.16/drivers/input/serio/serio_raw.c 25530diff -urNp linux-2.6.32.18/drivers/input/serio/serio_raw.c linux-2.6.32.18/drivers/input/serio/serio_raw.c
25499--- linux-2.6.32.16/drivers/input/serio/serio_raw.c 2010-07-05 14:14:00.000000000 -0400 25531--- linux-2.6.32.18/drivers/input/serio/serio_raw.c 2010-08-10 13:45:57.000000000 -0400
25500+++ linux-2.6.32.16/drivers/input/serio/serio_raw.c 2010-07-09 14:50:36.000000000 -0400 25532+++ linux-2.6.32.18/drivers/input/serio/serio_raw.c 2010-08-11 18:57:30.000000000 -0400
25501@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ 25533@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
25502 .id = SERIO_ANY, 25534 .id = SERIO_ANY,
25503 .extra = SERIO_ANY, 25535 .extra = SERIO_ANY,
@@ -25507,9 +25539,9 @@ diff -urNp linux-2.6.32.16/drivers/input/serio/serio_raw.c linux-2.6.32.16/drive
25507 }; 25539 };
25508 25540
25509 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); 25541 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
25510diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/common.c linux-2.6.32.16/drivers/isdn/gigaset/common.c 25542diff -urNp linux-2.6.32.18/drivers/isdn/gigaset/common.c linux-2.6.32.18/drivers/isdn/gigaset/common.c
25511--- linux-2.6.32.16/drivers/isdn/gigaset/common.c 2010-07-05 14:14:00.000000000 -0400 25543--- linux-2.6.32.18/drivers/isdn/gigaset/common.c 2010-08-10 13:45:57.000000000 -0400
25512+++ linux-2.6.32.16/drivers/isdn/gigaset/common.c 2010-07-09 14:50:36.000000000 -0400 25544+++ linux-2.6.32.18/drivers/isdn/gigaset/common.c 2010-08-11 18:57:30.000000000 -0400
25513@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct 25545@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
25514 cs->commands_pending = 0; 25546 cs->commands_pending = 0;
25515 cs->cur_at_seq = 0; 25547 cs->cur_at_seq = 0;
@@ -25519,9 +25551,9 @@ diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/common.c linux-2.6.32.16/drivers
25519 cs->dev = NULL; 25551 cs->dev = NULL;
25520 cs->tty = NULL; 25552 cs->tty = NULL;
25521 cs->tty_dev = NULL; 25553 cs->tty_dev = NULL;
25522diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h 25554diff -urNp linux-2.6.32.18/drivers/isdn/gigaset/gigaset.h linux-2.6.32.18/drivers/isdn/gigaset/gigaset.h
25523--- linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h 2010-07-05 14:14:00.000000000 -0400 25555--- linux-2.6.32.18/drivers/isdn/gigaset/gigaset.h 2010-08-10 13:45:57.000000000 -0400
25524+++ linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h 2010-07-09 14:50:36.000000000 -0400 25556+++ linux-2.6.32.18/drivers/isdn/gigaset/gigaset.h 2010-08-11 18:57:30.000000000 -0400
25525@@ -446,7 +446,7 @@ struct cardstate { 25557@@ -446,7 +446,7 @@ struct cardstate {
25526 spinlock_t cmdlock; 25558 spinlock_t cmdlock;
25527 unsigned curlen, cmdbytes; 25559 unsigned curlen, cmdbytes;
@@ -25531,9 +25563,9 @@ diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/gigaset.h linux-2.6.32.16/driver
25531 struct tty_struct *tty; 25563 struct tty_struct *tty;
25532 struct tasklet_struct if_wake_tasklet; 25564 struct tasklet_struct if_wake_tasklet;
25533 unsigned control_state; 25565 unsigned control_state;
25534diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/interface.c linux-2.6.32.16/drivers/isdn/gigaset/interface.c 25566diff -urNp linux-2.6.32.18/drivers/isdn/gigaset/interface.c linux-2.6.32.18/drivers/isdn/gigaset/interface.c
25535--- linux-2.6.32.16/drivers/isdn/gigaset/interface.c 2010-07-05 14:14:00.000000000 -0400 25567--- linux-2.6.32.18/drivers/isdn/gigaset/interface.c 2010-08-10 13:45:57.000000000 -0400
25536+++ linux-2.6.32.16/drivers/isdn/gigaset/interface.c 2010-07-09 14:50:36.000000000 -0400 25568+++ linux-2.6.32.18/drivers/isdn/gigaset/interface.c 2010-08-11 18:57:30.000000000 -0400
25537@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt 25569@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
25538 return -ERESTARTSYS; // FIXME -EINTR? 25570 return -ERESTARTSYS; // FIXME -EINTR?
25539 tty->driver_data = cs; 25571 tty->driver_data = cs;
@@ -25621,9 +25653,9 @@ diff -urNp linux-2.6.32.16/drivers/isdn/gigaset/interface.c linux-2.6.32.16/driv
25621 dev_warn(cs->dev, "%s: device not opened\n", __func__); 25653 dev_warn(cs->dev, "%s: device not opened\n", __func__);
25622 goto out; 25654 goto out;
25623 } 25655 }
25624diff -urNp linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c 25656diff -urNp linux-2.6.32.18/drivers/isdn/hardware/avm/b1.c linux-2.6.32.18/drivers/isdn/hardware/avm/b1.c
25625--- linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c 2010-07-05 14:14:00.000000000 -0400 25657--- linux-2.6.32.18/drivers/isdn/hardware/avm/b1.c 2010-08-10 13:45:57.000000000 -0400
25626+++ linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c 2010-07-09 14:50:36.000000000 -0400 25658+++ linux-2.6.32.18/drivers/isdn/hardware/avm/b1.c 2010-08-11 18:57:30.000000000 -0400
25627@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo 25659@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
25628 } 25660 }
25629 if (left) { 25661 if (left) {
@@ -25642,9 +25674,9 @@ diff -urNp linux-2.6.32.16/drivers/isdn/hardware/avm/b1.c linux-2.6.32.16/driver
25642 return -EFAULT; 25674 return -EFAULT;
25643 } else { 25675 } else {
25644 memcpy(buf, dp, left); 25676 memcpy(buf, dp, left);
25645diff -urNp linux-2.6.32.16/drivers/isdn/icn/icn.c linux-2.6.32.16/drivers/isdn/icn/icn.c 25677diff -urNp linux-2.6.32.18/drivers/isdn/icn/icn.c linux-2.6.32.18/drivers/isdn/icn/icn.c
25646--- linux-2.6.32.16/drivers/isdn/icn/icn.c 2010-07-05 14:14:00.000000000 -0400 25678--- linux-2.6.32.18/drivers/isdn/icn/icn.c 2010-08-10 13:45:57.000000000 -0400
25647+++ linux-2.6.32.16/drivers/isdn/icn/icn.c 2010-07-09 14:50:36.000000000 -0400 25679+++ linux-2.6.32.18/drivers/isdn/icn/icn.c 2010-08-11 18:57:30.000000000 -0400
25648@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len 25680@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
25649 if (count > len) 25681 if (count > len)
25650 count = len; 25682 count = len;
@@ -25654,9 +25686,9 @@ diff -urNp linux-2.6.32.16/drivers/isdn/icn/icn.c linux-2.6.32.16/drivers/isdn/i
25654 return -EFAULT; 25686 return -EFAULT;
25655 } else 25687 } else
25656 memcpy(msg, buf, count); 25688 memcpy(msg, buf, count);
25657diff -urNp linux-2.6.32.16/drivers/lguest/core.c linux-2.6.32.16/drivers/lguest/core.c 25689diff -urNp linux-2.6.32.18/drivers/lguest/core.c linux-2.6.32.18/drivers/lguest/core.c
25658--- linux-2.6.32.16/drivers/lguest/core.c 2010-07-05 14:14:00.000000000 -0400 25690--- linux-2.6.32.18/drivers/lguest/core.c 2010-08-10 13:45:57.000000000 -0400
25659+++ linux-2.6.32.16/drivers/lguest/core.c 2010-07-09 14:50:36.000000000 -0400 25691+++ linux-2.6.32.18/drivers/lguest/core.c 2010-08-11 18:57:30.000000000 -0400
25660@@ -91,9 +91,17 @@ static __init int map_switcher(void) 25692@@ -91,9 +91,17 @@ static __init int map_switcher(void)
25661 * it's worked so far. The end address needs +1 because __get_vm_area 25693 * it's worked so far. The end address needs +1 because __get_vm_area
25662 * allocates an extra guard page, so we need space for that. 25694 * allocates an extra guard page, so we need space for that.
@@ -25675,9 +25707,9 @@ diff -urNp linux-2.6.32.16/drivers/lguest/core.c linux-2.6.32.16/drivers/lguest/
25675 if (!switcher_vma) { 25707 if (!switcher_vma) {
25676 err = -ENOMEM; 25708 err = -ENOMEM;
25677 printk("lguest: could not map switcher pages high\n"); 25709 printk("lguest: could not map switcher pages high\n");
25678diff -urNp linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c 25710diff -urNp linux-2.6.32.18/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.18/drivers/macintosh/via-pmu-backlight.c
25679--- linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c 2010-07-05 14:14:00.000000000 -0400 25711--- linux-2.6.32.18/drivers/macintosh/via-pmu-backlight.c 2010-08-10 13:45:57.000000000 -0400
25680+++ linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c 2010-07-09 14:50:36.000000000 -0400 25712+++ linux-2.6.32.18/drivers/macintosh/via-pmu-backlight.c 2010-08-11 18:57:30.000000000 -0400
25681@@ -15,7 +15,7 @@ 25713@@ -15,7 +15,7 @@
25682 25714
25683 #define MAX_PMU_LEVEL 0xFF 25715 #define MAX_PMU_LEVEL 0xFF
@@ -25696,9 +25728,9 @@ diff -urNp linux-2.6.32.16/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.16
25696 .get_brightness = pmu_backlight_get_brightness, 25728 .get_brightness = pmu_backlight_get_brightness,
25697 .update_status = pmu_backlight_update_status, 25729 .update_status = pmu_backlight_update_status,
25698 25730
25699diff -urNp linux-2.6.32.16/drivers/macintosh/via-pmu.c linux-2.6.32.16/drivers/macintosh/via-pmu.c 25731diff -urNp linux-2.6.32.18/drivers/macintosh/via-pmu.c linux-2.6.32.18/drivers/macintosh/via-pmu.c
25700--- linux-2.6.32.16/drivers/macintosh/via-pmu.c 2010-07-05 14:14:00.000000000 -0400 25732--- linux-2.6.32.18/drivers/macintosh/via-pmu.c 2010-08-10 13:45:57.000000000 -0400
25701+++ linux-2.6.32.16/drivers/macintosh/via-pmu.c 2010-07-09 14:50:36.000000000 -0400 25733+++ linux-2.6.32.18/drivers/macintosh/via-pmu.c 2010-08-11 18:57:30.000000000 -0400
25702@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state 25734@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
25703 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); 25735 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
25704 } 25736 }
@@ -25708,9 +25740,9 @@ diff -urNp linux-2.6.32.16/drivers/macintosh/via-pmu.c linux-2.6.32.16/drivers/m
25708 .enter = powerbook_sleep, 25740 .enter = powerbook_sleep,
25709 .valid = pmu_sleep_valid, 25741 .valid = pmu_sleep_valid,
25710 }; 25742 };
25711diff -urNp linux-2.6.32.16/drivers/md/bitmap.c linux-2.6.32.16/drivers/md/bitmap.c 25743diff -urNp linux-2.6.32.18/drivers/md/bitmap.c linux-2.6.32.18/drivers/md/bitmap.c
25712--- linux-2.6.32.16/drivers/md/bitmap.c 2010-07-05 14:14:00.000000000 -0400 25744--- linux-2.6.32.18/drivers/md/bitmap.c 2010-08-10 13:45:57.000000000 -0400
25713+++ linux-2.6.32.16/drivers/md/bitmap.c 2010-07-09 14:50:36.000000000 -0400 25745+++ linux-2.6.32.18/drivers/md/bitmap.c 2010-08-11 18:57:30.000000000 -0400
25714@@ -58,7 +58,7 @@ 25746@@ -58,7 +58,7 @@
25715 # if DEBUG > 0 25747 # if DEBUG > 0
25716 # define PRINTK(x...) printk(KERN_DEBUG x) 25748 # define PRINTK(x...) printk(KERN_DEBUG x)
@@ -25720,9 +25752,9 @@ diff -urNp linux-2.6.32.16/drivers/md/bitmap.c linux-2.6.32.16/drivers/md/bitmap
25720 # endif 25752 # endif
25721 #endif 25753 #endif
25722 25754
25723diff -urNp linux-2.6.32.16/drivers/md/dm-sysfs.c linux-2.6.32.16/drivers/md/dm-sysfs.c 25755diff -urNp linux-2.6.32.18/drivers/md/dm-sysfs.c linux-2.6.32.18/drivers/md/dm-sysfs.c
25724--- linux-2.6.32.16/drivers/md/dm-sysfs.c 2010-07-05 14:14:00.000000000 -0400 25756--- linux-2.6.32.18/drivers/md/dm-sysfs.c 2010-08-10 13:45:57.000000000 -0400
25725+++ linux-2.6.32.16/drivers/md/dm-sysfs.c 2010-07-09 14:50:36.000000000 -0400 25757+++ linux-2.6.32.18/drivers/md/dm-sysfs.c 2010-08-11 18:57:30.000000000 -0400
25726@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { 25758@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
25727 NULL, 25759 NULL,
25728 }; 25760 };
@@ -25732,9 +25764,9 @@ diff -urNp linux-2.6.32.16/drivers/md/dm-sysfs.c linux-2.6.32.16/drivers/md/dm-s
25732 .show = dm_attr_show, 25764 .show = dm_attr_show,
25733 }; 25765 };
25734 25766
25735diff -urNp linux-2.6.32.16/drivers/md/dm-table.c linux-2.6.32.16/drivers/md/dm-table.c 25767diff -urNp linux-2.6.32.18/drivers/md/dm-table.c linux-2.6.32.18/drivers/md/dm-table.c
25736--- linux-2.6.32.16/drivers/md/dm-table.c 2010-07-05 14:14:00.000000000 -0400 25768--- linux-2.6.32.18/drivers/md/dm-table.c 2010-08-10 13:45:57.000000000 -0400
25737+++ linux-2.6.32.16/drivers/md/dm-table.c 2010-07-09 14:50:36.000000000 -0400 25769+++ linux-2.6.32.18/drivers/md/dm-table.c 2010-08-11 18:57:30.000000000 -0400
25738@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct 25770@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
25739 if (!dev_size) 25771 if (!dev_size)
25740 return 0; 25772 return 0;
@@ -25744,9 +25776,9 @@ diff -urNp linux-2.6.32.16/drivers/md/dm-table.c linux-2.6.32.16/drivers/md/dm-t
25744 DMWARN("%s: %s too small for target: " 25776 DMWARN("%s: %s too small for target: "
25745 "start=%llu, len=%llu, dev_size=%llu", 25777 "start=%llu, len=%llu, dev_size=%llu",
25746 dm_device_name(ti->table->md), bdevname(bdev, b), 25778 dm_device_name(ti->table->md), bdevname(bdev, b),
25747diff -urNp linux-2.6.32.16/drivers/md/md.c linux-2.6.32.16/drivers/md/md.c 25779diff -urNp linux-2.6.32.18/drivers/md/md.c linux-2.6.32.18/drivers/md/md.c
25748--- linux-2.6.32.16/drivers/md/md.c 2010-07-05 14:14:00.000000000 -0400 25780--- linux-2.6.32.18/drivers/md/md.c 2010-08-10 13:45:57.000000000 -0400
25749+++ linux-2.6.32.16/drivers/md/md.c 2010-07-09 14:50:36.000000000 -0400 25781+++ linux-2.6.32.18/drivers/md/md.c 2010-08-11 18:57:30.000000000 -0400
25750@@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko 25782@@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko
25751 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); 25783 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
25752 kfree(rdev); 25784 kfree(rdev);
@@ -25783,9 +25815,9 @@ diff -urNp linux-2.6.32.16/drivers/md/md.c linux-2.6.32.16/drivers/md/md.c
25783 /* sync IO will cause sync_io to increase before the disk_stats 25815 /* sync IO will cause sync_io to increase before the disk_stats
25784 * as sync_io is counted when a request starts, and 25816 * as sync_io is counted when a request starts, and
25785 * disk_stats is counted when it completes. 25817 * disk_stats is counted when it completes.
25786diff -urNp linux-2.6.32.16/drivers/md/md.h linux-2.6.32.16/drivers/md/md.h 25818diff -urNp linux-2.6.32.18/drivers/md/md.h linux-2.6.32.18/drivers/md/md.h
25787--- linux-2.6.32.16/drivers/md/md.h 2010-07-05 14:14:00.000000000 -0400 25819--- linux-2.6.32.18/drivers/md/md.h 2010-08-10 13:45:57.000000000 -0400
25788+++ linux-2.6.32.16/drivers/md/md.h 2010-07-09 14:50:36.000000000 -0400 25820+++ linux-2.6.32.18/drivers/md/md.h 2010-08-11 18:57:30.000000000 -0400
25789@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ 25821@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
25790 25822
25791 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) 25823 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
@@ -25795,9 +25827,9 @@ diff -urNp linux-2.6.32.16/drivers/md/md.h linux-2.6.32.16/drivers/md/md.h
25795 } 25827 }
25796 25828
25797 struct mdk_personality 25829 struct mdk_personality
25798diff -urNp linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c 25830diff -urNp linux-2.6.32.18/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.18/drivers/media/dvb/dvb-core/dvbdev.c
25799--- linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c 2010-07-05 14:14:00.000000000 -0400 25831--- linux-2.6.32.18/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-10 13:45:57.000000000 -0400
25800+++ linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c 2010-07-09 14:50:36.000000000 -0400 25832+++ linux-2.6.32.18/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-11 18:57:30.000000000 -0400
25801@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt 25833@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
25802 const struct dvb_device *template, void *priv, int type) 25834 const struct dvb_device *template, void *priv, int type)
25803 { 25835 {
@@ -25806,9 +25838,9 @@ diff -urNp linux-2.6.32.16/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.16/d
25806 struct file_operations *dvbdevfops; 25838 struct file_operations *dvbdevfops;
25807 struct device *clsdev; 25839 struct device *clsdev;
25808 int minor; 25840 int minor;
25809diff -urNp linux-2.6.32.16/drivers/media/radio/radio-cadet.c linux-2.6.32.16/drivers/media/radio/radio-cadet.c 25841diff -urNp linux-2.6.32.18/drivers/media/radio/radio-cadet.c linux-2.6.32.18/drivers/media/radio/radio-cadet.c
25810--- linux-2.6.32.16/drivers/media/radio/radio-cadet.c 2010-07-05 14:14:00.000000000 -0400 25842--- linux-2.6.32.18/drivers/media/radio/radio-cadet.c 2010-08-10 13:45:57.000000000 -0400
25811+++ linux-2.6.32.16/drivers/media/radio/radio-cadet.c 2010-07-09 14:50:36.000000000 -0400 25843+++ linux-2.6.32.18/drivers/media/radio/radio-cadet.c 2010-08-11 18:57:30.000000000 -0400
25812@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f 25844@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
25813 while (i < count && dev->rdsin != dev->rdsout) 25845 while (i < count && dev->rdsin != dev->rdsout)
25814 readbuf[i++] = dev->rdsbuf[dev->rdsout++]; 25846 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
@@ -25818,9 +25850,9 @@ diff -urNp linux-2.6.32.16/drivers/media/radio/radio-cadet.c linux-2.6.32.16/dri
25818 return -EFAULT; 25850 return -EFAULT;
25819 return i; 25851 return i;
25820 } 25852 }
25821diff -urNp linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c 25853diff -urNp linux-2.6.32.18/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.18/drivers/media/video/usbvideo/konicawc.c
25822--- linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c 2010-07-05 14:14:00.000000000 -0400 25854--- linux-2.6.32.18/drivers/media/video/usbvideo/konicawc.c 2010-08-10 13:45:57.000000000 -0400
25823+++ linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c 2010-07-09 14:50:36.000000000 -0400 25855+++ linux-2.6.32.18/drivers/media/video/usbvideo/konicawc.c 2010-08-11 18:57:30.000000000 -0400
25824@@ -225,7 +225,7 @@ static void konicawc_register_input(stru 25856@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
25825 int error; 25857 int error;
25826 25858
@@ -25830,9 +25862,9 @@ diff -urNp linux-2.6.32.16/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
25830 25862
25831 cam->input = input_dev = input_allocate_device(); 25863 cam->input = input_dev = input_allocate_device();
25832 if (!input_dev) { 25864 if (!input_dev) {
25833diff -urNp linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c 25865diff -urNp linux-2.6.32.18/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.18/drivers/media/video/usbvideo/quickcam_messenger.c
25834--- linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c 2010-07-05 14:14:00.000000000 -0400 25866--- linux-2.6.32.18/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-10 13:45:57.000000000 -0400
25835+++ linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c 2010-07-09 14:50:36.000000000 -0400 25867+++ linux-2.6.32.18/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-11 18:57:30.000000000 -0400
25836@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc 25868@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
25837 int error; 25869 int error;
25838 25870
@@ -25842,9 +25874,9 @@ diff -urNp linux-2.6.32.16/drivers/media/video/usbvideo/quickcam_messenger.c lin
25842 25874
25843 cam->input = input_dev = input_allocate_device(); 25875 cam->input = input_dev = input_allocate_device();
25844 if (!input_dev) { 25876 if (!input_dev) {
25845diff -urNp linux-2.6.32.16/drivers/message/fusion/mptdebug.h linux-2.6.32.16/drivers/message/fusion/mptdebug.h 25877diff -urNp linux-2.6.32.18/drivers/message/fusion/mptdebug.h linux-2.6.32.18/drivers/message/fusion/mptdebug.h
25846--- linux-2.6.32.16/drivers/message/fusion/mptdebug.h 2010-07-05 14:14:00.000000000 -0400 25878--- linux-2.6.32.18/drivers/message/fusion/mptdebug.h 2010-08-10 13:45:57.000000000 -0400
25847+++ linux-2.6.32.16/drivers/message/fusion/mptdebug.h 2010-07-09 14:50:36.000000000 -0400 25879+++ linux-2.6.32.18/drivers/message/fusion/mptdebug.h 2010-08-11 18:57:30.000000000 -0400
25848@@ -71,7 +71,7 @@ 25880@@ -71,7 +71,7 @@
25849 CMD; \ 25881 CMD; \
25850 } 25882 }
@@ -25854,9 +25886,9 @@ diff -urNp linux-2.6.32.16/drivers/message/fusion/mptdebug.h linux-2.6.32.16/dri
25854 #endif 25886 #endif
25855 25887
25856 25888
25857diff -urNp linux-2.6.32.16/drivers/message/fusion/mptsas.c linux-2.6.32.16/drivers/message/fusion/mptsas.c 25889diff -urNp linux-2.6.32.18/drivers/message/fusion/mptsas.c linux-2.6.32.18/drivers/message/fusion/mptsas.c
25858--- linux-2.6.32.16/drivers/message/fusion/mptsas.c 2010-07-05 14:14:00.000000000 -0400 25890--- linux-2.6.32.18/drivers/message/fusion/mptsas.c 2010-08-10 13:45:57.000000000 -0400
25859+++ linux-2.6.32.16/drivers/message/fusion/mptsas.c 2010-07-09 14:50:36.000000000 -0400 25891+++ linux-2.6.32.18/drivers/message/fusion/mptsas.c 2010-08-11 18:57:30.000000000 -0400
25860@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin 25892@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
25861 return 0; 25893 return 0;
25862 } 25894 }
@@ -25905,9 +25937,9 @@ diff -urNp linux-2.6.32.16/drivers/message/fusion/mptsas.c linux-2.6.32.16/drive
25905 static inline struct sas_port * 25937 static inline struct sas_port *
25906 mptsas_get_port(struct mptsas_phyinfo *phy_info) 25938 mptsas_get_port(struct mptsas_phyinfo *phy_info)
25907 { 25939 {
25908diff -urNp linux-2.6.32.16/drivers/message/i2o/i2o_proc.c linux-2.6.32.16/drivers/message/i2o/i2o_proc.c 25940diff -urNp linux-2.6.32.18/drivers/message/i2o/i2o_proc.c linux-2.6.32.18/drivers/message/i2o/i2o_proc.c
25909--- linux-2.6.32.16/drivers/message/i2o/i2o_proc.c 2010-07-05 14:14:00.000000000 -0400 25941--- linux-2.6.32.18/drivers/message/i2o/i2o_proc.c 2010-08-10 13:45:57.000000000 -0400
25910+++ linux-2.6.32.16/drivers/message/i2o/i2o_proc.c 2010-07-09 14:50:36.000000000 -0400 25942+++ linux-2.6.32.18/drivers/message/i2o/i2o_proc.c 2010-08-11 18:57:30.000000000 -0400
25911@@ -259,13 +259,6 @@ static char *scsi_devices[] = { 25943@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
25912 "Array Controller Device" 25944 "Array Controller Device"
25913 }; 25945 };
@@ -25994,9 +26026,9 @@ diff -urNp linux-2.6.32.16/drivers/message/i2o/i2o_proc.c linux-2.6.32.16/driver
25994 26026
25995 return 0; 26027 return 0;
25996 } 26028 }
25997diff -urNp linux-2.6.32.16/drivers/misc/kgdbts.c linux-2.6.32.16/drivers/misc/kgdbts.c 26029diff -urNp linux-2.6.32.18/drivers/misc/kgdbts.c linux-2.6.32.18/drivers/misc/kgdbts.c
25998--- linux-2.6.32.16/drivers/misc/kgdbts.c 2010-07-05 14:14:00.000000000 -0400 26030--- linux-2.6.32.18/drivers/misc/kgdbts.c 2010-08-10 13:45:57.000000000 -0400
25999+++ linux-2.6.32.16/drivers/misc/kgdbts.c 2010-07-09 14:50:36.000000000 -0400 26031+++ linux-2.6.32.18/drivers/misc/kgdbts.c 2010-08-11 18:57:30.000000000 -0400
26000@@ -118,7 +118,7 @@ 26032@@ -118,7 +118,7 @@
26001 } while (0) 26033 } while (0)
26002 #define MAX_CONFIG_LEN 40 26034 #define MAX_CONFIG_LEN 40
@@ -26015,9 +26047,9 @@ diff -urNp linux-2.6.32.16/drivers/misc/kgdbts.c linux-2.6.32.16/drivers/misc/kg
26015 .name = "kgdbts", 26047 .name = "kgdbts",
26016 .read_char = kgdbts_get_char, 26048 .read_char = kgdbts_get_char,
26017 .write_char = kgdbts_put_char, 26049 .write_char = kgdbts_put_char,
26018diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c 26050diff -urNp linux-2.6.32.18/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.18/drivers/misc/sgi-gru/gruhandles.c
26019--- linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c 2010-07-05 14:14:00.000000000 -0400 26051--- linux-2.6.32.18/drivers/misc/sgi-gru/gruhandles.c 2010-08-10 13:45:57.000000000 -0400
26020+++ linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c 2010-07-09 14:50:36.000000000 -0400 26052+++ linux-2.6.32.18/drivers/misc/sgi-gru/gruhandles.c 2010-08-11 18:57:30.000000000 -0400
26021@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic 26053@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
26022 26054
26023 static void update_mcs_stats(enum mcs_op op, unsigned long clks) 26055 static void update_mcs_stats(enum mcs_op op, unsigned long clks)
@@ -26029,9 +26061,9 @@ diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.16/dri
26029 if (mcs_op_statistics[op].max < clks) 26061 if (mcs_op_statistics[op].max < clks)
26030 mcs_op_statistics[op].max = clks; 26062 mcs_op_statistics[op].max = clks;
26031 } 26063 }
26032diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c 26064diff -urNp linux-2.6.32.18/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.18/drivers/misc/sgi-gru/gruprocfs.c
26033--- linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c 2010-07-05 14:14:00.000000000 -0400 26065--- linux-2.6.32.18/drivers/misc/sgi-gru/gruprocfs.c 2010-08-10 13:45:57.000000000 -0400
26034+++ linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c 2010-07-09 14:50:36.000000000 -0400 26066+++ linux-2.6.32.18/drivers/misc/sgi-gru/gruprocfs.c 2010-08-11 18:57:30.000000000 -0400
26035@@ -32,9 +32,9 @@ 26067@@ -32,9 +32,9 @@
26036 26068
26037 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) 26069 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -26055,9 +26087,9 @@ diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.16/driv
26055 max = mcs_op_statistics[op].max; 26087 max = mcs_op_statistics[op].max;
26056 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, 26088 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
26057 count ? total / count : 0, max); 26089 count ? total / count : 0, max);
26058diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h 26090diff -urNp linux-2.6.32.18/drivers/misc/sgi-gru/grutables.h linux-2.6.32.18/drivers/misc/sgi-gru/grutables.h
26059--- linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h 2010-07-05 14:14:00.000000000 -0400 26091--- linux-2.6.32.18/drivers/misc/sgi-gru/grutables.h 2010-08-10 13:45:57.000000000 -0400
26060+++ linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h 2010-07-09 14:50:36.000000000 -0400 26092+++ linux-2.6.32.18/drivers/misc/sgi-gru/grutables.h 2010-08-11 18:57:30.000000000 -0400
26061@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; 26093@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
26062 * GRU statistics. 26094 * GRU statistics.
26063 */ 26095 */
@@ -26241,9 +26273,9 @@ diff -urNp linux-2.6.32.16/drivers/misc/sgi-gru/grutables.h linux-2.6.32.16/driv
26241 } while (0) 26273 } while (0)
26242 26274
26243 #ifdef CONFIG_SGI_GRU_DEBUG 26275 #ifdef CONFIG_SGI_GRU_DEBUG
26244diff -urNp linux-2.6.32.16/drivers/mtd/devices/doc2000.c linux-2.6.32.16/drivers/mtd/devices/doc2000.c 26276diff -urNp linux-2.6.32.18/drivers/mtd/devices/doc2000.c linux-2.6.32.18/drivers/mtd/devices/doc2000.c
26245--- linux-2.6.32.16/drivers/mtd/devices/doc2000.c 2010-07-05 14:14:00.000000000 -0400 26277--- linux-2.6.32.18/drivers/mtd/devices/doc2000.c 2010-08-10 13:45:57.000000000 -0400
26246+++ linux-2.6.32.16/drivers/mtd/devices/doc2000.c 2010-07-09 14:50:36.000000000 -0400 26278+++ linux-2.6.32.18/drivers/mtd/devices/doc2000.c 2010-08-11 18:57:30.000000000 -0400
26247@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt 26279@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
26248 26280
26249 /* The ECC will not be calculated correctly if less than 512 is written */ 26281 /* The ECC will not be calculated correctly if less than 512 is written */
@@ -26253,9 +26285,9 @@ diff -urNp linux-2.6.32.16/drivers/mtd/devices/doc2000.c linux-2.6.32.16/drivers
26253 printk(KERN_WARNING 26285 printk(KERN_WARNING
26254 "ECC needs a full sector write (adr: %lx size %lx)\n", 26286 "ECC needs a full sector write (adr: %lx size %lx)\n",
26255 (long) to, (long) len); 26287 (long) to, (long) len);
26256diff -urNp linux-2.6.32.16/drivers/mtd/devices/doc2001.c linux-2.6.32.16/drivers/mtd/devices/doc2001.c 26288diff -urNp linux-2.6.32.18/drivers/mtd/devices/doc2001.c linux-2.6.32.18/drivers/mtd/devices/doc2001.c
26257--- linux-2.6.32.16/drivers/mtd/devices/doc2001.c 2010-07-05 14:14:00.000000000 -0400 26289--- linux-2.6.32.18/drivers/mtd/devices/doc2001.c 2010-08-10 13:45:57.000000000 -0400
26258+++ linux-2.6.32.16/drivers/mtd/devices/doc2001.c 2010-07-09 14:50:36.000000000 -0400 26290+++ linux-2.6.32.18/drivers/mtd/devices/doc2001.c 2010-08-11 18:57:30.000000000 -0400
26259@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt 26291@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
26260 struct Nand *mychip = &this->chips[from >> (this->chipshift)]; 26292 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
26261 26293
@@ -26265,9 +26297,9 @@ diff -urNp linux-2.6.32.16/drivers/mtd/devices/doc2001.c linux-2.6.32.16/drivers
26265 return -EINVAL; 26297 return -EINVAL;
26266 26298
26267 /* Don't allow a single read to cross a 512-byte block boundary */ 26299 /* Don't allow a single read to cross a 512-byte block boundary */
26268diff -urNp linux-2.6.32.16/drivers/mtd/ubi/build.c linux-2.6.32.16/drivers/mtd/ubi/build.c 26300diff -urNp linux-2.6.32.18/drivers/mtd/ubi/build.c linux-2.6.32.18/drivers/mtd/ubi/build.c
26269--- linux-2.6.32.16/drivers/mtd/ubi/build.c 2010-07-05 14:14:00.000000000 -0400 26301--- linux-2.6.32.18/drivers/mtd/ubi/build.c 2010-08-10 13:45:57.000000000 -0400
26270+++ linux-2.6.32.16/drivers/mtd/ubi/build.c 2010-07-09 14:50:36.000000000 -0400 26302+++ linux-2.6.32.18/drivers/mtd/ubi/build.c 2010-08-11 18:57:30.000000000 -0400
26271@@ -1255,7 +1255,7 @@ module_exit(ubi_exit); 26303@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
26272 static int __init bytes_str_to_int(const char *str) 26304 static int __init bytes_str_to_int(const char *str)
26273 { 26305 {
@@ -26307,9 +26339,9 @@ diff -urNp linux-2.6.32.16/drivers/mtd/ubi/build.c linux-2.6.32.16/drivers/mtd/u
26307 } 26339 }
26308 26340
26309 /** 26341 /**
26310diff -urNp linux-2.6.32.16/drivers/net/e1000e/82571.c linux-2.6.32.16/drivers/net/e1000e/82571.c 26342diff -urNp linux-2.6.32.18/drivers/net/e1000e/82571.c linux-2.6.32.18/drivers/net/e1000e/82571.c
26311--- linux-2.6.32.16/drivers/net/e1000e/82571.c 2010-07-05 14:14:00.000000000 -0400 26343--- linux-2.6.32.18/drivers/net/e1000e/82571.c 2010-08-10 13:45:57.000000000 -0400
26312+++ linux-2.6.32.16/drivers/net/e1000e/82571.c 2010-07-09 14:50:36.000000000 -0400 26344+++ linux-2.6.32.18/drivers/net/e1000e/82571.c 2010-08-11 18:57:30.000000000 -0400
26313@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s 26345@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
26314 { 26346 {
26315 struct e1000_hw *hw = &adapter->hw; 26347 struct e1000_hw *hw = &adapter->hw;
@@ -26363,9 +26395,9 @@ diff -urNp linux-2.6.32.16/drivers/net/e1000e/82571.c linux-2.6.32.16/drivers/ne
26363 .acquire_nvm = e1000_acquire_nvm_82571, 26395 .acquire_nvm = e1000_acquire_nvm_82571,
26364 .read_nvm = e1000e_read_nvm_eerd, 26396 .read_nvm = e1000e_read_nvm_eerd,
26365 .release_nvm = e1000_release_nvm_82571, 26397 .release_nvm = e1000_release_nvm_82571,
26366diff -urNp linux-2.6.32.16/drivers/net/e1000e/e1000.h linux-2.6.32.16/drivers/net/e1000e/e1000.h 26398diff -urNp linux-2.6.32.18/drivers/net/e1000e/e1000.h linux-2.6.32.18/drivers/net/e1000e/e1000.h
26367--- linux-2.6.32.16/drivers/net/e1000e/e1000.h 2010-07-05 14:14:00.000000000 -0400 26399--- linux-2.6.32.18/drivers/net/e1000e/e1000.h 2010-08-10 13:45:57.000000000 -0400
26368+++ linux-2.6.32.16/drivers/net/e1000e/e1000.h 2010-07-09 14:50:36.000000000 -0400 26400+++ linux-2.6.32.18/drivers/net/e1000e/e1000.h 2010-08-11 18:57:30.000000000 -0400
26369@@ -375,9 +375,9 @@ struct e1000_info { 26401@@ -375,9 +375,9 @@ struct e1000_info {
26370 u32 pba; 26402 u32 pba;
26371 u32 max_hw_frame_size; 26403 u32 max_hw_frame_size;
@@ -26379,9 +26411,9 @@ diff -urNp linux-2.6.32.16/drivers/net/e1000e/e1000.h linux-2.6.32.16/drivers/ne
26379 }; 26411 };
26380 26412
26381 /* hardware capability, feature, and workaround flags */ 26413 /* hardware capability, feature, and workaround flags */
26382diff -urNp linux-2.6.32.16/drivers/net/e1000e/es2lan.c linux-2.6.32.16/drivers/net/e1000e/es2lan.c 26414diff -urNp linux-2.6.32.18/drivers/net/e1000e/es2lan.c linux-2.6.32.18/drivers/net/e1000e/es2lan.c
26383--- linux-2.6.32.16/drivers/net/e1000e/es2lan.c 2010-07-05 14:14:00.000000000 -0400 26415--- linux-2.6.32.18/drivers/net/e1000e/es2lan.c 2010-08-10 13:45:57.000000000 -0400
26384+++ linux-2.6.32.16/drivers/net/e1000e/es2lan.c 2010-07-09 14:50:36.000000000 -0400 26416+++ linux-2.6.32.18/drivers/net/e1000e/es2lan.c 2010-08-11 18:57:30.000000000 -0400
26385@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es 26417@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
26386 { 26418 {
26387 struct e1000_hw *hw = &adapter->hw; 26419 struct e1000_hw *hw = &adapter->hw;
@@ -26417,9 +26449,9 @@ diff -urNp linux-2.6.32.16/drivers/net/e1000e/es2lan.c linux-2.6.32.16/drivers/n
26417 .acquire_nvm = e1000_acquire_nvm_80003es2lan, 26449 .acquire_nvm = e1000_acquire_nvm_80003es2lan,
26418 .read_nvm = e1000e_read_nvm_eerd, 26450 .read_nvm = e1000e_read_nvm_eerd,
26419 .release_nvm = e1000_release_nvm_80003es2lan, 26451 .release_nvm = e1000_release_nvm_80003es2lan,
26420diff -urNp linux-2.6.32.16/drivers/net/e1000e/hw.h linux-2.6.32.16/drivers/net/e1000e/hw.h 26452diff -urNp linux-2.6.32.18/drivers/net/e1000e/hw.h linux-2.6.32.18/drivers/net/e1000e/hw.h
26421--- linux-2.6.32.16/drivers/net/e1000e/hw.h 2010-07-05 14:14:00.000000000 -0400 26453--- linux-2.6.32.18/drivers/net/e1000e/hw.h 2010-08-10 13:45:57.000000000 -0400
26422+++ linux-2.6.32.16/drivers/net/e1000e/hw.h 2010-07-09 14:50:36.000000000 -0400 26454+++ linux-2.6.32.18/drivers/net/e1000e/hw.h 2010-08-11 18:57:30.000000000 -0400
26423@@ -756,34 +756,34 @@ struct e1000_mac_operations { 26455@@ -756,34 +756,34 @@ struct e1000_mac_operations {
26424 26456
26425 /* Function pointers for the PHY. */ 26457 /* Function pointers for the PHY. */
@@ -26479,9 +26511,9 @@ diff -urNp linux-2.6.32.16/drivers/net/e1000e/hw.h linux-2.6.32.16/drivers/net/e
26479 }; 26511 };
26480 26512
26481 struct e1000_mac_info { 26513 struct e1000_mac_info {
26482diff -urNp linux-2.6.32.16/drivers/net/e1000e/ich8lan.c linux-2.6.32.16/drivers/net/e1000e/ich8lan.c 26514diff -urNp linux-2.6.32.18/drivers/net/e1000e/ich8lan.c linux-2.6.32.18/drivers/net/e1000e/ich8lan.c
26483--- linux-2.6.32.16/drivers/net/e1000e/ich8lan.c 2010-07-05 14:14:00.000000000 -0400 26515--- linux-2.6.32.18/drivers/net/e1000e/ich8lan.c 2010-08-10 13:45:57.000000000 -0400
26484+++ linux-2.6.32.16/drivers/net/e1000e/ich8lan.c 2010-07-09 14:50:36.000000000 -0400 26516+++ linux-2.6.32.18/drivers/net/e1000e/ich8lan.c 2010-08-11 18:57:30.000000000 -0400
26485@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan 26517@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
26486 } 26518 }
26487 } 26519 }
@@ -26509,9 +26541,9 @@ diff -urNp linux-2.6.32.16/drivers/net/e1000e/ich8lan.c linux-2.6.32.16/drivers/
26509 .acquire_nvm = e1000_acquire_nvm_ich8lan, 26541 .acquire_nvm = e1000_acquire_nvm_ich8lan,
26510 .read_nvm = e1000_read_nvm_ich8lan, 26542 .read_nvm = e1000_read_nvm_ich8lan,
26511 .release_nvm = e1000_release_nvm_ich8lan, 26543 .release_nvm = e1000_release_nvm_ich8lan,
26512diff -urNp linux-2.6.32.16/drivers/net/ibmveth.c linux-2.6.32.16/drivers/net/ibmveth.c 26544diff -urNp linux-2.6.32.18/drivers/net/ibmveth.c linux-2.6.32.18/drivers/net/ibmveth.c
26513--- linux-2.6.32.16/drivers/net/ibmveth.c 2010-07-05 14:14:00.000000000 -0400 26545--- linux-2.6.32.18/drivers/net/ibmveth.c 2010-08-10 13:45:57.000000000 -0400
26514+++ linux-2.6.32.16/drivers/net/ibmveth.c 2010-07-09 14:50:36.000000000 -0400 26546+++ linux-2.6.32.18/drivers/net/ibmveth.c 2010-08-11 18:57:30.000000000 -0400
26515@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr 26547@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
26516 NULL, 26548 NULL,
26517 }; 26549 };
@@ -26521,10 +26553,10 @@ diff -urNp linux-2.6.32.16/drivers/net/ibmveth.c linux-2.6.32.16/drivers/net/ibm
26521 .show = veth_pool_show, 26553 .show = veth_pool_show,
26522 .store = veth_pool_store, 26554 .store = veth_pool_store,
26523 }; 26555 };
26524diff -urNp linux-2.6.32.16/drivers/net/igb/e1000_82575.c linux-2.6.32.16/drivers/net/igb/e1000_82575.c 26556diff -urNp linux-2.6.32.18/drivers/net/igb/e1000_82575.c linux-2.6.32.18/drivers/net/igb/e1000_82575.c
26525--- linux-2.6.32.16/drivers/net/igb/e1000_82575.c 2010-07-05 14:14:00.000000000 -0400 26557--- linux-2.6.32.18/drivers/net/igb/e1000_82575.c 2010-08-10 13:45:57.000000000 -0400
26526+++ linux-2.6.32.16/drivers/net/igb/e1000_82575.c 2010-07-09 14:50:36.000000000 -0400 26558+++ linux-2.6.32.18/drivers/net/igb/e1000_82575.c 2010-08-11 18:57:30.000000000 -0400
26527@@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct 26559@@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct
26528 wr32(E1000_VT_CTL, vt_ctl); 26560 wr32(E1000_VT_CTL, vt_ctl);
26529 } 26561 }
26530 26562
@@ -26533,7 +26565,7 @@ diff -urNp linux-2.6.32.16/drivers/net/igb/e1000_82575.c linux-2.6.32.16/drivers
26533 .reset_hw = igb_reset_hw_82575, 26565 .reset_hw = igb_reset_hw_82575,
26534 .init_hw = igb_init_hw_82575, 26566 .init_hw = igb_init_hw_82575,
26535 .check_for_link = igb_check_for_link_82575, 26567 .check_for_link = igb_check_for_link_82575,
26536@@ -1410,13 +1410,13 @@ static struct e1000_mac_operations e1000 26568@@ -1419,13 +1419,13 @@ static struct e1000_mac_operations e1000
26537 .get_speed_and_duplex = igb_get_speed_and_duplex_copper, 26569 .get_speed_and_duplex = igb_get_speed_and_duplex_copper,
26538 }; 26570 };
26539 26571
@@ -26549,10 +26581,10 @@ diff -urNp linux-2.6.32.16/drivers/net/igb/e1000_82575.c linux-2.6.32.16/drivers
26549 .acquire = igb_acquire_nvm_82575, 26581 .acquire = igb_acquire_nvm_82575,
26550 .read = igb_read_nvm_eerd, 26582 .read = igb_read_nvm_eerd,
26551 .release = igb_release_nvm_82575, 26583 .release = igb_release_nvm_82575,
26552diff -urNp linux-2.6.32.16/drivers/net/igb/e1000_hw.h linux-2.6.32.16/drivers/net/igb/e1000_hw.h 26584diff -urNp linux-2.6.32.18/drivers/net/igb/e1000_hw.h linux-2.6.32.18/drivers/net/igb/e1000_hw.h
26553--- linux-2.6.32.16/drivers/net/igb/e1000_hw.h 2010-07-05 14:14:00.000000000 -0400 26585--- linux-2.6.32.18/drivers/net/igb/e1000_hw.h 2010-08-10 13:45:57.000000000 -0400
26554+++ linux-2.6.32.16/drivers/net/igb/e1000_hw.h 2010-07-09 14:50:36.000000000 -0400 26586+++ linux-2.6.32.18/drivers/net/igb/e1000_hw.h 2010-08-11 18:57:30.000000000 -0400
26555@@ -303,17 +303,17 @@ struct e1000_phy_operations { 26587@@ -305,17 +305,17 @@ struct e1000_phy_operations {
26556 }; 26588 };
26557 26589
26558 struct e1000_nvm_operations { 26590 struct e1000_nvm_operations {
@@ -26577,9 +26609,9 @@ diff -urNp linux-2.6.32.16/drivers/net/igb/e1000_hw.h linux-2.6.32.16/drivers/ne
26577 }; 26609 };
26578 26610
26579 extern const struct e1000_info e1000_82575_info; 26611 extern const struct e1000_info e1000_82575_info;
26580diff -urNp linux-2.6.32.16/drivers/net/irda/vlsi_ir.c linux-2.6.32.16/drivers/net/irda/vlsi_ir.c 26612diff -urNp linux-2.6.32.18/drivers/net/irda/vlsi_ir.c linux-2.6.32.18/drivers/net/irda/vlsi_ir.c
26581--- linux-2.6.32.16/drivers/net/irda/vlsi_ir.c 2010-07-05 14:14:00.000000000 -0400 26613--- linux-2.6.32.18/drivers/net/irda/vlsi_ir.c 2010-08-10 13:45:57.000000000 -0400
26582+++ linux-2.6.32.16/drivers/net/irda/vlsi_ir.c 2010-07-09 14:50:36.000000000 -0400 26614+++ linux-2.6.32.18/drivers/net/irda/vlsi_ir.c 2010-08-11 18:57:30.000000000 -0400
26583@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( 26615@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
26584 /* no race - tx-ring already empty */ 26616 /* no race - tx-ring already empty */
26585 vlsi_set_baud(idev, iobase); 26617 vlsi_set_baud(idev, iobase);
@@ -26596,9 +26628,9 @@ diff -urNp linux-2.6.32.16/drivers/net/irda/vlsi_ir.c linux-2.6.32.16/drivers/ne
26596 spin_unlock_irqrestore(&idev->lock, flags); 26628 spin_unlock_irqrestore(&idev->lock, flags);
26597 dev_kfree_skb_any(skb); 26629 dev_kfree_skb_any(skb);
26598 return NETDEV_TX_OK; 26630 return NETDEV_TX_OK;
26599diff -urNp linux-2.6.32.16/drivers/net/iseries_veth.c linux-2.6.32.16/drivers/net/iseries_veth.c 26631diff -urNp linux-2.6.32.18/drivers/net/iseries_veth.c linux-2.6.32.18/drivers/net/iseries_veth.c
26600--- linux-2.6.32.16/drivers/net/iseries_veth.c 2010-07-05 14:14:00.000000000 -0400 26632--- linux-2.6.32.18/drivers/net/iseries_veth.c 2010-08-10 13:45:57.000000000 -0400
26601+++ linux-2.6.32.16/drivers/net/iseries_veth.c 2010-07-09 14:50:36.000000000 -0400 26633+++ linux-2.6.32.18/drivers/net/iseries_veth.c 2010-08-11 18:57:30.000000000 -0400
26602@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul 26634@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
26603 NULL 26635 NULL
26604 }; 26636 };
@@ -26617,9 +26649,9 @@ diff -urNp linux-2.6.32.16/drivers/net/iseries_veth.c linux-2.6.32.16/drivers/ne
26617 .show = veth_port_attribute_show 26649 .show = veth_port_attribute_show
26618 }; 26650 };
26619 26651
26620diff -urNp linux-2.6.32.16/drivers/net/pcnet32.c linux-2.6.32.16/drivers/net/pcnet32.c 26652diff -urNp linux-2.6.32.18/drivers/net/pcnet32.c linux-2.6.32.18/drivers/net/pcnet32.c
26621--- linux-2.6.32.16/drivers/net/pcnet32.c 2010-07-05 14:14:00.000000000 -0400 26653--- linux-2.6.32.18/drivers/net/pcnet32.c 2010-08-10 13:45:57.000000000 -0400
26622+++ linux-2.6.32.16/drivers/net/pcnet32.c 2010-07-09 14:50:36.000000000 -0400 26654+++ linux-2.6.32.18/drivers/net/pcnet32.c 2010-08-11 18:57:30.000000000 -0400
26623@@ -79,7 +79,7 @@ static int cards_found; 26655@@ -79,7 +79,7 @@ static int cards_found;
26624 /* 26656 /*
26625 * VLB I/O addresses 26657 * VLB I/O addresses
@@ -26629,9 +26661,9 @@ diff -urNp linux-2.6.32.16/drivers/net/pcnet32.c linux-2.6.32.16/drivers/net/pcn
26629 { 0x300, 0x320, 0x340, 0x360, 0 }; 26661 { 0x300, 0x320, 0x340, 0x360, 0 };
26630 26662
26631 static int pcnet32_debug = 0; 26663 static int pcnet32_debug = 0;
26632diff -urNp linux-2.6.32.16/drivers/net/tg3.h linux-2.6.32.16/drivers/net/tg3.h 26664diff -urNp linux-2.6.32.18/drivers/net/tg3.h linux-2.6.32.18/drivers/net/tg3.h
26633--- linux-2.6.32.16/drivers/net/tg3.h 2010-07-05 14:14:00.000000000 -0400 26665--- linux-2.6.32.18/drivers/net/tg3.h 2010-08-10 13:45:57.000000000 -0400
26634+++ linux-2.6.32.16/drivers/net/tg3.h 2010-07-09 14:50:36.000000000 -0400 26666+++ linux-2.6.32.18/drivers/net/tg3.h 2010-08-11 18:57:30.000000000 -0400
26635@@ -95,6 +95,7 @@ 26667@@ -95,6 +95,7 @@
26636 #define CHIPREV_ID_5750_A0 0x4000 26668 #define CHIPREV_ID_5750_A0 0x4000
26637 #define CHIPREV_ID_5750_A1 0x4001 26669 #define CHIPREV_ID_5750_A1 0x4001
@@ -26640,9 +26672,9 @@ diff -urNp linux-2.6.32.16/drivers/net/tg3.h linux-2.6.32.16/drivers/net/tg3.h
26640 #define CHIPREV_ID_5750_C2 0x4202 26672 #define CHIPREV_ID_5750_C2 0x4202
26641 #define CHIPREV_ID_5752_A0_HW 0x5000 26673 #define CHIPREV_ID_5752_A0_HW 0x5000
26642 #define CHIPREV_ID_5752_A0 0x6000 26674 #define CHIPREV_ID_5752_A0 0x6000
26643diff -urNp linux-2.6.32.16/drivers/net/tulip/de4x5.c linux-2.6.32.16/drivers/net/tulip/de4x5.c 26675diff -urNp linux-2.6.32.18/drivers/net/tulip/de4x5.c linux-2.6.32.18/drivers/net/tulip/de4x5.c
26644--- linux-2.6.32.16/drivers/net/tulip/de4x5.c 2010-07-05 14:14:00.000000000 -0400 26676--- linux-2.6.32.18/drivers/net/tulip/de4x5.c 2010-08-10 13:45:57.000000000 -0400
26645+++ linux-2.6.32.16/drivers/net/tulip/de4x5.c 2010-07-09 14:50:36.000000000 -0400 26677+++ linux-2.6.32.18/drivers/net/tulip/de4x5.c 2010-08-11 18:57:30.000000000 -0400
26646@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru 26678@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
26647 for (i=0; i<ETH_ALEN; i++) { 26679 for (i=0; i<ETH_ALEN; i++) {
26648 tmp.addr[i] = dev->dev_addr[i]; 26680 tmp.addr[i] = dev->dev_addr[i];
@@ -26661,9 +26693,9 @@ diff -urNp linux-2.6.32.16/drivers/net/tulip/de4x5.c linux-2.6.32.16/drivers/net
26661 return -EFAULT; 26693 return -EFAULT;
26662 break; 26694 break;
26663 } 26695 }
26664diff -urNp linux-2.6.32.16/drivers/net/usb/hso.c linux-2.6.32.16/drivers/net/usb/hso.c 26696diff -urNp linux-2.6.32.18/drivers/net/usb/hso.c linux-2.6.32.18/drivers/net/usb/hso.c
26665--- linux-2.6.32.16/drivers/net/usb/hso.c 2010-07-05 14:14:00.000000000 -0400 26697--- linux-2.6.32.18/drivers/net/usb/hso.c 2010-08-10 13:45:57.000000000 -0400
26666+++ linux-2.6.32.16/drivers/net/usb/hso.c 2010-07-09 14:50:36.000000000 -0400 26698+++ linux-2.6.32.18/drivers/net/usb/hso.c 2010-08-11 18:57:30.000000000 -0400
26667@@ -258,7 +258,7 @@ struct hso_serial { 26699@@ -258,7 +258,7 @@ struct hso_serial {
26668 26700
26669 /* from usb_serial_port */ 26701 /* from usb_serial_port */
@@ -26742,9 +26774,9 @@ diff -urNp linux-2.6.32.16/drivers/net/usb/hso.c linux-2.6.32.16/drivers/net/usb
26742 result = 26774 result =
26743 hso_start_serial_device(serial_table[i], GFP_NOIO); 26775 hso_start_serial_device(serial_table[i], GFP_NOIO);
26744 hso_kick_transmit(dev2ser(serial_table[i])); 26776 hso_kick_transmit(dev2ser(serial_table[i]));
26745diff -urNp linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c 26777diff -urNp linux-2.6.32.18/drivers/net/wireless/b43/debugfs.c linux-2.6.32.18/drivers/net/wireless/b43/debugfs.c
26746--- linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c 2010-07-05 14:14:00.000000000 -0400 26778--- linux-2.6.32.18/drivers/net/wireless/b43/debugfs.c 2010-08-10 13:45:57.000000000 -0400
26747+++ linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c 2010-07-09 14:50:36.000000000 -0400 26779+++ linux-2.6.32.18/drivers/net/wireless/b43/debugfs.c 2010-08-11 18:57:30.000000000 -0400
26748@@ -43,7 +43,7 @@ static struct dentry *rootdir; 26780@@ -43,7 +43,7 @@ static struct dentry *rootdir;
26749 struct b43_debugfs_fops { 26781 struct b43_debugfs_fops {
26750 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); 26782 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -26754,9 +26786,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/b43/debugfs.c linux-2.6.32.16/dr
26754 /* Offset of struct b43_dfs_file in struct b43_dfsentry */ 26786 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
26755 size_t file_struct_offset; 26787 size_t file_struct_offset;
26756 }; 26788 };
26757diff -urNp linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c 26789diff -urNp linux-2.6.32.18/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.18/drivers/net/wireless/b43legacy/debugfs.c
26758--- linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c 2010-07-05 14:14:00.000000000 -0400 26790--- linux-2.6.32.18/drivers/net/wireless/b43legacy/debugfs.c 2010-08-10 13:45:57.000000000 -0400
26759+++ linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c 2010-07-09 14:50:36.000000000 -0400 26791+++ linux-2.6.32.18/drivers/net/wireless/b43legacy/debugfs.c 2010-08-11 18:57:30.000000000 -0400
26760@@ -44,7 +44,7 @@ static struct dentry *rootdir; 26792@@ -44,7 +44,7 @@ static struct dentry *rootdir;
26761 struct b43legacy_debugfs_fops { 26793 struct b43legacy_debugfs_fops {
26762 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); 26794 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -26766,9 +26798,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32
26766 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ 26798 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
26767 size_t file_struct_offset; 26799 size_t file_struct_offset;
26768 /* Take wl->irq_lock before calling read/write? */ 26800 /* Take wl->irq_lock before calling read/write? */
26769diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-1000.c 26801diff -urNp linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-1000.c
26770--- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-07-05 14:14:00.000000000 -0400 26802--- linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-10 13:45:57.000000000 -0400
26771+++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-07-09 14:50:36.000000000 -0400 26803+++ linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-11 18:57:30.000000000 -0400
26772@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = 26804@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
26773 }, 26805 },
26774 }; 26806 };
@@ -26778,9 +26810,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
26778 .ucode = &iwl5000_ucode, 26810 .ucode = &iwl5000_ucode,
26779 .lib = &iwl1000_lib, 26811 .lib = &iwl1000_lib,
26780 .hcmd = &iwl5000_hcmd, 26812 .hcmd = &iwl5000_hcmd,
26781diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-3945.c 26813diff -urNp linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-3945.c
26782--- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-07-05 14:14:00.000000000 -0400 26814--- linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-10 13:45:57.000000000 -0400
26783+++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-07-09 14:50:36.000000000 -0400 26815+++ linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-11 18:57:30.000000000 -0400
26784@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 26816@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
26785 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, 26817 .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
26786 }; 26818 };
@@ -26790,9 +26822,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.
26790 .ucode = &iwl3945_ucode, 26822 .ucode = &iwl3945_ucode,
26791 .lib = &iwl3945_lib, 26823 .lib = &iwl3945_lib,
26792 .hcmd = &iwl3945_hcmd, 26824 .hcmd = &iwl3945_hcmd,
26793diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-4965.c 26825diff -urNp linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-4965.c
26794--- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-07-05 14:14:00.000000000 -0400 26826--- linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-10 13:45:57.000000000 -0400
26795+++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-07-09 14:50:36.000000000 -0400 26827+++ linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-11 18:57:30.000000000 -0400
26796@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = 26828@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib =
26797 }, 26829 },
26798 }; 26830 };
@@ -26802,9 +26834,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.
26802 .ucode = &iwl4965_ucode, 26834 .ucode = &iwl4965_ucode,
26803 .lib = &iwl4965_lib, 26835 .lib = &iwl4965_lib,
26804 .hcmd = &iwl4965_hcmd, 26836 .hcmd = &iwl4965_hcmd,
26805diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-5000.c 26837diff -urNp linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-5000.c
26806--- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-07-05 14:14:00.000000000 -0400 26838--- linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-10 13:45:57.000000000 -0400
26807+++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-07-09 14:50:36.000000000 -0400 26839+++ linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-11 18:57:30.000000000 -0400
26808@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = 26840@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib =
26809 }, 26841 },
26810 }; 26842 };
@@ -26822,9 +26854,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.
26822 .ucode = &iwl5000_ucode, 26854 .ucode = &iwl5000_ucode,
26823 .lib = &iwl5150_lib, 26855 .lib = &iwl5150_lib,
26824 .hcmd = &iwl5000_hcmd, 26856 .hcmd = &iwl5000_hcmd,
26825diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-6000.c 26857diff -urNp linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-6000.c
26826--- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-07-05 14:14:00.000000000 -0400 26858--- linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-10 13:45:57.000000000 -0400
26827+++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-07-09 14:50:36.000000000 -0400 26859+++ linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-11 18:57:30.000000000 -0400
26828@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 26860@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
26829 .calc_rssi = iwl5000_calc_rssi, 26861 .calc_rssi = iwl5000_calc_rssi,
26830 }; 26862 };
@@ -26834,9 +26866,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
26834 .ucode = &iwl5000_ucode, 26866 .ucode = &iwl5000_ucode,
26835 .lib = &iwl6000_lib, 26867 .lib = &iwl6000_lib,
26836 .hcmd = &iwl5000_hcmd, 26868 .hcmd = &iwl5000_hcmd,
26837diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-debug.h 26869diff -urNp linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-debug.h
26838--- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-07-05 14:14:00.000000000 -0400 26870--- linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-10 13:45:57.000000000 -0400
26839+++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-07-09 14:50:36.000000000 -0400 26871+++ linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-11 18:57:30.000000000 -0400
26840@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri 26872@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
26841 #endif 26873 #endif
26842 26874
@@ -26848,9 +26880,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32
26848 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, 26880 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
26849 void *p, u32 len) 26881 void *p, u32 len)
26850 {} 26882 {}
26851diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h 26883diff -urNp linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-dev.h
26852--- linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-07-05 14:14:00.000000000 -0400 26884--- linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-10 13:45:57.000000000 -0400
26853+++ linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-07-09 14:50:36.000000000 -0400 26885+++ linux-2.6.32.18/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-11 18:57:30.000000000 -0400
26854@@ -68,7 +68,7 @@ struct iwl_tx_queue; 26886@@ -68,7 +68,7 @@ struct iwl_tx_queue;
26855 26887
26856 /* shared structures from iwl-5000.c */ 26888 /* shared structures from iwl-5000.c */
@@ -26860,9 +26892,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.1
26860 extern struct iwl_ucode_ops iwl5000_ucode; 26892 extern struct iwl_ucode_ops iwl5000_ucode;
26861 extern struct iwl_lib_ops iwl5000_lib; 26893 extern struct iwl_lib_ops iwl5000_lib;
26862 extern struct iwl_hcmd_ops iwl5000_hcmd; 26894 extern struct iwl_hcmd_ops iwl5000_hcmd;
26863diff -urNp linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c 26895diff -urNp linux-2.6.32.18/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.18/drivers/net/wireless/libertas/debugfs.c
26864--- linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c 2010-07-05 14:14:00.000000000 -0400 26896--- linux-2.6.32.18/drivers/net/wireless/libertas/debugfs.c 2010-08-10 13:45:57.000000000 -0400
26865+++ linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c 2010-07-09 14:50:36.000000000 -0400 26897+++ linux-2.6.32.18/drivers/net/wireless/libertas/debugfs.c 2010-08-11 18:57:30.000000000 -0400
26866@@ -708,7 +708,7 @@ out_unlock: 26898@@ -708,7 +708,7 @@ out_unlock:
26867 struct lbs_debugfs_files { 26899 struct lbs_debugfs_files {
26868 const char *name; 26900 const char *name;
@@ -26872,9 +26904,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
26872 }; 26904 };
26873 26905
26874 static const struct lbs_debugfs_files debugfs_files[] = { 26906 static const struct lbs_debugfs_files debugfs_files[] = {
26875diff -urNp linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c 26907diff -urNp linux-2.6.32.18/drivers/net/wireless/rndis_wlan.c linux-2.6.32.18/drivers/net/wireless/rndis_wlan.c
26876--- linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c 2010-07-05 14:14:00.000000000 -0400 26908--- linux-2.6.32.18/drivers/net/wireless/rndis_wlan.c 2010-08-10 13:45:57.000000000 -0400
26877+++ linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c 2010-07-09 14:50:36.000000000 -0400 26909+++ linux-2.6.32.18/drivers/net/wireless/rndis_wlan.c 2010-08-11 18:57:31.000000000 -0400
26878@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn 26910@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
26879 26911
26880 devdbg(usbdev, "set_rts_threshold %i", rts_threshold); 26912 devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
@@ -26884,9 +26916,9 @@ diff -urNp linux-2.6.32.16/drivers/net/wireless/rndis_wlan.c linux-2.6.32.16/dri
26884 rts_threshold = 2347; 26916 rts_threshold = 2347;
26885 26917
26886 tmp = cpu_to_le32(rts_threshold); 26918 tmp = cpu_to_le32(rts_threshold);
26887diff -urNp linux-2.6.32.16/drivers/oprofile/buffer_sync.c linux-2.6.32.16/drivers/oprofile/buffer_sync.c 26919diff -urNp linux-2.6.32.18/drivers/oprofile/buffer_sync.c linux-2.6.32.18/drivers/oprofile/buffer_sync.c
26888--- linux-2.6.32.16/drivers/oprofile/buffer_sync.c 2010-07-05 14:14:00.000000000 -0400 26920--- linux-2.6.32.18/drivers/oprofile/buffer_sync.c 2010-08-10 13:45:57.000000000 -0400
26889+++ linux-2.6.32.16/drivers/oprofile/buffer_sync.c 2010-07-09 14:50:36.000000000 -0400 26921+++ linux-2.6.32.18/drivers/oprofile/buffer_sync.c 2010-08-11 18:57:31.000000000 -0400
26890@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en 26922@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en
26891 if (cookie == NO_COOKIE) 26923 if (cookie == NO_COOKIE)
26892 offset = pc; 26924 offset = pc;
@@ -26922,9 +26954,9 @@ diff -urNp linux-2.6.32.16/drivers/oprofile/buffer_sync.c linux-2.6.32.16/driver
26922 } 26954 }
26923 } 26955 }
26924 release_mm(mm); 26956 release_mm(mm);
26925diff -urNp linux-2.6.32.16/drivers/oprofile/event_buffer.c linux-2.6.32.16/drivers/oprofile/event_buffer.c 26957diff -urNp linux-2.6.32.18/drivers/oprofile/event_buffer.c linux-2.6.32.18/drivers/oprofile/event_buffer.c
26926--- linux-2.6.32.16/drivers/oprofile/event_buffer.c 2010-07-05 14:14:00.000000000 -0400 26958--- linux-2.6.32.18/drivers/oprofile/event_buffer.c 2010-08-10 13:45:57.000000000 -0400
26927+++ linux-2.6.32.16/drivers/oprofile/event_buffer.c 2010-07-09 14:50:36.000000000 -0400 26959+++ linux-2.6.32.18/drivers/oprofile/event_buffer.c 2010-08-11 18:57:31.000000000 -0400
26928@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value 26960@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
26929 } 26961 }
26930 26962
@@ -26934,9 +26966,9 @@ diff -urNp linux-2.6.32.16/drivers/oprofile/event_buffer.c linux-2.6.32.16/drive
26934 return; 26966 return;
26935 } 26967 }
26936 26968
26937diff -urNp linux-2.6.32.16/drivers/oprofile/oprof.c linux-2.6.32.16/drivers/oprofile/oprof.c 26969diff -urNp linux-2.6.32.18/drivers/oprofile/oprof.c linux-2.6.32.18/drivers/oprofile/oprof.c
26938--- linux-2.6.32.16/drivers/oprofile/oprof.c 2010-07-05 14:14:00.000000000 -0400 26970--- linux-2.6.32.18/drivers/oprofile/oprof.c 2010-08-10 13:45:57.000000000 -0400
26939+++ linux-2.6.32.16/drivers/oprofile/oprof.c 2010-07-09 14:50:36.000000000 -0400 26971+++ linux-2.6.32.18/drivers/oprofile/oprof.c 2010-08-11 18:57:31.000000000 -0400
26940@@ -110,7 +110,7 @@ static void switch_worker(struct work_st 26972@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
26941 if (oprofile_ops.switch_events()) 26973 if (oprofile_ops.switch_events())
26942 return; 26974 return;
@@ -26946,9 +26978,9 @@ diff -urNp linux-2.6.32.16/drivers/oprofile/oprof.c linux-2.6.32.16/drivers/opro
26946 start_switch_worker(); 26978 start_switch_worker();
26947 } 26979 }
26948 26980
26949diff -urNp linux-2.6.32.16/drivers/oprofile/oprofilefs.c linux-2.6.32.16/drivers/oprofile/oprofilefs.c 26981diff -urNp linux-2.6.32.18/drivers/oprofile/oprofilefs.c linux-2.6.32.18/drivers/oprofile/oprofilefs.c
26950--- linux-2.6.32.16/drivers/oprofile/oprofilefs.c 2010-07-05 14:14:00.000000000 -0400 26982--- linux-2.6.32.18/drivers/oprofile/oprofilefs.c 2010-08-10 13:45:57.000000000 -0400
26951+++ linux-2.6.32.16/drivers/oprofile/oprofilefs.c 2010-07-09 14:50:37.000000000 -0400 26983+++ linux-2.6.32.18/drivers/oprofile/oprofilefs.c 2010-08-11 18:57:31.000000000 -0400
26952@@ -187,7 +187,7 @@ static const struct file_operations atom 26984@@ -187,7 +187,7 @@ static const struct file_operations atom
26953 26985
26954 26986
@@ -26958,9 +26990,9 @@ diff -urNp linux-2.6.32.16/drivers/oprofile/oprofilefs.c linux-2.6.32.16/drivers
26958 { 26990 {
26959 struct dentry *d = __oprofilefs_create_file(sb, root, name, 26991 struct dentry *d = __oprofilefs_create_file(sb, root, name,
26960 &atomic_ro_fops, 0444); 26992 &atomic_ro_fops, 0444);
26961diff -urNp linux-2.6.32.16/drivers/oprofile/oprofile_stats.c linux-2.6.32.16/drivers/oprofile/oprofile_stats.c 26993diff -urNp linux-2.6.32.18/drivers/oprofile/oprofile_stats.c linux-2.6.32.18/drivers/oprofile/oprofile_stats.c
26962--- linux-2.6.32.16/drivers/oprofile/oprofile_stats.c 2010-07-05 14:14:00.000000000 -0400 26994--- linux-2.6.32.18/drivers/oprofile/oprofile_stats.c 2010-08-10 13:45:57.000000000 -0400
26963+++ linux-2.6.32.16/drivers/oprofile/oprofile_stats.c 2010-07-09 14:50:37.000000000 -0400 26995+++ linux-2.6.32.18/drivers/oprofile/oprofile_stats.c 2010-08-11 18:57:31.000000000 -0400
26964@@ -30,11 +30,11 @@ void oprofile_reset_stats(void) 26996@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
26965 cpu_buf->sample_invalid_eip = 0; 26997 cpu_buf->sample_invalid_eip = 0;
26966 } 26998 }
@@ -26978,9 +27010,9 @@ diff -urNp linux-2.6.32.16/drivers/oprofile/oprofile_stats.c linux-2.6.32.16/dri
26978 } 27010 }
26979 27011
26980 27012
26981diff -urNp linux-2.6.32.16/drivers/oprofile/oprofile_stats.h linux-2.6.32.16/drivers/oprofile/oprofile_stats.h 27013diff -urNp linux-2.6.32.18/drivers/oprofile/oprofile_stats.h linux-2.6.32.18/drivers/oprofile/oprofile_stats.h
26982--- linux-2.6.32.16/drivers/oprofile/oprofile_stats.h 2010-07-05 14:14:00.000000000 -0400 27014--- linux-2.6.32.18/drivers/oprofile/oprofile_stats.h 2010-08-10 13:45:57.000000000 -0400
26983+++ linux-2.6.32.16/drivers/oprofile/oprofile_stats.h 2010-07-09 14:50:37.000000000 -0400 27015+++ linux-2.6.32.18/drivers/oprofile/oprofile_stats.h 2010-08-11 18:57:31.000000000 -0400
26984@@ -13,11 +13,11 @@ 27016@@ -13,11 +13,11 @@
26985 #include <asm/atomic.h> 27017 #include <asm/atomic.h>
26986 27018
@@ -26998,9 +27030,9 @@ diff -urNp linux-2.6.32.16/drivers/oprofile/oprofile_stats.h linux-2.6.32.16/dri
26998 }; 27030 };
26999 27031
27000 extern struct oprofile_stat_struct oprofile_stats; 27032 extern struct oprofile_stat_struct oprofile_stats;
27001diff -urNp linux-2.6.32.16/drivers/parisc/pdc_stable.c linux-2.6.32.16/drivers/parisc/pdc_stable.c 27033diff -urNp linux-2.6.32.18/drivers/parisc/pdc_stable.c linux-2.6.32.18/drivers/parisc/pdc_stable.c
27002--- linux-2.6.32.16/drivers/parisc/pdc_stable.c 2010-07-05 14:14:00.000000000 -0400 27034--- linux-2.6.32.18/drivers/parisc/pdc_stable.c 2010-08-10 13:45:57.000000000 -0400
27003+++ linux-2.6.32.16/drivers/parisc/pdc_stable.c 2010-07-09 14:50:37.000000000 -0400 27035+++ linux-2.6.32.18/drivers/parisc/pdc_stable.c 2010-08-11 18:57:31.000000000 -0400
27004@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj 27036@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
27005 return ret; 27037 return ret;
27006 } 27038 }
@@ -27010,9 +27042,9 @@ diff -urNp linux-2.6.32.16/drivers/parisc/pdc_stable.c linux-2.6.32.16/drivers/p
27010 .show = pdcspath_attr_show, 27042 .show = pdcspath_attr_show,
27011 .store = pdcspath_attr_store, 27043 .store = pdcspath_attr_store,
27012 }; 27044 };
27013diff -urNp linux-2.6.32.16/drivers/parport/procfs.c linux-2.6.32.16/drivers/parport/procfs.c 27045diff -urNp linux-2.6.32.18/drivers/parport/procfs.c linux-2.6.32.18/drivers/parport/procfs.c
27014--- linux-2.6.32.16/drivers/parport/procfs.c 2010-07-05 14:14:00.000000000 -0400 27046--- linux-2.6.32.18/drivers/parport/procfs.c 2010-08-10 13:45:57.000000000 -0400
27015+++ linux-2.6.32.16/drivers/parport/procfs.c 2010-07-09 14:50:37.000000000 -0400 27047+++ linux-2.6.32.18/drivers/parport/procfs.c 2010-08-11 18:57:31.000000000 -0400
27016@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t 27048@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
27017 27049
27018 *ppos += len; 27050 *ppos += len;
@@ -27031,9 +27063,9 @@ diff -urNp linux-2.6.32.16/drivers/parport/procfs.c linux-2.6.32.16/drivers/parp
27031 } 27063 }
27032 #endif /* IEEE1284.3 support. */ 27064 #endif /* IEEE1284.3 support. */
27033 27065
27034diff -urNp linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c 27066diff -urNp linux-2.6.32.18/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.18/drivers/pci/hotplug/acpiphp_glue.c
27035--- linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c 2010-07-05 14:14:00.000000000 -0400 27067--- linux-2.6.32.18/drivers/pci/hotplug/acpiphp_glue.c 2010-08-10 13:45:57.000000000 -0400
27036+++ linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c 2010-07-09 14:50:37.000000000 -0400 27068+++ linux-2.6.32.18/drivers/pci/hotplug/acpiphp_glue.c 2010-08-11 18:57:31.000000000 -0400
27037@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif 27069@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
27038 } 27070 }
27039 27071
@@ -27043,9 +27075,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.16/dr
27043 .handler = handle_hotplug_event_func, 27075 .handler = handle_hotplug_event_func,
27044 }; 27076 };
27045 27077
27046diff -urNp linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c 27078diff -urNp linux-2.6.32.18/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.18/drivers/pci/hotplug/cpqphp_nvram.c
27047--- linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c 2010-07-05 14:14:00.000000000 -0400 27079--- linux-2.6.32.18/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-10 13:45:57.000000000 -0400
27048+++ linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c 2010-07-09 14:50:37.000000000 -0400 27080+++ linux-2.6.32.18/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-11 18:57:31.000000000 -0400
27049@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ 27081@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
27050 27082
27051 void compaq_nvram_init (void __iomem *rom_start) 27083 void compaq_nvram_init (void __iomem *rom_start)
@@ -27060,9 +27092,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.16/dr
27060 dbg("int15 entry = %p\n", compaq_int15_entry_point); 27092 dbg("int15 entry = %p\n", compaq_int15_entry_point);
27061 27093
27062 /* initialize our int15 lock */ 27094 /* initialize our int15 lock */
27063diff -urNp linux-2.6.32.16/drivers/pci/hotplug/fakephp.c linux-2.6.32.16/drivers/pci/hotplug/fakephp.c 27095diff -urNp linux-2.6.32.18/drivers/pci/hotplug/fakephp.c linux-2.6.32.18/drivers/pci/hotplug/fakephp.c
27064--- linux-2.6.32.16/drivers/pci/hotplug/fakephp.c 2010-07-05 14:14:00.000000000 -0400 27096--- linux-2.6.32.18/drivers/pci/hotplug/fakephp.c 2010-08-10 13:45:57.000000000 -0400
27065+++ linux-2.6.32.16/drivers/pci/hotplug/fakephp.c 2010-07-09 14:50:37.000000000 -0400 27097+++ linux-2.6.32.18/drivers/pci/hotplug/fakephp.c 2010-08-11 18:57:31.000000000 -0400
27066@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec 27098@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
27067 } 27099 }
27068 27100
@@ -27072,9 +27104,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/hotplug/fakephp.c linux-2.6.32.16/drivers
27072 .store = legacy_store, .show = legacy_show 27104 .store = legacy_store, .show = legacy_show
27073 }, 27105 },
27074 .release = &legacy_release, 27106 .release = &legacy_release,
27075diff -urNp linux-2.6.32.16/drivers/pci/intel-iommu.c linux-2.6.32.16/drivers/pci/intel-iommu.c 27107diff -urNp linux-2.6.32.18/drivers/pci/intel-iommu.c linux-2.6.32.18/drivers/pci/intel-iommu.c
27076--- linux-2.6.32.16/drivers/pci/intel-iommu.c 2010-07-05 14:14:00.000000000 -0400 27108--- linux-2.6.32.18/drivers/pci/intel-iommu.c 2010-08-10 13:45:57.000000000 -0400
27077+++ linux-2.6.32.16/drivers/pci/intel-iommu.c 2010-07-09 14:50:44.000000000 -0400 27109+++ linux-2.6.32.18/drivers/pci/intel-iommu.c 2010-08-11 18:57:31.000000000 -0400
27078@@ -2647,7 +2647,7 @@ error: 27110@@ -2647,7 +2647,7 @@ error:
27079 return 0; 27111 return 0;
27080 } 27112 }
@@ -27144,9 +27176,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/intel-iommu.c linux-2.6.32.16/drivers/pci
27144 .alloc_coherent = intel_alloc_coherent, 27176 .alloc_coherent = intel_alloc_coherent,
27145 .free_coherent = intel_free_coherent, 27177 .free_coherent = intel_free_coherent,
27146 .map_sg = intel_map_sg, 27178 .map_sg = intel_map_sg,
27147diff -urNp linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c 27179diff -urNp linux-2.6.32.18/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.18/drivers/pci/pcie/portdrv_pci.c
27148--- linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c 2010-07-05 14:14:00.000000000 -0400 27180--- linux-2.6.32.18/drivers/pci/pcie/portdrv_pci.c 2010-08-10 13:45:57.000000000 -0400
27149+++ linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c 2010-07-09 14:50:37.000000000 -0400 27181+++ linux-2.6.32.18/drivers/pci/pcie/portdrv_pci.c 2010-08-11 18:57:31.000000000 -0400
27150@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru 27182@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru
27151 static const struct pci_device_id port_pci_ids[] = { { 27183 static const struct pci_device_id port_pci_ids[] = { {
27152 /* handle any PCI-Express port */ 27184 /* handle any PCI-Express port */
@@ -27156,9 +27188,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.16/driver
27156 }; 27188 };
27157 MODULE_DEVICE_TABLE(pci, port_pci_ids); 27189 MODULE_DEVICE_TABLE(pci, port_pci_ids);
27158 27190
27159diff -urNp linux-2.6.32.16/drivers/pci/probe.c linux-2.6.32.16/drivers/pci/probe.c 27191diff -urNp linux-2.6.32.18/drivers/pci/probe.c linux-2.6.32.18/drivers/pci/probe.c
27160--- linux-2.6.32.16/drivers/pci/probe.c 2010-07-05 14:14:00.000000000 -0400 27192--- linux-2.6.32.18/drivers/pci/probe.c 2010-08-10 13:45:57.000000000 -0400
27161+++ linux-2.6.32.16/drivers/pci/probe.c 2010-07-09 14:50:37.000000000 -0400 27193+++ linux-2.6.32.18/drivers/pci/probe.c 2010-08-11 18:57:31.000000000 -0400
27162@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( 27194@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
27163 return ret; 27195 return ret;
27164 } 27196 }
@@ -27176,9 +27208,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/probe.c linux-2.6.32.16/drivers/pci/probe
27176 struct device_attribute *attr, 27208 struct device_attribute *attr,
27177 char *buf) 27209 char *buf)
27178 { 27210 {
27179diff -urNp linux-2.6.32.16/drivers/pci/proc.c linux-2.6.32.16/drivers/pci/proc.c 27211diff -urNp linux-2.6.32.18/drivers/pci/proc.c linux-2.6.32.18/drivers/pci/proc.c
27180--- linux-2.6.32.16/drivers/pci/proc.c 2010-07-05 14:14:00.000000000 -0400 27212--- linux-2.6.32.18/drivers/pci/proc.c 2010-08-10 13:45:57.000000000 -0400
27181+++ linux-2.6.32.16/drivers/pci/proc.c 2010-07-09 14:50:37.000000000 -0400 27213+++ linux-2.6.32.18/drivers/pci/proc.c 2010-08-11 18:57:31.000000000 -0400
27182@@ -480,7 +480,16 @@ static const struct file_operations proc 27214@@ -480,7 +480,16 @@ static const struct file_operations proc
27183 static int __init pci_proc_init(void) 27215 static int __init pci_proc_init(void)
27184 { 27216 {
@@ -27196,9 +27228,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/proc.c linux-2.6.32.16/drivers/pci/proc.c
27196 proc_create("devices", 0, proc_bus_pci_dir, 27228 proc_create("devices", 0, proc_bus_pci_dir,
27197 &proc_bus_pci_dev_operations); 27229 &proc_bus_pci_dev_operations);
27198 proc_initialized = 1; 27230 proc_initialized = 1;
27199diff -urNp linux-2.6.32.16/drivers/pci/slot.c linux-2.6.32.16/drivers/pci/slot.c 27231diff -urNp linux-2.6.32.18/drivers/pci/slot.c linux-2.6.32.18/drivers/pci/slot.c
27200--- linux-2.6.32.16/drivers/pci/slot.c 2010-07-05 14:14:00.000000000 -0400 27232--- linux-2.6.32.18/drivers/pci/slot.c 2010-08-10 13:45:57.000000000 -0400
27201+++ linux-2.6.32.16/drivers/pci/slot.c 2010-07-09 14:50:37.000000000 -0400 27233+++ linux-2.6.32.18/drivers/pci/slot.c 2010-08-11 18:57:31.000000000 -0400
27202@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc 27234@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
27203 return attribute->store ? attribute->store(slot, buf, len) : -EIO; 27235 return attribute->store ? attribute->store(slot, buf, len) : -EIO;
27204 } 27236 }
@@ -27208,9 +27240,9 @@ diff -urNp linux-2.6.32.16/drivers/pci/slot.c linux-2.6.32.16/drivers/pci/slot.c
27208 .show = pci_slot_attr_show, 27240 .show = pci_slot_attr_show,
27209 .store = pci_slot_attr_store, 27241 .store = pci_slot_attr_store,
27210 }; 27242 };
27211diff -urNp linux-2.6.32.16/drivers/pcmcia/ti113x.h linux-2.6.32.16/drivers/pcmcia/ti113x.h 27243diff -urNp linux-2.6.32.18/drivers/pcmcia/ti113x.h linux-2.6.32.18/drivers/pcmcia/ti113x.h
27212--- linux-2.6.32.16/drivers/pcmcia/ti113x.h 2010-07-05 14:14:00.000000000 -0400 27244--- linux-2.6.32.18/drivers/pcmcia/ti113x.h 2010-08-10 13:45:57.000000000 -0400
27213+++ linux-2.6.32.16/drivers/pcmcia/ti113x.h 2010-07-09 14:50:37.000000000 -0400 27245+++ linux-2.6.32.18/drivers/pcmcia/ti113x.h 2010-08-11 18:57:31.000000000 -0400
27214@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl 27246@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
27215 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, 27247 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
27216 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), 27248 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
@@ -27220,9 +27252,9 @@ diff -urNp linux-2.6.32.16/drivers/pcmcia/ti113x.h linux-2.6.32.16/drivers/pcmci
27220 }; 27252 };
27221 27253
27222 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) 27254 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
27223diff -urNp linux-2.6.32.16/drivers/pcmcia/yenta_socket.c linux-2.6.32.16/drivers/pcmcia/yenta_socket.c 27255diff -urNp linux-2.6.32.18/drivers/pcmcia/yenta_socket.c linux-2.6.32.18/drivers/pcmcia/yenta_socket.c
27224--- linux-2.6.32.16/drivers/pcmcia/yenta_socket.c 2010-07-05 14:14:00.000000000 -0400 27256--- linux-2.6.32.18/drivers/pcmcia/yenta_socket.c 2010-08-10 13:45:57.000000000 -0400
27225+++ linux-2.6.32.16/drivers/pcmcia/yenta_socket.c 2010-07-09 14:50:37.000000000 -0400 27257+++ linux-2.6.32.18/drivers/pcmcia/yenta_socket.c 2010-08-11 18:57:31.000000000 -0400
27226@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table 27258@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
27227 27259
27228 /* match any cardbus bridge */ 27260 /* match any cardbus bridge */
@@ -27232,9 +27264,9 @@ diff -urNp linux-2.6.32.16/drivers/pcmcia/yenta_socket.c linux-2.6.32.16/drivers
27232 }; 27264 };
27233 MODULE_DEVICE_TABLE(pci, yenta_table); 27265 MODULE_DEVICE_TABLE(pci, yenta_table);
27234 27266
27235diff -urNp linux-2.6.32.16/drivers/platform/x86/acer-wmi.c linux-2.6.32.16/drivers/platform/x86/acer-wmi.c 27267diff -urNp linux-2.6.32.18/drivers/platform/x86/acer-wmi.c linux-2.6.32.18/drivers/platform/x86/acer-wmi.c
27236--- linux-2.6.32.16/drivers/platform/x86/acer-wmi.c 2010-07-05 14:14:00.000000000 -0400 27268--- linux-2.6.32.18/drivers/platform/x86/acer-wmi.c 2010-08-10 13:45:57.000000000 -0400
27237+++ linux-2.6.32.16/drivers/platform/x86/acer-wmi.c 2010-07-09 14:50:37.000000000 -0400 27269+++ linux-2.6.32.18/drivers/platform/x86/acer-wmi.c 2010-08-11 18:57:31.000000000 -0400
27238@@ -918,7 +918,7 @@ static int update_bl_status(struct backl 27270@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
27239 return 0; 27271 return 0;
27240 } 27272 }
@@ -27244,9 +27276,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/acer-wmi.c linux-2.6.32.16/drive
27244 .get_brightness = read_brightness, 27276 .get_brightness = read_brightness,
27245 .update_status = update_bl_status, 27277 .update_status = update_bl_status,
27246 }; 27278 };
27247diff -urNp linux-2.6.32.16/drivers/platform/x86/asus_acpi.c linux-2.6.32.16/drivers/platform/x86/asus_acpi.c 27279diff -urNp linux-2.6.32.18/drivers/platform/x86/asus_acpi.c linux-2.6.32.18/drivers/platform/x86/asus_acpi.c
27248--- linux-2.6.32.16/drivers/platform/x86/asus_acpi.c 2010-07-05 14:14:00.000000000 -0400 27280--- linux-2.6.32.18/drivers/platform/x86/asus_acpi.c 2010-08-10 13:45:57.000000000 -0400
27249+++ linux-2.6.32.16/drivers/platform/x86/asus_acpi.c 2010-07-09 14:50:37.000000000 -0400 27281+++ linux-2.6.32.18/drivers/platform/x86/asus_acpi.c 2010-08-11 18:57:31.000000000 -0400
27250@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ 27282@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
27251 return 0; 27283 return 0;
27252 } 27284 }
@@ -27256,9 +27288,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/asus_acpi.c linux-2.6.32.16/driv
27256 .get_brightness = read_brightness, 27288 .get_brightness = read_brightness,
27257 .update_status = set_brightness_status, 27289 .update_status = set_brightness_status,
27258 }; 27290 };
27259diff -urNp linux-2.6.32.16/drivers/platform/x86/asus-laptop.c linux-2.6.32.16/drivers/platform/x86/asus-laptop.c 27291diff -urNp linux-2.6.32.18/drivers/platform/x86/asus-laptop.c linux-2.6.32.18/drivers/platform/x86/asus-laptop.c
27260--- linux-2.6.32.16/drivers/platform/x86/asus-laptop.c 2010-07-05 14:14:00.000000000 -0400 27292--- linux-2.6.32.18/drivers/platform/x86/asus-laptop.c 2010-08-10 13:45:57.000000000 -0400
27261+++ linux-2.6.32.16/drivers/platform/x86/asus-laptop.c 2010-07-09 14:50:37.000000000 -0400 27293+++ linux-2.6.32.18/drivers/platform/x86/asus-laptop.c 2010-08-11 18:57:31.000000000 -0400
27262@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac 27294@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
27263 */ 27295 */
27264 static int read_brightness(struct backlight_device *bd); 27296 static int read_brightness(struct backlight_device *bd);
@@ -27268,9 +27300,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/asus-laptop.c linux-2.6.32.16/dr
27268 .get_brightness = read_brightness, 27300 .get_brightness = read_brightness,
27269 .update_status = update_bl_status, 27301 .update_status = update_bl_status,
27270 }; 27302 };
27271diff -urNp linux-2.6.32.16/drivers/platform/x86/compal-laptop.c linux-2.6.32.16/drivers/platform/x86/compal-laptop.c 27303diff -urNp linux-2.6.32.18/drivers/platform/x86/compal-laptop.c linux-2.6.32.18/drivers/platform/x86/compal-laptop.c
27272--- linux-2.6.32.16/drivers/platform/x86/compal-laptop.c 2010-07-05 14:14:00.000000000 -0400 27304--- linux-2.6.32.18/drivers/platform/x86/compal-laptop.c 2010-08-10 13:45:57.000000000 -0400
27273+++ linux-2.6.32.16/drivers/platform/x86/compal-laptop.c 2010-07-09 14:50:37.000000000 -0400 27305+++ linux-2.6.32.18/drivers/platform/x86/compal-laptop.c 2010-08-11 18:57:31.000000000 -0400
27274@@ -163,7 +163,7 @@ static int bl_update_status(struct backl 27306@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
27275 return set_lcd_level(b->props.brightness); 27307 return set_lcd_level(b->props.brightness);
27276 } 27308 }
@@ -27280,9 +27312,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/compal-laptop.c linux-2.6.32.16/
27280 .get_brightness = bl_get_brightness, 27312 .get_brightness = bl_get_brightness,
27281 .update_status = bl_update_status, 27313 .update_status = bl_update_status,
27282 }; 27314 };
27283diff -urNp linux-2.6.32.16/drivers/platform/x86/dell-laptop.c linux-2.6.32.16/drivers/platform/x86/dell-laptop.c 27315diff -urNp linux-2.6.32.18/drivers/platform/x86/dell-laptop.c linux-2.6.32.18/drivers/platform/x86/dell-laptop.c
27284--- linux-2.6.32.16/drivers/platform/x86/dell-laptop.c 2010-07-05 14:14:00.000000000 -0400 27316--- linux-2.6.32.18/drivers/platform/x86/dell-laptop.c 2010-08-10 13:45:57.000000000 -0400
27285+++ linux-2.6.32.16/drivers/platform/x86/dell-laptop.c 2010-07-09 14:50:37.000000000 -0400 27317+++ linux-2.6.32.18/drivers/platform/x86/dell-laptop.c 2010-08-11 18:57:31.000000000 -0400
27286@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac 27318@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
27287 return buffer.output[1]; 27319 return buffer.output[1];
27288 } 27320 }
@@ -27292,9 +27324,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/dell-laptop.c linux-2.6.32.16/dr
27292 .get_brightness = dell_get_intensity, 27324 .get_brightness = dell_get_intensity,
27293 .update_status = dell_send_intensity, 27325 .update_status = dell_send_intensity,
27294 }; 27326 };
27295diff -urNp linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c 27327diff -urNp linux-2.6.32.18/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.18/drivers/platform/x86/eeepc-laptop.c
27296--- linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c 2010-07-05 14:14:00.000000000 -0400 27328--- linux-2.6.32.18/drivers/platform/x86/eeepc-laptop.c 2010-08-10 13:45:57.000000000 -0400
27297+++ linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c 2010-07-09 14:50:37.000000000 -0400 27329+++ linux-2.6.32.18/drivers/platform/x86/eeepc-laptop.c 2010-08-11 18:57:31.000000000 -0400
27298@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device 27330@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
27299 */ 27331 */
27300 static int read_brightness(struct backlight_device *bd); 27332 static int read_brightness(struct backlight_device *bd);
@@ -27304,9 +27336,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.16/d
27304 .get_brightness = read_brightness, 27336 .get_brightness = read_brightness,
27305 .update_status = update_bl_status, 27337 .update_status = update_bl_status,
27306 }; 27338 };
27307diff -urNp linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c 27339diff -urNp linux-2.6.32.18/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.18/drivers/platform/x86/fujitsu-laptop.c
27308--- linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c 2010-07-05 14:14:00.000000000 -0400 27340--- linux-2.6.32.18/drivers/platform/x86/fujitsu-laptop.c 2010-08-10 13:45:57.000000000 -0400
27309+++ linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c 2010-07-09 14:50:37.000000000 -0400 27341+++ linux-2.6.32.18/drivers/platform/x86/fujitsu-laptop.c 2010-08-11 18:57:31.000000000 -0400
27310@@ -436,7 +436,7 @@ static int bl_update_status(struct backl 27342@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
27311 return ret; 27343 return ret;
27312 } 27344 }
@@ -27316,9 +27348,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.16
27316 .get_brightness = bl_get_brightness, 27348 .get_brightness = bl_get_brightness,
27317 .update_status = bl_update_status, 27349 .update_status = bl_update_status,
27318 }; 27350 };
27319diff -urNp linux-2.6.32.16/drivers/platform/x86/msi-laptop.c linux-2.6.32.16/drivers/platform/x86/msi-laptop.c 27351diff -urNp linux-2.6.32.18/drivers/platform/x86/msi-laptop.c linux-2.6.32.18/drivers/platform/x86/msi-laptop.c
27320--- linux-2.6.32.16/drivers/platform/x86/msi-laptop.c 2010-07-05 14:14:00.000000000 -0400 27352--- linux-2.6.32.18/drivers/platform/x86/msi-laptop.c 2010-08-10 13:45:57.000000000 -0400
27321+++ linux-2.6.32.16/drivers/platform/x86/msi-laptop.c 2010-07-09 14:50:37.000000000 -0400 27353+++ linux-2.6.32.18/drivers/platform/x86/msi-laptop.c 2010-08-11 18:57:31.000000000 -0400
27322@@ -161,7 +161,7 @@ static int bl_update_status(struct backl 27354@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
27323 return set_lcd_level(b->props.brightness); 27355 return set_lcd_level(b->props.brightness);
27324 } 27356 }
@@ -27328,9 +27360,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/msi-laptop.c linux-2.6.32.16/dri
27328 .get_brightness = bl_get_brightness, 27360 .get_brightness = bl_get_brightness,
27329 .update_status = bl_update_status, 27361 .update_status = bl_update_status,
27330 }; 27362 };
27331diff -urNp linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c 27363diff -urNp linux-2.6.32.18/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.18/drivers/platform/x86/panasonic-laptop.c
27332--- linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c 2010-07-05 14:14:00.000000000 -0400 27364--- linux-2.6.32.18/drivers/platform/x86/panasonic-laptop.c 2010-08-10 13:45:57.000000000 -0400
27333+++ linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c 2010-07-09 14:50:37.000000000 -0400 27365+++ linux-2.6.32.18/drivers/platform/x86/panasonic-laptop.c 2010-08-11 18:57:31.000000000 -0400
27334@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh 27366@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
27335 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); 27367 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
27336 } 27368 }
@@ -27340,9 +27372,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.
27340 .get_brightness = bl_get, 27372 .get_brightness = bl_get,
27341 .update_status = bl_set_status, 27373 .update_status = bl_set_status,
27342 }; 27374 };
27343diff -urNp linux-2.6.32.16/drivers/platform/x86/sony-laptop.c linux-2.6.32.16/drivers/platform/x86/sony-laptop.c 27375diff -urNp linux-2.6.32.18/drivers/platform/x86/sony-laptop.c linux-2.6.32.18/drivers/platform/x86/sony-laptop.c
27344--- linux-2.6.32.16/drivers/platform/x86/sony-laptop.c 2010-07-05 14:14:00.000000000 -0400 27376--- linux-2.6.32.18/drivers/platform/x86/sony-laptop.c 2010-08-10 13:45:57.000000000 -0400
27345+++ linux-2.6.32.16/drivers/platform/x86/sony-laptop.c 2010-07-09 14:50:37.000000000 -0400 27377+++ linux-2.6.32.18/drivers/platform/x86/sony-laptop.c 2010-08-11 18:57:31.000000000 -0400
27346@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness 27378@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
27347 } 27379 }
27348 27380
@@ -27352,9 +27384,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/sony-laptop.c linux-2.6.32.16/dr
27352 .update_status = sony_backlight_update_status, 27384 .update_status = sony_backlight_update_status,
27353 .get_brightness = sony_backlight_get_brightness, 27385 .get_brightness = sony_backlight_get_brightness,
27354 }; 27386 };
27355diff -urNp linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c 27387diff -urNp linux-2.6.32.18/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.18/drivers/platform/x86/thinkpad_acpi.c
27356--- linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c 2010-07-05 14:14:00.000000000 -0400 27388--- linux-2.6.32.18/drivers/platform/x86/thinkpad_acpi.c 2010-08-10 13:45:57.000000000 -0400
27357+++ linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c 2010-07-09 14:50:37.000000000 -0400 27389+++ linux-2.6.32.18/drivers/platform/x86/thinkpad_acpi.c 2010-08-11 18:57:31.000000000 -0400
27358@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha 27390@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
27359 BACKLIGHT_UPDATE_HOTKEY); 27391 BACKLIGHT_UPDATE_HOTKEY);
27360 } 27392 }
@@ -27364,9 +27396,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.16/
27364 .get_brightness = brightness_get, 27396 .get_brightness = brightness_get,
27365 .update_status = brightness_update_status, 27397 .update_status = brightness_update_status,
27366 }; 27398 };
27367diff -urNp linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c 27399diff -urNp linux-2.6.32.18/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.18/drivers/platform/x86/toshiba_acpi.c
27368--- linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c 2010-07-05 14:14:00.000000000 -0400 27400--- linux-2.6.32.18/drivers/platform/x86/toshiba_acpi.c 2010-08-10 13:45:57.000000000 -0400
27369+++ linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c 2010-07-09 14:50:37.000000000 -0400 27401+++ linux-2.6.32.18/drivers/platform/x86/toshiba_acpi.c 2010-08-11 18:57:31.000000000 -0400
27370@@ -671,7 +671,7 @@ static acpi_status remove_device(void) 27402@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
27371 return AE_OK; 27403 return AE_OK;
27372 } 27404 }
@@ -27376,9 +27408,9 @@ diff -urNp linux-2.6.32.16/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.16/d
27376 .get_brightness = get_lcd, 27408 .get_brightness = get_lcd,
27377 .update_status = set_lcd_status, 27409 .update_status = set_lcd_status,
27378 }; 27410 };
27379diff -urNp linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c 27411diff -urNp linux-2.6.32.18/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.18/drivers/pnp/pnpbios/bioscalls.c
27380--- linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c 2010-07-05 14:14:00.000000000 -0400 27412--- linux-2.6.32.18/drivers/pnp/pnpbios/bioscalls.c 2010-08-10 13:45:57.000000000 -0400
27381+++ linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c 2010-07-09 14:50:37.000000000 -0400 27413+++ linux-2.6.32.18/drivers/pnp/pnpbios/bioscalls.c 2010-08-11 18:57:31.000000000 -0400
27382@@ -60,7 +60,7 @@ do { \ 27414@@ -60,7 +60,7 @@ do { \
27383 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ 27415 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
27384 } while(0) 27416 } while(0)
@@ -27435,9 +27467,9 @@ diff -urNp linux-2.6.32.16/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.16/drive
27435+ 27467+
27436+ pax_close_kernel(); 27468+ pax_close_kernel();
27437 } 27469 }
27438diff -urNp linux-2.6.32.16/drivers/pnp/quirks.c linux-2.6.32.16/drivers/pnp/quirks.c 27470diff -urNp linux-2.6.32.18/drivers/pnp/quirks.c linux-2.6.32.18/drivers/pnp/quirks.c
27439--- linux-2.6.32.16/drivers/pnp/quirks.c 2010-07-05 14:14:00.000000000 -0400 27471--- linux-2.6.32.18/drivers/pnp/quirks.c 2010-08-10 13:45:57.000000000 -0400
27440+++ linux-2.6.32.16/drivers/pnp/quirks.c 2010-07-09 14:50:37.000000000 -0400 27472+++ linux-2.6.32.18/drivers/pnp/quirks.c 2010-08-11 18:57:31.000000000 -0400
27441@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { 27473@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
27442 /* PnP resources that might overlap PCI BARs */ 27474 /* PnP resources that might overlap PCI BARs */
27443 {"PNP0c01", quirk_system_pci_resources}, 27475 {"PNP0c01", quirk_system_pci_resources},
@@ -27447,9 +27479,9 @@ diff -urNp linux-2.6.32.16/drivers/pnp/quirks.c linux-2.6.32.16/drivers/pnp/quir
27447 }; 27479 };
27448 27480
27449 void pnp_fixup_device(struct pnp_dev *dev) 27481 void pnp_fixup_device(struct pnp_dev *dev)
27450diff -urNp linux-2.6.32.16/drivers/pnp/resource.c linux-2.6.32.16/drivers/pnp/resource.c 27482diff -urNp linux-2.6.32.18/drivers/pnp/resource.c linux-2.6.32.18/drivers/pnp/resource.c
27451--- linux-2.6.32.16/drivers/pnp/resource.c 2010-07-05 14:14:00.000000000 -0400 27483--- linux-2.6.32.18/drivers/pnp/resource.c 2010-08-10 13:45:57.000000000 -0400
27452+++ linux-2.6.32.16/drivers/pnp/resource.c 2010-07-09 14:50:37.000000000 -0400 27484+++ linux-2.6.32.18/drivers/pnp/resource.c 2010-08-11 18:57:31.000000000 -0400
27453@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s 27485@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
27454 return 1; 27486 return 1;
27455 27487
@@ -27468,9 +27500,9 @@ diff -urNp linux-2.6.32.16/drivers/pnp/resource.c linux-2.6.32.16/drivers/pnp/re
27468 return 0; 27500 return 0;
27469 27501
27470 /* check if the resource is reserved */ 27502 /* check if the resource is reserved */
27471diff -urNp linux-2.6.32.16/drivers/s390/cio/qdio_perf.c linux-2.6.32.16/drivers/s390/cio/qdio_perf.c 27503diff -urNp linux-2.6.32.18/drivers/s390/cio/qdio_perf.c linux-2.6.32.18/drivers/s390/cio/qdio_perf.c
27472--- linux-2.6.32.16/drivers/s390/cio/qdio_perf.c 2010-07-05 14:14:00.000000000 -0400 27504--- linux-2.6.32.18/drivers/s390/cio/qdio_perf.c 2010-08-10 13:45:57.000000000 -0400
27473+++ linux-2.6.32.16/drivers/s390/cio/qdio_perf.c 2010-07-09 14:50:37.000000000 -0400 27505+++ linux-2.6.32.18/drivers/s390/cio/qdio_perf.c 2010-08-11 18:57:31.000000000 -0400
27474@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ 27506@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
27475 static int qdio_perf_proc_show(struct seq_file *m, void *v) 27507 static int qdio_perf_proc_show(struct seq_file *m, void *v)
27476 { 27508 {
@@ -27546,9 +27578,9 @@ diff -urNp linux-2.6.32.16/drivers/s390/cio/qdio_perf.c linux-2.6.32.16/drivers/
27546 seq_printf(m, "\n"); 27578 seq_printf(m, "\n");
27547 return 0; 27579 return 0;
27548 } 27580 }
27549diff -urNp linux-2.6.32.16/drivers/s390/cio/qdio_perf.h linux-2.6.32.16/drivers/s390/cio/qdio_perf.h 27581diff -urNp linux-2.6.32.18/drivers/s390/cio/qdio_perf.h linux-2.6.32.18/drivers/s390/cio/qdio_perf.h
27550--- linux-2.6.32.16/drivers/s390/cio/qdio_perf.h 2010-07-05 14:14:00.000000000 -0400 27582--- linux-2.6.32.18/drivers/s390/cio/qdio_perf.h 2010-08-10 13:45:57.000000000 -0400
27551+++ linux-2.6.32.16/drivers/s390/cio/qdio_perf.h 2010-07-09 14:50:37.000000000 -0400 27583+++ linux-2.6.32.18/drivers/s390/cio/qdio_perf.h 2010-08-11 18:57:31.000000000 -0400
27552@@ -13,46 +13,46 @@ 27584@@ -13,46 +13,46 @@
27553 27585
27554 struct qdio_perf_stats { 27586 struct qdio_perf_stats {
@@ -27621,9 +27653,9 @@ diff -urNp linux-2.6.32.16/drivers/s390/cio/qdio_perf.h linux-2.6.32.16/drivers/
27621 } 27653 }
27622 27654
27623 int qdio_setup_perf_stats(void); 27655 int qdio_setup_perf_stats(void);
27624diff -urNp linux-2.6.32.16/drivers/scsi/ipr.c linux-2.6.32.16/drivers/scsi/ipr.c 27656diff -urNp linux-2.6.32.18/drivers/scsi/ipr.c linux-2.6.32.18/drivers/scsi/ipr.c
27625--- linux-2.6.32.16/drivers/scsi/ipr.c 2010-07-05 14:14:00.000000000 -0400 27657--- linux-2.6.32.18/drivers/scsi/ipr.c 2010-08-10 13:45:57.000000000 -0400
27626+++ linux-2.6.32.16/drivers/scsi/ipr.c 2010-07-09 14:50:37.000000000 -0400 27658+++ linux-2.6.32.18/drivers/scsi/ipr.c 2010-08-11 18:57:31.000000000 -0400
27627@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q 27659@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
27628 return true; 27660 return true;
27629 } 27661 }
@@ -27633,9 +27665,9 @@ diff -urNp linux-2.6.32.16/drivers/scsi/ipr.c linux-2.6.32.16/drivers/scsi/ipr.c
27633 .phy_reset = ipr_ata_phy_reset, 27665 .phy_reset = ipr_ata_phy_reset,
27634 .hardreset = ipr_sata_reset, 27666 .hardreset = ipr_sata_reset,
27635 .post_internal_cmd = ipr_ata_post_internal, 27667 .post_internal_cmd = ipr_ata_post_internal,
27636diff -urNp linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c 27668diff -urNp linux-2.6.32.18/drivers/scsi/libfc/fc_exch.c linux-2.6.32.18/drivers/scsi/libfc/fc_exch.c
27637--- linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c 2010-07-05 14:14:00.000000000 -0400 27669--- linux-2.6.32.18/drivers/scsi/libfc/fc_exch.c 2010-08-10 13:45:57.000000000 -0400
27638+++ linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c 2010-07-09 14:50:37.000000000 -0400 27670+++ linux-2.6.32.18/drivers/scsi/libfc/fc_exch.c 2010-08-11 18:57:31.000000000 -0400
27639@@ -86,12 +86,12 @@ struct fc_exch_mgr { 27671@@ -86,12 +86,12 @@ struct fc_exch_mgr {
27640 * all together if not used XXX 27672 * all together if not used XXX
27641 */ 27673 */
@@ -27757,9 +27789,9 @@ diff -urNp linux-2.6.32.16/drivers/scsi/libfc/fc_exch.c linux-2.6.32.16/drivers/
27757 27789
27758 fc_frame_free(fp); 27790 fc_frame_free(fp);
27759 } 27791 }
27760diff -urNp linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c 27792diff -urNp linux-2.6.32.18/drivers/scsi/libsas/sas_ata.c linux-2.6.32.18/drivers/scsi/libsas/sas_ata.c
27761--- linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c 2010-07-05 14:14:00.000000000 -0400 27793--- linux-2.6.32.18/drivers/scsi/libsas/sas_ata.c 2010-08-10 13:45:57.000000000 -0400
27762+++ linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c 2010-07-09 14:50:37.000000000 -0400 27794+++ linux-2.6.32.18/drivers/scsi/libsas/sas_ata.c 2010-08-11 18:57:31.000000000 -0400
27763@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l 27795@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
27764 } 27796 }
27765 } 27797 }
@@ -27769,9 +27801,9 @@ diff -urNp linux-2.6.32.16/drivers/scsi/libsas/sas_ata.c linux-2.6.32.16/drivers
27769 .phy_reset = sas_ata_phy_reset, 27801 .phy_reset = sas_ata_phy_reset,
27770 .post_internal_cmd = sas_ata_post_internal, 27802 .post_internal_cmd = sas_ata_post_internal,
27771 .qc_prep = ata_noop_qc_prep, 27803 .qc_prep = ata_noop_qc_prep,
27772diff -urNp linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h 27804diff -urNp linux-2.6.32.18/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.18/drivers/scsi/mpt2sas/mpt2sas_debug.h
27773--- linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-07-05 14:14:00.000000000 -0400 27805--- linux-2.6.32.18/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-10 13:45:57.000000000 -0400
27774+++ linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-07-09 14:50:37.000000000 -0400 27806+++ linux-2.6.32.18/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-11 18:57:31.000000000 -0400
27775@@ -79,7 +79,7 @@ 27807@@ -79,7 +79,7 @@
27776 CMD; \ 27808 CMD; \
27777 } 27809 }
@@ -27781,9 +27813,9 @@ diff -urNp linux-2.6.32.16/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.16/
27781 #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ 27813 #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
27782 27814
27783 27815
27784diff -urNp linux-2.6.32.16/drivers/scsi/scsi_logging.h linux-2.6.32.16/drivers/scsi/scsi_logging.h 27816diff -urNp linux-2.6.32.18/drivers/scsi/scsi_logging.h linux-2.6.32.18/drivers/scsi/scsi_logging.h
27785--- linux-2.6.32.16/drivers/scsi/scsi_logging.h 2010-07-05 14:14:00.000000000 -0400 27817--- linux-2.6.32.18/drivers/scsi/scsi_logging.h 2010-08-10 13:45:57.000000000 -0400
27786+++ linux-2.6.32.16/drivers/scsi/scsi_logging.h 2010-07-09 14:50:37.000000000 -0400 27818+++ linux-2.6.32.18/drivers/scsi/scsi_logging.h 2010-08-11 18:57:31.000000000 -0400
27787@@ -51,7 +51,7 @@ do { \ 27819@@ -51,7 +51,7 @@ do { \
27788 } while (0); \ 27820 } while (0); \
27789 } while (0) 27821 } while (0)
@@ -27793,9 +27825,9 @@ diff -urNp linux-2.6.32.16/drivers/scsi/scsi_logging.h linux-2.6.32.16/drivers/s
27793 #endif /* CONFIG_SCSI_LOGGING */ 27825 #endif /* CONFIG_SCSI_LOGGING */
27794 27826
27795 /* 27827 /*
27796diff -urNp linux-2.6.32.16/drivers/scsi/sg.c linux-2.6.32.16/drivers/scsi/sg.c 27828diff -urNp linux-2.6.32.18/drivers/scsi/sg.c linux-2.6.32.18/drivers/scsi/sg.c
27797--- linux-2.6.32.16/drivers/scsi/sg.c 2010-07-05 14:14:00.000000000 -0400 27829--- linux-2.6.32.18/drivers/scsi/sg.c 2010-08-10 13:45:57.000000000 -0400
27798+++ linux-2.6.32.16/drivers/scsi/sg.c 2010-07-09 14:50:37.000000000 -0400 27830+++ linux-2.6.32.18/drivers/scsi/sg.c 2010-08-11 18:57:31.000000000 -0400
27799@@ -2292,7 +2292,7 @@ struct sg_proc_leaf { 27831@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
27800 const struct file_operations * fops; 27832 const struct file_operations * fops;
27801 }; 27833 };
@@ -27814,9 +27846,9 @@ diff -urNp linux-2.6.32.16/drivers/scsi/sg.c linux-2.6.32.16/drivers/scsi/sg.c
27814 27846
27815 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); 27847 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
27816 if (!sg_proc_sgp) 27848 if (!sg_proc_sgp)
27817diff -urNp linux-2.6.32.16/drivers/serial/8250_pci.c linux-2.6.32.16/drivers/serial/8250_pci.c 27849diff -urNp linux-2.6.32.18/drivers/serial/8250_pci.c linux-2.6.32.18/drivers/serial/8250_pci.c
27818--- linux-2.6.32.16/drivers/serial/8250_pci.c 2010-07-05 14:14:00.000000000 -0400 27850--- linux-2.6.32.18/drivers/serial/8250_pci.c 2010-08-10 13:45:57.000000000 -0400
27819+++ linux-2.6.32.16/drivers/serial/8250_pci.c 2010-07-09 14:50:37.000000000 -0400 27851+++ linux-2.6.32.18/drivers/serial/8250_pci.c 2010-08-11 18:57:31.000000000 -0400
27820@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t 27852@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
27821 PCI_ANY_ID, PCI_ANY_ID, 27853 PCI_ANY_ID, PCI_ANY_ID,
27822 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 27854 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
@@ -27826,9 +27858,9 @@ diff -urNp linux-2.6.32.16/drivers/serial/8250_pci.c linux-2.6.32.16/drivers/ser
27826 }; 27858 };
27827 27859
27828 static struct pci_driver serial_pci_driver = { 27860 static struct pci_driver serial_pci_driver = {
27829diff -urNp linux-2.6.32.16/drivers/serial/kgdboc.c linux-2.6.32.16/drivers/serial/kgdboc.c 27861diff -urNp linux-2.6.32.18/drivers/serial/kgdboc.c linux-2.6.32.18/drivers/serial/kgdboc.c
27830--- linux-2.6.32.16/drivers/serial/kgdboc.c 2010-07-05 14:14:00.000000000 -0400 27862--- linux-2.6.32.18/drivers/serial/kgdboc.c 2010-08-10 13:45:57.000000000 -0400
27831+++ linux-2.6.32.16/drivers/serial/kgdboc.c 2010-07-09 14:50:37.000000000 -0400 27863+++ linux-2.6.32.18/drivers/serial/kgdboc.c 2010-08-11 18:57:31.000000000 -0400
27832@@ -18,7 +18,7 @@ 27864@@ -18,7 +18,7 @@
27833 27865
27834 #define MAX_CONFIG_LEN 40 27866 #define MAX_CONFIG_LEN 40
@@ -27847,9 +27879,9 @@ diff -urNp linux-2.6.32.16/drivers/serial/kgdboc.c linux-2.6.32.16/drivers/seria
27847 .name = "kgdboc", 27879 .name = "kgdboc",
27848 .read_char = kgdboc_get_char, 27880 .read_char = kgdboc_get_char,
27849 .write_char = kgdboc_put_char, 27881 .write_char = kgdboc_put_char,
27850diff -urNp linux-2.6.32.16/drivers/staging/android/binder.c linux-2.6.32.16/drivers/staging/android/binder.c 27882diff -urNp linux-2.6.32.18/drivers/staging/android/binder.c linux-2.6.32.18/drivers/staging/android/binder.c
27851--- linux-2.6.32.16/drivers/staging/android/binder.c 2010-07-05 14:14:00.000000000 -0400 27883--- linux-2.6.32.18/drivers/staging/android/binder.c 2010-08-10 13:45:57.000000000 -0400
27852+++ linux-2.6.32.16/drivers/staging/android/binder.c 2010-07-09 14:50:37.000000000 -0400 27884+++ linux-2.6.32.18/drivers/staging/android/binder.c 2010-08-11 18:57:31.000000000 -0400
27853@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a 27885@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
27854 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); 27886 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
27855 } 27887 }
@@ -27859,9 +27891,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/android/binder.c linux-2.6.32.16/driv
27859 .open = binder_vma_open, 27891 .open = binder_vma_open,
27860 .close = binder_vma_close, 27892 .close = binder_vma_close,
27861 }; 27893 };
27862diff -urNp linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c 27894diff -urNp linux-2.6.32.18/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.18/drivers/staging/b3dfg/b3dfg.c
27863--- linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c 2010-07-05 14:14:00.000000000 -0400 27895--- linux-2.6.32.18/drivers/staging/b3dfg/b3dfg.c 2010-08-10 13:45:57.000000000 -0400
27864+++ linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c 2010-07-09 14:50:37.000000000 -0400 27896+++ linux-2.6.32.18/drivers/staging/b3dfg/b3dfg.c 2010-08-11 18:57:31.000000000 -0400
27865@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are 27897@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
27866 return VM_FAULT_NOPAGE; 27898 return VM_FAULT_NOPAGE;
27867 } 27899 }
@@ -27880,9 +27912,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.16/drivers
27880 .owner = THIS_MODULE, 27912 .owner = THIS_MODULE,
27881 .open = b3dfg_open, 27913 .open = b3dfg_open,
27882 .release = b3dfg_release, 27914 .release = b3dfg_release,
27883diff -urNp linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c 27915diff -urNp linux-2.6.32.18/drivers/staging/comedi/comedi_fops.c linux-2.6.32.18/drivers/staging/comedi/comedi_fops.c
27884--- linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c 2010-07-05 14:14:00.000000000 -0400 27916--- linux-2.6.32.18/drivers/staging/comedi/comedi_fops.c 2010-08-10 13:45:57.000000000 -0400
27885+++ linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c 2010-07-09 14:50:37.000000000 -0400 27917+++ linux-2.6.32.18/drivers/staging/comedi/comedi_fops.c 2010-08-11 18:57:31.000000000 -0400
27886@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct 27918@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
27887 mutex_unlock(&dev->mutex); 27919 mutex_unlock(&dev->mutex);
27888 } 27920 }
@@ -27892,9 +27924,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/comedi/comedi_fops.c linux-2.6.32.16/
27892 .close = comedi_unmap, 27924 .close = comedi_unmap,
27893 }; 27925 };
27894 27926
27895diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c 27927diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.18/drivers/staging/dream/qdsp5/adsp_driver.c
27896--- linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c 2010-07-05 14:14:00.000000000 -0400 27928--- linux-2.6.32.18/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-10 13:45:57.000000000 -0400
27897+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c 2010-07-09 14:50:37.000000000 -0400 27929+++ linux-2.6.32.18/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-11 18:57:31.000000000 -0400
27898@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi 27930@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
27899 static dev_t adsp_devno; 27931 static dev_t adsp_devno;
27900 static struct class *adsp_class; 27932 static struct class *adsp_class;
@@ -27904,9 +27936,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3
27904 .owner = THIS_MODULE, 27936 .owner = THIS_MODULE,
27905 .open = adsp_open, 27937 .open = adsp_open,
27906 .unlocked_ioctl = adsp_ioctl, 27938 .unlocked_ioctl = adsp_ioctl,
27907diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_aac.c 27939diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_aac.c
27908--- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_aac.c 2010-07-05 14:14:00.000000000 -0400 27940--- linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-10 13:45:57.000000000 -0400
27909+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_aac.c 2010-07-09 14:50:37.000000000 -0400 27941+++ linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-11 18:57:31.000000000 -0400
27910@@ -1022,7 +1022,7 @@ done: 27942@@ -1022,7 +1022,7 @@ done:
27911 return rc; 27943 return rc;
27912 } 27944 }
@@ -27916,9 +27948,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
27916 .owner = THIS_MODULE, 27948 .owner = THIS_MODULE,
27917 .open = audio_open, 27949 .open = audio_open,
27918 .release = audio_release, 27950 .release = audio_release,
27919diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_amrnb.c 27951diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_amrnb.c
27920--- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-07-05 14:14:00.000000000 -0400 27952--- linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-10 13:45:57.000000000 -0400
27921+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-07-09 14:50:37.000000000 -0400 27953+++ linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-11 18:57:31.000000000 -0400
27922@@ -833,7 +833,7 @@ done: 27954@@ -833,7 +833,7 @@ done:
27923 return rc; 27955 return rc;
27924 } 27956 }
@@ -27928,9 +27960,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
27928 .owner = THIS_MODULE, 27960 .owner = THIS_MODULE,
27929 .open = audamrnb_open, 27961 .open = audamrnb_open,
27930 .release = audamrnb_release, 27962 .release = audamrnb_release,
27931diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_evrc.c 27963diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_evrc.c
27932--- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_evrc.c 2010-07-05 14:14:00.000000000 -0400 27964--- linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-10 13:45:57.000000000 -0400
27933+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_evrc.c 2010-07-09 14:50:37.000000000 -0400 27965+++ linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-11 18:57:31.000000000 -0400
27934@@ -805,7 +805,7 @@ dma_fail: 27966@@ -805,7 +805,7 @@ dma_fail:
27935 return rc; 27967 return rc;
27936 } 27968 }
@@ -27940,9 +27972,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32
27940 .owner = THIS_MODULE, 27972 .owner = THIS_MODULE,
27941 .open = audevrc_open, 27973 .open = audevrc_open,
27942 .release = audevrc_release, 27974 .release = audevrc_release,
27943diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c 27975diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_in.c
27944--- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c 2010-07-05 14:14:00.000000000 -0400 27976--- linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_in.c 2010-08-10 13:45:57.000000000 -0400
27945+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c 2010-07-09 14:50:37.000000000 -0400 27977+++ linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_in.c 2010-08-11 18:57:31.000000000 -0400
27946@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino 27978@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
27947 return 0; 27979 return 0;
27948 } 27980 }
@@ -27961,9 +27993,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.1
27961 .owner = THIS_MODULE, 27993 .owner = THIS_MODULE,
27962 .open = audpre_open, 27994 .open = audpre_open,
27963 .unlocked_ioctl = audpre_ioctl, 27995 .unlocked_ioctl = audpre_ioctl,
27964diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c 27996diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_mp3.c
27965--- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c 2010-07-05 14:14:00.000000000 -0400 27997--- linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-10 13:45:57.000000000 -0400
27966+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c 2010-07-09 14:50:37.000000000 -0400 27998+++ linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-11 18:57:31.000000000 -0400
27967@@ -941,7 +941,7 @@ done: 27999@@ -941,7 +941,7 @@ done:
27968 return rc; 28000 return rc;
27969 } 28001 }
@@ -27973,9 +28005,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
27973 .owner = THIS_MODULE, 28005 .owner = THIS_MODULE,
27974 .open = audio_open, 28006 .open = audio_open,
27975 .release = audio_release, 28007 .release = audio_release,
27976diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_out.c 28008diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_out.c
27977--- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_out.c 2010-07-05 14:14:00.000000000 -0400 28009--- linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_out.c 2010-08-10 13:45:57.000000000 -0400
27978+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_out.c 2010-07-09 14:50:37.000000000 -0400 28010+++ linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_out.c 2010-08-11 18:57:31.000000000 -0400
27979@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod 28011@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
27980 return 0; 28012 return 0;
27981 } 28013 }
@@ -27994,9 +28026,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
27994 .owner = THIS_MODULE, 28026 .owner = THIS_MODULE,
27995 .open = audpp_open, 28027 .open = audpp_open,
27996 .unlocked_ioctl = audpp_ioctl, 28028 .unlocked_ioctl = audpp_ioctl,
27997diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_qcelp.c 28029diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_qcelp.c
27998--- linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-07-05 14:14:00.000000000 -0400 28030--- linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-10 13:45:57.000000000 -0400
27999+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-07-09 14:50:37.000000000 -0400 28031+++ linux-2.6.32.18/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-11 18:57:31.000000000 -0400
28000@@ -816,7 +816,7 @@ err: 28032@@ -816,7 +816,7 @@ err:
28001 return rc; 28033 return rc;
28002 } 28034 }
@@ -28006,9 +28038,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
28006 .owner = THIS_MODULE, 28038 .owner = THIS_MODULE,
28007 .open = audqcelp_open, 28039 .open = audqcelp_open,
28008 .release = audqcelp_release, 28040 .release = audqcelp_release,
28009diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c 28041diff -urNp linux-2.6.32.18/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.18/drivers/staging/dream/qdsp5/snd.c
28010--- linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c 2010-07-05 14:14:00.000000000 -0400 28042--- linux-2.6.32.18/drivers/staging/dream/qdsp5/snd.c 2010-08-10 13:45:57.000000000 -0400
28011+++ linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c 2010-07-09 14:50:37.000000000 -0400 28043+++ linux-2.6.32.18/drivers/staging/dream/qdsp5/snd.c 2010-08-11 18:57:31.000000000 -0400
28012@@ -242,7 +242,7 @@ err: 28044@@ -242,7 +242,7 @@ err:
28013 return rc; 28045 return rc;
28014 } 28046 }
@@ -28018,9 +28050,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.16/dri
28018 .owner = THIS_MODULE, 28050 .owner = THIS_MODULE,
28019 .open = snd_open, 28051 .open = snd_open,
28020 .release = snd_release, 28052 .release = snd_release,
28021diff -urNp linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c 28053diff -urNp linux-2.6.32.18/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.18/drivers/staging/dream/smd/smd_qmi.c
28022--- linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c 2010-07-05 14:14:00.000000000 -0400 28054--- linux-2.6.32.18/drivers/staging/dream/smd/smd_qmi.c 2010-08-10 13:45:57.000000000 -0400
28023+++ linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c 2010-07-09 14:50:37.000000000 -0400 28055+++ linux-2.6.32.18/drivers/staging/dream/smd/smd_qmi.c 2010-08-11 18:57:31.000000000 -0400
28024@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, 28056@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
28025 return 0; 28057 return 0;
28026 } 28058 }
@@ -28030,9 +28062,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.16/d
28030 .owner = THIS_MODULE, 28062 .owner = THIS_MODULE,
28031 .read = qmi_read, 28063 .read = qmi_read,
28032 .write = qmi_write, 28064 .write = qmi_write,
28033diff -urNp linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c 28065diff -urNp linux-2.6.32.18/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.18/drivers/staging/dream/smd/smd_rpcrouter_device.c
28034--- linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-07-05 14:14:00.000000000 -0400 28066--- linux-2.6.32.18/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-10 13:45:57.000000000 -0400
28035+++ linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-07-09 14:50:37.000000000 -0400 28067+++ linux-2.6.32.18/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-11 18:57:31.000000000 -0400
28036@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file 28068@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
28037 return rc; 28069 return rc;
28038 } 28070 }
@@ -28051,9 +28083,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
28051 .owner = THIS_MODULE, 28083 .owner = THIS_MODULE,
28052 .open = rpcrouter_open, 28084 .open = rpcrouter_open,
28053 .release = rpcrouter_release, 28085 .release = rpcrouter_release,
28054diff -urNp linux-2.6.32.16/drivers/staging/dst/dcore.c linux-2.6.32.16/drivers/staging/dst/dcore.c 28086diff -urNp linux-2.6.32.18/drivers/staging/dst/dcore.c linux-2.6.32.18/drivers/staging/dst/dcore.c
28055--- linux-2.6.32.16/drivers/staging/dst/dcore.c 2010-07-05 14:14:00.000000000 -0400 28087--- linux-2.6.32.18/drivers/staging/dst/dcore.c 2010-08-10 13:45:57.000000000 -0400
28056+++ linux-2.6.32.16/drivers/staging/dst/dcore.c 2010-07-09 14:50:37.000000000 -0400 28088+++ linux-2.6.32.18/drivers/staging/dst/dcore.c 2010-08-11 18:57:31.000000000 -0400
28057@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi 28089@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
28058 return 0; 28090 return 0;
28059 } 28091 }
@@ -28072,9 +28104,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dst/dcore.c linux-2.6.32.16/drivers/s
28072 snprintf(n->name, sizeof(n->name), "%s", ctl->name); 28104 snprintf(n->name, sizeof(n->name), "%s", ctl->name);
28073 28105
28074 err = dst_node_sysfs_init(n); 28106 err = dst_node_sysfs_init(n);
28075diff -urNp linux-2.6.32.16/drivers/staging/dst/trans.c linux-2.6.32.16/drivers/staging/dst/trans.c 28107diff -urNp linux-2.6.32.18/drivers/staging/dst/trans.c linux-2.6.32.18/drivers/staging/dst/trans.c
28076--- linux-2.6.32.16/drivers/staging/dst/trans.c 2010-07-05 14:14:00.000000000 -0400 28108--- linux-2.6.32.18/drivers/staging/dst/trans.c 2010-08-10 13:45:57.000000000 -0400
28077+++ linux-2.6.32.16/drivers/staging/dst/trans.c 2010-07-09 14:50:37.000000000 -0400 28109+++ linux-2.6.32.18/drivers/staging/dst/trans.c 2010-08-11 18:57:31.000000000 -0400
28078@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, 28110@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
28079 t->error = 0; 28111 t->error = 0;
28080 t->retries = 0; 28112 t->retries = 0;
@@ -28084,9 +28116,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/dst/trans.c linux-2.6.32.16/drivers/s
28084 28116
28085 t->enc = bio_data_dir(bio); 28117 t->enc = bio_data_dir(bio);
28086 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); 28118 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
28087diff -urNp linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c 28119diff -urNp linux-2.6.32.18/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.18/drivers/staging/go7007/go7007-v4l2.c
28088--- linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c 2010-07-05 14:14:00.000000000 -0400 28120--- linux-2.6.32.18/drivers/staging/go7007/go7007-v4l2.c 2010-08-10 13:45:57.000000000 -0400
28089+++ linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c 2010-07-09 14:50:37.000000000 -0400 28121+++ linux-2.6.32.18/drivers/staging/go7007/go7007-v4l2.c 2010-08-11 18:57:31.000000000 -0400
28090@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are 28122@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
28091 return 0; 28123 return 0;
28092 } 28124 }
@@ -28096,9 +28128,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.16/
28096 .open = go7007_vm_open, 28128 .open = go7007_vm_open,
28097 .close = go7007_vm_close, 28129 .close = go7007_vm_close,
28098 .fault = go7007_vm_fault, 28130 .fault = go7007_vm_fault,
28099diff -urNp linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c 28131diff -urNp linux-2.6.32.18/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.18/drivers/staging/hv/blkvsc_drv.c
28100--- linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c 2010-07-05 14:14:00.000000000 -0400 28132--- linux-2.6.32.18/drivers/staging/hv/blkvsc_drv.c 2010-08-10 13:45:57.000000000 -0400
28101+++ linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c 2010-07-09 14:50:37.000000000 -0400 28133+++ linux-2.6.32.18/drivers/staging/hv/blkvsc_drv.c 2010-08-11 18:57:31.000000000 -0400
28102@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV 28134@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
28103 /* The one and only one */ 28135 /* The one and only one */
28104 static struct blkvsc_driver_context g_blkvsc_drv; 28136 static struct blkvsc_driver_context g_blkvsc_drv;
@@ -28108,9 +28140,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.16/drive
28108 .owner = THIS_MODULE, 28140 .owner = THIS_MODULE,
28109 .open = blkvsc_open, 28141 .open = blkvsc_open,
28110 .release = blkvsc_release, 28142 .release = blkvsc_release,
28111diff -urNp linux-2.6.32.16/drivers/staging/hv/Hv.c linux-2.6.32.16/drivers/staging/hv/Hv.c 28143diff -urNp linux-2.6.32.18/drivers/staging/hv/Hv.c linux-2.6.32.18/drivers/staging/hv/Hv.c
28112--- linux-2.6.32.16/drivers/staging/hv/Hv.c 2010-07-05 14:14:00.000000000 -0400 28144--- linux-2.6.32.18/drivers/staging/hv/Hv.c 2010-08-10 13:45:57.000000000 -0400
28113+++ linux-2.6.32.16/drivers/staging/hv/Hv.c 2010-07-09 14:50:37.000000000 -0400 28145+++ linux-2.6.32.18/drivers/staging/hv/Hv.c 2010-08-11 18:57:31.000000000 -0400
28114@@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo 28146@@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo
28115 u64 outputAddress = (Output) ? virt_to_phys(Output) : 0; 28147 u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
28116 u32 outputAddressHi = outputAddress >> 32; 28148 u32 outputAddressHi = outputAddress >> 32;
@@ -28120,9 +28152,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/hv/Hv.c linux-2.6.32.16/drivers/stagi
28120 28152
28121 DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>", 28153 DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
28122 Control, Input, Output); 28154 Control, Input, Output);
28123diff -urNp linux-2.6.32.16/drivers/staging/panel/panel.c linux-2.6.32.16/drivers/staging/panel/panel.c 28155diff -urNp linux-2.6.32.18/drivers/staging/panel/panel.c linux-2.6.32.18/drivers/staging/panel/panel.c
28124--- linux-2.6.32.16/drivers/staging/panel/panel.c 2010-07-05 14:14:00.000000000 -0400 28156--- linux-2.6.32.18/drivers/staging/panel/panel.c 2010-08-10 13:45:57.000000000 -0400
28125+++ linux-2.6.32.16/drivers/staging/panel/panel.c 2010-07-09 14:50:37.000000000 -0400 28157+++ linux-2.6.32.18/drivers/staging/panel/panel.c 2010-08-11 18:57:31.000000000 -0400
28126@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino 28158@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
28127 return 0; 28159 return 0;
28128 } 28160 }
@@ -28141,9 +28173,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/panel/panel.c linux-2.6.32.16/drivers
28141 .read = keypad_read, /* read */ 28173 .read = keypad_read, /* read */
28142 .open = keypad_open, /* open */ 28174 .open = keypad_open, /* open */
28143 .release = keypad_release, /* close */ 28175 .release = keypad_release, /* close */
28144diff -urNp linux-2.6.32.16/drivers/staging/phison/phison.c linux-2.6.32.16/drivers/staging/phison/phison.c 28176diff -urNp linux-2.6.32.18/drivers/staging/phison/phison.c linux-2.6.32.18/drivers/staging/phison/phison.c
28145--- linux-2.6.32.16/drivers/staging/phison/phison.c 2010-07-05 14:14:00.000000000 -0400 28177--- linux-2.6.32.18/drivers/staging/phison/phison.c 2010-08-10 13:45:57.000000000 -0400
28146+++ linux-2.6.32.16/drivers/staging/phison/phison.c 2010-07-09 14:50:37.000000000 -0400 28178+++ linux-2.6.32.18/drivers/staging/phison/phison.c 2010-08-11 18:57:31.000000000 -0400
28147@@ -43,7 +43,7 @@ static struct scsi_host_template phison_ 28179@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
28148 ATA_BMDMA_SHT(DRV_NAME), 28180 ATA_BMDMA_SHT(DRV_NAME),
28149 }; 28181 };
@@ -28153,9 +28185,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/phison/phison.c linux-2.6.32.16/drive
28153 .inherits = &ata_bmdma_port_ops, 28185 .inherits = &ata_bmdma_port_ops,
28154 .prereset = phison_pre_reset, 28186 .prereset = phison_pre_reset,
28155 }; 28187 };
28156diff -urNp linux-2.6.32.16/drivers/staging/poch/poch.c linux-2.6.32.16/drivers/staging/poch/poch.c 28188diff -urNp linux-2.6.32.18/drivers/staging/poch/poch.c linux-2.6.32.18/drivers/staging/poch/poch.c
28157--- linux-2.6.32.16/drivers/staging/poch/poch.c 2010-07-05 14:14:00.000000000 -0400 28189--- linux-2.6.32.18/drivers/staging/poch/poch.c 2010-08-10 13:45:57.000000000 -0400
28158+++ linux-2.6.32.16/drivers/staging/poch/poch.c 2010-07-09 14:50:37.000000000 -0400 28190+++ linux-2.6.32.18/drivers/staging/poch/poch.c 2010-08-11 18:57:31.000000000 -0400
28159@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod 28191@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
28160 return 0; 28192 return 0;
28161 } 28193 }
@@ -28165,9 +28197,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/poch/poch.c linux-2.6.32.16/drivers/s
28165 .owner = THIS_MODULE, 28197 .owner = THIS_MODULE,
28166 .open = poch_open, 28198 .open = poch_open,
28167 .release = poch_release, 28199 .release = poch_release,
28168diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/inode.c linux-2.6.32.16/drivers/staging/pohmelfs/inode.c 28200diff -urNp linux-2.6.32.18/drivers/staging/pohmelfs/inode.c linux-2.6.32.18/drivers/staging/pohmelfs/inode.c
28169--- linux-2.6.32.16/drivers/staging/pohmelfs/inode.c 2010-07-05 14:14:00.000000000 -0400 28201--- linux-2.6.32.18/drivers/staging/pohmelfs/inode.c 2010-08-10 13:45:57.000000000 -0400
28170+++ linux-2.6.32.16/drivers/staging/pohmelfs/inode.c 2010-07-09 14:50:37.000000000 -0400 28202+++ linux-2.6.32.18/drivers/staging/pohmelfs/inode.c 2010-08-11 18:57:31.000000000 -0400
28171@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su 28203@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
28172 mutex_init(&psb->mcache_lock); 28204 mutex_init(&psb->mcache_lock);
28173 psb->mcache_root = RB_ROOT; 28205 psb->mcache_root = RB_ROOT;
@@ -28177,9 +28209,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/inode.c linux-2.6.32.16/driv
28177 28209
28178 psb->trans_max_pages = 100; 28210 psb->trans_max_pages = 100;
28179 28211
28180diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c 28212diff -urNp linux-2.6.32.18/drivers/staging/pohmelfs/mcache.c linux-2.6.32.18/drivers/staging/pohmelfs/mcache.c
28181--- linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c 2010-07-05 14:14:00.000000000 -0400 28213--- linux-2.6.32.18/drivers/staging/pohmelfs/mcache.c 2010-08-10 13:45:57.000000000 -0400
28182+++ linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c 2010-07-09 14:50:37.000000000 -0400 28214+++ linux-2.6.32.18/drivers/staging/pohmelfs/mcache.c 2010-08-11 18:57:31.000000000 -0400
28183@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ 28215@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
28184 m->data = data; 28216 m->data = data;
28185 m->start = start; 28217 m->start = start;
@@ -28189,9 +28221,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/mcache.c linux-2.6.32.16/dri
28189 28221
28190 mutex_lock(&psb->mcache_lock); 28222 mutex_lock(&psb->mcache_lock);
28191 err = pohmelfs_mcache_insert(psb, m); 28223 err = pohmelfs_mcache_insert(psb, m);
28192diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h 28224diff -urNp linux-2.6.32.18/drivers/staging/pohmelfs/netfs.h linux-2.6.32.18/drivers/staging/pohmelfs/netfs.h
28193--- linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h 2010-07-05 14:14:00.000000000 -0400 28225--- linux-2.6.32.18/drivers/staging/pohmelfs/netfs.h 2010-08-10 13:45:57.000000000 -0400
28194+++ linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h 2010-07-09 14:50:37.000000000 -0400 28226+++ linux-2.6.32.18/drivers/staging/pohmelfs/netfs.h 2010-08-11 18:57:31.000000000 -0400
28195@@ -570,7 +570,7 @@ struct pohmelfs_config; 28227@@ -570,7 +570,7 @@ struct pohmelfs_config;
28196 struct pohmelfs_sb { 28228 struct pohmelfs_sb {
28197 struct rb_root mcache_root; 28229 struct rb_root mcache_root;
@@ -28201,9 +28233,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/pohmelfs/netfs.h linux-2.6.32.16/driv
28201 unsigned long mcache_timeout; 28233 unsigned long mcache_timeout;
28202 28234
28203 unsigned int idx; 28235 unsigned int idx;
28204diff -urNp linux-2.6.32.16/drivers/staging/sep/sep_driver.c linux-2.6.32.16/drivers/staging/sep/sep_driver.c 28236diff -urNp linux-2.6.32.18/drivers/staging/sep/sep_driver.c linux-2.6.32.18/drivers/staging/sep/sep_driver.c
28205--- linux-2.6.32.16/drivers/staging/sep/sep_driver.c 2010-07-05 14:14:00.000000000 -0400 28237--- linux-2.6.32.18/drivers/staging/sep/sep_driver.c 2010-08-10 13:45:57.000000000 -0400
28206+++ linux-2.6.32.16/drivers/staging/sep/sep_driver.c 2010-07-09 14:50:37.000000000 -0400 28238+++ linux-2.6.32.18/drivers/staging/sep/sep_driver.c 2010-08-11 18:57:31.000000000 -0400
28207@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver 28239@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
28208 static dev_t sep_devno; 28240 static dev_t sep_devno;
28209 28241
@@ -28213,9 +28245,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/sep/sep_driver.c linux-2.6.32.16/driv
28213 .owner = THIS_MODULE, 28245 .owner = THIS_MODULE,
28214 .ioctl = sep_ioctl, 28246 .ioctl = sep_ioctl,
28215 .poll = sep_poll, 28247 .poll = sep_poll,
28216diff -urNp linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c 28248diff -urNp linux-2.6.32.18/drivers/staging/vme/devices/vme_user.c linux-2.6.32.18/drivers/staging/vme/devices/vme_user.c
28217--- linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c 2010-07-05 14:14:00.000000000 -0400 28249--- linux-2.6.32.18/drivers/staging/vme/devices/vme_user.c 2010-08-10 13:45:57.000000000 -0400
28218+++ linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c 2010-07-09 14:50:37.000000000 -0400 28250+++ linux-2.6.32.18/drivers/staging/vme/devices/vme_user.c 2010-08-11 18:57:31.000000000 -0400
28219@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * 28251@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
28220 static int __init vme_user_probe(struct device *, int, int); 28252 static int __init vme_user_probe(struct device *, int, int);
28221 static int __exit vme_user_remove(struct device *, int, int); 28253 static int __exit vme_user_remove(struct device *, int, int);
@@ -28225,9 +28257,9 @@ diff -urNp linux-2.6.32.16/drivers/staging/vme/devices/vme_user.c linux-2.6.32.1
28225 .open = vme_user_open, 28257 .open = vme_user_open,
28226 .release = vme_user_release, 28258 .release = vme_user_release,
28227 .read = vme_user_read, 28259 .read = vme_user_read,
28228diff -urNp linux-2.6.32.16/drivers/uio/uio.c linux-2.6.32.16/drivers/uio/uio.c 28260diff -urNp linux-2.6.32.18/drivers/uio/uio.c linux-2.6.32.18/drivers/uio/uio.c
28229--- linux-2.6.32.16/drivers/uio/uio.c 2010-07-05 14:14:00.000000000 -0400 28261--- linux-2.6.32.18/drivers/uio/uio.c 2010-08-10 13:45:57.000000000 -0400
28230+++ linux-2.6.32.16/drivers/uio/uio.c 2010-07-09 14:50:37.000000000 -0400 28262+++ linux-2.6.32.18/drivers/uio/uio.c 2010-08-11 18:57:31.000000000 -0400
28231@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj 28263@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
28232 return entry->show(mem, buf); 28264 return entry->show(mem, buf);
28233 } 28265 }
@@ -28246,9 +28278,9 @@ diff -urNp linux-2.6.32.16/drivers/uio/uio.c linux-2.6.32.16/drivers/uio/uio.c
28246 .show = portio_type_show, 28278 .show = portio_type_show,
28247 }; 28279 };
28248 28280
28249diff -urNp linux-2.6.32.16/drivers/usb/atm/usbatm.c linux-2.6.32.16/drivers/usb/atm/usbatm.c 28281diff -urNp linux-2.6.32.18/drivers/usb/atm/usbatm.c linux-2.6.32.18/drivers/usb/atm/usbatm.c
28250--- linux-2.6.32.16/drivers/usb/atm/usbatm.c 2010-07-05 14:14:00.000000000 -0400 28282--- linux-2.6.32.18/drivers/usb/atm/usbatm.c 2010-08-10 13:45:57.000000000 -0400
28251+++ linux-2.6.32.16/drivers/usb/atm/usbatm.c 2010-07-09 14:50:37.000000000 -0400 28283+++ linux-2.6.32.18/drivers/usb/atm/usbatm.c 2010-08-11 18:57:31.000000000 -0400
28252@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru 28284@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
28253 if (printk_ratelimit()) 28285 if (printk_ratelimit())
28254 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", 28286 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -28328,9 +28360,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/atm/usbatm.c linux-2.6.32.16/drivers/usb/
28328 28360
28329 if (!left--) { 28361 if (!left--) {
28330 if (instance->disconnected) 28362 if (instance->disconnected)
28331diff -urNp linux-2.6.32.16/drivers/usb/class/cdc-acm.c linux-2.6.32.16/drivers/usb/class/cdc-acm.c 28363diff -urNp linux-2.6.32.18/drivers/usb/class/cdc-acm.c linux-2.6.32.18/drivers/usb/class/cdc-acm.c
28332--- linux-2.6.32.16/drivers/usb/class/cdc-acm.c 2010-07-05 14:14:00.000000000 -0400 28364--- linux-2.6.32.18/drivers/usb/class/cdc-acm.c 2010-08-10 13:45:57.000000000 -0400
28333+++ linux-2.6.32.16/drivers/usb/class/cdc-acm.c 2010-07-09 14:50:37.000000000 -0400 28365+++ linux-2.6.32.18/drivers/usb/class/cdc-acm.c 2010-08-11 18:57:31.000000000 -0400
28334@@ -1537,7 +1537,7 @@ static struct usb_device_id acm_ids[] = 28366@@ -1537,7 +1537,7 @@ static struct usb_device_id acm_ids[] =
28335 USB_CDC_ACM_PROTO_AT_CDMA) }, 28367 USB_CDC_ACM_PROTO_AT_CDMA) },
28336 28368
@@ -28340,9 +28372,21 @@ diff -urNp linux-2.6.32.16/drivers/usb/class/cdc-acm.c linux-2.6.32.16/drivers/u
28340 }; 28372 };
28341 28373
28342 MODULE_DEVICE_TABLE(usb, acm_ids); 28374 MODULE_DEVICE_TABLE(usb, acm_ids);
28343diff -urNp linux-2.6.32.16/drivers/usb/class/usblp.c linux-2.6.32.16/drivers/usb/class/usblp.c 28375diff -urNp linux-2.6.32.18/drivers/usb/class/cdc-wdm.c linux-2.6.32.18/drivers/usb/class/cdc-wdm.c
28344--- linux-2.6.32.16/drivers/usb/class/usblp.c 2010-07-05 14:14:00.000000000 -0400 28376--- linux-2.6.32.18/drivers/usb/class/cdc-wdm.c 2010-08-10 13:45:57.000000000 -0400
28345+++ linux-2.6.32.16/drivers/usb/class/usblp.c 2010-07-09 14:50:37.000000000 -0400 28377+++ linux-2.6.32.18/drivers/usb/class/cdc-wdm.c 2010-08-11 19:02:29.000000000 -0400
28378@@ -314,7 +314,7 @@ static ssize_t wdm_write
28379 if (r < 0)
28380 goto outnp;
28381
28382- if (!file->f_flags && O_NONBLOCK)
28383+ if (!file->f_flags & O_NONBLOCK)
28384 r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
28385 &desc->flags));
28386 else
28387diff -urNp linux-2.6.32.18/drivers/usb/class/usblp.c linux-2.6.32.18/drivers/usb/class/usblp.c
28388--- linux-2.6.32.18/drivers/usb/class/usblp.c 2010-08-10 13:45:57.000000000 -0400
28389+++ linux-2.6.32.18/drivers/usb/class/usblp.c 2010-08-11 18:57:31.000000000 -0400
28346@@ -228,7 +228,7 @@ static const struct quirk_printer_struct 28390@@ -228,7 +228,7 @@ static const struct quirk_printer_struct
28347 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ 28391 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
28348 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ 28392 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
@@ -28361,9 +28405,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/class/usblp.c linux-2.6.32.16/drivers/usb
28361 }; 28405 };
28362 28406
28363 MODULE_DEVICE_TABLE (usb, usblp_ids); 28407 MODULE_DEVICE_TABLE (usb, usblp_ids);
28364diff -urNp linux-2.6.32.16/drivers/usb/core/hcd.c linux-2.6.32.16/drivers/usb/core/hcd.c 28408diff -urNp linux-2.6.32.18/drivers/usb/core/hcd.c linux-2.6.32.18/drivers/usb/core/hcd.c
28365--- linux-2.6.32.16/drivers/usb/core/hcd.c 2010-07-05 14:14:00.000000000 -0400 28409--- linux-2.6.32.18/drivers/usb/core/hcd.c 2010-08-10 13:45:57.000000000 -0400
28366+++ linux-2.6.32.16/drivers/usb/core/hcd.c 2010-07-09 14:50:37.000000000 -0400 28410+++ linux-2.6.32.18/drivers/usb/core/hcd.c 2010-08-11 18:57:31.000000000 -0400
28367@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd 28411@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
28368 28412
28369 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 28413 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -28382,9 +28426,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/core/hcd.c linux-2.6.32.16/drivers/usb/co
28382 { 28426 {
28383 28427
28384 if (mon_ops) 28428 if (mon_ops)
28385diff -urNp linux-2.6.32.16/drivers/usb/core/hcd.h linux-2.6.32.16/drivers/usb/core/hcd.h 28429diff -urNp linux-2.6.32.18/drivers/usb/core/hcd.h linux-2.6.32.18/drivers/usb/core/hcd.h
28386--- linux-2.6.32.16/drivers/usb/core/hcd.h 2010-07-05 14:14:00.000000000 -0400 28430--- linux-2.6.32.18/drivers/usb/core/hcd.h 2010-08-10 13:45:57.000000000 -0400
28387+++ linux-2.6.32.16/drivers/usb/core/hcd.h 2010-07-09 14:50:37.000000000 -0400 28431+++ linux-2.6.32.18/drivers/usb/core/hcd.h 2010-08-11 18:57:31.000000000 -0400
28388@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { 28432@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
28389 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 28433 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
28390 28434
@@ -28412,9 +28456,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/core/hcd.h linux-2.6.32.16/drivers/usb/co
28412 void usb_mon_deregister(void); 28456 void usb_mon_deregister(void);
28413 28457
28414 #else 28458 #else
28415diff -urNp linux-2.6.32.16/drivers/usb/core/hub.c linux-2.6.32.16/drivers/usb/core/hub.c 28459diff -urNp linux-2.6.32.18/drivers/usb/core/hub.c linux-2.6.32.18/drivers/usb/core/hub.c
28416--- linux-2.6.32.16/drivers/usb/core/hub.c 2010-07-05 14:14:00.000000000 -0400 28460--- linux-2.6.32.18/drivers/usb/core/hub.c 2010-08-10 13:45:57.000000000 -0400
28417+++ linux-2.6.32.16/drivers/usb/core/hub.c 2010-07-09 14:50:37.000000000 -0400 28461+++ linux-2.6.32.18/drivers/usb/core/hub.c 2010-08-11 18:57:31.000000000 -0400
28418@@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table 28462@@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table
28419 .bDeviceClass = USB_CLASS_HUB}, 28463 .bDeviceClass = USB_CLASS_HUB},
28420 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, 28464 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
@@ -28424,9 +28468,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/core/hub.c linux-2.6.32.16/drivers/usb/co
28424 }; 28468 };
28425 28469
28426 MODULE_DEVICE_TABLE (usb, hub_id_table); 28470 MODULE_DEVICE_TABLE (usb, hub_id_table);
28427diff -urNp linux-2.6.32.16/drivers/usb/core/message.c linux-2.6.32.16/drivers/usb/core/message.c 28471diff -urNp linux-2.6.32.18/drivers/usb/core/message.c linux-2.6.32.18/drivers/usb/core/message.c
28428--- linux-2.6.32.16/drivers/usb/core/message.c 2010-07-05 14:14:00.000000000 -0400 28472--- linux-2.6.32.18/drivers/usb/core/message.c 2010-08-10 13:45:57.000000000 -0400
28429+++ linux-2.6.32.16/drivers/usb/core/message.c 2010-07-09 14:50:37.000000000 -0400 28473+++ linux-2.6.32.18/drivers/usb/core/message.c 2010-08-11 18:57:31.000000000 -0400
28430@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device 28474@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
28431 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); 28475 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
28432 if (buf) { 28476 if (buf) {
@@ -28438,9 +28482,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/core/message.c linux-2.6.32.16/drivers/us
28438 if (!smallbuf) 28482 if (!smallbuf)
28439 return buf; 28483 return buf;
28440 memcpy(smallbuf, buf, len); 28484 memcpy(smallbuf, buf, len);
28441diff -urNp linux-2.6.32.16/drivers/usb/host/ehci-pci.c linux-2.6.32.16/drivers/usb/host/ehci-pci.c 28485diff -urNp linux-2.6.32.18/drivers/usb/host/ehci-pci.c linux-2.6.32.18/drivers/usb/host/ehci-pci.c
28442--- linux-2.6.32.16/drivers/usb/host/ehci-pci.c 2010-07-05 14:14:00.000000000 -0400 28486--- linux-2.6.32.18/drivers/usb/host/ehci-pci.c 2010-08-10 13:45:57.000000000 -0400
28443+++ linux-2.6.32.16/drivers/usb/host/ehci-pci.c 2010-07-09 14:50:37.000000000 -0400 28487+++ linux-2.6.32.18/drivers/usb/host/ehci-pci.c 2010-08-11 18:57:31.000000000 -0400
28444@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id 28488@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
28445 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), 28489 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
28446 .driver_data = (unsigned long) &ehci_pci_hc_driver, 28490 .driver_data = (unsigned long) &ehci_pci_hc_driver,
@@ -28450,9 +28494,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/host/ehci-pci.c linux-2.6.32.16/drivers/u
28450 }; 28494 };
28451 MODULE_DEVICE_TABLE(pci, pci_ids); 28495 MODULE_DEVICE_TABLE(pci, pci_ids);
28452 28496
28453diff -urNp linux-2.6.32.16/drivers/usb/host/uhci-hcd.c linux-2.6.32.16/drivers/usb/host/uhci-hcd.c 28497diff -urNp linux-2.6.32.18/drivers/usb/host/uhci-hcd.c linux-2.6.32.18/drivers/usb/host/uhci-hcd.c
28454--- linux-2.6.32.16/drivers/usb/host/uhci-hcd.c 2010-07-05 14:14:00.000000000 -0400 28498--- linux-2.6.32.18/drivers/usb/host/uhci-hcd.c 2010-08-10 13:45:57.000000000 -0400
28455+++ linux-2.6.32.16/drivers/usb/host/uhci-hcd.c 2010-07-09 14:50:37.000000000 -0400 28499+++ linux-2.6.32.18/drivers/usb/host/uhci-hcd.c 2010-08-11 18:57:31.000000000 -0400
28456@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p 28500@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
28457 /* handle any USB UHCI controller */ 28501 /* handle any USB UHCI controller */
28458 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), 28502 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -28462,9 +28506,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/host/uhci-hcd.c linux-2.6.32.16/drivers/u
28462 }; 28506 };
28463 28507
28464 MODULE_DEVICE_TABLE(pci, uhci_pci_ids); 28508 MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
28465diff -urNp linux-2.6.32.16/drivers/usb/misc/appledisplay.c linux-2.6.32.16/drivers/usb/misc/appledisplay.c 28509diff -urNp linux-2.6.32.18/drivers/usb/misc/appledisplay.c linux-2.6.32.18/drivers/usb/misc/appledisplay.c
28466--- linux-2.6.32.16/drivers/usb/misc/appledisplay.c 2010-07-05 14:14:00.000000000 -0400 28510--- linux-2.6.32.18/drivers/usb/misc/appledisplay.c 2010-08-10 13:45:57.000000000 -0400
28467+++ linux-2.6.32.16/drivers/usb/misc/appledisplay.c 2010-07-09 14:50:37.000000000 -0400 28511+++ linux-2.6.32.18/drivers/usb/misc/appledisplay.c 2010-08-11 18:57:31.000000000 -0400
28468@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes 28512@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
28469 return pdata->msgdata[1]; 28513 return pdata->msgdata[1];
28470 } 28514 }
@@ -28474,9 +28518,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/misc/appledisplay.c linux-2.6.32.16/drive
28474 .get_brightness = appledisplay_bl_get_brightness, 28518 .get_brightness = appledisplay_bl_get_brightness,
28475 .update_status = appledisplay_bl_update_status, 28519 .update_status = appledisplay_bl_update_status,
28476 }; 28520 };
28477diff -urNp linux-2.6.32.16/drivers/usb/mon/mon_main.c linux-2.6.32.16/drivers/usb/mon/mon_main.c 28521diff -urNp linux-2.6.32.18/drivers/usb/mon/mon_main.c linux-2.6.32.18/drivers/usb/mon/mon_main.c
28478--- linux-2.6.32.16/drivers/usb/mon/mon_main.c 2010-07-05 14:14:00.000000000 -0400 28522--- linux-2.6.32.18/drivers/usb/mon/mon_main.c 2010-08-10 13:45:57.000000000 -0400
28479+++ linux-2.6.32.16/drivers/usb/mon/mon_main.c 2010-07-09 14:50:37.000000000 -0400 28523+++ linux-2.6.32.18/drivers/usb/mon/mon_main.c 2010-08-11 18:57:31.000000000 -0400
28480@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { 28524@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
28481 /* 28525 /*
28482 * Ops 28526 * Ops
@@ -28486,9 +28530,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/mon/mon_main.c linux-2.6.32.16/drivers/us
28486 .urb_submit = mon_submit, 28530 .urb_submit = mon_submit,
28487 .urb_submit_error = mon_submit_error, 28531 .urb_submit_error = mon_submit_error,
28488 .urb_complete = mon_complete, 28532 .urb_complete = mon_complete,
28489diff -urNp linux-2.6.32.16/drivers/usb/storage/debug.h linux-2.6.32.16/drivers/usb/storage/debug.h 28533diff -urNp linux-2.6.32.18/drivers/usb/storage/debug.h linux-2.6.32.18/drivers/usb/storage/debug.h
28490--- linux-2.6.32.16/drivers/usb/storage/debug.h 2010-07-05 14:14:00.000000000 -0400 28534--- linux-2.6.32.18/drivers/usb/storage/debug.h 2010-08-10 13:45:57.000000000 -0400
28491+++ linux-2.6.32.16/drivers/usb/storage/debug.h 2010-07-09 14:50:37.000000000 -0400 28535+++ linux-2.6.32.18/drivers/usb/storage/debug.h 2010-08-11 18:57:31.000000000 -0400
28492@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char 28536@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
28493 #define US_DEBUGPX(x...) printk( x ) 28537 #define US_DEBUGPX(x...) printk( x )
28494 #define US_DEBUG(x) x 28538 #define US_DEBUG(x) x
@@ -28502,9 +28546,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/storage/debug.h linux-2.6.32.16/drivers/u
28502 #endif 28546 #endif
28503 28547
28504 #endif 28548 #endif
28505diff -urNp linux-2.6.32.16/drivers/usb/storage/usb.c linux-2.6.32.16/drivers/usb/storage/usb.c 28549diff -urNp linux-2.6.32.18/drivers/usb/storage/usb.c linux-2.6.32.18/drivers/usb/storage/usb.c
28506--- linux-2.6.32.16/drivers/usb/storage/usb.c 2010-07-05 14:14:00.000000000 -0400 28550--- linux-2.6.32.18/drivers/usb/storage/usb.c 2010-08-10 13:45:57.000000000 -0400
28507+++ linux-2.6.32.16/drivers/usb/storage/usb.c 2010-07-09 14:50:37.000000000 -0400 28551+++ linux-2.6.32.18/drivers/usb/storage/usb.c 2010-08-11 18:57:31.000000000 -0400
28508@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l 28552@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
28509 28553
28510 static struct us_unusual_dev us_unusual_dev_list[] = { 28554 static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -28514,9 +28558,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/storage/usb.c linux-2.6.32.16/drivers/usb
28514 }; 28558 };
28515 28559
28516 #undef UNUSUAL_DEV 28560 #undef UNUSUAL_DEV
28517diff -urNp linux-2.6.32.16/drivers/usb/storage/usual-tables.c linux-2.6.32.16/drivers/usb/storage/usual-tables.c 28561diff -urNp linux-2.6.32.18/drivers/usb/storage/usual-tables.c linux-2.6.32.18/drivers/usb/storage/usual-tables.c
28518--- linux-2.6.32.16/drivers/usb/storage/usual-tables.c 2010-07-05 14:14:00.000000000 -0400 28562--- linux-2.6.32.18/drivers/usb/storage/usual-tables.c 2010-08-10 13:45:57.000000000 -0400
28519+++ linux-2.6.32.16/drivers/usb/storage/usual-tables.c 2010-07-09 14:50:37.000000000 -0400 28563+++ linux-2.6.32.18/drivers/usb/storage/usual-tables.c 2010-08-11 18:57:31.000000000 -0400
28520@@ -48,7 +48,7 @@ 28564@@ -48,7 +48,7 @@
28521 28565
28522 struct usb_device_id usb_storage_usb_ids[] = { 28566 struct usb_device_id usb_storage_usb_ids[] = {
@@ -28526,9 +28570,9 @@ diff -urNp linux-2.6.32.16/drivers/usb/storage/usual-tables.c linux-2.6.32.16/dr
28526 }; 28570 };
28527 EXPORT_SYMBOL_GPL(usb_storage_usb_ids); 28571 EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
28528 28572
28529diff -urNp linux-2.6.32.16/drivers/uwb/wlp/messages.c linux-2.6.32.16/drivers/uwb/wlp/messages.c 28573diff -urNp linux-2.6.32.18/drivers/uwb/wlp/messages.c linux-2.6.32.18/drivers/uwb/wlp/messages.c
28530--- linux-2.6.32.16/drivers/uwb/wlp/messages.c 2010-07-05 14:14:00.000000000 -0400 28574--- linux-2.6.32.18/drivers/uwb/wlp/messages.c 2010-08-10 13:45:57.000000000 -0400
28531+++ linux-2.6.32.16/drivers/uwb/wlp/messages.c 2010-07-09 14:50:37.000000000 -0400 28575+++ linux-2.6.32.18/drivers/uwb/wlp/messages.c 2010-08-11 18:57:31.000000000 -0400
28532@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct 28576@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
28533 size_t len = skb->len; 28577 size_t len = skb->len;
28534 size_t used; 28578 size_t used;
@@ -28538,9 +28582,9 @@ diff -urNp linux-2.6.32.16/drivers/uwb/wlp/messages.c linux-2.6.32.16/drivers/uw
28538 enum wlp_assc_error assc_err; 28582 enum wlp_assc_error assc_err;
28539 char enonce_buf[WLP_WSS_NONCE_STRSIZE]; 28583 char enonce_buf[WLP_WSS_NONCE_STRSIZE];
28540 char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; 28584 char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
28541diff -urNp linux-2.6.32.16/drivers/uwb/wlp/sysfs.c linux-2.6.32.16/drivers/uwb/wlp/sysfs.c 28585diff -urNp linux-2.6.32.18/drivers/uwb/wlp/sysfs.c linux-2.6.32.18/drivers/uwb/wlp/sysfs.c
28542--- linux-2.6.32.16/drivers/uwb/wlp/sysfs.c 2010-07-05 14:14:00.000000000 -0400 28586--- linux-2.6.32.18/drivers/uwb/wlp/sysfs.c 2010-08-10 13:45:57.000000000 -0400
28543+++ linux-2.6.32.16/drivers/uwb/wlp/sysfs.c 2010-07-09 14:50:37.000000000 -0400 28587+++ linux-2.6.32.18/drivers/uwb/wlp/sysfs.c 2010-08-11 18:57:31.000000000 -0400
28544@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec 28588@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
28545 return ret; 28589 return ret;
28546 } 28590 }
@@ -28551,9 +28595,9 @@ diff -urNp linux-2.6.32.16/drivers/uwb/wlp/sysfs.c linux-2.6.32.16/drivers/uwb/w
28551 .show = wlp_wss_attr_show, 28595 .show = wlp_wss_attr_show,
28552 .store = wlp_wss_attr_store, 28596 .store = wlp_wss_attr_store,
28553 }; 28597 };
28554diff -urNp linux-2.6.32.16/drivers/video/atmel_lcdfb.c linux-2.6.32.16/drivers/video/atmel_lcdfb.c 28598diff -urNp linux-2.6.32.18/drivers/video/atmel_lcdfb.c linux-2.6.32.18/drivers/video/atmel_lcdfb.c
28555--- linux-2.6.32.16/drivers/video/atmel_lcdfb.c 2010-07-05 14:14:00.000000000 -0400 28599--- linux-2.6.32.18/drivers/video/atmel_lcdfb.c 2010-08-10 13:45:57.000000000 -0400
28556+++ linux-2.6.32.16/drivers/video/atmel_lcdfb.c 2010-07-09 14:50:37.000000000 -0400 28600+++ linux-2.6.32.18/drivers/video/atmel_lcdfb.c 2010-08-11 18:57:31.000000000 -0400
28557@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc 28601@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
28558 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); 28602 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
28559 } 28603 }
@@ -28563,9 +28607,9 @@ diff -urNp linux-2.6.32.16/drivers/video/atmel_lcdfb.c linux-2.6.32.16/drivers/v
28563 .update_status = atmel_bl_update_status, 28607 .update_status = atmel_bl_update_status,
28564 .get_brightness = atmel_bl_get_brightness, 28608 .get_brightness = atmel_bl_get_brightness,
28565 }; 28609 };
28566diff -urNp linux-2.6.32.16/drivers/video/aty/aty128fb.c linux-2.6.32.16/drivers/video/aty/aty128fb.c 28610diff -urNp linux-2.6.32.18/drivers/video/aty/aty128fb.c linux-2.6.32.18/drivers/video/aty/aty128fb.c
28567--- linux-2.6.32.16/drivers/video/aty/aty128fb.c 2010-07-05 14:14:00.000000000 -0400 28611--- linux-2.6.32.18/drivers/video/aty/aty128fb.c 2010-08-10 13:45:57.000000000 -0400
28568+++ linux-2.6.32.16/drivers/video/aty/aty128fb.c 2010-07-09 14:50:37.000000000 -0400 28612+++ linux-2.6.32.18/drivers/video/aty/aty128fb.c 2010-08-11 18:57:31.000000000 -0400
28569@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru 28613@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
28570 return bd->props.brightness; 28614 return bd->props.brightness;
28571 } 28615 }
@@ -28575,9 +28619,9 @@ diff -urNp linux-2.6.32.16/drivers/video/aty/aty128fb.c linux-2.6.32.16/drivers/
28575 .get_brightness = aty128_bl_get_brightness, 28619 .get_brightness = aty128_bl_get_brightness,
28576 .update_status = aty128_bl_update_status, 28620 .update_status = aty128_bl_update_status,
28577 }; 28621 };
28578diff -urNp linux-2.6.32.16/drivers/video/aty/atyfb_base.c linux-2.6.32.16/drivers/video/aty/atyfb_base.c 28622diff -urNp linux-2.6.32.18/drivers/video/aty/atyfb_base.c linux-2.6.32.18/drivers/video/aty/atyfb_base.c
28579--- linux-2.6.32.16/drivers/video/aty/atyfb_base.c 2010-07-05 14:14:00.000000000 -0400 28623--- linux-2.6.32.18/drivers/video/aty/atyfb_base.c 2010-08-10 13:45:57.000000000 -0400
28580+++ linux-2.6.32.16/drivers/video/aty/atyfb_base.c 2010-07-09 14:50:37.000000000 -0400 28624+++ linux-2.6.32.18/drivers/video/aty/atyfb_base.c 2010-08-11 18:57:31.000000000 -0400
28581@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct 28625@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
28582 return bd->props.brightness; 28626 return bd->props.brightness;
28583 } 28627 }
@@ -28587,9 +28631,9 @@ diff -urNp linux-2.6.32.16/drivers/video/aty/atyfb_base.c linux-2.6.32.16/driver
28587 .get_brightness = aty_bl_get_brightness, 28631 .get_brightness = aty_bl_get_brightness,
28588 .update_status = aty_bl_update_status, 28632 .update_status = aty_bl_update_status,
28589 }; 28633 };
28590diff -urNp linux-2.6.32.16/drivers/video/aty/radeon_backlight.c linux-2.6.32.16/drivers/video/aty/radeon_backlight.c 28634diff -urNp linux-2.6.32.18/drivers/video/aty/radeon_backlight.c linux-2.6.32.18/drivers/video/aty/radeon_backlight.c
28591--- linux-2.6.32.16/drivers/video/aty/radeon_backlight.c 2010-07-05 14:14:00.000000000 -0400 28635--- linux-2.6.32.18/drivers/video/aty/radeon_backlight.c 2010-08-10 13:45:57.000000000 -0400
28592+++ linux-2.6.32.16/drivers/video/aty/radeon_backlight.c 2010-07-09 14:50:37.000000000 -0400 28636+++ linux-2.6.32.18/drivers/video/aty/radeon_backlight.c 2010-08-11 18:57:31.000000000 -0400
28593@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru 28637@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
28594 return bd->props.brightness; 28638 return bd->props.brightness;
28595 } 28639 }
@@ -28599,9 +28643,9 @@ diff -urNp linux-2.6.32.16/drivers/video/aty/radeon_backlight.c linux-2.6.32.16/
28599 .get_brightness = radeon_bl_get_brightness, 28643 .get_brightness = radeon_bl_get_brightness,
28600 .update_status = radeon_bl_update_status, 28644 .update_status = radeon_bl_update_status,
28601 }; 28645 };
28602diff -urNp linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c 28646diff -urNp linux-2.6.32.18/drivers/video/backlight/adp5520_bl.c linux-2.6.32.18/drivers/video/backlight/adp5520_bl.c
28603--- linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c 2010-07-05 14:14:00.000000000 -0400 28647--- linux-2.6.32.18/drivers/video/backlight/adp5520_bl.c 2010-08-10 13:45:57.000000000 -0400
28604+++ linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c 2010-07-09 14:50:37.000000000 -0400 28648+++ linux-2.6.32.18/drivers/video/backlight/adp5520_bl.c 2010-08-11 18:57:31.000000000 -0400
28605@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str 28649@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
28606 return error ? data->current_brightness : reg_val; 28650 return error ? data->current_brightness : reg_val;
28607 } 28651 }
@@ -28611,9 +28655,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/adp5520_bl.c linux-2.6.32.16/
28611 .update_status = adp5520_bl_update_status, 28655 .update_status = adp5520_bl_update_status,
28612 .get_brightness = adp5520_bl_get_brightness, 28656 .get_brightness = adp5520_bl_get_brightness,
28613 }; 28657 };
28614diff -urNp linux-2.6.32.16/drivers/video/backlight/adx_bl.c linux-2.6.32.16/drivers/video/backlight/adx_bl.c 28658diff -urNp linux-2.6.32.18/drivers/video/backlight/adx_bl.c linux-2.6.32.18/drivers/video/backlight/adx_bl.c
28615--- linux-2.6.32.16/drivers/video/backlight/adx_bl.c 2010-07-05 14:14:00.000000000 -0400 28659--- linux-2.6.32.18/drivers/video/backlight/adx_bl.c 2010-08-10 13:45:57.000000000 -0400
28616+++ linux-2.6.32.16/drivers/video/backlight/adx_bl.c 2010-07-09 14:50:37.000000000 -0400 28660+++ linux-2.6.32.18/drivers/video/backlight/adx_bl.c 2010-08-11 18:57:31.000000000 -0400
28617@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct 28661@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
28618 return 1; 28662 return 1;
28619 } 28663 }
@@ -28623,9 +28667,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/adx_bl.c linux-2.6.32.16/driv
28623 .options = 0, 28667 .options = 0,
28624 .update_status = adx_backlight_update_status, 28668 .update_status = adx_backlight_update_status,
28625 .get_brightness = adx_backlight_get_brightness, 28669 .get_brightness = adx_backlight_get_brightness,
28626diff -urNp linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c 28670diff -urNp linux-2.6.32.18/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.18/drivers/video/backlight/atmel-pwm-bl.c
28627--- linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c 2010-07-05 14:14:00.000000000 -0400 28671--- linux-2.6.32.18/drivers/video/backlight/atmel-pwm-bl.c 2010-08-10 13:45:57.000000000 -0400
28628+++ linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c 2010-07-09 14:50:37.000000000 -0400 28672+++ linux-2.6.32.18/drivers/video/backlight/atmel-pwm-bl.c 2010-08-11 18:57:31.000000000 -0400
28629@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct 28673@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
28630 return pwm_channel_enable(&pwmbl->pwmc); 28674 return pwm_channel_enable(&pwmbl->pwmc);
28631 } 28675 }
@@ -28635,9 +28679,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.1
28635 .get_brightness = atmel_pwm_bl_get_intensity, 28679 .get_brightness = atmel_pwm_bl_get_intensity,
28636 .update_status = atmel_pwm_bl_set_intensity, 28680 .update_status = atmel_pwm_bl_set_intensity,
28637 }; 28681 };
28638diff -urNp linux-2.6.32.16/drivers/video/backlight/backlight.c linux-2.6.32.16/drivers/video/backlight/backlight.c 28682diff -urNp linux-2.6.32.18/drivers/video/backlight/backlight.c linux-2.6.32.18/drivers/video/backlight/backlight.c
28639--- linux-2.6.32.16/drivers/video/backlight/backlight.c 2010-07-05 14:14:00.000000000 -0400 28683--- linux-2.6.32.18/drivers/video/backlight/backlight.c 2010-08-10 13:45:57.000000000 -0400
28640+++ linux-2.6.32.16/drivers/video/backlight/backlight.c 2010-07-09 14:50:37.000000000 -0400 28684+++ linux-2.6.32.18/drivers/video/backlight/backlight.c 2010-08-11 18:57:31.000000000 -0400
28641@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); 28685@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
28642 * ERR_PTR() or a pointer to the newly allocated device. 28686 * ERR_PTR() or a pointer to the newly allocated device.
28643 */ 28687 */
@@ -28647,9 +28691,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/backlight.c linux-2.6.32.16/d
28647 { 28691 {
28648 struct backlight_device *new_bd; 28692 struct backlight_device *new_bd;
28649 int rc; 28693 int rc;
28650diff -urNp linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c 28694diff -urNp linux-2.6.32.18/drivers/video/backlight/corgi_lcd.c linux-2.6.32.18/drivers/video/backlight/corgi_lcd.c
28651--- linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c 2010-07-05 14:14:00.000000000 -0400 28695--- linux-2.6.32.18/drivers/video/backlight/corgi_lcd.c 2010-08-10 13:45:57.000000000 -0400
28652+++ linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c 2010-07-09 14:50:37.000000000 -0400 28696+++ linux-2.6.32.18/drivers/video/backlight/corgi_lcd.c 2010-08-11 18:57:31.000000000 -0400
28653@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit 28697@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
28654 } 28698 }
28655 EXPORT_SYMBOL(corgi_lcd_limit_intensity); 28699 EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -28659,9 +28703,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/corgi_lcd.c linux-2.6.32.16/d
28659 .get_brightness = corgi_bl_get_intensity, 28703 .get_brightness = corgi_bl_get_intensity,
28660 .update_status = corgi_bl_update_status, 28704 .update_status = corgi_bl_update_status,
28661 }; 28705 };
28662diff -urNp linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c 28706diff -urNp linux-2.6.32.18/drivers/video/backlight/cr_bllcd.c linux-2.6.32.18/drivers/video/backlight/cr_bllcd.c
28663--- linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c 2010-07-05 14:14:00.000000000 -0400 28707--- linux-2.6.32.18/drivers/video/backlight/cr_bllcd.c 2010-08-10 13:45:57.000000000 -0400
28664+++ linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c 2010-07-09 14:50:37.000000000 -0400 28708+++ linux-2.6.32.18/drivers/video/backlight/cr_bllcd.c 2010-08-11 18:57:31.000000000 -0400
28665@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st 28709@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
28666 return intensity; 28710 return intensity;
28667 } 28711 }
@@ -28671,9 +28715,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/cr_bllcd.c linux-2.6.32.16/dr
28671 .get_brightness = cr_backlight_get_intensity, 28715 .get_brightness = cr_backlight_get_intensity,
28672 .update_status = cr_backlight_set_intensity, 28716 .update_status = cr_backlight_set_intensity,
28673 }; 28717 };
28674diff -urNp linux-2.6.32.16/drivers/video/backlight/da903x_bl.c linux-2.6.32.16/drivers/video/backlight/da903x_bl.c 28718diff -urNp linux-2.6.32.18/drivers/video/backlight/da903x_bl.c linux-2.6.32.18/drivers/video/backlight/da903x_bl.c
28675--- linux-2.6.32.16/drivers/video/backlight/da903x_bl.c 2010-07-05 14:14:00.000000000 -0400 28719--- linux-2.6.32.18/drivers/video/backlight/da903x_bl.c 2010-08-10 13:45:57.000000000 -0400
28676+++ linux-2.6.32.16/drivers/video/backlight/da903x_bl.c 2010-07-09 14:50:37.000000000 -0400 28720+++ linux-2.6.32.18/drivers/video/backlight/da903x_bl.c 2010-08-11 18:57:31.000000000 -0400
28677@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne 28721@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
28678 return data->current_brightness; 28722 return data->current_brightness;
28679 } 28723 }
@@ -28683,9 +28727,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/da903x_bl.c linux-2.6.32.16/d
28683 .update_status = da903x_backlight_update_status, 28727 .update_status = da903x_backlight_update_status,
28684 .get_brightness = da903x_backlight_get_brightness, 28728 .get_brightness = da903x_backlight_get_brightness,
28685 }; 28729 };
28686diff -urNp linux-2.6.32.16/drivers/video/backlight/generic_bl.c linux-2.6.32.16/drivers/video/backlight/generic_bl.c 28730diff -urNp linux-2.6.32.18/drivers/video/backlight/generic_bl.c linux-2.6.32.18/drivers/video/backlight/generic_bl.c
28687--- linux-2.6.32.16/drivers/video/backlight/generic_bl.c 2010-07-05 14:14:00.000000000 -0400 28731--- linux-2.6.32.18/drivers/video/backlight/generic_bl.c 2010-08-10 13:45:57.000000000 -0400
28688+++ linux-2.6.32.16/drivers/video/backlight/generic_bl.c 2010-07-09 14:50:37.000000000 -0400 28732+++ linux-2.6.32.18/drivers/video/backlight/generic_bl.c 2010-08-11 18:57:31.000000000 -0400
28689@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) 28733@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
28690 } 28734 }
28691 EXPORT_SYMBOL(corgibl_limit_intensity); 28735 EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -28695,9 +28739,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/generic_bl.c linux-2.6.32.16/
28695 .options = BL_CORE_SUSPENDRESUME, 28739 .options = BL_CORE_SUSPENDRESUME,
28696 .get_brightness = genericbl_get_intensity, 28740 .get_brightness = genericbl_get_intensity,
28697 .update_status = genericbl_send_intensity, 28741 .update_status = genericbl_send_intensity,
28698diff -urNp linux-2.6.32.16/drivers/video/backlight/hp680_bl.c linux-2.6.32.16/drivers/video/backlight/hp680_bl.c 28742diff -urNp linux-2.6.32.18/drivers/video/backlight/hp680_bl.c linux-2.6.32.18/drivers/video/backlight/hp680_bl.c
28699--- linux-2.6.32.16/drivers/video/backlight/hp680_bl.c 2010-07-05 14:14:00.000000000 -0400 28743--- linux-2.6.32.18/drivers/video/backlight/hp680_bl.c 2010-08-10 13:45:57.000000000 -0400
28700+++ linux-2.6.32.16/drivers/video/backlight/hp680_bl.c 2010-07-09 14:50:37.000000000 -0400 28744+++ linux-2.6.32.18/drivers/video/backlight/hp680_bl.c 2010-08-11 18:57:31.000000000 -0400
28701@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct 28745@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
28702 return current_intensity; 28746 return current_intensity;
28703 } 28747 }
@@ -28707,9 +28751,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/hp680_bl.c linux-2.6.32.16/dr
28707 .get_brightness = hp680bl_get_intensity, 28751 .get_brightness = hp680bl_get_intensity,
28708 .update_status = hp680bl_set_intensity, 28752 .update_status = hp680bl_set_intensity,
28709 }; 28753 };
28710diff -urNp linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c 28754diff -urNp linux-2.6.32.18/drivers/video/backlight/jornada720_bl.c linux-2.6.32.18/drivers/video/backlight/jornada720_bl.c
28711--- linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c 2010-07-05 14:14:00.000000000 -0400 28755--- linux-2.6.32.18/drivers/video/backlight/jornada720_bl.c 2010-08-10 13:45:57.000000000 -0400
28712+++ linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c 2010-07-09 14:50:37.000000000 -0400 28756+++ linux-2.6.32.18/drivers/video/backlight/jornada720_bl.c 2010-08-11 18:57:31.000000000 -0400
28713@@ -93,7 +93,7 @@ out: 28757@@ -93,7 +93,7 @@ out:
28714 return ret; 28758 return ret;
28715 } 28759 }
@@ -28719,9 +28763,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/jornada720_bl.c linux-2.6.32.
28719 .get_brightness = jornada_bl_get_brightness, 28763 .get_brightness = jornada_bl_get_brightness,
28720 .update_status = jornada_bl_update_status, 28764 .update_status = jornada_bl_update_status,
28721 .options = BL_CORE_SUSPENDRESUME, 28765 .options = BL_CORE_SUSPENDRESUME,
28722diff -urNp linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c 28766diff -urNp linux-2.6.32.18/drivers/video/backlight/kb3886_bl.c linux-2.6.32.18/drivers/video/backlight/kb3886_bl.c
28723--- linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c 2010-07-05 14:14:00.000000000 -0400 28767--- linux-2.6.32.18/drivers/video/backlight/kb3886_bl.c 2010-08-10 13:45:57.000000000 -0400
28724+++ linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c 2010-07-09 14:50:37.000000000 -0400 28768+++ linux-2.6.32.18/drivers/video/backlight/kb3886_bl.c 2010-08-11 18:57:31.000000000 -0400
28725@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct 28769@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
28726 return kb3886bl_intensity; 28770 return kb3886bl_intensity;
28727 } 28771 }
@@ -28731,9 +28775,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/kb3886_bl.c linux-2.6.32.16/d
28731 .get_brightness = kb3886bl_get_intensity, 28775 .get_brightness = kb3886bl_get_intensity,
28732 .update_status = kb3886bl_send_intensity, 28776 .update_status = kb3886bl_send_intensity,
28733 }; 28777 };
28734diff -urNp linux-2.6.32.16/drivers/video/backlight/locomolcd.c linux-2.6.32.16/drivers/video/backlight/locomolcd.c 28778diff -urNp linux-2.6.32.18/drivers/video/backlight/locomolcd.c linux-2.6.32.18/drivers/video/backlight/locomolcd.c
28735--- linux-2.6.32.16/drivers/video/backlight/locomolcd.c 2010-07-05 14:14:00.000000000 -0400 28779--- linux-2.6.32.18/drivers/video/backlight/locomolcd.c 2010-08-10 13:45:57.000000000 -0400
28736+++ linux-2.6.32.16/drivers/video/backlight/locomolcd.c 2010-07-09 14:50:37.000000000 -0400 28780+++ linux-2.6.32.18/drivers/video/backlight/locomolcd.c 2010-08-11 18:57:31.000000000 -0400
28737@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc 28781@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
28738 return current_intensity; 28782 return current_intensity;
28739 } 28783 }
@@ -28743,9 +28787,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/locomolcd.c linux-2.6.32.16/d
28743 .get_brightness = locomolcd_get_intensity, 28787 .get_brightness = locomolcd_get_intensity,
28744 .update_status = locomolcd_set_intensity, 28788 .update_status = locomolcd_set_intensity,
28745 }; 28789 };
28746diff -urNp linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c 28790diff -urNp linux-2.6.32.18/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.18/drivers/video/backlight/mbp_nvidia_bl.c
28747--- linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c 2010-07-05 14:14:00.000000000 -0400 28791--- linux-2.6.32.18/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-10 13:45:57.000000000 -0400
28748+++ linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c 2010-07-09 14:50:37.000000000 -0400 28792+++ linux-2.6.32.18/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-11 18:57:31.000000000 -0400
28749@@ -33,7 +33,7 @@ struct dmi_match_data { 28793@@ -33,7 +33,7 @@ struct dmi_match_data {
28750 unsigned long iostart; 28794 unsigned long iostart;
28751 unsigned long iolen; 28795 unsigned long iolen;
@@ -28755,9 +28799,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
28755 }; 28799 };
28756 28800
28757 /* Module parameters. */ 28801 /* Module parameters. */
28758diff -urNp linux-2.6.32.16/drivers/video/backlight/omap1_bl.c linux-2.6.32.16/drivers/video/backlight/omap1_bl.c 28802diff -urNp linux-2.6.32.18/drivers/video/backlight/omap1_bl.c linux-2.6.32.18/drivers/video/backlight/omap1_bl.c
28759--- linux-2.6.32.16/drivers/video/backlight/omap1_bl.c 2010-07-05 14:14:00.000000000 -0400 28803--- linux-2.6.32.18/drivers/video/backlight/omap1_bl.c 2010-08-10 13:45:57.000000000 -0400
28760+++ linux-2.6.32.16/drivers/video/backlight/omap1_bl.c 2010-07-09 14:50:37.000000000 -0400 28804+++ linux-2.6.32.18/drivers/video/backlight/omap1_bl.c 2010-08-11 18:57:31.000000000 -0400
28761@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b 28805@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
28762 return bl->current_intensity; 28806 return bl->current_intensity;
28763 } 28807 }
@@ -28767,9 +28811,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/omap1_bl.c linux-2.6.32.16/dr
28767 .get_brightness = omapbl_get_intensity, 28811 .get_brightness = omapbl_get_intensity,
28768 .update_status = omapbl_update_status, 28812 .update_status = omapbl_update_status,
28769 }; 28813 };
28770diff -urNp linux-2.6.32.16/drivers/video/backlight/progear_bl.c linux-2.6.32.16/drivers/video/backlight/progear_bl.c 28814diff -urNp linux-2.6.32.18/drivers/video/backlight/progear_bl.c linux-2.6.32.18/drivers/video/backlight/progear_bl.c
28771--- linux-2.6.32.16/drivers/video/backlight/progear_bl.c 2010-07-05 14:14:00.000000000 -0400 28815--- linux-2.6.32.18/drivers/video/backlight/progear_bl.c 2010-08-10 13:45:57.000000000 -0400
28772+++ linux-2.6.32.16/drivers/video/backlight/progear_bl.c 2010-07-09 14:50:37.000000000 -0400 28816+++ linux-2.6.32.18/drivers/video/backlight/progear_bl.c 2010-08-11 18:57:31.000000000 -0400
28773@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc 28817@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
28774 return intensity - HW_LEVEL_MIN; 28818 return intensity - HW_LEVEL_MIN;
28775 } 28819 }
@@ -28779,9 +28823,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/progear_bl.c linux-2.6.32.16/
28779 .get_brightness = progearbl_get_intensity, 28823 .get_brightness = progearbl_get_intensity,
28780 .update_status = progearbl_set_intensity, 28824 .update_status = progearbl_set_intensity,
28781 }; 28825 };
28782diff -urNp linux-2.6.32.16/drivers/video/backlight/pwm_bl.c linux-2.6.32.16/drivers/video/backlight/pwm_bl.c 28826diff -urNp linux-2.6.32.18/drivers/video/backlight/pwm_bl.c linux-2.6.32.18/drivers/video/backlight/pwm_bl.c
28783--- linux-2.6.32.16/drivers/video/backlight/pwm_bl.c 2010-07-05 14:14:00.000000000 -0400 28827--- linux-2.6.32.18/drivers/video/backlight/pwm_bl.c 2010-08-10 13:45:57.000000000 -0400
28784+++ linux-2.6.32.16/drivers/video/backlight/pwm_bl.c 2010-07-09 14:50:37.000000000 -0400 28828+++ linux-2.6.32.18/drivers/video/backlight/pwm_bl.c 2010-08-11 18:57:31.000000000 -0400
28785@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( 28829@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
28786 return bl->props.brightness; 28830 return bl->props.brightness;
28787 } 28831 }
@@ -28791,9 +28835,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/pwm_bl.c linux-2.6.32.16/driv
28791 .update_status = pwm_backlight_update_status, 28835 .update_status = pwm_backlight_update_status,
28792 .get_brightness = pwm_backlight_get_brightness, 28836 .get_brightness = pwm_backlight_get_brightness,
28793 }; 28837 };
28794diff -urNp linux-2.6.32.16/drivers/video/backlight/tosa_bl.c linux-2.6.32.16/drivers/video/backlight/tosa_bl.c 28838diff -urNp linux-2.6.32.18/drivers/video/backlight/tosa_bl.c linux-2.6.32.18/drivers/video/backlight/tosa_bl.c
28795--- linux-2.6.32.16/drivers/video/backlight/tosa_bl.c 2010-07-05 14:14:00.000000000 -0400 28839--- linux-2.6.32.18/drivers/video/backlight/tosa_bl.c 2010-08-10 13:45:57.000000000 -0400
28796+++ linux-2.6.32.16/drivers/video/backlight/tosa_bl.c 2010-07-09 14:50:37.000000000 -0400 28840+++ linux-2.6.32.18/drivers/video/backlight/tosa_bl.c 2010-08-11 18:57:31.000000000 -0400
28797@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct 28841@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
28798 return props->brightness; 28842 return props->brightness;
28799 } 28843 }
@@ -28803,9 +28847,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/tosa_bl.c linux-2.6.32.16/dri
28803 .get_brightness = tosa_bl_get_brightness, 28847 .get_brightness = tosa_bl_get_brightness,
28804 .update_status = tosa_bl_update_status, 28848 .update_status = tosa_bl_update_status,
28805 }; 28849 };
28806diff -urNp linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c 28850diff -urNp linux-2.6.32.18/drivers/video/backlight/wm831x_bl.c linux-2.6.32.18/drivers/video/backlight/wm831x_bl.c
28807--- linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c 2010-07-05 14:14:00.000000000 -0400 28851--- linux-2.6.32.18/drivers/video/backlight/wm831x_bl.c 2010-08-10 13:45:57.000000000 -0400
28808+++ linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c 2010-07-09 14:50:37.000000000 -0400 28852+++ linux-2.6.32.18/drivers/video/backlight/wm831x_bl.c 2010-08-11 18:57:31.000000000 -0400
28809@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne 28853@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
28810 return data->current_brightness; 28854 return data->current_brightness;
28811 } 28855 }
@@ -28815,9 +28859,9 @@ diff -urNp linux-2.6.32.16/drivers/video/backlight/wm831x_bl.c linux-2.6.32.16/d
28815 .options = BL_CORE_SUSPENDRESUME, 28859 .options = BL_CORE_SUSPENDRESUME,
28816 .update_status = wm831x_backlight_update_status, 28860 .update_status = wm831x_backlight_update_status,
28817 .get_brightness = wm831x_backlight_get_brightness, 28861 .get_brightness = wm831x_backlight_get_brightness,
28818diff -urNp linux-2.6.32.16/drivers/video/bf54x-lq043fb.c linux-2.6.32.16/drivers/video/bf54x-lq043fb.c 28862diff -urNp linux-2.6.32.18/drivers/video/bf54x-lq043fb.c linux-2.6.32.18/drivers/video/bf54x-lq043fb.c
28819--- linux-2.6.32.16/drivers/video/bf54x-lq043fb.c 2010-07-05 14:14:00.000000000 -0400 28863--- linux-2.6.32.18/drivers/video/bf54x-lq043fb.c 2010-08-10 13:45:57.000000000 -0400
28820+++ linux-2.6.32.16/drivers/video/bf54x-lq043fb.c 2010-07-09 14:50:37.000000000 -0400 28864+++ linux-2.6.32.18/drivers/video/bf54x-lq043fb.c 2010-08-11 18:57:31.000000000 -0400
28821@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back 28865@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
28822 return 0; 28866 return 0;
28823 } 28867 }
@@ -28827,9 +28871,9 @@ diff -urNp linux-2.6.32.16/drivers/video/bf54x-lq043fb.c linux-2.6.32.16/drivers
28827 .get_brightness = bl_get_brightness, 28871 .get_brightness = bl_get_brightness,
28828 }; 28872 };
28829 28873
28830diff -urNp linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c 28874diff -urNp linux-2.6.32.18/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.18/drivers/video/bfin-t350mcqb-fb.c
28831--- linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c 2010-07-05 14:14:00.000000000 -0400 28875--- linux-2.6.32.18/drivers/video/bfin-t350mcqb-fb.c 2010-08-10 13:45:57.000000000 -0400
28832+++ linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c 2010-07-09 14:50:37.000000000 -0400 28876+++ linux-2.6.32.18/drivers/video/bfin-t350mcqb-fb.c 2010-08-11 18:57:31.000000000 -0400
28833@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back 28877@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
28834 return 0; 28878 return 0;
28835 } 28879 }
@@ -28839,9 +28883,9 @@ diff -urNp linux-2.6.32.16/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.16/driv
28839 .get_brightness = bl_get_brightness, 28883 .get_brightness = bl_get_brightness,
28840 }; 28884 };
28841 28885
28842diff -urNp linux-2.6.32.16/drivers/video/fbcmap.c linux-2.6.32.16/drivers/video/fbcmap.c 28886diff -urNp linux-2.6.32.18/drivers/video/fbcmap.c linux-2.6.32.18/drivers/video/fbcmap.c
28843--- linux-2.6.32.16/drivers/video/fbcmap.c 2010-07-05 14:14:00.000000000 -0400 28887--- linux-2.6.32.18/drivers/video/fbcmap.c 2010-08-10 13:45:57.000000000 -0400
28844+++ linux-2.6.32.16/drivers/video/fbcmap.c 2010-07-09 14:50:37.000000000 -0400 28888+++ linux-2.6.32.18/drivers/video/fbcmap.c 2010-08-11 18:57:31.000000000 -0400
28845@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user 28889@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
28846 rc = -ENODEV; 28890 rc = -ENODEV;
28847 goto out; 28891 goto out;
@@ -28852,9 +28896,9 @@ diff -urNp linux-2.6.32.16/drivers/video/fbcmap.c linux-2.6.32.16/drivers/video/
28852 rc = -EINVAL; 28896 rc = -EINVAL;
28853 goto out1; 28897 goto out1;
28854 } 28898 }
28855diff -urNp linux-2.6.32.16/drivers/video/fbmem.c linux-2.6.32.16/drivers/video/fbmem.c 28899diff -urNp linux-2.6.32.18/drivers/video/fbmem.c linux-2.6.32.18/drivers/video/fbmem.c
28856--- linux-2.6.32.16/drivers/video/fbmem.c 2010-07-05 14:14:00.000000000 -0400 28900--- linux-2.6.32.18/drivers/video/fbmem.c 2010-08-10 13:45:57.000000000 -0400
28857+++ linux-2.6.32.16/drivers/video/fbmem.c 2010-07-09 14:50:37.000000000 -0400 28901+++ linux-2.6.32.18/drivers/video/fbmem.c 2010-08-11 18:57:31.000000000 -0400
28858@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in 28902@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
28859 image->dx += image->width + 8; 28903 image->dx += image->width + 8;
28860 } 28904 }
@@ -28882,9 +28926,9 @@ diff -urNp linux-2.6.32.16/drivers/video/fbmem.c linux-2.6.32.16/drivers/video/f
28882 return -EINVAL; 28926 return -EINVAL;
28883 if (!registered_fb[con2fb.framebuffer]) 28927 if (!registered_fb[con2fb.framebuffer])
28884 request_module("fb%d", con2fb.framebuffer); 28928 request_module("fb%d", con2fb.framebuffer);
28885diff -urNp linux-2.6.32.16/drivers/video/fbmon.c linux-2.6.32.16/drivers/video/fbmon.c 28929diff -urNp linux-2.6.32.18/drivers/video/fbmon.c linux-2.6.32.18/drivers/video/fbmon.c
28886--- linux-2.6.32.16/drivers/video/fbmon.c 2010-07-05 14:14:00.000000000 -0400 28930--- linux-2.6.32.18/drivers/video/fbmon.c 2010-08-10 13:45:57.000000000 -0400
28887+++ linux-2.6.32.16/drivers/video/fbmon.c 2010-07-09 14:50:37.000000000 -0400 28931+++ linux-2.6.32.18/drivers/video/fbmon.c 2010-08-11 18:57:31.000000000 -0400
28888@@ -45,7 +45,7 @@ 28932@@ -45,7 +45,7 @@
28889 #ifdef DEBUG 28933 #ifdef DEBUG
28890 #define DPRINTK(fmt, args...) printk(fmt,## args) 28934 #define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -28894,9 +28938,9 @@ diff -urNp linux-2.6.32.16/drivers/video/fbmon.c linux-2.6.32.16/drivers/video/f
28894 #endif 28938 #endif
28895 28939
28896 #define FBMON_FIX_HEADER 1 28940 #define FBMON_FIX_HEADER 1
28897diff -urNp linux-2.6.32.16/drivers/video/i810/i810_accel.c linux-2.6.32.16/drivers/video/i810/i810_accel.c 28941diff -urNp linux-2.6.32.18/drivers/video/i810/i810_accel.c linux-2.6.32.18/drivers/video/i810/i810_accel.c
28898--- linux-2.6.32.16/drivers/video/i810/i810_accel.c 2010-07-05 14:14:00.000000000 -0400 28942--- linux-2.6.32.18/drivers/video/i810/i810_accel.c 2010-08-10 13:45:57.000000000 -0400
28899+++ linux-2.6.32.16/drivers/video/i810/i810_accel.c 2010-07-09 14:50:37.000000000 -0400 28943+++ linux-2.6.32.18/drivers/video/i810/i810_accel.c 2010-08-11 18:57:31.000000000 -0400
28900@@ -73,6 +73,7 @@ static inline int wait_for_space(struct 28944@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
28901 } 28945 }
28902 } 28946 }
@@ -28905,9 +28949,9 @@ diff -urNp linux-2.6.32.16/drivers/video/i810/i810_accel.c linux-2.6.32.16/drive
28905 i810_report_error(mmio); 28949 i810_report_error(mmio);
28906 par->dev_flags |= LOCKUP; 28950 par->dev_flags |= LOCKUP;
28907 info->pixmap.scan_align = 1; 28951 info->pixmap.scan_align = 1;
28908diff -urNp linux-2.6.32.16/drivers/video/i810/i810_main.c linux-2.6.32.16/drivers/video/i810/i810_main.c 28952diff -urNp linux-2.6.32.18/drivers/video/i810/i810_main.c linux-2.6.32.18/drivers/video/i810/i810_main.c
28909--- linux-2.6.32.16/drivers/video/i810/i810_main.c 2010-07-05 14:14:00.000000000 -0400 28953--- linux-2.6.32.18/drivers/video/i810/i810_main.c 2010-08-10 13:45:57.000000000 -0400
28910+++ linux-2.6.32.16/drivers/video/i810/i810_main.c 2010-07-09 14:50:37.000000000 -0400 28954+++ linux-2.6.32.18/drivers/video/i810/i810_main.c 2010-08-11 18:57:31.000000000 -0400
28911@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t 28955@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
28912 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, 28956 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
28913 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, 28957 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -28917,9 +28961,9 @@ diff -urNp linux-2.6.32.16/drivers/video/i810/i810_main.c linux-2.6.32.16/driver
28917 }; 28961 };
28918 28962
28919 static struct pci_driver i810fb_driver = { 28963 static struct pci_driver i810fb_driver = {
28920diff -urNp linux-2.6.32.16/drivers/video/modedb.c linux-2.6.32.16/drivers/video/modedb.c 28964diff -urNp linux-2.6.32.18/drivers/video/modedb.c linux-2.6.32.18/drivers/video/modedb.c
28921--- linux-2.6.32.16/drivers/video/modedb.c 2010-07-05 14:14:00.000000000 -0400 28965--- linux-2.6.32.18/drivers/video/modedb.c 2010-08-10 13:45:57.000000000 -0400
28922+++ linux-2.6.32.16/drivers/video/modedb.c 2010-07-09 14:50:37.000000000 -0400 28966+++ linux-2.6.32.18/drivers/video/modedb.c 2010-08-11 18:57:31.000000000 -0400
28923@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ 28967@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
28924 { 28968 {
28925 /* 640x400 @ 70 Hz, 31.5 kHz hsync */ 28969 /* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -29220,9 +29264,9 @@ diff -urNp linux-2.6.32.16/drivers/video/modedb.c linux-2.6.32.16/drivers/video/
29220 }, 29264 },
29221 }; 29265 };
29222 29266
29223diff -urNp linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c 29267diff -urNp linux-2.6.32.18/drivers/video/nvidia/nv_backlight.c linux-2.6.32.18/drivers/video/nvidia/nv_backlight.c
29224--- linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c 2010-07-05 14:14:00.000000000 -0400 29268--- linux-2.6.32.18/drivers/video/nvidia/nv_backlight.c 2010-08-10 13:45:57.000000000 -0400
29225+++ linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c 2010-07-09 14:50:37.000000000 -0400 29269+++ linux-2.6.32.18/drivers/video/nvidia/nv_backlight.c 2010-08-11 18:57:31.000000000 -0400
29226@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru 29270@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
29227 return bd->props.brightness; 29271 return bd->props.brightness;
29228 } 29272 }
@@ -29232,9 +29276,9 @@ diff -urNp linux-2.6.32.16/drivers/video/nvidia/nv_backlight.c linux-2.6.32.16/d
29232 .get_brightness = nvidia_bl_get_brightness, 29276 .get_brightness = nvidia_bl_get_brightness,
29233 .update_status = nvidia_bl_update_status, 29277 .update_status = nvidia_bl_update_status,
29234 }; 29278 };
29235diff -urNp linux-2.6.32.16/drivers/video/riva/fbdev.c linux-2.6.32.16/drivers/video/riva/fbdev.c 29279diff -urNp linux-2.6.32.18/drivers/video/riva/fbdev.c linux-2.6.32.18/drivers/video/riva/fbdev.c
29236--- linux-2.6.32.16/drivers/video/riva/fbdev.c 2010-07-05 14:14:00.000000000 -0400 29280--- linux-2.6.32.18/drivers/video/riva/fbdev.c 2010-08-10 13:45:57.000000000 -0400
29237+++ linux-2.6.32.16/drivers/video/riva/fbdev.c 2010-07-09 14:50:37.000000000 -0400 29281+++ linux-2.6.32.18/drivers/video/riva/fbdev.c 2010-08-11 18:57:31.000000000 -0400
29238@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct 29282@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
29239 return bd->props.brightness; 29283 return bd->props.brightness;
29240 } 29284 }
@@ -29244,9 +29288,9 @@ diff -urNp linux-2.6.32.16/drivers/video/riva/fbdev.c linux-2.6.32.16/drivers/vi
29244 .get_brightness = riva_bl_get_brightness, 29288 .get_brightness = riva_bl_get_brightness,
29245 .update_status = riva_bl_update_status, 29289 .update_status = riva_bl_update_status,
29246 }; 29290 };
29247diff -urNp linux-2.6.32.16/drivers/video/uvesafb.c linux-2.6.32.16/drivers/video/uvesafb.c 29291diff -urNp linux-2.6.32.18/drivers/video/uvesafb.c linux-2.6.32.18/drivers/video/uvesafb.c
29248--- linux-2.6.32.16/drivers/video/uvesafb.c 2010-07-05 14:14:00.000000000 -0400 29292--- linux-2.6.32.18/drivers/video/uvesafb.c 2010-08-10 13:45:57.000000000 -0400
29249+++ linux-2.6.32.16/drivers/video/uvesafb.c 2010-07-09 14:50:37.000000000 -0400 29293+++ linux-2.6.32.18/drivers/video/uvesafb.c 2010-08-11 18:57:31.000000000 -0400
29250@@ -18,6 +18,7 @@ 29294@@ -18,6 +18,7 @@
29251 #include <linux/fb.h> 29295 #include <linux/fb.h>
29252 #include <linux/io.h> 29296 #include <linux/io.h>
@@ -29322,9 +29366,9 @@ diff -urNp linux-2.6.32.16/drivers/video/uvesafb.c linux-2.6.32.16/drivers/video
29322 } 29366 }
29323 29367
29324 framebuffer_release(info); 29368 framebuffer_release(info);
29325diff -urNp linux-2.6.32.16/drivers/video/vesafb.c linux-2.6.32.16/drivers/video/vesafb.c 29369diff -urNp linux-2.6.32.18/drivers/video/vesafb.c linux-2.6.32.18/drivers/video/vesafb.c
29326--- linux-2.6.32.16/drivers/video/vesafb.c 2010-07-05 14:14:00.000000000 -0400 29370--- linux-2.6.32.18/drivers/video/vesafb.c 2010-08-10 13:45:57.000000000 -0400
29327+++ linux-2.6.32.16/drivers/video/vesafb.c 2010-07-09 14:50:37.000000000 -0400 29371+++ linux-2.6.32.18/drivers/video/vesafb.c 2010-08-11 18:57:31.000000000 -0400
29328@@ -9,6 +9,7 @@ 29372@@ -9,6 +9,7 @@
29329 */ 29373 */
29330 29374
@@ -29428,9 +29472,9 @@ diff -urNp linux-2.6.32.16/drivers/video/vesafb.c linux-2.6.32.16/drivers/video/
29428 if (info->screen_base) 29472 if (info->screen_base)
29429 iounmap(info->screen_base); 29473 iounmap(info->screen_base);
29430 framebuffer_release(info); 29474 framebuffer_release(info);
29431diff -urNp linux-2.6.32.16/drivers/xen/sys-hypervisor.c linux-2.6.32.16/drivers/xen/sys-hypervisor.c 29475diff -urNp linux-2.6.32.18/drivers/xen/sys-hypervisor.c linux-2.6.32.18/drivers/xen/sys-hypervisor.c
29432--- linux-2.6.32.16/drivers/xen/sys-hypervisor.c 2010-07-05 14:14:00.000000000 -0400 29476--- linux-2.6.32.18/drivers/xen/sys-hypervisor.c 2010-08-10 13:45:57.000000000 -0400
29433+++ linux-2.6.32.16/drivers/xen/sys-hypervisor.c 2010-07-09 14:50:37.000000000 -0400 29477+++ linux-2.6.32.18/drivers/xen/sys-hypervisor.c 2010-08-11 18:57:31.000000000 -0400
29434@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko 29478@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
29435 return 0; 29479 return 0;
29436 } 29480 }
@@ -29440,9 +29484,9 @@ diff -urNp linux-2.6.32.16/drivers/xen/sys-hypervisor.c linux-2.6.32.16/drivers/
29440 .show = hyp_sysfs_show, 29484 .show = hyp_sysfs_show,
29441 .store = hyp_sysfs_store, 29485 .store = hyp_sysfs_store,
29442 }; 29486 };
29443diff -urNp linux-2.6.32.16/fs/9p/vfs_inode.c linux-2.6.32.16/fs/9p/vfs_inode.c 29487diff -urNp linux-2.6.32.18/fs/9p/vfs_inode.c linux-2.6.32.18/fs/9p/vfs_inode.c
29444--- linux-2.6.32.16/fs/9p/vfs_inode.c 2010-07-05 14:14:00.000000000 -0400 29488--- linux-2.6.32.18/fs/9p/vfs_inode.c 2010-08-10 13:45:57.000000000 -0400
29445+++ linux-2.6.32.16/fs/9p/vfs_inode.c 2010-07-09 14:50:37.000000000 -0400 29489+++ linux-2.6.32.18/fs/9p/vfs_inode.c 2010-08-11 18:57:31.000000000 -0400
29446@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct 29490@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
29447 static void 29491 static void
29448 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 29492 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -29452,9 +29496,9 @@ diff -urNp linux-2.6.32.16/fs/9p/vfs_inode.c linux-2.6.32.16/fs/9p/vfs_inode.c
29452 29496
29453 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, 29497 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
29454 IS_ERR(s) ? "<error>" : s); 29498 IS_ERR(s) ? "<error>" : s);
29455diff -urNp linux-2.6.32.16/fs/aio.c linux-2.6.32.16/fs/aio.c 29499diff -urNp linux-2.6.32.18/fs/aio.c linux-2.6.32.18/fs/aio.c
29456--- linux-2.6.32.16/fs/aio.c 2010-07-05 14:14:00.000000000 -0400 29500--- linux-2.6.32.18/fs/aio.c 2010-08-10 13:45:57.000000000 -0400
29457+++ linux-2.6.32.16/fs/aio.c 2010-07-09 14:50:37.000000000 -0400 29501+++ linux-2.6.32.18/fs/aio.c 2010-08-11 18:57:31.000000000 -0400
29458@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx 29502@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
29459 size += sizeof(struct io_event) * nr_events; 29503 size += sizeof(struct io_event) * nr_events;
29460 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; 29504 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -29464,9 +29508,9 @@ diff -urNp linux-2.6.32.16/fs/aio.c linux-2.6.32.16/fs/aio.c
29464 return -EINVAL; 29508 return -EINVAL;
29465 29509
29466 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); 29510 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
29467diff -urNp linux-2.6.32.16/fs/attr.c linux-2.6.32.16/fs/attr.c 29511diff -urNp linux-2.6.32.18/fs/attr.c linux-2.6.32.18/fs/attr.c
29468--- linux-2.6.32.16/fs/attr.c 2010-07-05 14:14:00.000000000 -0400 29512--- linux-2.6.32.18/fs/attr.c 2010-08-10 13:45:57.000000000 -0400
29469+++ linux-2.6.32.16/fs/attr.c 2010-07-09 14:50:37.000000000 -0400 29513+++ linux-2.6.32.18/fs/attr.c 2010-08-11 18:57:31.000000000 -0400
29470@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode 29514@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
29471 unsigned long limit; 29515 unsigned long limit;
29472 29516
@@ -29475,9 +29519,9 @@ diff -urNp linux-2.6.32.16/fs/attr.c linux-2.6.32.16/fs/attr.c
29475 if (limit != RLIM_INFINITY && offset > limit) 29519 if (limit != RLIM_INFINITY && offset > limit)
29476 goto out_sig; 29520 goto out_sig;
29477 if (offset > inode->i_sb->s_maxbytes) 29521 if (offset > inode->i_sb->s_maxbytes)
29478diff -urNp linux-2.6.32.16/fs/autofs/root.c linux-2.6.32.16/fs/autofs/root.c 29522diff -urNp linux-2.6.32.18/fs/autofs/root.c linux-2.6.32.18/fs/autofs/root.c
29479--- linux-2.6.32.16/fs/autofs/root.c 2010-07-05 14:14:00.000000000 -0400 29523--- linux-2.6.32.18/fs/autofs/root.c 2010-08-10 13:45:57.000000000 -0400
29480+++ linux-2.6.32.16/fs/autofs/root.c 2010-07-09 14:50:37.000000000 -0400 29524+++ linux-2.6.32.18/fs/autofs/root.c 2010-08-11 18:57:31.000000000 -0400
29481@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in 29525@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
29482 set_bit(n,sbi->symlink_bitmap); 29526 set_bit(n,sbi->symlink_bitmap);
29483 sl = &sbi->symlink[n]; 29527 sl = &sbi->symlink[n];
@@ -29488,9 +29532,9 @@ diff -urNp linux-2.6.32.16/fs/autofs/root.c linux-2.6.32.16/fs/autofs/root.c
29488 if (!sl->data) { 29532 if (!sl->data) {
29489 clear_bit(n,sbi->symlink_bitmap); 29533 clear_bit(n,sbi->symlink_bitmap);
29490 unlock_kernel(); 29534 unlock_kernel();
29491diff -urNp linux-2.6.32.16/fs/autofs4/symlink.c linux-2.6.32.16/fs/autofs4/symlink.c 29535diff -urNp linux-2.6.32.18/fs/autofs4/symlink.c linux-2.6.32.18/fs/autofs4/symlink.c
29492--- linux-2.6.32.16/fs/autofs4/symlink.c 2010-07-05 14:14:00.000000000 -0400 29536--- linux-2.6.32.18/fs/autofs4/symlink.c 2010-08-10 13:45:57.000000000 -0400
29493+++ linux-2.6.32.16/fs/autofs4/symlink.c 2010-07-09 14:50:37.000000000 -0400 29537+++ linux-2.6.32.18/fs/autofs4/symlink.c 2010-08-11 18:57:31.000000000 -0400
29494@@ -15,7 +15,7 @@ 29538@@ -15,7 +15,7 @@
29495 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) 29539 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
29496 { 29540 {
@@ -29500,9 +29544,9 @@ diff -urNp linux-2.6.32.16/fs/autofs4/symlink.c linux-2.6.32.16/fs/autofs4/symli
29500 return NULL; 29544 return NULL;
29501 } 29545 }
29502 29546
29503diff -urNp linux-2.6.32.16/fs/befs/linuxvfs.c linux-2.6.32.16/fs/befs/linuxvfs.c 29547diff -urNp linux-2.6.32.18/fs/befs/linuxvfs.c linux-2.6.32.18/fs/befs/linuxvfs.c
29504--- linux-2.6.32.16/fs/befs/linuxvfs.c 2010-07-05 14:14:00.000000000 -0400 29548--- linux-2.6.32.18/fs/befs/linuxvfs.c 2010-08-10 13:45:57.000000000 -0400
29505+++ linux-2.6.32.16/fs/befs/linuxvfs.c 2010-07-09 14:50:37.000000000 -0400 29549+++ linux-2.6.32.18/fs/befs/linuxvfs.c 2010-08-11 18:57:31.000000000 -0400
29506@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry 29550@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
29507 { 29551 {
29508 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); 29552 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -29512,9 +29556,9 @@ diff -urNp linux-2.6.32.16/fs/befs/linuxvfs.c linux-2.6.32.16/fs/befs/linuxvfs.c
29512 if (!IS_ERR(link)) 29556 if (!IS_ERR(link))
29513 kfree(link); 29557 kfree(link);
29514 } 29558 }
29515diff -urNp linux-2.6.32.16/fs/binfmt_aout.c linux-2.6.32.16/fs/binfmt_aout.c 29559diff -urNp linux-2.6.32.18/fs/binfmt_aout.c linux-2.6.32.18/fs/binfmt_aout.c
29516--- linux-2.6.32.16/fs/binfmt_aout.c 2010-07-05 14:14:00.000000000 -0400 29560--- linux-2.6.32.18/fs/binfmt_aout.c 2010-08-10 13:45:57.000000000 -0400
29517+++ linux-2.6.32.16/fs/binfmt_aout.c 2010-07-09 14:50:37.000000000 -0400 29561+++ linux-2.6.32.18/fs/binfmt_aout.c 2010-08-11 18:57:31.000000000 -0400
29518@@ -16,6 +16,7 @@ 29562@@ -16,6 +16,7 @@
29519 #include <linux/string.h> 29563 #include <linux/string.h>
29520 #include <linux/fs.h> 29564 #include <linux/fs.h>
@@ -29582,9 +29626,9 @@ diff -urNp linux-2.6.32.16/fs/binfmt_aout.c linux-2.6.32.16/fs/binfmt_aout.c
29582 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, 29626 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
29583 fd_offset + ex.a_text); 29627 fd_offset + ex.a_text);
29584 up_write(&current->mm->mmap_sem); 29628 up_write(&current->mm->mmap_sem);
29585diff -urNp linux-2.6.32.16/fs/binfmt_elf.c linux-2.6.32.16/fs/binfmt_elf.c 29629diff -urNp linux-2.6.32.18/fs/binfmt_elf.c linux-2.6.32.18/fs/binfmt_elf.c
29586--- linux-2.6.32.16/fs/binfmt_elf.c 2010-07-05 14:14:00.000000000 -0400 29630--- linux-2.6.32.18/fs/binfmt_elf.c 2010-08-10 13:45:57.000000000 -0400
29587+++ linux-2.6.32.16/fs/binfmt_elf.c 2010-07-09 14:50:37.000000000 -0400 29631+++ linux-2.6.32.18/fs/binfmt_elf.c 2010-08-11 19:32:49.000000000 -0400
29588@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str 29632@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
29589 #define elf_core_dump NULL 29633 #define elf_core_dump NULL
29590 #endif 29634 #endif
@@ -30148,13 +30192,13 @@ diff -urNp linux-2.6.32.16/fs/binfmt_elf.c linux-2.6.32.16/fs/binfmt_elf.c
30148+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ); 30192+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
30149+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ; 30193+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
30150+ 30194+
30151+#ifdef CONFIG_PAX_NOELFRELOCS 30195+#ifdef CONFIG_PAX_ELFRELOCS
30152+ is_textrel_rw = false;
30153+ is_textrel_rx = false;
30154+#else
30155+ /* possible TEXTREL */ 30196+ /* possible TEXTREL */
30156+ is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ); 30197+ is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
30157+ is_textrel_rx = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ); 30198+ is_textrel_rx = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
30199+#else
30200+ is_textrel_rw = false;
30201+ is_textrel_rx = false;
30158+#endif 30202+#endif
30159+ 30203+
30160+ /* possible RELRO */ 30204+ /* possible RELRO */
@@ -30220,9 +30264,9 @@ diff -urNp linux-2.6.32.16/fs/binfmt_elf.c linux-2.6.32.16/fs/binfmt_elf.c
30220 static int __init init_elf_binfmt(void) 30264 static int __init init_elf_binfmt(void)
30221 { 30265 {
30222 return register_binfmt(&elf_format); 30266 return register_binfmt(&elf_format);
30223diff -urNp linux-2.6.32.16/fs/binfmt_flat.c linux-2.6.32.16/fs/binfmt_flat.c 30267diff -urNp linux-2.6.32.18/fs/binfmt_flat.c linux-2.6.32.18/fs/binfmt_flat.c
30224--- linux-2.6.32.16/fs/binfmt_flat.c 2010-07-05 14:14:00.000000000 -0400 30268--- linux-2.6.32.18/fs/binfmt_flat.c 2010-08-10 13:45:57.000000000 -0400
30225+++ linux-2.6.32.16/fs/binfmt_flat.c 2010-07-09 14:50:37.000000000 -0400 30269+++ linux-2.6.32.18/fs/binfmt_flat.c 2010-08-11 18:57:31.000000000 -0400
30226@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b 30270@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
30227 realdatastart = (unsigned long) -ENOMEM; 30271 realdatastart = (unsigned long) -ENOMEM;
30228 printk("Unable to allocate RAM for process data, errno %d\n", 30272 printk("Unable to allocate RAM for process data, errno %d\n",
@@ -30255,9 +30299,9 @@ diff -urNp linux-2.6.32.16/fs/binfmt_flat.c linux-2.6.32.16/fs/binfmt_flat.c
30255 ret = result; 30299 ret = result;
30256 goto err; 30300 goto err;
30257 } 30301 }
30258diff -urNp linux-2.6.32.16/fs/binfmt_misc.c linux-2.6.32.16/fs/binfmt_misc.c 30302diff -urNp linux-2.6.32.18/fs/binfmt_misc.c linux-2.6.32.18/fs/binfmt_misc.c
30259--- linux-2.6.32.16/fs/binfmt_misc.c 2010-07-05 14:14:00.000000000 -0400 30303--- linux-2.6.32.18/fs/binfmt_misc.c 2010-08-10 13:45:57.000000000 -0400
30260+++ linux-2.6.32.16/fs/binfmt_misc.c 2010-07-09 14:50:37.000000000 -0400 30304+++ linux-2.6.32.18/fs/binfmt_misc.c 2010-08-11 18:57:31.000000000 -0400
30261@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl 30305@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
30262 static struct tree_descr bm_files[] = { 30306 static struct tree_descr bm_files[] = {
30263 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, 30307 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -30267,9 +30311,9 @@ diff -urNp linux-2.6.32.16/fs/binfmt_misc.c linux-2.6.32.16/fs/binfmt_misc.c
30267 }; 30311 };
30268 int err = simple_fill_super(sb, 0x42494e4d, bm_files); 30312 int err = simple_fill_super(sb, 0x42494e4d, bm_files);
30269 if (!err) 30313 if (!err)
30270diff -urNp linux-2.6.32.16/fs/bio.c linux-2.6.32.16/fs/bio.c 30314diff -urNp linux-2.6.32.18/fs/bio.c linux-2.6.32.18/fs/bio.c
30271--- linux-2.6.32.16/fs/bio.c 2010-07-05 14:14:00.000000000 -0400 30315--- linux-2.6.32.18/fs/bio.c 2010-08-10 13:45:57.000000000 -0400
30272+++ linux-2.6.32.16/fs/bio.c 2010-07-09 14:50:37.000000000 -0400 30316+++ linux-2.6.32.18/fs/bio.c 2010-08-11 18:57:31.000000000 -0400
30273@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr 30317@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
30274 30318
30275 i = 0; 30319 i = 0;
@@ -30288,9 +30332,9 @@ diff -urNp linux-2.6.32.16/fs/bio.c linux-2.6.32.16/fs/bio.c
30288 30332
30289 __bio_for_each_segment(bvec, bio, i, 0) { 30333 __bio_for_each_segment(bvec, bio, i, 0) {
30290 char *addr = page_address(bvec->bv_page); 30334 char *addr = page_address(bvec->bv_page);
30291diff -urNp linux-2.6.32.16/fs/block_dev.c linux-2.6.32.16/fs/block_dev.c 30335diff -urNp linux-2.6.32.18/fs/block_dev.c linux-2.6.32.18/fs/block_dev.c
30292--- linux-2.6.32.16/fs/block_dev.c 2010-07-05 14:14:00.000000000 -0400 30336--- linux-2.6.32.18/fs/block_dev.c 2010-08-10 13:45:57.000000000 -0400
30293+++ linux-2.6.32.16/fs/block_dev.c 2010-07-09 14:50:37.000000000 -0400 30337+++ linux-2.6.32.18/fs/block_dev.c 2010-08-11 18:57:31.000000000 -0400
30294@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, 30338@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev,
30295 else if (bdev->bd_contains == bdev) 30339 else if (bdev->bd_contains == bdev)
30296 res = 0; /* is a whole device which isn't held */ 30340 res = 0; /* is a whole device which isn't held */
@@ -30300,9 +30344,9 @@ diff -urNp linux-2.6.32.16/fs/block_dev.c linux-2.6.32.16/fs/block_dev.c
30300 res = 0; /* is a partition of a device that is being partitioned */ 30344 res = 0; /* is a partition of a device that is being partitioned */
30301 else if (bdev->bd_contains->bd_holder != NULL) 30345 else if (bdev->bd_contains->bd_holder != NULL)
30302 res = -EBUSY; /* is a partition of a held device */ 30346 res = -EBUSY; /* is a partition of a held device */
30303diff -urNp linux-2.6.32.16/fs/btrfs/ctree.c linux-2.6.32.16/fs/btrfs/ctree.c 30347diff -urNp linux-2.6.32.18/fs/btrfs/ctree.c linux-2.6.32.18/fs/btrfs/ctree.c
30304--- linux-2.6.32.16/fs/btrfs/ctree.c 2010-07-05 14:14:00.000000000 -0400 30348--- linux-2.6.32.18/fs/btrfs/ctree.c 2010-08-10 13:45:57.000000000 -0400
30305+++ linux-2.6.32.16/fs/btrfs/ctree.c 2010-07-09 14:50:37.000000000 -0400 30349+++ linux-2.6.32.18/fs/btrfs/ctree.c 2010-08-11 18:57:31.000000000 -0400
30306@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran 30350@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran
30307 30351
30308 ret = 0; 30352 ret = 0;
@@ -30311,9 +30355,9 @@ diff -urNp linux-2.6.32.16/fs/btrfs/ctree.c linux-2.6.32.16/fs/btrfs/ctree.c
30311 btrfs_cpu_key_to_disk(&disk_key, cpu_key); 30355 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
30312 ret = fixup_low_keys(trans, root, path, &disk_key, 1); 30356 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
30313 } 30357 }
30314diff -urNp linux-2.6.32.16/fs/btrfs/disk-io.c linux-2.6.32.16/fs/btrfs/disk-io.c 30358diff -urNp linux-2.6.32.18/fs/btrfs/disk-io.c linux-2.6.32.18/fs/btrfs/disk-io.c
30315--- linux-2.6.32.16/fs/btrfs/disk-io.c 2010-07-05 14:14:00.000000000 -0400 30359--- linux-2.6.32.18/fs/btrfs/disk-io.c 2010-08-10 13:45:57.000000000 -0400
30316+++ linux-2.6.32.16/fs/btrfs/disk-io.c 2010-07-09 14:50:37.000000000 -0400 30360+++ linux-2.6.32.18/fs/btrfs/disk-io.c 2010-08-11 18:57:31.000000000 -0400
30317@@ -39,7 +39,7 @@ 30361@@ -39,7 +39,7 @@
30318 #include "tree-log.h" 30362 #include "tree-log.h"
30319 #include "free-space-cache.h" 30363 #include "free-space-cache.h"
@@ -30332,9 +30376,9 @@ diff -urNp linux-2.6.32.16/fs/btrfs/disk-io.c linux-2.6.32.16/fs/btrfs/disk-io.c
30332 .write_cache_pages_lock_hook = btree_lock_page_hook, 30376 .write_cache_pages_lock_hook = btree_lock_page_hook,
30333 .readpage_end_io_hook = btree_readpage_end_io_hook, 30377 .readpage_end_io_hook = btree_readpage_end_io_hook,
30334 .submit_bio_hook = btree_submit_bio_hook, 30378 .submit_bio_hook = btree_submit_bio_hook,
30335diff -urNp linux-2.6.32.16/fs/btrfs/extent_io.h linux-2.6.32.16/fs/btrfs/extent_io.h 30379diff -urNp linux-2.6.32.18/fs/btrfs/extent_io.h linux-2.6.32.18/fs/btrfs/extent_io.h
30336--- linux-2.6.32.16/fs/btrfs/extent_io.h 2010-07-05 14:14:00.000000000 -0400 30380--- linux-2.6.32.18/fs/btrfs/extent_io.h 2010-08-10 13:45:57.000000000 -0400
30337+++ linux-2.6.32.16/fs/btrfs/extent_io.h 2010-07-09 14:50:37.000000000 -0400 30381+++ linux-2.6.32.18/fs/btrfs/extent_io.h 2010-08-11 18:57:31.000000000 -0400
30338@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s 30382@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
30339 struct bio *bio, int mirror_num, 30383 struct bio *bio, int mirror_num,
30340 unsigned long bio_flags); 30384 unsigned long bio_flags);
@@ -30395,9 +30439,9 @@ diff -urNp linux-2.6.32.16/fs/btrfs/extent_io.h linux-2.6.32.16/fs/btrfs/extent_
30395 }; 30439 };
30396 30440
30397 struct extent_state { 30441 struct extent_state {
30398diff -urNp linux-2.6.32.16/fs/btrfs/free-space-cache.c linux-2.6.32.16/fs/btrfs/free-space-cache.c 30442diff -urNp linux-2.6.32.18/fs/btrfs/free-space-cache.c linux-2.6.32.18/fs/btrfs/free-space-cache.c
30399--- linux-2.6.32.16/fs/btrfs/free-space-cache.c 2010-07-05 14:14:00.000000000 -0400 30443--- linux-2.6.32.18/fs/btrfs/free-space-cache.c 2010-08-10 13:45:57.000000000 -0400
30400+++ linux-2.6.32.16/fs/btrfs/free-space-cache.c 2010-07-09 14:50:37.000000000 -0400 30444+++ linux-2.6.32.18/fs/btrfs/free-space-cache.c 2010-08-11 18:57:31.000000000 -0400
30401@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf 30445@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
30402 30446
30403 while(1) { 30447 while(1) {
@@ -30416,9 +30460,9 @@ diff -urNp linux-2.6.32.16/fs/btrfs/free-space-cache.c linux-2.6.32.16/fs/btrfs/
30416 30460
30417 if (entry->bitmap && entry->bytes > bytes + empty_size) { 30461 if (entry->bitmap && entry->bytes > bytes + empty_size) {
30418 ret = btrfs_bitmap_cluster(block_group, entry, cluster, 30462 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
30419diff -urNp linux-2.6.32.16/fs/btrfs/inode.c linux-2.6.32.16/fs/btrfs/inode.c 30463diff -urNp linux-2.6.32.18/fs/btrfs/inode.c linux-2.6.32.18/fs/btrfs/inode.c
30420--- linux-2.6.32.16/fs/btrfs/inode.c 2010-07-05 14:14:00.000000000 -0400 30464--- linux-2.6.32.18/fs/btrfs/inode.c 2010-08-10 13:45:57.000000000 -0400
30421+++ linux-2.6.32.16/fs/btrfs/inode.c 2010-07-09 14:50:37.000000000 -0400 30465+++ linux-2.6.32.18/fs/btrfs/inode.c 2010-08-11 18:57:31.000000000 -0400
30422@@ -63,7 +63,7 @@ static const struct inode_operations btr 30466@@ -63,7 +63,7 @@ static const struct inode_operations btr
30423 static const struct address_space_operations btrfs_aops; 30467 static const struct address_space_operations btrfs_aops;
30424 static const struct address_space_operations btrfs_symlink_aops; 30468 static const struct address_space_operations btrfs_symlink_aops;
@@ -30437,9 +30481,9 @@ diff -urNp linux-2.6.32.16/fs/btrfs/inode.c linux-2.6.32.16/fs/btrfs/inode.c
30437 .fill_delalloc = run_delalloc_range, 30481 .fill_delalloc = run_delalloc_range,
30438 .submit_bio_hook = btrfs_submit_bio_hook, 30482 .submit_bio_hook = btrfs_submit_bio_hook,
30439 .merge_bio_hook = btrfs_merge_bio_hook, 30483 .merge_bio_hook = btrfs_merge_bio_hook,
30440diff -urNp linux-2.6.32.16/fs/btrfs/sysfs.c linux-2.6.32.16/fs/btrfs/sysfs.c 30484diff -urNp linux-2.6.32.18/fs/btrfs/sysfs.c linux-2.6.32.18/fs/btrfs/sysfs.c
30441--- linux-2.6.32.16/fs/btrfs/sysfs.c 2010-07-05 14:14:00.000000000 -0400 30485--- linux-2.6.32.18/fs/btrfs/sysfs.c 2010-08-10 13:45:57.000000000 -0400
30442+++ linux-2.6.32.16/fs/btrfs/sysfs.c 2010-07-09 14:50:37.000000000 -0400 30486+++ linux-2.6.32.18/fs/btrfs/sysfs.c 2010-08-11 18:57:31.000000000 -0400
30443@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko 30487@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
30444 complete(&root->kobj_unregister); 30488 complete(&root->kobj_unregister);
30445 } 30489 }
@@ -30455,9 +30499,9 @@ diff -urNp linux-2.6.32.16/fs/btrfs/sysfs.c linux-2.6.32.16/fs/btrfs/sysfs.c
30455 .show = btrfs_root_attr_show, 30499 .show = btrfs_root_attr_show,
30456 .store = btrfs_root_attr_store, 30500 .store = btrfs_root_attr_store,
30457 }; 30501 };
30458diff -urNp linux-2.6.32.16/fs/buffer.c linux-2.6.32.16/fs/buffer.c 30502diff -urNp linux-2.6.32.18/fs/buffer.c linux-2.6.32.18/fs/buffer.c
30459--- linux-2.6.32.16/fs/buffer.c 2010-07-05 14:14:00.000000000 -0400 30503--- linux-2.6.32.18/fs/buffer.c 2010-08-10 13:45:57.000000000 -0400
30460+++ linux-2.6.32.16/fs/buffer.c 2010-07-09 14:50:37.000000000 -0400 30504+++ linux-2.6.32.18/fs/buffer.c 2010-08-11 18:57:31.000000000 -0400
30461@@ -25,6 +25,7 @@ 30505@@ -25,6 +25,7 @@
30462 #include <linux/percpu.h> 30506 #include <linux/percpu.h>
30463 #include <linux/slab.h> 30507 #include <linux/slab.h>
@@ -30466,9 +30510,9 @@ diff -urNp linux-2.6.32.16/fs/buffer.c linux-2.6.32.16/fs/buffer.c
30466 #include <linux/blkdev.h> 30510 #include <linux/blkdev.h>
30467 #include <linux/file.h> 30511 #include <linux/file.h>
30468 #include <linux/quotaops.h> 30512 #include <linux/quotaops.h>
30469diff -urNp linux-2.6.32.16/fs/cachefiles/bind.c linux-2.6.32.16/fs/cachefiles/bind.c 30513diff -urNp linux-2.6.32.18/fs/cachefiles/bind.c linux-2.6.32.18/fs/cachefiles/bind.c
30470--- linux-2.6.32.16/fs/cachefiles/bind.c 2010-07-05 14:14:00.000000000 -0400 30514--- linux-2.6.32.18/fs/cachefiles/bind.c 2010-08-10 13:45:57.000000000 -0400
30471+++ linux-2.6.32.16/fs/cachefiles/bind.c 2010-07-09 14:50:37.000000000 -0400 30515+++ linux-2.6.32.18/fs/cachefiles/bind.c 2010-08-11 18:57:31.000000000 -0400
30472@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef 30516@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
30473 args); 30517 args);
30474 30518
@@ -30485,9 +30529,9 @@ diff -urNp linux-2.6.32.16/fs/cachefiles/bind.c linux-2.6.32.16/fs/cachefiles/bi
30485 cache->bcull_percent < cache->brun_percent && 30529 cache->bcull_percent < cache->brun_percent &&
30486 cache->brun_percent < 100); 30530 cache->brun_percent < 100);
30487 30531
30488diff -urNp linux-2.6.32.16/fs/cachefiles/daemon.c linux-2.6.32.16/fs/cachefiles/daemon.c 30532diff -urNp linux-2.6.32.18/fs/cachefiles/daemon.c linux-2.6.32.18/fs/cachefiles/daemon.c
30489--- linux-2.6.32.16/fs/cachefiles/daemon.c 2010-07-05 14:14:00.000000000 -0400 30533--- linux-2.6.32.18/fs/cachefiles/daemon.c 2010-08-10 13:45:57.000000000 -0400
30490+++ linux-2.6.32.16/fs/cachefiles/daemon.c 2010-07-09 14:50:37.000000000 -0400 30534+++ linux-2.6.32.18/fs/cachefiles/daemon.c 2010-08-11 18:57:31.000000000 -0400
30491@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s 30535@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
30492 if (test_bit(CACHEFILES_DEAD, &cache->flags)) 30536 if (test_bit(CACHEFILES_DEAD, &cache->flags))
30493 return -EIO; 30537 return -EIO;
@@ -30515,9 +30559,9 @@ diff -urNp linux-2.6.32.16/fs/cachefiles/daemon.c linux-2.6.32.16/fs/cachefiles/
30515 return cachefiles_daemon_range_error(cache, args); 30559 return cachefiles_daemon_range_error(cache, args);
30516 30560
30517 cache->bstop_percent = bstop; 30561 cache->bstop_percent = bstop;
30518diff -urNp linux-2.6.32.16/fs/cachefiles/rdwr.c linux-2.6.32.16/fs/cachefiles/rdwr.c 30562diff -urNp linux-2.6.32.18/fs/cachefiles/rdwr.c linux-2.6.32.18/fs/cachefiles/rdwr.c
30519--- linux-2.6.32.16/fs/cachefiles/rdwr.c 2010-07-05 14:14:00.000000000 -0400 30563--- linux-2.6.32.18/fs/cachefiles/rdwr.c 2010-08-10 13:45:57.000000000 -0400
30520+++ linux-2.6.32.16/fs/cachefiles/rdwr.c 2010-07-09 14:50:37.000000000 -0400 30564+++ linux-2.6.32.18/fs/cachefiles/rdwr.c 2010-08-11 18:57:31.000000000 -0400
30521@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache 30565@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
30522 old_fs = get_fs(); 30566 old_fs = get_fs();
30523 set_fs(KERNEL_DS); 30567 set_fs(KERNEL_DS);
@@ -30527,9 +30571,9 @@ diff -urNp linux-2.6.32.16/fs/cachefiles/rdwr.c linux-2.6.32.16/fs/cachefiles/rd
30527 set_fs(old_fs); 30571 set_fs(old_fs);
30528 kunmap(page); 30572 kunmap(page);
30529 if (ret != len) 30573 if (ret != len)
30530diff -urNp linux-2.6.32.16/fs/cifs/cifs_uniupr.h linux-2.6.32.16/fs/cifs/cifs_uniupr.h 30574diff -urNp linux-2.6.32.18/fs/cifs/cifs_uniupr.h linux-2.6.32.18/fs/cifs/cifs_uniupr.h
30531--- linux-2.6.32.16/fs/cifs/cifs_uniupr.h 2010-07-05 14:14:00.000000000 -0400 30575--- linux-2.6.32.18/fs/cifs/cifs_uniupr.h 2010-08-10 13:45:57.000000000 -0400
30532+++ linux-2.6.32.16/fs/cifs/cifs_uniupr.h 2010-07-09 14:50:37.000000000 -0400 30576+++ linux-2.6.32.18/fs/cifs/cifs_uniupr.h 2010-08-11 18:57:31.000000000 -0400
30533@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa 30577@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
30534 {0x0490, 0x04cc, UniCaseRangeU0490}, 30578 {0x0490, 0x04cc, UniCaseRangeU0490},
30535 {0x1e00, 0x1ffc, UniCaseRangeU1e00}, 30579 {0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -30539,9 +30583,9 @@ diff -urNp linux-2.6.32.16/fs/cifs/cifs_uniupr.h linux-2.6.32.16/fs/cifs/cifs_un
30539 }; 30583 };
30540 #endif 30584 #endif
30541 30585
30542diff -urNp linux-2.6.32.16/fs/cifs/link.c linux-2.6.32.16/fs/cifs/link.c 30586diff -urNp linux-2.6.32.18/fs/cifs/link.c linux-2.6.32.18/fs/cifs/link.c
30543--- linux-2.6.32.16/fs/cifs/link.c 2010-07-05 14:14:00.000000000 -0400 30587--- linux-2.6.32.18/fs/cifs/link.c 2010-08-10 13:45:57.000000000 -0400
30544+++ linux-2.6.32.16/fs/cifs/link.c 2010-07-09 14:50:37.000000000 -0400 30588+++ linux-2.6.32.18/fs/cifs/link.c 2010-08-11 18:57:31.000000000 -0400
30545@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct 30589@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
30546 30590
30547 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) 30591 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -30551,9 +30595,9 @@ diff -urNp linux-2.6.32.16/fs/cifs/link.c linux-2.6.32.16/fs/cifs/link.c
30551 if (!IS_ERR(p)) 30595 if (!IS_ERR(p))
30552 kfree(p); 30596 kfree(p);
30553 } 30597 }
30554diff -urNp linux-2.6.32.16/fs/compat_binfmt_elf.c linux-2.6.32.16/fs/compat_binfmt_elf.c 30598diff -urNp linux-2.6.32.18/fs/compat_binfmt_elf.c linux-2.6.32.18/fs/compat_binfmt_elf.c
30555--- linux-2.6.32.16/fs/compat_binfmt_elf.c 2010-07-05 14:14:00.000000000 -0400 30599--- linux-2.6.32.18/fs/compat_binfmt_elf.c 2010-08-10 13:45:57.000000000 -0400
30556+++ linux-2.6.32.16/fs/compat_binfmt_elf.c 2010-07-09 14:50:37.000000000 -0400 30600+++ linux-2.6.32.18/fs/compat_binfmt_elf.c 2010-08-11 18:57:31.000000000 -0400
30557@@ -29,10 +29,12 @@ 30601@@ -29,10 +29,12 @@
30558 #undef elfhdr 30602 #undef elfhdr
30559 #undef elf_phdr 30603 #undef elf_phdr
@@ -30567,9 +30611,9 @@ diff -urNp linux-2.6.32.16/fs/compat_binfmt_elf.c linux-2.6.32.16/fs/compat_binf
30567 #define elf_addr_t Elf32_Addr 30611 #define elf_addr_t Elf32_Addr
30568 30612
30569 /* 30613 /*
30570diff -urNp linux-2.6.32.16/fs/compat.c linux-2.6.32.16/fs/compat.c 30614diff -urNp linux-2.6.32.18/fs/compat.c linux-2.6.32.18/fs/compat.c
30571--- linux-2.6.32.16/fs/compat.c 2010-07-05 14:14:00.000000000 -0400 30615--- linux-2.6.32.18/fs/compat.c 2010-08-10 13:45:57.000000000 -0400
30572+++ linux-2.6.32.16/fs/compat.c 2010-07-09 14:50:37.000000000 -0400 30616+++ linux-2.6.32.18/fs/compat.c 2010-08-11 18:57:31.000000000 -0400
30573@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, 30617@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc,
30574 if (!kmapped_page || kpos != (pos & PAGE_MASK)) { 30618 if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
30575 struct page *page; 30619 struct page *page;
@@ -30669,9 +30713,9 @@ diff -urNp linux-2.6.32.16/fs/compat.c linux-2.6.32.16/fs/compat.c
30669 out: 30713 out:
30670 if (bprm->mm) 30714 if (bprm->mm)
30671 mmput(bprm->mm); 30715 mmput(bprm->mm);
30672diff -urNp linux-2.6.32.16/fs/compat_ioctl.c linux-2.6.32.16/fs/compat_ioctl.c 30716diff -urNp linux-2.6.32.18/fs/compat_ioctl.c linux-2.6.32.18/fs/compat_ioctl.c
30673--- linux-2.6.32.16/fs/compat_ioctl.c 2010-07-05 14:14:00.000000000 -0400 30717--- linux-2.6.32.18/fs/compat_ioctl.c 2010-08-10 13:45:57.000000000 -0400
30674+++ linux-2.6.32.16/fs/compat_ioctl.c 2010-07-09 14:50:37.000000000 -0400 30718+++ linux-2.6.32.18/fs/compat_ioctl.c 2010-08-11 18:57:31.000000000 -0400
30675@@ -1827,15 +1827,15 @@ struct ioctl_trans { 30719@@ -1827,15 +1827,15 @@ struct ioctl_trans {
30676 }; 30720 };
30677 30721
@@ -30691,9 +30735,9 @@ diff -urNp linux-2.6.32.16/fs/compat_ioctl.c linux-2.6.32.16/fs/compat_ioctl.c
30691 30735
30692 /* ioctl should not be warned about even if it's not implemented. 30736 /* ioctl should not be warned about even if it's not implemented.
30693 Valid reasons to use this: 30737 Valid reasons to use this:
30694diff -urNp linux-2.6.32.16/fs/debugfs/inode.c linux-2.6.32.16/fs/debugfs/inode.c 30738diff -urNp linux-2.6.32.18/fs/debugfs/inode.c linux-2.6.32.18/fs/debugfs/inode.c
30695--- linux-2.6.32.16/fs/debugfs/inode.c 2010-07-05 14:14:00.000000000 -0400 30739--- linux-2.6.32.18/fs/debugfs/inode.c 2010-08-10 13:45:57.000000000 -0400
30696+++ linux-2.6.32.16/fs/debugfs/inode.c 2010-07-09 14:50:37.000000000 -0400 30740+++ linux-2.6.32.18/fs/debugfs/inode.c 2010-08-11 18:57:31.000000000 -0400
30697@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc 30741@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
30698 30742
30699 static int debug_fill_super(struct super_block *sb, void *data, int silent) 30743 static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -30703,9 +30747,9 @@ diff -urNp linux-2.6.32.16/fs/debugfs/inode.c linux-2.6.32.16/fs/debugfs/inode.c
30703 30747
30704 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); 30748 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
30705 } 30749 }
30706diff -urNp linux-2.6.32.16/fs/dlm/lockspace.c linux-2.6.32.16/fs/dlm/lockspace.c 30750diff -urNp linux-2.6.32.18/fs/dlm/lockspace.c linux-2.6.32.18/fs/dlm/lockspace.c
30707--- linux-2.6.32.16/fs/dlm/lockspace.c 2010-07-05 14:14:00.000000000 -0400 30751--- linux-2.6.32.18/fs/dlm/lockspace.c 2010-08-10 13:45:57.000000000 -0400
30708+++ linux-2.6.32.16/fs/dlm/lockspace.c 2010-07-09 14:50:37.000000000 -0400 30752+++ linux-2.6.32.18/fs/dlm/lockspace.c 2010-08-11 18:57:31.000000000 -0400
30709@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc 30753@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
30710 kfree(ls); 30754 kfree(ls);
30711 } 30755 }
@@ -30715,9 +30759,9 @@ diff -urNp linux-2.6.32.16/fs/dlm/lockspace.c linux-2.6.32.16/fs/dlm/lockspace.c
30715 .show = dlm_attr_show, 30759 .show = dlm_attr_show,
30716 .store = dlm_attr_store, 30760 .store = dlm_attr_store,
30717 }; 30761 };
30718diff -urNp linux-2.6.32.16/fs/ecryptfs/inode.c linux-2.6.32.16/fs/ecryptfs/inode.c 30762diff -urNp linux-2.6.32.18/fs/ecryptfs/inode.c linux-2.6.32.18/fs/ecryptfs/inode.c
30719--- linux-2.6.32.16/fs/ecryptfs/inode.c 2010-07-05 14:14:00.000000000 -0400 30763--- linux-2.6.32.18/fs/ecryptfs/inode.c 2010-08-10 13:45:57.000000000 -0400
30720+++ linux-2.6.32.16/fs/ecryptfs/inode.c 2010-07-09 14:50:37.000000000 -0400 30764+++ linux-2.6.32.18/fs/ecryptfs/inode.c 2010-08-11 18:57:31.000000000 -0400
30721@@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc 30765@@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc
30722 old_fs = get_fs(); 30766 old_fs = get_fs();
30723 set_fs(get_ds()); 30767 set_fs(get_ds());
@@ -30736,9 +30780,9 @@ diff -urNp linux-2.6.32.16/fs/ecryptfs/inode.c linux-2.6.32.16/fs/ecryptfs/inode
30736 set_fs(old_fs); 30780 set_fs(old_fs);
30737 if (rc < 0) 30781 if (rc < 0)
30738 goto out_free; 30782 goto out_free;
30739diff -urNp linux-2.6.32.16/fs/exec.c linux-2.6.32.16/fs/exec.c 30783diff -urNp linux-2.6.32.18/fs/exec.c linux-2.6.32.18/fs/exec.c
30740--- linux-2.6.32.16/fs/exec.c 2010-07-05 14:14:00.000000000 -0400 30784--- linux-2.6.32.18/fs/exec.c 2010-08-10 13:45:57.000000000 -0400
30741+++ linux-2.6.32.16/fs/exec.c 2010-07-09 14:50:37.000000000 -0400 30785+++ linux-2.6.32.18/fs/exec.c 2010-08-11 18:57:31.000000000 -0400
30742@@ -56,12 +56,24 @@ 30786@@ -56,12 +56,24 @@
30743 #include <linux/fsnotify.h> 30787 #include <linux/fsnotify.h>
30744 #include <linux/fs_struct.h> 30788 #include <linux/fs_struct.h>
@@ -31217,9 +31261,9 @@ diff -urNp linux-2.6.32.16/fs/exec.c linux-2.6.32.16/fs/exec.c
31217 /* 31261 /*
31218 * lock_kernel() because format_corename() is controlled by sysctl, which 31262 * lock_kernel() because format_corename() is controlled by sysctl, which
31219 * uses lock_kernel() 31263 * uses lock_kernel()
31220diff -urNp linux-2.6.32.16/fs/ext2/balloc.c linux-2.6.32.16/fs/ext2/balloc.c 31264diff -urNp linux-2.6.32.18/fs/ext2/balloc.c linux-2.6.32.18/fs/ext2/balloc.c
31221--- linux-2.6.32.16/fs/ext2/balloc.c 2010-07-05 14:14:00.000000000 -0400 31265--- linux-2.6.32.18/fs/ext2/balloc.c 2010-08-10 13:45:57.000000000 -0400
31222+++ linux-2.6.32.16/fs/ext2/balloc.c 2010-07-09 14:50:37.000000000 -0400 31266+++ linux-2.6.32.18/fs/ext2/balloc.c 2010-08-11 18:57:32.000000000 -0400
31223@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e 31267@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
31224 31268
31225 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 31269 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -31229,9 +31273,9 @@ diff -urNp linux-2.6.32.16/fs/ext2/balloc.c linux-2.6.32.16/fs/ext2/balloc.c
31229 sbi->s_resuid != current_fsuid() && 31273 sbi->s_resuid != current_fsuid() &&
31230 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 31274 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
31231 return 0; 31275 return 0;
31232diff -urNp linux-2.6.32.16/fs/ext2/xattr.c linux-2.6.32.16/fs/ext2/xattr.c 31276diff -urNp linux-2.6.32.18/fs/ext2/xattr.c linux-2.6.32.18/fs/ext2/xattr.c
31233--- linux-2.6.32.16/fs/ext2/xattr.c 2010-07-05 14:14:00.000000000 -0400 31277--- linux-2.6.32.18/fs/ext2/xattr.c 2010-08-10 13:45:57.000000000 -0400
31234+++ linux-2.6.32.16/fs/ext2/xattr.c 2010-07-09 14:50:37.000000000 -0400 31278+++ linux-2.6.32.18/fs/ext2/xattr.c 2010-08-11 18:57:32.000000000 -0400
31235@@ -85,8 +85,8 @@ 31279@@ -85,8 +85,8 @@
31236 printk("\n"); \ 31280 printk("\n"); \
31237 } while (0) 31281 } while (0)
@@ -31243,9 +31287,9 @@ diff -urNp linux-2.6.32.16/fs/ext2/xattr.c linux-2.6.32.16/fs/ext2/xattr.c
31243 #endif 31287 #endif
31244 31288
31245 static int ext2_xattr_set2(struct inode *, struct buffer_head *, 31289 static int ext2_xattr_set2(struct inode *, struct buffer_head *,
31246diff -urNp linux-2.6.32.16/fs/ext3/balloc.c linux-2.6.32.16/fs/ext3/balloc.c 31290diff -urNp linux-2.6.32.18/fs/ext3/balloc.c linux-2.6.32.18/fs/ext3/balloc.c
31247--- linux-2.6.32.16/fs/ext3/balloc.c 2010-07-05 14:14:00.000000000 -0400 31291--- linux-2.6.32.18/fs/ext3/balloc.c 2010-08-10 13:45:57.000000000 -0400
31248+++ linux-2.6.32.16/fs/ext3/balloc.c 2010-07-09 14:50:37.000000000 -0400 31292+++ linux-2.6.32.18/fs/ext3/balloc.c 2010-08-11 18:57:32.000000000 -0400
31249@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e 31293@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
31250 31294
31251 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 31295 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -31255,9 +31299,9 @@ diff -urNp linux-2.6.32.16/fs/ext3/balloc.c linux-2.6.32.16/fs/ext3/balloc.c
31255 sbi->s_resuid != current_fsuid() && 31299 sbi->s_resuid != current_fsuid() &&
31256 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 31300 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
31257 return 0; 31301 return 0;
31258diff -urNp linux-2.6.32.16/fs/ext3/namei.c linux-2.6.32.16/fs/ext3/namei.c 31302diff -urNp linux-2.6.32.18/fs/ext3/namei.c linux-2.6.32.18/fs/ext3/namei.c
31259--- linux-2.6.32.16/fs/ext3/namei.c 2010-07-05 14:14:00.000000000 -0400 31303--- linux-2.6.32.18/fs/ext3/namei.c 2010-08-10 13:45:57.000000000 -0400
31260+++ linux-2.6.32.16/fs/ext3/namei.c 2010-07-09 14:50:37.000000000 -0400 31304+++ linux-2.6.32.18/fs/ext3/namei.c 2010-08-11 18:57:32.000000000 -0400
31261@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split 31305@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
31262 char *data1 = (*bh)->b_data, *data2; 31306 char *data1 = (*bh)->b_data, *data2;
31263 unsigned split, move, size; 31307 unsigned split, move, size;
@@ -31267,9 +31311,9 @@ diff -urNp linux-2.6.32.16/fs/ext3/namei.c linux-2.6.32.16/fs/ext3/namei.c
31267 31311
31268 bh2 = ext3_append (handle, dir, &newblock, &err); 31312 bh2 = ext3_append (handle, dir, &newblock, &err);
31269 if (!(bh2)) { 31313 if (!(bh2)) {
31270diff -urNp linux-2.6.32.16/fs/ext3/xattr.c linux-2.6.32.16/fs/ext3/xattr.c 31314diff -urNp linux-2.6.32.18/fs/ext3/xattr.c linux-2.6.32.18/fs/ext3/xattr.c
31271--- linux-2.6.32.16/fs/ext3/xattr.c 2010-07-05 14:14:00.000000000 -0400 31315--- linux-2.6.32.18/fs/ext3/xattr.c 2010-08-10 13:45:57.000000000 -0400
31272+++ linux-2.6.32.16/fs/ext3/xattr.c 2010-07-09 14:50:37.000000000 -0400 31316+++ linux-2.6.32.18/fs/ext3/xattr.c 2010-08-11 18:57:32.000000000 -0400
31273@@ -89,8 +89,8 @@ 31317@@ -89,8 +89,8 @@
31274 printk("\n"); \ 31318 printk("\n"); \
31275 } while (0) 31319 } while (0)
@@ -31281,9 +31325,9 @@ diff -urNp linux-2.6.32.16/fs/ext3/xattr.c linux-2.6.32.16/fs/ext3/xattr.c
31281 #endif 31325 #endif
31282 31326
31283 static void ext3_xattr_cache_insert(struct buffer_head *); 31327 static void ext3_xattr_cache_insert(struct buffer_head *);
31284diff -urNp linux-2.6.32.16/fs/ext4/balloc.c linux-2.6.32.16/fs/ext4/balloc.c 31328diff -urNp linux-2.6.32.18/fs/ext4/balloc.c linux-2.6.32.18/fs/ext4/balloc.c
31285--- linux-2.6.32.16/fs/ext4/balloc.c 2010-07-05 14:14:00.000000000 -0400 31329--- linux-2.6.32.18/fs/ext4/balloc.c 2010-08-10 13:45:57.000000000 -0400
31286+++ linux-2.6.32.16/fs/ext4/balloc.c 2010-07-09 14:50:37.000000000 -0400 31330+++ linux-2.6.32.18/fs/ext4/balloc.c 2010-08-11 18:57:32.000000000 -0400
31287@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ 31331@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_
31288 /* Hm, nope. Are (enough) root reserved blocks available? */ 31332 /* Hm, nope. Are (enough) root reserved blocks available? */
31289 if (sbi->s_resuid == current_fsuid() || 31333 if (sbi->s_resuid == current_fsuid() ||
@@ -31293,10 +31337,10 @@ diff -urNp linux-2.6.32.16/fs/ext4/balloc.c linux-2.6.32.16/fs/ext4/balloc.c
31293 if (free_blocks >= (nblocks + dirty_blocks)) 31337 if (free_blocks >= (nblocks + dirty_blocks))
31294 return 1; 31338 return 1;
31295 } 31339 }
31296diff -urNp linux-2.6.32.16/fs/ext4/ioctl.c linux-2.6.32.16/fs/ext4/ioctl.c 31340diff -urNp linux-2.6.32.18/fs/ext4/ioctl.c linux-2.6.32.18/fs/ext4/ioctl.c
31297--- linux-2.6.32.16/fs/ext4/ioctl.c 2010-07-05 14:14:00.000000000 -0400 31341--- linux-2.6.32.18/fs/ext4/ioctl.c 2010-08-10 13:45:57.000000000 -0400
31298+++ linux-2.6.32.16/fs/ext4/ioctl.c 2010-07-09 14:50:37.000000000 -0400 31342+++ linux-2.6.32.18/fs/ext4/ioctl.c 2010-08-11 18:57:32.000000000 -0400
31299@@ -221,6 +221,9 @@ setversion_out: 31343@@ -230,6 +230,9 @@ setversion_out:
31300 struct file *donor_filp; 31344 struct file *donor_filp;
31301 int err; 31345 int err;
31302 31346
@@ -31306,9 +31350,9 @@ diff -urNp linux-2.6.32.16/fs/ext4/ioctl.c linux-2.6.32.16/fs/ext4/ioctl.c
31306 if (!(filp->f_mode & FMODE_READ) || 31350 if (!(filp->f_mode & FMODE_READ) ||
31307 !(filp->f_mode & FMODE_WRITE)) 31351 !(filp->f_mode & FMODE_WRITE))
31308 return -EBADF; 31352 return -EBADF;
31309diff -urNp linux-2.6.32.16/fs/ext4/namei.c linux-2.6.32.16/fs/ext4/namei.c 31353diff -urNp linux-2.6.32.18/fs/ext4/namei.c linux-2.6.32.18/fs/ext4/namei.c
31310--- linux-2.6.32.16/fs/ext4/namei.c 2010-07-05 14:14:00.000000000 -0400 31354--- linux-2.6.32.18/fs/ext4/namei.c 2010-08-10 13:45:57.000000000 -0400
31311+++ linux-2.6.32.16/fs/ext4/namei.c 2010-07-09 14:50:37.000000000 -0400 31355+++ linux-2.6.32.18/fs/ext4/namei.c 2010-08-11 18:57:32.000000000 -0400
31312@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split 31356@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
31313 char *data1 = (*bh)->b_data, *data2; 31357 char *data1 = (*bh)->b_data, *data2;
31314 unsigned split, move, size; 31358 unsigned split, move, size;
@@ -31318,10 +31362,10 @@ diff -urNp linux-2.6.32.16/fs/ext4/namei.c linux-2.6.32.16/fs/ext4/namei.c
31318 31362
31319 bh2 = ext4_append (handle, dir, &newblock, &err); 31363 bh2 = ext4_append (handle, dir, &newblock, &err);
31320 if (!(bh2)) { 31364 if (!(bh2)) {
31321diff -urNp linux-2.6.32.16/fs/ext4/super.c linux-2.6.32.16/fs/ext4/super.c 31365diff -urNp linux-2.6.32.18/fs/ext4/super.c linux-2.6.32.18/fs/ext4/super.c
31322--- linux-2.6.32.16/fs/ext4/super.c 2010-07-05 14:14:00.000000000 -0400 31366--- linux-2.6.32.18/fs/ext4/super.c 2010-08-10 13:45:57.000000000 -0400
31323+++ linux-2.6.32.16/fs/ext4/super.c 2010-07-09 14:50:38.000000000 -0400 31367+++ linux-2.6.32.18/fs/ext4/super.c 2010-08-11 18:57:32.000000000 -0400
31324@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje 31368@@ -2280,7 +2280,7 @@ static void ext4_sb_release(struct kobje
31325 } 31369 }
31326 31370
31327 31371
@@ -31330,9 +31374,9 @@ diff -urNp linux-2.6.32.16/fs/ext4/super.c linux-2.6.32.16/fs/ext4/super.c
31330 .show = ext4_attr_show, 31374 .show = ext4_attr_show,
31331 .store = ext4_attr_store, 31375 .store = ext4_attr_store,
31332 }; 31376 };
31333diff -urNp linux-2.6.32.16/fs/ext4/xattr.c linux-2.6.32.16/fs/ext4/xattr.c 31377diff -urNp linux-2.6.32.18/fs/ext4/xattr.c linux-2.6.32.18/fs/ext4/xattr.c
31334--- linux-2.6.32.16/fs/ext4/xattr.c 2010-07-05 14:14:00.000000000 -0400 31378--- linux-2.6.32.18/fs/ext4/xattr.c 2010-08-10 13:45:57.000000000 -0400
31335+++ linux-2.6.32.16/fs/ext4/xattr.c 2010-07-09 14:50:38.000000000 -0400 31379+++ linux-2.6.32.18/fs/ext4/xattr.c 2010-08-11 18:57:32.000000000 -0400
31336@@ -82,8 +82,8 @@ 31380@@ -82,8 +82,8 @@
31337 printk("\n"); \ 31381 printk("\n"); \
31338 } while (0) 31382 } while (0)
@@ -31344,9 +31388,9 @@ diff -urNp linux-2.6.32.16/fs/ext4/xattr.c linux-2.6.32.16/fs/ext4/xattr.c
31344 #endif 31388 #endif
31345 31389
31346 static void ext4_xattr_cache_insert(struct buffer_head *); 31390 static void ext4_xattr_cache_insert(struct buffer_head *);
31347diff -urNp linux-2.6.32.16/fs/fcntl.c linux-2.6.32.16/fs/fcntl.c 31391diff -urNp linux-2.6.32.18/fs/fcntl.c linux-2.6.32.18/fs/fcntl.c
31348--- linux-2.6.32.16/fs/fcntl.c 2010-07-05 14:14:00.000000000 -0400 31392--- linux-2.6.32.18/fs/fcntl.c 2010-08-10 13:45:57.000000000 -0400
31349+++ linux-2.6.32.16/fs/fcntl.c 2010-07-10 08:04:59.000000000 -0400 31393+++ linux-2.6.32.18/fs/fcntl.c 2010-08-11 18:57:32.000000000 -0400
31350@@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct 31394@@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct
31351 if (err) 31395 if (err)
31352 return err; 31396 return err;
@@ -31367,9 +31411,9 @@ diff -urNp linux-2.6.32.16/fs/fcntl.c linux-2.6.32.16/fs/fcntl.c
31367 if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 31411 if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
31368 break; 31412 break;
31369 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); 31413 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
31370diff -urNp linux-2.6.32.16/fs/fifo.c linux-2.6.32.16/fs/fifo.c 31414diff -urNp linux-2.6.32.18/fs/fifo.c linux-2.6.32.18/fs/fifo.c
31371--- linux-2.6.32.16/fs/fifo.c 2010-07-05 14:14:00.000000000 -0400 31415--- linux-2.6.32.18/fs/fifo.c 2010-08-10 13:45:57.000000000 -0400
31372+++ linux-2.6.32.16/fs/fifo.c 2010-07-09 14:50:38.000000000 -0400 31416+++ linux-2.6.32.18/fs/fifo.c 2010-08-11 18:57:32.000000000 -0400
31373@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode 31417@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
31374 */ 31418 */
31375 filp->f_op = &read_pipefifo_fops; 31419 filp->f_op = &read_pipefifo_fops;
@@ -31440,9 +31484,9 @@ diff -urNp linux-2.6.32.16/fs/fifo.c linux-2.6.32.16/fs/fifo.c
31440 free_pipe_info(inode); 31484 free_pipe_info(inode);
31441 31485
31442 err_nocleanup: 31486 err_nocleanup:
31443diff -urNp linux-2.6.32.16/fs/file.c linux-2.6.32.16/fs/file.c 31487diff -urNp linux-2.6.32.18/fs/file.c linux-2.6.32.18/fs/file.c
31444--- linux-2.6.32.16/fs/file.c 2010-07-05 14:14:00.000000000 -0400 31488--- linux-2.6.32.18/fs/file.c 2010-08-10 13:45:57.000000000 -0400
31445+++ linux-2.6.32.16/fs/file.c 2010-07-09 14:50:38.000000000 -0400 31489+++ linux-2.6.32.18/fs/file.c 2010-08-11 18:57:32.000000000 -0400
31446@@ -14,6 +14,7 @@ 31490@@ -14,6 +14,7 @@
31447 #include <linux/slab.h> 31491 #include <linux/slab.h>
31448 #include <linux/vmalloc.h> 31492 #include <linux/vmalloc.h>
@@ -31460,9 +31504,9 @@ diff -urNp linux-2.6.32.16/fs/file.c linux-2.6.32.16/fs/file.c
31460 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 31504 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
31461 return -EMFILE; 31505 return -EMFILE;
31462 31506
31463diff -urNp linux-2.6.32.16/fs/fs_struct.c linux-2.6.32.16/fs/fs_struct.c 31507diff -urNp linux-2.6.32.18/fs/fs_struct.c linux-2.6.32.18/fs/fs_struct.c
31464--- linux-2.6.32.16/fs/fs_struct.c 2010-07-05 14:14:00.000000000 -0400 31508--- linux-2.6.32.18/fs/fs_struct.c 2010-08-10 13:45:57.000000000 -0400
31465+++ linux-2.6.32.16/fs/fs_struct.c 2010-07-09 14:50:38.000000000 -0400 31509+++ linux-2.6.32.18/fs/fs_struct.c 2010-08-11 18:57:32.000000000 -0400
31466@@ -4,6 +4,7 @@ 31510@@ -4,6 +4,7 @@
31467 #include <linux/path.h> 31511 #include <linux/path.h>
31468 #include <linux/slab.h> 31512 #include <linux/slab.h>
@@ -31542,9 +31586,9 @@ diff -urNp linux-2.6.32.16/fs/fs_struct.c linux-2.6.32.16/fs/fs_struct.c
31542 write_unlock(&fs->lock); 31586 write_unlock(&fs->lock);
31543 31587
31544 task_unlock(current); 31588 task_unlock(current);
31545diff -urNp linux-2.6.32.16/fs/fuse/control.c linux-2.6.32.16/fs/fuse/control.c 31589diff -urNp linux-2.6.32.18/fs/fuse/control.c linux-2.6.32.18/fs/fuse/control.c
31546--- linux-2.6.32.16/fs/fuse/control.c 2010-07-05 14:14:00.000000000 -0400 31590--- linux-2.6.32.18/fs/fuse/control.c 2010-08-10 13:45:57.000000000 -0400
31547+++ linux-2.6.32.16/fs/fuse/control.c 2010-07-09 14:50:38.000000000 -0400 31591+++ linux-2.6.32.18/fs/fuse/control.c 2010-08-11 18:57:32.000000000 -0400
31548@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co 31592@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
31549 31593
31550 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) 31594 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -31554,9 +31598,9 @@ diff -urNp linux-2.6.32.16/fs/fuse/control.c linux-2.6.32.16/fs/fuse/control.c
31554 struct fuse_conn *fc; 31598 struct fuse_conn *fc;
31555 int err; 31599 int err;
31556 31600
31557diff -urNp linux-2.6.32.16/fs/fuse/cuse.c linux-2.6.32.16/fs/fuse/cuse.c 31601diff -urNp linux-2.6.32.18/fs/fuse/cuse.c linux-2.6.32.18/fs/fuse/cuse.c
31558--- linux-2.6.32.16/fs/fuse/cuse.c 2010-07-05 14:14:00.000000000 -0400 31602--- linux-2.6.32.18/fs/fuse/cuse.c 2010-08-10 13:45:57.000000000 -0400
31559+++ linux-2.6.32.16/fs/fuse/cuse.c 2010-07-09 14:50:38.000000000 -0400 31603+++ linux-2.6.32.18/fs/fuse/cuse.c 2010-08-11 18:57:32.000000000 -0400
31560@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i 31604@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
31561 return rc; 31605 return rc;
31562 } 31606 }
@@ -31591,9 +31635,9 @@ diff -urNp linux-2.6.32.16/fs/fuse/cuse.c linux-2.6.32.16/fs/fuse/cuse.c
31591 cuse_class = class_create(THIS_MODULE, "cuse"); 31635 cuse_class = class_create(THIS_MODULE, "cuse");
31592 if (IS_ERR(cuse_class)) 31636 if (IS_ERR(cuse_class))
31593 return PTR_ERR(cuse_class); 31637 return PTR_ERR(cuse_class);
31594diff -urNp linux-2.6.32.16/fs/fuse/dev.c linux-2.6.32.16/fs/fuse/dev.c 31638diff -urNp linux-2.6.32.18/fs/fuse/dev.c linux-2.6.32.18/fs/fuse/dev.c
31595--- linux-2.6.32.16/fs/fuse/dev.c 2010-07-05 14:14:00.000000000 -0400 31639--- linux-2.6.32.18/fs/fuse/dev.c 2010-08-10 13:45:57.000000000 -0400
31596+++ linux-2.6.32.16/fs/fuse/dev.c 2010-07-09 14:50:38.000000000 -0400 31640+++ linux-2.6.32.18/fs/fuse/dev.c 2010-08-11 18:57:32.000000000 -0400
31597@@ -745,7 +745,7 @@ __releases(&fc->lock) 31641@@ -745,7 +745,7 @@ __releases(&fc->lock)
31598 * request_end(). Otherwise add it to the processing list, and set 31642 * request_end(). Otherwise add it to the processing list, and set
31599 * the 'sent' flag. 31643 * the 'sent' flag.
@@ -31699,9 +31743,9 @@ diff -urNp linux-2.6.32.16/fs/fuse/dev.c linux-2.6.32.16/fs/fuse/dev.c
31699 31743
31700 const struct file_operations fuse_dev_operations = { 31744 const struct file_operations fuse_dev_operations = {
31701 .owner = THIS_MODULE, 31745 .owner = THIS_MODULE,
31702diff -urNp linux-2.6.32.16/fs/fuse/dir.c linux-2.6.32.16/fs/fuse/dir.c 31746diff -urNp linux-2.6.32.18/fs/fuse/dir.c linux-2.6.32.18/fs/fuse/dir.c
31703--- linux-2.6.32.16/fs/fuse/dir.c 2010-07-05 14:14:00.000000000 -0400 31747--- linux-2.6.32.18/fs/fuse/dir.c 2010-08-10 13:45:57.000000000 -0400
31704+++ linux-2.6.32.16/fs/fuse/dir.c 2010-07-09 14:50:38.000000000 -0400 31748+++ linux-2.6.32.18/fs/fuse/dir.c 2010-08-11 18:57:32.000000000 -0400
31705@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de 31749@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
31706 return link; 31750 return link;
31707 } 31751 }
@@ -31711,9 +31755,9 @@ diff -urNp linux-2.6.32.16/fs/fuse/dir.c linux-2.6.32.16/fs/fuse/dir.c
31711 { 31755 {
31712 if (!IS_ERR(link)) 31756 if (!IS_ERR(link))
31713 free_page((unsigned long) link); 31757 free_page((unsigned long) link);
31714diff -urNp linux-2.6.32.16/fs/fuse/fuse_i.h linux-2.6.32.16/fs/fuse/fuse_i.h 31758diff -urNp linux-2.6.32.18/fs/fuse/fuse_i.h linux-2.6.32.18/fs/fuse/fuse_i.h
31715--- linux-2.6.32.16/fs/fuse/fuse_i.h 2010-07-05 14:14:00.000000000 -0400 31759--- linux-2.6.32.18/fs/fuse/fuse_i.h 2010-08-10 13:45:57.000000000 -0400
31716+++ linux-2.6.32.16/fs/fuse/fuse_i.h 2010-07-09 14:50:38.000000000 -0400 31760+++ linux-2.6.32.18/fs/fuse/fuse_i.h 2010-08-11 18:57:32.000000000 -0400
31717@@ -521,6 +521,16 @@ extern const struct file_operations fuse 31761@@ -521,6 +521,16 @@ extern const struct file_operations fuse
31718 31762
31719 extern const struct dentry_operations fuse_dentry_operations; 31763 extern const struct dentry_operations fuse_dentry_operations;
@@ -31731,9 +31775,9 @@ diff -urNp linux-2.6.32.16/fs/fuse/fuse_i.h linux-2.6.32.16/fs/fuse/fuse_i.h
31731 /** 31775 /**
31732 * Inode to nodeid comparison. 31776 * Inode to nodeid comparison.
31733 */ 31777 */
31734diff -urNp linux-2.6.32.16/fs/gfs2/sys.c linux-2.6.32.16/fs/gfs2/sys.c 31778diff -urNp linux-2.6.32.18/fs/gfs2/sys.c linux-2.6.32.18/fs/gfs2/sys.c
31735--- linux-2.6.32.16/fs/gfs2/sys.c 2010-07-05 14:14:00.000000000 -0400 31779--- linux-2.6.32.18/fs/gfs2/sys.c 2010-08-10 13:45:57.000000000 -0400
31736+++ linux-2.6.32.16/fs/gfs2/sys.c 2010-07-09 14:50:38.000000000 -0400 31780+++ linux-2.6.32.18/fs/gfs2/sys.c 2010-08-11 18:57:32.000000000 -0400
31737@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko 31781@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
31738 return a->store ? a->store(sdp, buf, len) : len; 31782 return a->store ? a->store(sdp, buf, len) : len;
31739 } 31783 }
@@ -31752,9 +31796,9 @@ diff -urNp linux-2.6.32.16/fs/gfs2/sys.c linux-2.6.32.16/fs/gfs2/sys.c
31752 .uevent = gfs2_uevent, 31796 .uevent = gfs2_uevent,
31753 }; 31797 };
31754 31798
31755diff -urNp linux-2.6.32.16/fs/hfs/inode.c linux-2.6.32.16/fs/hfs/inode.c 31799diff -urNp linux-2.6.32.18/fs/hfs/inode.c linux-2.6.32.18/fs/hfs/inode.c
31756--- linux-2.6.32.16/fs/hfs/inode.c 2010-07-05 14:14:00.000000000 -0400 31800--- linux-2.6.32.18/fs/hfs/inode.c 2010-08-10 13:45:57.000000000 -0400
31757+++ linux-2.6.32.16/fs/hfs/inode.c 2010-07-09 14:50:38.000000000 -0400 31801+++ linux-2.6.32.18/fs/hfs/inode.c 2010-08-11 18:57:32.000000000 -0400
31758@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, 31802@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
31759 31803
31760 if (S_ISDIR(main_inode->i_mode)) { 31804 if (S_ISDIR(main_inode->i_mode)) {
@@ -31773,9 +31817,9 @@ diff -urNp linux-2.6.32.16/fs/hfs/inode.c linux-2.6.32.16/fs/hfs/inode.c
31773 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, 31817 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
31774 sizeof(struct hfs_cat_file)); 31818 sizeof(struct hfs_cat_file));
31775 if (rec.type != HFS_CDR_FIL || 31819 if (rec.type != HFS_CDR_FIL ||
31776diff -urNp linux-2.6.32.16/fs/hfsplus/inode.c linux-2.6.32.16/fs/hfsplus/inode.c 31820diff -urNp linux-2.6.32.18/fs/hfsplus/inode.c linux-2.6.32.18/fs/hfsplus/inode.c
31777--- linux-2.6.32.16/fs/hfsplus/inode.c 2010-07-05 14:14:00.000000000 -0400 31821--- linux-2.6.32.18/fs/hfsplus/inode.c 2010-08-10 13:45:57.000000000 -0400
31778+++ linux-2.6.32.16/fs/hfsplus/inode.c 2010-07-09 14:50:38.000000000 -0400 31822+++ linux-2.6.32.18/fs/hfsplus/inode.c 2010-08-11 18:57:32.000000000 -0400
31779@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode 31823@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
31780 struct hfsplus_cat_folder *folder = &entry.folder; 31824 struct hfsplus_cat_folder *folder = &entry.folder;
31781 31825
@@ -31812,9 +31856,9 @@ diff -urNp linux-2.6.32.16/fs/hfsplus/inode.c linux-2.6.32.16/fs/hfsplus/inode.c
31812 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, 31856 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
31813 sizeof(struct hfsplus_cat_file)); 31857 sizeof(struct hfsplus_cat_file));
31814 hfsplus_inode_write_fork(inode, &file->data_fork); 31858 hfsplus_inode_write_fork(inode, &file->data_fork);
31815diff -urNp linux-2.6.32.16/fs/hugetlbfs/inode.c linux-2.6.32.16/fs/hugetlbfs/inode.c 31859diff -urNp linux-2.6.32.18/fs/hugetlbfs/inode.c linux-2.6.32.18/fs/hugetlbfs/inode.c
31816--- linux-2.6.32.16/fs/hugetlbfs/inode.c 2010-07-05 14:14:00.000000000 -0400 31860--- linux-2.6.32.18/fs/hugetlbfs/inode.c 2010-08-10 13:45:57.000000000 -0400
31817+++ linux-2.6.32.16/fs/hugetlbfs/inode.c 2010-07-09 14:50:38.000000000 -0400 31861+++ linux-2.6.32.18/fs/hugetlbfs/inode.c 2010-08-11 18:57:32.000000000 -0400
31818@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs 31862@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
31819 .kill_sb = kill_litter_super, 31863 .kill_sb = kill_litter_super,
31820 }; 31864 };
@@ -31824,9 +31868,9 @@ diff -urNp linux-2.6.32.16/fs/hugetlbfs/inode.c linux-2.6.32.16/fs/hugetlbfs/ino
31824 31868
31825 static int can_do_hugetlb_shm(void) 31869 static int can_do_hugetlb_shm(void)
31826 { 31870 {
31827diff -urNp linux-2.6.32.16/fs/ioctl.c linux-2.6.32.16/fs/ioctl.c 31871diff -urNp linux-2.6.32.18/fs/ioctl.c linux-2.6.32.18/fs/ioctl.c
31828--- linux-2.6.32.16/fs/ioctl.c 2010-07-05 14:14:00.000000000 -0400 31872--- linux-2.6.32.18/fs/ioctl.c 2010-08-10 13:45:57.000000000 -0400
31829+++ linux-2.6.32.16/fs/ioctl.c 2010-07-09 14:50:38.000000000 -0400 31873+++ linux-2.6.32.18/fs/ioctl.c 2010-08-11 18:57:32.000000000 -0400
31830@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema 31874@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
31831 u64 phys, u64 len, u32 flags) 31875 u64 phys, u64 len, u32 flags)
31832 { 31876 {
@@ -31854,9 +31898,9 @@ diff -urNp linux-2.6.32.16/fs/ioctl.c linux-2.6.32.16/fs/ioctl.c
31854 error = -EFAULT; 31898 error = -EFAULT;
31855 31899
31856 return error; 31900 return error;
31857diff -urNp linux-2.6.32.16/fs/jffs2/debug.h linux-2.6.32.16/fs/jffs2/debug.h 31901diff -urNp linux-2.6.32.18/fs/jffs2/debug.h linux-2.6.32.18/fs/jffs2/debug.h
31858--- linux-2.6.32.16/fs/jffs2/debug.h 2010-07-05 14:14:00.000000000 -0400 31902--- linux-2.6.32.18/fs/jffs2/debug.h 2010-08-10 13:45:57.000000000 -0400
31859+++ linux-2.6.32.16/fs/jffs2/debug.h 2010-07-09 14:50:38.000000000 -0400 31903+++ linux-2.6.32.18/fs/jffs2/debug.h 2010-08-11 18:57:32.000000000 -0400
31860@@ -52,13 +52,13 @@ 31904@@ -52,13 +52,13 @@
31861 #if CONFIG_JFFS2_FS_DEBUG > 0 31905 #if CONFIG_JFFS2_FS_DEBUG > 0
31862 #define D1(x) x 31906 #define D1(x) x
@@ -31958,9 +32002,9 @@ diff -urNp linux-2.6.32.16/fs/jffs2/debug.h linux-2.6.32.16/fs/jffs2/debug.h
31958 #endif 32002 #endif
31959 32003
31960 /* "Sanity" checks */ 32004 /* "Sanity" checks */
31961diff -urNp linux-2.6.32.16/fs/jffs2/erase.c linux-2.6.32.16/fs/jffs2/erase.c 32005diff -urNp linux-2.6.32.18/fs/jffs2/erase.c linux-2.6.32.18/fs/jffs2/erase.c
31962--- linux-2.6.32.16/fs/jffs2/erase.c 2010-07-05 14:14:00.000000000 -0400 32006--- linux-2.6.32.18/fs/jffs2/erase.c 2010-08-10 13:45:57.000000000 -0400
31963+++ linux-2.6.32.16/fs/jffs2/erase.c 2010-07-09 14:50:38.000000000 -0400 32007+++ linux-2.6.32.18/fs/jffs2/erase.c 2010-08-11 18:57:32.000000000 -0400
31964@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru 32008@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
31965 struct jffs2_unknown_node marker = { 32009 struct jffs2_unknown_node marker = {
31966 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), 32010 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -31971,9 +32015,9 @@ diff -urNp linux-2.6.32.16/fs/jffs2/erase.c linux-2.6.32.16/fs/jffs2/erase.c
31971 }; 32015 };
31972 32016
31973 jffs2_prealloc_raw_node_refs(c, jeb, 1); 32017 jffs2_prealloc_raw_node_refs(c, jeb, 1);
31974diff -urNp linux-2.6.32.16/fs/jffs2/summary.h linux-2.6.32.16/fs/jffs2/summary.h 32018diff -urNp linux-2.6.32.18/fs/jffs2/summary.h linux-2.6.32.18/fs/jffs2/summary.h
31975--- linux-2.6.32.16/fs/jffs2/summary.h 2010-07-05 14:14:00.000000000 -0400 32019--- linux-2.6.32.18/fs/jffs2/summary.h 2010-08-10 13:45:57.000000000 -0400
31976+++ linux-2.6.32.16/fs/jffs2/summary.h 2010-07-09 14:50:38.000000000 -0400 32020+++ linux-2.6.32.18/fs/jffs2/summary.h 2010-08-11 18:57:32.000000000 -0400
31977@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ 32021@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
31978 32022
31979 #define jffs2_sum_active() (0) 32023 #define jffs2_sum_active() (0)
@@ -32002,9 +32046,9 @@ diff -urNp linux-2.6.32.16/fs/jffs2/summary.h linux-2.6.32.16/fs/jffs2/summary.h
32002 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) 32046 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
32003 32047
32004 #endif /* CONFIG_JFFS2_SUMMARY */ 32048 #endif /* CONFIG_JFFS2_SUMMARY */
32005diff -urNp linux-2.6.32.16/fs/jffs2/wbuf.c linux-2.6.32.16/fs/jffs2/wbuf.c 32049diff -urNp linux-2.6.32.18/fs/jffs2/wbuf.c linux-2.6.32.18/fs/jffs2/wbuf.c
32006--- linux-2.6.32.16/fs/jffs2/wbuf.c 2010-07-05 14:14:00.000000000 -0400 32050--- linux-2.6.32.18/fs/jffs2/wbuf.c 2010-08-10 13:45:57.000000000 -0400
32007+++ linux-2.6.32.16/fs/jffs2/wbuf.c 2010-07-09 14:50:38.000000000 -0400 32051+++ linux-2.6.32.18/fs/jffs2/wbuf.c 2010-08-11 18:57:32.000000000 -0400
32008@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o 32052@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
32009 { 32053 {
32010 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), 32054 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -32015,9 +32059,9 @@ diff -urNp linux-2.6.32.16/fs/jffs2/wbuf.c linux-2.6.32.16/fs/jffs2/wbuf.c
32015 }; 32059 };
32016 32060
32017 /* 32061 /*
32018diff -urNp linux-2.6.32.16/fs/lockd/svc.c linux-2.6.32.16/fs/lockd/svc.c 32062diff -urNp linux-2.6.32.18/fs/lockd/svc.c linux-2.6.32.18/fs/lockd/svc.c
32019--- linux-2.6.32.16/fs/lockd/svc.c 2010-07-05 14:14:00.000000000 -0400 32063--- linux-2.6.32.18/fs/lockd/svc.c 2010-08-10 13:45:57.000000000 -0400
32020+++ linux-2.6.32.16/fs/lockd/svc.c 2010-07-09 14:50:38.000000000 -0400 32064+++ linux-2.6.32.18/fs/lockd/svc.c 2010-08-11 18:57:32.000000000 -0400
32021@@ -43,7 +43,7 @@ 32065@@ -43,7 +43,7 @@
32022 32066
32023 static struct svc_program nlmsvc_program; 32067 static struct svc_program nlmsvc_program;
@@ -32027,9 +32071,9 @@ diff -urNp linux-2.6.32.16/fs/lockd/svc.c linux-2.6.32.16/fs/lockd/svc.c
32027 EXPORT_SYMBOL_GPL(nlmsvc_ops); 32071 EXPORT_SYMBOL_GPL(nlmsvc_ops);
32028 32072
32029 static DEFINE_MUTEX(nlmsvc_mutex); 32073 static DEFINE_MUTEX(nlmsvc_mutex);
32030diff -urNp linux-2.6.32.16/fs/locks.c linux-2.6.32.16/fs/locks.c 32074diff -urNp linux-2.6.32.18/fs/locks.c linux-2.6.32.18/fs/locks.c
32031--- linux-2.6.32.16/fs/locks.c 2010-07-05 14:14:00.000000000 -0400 32075--- linux-2.6.32.18/fs/locks.c 2010-08-10 13:45:57.000000000 -0400
32032+++ linux-2.6.32.16/fs/locks.c 2010-07-09 14:50:38.000000000 -0400 32076+++ linux-2.6.32.18/fs/locks.c 2010-08-11 18:57:32.000000000 -0400
32033@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil 32077@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
32034 return; 32078 return;
32035 32079
@@ -32051,9 +32095,9 @@ diff -urNp linux-2.6.32.16/fs/locks.c linux-2.6.32.16/fs/locks.c
32051 } 32095 }
32052 32096
32053 lock_kernel(); 32097 lock_kernel();
32054diff -urNp linux-2.6.32.16/fs/namei.c linux-2.6.32.16/fs/namei.c 32098diff -urNp linux-2.6.32.18/fs/namei.c linux-2.6.32.18/fs/namei.c
32055--- linux-2.6.32.16/fs/namei.c 2010-07-05 14:14:00.000000000 -0400 32099--- linux-2.6.32.18/fs/namei.c 2010-08-10 13:45:57.000000000 -0400
32056+++ linux-2.6.32.16/fs/namei.c 2010-07-09 14:50:38.000000000 -0400 32100+++ linux-2.6.32.18/fs/namei.c 2010-08-11 18:57:32.000000000 -0400
32057@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l 32101@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l
32058 cookie = dentry->d_inode->i_op->follow_link(dentry, nd); 32102 cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
32059 error = PTR_ERR(cookie); 32103 error = PTR_ERR(cookie);
@@ -32380,9 +32424,9 @@ diff -urNp linux-2.6.32.16/fs/namei.c linux-2.6.32.16/fs/namei.c
32380 exit6: 32424 exit6:
32381 mnt_drop_write(oldnd.path.mnt); 32425 mnt_drop_write(oldnd.path.mnt);
32382 exit5: 32426 exit5:
32383diff -urNp linux-2.6.32.16/fs/namespace.c linux-2.6.32.16/fs/namespace.c 32427diff -urNp linux-2.6.32.18/fs/namespace.c linux-2.6.32.18/fs/namespace.c
32384--- linux-2.6.32.16/fs/namespace.c 2010-07-05 14:14:00.000000000 -0400 32428--- linux-2.6.32.18/fs/namespace.c 2010-08-10 13:45:57.000000000 -0400
32385+++ linux-2.6.32.16/fs/namespace.c 2010-07-09 14:50:38.000000000 -0400 32429+++ linux-2.6.32.18/fs/namespace.c 2010-08-11 18:57:32.000000000 -0400
32386@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn 32430@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
32387 if (!(sb->s_flags & MS_RDONLY)) 32431 if (!(sb->s_flags & MS_RDONLY))
32388 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); 32432 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -32443,9 +32487,9 @@ diff -urNp linux-2.6.32.16/fs/namespace.c linux-2.6.32.16/fs/namespace.c
32443 read_lock(&current->fs->lock); 32487 read_lock(&current->fs->lock);
32444 root = current->fs->root; 32488 root = current->fs->root;
32445 path_get(&current->fs->root); 32489 path_get(&current->fs->root);
32446diff -urNp linux-2.6.32.16/fs/nfs/inode.c linux-2.6.32.16/fs/nfs/inode.c 32490diff -urNp linux-2.6.32.18/fs/nfs/inode.c linux-2.6.32.18/fs/nfs/inode.c
32447--- linux-2.6.32.16/fs/nfs/inode.c 2010-07-05 14:14:00.000000000 -0400 32491--- linux-2.6.32.18/fs/nfs/inode.c 2010-08-10 13:45:57.000000000 -0400
32448+++ linux-2.6.32.16/fs/nfs/inode.c 2010-07-09 14:50:38.000000000 -0400 32492+++ linux-2.6.32.18/fs/nfs/inode.c 2010-08-11 18:57:32.000000000 -0400
32449@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st 32493@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
32450 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); 32494 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
32451 } 32495 }
@@ -32466,9 +32510,9 @@ diff -urNp linux-2.6.32.16/fs/nfs/inode.c linux-2.6.32.16/fs/nfs/inode.c
32466 } 32510 }
32467 32511
32468 void nfs_fattr_init(struct nfs_fattr *fattr) 32512 void nfs_fattr_init(struct nfs_fattr *fattr)
32469diff -urNp linux-2.6.32.16/fs/nfs/nfs4proc.c linux-2.6.32.16/fs/nfs/nfs4proc.c 32513diff -urNp linux-2.6.32.18/fs/nfs/nfs4proc.c linux-2.6.32.18/fs/nfs/nfs4proc.c
32470--- linux-2.6.32.16/fs/nfs/nfs4proc.c 2010-07-05 14:14:00.000000000 -0400 32514--- linux-2.6.32.18/fs/nfs/nfs4proc.c 2010-08-10 13:45:57.000000000 -0400
32471+++ linux-2.6.32.16/fs/nfs/nfs4proc.c 2010-07-09 14:50:38.000000000 -0400 32515+++ linux-2.6.32.18/fs/nfs/nfs4proc.c 2010-08-11 18:57:32.000000000 -0400
32472@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct 32516@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct
32473 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) 32517 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
32474 { 32518 {
@@ -32739,9 +32783,9 @@ diff -urNp linux-2.6.32.16/fs/nfs/nfs4proc.c linux-2.6.32.16/fs/nfs/nfs4proc.c
32739 int err; 32783 int err;
32740 32784
32741 err = nfs4_set_lock_state(state, fl); 32785 err = nfs4_set_lock_state(state, fl);
32742diff -urNp linux-2.6.32.16/fs/nfsd/lockd.c linux-2.6.32.16/fs/nfsd/lockd.c 32786diff -urNp linux-2.6.32.18/fs/nfsd/lockd.c linux-2.6.32.18/fs/nfsd/lockd.c
32743--- linux-2.6.32.16/fs/nfsd/lockd.c 2010-07-05 14:14:00.000000000 -0400 32787--- linux-2.6.32.18/fs/nfsd/lockd.c 2010-08-10 13:45:57.000000000 -0400
32744+++ linux-2.6.32.16/fs/nfsd/lockd.c 2010-07-09 14:50:38.000000000 -0400 32788+++ linux-2.6.32.18/fs/nfsd/lockd.c 2010-08-11 18:57:32.000000000 -0400
32745@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) 32789@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
32746 fput(filp); 32790 fput(filp);
32747 } 32791 }
@@ -32751,9 +32795,9 @@ diff -urNp linux-2.6.32.16/fs/nfsd/lockd.c linux-2.6.32.16/fs/nfsd/lockd.c
32751 .fopen = nlm_fopen, /* open file for locking */ 32795 .fopen = nlm_fopen, /* open file for locking */
32752 .fclose = nlm_fclose, /* close file */ 32796 .fclose = nlm_fclose, /* close file */
32753 }; 32797 };
32754diff -urNp linux-2.6.32.16/fs/nfsd/vfs.c linux-2.6.32.16/fs/nfsd/vfs.c 32798diff -urNp linux-2.6.32.18/fs/nfsd/vfs.c linux-2.6.32.18/fs/nfsd/vfs.c
32755--- linux-2.6.32.16/fs/nfsd/vfs.c 2010-07-05 14:14:00.000000000 -0400 32799--- linux-2.6.32.18/fs/nfsd/vfs.c 2010-08-10 13:45:57.000000000 -0400
32756+++ linux-2.6.32.16/fs/nfsd/vfs.c 2010-07-09 14:50:38.000000000 -0400 32800+++ linux-2.6.32.18/fs/nfsd/vfs.c 2010-08-11 18:57:32.000000000 -0400
32757@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st 32801@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
32758 } else { 32802 } else {
32759 oldfs = get_fs(); 32803 oldfs = get_fs();
@@ -32781,9 +32825,9 @@ diff -urNp linux-2.6.32.16/fs/nfsd/vfs.c linux-2.6.32.16/fs/nfsd/vfs.c
32781 set_fs(oldfs); 32825 set_fs(oldfs);
32782 32826
32783 if (host_err < 0) 32827 if (host_err < 0)
32784diff -urNp linux-2.6.32.16/fs/nls/nls_base.c linux-2.6.32.16/fs/nls/nls_base.c 32828diff -urNp linux-2.6.32.18/fs/nls/nls_base.c linux-2.6.32.18/fs/nls/nls_base.c
32785--- linux-2.6.32.16/fs/nls/nls_base.c 2010-07-05 14:14:00.000000000 -0400 32829--- linux-2.6.32.18/fs/nls/nls_base.c 2010-08-10 13:45:57.000000000 -0400
32786+++ linux-2.6.32.16/fs/nls/nls_base.c 2010-07-09 14:50:38.000000000 -0400 32830+++ linux-2.6.32.18/fs/nls/nls_base.c 2010-08-11 18:57:32.000000000 -0400
32787@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl 32831@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
32788 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, 32832 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
32789 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, 32833 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
@@ -32793,9 +32837,9 @@ diff -urNp linux-2.6.32.16/fs/nls/nls_base.c linux-2.6.32.16/fs/nls/nls_base.c
32793 }; 32837 };
32794 32838
32795 #define UNICODE_MAX 0x0010ffff 32839 #define UNICODE_MAX 0x0010ffff
32796diff -urNp linux-2.6.32.16/fs/ntfs/file.c linux-2.6.32.16/fs/ntfs/file.c 32840diff -urNp linux-2.6.32.18/fs/ntfs/file.c linux-2.6.32.18/fs/ntfs/file.c
32797--- linux-2.6.32.16/fs/ntfs/file.c 2010-07-05 14:14:00.000000000 -0400 32841--- linux-2.6.32.18/fs/ntfs/file.c 2010-08-10 13:45:57.000000000 -0400
32798+++ linux-2.6.32.16/fs/ntfs/file.c 2010-07-09 14:50:38.000000000 -0400 32842+++ linux-2.6.32.18/fs/ntfs/file.c 2010-08-11 18:57:32.000000000 -0400
32799@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ 32843@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
32800 #endif /* NTFS_RW */ 32844 #endif /* NTFS_RW */
32801 }; 32845 };
@@ -32805,9 +32849,9 @@ diff -urNp linux-2.6.32.16/fs/ntfs/file.c linux-2.6.32.16/fs/ntfs/file.c
32805 32849
32806-const struct inode_operations ntfs_empty_inode_ops = {}; 32850-const struct inode_operations ntfs_empty_inode_ops = {};
32807+const struct inode_operations ntfs_empty_inode_ops __read_only; 32851+const struct inode_operations ntfs_empty_inode_ops __read_only;
32808diff -urNp linux-2.6.32.16/fs/ocfs2/cluster/masklog.c linux-2.6.32.16/fs/ocfs2/cluster/masklog.c 32852diff -urNp linux-2.6.32.18/fs/ocfs2/cluster/masklog.c linux-2.6.32.18/fs/ocfs2/cluster/masklog.c
32809--- linux-2.6.32.16/fs/ocfs2/cluster/masklog.c 2010-07-05 14:14:00.000000000 -0400 32853--- linux-2.6.32.18/fs/ocfs2/cluster/masklog.c 2010-08-10 13:45:57.000000000 -0400
32810+++ linux-2.6.32.16/fs/ocfs2/cluster/masklog.c 2010-07-09 14:50:38.000000000 -0400 32854+++ linux-2.6.32.18/fs/ocfs2/cluster/masklog.c 2010-08-11 18:57:32.000000000 -0400
32811@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject 32855@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
32812 return mlog_mask_store(mlog_attr->mask, buf, count); 32856 return mlog_mask_store(mlog_attr->mask, buf, count);
32813 } 32857 }
@@ -32817,9 +32861,9 @@ diff -urNp linux-2.6.32.16/fs/ocfs2/cluster/masklog.c linux-2.6.32.16/fs/ocfs2/c
32817 .show = mlog_show, 32861 .show = mlog_show,
32818 .store = mlog_store, 32862 .store = mlog_store,
32819 }; 32863 };
32820diff -urNp linux-2.6.32.16/fs/ocfs2/localalloc.c linux-2.6.32.16/fs/ocfs2/localalloc.c 32864diff -urNp linux-2.6.32.18/fs/ocfs2/localalloc.c linux-2.6.32.18/fs/ocfs2/localalloc.c
32821--- linux-2.6.32.16/fs/ocfs2/localalloc.c 2010-07-05 14:14:00.000000000 -0400 32865--- linux-2.6.32.18/fs/ocfs2/localalloc.c 2010-08-10 13:45:57.000000000 -0400
32822+++ linux-2.6.32.16/fs/ocfs2/localalloc.c 2010-07-09 14:50:38.000000000 -0400 32866+++ linux-2.6.32.18/fs/ocfs2/localalloc.c 2010-08-11 18:57:32.000000000 -0400
32823@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo 32867@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
32824 goto bail; 32868 goto bail;
32825 } 32869 }
@@ -32829,9 +32873,9 @@ diff -urNp linux-2.6.32.16/fs/ocfs2/localalloc.c linux-2.6.32.16/fs/ocfs2/locala
32829 32873
32830 status = 0; 32874 status = 0;
32831 bail: 32875 bail:
32832diff -urNp linux-2.6.32.16/fs/ocfs2/ocfs2.h linux-2.6.32.16/fs/ocfs2/ocfs2.h 32876diff -urNp linux-2.6.32.18/fs/ocfs2/ocfs2.h linux-2.6.32.18/fs/ocfs2/ocfs2.h
32833--- linux-2.6.32.16/fs/ocfs2/ocfs2.h 2010-07-05 14:14:00.000000000 -0400 32877--- linux-2.6.32.18/fs/ocfs2/ocfs2.h 2010-08-10 13:45:57.000000000 -0400
32834+++ linux-2.6.32.16/fs/ocfs2/ocfs2.h 2010-07-09 14:50:38.000000000 -0400 32878+++ linux-2.6.32.18/fs/ocfs2/ocfs2.h 2010-08-11 18:57:32.000000000 -0400
32835@@ -217,11 +217,11 @@ enum ocfs2_vol_state 32879@@ -217,11 +217,11 @@ enum ocfs2_vol_state
32836 32880
32837 struct ocfs2_alloc_stats 32881 struct ocfs2_alloc_stats
@@ -32849,9 +32893,9 @@ diff -urNp linux-2.6.32.16/fs/ocfs2/ocfs2.h linux-2.6.32.16/fs/ocfs2/ocfs2.h
32849 }; 32893 };
32850 32894
32851 enum ocfs2_local_alloc_state 32895 enum ocfs2_local_alloc_state
32852diff -urNp linux-2.6.32.16/fs/ocfs2/suballoc.c linux-2.6.32.16/fs/ocfs2/suballoc.c 32896diff -urNp linux-2.6.32.18/fs/ocfs2/suballoc.c linux-2.6.32.18/fs/ocfs2/suballoc.c
32853--- linux-2.6.32.16/fs/ocfs2/suballoc.c 2010-07-05 14:14:00.000000000 -0400 32897--- linux-2.6.32.18/fs/ocfs2/suballoc.c 2010-08-10 13:45:57.000000000 -0400
32854+++ linux-2.6.32.16/fs/ocfs2/suballoc.c 2010-07-09 14:50:38.000000000 -0400 32898+++ linux-2.6.32.18/fs/ocfs2/suballoc.c 2010-08-11 18:57:32.000000000 -0400
32855@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s 32899@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
32856 mlog_errno(status); 32900 mlog_errno(status);
32857 goto bail; 32901 goto bail;
@@ -32897,9 +32941,9 @@ diff -urNp linux-2.6.32.16/fs/ocfs2/suballoc.c linux-2.6.32.16/fs/ocfs2/suballoc
32897 } 32941 }
32898 } 32942 }
32899 if (status < 0) { 32943 if (status < 0) {
32900diff -urNp linux-2.6.32.16/fs/ocfs2/super.c linux-2.6.32.16/fs/ocfs2/super.c 32944diff -urNp linux-2.6.32.18/fs/ocfs2/super.c linux-2.6.32.18/fs/ocfs2/super.c
32901--- linux-2.6.32.16/fs/ocfs2/super.c 2010-07-05 14:14:00.000000000 -0400 32945--- linux-2.6.32.18/fs/ocfs2/super.c 2010-08-10 13:45:57.000000000 -0400
32902+++ linux-2.6.32.16/fs/ocfs2/super.c 2010-07-09 14:50:38.000000000 -0400 32946+++ linux-2.6.32.18/fs/ocfs2/super.c 2010-08-11 18:57:32.000000000 -0400
32903@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s 32947@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
32904 "%10s => GlobalAllocs: %d LocalAllocs: %d " 32948 "%10s => GlobalAllocs: %d LocalAllocs: %d "
32905 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", 32949 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
@@ -32934,9 +32978,9 @@ diff -urNp linux-2.6.32.16/fs/ocfs2/super.c linux-2.6.32.16/fs/ocfs2/super.c
32934 32978
32935 /* Copy the blockcheck stats from the superblock probe */ 32979 /* Copy the blockcheck stats from the superblock probe */
32936 osb->osb_ecc_stats = *stats; 32980 osb->osb_ecc_stats = *stats;
32937diff -urNp linux-2.6.32.16/fs/open.c linux-2.6.32.16/fs/open.c 32981diff -urNp linux-2.6.32.18/fs/open.c linux-2.6.32.18/fs/open.c
32938--- linux-2.6.32.16/fs/open.c 2010-07-05 14:14:00.000000000 -0400 32982--- linux-2.6.32.18/fs/open.c 2010-08-10 13:45:57.000000000 -0400
32939+++ linux-2.6.32.16/fs/open.c 2010-07-09 14:50:38.000000000 -0400 32983+++ linux-2.6.32.18/fs/open.c 2010-08-11 18:57:32.000000000 -0400
32940@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l 32984@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l
32941 if (length < 0) 32985 if (length < 0)
32942 return -EINVAL; 32986 return -EINVAL;
@@ -33110,9 +33154,9 @@ diff -urNp linux-2.6.32.16/fs/open.c linux-2.6.32.16/fs/open.c
33110 mnt_drop_write(file->f_path.mnt); 33154 mnt_drop_write(file->f_path.mnt);
33111 out_fput: 33155 out_fput:
33112 fput(file); 33156 fput(file);
33113diff -urNp linux-2.6.32.16/fs/pipe.c linux-2.6.32.16/fs/pipe.c 33157diff -urNp linux-2.6.32.18/fs/pipe.c linux-2.6.32.18/fs/pipe.c
33114--- linux-2.6.32.16/fs/pipe.c 2010-07-05 14:14:00.000000000 -0400 33158--- linux-2.6.32.18/fs/pipe.c 2010-08-10 13:45:57.000000000 -0400
33115+++ linux-2.6.32.16/fs/pipe.c 2010-07-09 14:50:38.000000000 -0400 33159+++ linux-2.6.32.18/fs/pipe.c 2010-08-11 18:57:32.000000000 -0400
33116@@ -401,9 +401,9 @@ redo: 33160@@ -401,9 +401,9 @@ redo:
33117 } 33161 }
33118 if (bufs) /* More to do? */ 33162 if (bufs) /* More to do? */
@@ -33236,9 +33280,9 @@ diff -urNp linux-2.6.32.16/fs/pipe.c linux-2.6.32.16/fs/pipe.c
33236 inode->i_fop = &rdwr_pipefifo_fops; 33280 inode->i_fop = &rdwr_pipefifo_fops;
33237 33281
33238 /* 33282 /*
33239diff -urNp linux-2.6.32.16/fs/proc/array.c linux-2.6.32.16/fs/proc/array.c 33283diff -urNp linux-2.6.32.18/fs/proc/array.c linux-2.6.32.18/fs/proc/array.c
33240--- linux-2.6.32.16/fs/proc/array.c 2010-07-05 14:14:00.000000000 -0400 33284--- linux-2.6.32.18/fs/proc/array.c 2010-08-10 13:45:57.000000000 -0400
33241+++ linux-2.6.32.16/fs/proc/array.c 2010-07-09 14:50:38.000000000 -0400 33285+++ linux-2.6.32.18/fs/proc/array.c 2010-08-11 18:57:32.000000000 -0400
33242@@ -321,6 +321,21 @@ static inline void task_context_switch_c 33286@@ -321,6 +321,21 @@ static inline void task_context_switch_c
33243 p->nivcsw); 33287 p->nivcsw);
33244 } 33288 }
@@ -33329,9 +33373,9 @@ diff -urNp linux-2.6.32.16/fs/proc/array.c linux-2.6.32.16/fs/proc/array.c
33329+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); 33373+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
33330+} 33374+}
33331+#endif 33375+#endif
33332diff -urNp linux-2.6.32.16/fs/proc/base.c linux-2.6.32.16/fs/proc/base.c 33376diff -urNp linux-2.6.32.18/fs/proc/base.c linux-2.6.32.18/fs/proc/base.c
33333--- linux-2.6.32.16/fs/proc/base.c 2010-07-05 14:14:00.000000000 -0400 33377--- linux-2.6.32.18/fs/proc/base.c 2010-08-10 13:45:57.000000000 -0400
33334+++ linux-2.6.32.16/fs/proc/base.c 2010-07-10 14:56:09.000000000 -0400 33378+++ linux-2.6.32.18/fs/proc/base.c 2010-08-11 18:57:32.000000000 -0400
33335@@ -102,6 +102,22 @@ struct pid_entry { 33379@@ -102,6 +102,22 @@ struct pid_entry {
33336 union proc_op op; 33380 union proc_op op;
33337 }; 33381 };
@@ -33687,9 +33731,9 @@ diff -urNp linux-2.6.32.16/fs/proc/base.c linux-2.6.32.16/fs/proc/base.c
33687 ONE("stack", S_IRUSR, proc_pid_stack), 33731 ONE("stack", S_IRUSR, proc_pid_stack),
33688 #endif 33732 #endif
33689 #ifdef CONFIG_SCHEDSTATS 33733 #ifdef CONFIG_SCHEDSTATS
33690diff -urNp linux-2.6.32.16/fs/proc/cmdline.c linux-2.6.32.16/fs/proc/cmdline.c 33734diff -urNp linux-2.6.32.18/fs/proc/cmdline.c linux-2.6.32.18/fs/proc/cmdline.c
33691--- linux-2.6.32.16/fs/proc/cmdline.c 2010-07-05 14:14:00.000000000 -0400 33735--- linux-2.6.32.18/fs/proc/cmdline.c 2010-08-10 13:45:57.000000000 -0400
33692+++ linux-2.6.32.16/fs/proc/cmdline.c 2010-07-09 14:50:38.000000000 -0400 33736+++ linux-2.6.32.18/fs/proc/cmdline.c 2010-08-11 18:57:32.000000000 -0400
33693@@ -23,7 +23,11 @@ static const struct file_operations cmdl 33737@@ -23,7 +23,11 @@ static const struct file_operations cmdl
33694 33738
33695 static int __init proc_cmdline_init(void) 33739 static int __init proc_cmdline_init(void)
@@ -33702,9 +33746,9 @@ diff -urNp linux-2.6.32.16/fs/proc/cmdline.c linux-2.6.32.16/fs/proc/cmdline.c
33702 return 0; 33746 return 0;
33703 } 33747 }
33704 module_init(proc_cmdline_init); 33748 module_init(proc_cmdline_init);
33705diff -urNp linux-2.6.32.16/fs/proc/devices.c linux-2.6.32.16/fs/proc/devices.c 33749diff -urNp linux-2.6.32.18/fs/proc/devices.c linux-2.6.32.18/fs/proc/devices.c
33706--- linux-2.6.32.16/fs/proc/devices.c 2010-07-05 14:14:00.000000000 -0400 33750--- linux-2.6.32.18/fs/proc/devices.c 2010-08-10 13:45:57.000000000 -0400
33707+++ linux-2.6.32.16/fs/proc/devices.c 2010-07-09 14:50:38.000000000 -0400 33751+++ linux-2.6.32.18/fs/proc/devices.c 2010-08-11 18:57:32.000000000 -0400
33708@@ -64,7 +64,11 @@ static const struct file_operations proc 33752@@ -64,7 +64,11 @@ static const struct file_operations proc
33709 33753
33710 static int __init proc_devices_init(void) 33754 static int __init proc_devices_init(void)
@@ -33717,9 +33761,9 @@ diff -urNp linux-2.6.32.16/fs/proc/devices.c linux-2.6.32.16/fs/proc/devices.c
33717 return 0; 33761 return 0;
33718 } 33762 }
33719 module_init(proc_devices_init); 33763 module_init(proc_devices_init);
33720diff -urNp linux-2.6.32.16/fs/proc/inode.c linux-2.6.32.16/fs/proc/inode.c 33764diff -urNp linux-2.6.32.18/fs/proc/inode.c linux-2.6.32.18/fs/proc/inode.c
33721--- linux-2.6.32.16/fs/proc/inode.c 2010-07-05 14:14:00.000000000 -0400 33765--- linux-2.6.32.18/fs/proc/inode.c 2010-08-10 13:45:57.000000000 -0400
33722+++ linux-2.6.32.16/fs/proc/inode.c 2010-07-09 14:50:38.000000000 -0400 33766+++ linux-2.6.32.18/fs/proc/inode.c 2010-08-11 18:57:32.000000000 -0400
33723@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe 33767@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
33724 if (de->mode) { 33768 if (de->mode) {
33725 inode->i_mode = de->mode; 33769 inode->i_mode = de->mode;
@@ -33732,9 +33776,9 @@ diff -urNp linux-2.6.32.16/fs/proc/inode.c linux-2.6.32.16/fs/proc/inode.c
33732 } 33776 }
33733 if (de->size) 33777 if (de->size)
33734 inode->i_size = de->size; 33778 inode->i_size = de->size;
33735diff -urNp linux-2.6.32.16/fs/proc/internal.h linux-2.6.32.16/fs/proc/internal.h 33779diff -urNp linux-2.6.32.18/fs/proc/internal.h linux-2.6.32.18/fs/proc/internal.h
33736--- linux-2.6.32.16/fs/proc/internal.h 2010-07-05 14:14:00.000000000 -0400 33780--- linux-2.6.32.18/fs/proc/internal.h 2010-08-10 13:45:57.000000000 -0400
33737+++ linux-2.6.32.16/fs/proc/internal.h 2010-07-09 14:50:38.000000000 -0400 33781+++ linux-2.6.32.18/fs/proc/internal.h 2010-08-11 18:57:32.000000000 -0400
33738@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi 33782@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
33739 struct pid *pid, struct task_struct *task); 33783 struct pid *pid, struct task_struct *task);
33740 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, 33784 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -33745,9 +33789,9 @@ diff -urNp linux-2.6.32.16/fs/proc/internal.h linux-2.6.32.16/fs/proc/internal.h
33745 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); 33789 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
33746 33790
33747 extern const struct file_operations proc_maps_operations; 33791 extern const struct file_operations proc_maps_operations;
33748diff -urNp linux-2.6.32.16/fs/proc/Kconfig linux-2.6.32.16/fs/proc/Kconfig 33792diff -urNp linux-2.6.32.18/fs/proc/Kconfig linux-2.6.32.18/fs/proc/Kconfig
33749--- linux-2.6.32.16/fs/proc/Kconfig 2010-07-05 14:14:00.000000000 -0400 33793--- linux-2.6.32.18/fs/proc/Kconfig 2010-08-10 13:45:57.000000000 -0400
33750+++ linux-2.6.32.16/fs/proc/Kconfig 2010-07-09 14:50:38.000000000 -0400 33794+++ linux-2.6.32.18/fs/proc/Kconfig 2010-08-11 18:57:32.000000000 -0400
33751@@ -30,12 +30,12 @@ config PROC_FS 33795@@ -30,12 +30,12 @@ config PROC_FS
33752 33796
33753 config PROC_KCORE 33797 config PROC_KCORE
@@ -33775,9 +33819,9 @@ diff -urNp linux-2.6.32.16/fs/proc/Kconfig linux-2.6.32.16/fs/proc/Kconfig
33775 bool "Enable /proc page monitoring" if EMBEDDED 33819 bool "Enable /proc page monitoring" if EMBEDDED
33776 help 33820 help
33777 Various /proc files exist to monitor process memory utilization: 33821 Various /proc files exist to monitor process memory utilization:
33778diff -urNp linux-2.6.32.16/fs/proc/kcore.c linux-2.6.32.16/fs/proc/kcore.c 33822diff -urNp linux-2.6.32.18/fs/proc/kcore.c linux-2.6.32.18/fs/proc/kcore.c
33779--- linux-2.6.32.16/fs/proc/kcore.c 2010-07-05 14:14:00.000000000 -0400 33823--- linux-2.6.32.18/fs/proc/kcore.c 2010-08-10 13:45:57.000000000 -0400
33780+++ linux-2.6.32.16/fs/proc/kcore.c 2010-07-09 14:50:38.000000000 -0400 33824+++ linux-2.6.32.18/fs/proc/kcore.c 2010-08-11 18:57:32.000000000 -0400
33781@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use 33825@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use
33782 33826
33783 static int open_kcore(struct inode *inode, struct file *filp) 33827 static int open_kcore(struct inode *inode, struct file *filp)
@@ -33788,9 +33832,9 @@ diff -urNp linux-2.6.32.16/fs/proc/kcore.c linux-2.6.32.16/fs/proc/kcore.c
33788 if (!capable(CAP_SYS_RAWIO)) 33832 if (!capable(CAP_SYS_RAWIO))
33789 return -EPERM; 33833 return -EPERM;
33790 if (kcore_need_update) 33834 if (kcore_need_update)
33791diff -urNp linux-2.6.32.16/fs/proc/meminfo.c linux-2.6.32.16/fs/proc/meminfo.c 33835diff -urNp linux-2.6.32.18/fs/proc/meminfo.c linux-2.6.32.18/fs/proc/meminfo.c
33792--- linux-2.6.32.16/fs/proc/meminfo.c 2010-07-05 14:14:00.000000000 -0400 33836--- linux-2.6.32.18/fs/proc/meminfo.c 2010-08-10 13:45:57.000000000 -0400
33793+++ linux-2.6.32.16/fs/proc/meminfo.c 2010-07-09 14:50:38.000000000 -0400 33837+++ linux-2.6.32.18/fs/proc/meminfo.c 2010-08-11 18:57:32.000000000 -0400
33794@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ 33838@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
33795 vmi.used >> 10, 33839 vmi.used >> 10,
33796 vmi.largest_chunk >> 10 33840 vmi.largest_chunk >> 10
@@ -33800,9 +33844,9 @@ diff -urNp linux-2.6.32.16/fs/proc/meminfo.c linux-2.6.32.16/fs/proc/meminfo.c
33800 #endif 33844 #endif
33801 ); 33845 );
33802 33846
33803diff -urNp linux-2.6.32.16/fs/proc/nommu.c linux-2.6.32.16/fs/proc/nommu.c 33847diff -urNp linux-2.6.32.18/fs/proc/nommu.c linux-2.6.32.18/fs/proc/nommu.c
33804--- linux-2.6.32.16/fs/proc/nommu.c 2010-07-05 14:14:00.000000000 -0400 33848--- linux-2.6.32.18/fs/proc/nommu.c 2010-08-10 13:45:57.000000000 -0400
33805+++ linux-2.6.32.16/fs/proc/nommu.c 2010-07-09 14:50:38.000000000 -0400 33849+++ linux-2.6.32.18/fs/proc/nommu.c 2010-08-11 18:57:32.000000000 -0400
33806@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ 33850@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
33807 if (len < 1) 33851 if (len < 1)
33808 len = 1; 33852 len = 1;
@@ -33812,9 +33856,9 @@ diff -urNp linux-2.6.32.16/fs/proc/nommu.c linux-2.6.32.16/fs/proc/nommu.c
33812 } 33856 }
33813 33857
33814 seq_putc(m, '\n'); 33858 seq_putc(m, '\n');
33815diff -urNp linux-2.6.32.16/fs/proc/proc_net.c linux-2.6.32.16/fs/proc/proc_net.c 33859diff -urNp linux-2.6.32.18/fs/proc/proc_net.c linux-2.6.32.18/fs/proc/proc_net.c
33816--- linux-2.6.32.16/fs/proc/proc_net.c 2010-07-05 14:14:00.000000000 -0400 33860--- linux-2.6.32.18/fs/proc/proc_net.c 2010-08-10 13:45:57.000000000 -0400
33817+++ linux-2.6.32.16/fs/proc/proc_net.c 2010-07-09 14:50:38.000000000 -0400 33861+++ linux-2.6.32.18/fs/proc/proc_net.c 2010-08-11 18:57:32.000000000 -0400
33818@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str 33862@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
33819 struct task_struct *task; 33863 struct task_struct *task;
33820 struct nsproxy *ns; 33864 struct nsproxy *ns;
@@ -33833,9 +33877,9 @@ diff -urNp linux-2.6.32.16/fs/proc/proc_net.c linux-2.6.32.16/fs/proc/proc_net.c
33833 33877
33834 rcu_read_lock(); 33878 rcu_read_lock();
33835 task = pid_task(proc_pid(dir), PIDTYPE_PID); 33879 task = pid_task(proc_pid(dir), PIDTYPE_PID);
33836diff -urNp linux-2.6.32.16/fs/proc/proc_sysctl.c linux-2.6.32.16/fs/proc/proc_sysctl.c 33880diff -urNp linux-2.6.32.18/fs/proc/proc_sysctl.c linux-2.6.32.18/fs/proc/proc_sysctl.c
33837--- linux-2.6.32.16/fs/proc/proc_sysctl.c 2010-07-05 14:14:00.000000000 -0400 33881--- linux-2.6.32.18/fs/proc/proc_sysctl.c 2010-08-10 13:45:57.000000000 -0400
33838+++ linux-2.6.32.16/fs/proc/proc_sysctl.c 2010-07-09 14:50:38.000000000 -0400 33882+++ linux-2.6.32.18/fs/proc/proc_sysctl.c 2010-08-11 18:57:32.000000000 -0400
33839@@ -7,6 +7,8 @@ 33883@@ -7,6 +7,8 @@
33840 #include <linux/security.h> 33884 #include <linux/security.h>
33841 #include "internal.h" 33885 #include "internal.h"
@@ -33875,9 +33919,9 @@ diff -urNp linux-2.6.32.16/fs/proc/proc_sysctl.c linux-2.6.32.16/fs/proc/proc_sy
33875 generic_fillattr(inode, stat); 33919 generic_fillattr(inode, stat);
33876 if (table) 33920 if (table)
33877 stat->mode = (stat->mode & S_IFMT) | table->mode; 33921 stat->mode = (stat->mode & S_IFMT) | table->mode;
33878diff -urNp linux-2.6.32.16/fs/proc/root.c linux-2.6.32.16/fs/proc/root.c 33922diff -urNp linux-2.6.32.18/fs/proc/root.c linux-2.6.32.18/fs/proc/root.c
33879--- linux-2.6.32.16/fs/proc/root.c 2010-07-05 14:14:00.000000000 -0400 33923--- linux-2.6.32.18/fs/proc/root.c 2010-08-10 13:45:57.000000000 -0400
33880+++ linux-2.6.32.16/fs/proc/root.c 2010-07-09 14:50:38.000000000 -0400 33924+++ linux-2.6.32.18/fs/proc/root.c 2010-08-11 18:57:32.000000000 -0400
33881@@ -134,7 +134,15 @@ void __init proc_root_init(void) 33925@@ -134,7 +134,15 @@ void __init proc_root_init(void)
33882 #ifdef CONFIG_PROC_DEVICETREE 33926 #ifdef CONFIG_PROC_DEVICETREE
33883 proc_device_tree_init(); 33927 proc_device_tree_init();
@@ -33894,9 +33938,9 @@ diff -urNp linux-2.6.32.16/fs/proc/root.c linux-2.6.32.16/fs/proc/root.c
33894 proc_sys_init(); 33938 proc_sys_init();
33895 } 33939 }
33896 33940
33897diff -urNp linux-2.6.32.16/fs/proc/task_mmu.c linux-2.6.32.16/fs/proc/task_mmu.c 33941diff -urNp linux-2.6.32.18/fs/proc/task_mmu.c linux-2.6.32.18/fs/proc/task_mmu.c
33898--- linux-2.6.32.16/fs/proc/task_mmu.c 2010-07-05 14:14:00.000000000 -0400 33942--- linux-2.6.32.18/fs/proc/task_mmu.c 2010-08-10 13:45:57.000000000 -0400
33899+++ linux-2.6.32.16/fs/proc/task_mmu.c 2010-07-09 14:50:38.000000000 -0400 33943+++ linux-2.6.32.18/fs/proc/task_mmu.c 2010-08-11 18:57:32.000000000 -0400
33900@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct 33944@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
33901 "VmStk:\t%8lu kB\n" 33945 "VmStk:\t%8lu kB\n"
33902 "VmExe:\t%8lu kB\n" 33946 "VmExe:\t%8lu kB\n"
@@ -34017,9 +34061,9 @@ diff -urNp linux-2.6.32.16/fs/proc/task_mmu.c linux-2.6.32.16/fs/proc/task_mmu.c
34017 mss.resident >> 10, 34061 mss.resident >> 10,
34018 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), 34062 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
34019 mss.shared_clean >> 10, 34063 mss.shared_clean >> 10,
34020diff -urNp linux-2.6.32.16/fs/proc/task_nommu.c linux-2.6.32.16/fs/proc/task_nommu.c 34064diff -urNp linux-2.6.32.18/fs/proc/task_nommu.c linux-2.6.32.18/fs/proc/task_nommu.c
34021--- linux-2.6.32.16/fs/proc/task_nommu.c 2010-07-05 14:14:00.000000000 -0400 34065--- linux-2.6.32.18/fs/proc/task_nommu.c 2010-08-10 13:45:57.000000000 -0400
34022+++ linux-2.6.32.16/fs/proc/task_nommu.c 2010-07-09 14:50:38.000000000 -0400 34066+++ linux-2.6.32.18/fs/proc/task_nommu.c 2010-08-11 18:57:32.000000000 -0400
34023@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct 34067@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
34024 else 34068 else
34025 bytes += kobjsize(mm); 34069 bytes += kobjsize(mm);
@@ -34038,9 +34082,9 @@ diff -urNp linux-2.6.32.16/fs/proc/task_nommu.c linux-2.6.32.16/fs/proc/task_nom
34038 } 34082 }
34039 34083
34040 seq_putc(m, '\n'); 34084 seq_putc(m, '\n');
34041diff -urNp linux-2.6.32.16/fs/readdir.c linux-2.6.32.16/fs/readdir.c 34085diff -urNp linux-2.6.32.18/fs/readdir.c linux-2.6.32.18/fs/readdir.c
34042--- linux-2.6.32.16/fs/readdir.c 2010-07-05 14:14:00.000000000 -0400 34086--- linux-2.6.32.18/fs/readdir.c 2010-08-10 13:45:57.000000000 -0400
34043+++ linux-2.6.32.16/fs/readdir.c 2010-07-09 14:50:38.000000000 -0400 34087+++ linux-2.6.32.18/fs/readdir.c 2010-08-11 18:57:32.000000000 -0400
34044@@ -16,6 +16,7 @@ 34088@@ -16,6 +16,7 @@
34045 #include <linux/security.h> 34089 #include <linux/security.h>
34046 #include <linux/syscalls.h> 34090 #include <linux/syscalls.h>
@@ -34130,9 +34174,9 @@ diff -urNp linux-2.6.32.16/fs/readdir.c linux-2.6.32.16/fs/readdir.c
34130 buf.count = count; 34174 buf.count = count;
34131 buf.error = 0; 34175 buf.error = 0;
34132 34176
34133diff -urNp linux-2.6.32.16/fs/reiserfs/do_balan.c linux-2.6.32.16/fs/reiserfs/do_balan.c 34177diff -urNp linux-2.6.32.18/fs/reiserfs/do_balan.c linux-2.6.32.18/fs/reiserfs/do_balan.c
34134--- linux-2.6.32.16/fs/reiserfs/do_balan.c 2010-07-05 14:14:00.000000000 -0400 34178--- linux-2.6.32.18/fs/reiserfs/do_balan.c 2010-08-10 13:45:57.000000000 -0400
34135+++ linux-2.6.32.16/fs/reiserfs/do_balan.c 2010-07-09 14:50:38.000000000 -0400 34179+++ linux-2.6.32.18/fs/reiserfs/do_balan.c 2010-08-11 18:57:32.000000000 -0400
34136@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, 34180@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
34137 return; 34181 return;
34138 } 34182 }
@@ -34142,9 +34186,9 @@ diff -urNp linux-2.6.32.16/fs/reiserfs/do_balan.c linux-2.6.32.16/fs/reiserfs/do
34142 do_balance_starts(tb); 34186 do_balance_starts(tb);
34143 34187
34144 /* balance leaf returns 0 except if combining L R and S into 34188 /* balance leaf returns 0 except if combining L R and S into
34145diff -urNp linux-2.6.32.16/fs/reiserfs/item_ops.c linux-2.6.32.16/fs/reiserfs/item_ops.c 34189diff -urNp linux-2.6.32.18/fs/reiserfs/item_ops.c linux-2.6.32.18/fs/reiserfs/item_ops.c
34146--- linux-2.6.32.16/fs/reiserfs/item_ops.c 2010-07-05 14:14:00.000000000 -0400 34190--- linux-2.6.32.18/fs/reiserfs/item_ops.c 2010-08-10 13:45:57.000000000 -0400
34147+++ linux-2.6.32.16/fs/reiserfs/item_ops.c 2010-07-09 14:50:38.000000000 -0400 34191+++ linux-2.6.32.18/fs/reiserfs/item_ops.c 2010-08-11 18:57:32.000000000 -0400
34148@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i 34192@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
34149 vi->vi_index, vi->vi_type, vi->vi_ih); 34193 vi->vi_index, vi->vi_type, vi->vi_ih);
34150 } 34194 }
@@ -34199,9 +34243,9 @@ diff -urNp linux-2.6.32.16/fs/reiserfs/item_ops.c linux-2.6.32.16/fs/reiserfs/it
34199 &stat_data_ops, 34243 &stat_data_ops,
34200 &indirect_ops, 34244 &indirect_ops,
34201 &direct_ops, 34245 &direct_ops,
34202diff -urNp linux-2.6.32.16/fs/reiserfs/procfs.c linux-2.6.32.16/fs/reiserfs/procfs.c 34246diff -urNp linux-2.6.32.18/fs/reiserfs/procfs.c linux-2.6.32.18/fs/reiserfs/procfs.c
34203--- linux-2.6.32.16/fs/reiserfs/procfs.c 2010-07-05 14:14:00.000000000 -0400 34247--- linux-2.6.32.18/fs/reiserfs/procfs.c 2010-08-10 13:45:57.000000000 -0400
34204+++ linux-2.6.32.16/fs/reiserfs/procfs.c 2010-07-09 14:50:38.000000000 -0400 34248+++ linux-2.6.32.18/fs/reiserfs/procfs.c 2010-08-11 18:57:32.000000000 -0400
34205@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m 34249@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
34206 "SMALL_TAILS " : "NO_TAILS ", 34250 "SMALL_TAILS " : "NO_TAILS ",
34207 replay_only(sb) ? "REPLAY_ONLY " : "", 34251 replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -34211,9 +34255,9 @@ diff -urNp linux-2.6.32.16/fs/reiserfs/procfs.c linux-2.6.32.16/fs/reiserfs/proc
34211 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), 34255 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
34212 SF(s_do_balance), SF(s_unneeded_left_neighbor), 34256 SF(s_do_balance), SF(s_unneeded_left_neighbor),
34213 SF(s_good_search_by_key_reada), SF(s_bmaps), 34257 SF(s_good_search_by_key_reada), SF(s_bmaps),
34214diff -urNp linux-2.6.32.16/fs/select.c linux-2.6.32.16/fs/select.c 34258diff -urNp linux-2.6.32.18/fs/select.c linux-2.6.32.18/fs/select.c
34215--- linux-2.6.32.16/fs/select.c 2010-07-05 14:14:00.000000000 -0400 34259--- linux-2.6.32.18/fs/select.c 2010-08-10 13:45:57.000000000 -0400
34216+++ linux-2.6.32.16/fs/select.c 2010-07-09 14:50:38.000000000 -0400 34260+++ linux-2.6.32.18/fs/select.c 2010-08-11 18:57:32.000000000 -0400
34217@@ -20,6 +20,7 @@ 34261@@ -20,6 +20,7 @@
34218 #include <linux/module.h> 34262 #include <linux/module.h>
34219 #include <linux/slab.h> 34263 #include <linux/slab.h>
@@ -34230,9 +34274,9 @@ diff -urNp linux-2.6.32.16/fs/select.c linux-2.6.32.16/fs/select.c
34230 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 34274 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
34231 return -EINVAL; 34275 return -EINVAL;
34232 34276
34233diff -urNp linux-2.6.32.16/fs/seq_file.c linux-2.6.32.16/fs/seq_file.c 34277diff -urNp linux-2.6.32.18/fs/seq_file.c linux-2.6.32.18/fs/seq_file.c
34234--- linux-2.6.32.16/fs/seq_file.c 2010-07-05 14:14:00.000000000 -0400 34278--- linux-2.6.32.18/fs/seq_file.c 2010-08-10 13:45:57.000000000 -0400
34235+++ linux-2.6.32.16/fs/seq_file.c 2010-07-09 14:50:38.000000000 -0400 34279+++ linux-2.6.32.18/fs/seq_file.c 2010-08-11 18:57:32.000000000 -0400
34236@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 34280@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
34237 return 0; 34281 return 0;
34238 } 34282 }
@@ -34273,9 +34317,9 @@ diff -urNp linux-2.6.32.16/fs/seq_file.c linux-2.6.32.16/fs/seq_file.c
34273 if (!m->buf) 34317 if (!m->buf)
34274 goto Enomem; 34318 goto Enomem;
34275 m->count = 0; 34319 m->count = 0;
34276diff -urNp linux-2.6.32.16/fs/smbfs/symlink.c linux-2.6.32.16/fs/smbfs/symlink.c 34320diff -urNp linux-2.6.32.18/fs/smbfs/symlink.c linux-2.6.32.18/fs/smbfs/symlink.c
34277--- linux-2.6.32.16/fs/smbfs/symlink.c 2010-07-05 14:14:00.000000000 -0400 34321--- linux-2.6.32.18/fs/smbfs/symlink.c 2010-08-10 13:45:57.000000000 -0400
34278+++ linux-2.6.32.16/fs/smbfs/symlink.c 2010-07-09 14:50:38.000000000 -0400 34322+++ linux-2.6.32.18/fs/smbfs/symlink.c 2010-08-11 18:57:32.000000000 -0400
34279@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent 34323@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
34280 34324
34281 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 34325 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -34285,9 +34329,9 @@ diff -urNp linux-2.6.32.16/fs/smbfs/symlink.c linux-2.6.32.16/fs/smbfs/symlink.c
34285 if (!IS_ERR(s)) 34329 if (!IS_ERR(s))
34286 __putname(s); 34330 __putname(s);
34287 } 34331 }
34288diff -urNp linux-2.6.32.16/fs/splice.c linux-2.6.32.16/fs/splice.c 34332diff -urNp linux-2.6.32.18/fs/splice.c linux-2.6.32.18/fs/splice.c
34289--- linux-2.6.32.16/fs/splice.c 2010-07-05 14:14:00.000000000 -0400 34333--- linux-2.6.32.18/fs/splice.c 2010-08-10 13:45:57.000000000 -0400
34290+++ linux-2.6.32.16/fs/splice.c 2010-07-09 14:50:38.000000000 -0400 34334+++ linux-2.6.32.18/fs/splice.c 2010-08-11 18:57:32.000000000 -0400
34291@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode 34335@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
34292 pipe_lock(pipe); 34336 pipe_lock(pipe);
34293 34337
@@ -34426,9 +34470,9 @@ diff -urNp linux-2.6.32.16/fs/splice.c linux-2.6.32.16/fs/splice.c
34426 ret = -EAGAIN; 34470 ret = -EAGAIN;
34427 34471
34428 pipe_unlock(ipipe); 34472 pipe_unlock(ipipe);
34429diff -urNp linux-2.6.32.16/fs/sysfs/file.c linux-2.6.32.16/fs/sysfs/file.c 34473diff -urNp linux-2.6.32.18/fs/sysfs/file.c linux-2.6.32.18/fs/sysfs/file.c
34430--- linux-2.6.32.16/fs/sysfs/file.c 2010-07-05 14:14:00.000000000 -0400 34474--- linux-2.6.32.18/fs/sysfs/file.c 2010-08-10 13:45:57.000000000 -0400
34431+++ linux-2.6.32.16/fs/sysfs/file.c 2010-07-09 14:50:38.000000000 -0400 34475+++ linux-2.6.32.18/fs/sysfs/file.c 2010-08-11 18:57:32.000000000 -0400
34432@@ -53,7 +53,7 @@ struct sysfs_buffer { 34476@@ -53,7 +53,7 @@ struct sysfs_buffer {
34433 size_t count; 34477 size_t count;
34434 loff_t pos; 34478 loff_t pos;
@@ -34465,9 +34509,9 @@ diff -urNp linux-2.6.32.16/fs/sysfs/file.c linux-2.6.32.16/fs/sysfs/file.c
34465 int error = -EACCES; 34509 int error = -EACCES;
34466 char *p; 34510 char *p;
34467 34511
34468diff -urNp linux-2.6.32.16/fs/sysfs/symlink.c linux-2.6.32.16/fs/sysfs/symlink.c 34512diff -urNp linux-2.6.32.18/fs/sysfs/symlink.c linux-2.6.32.18/fs/sysfs/symlink.c
34469--- linux-2.6.32.16/fs/sysfs/symlink.c 2010-07-05 14:14:00.000000000 -0400 34513--- linux-2.6.32.18/fs/sysfs/symlink.c 2010-08-10 13:45:57.000000000 -0400
34470+++ linux-2.6.32.16/fs/sysfs/symlink.c 2010-07-09 14:50:38.000000000 -0400 34514+++ linux-2.6.32.18/fs/sysfs/symlink.c 2010-08-11 18:57:32.000000000 -0400
34471@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de 34515@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
34472 34516
34473 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) 34517 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -34477,9 +34521,9 @@ diff -urNp linux-2.6.32.16/fs/sysfs/symlink.c linux-2.6.32.16/fs/sysfs/symlink.c
34477 if (!IS_ERR(page)) 34521 if (!IS_ERR(page))
34478 free_page((unsigned long)page); 34522 free_page((unsigned long)page);
34479 } 34523 }
34480diff -urNp linux-2.6.32.16/fs/udf/balloc.c linux-2.6.32.16/fs/udf/balloc.c 34524diff -urNp linux-2.6.32.18/fs/udf/balloc.c linux-2.6.32.18/fs/udf/balloc.c
34481--- linux-2.6.32.16/fs/udf/balloc.c 2010-07-05 14:14:00.000000000 -0400 34525--- linux-2.6.32.18/fs/udf/balloc.c 2010-08-10 13:45:57.000000000 -0400
34482+++ linux-2.6.32.16/fs/udf/balloc.c 2010-07-09 14:50:38.000000000 -0400 34526+++ linux-2.6.32.18/fs/udf/balloc.c 2010-08-11 18:57:32.000000000 -0400
34483@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc 34527@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
34484 34528
34485 mutex_lock(&sbi->s_alloc_mutex); 34529 mutex_lock(&sbi->s_alloc_mutex);
@@ -34502,9 +34546,9 @@ diff -urNp linux-2.6.32.16/fs/udf/balloc.c linux-2.6.32.16/fs/udf/balloc.c
34502 udf_debug("%d < %d || %d + %d > %d\n", 34546 udf_debug("%d < %d || %d + %d > %d\n",
34503 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, 34547 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
34504 partmap->s_partition_len); 34548 partmap->s_partition_len);
34505diff -urNp linux-2.6.32.16/fs/udf/misc.c linux-2.6.32.16/fs/udf/misc.c 34549diff -urNp linux-2.6.32.18/fs/udf/misc.c linux-2.6.32.18/fs/udf/misc.c
34506--- linux-2.6.32.16/fs/udf/misc.c 2010-07-05 14:14:00.000000000 -0400 34550--- linux-2.6.32.18/fs/udf/misc.c 2010-08-10 13:45:57.000000000 -0400
34507+++ linux-2.6.32.16/fs/udf/misc.c 2010-07-09 14:50:38.000000000 -0400 34551+++ linux-2.6.32.18/fs/udf/misc.c 2010-08-11 18:57:32.000000000 -0400
34508@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat 34552@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
34509 iinfo->i_lenEAttr += size; 34553 iinfo->i_lenEAttr += size;
34510 return (struct genericFormat *)&ea[offset]; 34554 return (struct genericFormat *)&ea[offset];
@@ -34516,9 +34560,9 @@ diff -urNp linux-2.6.32.16/fs/udf/misc.c linux-2.6.32.16/fs/udf/misc.c
34516 34560
34517 return NULL; 34561 return NULL;
34518 } 34562 }
34519diff -urNp linux-2.6.32.16/fs/udf/udfdecl.h linux-2.6.32.16/fs/udf/udfdecl.h 34563diff -urNp linux-2.6.32.18/fs/udf/udfdecl.h linux-2.6.32.18/fs/udf/udfdecl.h
34520--- linux-2.6.32.16/fs/udf/udfdecl.h 2010-07-05 14:14:00.000000000 -0400 34564--- linux-2.6.32.18/fs/udf/udfdecl.h 2010-08-10 13:45:57.000000000 -0400
34521+++ linux-2.6.32.16/fs/udf/udfdecl.h 2010-07-09 14:50:38.000000000 -0400 34565+++ linux-2.6.32.18/fs/udf/udfdecl.h 2010-08-11 18:57:32.000000000 -0400
34522@@ -26,7 +26,7 @@ do { \ 34566@@ -26,7 +26,7 @@ do { \
34523 printk(f, ##a); \ 34567 printk(f, ##a); \
34524 } while (0) 34568 } while (0)
@@ -34528,9 +34572,9 @@ diff -urNp linux-2.6.32.16/fs/udf/udfdecl.h linux-2.6.32.16/fs/udf/udfdecl.h
34528 #endif 34572 #endif
34529 34573
34530 #define udf_info(f, a...) \ 34574 #define udf_info(f, a...) \
34531diff -urNp linux-2.6.32.16/fs/utimes.c linux-2.6.32.16/fs/utimes.c 34575diff -urNp linux-2.6.32.18/fs/utimes.c linux-2.6.32.18/fs/utimes.c
34532--- linux-2.6.32.16/fs/utimes.c 2010-07-05 14:14:00.000000000 -0400 34576--- linux-2.6.32.18/fs/utimes.c 2010-08-10 13:45:57.000000000 -0400
34533+++ linux-2.6.32.16/fs/utimes.c 2010-07-09 14:50:38.000000000 -0400 34577+++ linux-2.6.32.18/fs/utimes.c 2010-08-11 18:57:32.000000000 -0400
34534@@ -1,6 +1,7 @@ 34578@@ -1,6 +1,7 @@
34535 #include <linux/compiler.h> 34579 #include <linux/compiler.h>
34536 #include <linux/file.h> 34580 #include <linux/file.h>
@@ -34552,9 +34596,9 @@ diff -urNp linux-2.6.32.16/fs/utimes.c linux-2.6.32.16/fs/utimes.c
34552 mutex_lock(&inode->i_mutex); 34596 mutex_lock(&inode->i_mutex);
34553 error = notify_change(path->dentry, &newattrs); 34597 error = notify_change(path->dentry, &newattrs);
34554 mutex_unlock(&inode->i_mutex); 34598 mutex_unlock(&inode->i_mutex);
34555diff -urNp linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c 34599diff -urNp linux-2.6.32.18/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.18/fs/xfs/linux-2.6/xfs_ioctl.c
34556--- linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c 2010-07-05 14:14:00.000000000 -0400 34600--- linux-2.6.32.18/fs/xfs/linux-2.6/xfs_ioctl.c 2010-08-10 13:45:57.000000000 -0400
34557+++ linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c 2010-07-09 14:50:38.000000000 -0400 34601+++ linux-2.6.32.18/fs/xfs/linux-2.6/xfs_ioctl.c 2010-08-11 18:57:32.000000000 -0400
34558@@ -134,7 +134,7 @@ xfs_find_handle( 34602@@ -134,7 +134,7 @@ xfs_find_handle(
34559 } 34603 }
34560 34604
@@ -34564,9 +34608,9 @@ diff -urNp linux-2.6.32.16/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.16/fs/xfs/l
34564 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) 34608 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
34565 goto out_put; 34609 goto out_put;
34566 34610
34567diff -urNp linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c 34611diff -urNp linux-2.6.32.18/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.18/fs/xfs/linux-2.6/xfs_iops.c
34568--- linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c 2010-07-05 14:14:00.000000000 -0400 34612--- linux-2.6.32.18/fs/xfs/linux-2.6/xfs_iops.c 2010-08-10 13:45:57.000000000 -0400
34569+++ linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c 2010-07-09 14:50:38.000000000 -0400 34613+++ linux-2.6.32.18/fs/xfs/linux-2.6/xfs_iops.c 2010-08-11 18:57:32.000000000 -0400
34570@@ -468,7 +468,7 @@ xfs_vn_put_link( 34614@@ -468,7 +468,7 @@ xfs_vn_put_link(
34571 struct nameidata *nd, 34615 struct nameidata *nd,
34572 void *p) 34616 void *p)
@@ -34576,9 +34620,9 @@ diff -urNp linux-2.6.32.16/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.16/fs/xfs/li
34576 34620
34577 if (!IS_ERR(s)) 34621 if (!IS_ERR(s))
34578 kfree(s); 34622 kfree(s);
34579diff -urNp linux-2.6.32.16/fs/xfs/xfs_bmap.c linux-2.6.32.16/fs/xfs/xfs_bmap.c 34623diff -urNp linux-2.6.32.18/fs/xfs/xfs_bmap.c linux-2.6.32.18/fs/xfs/xfs_bmap.c
34580--- linux-2.6.32.16/fs/xfs/xfs_bmap.c 2010-07-05 14:14:00.000000000 -0400 34624--- linux-2.6.32.18/fs/xfs/xfs_bmap.c 2010-08-10 13:45:57.000000000 -0400
34581+++ linux-2.6.32.16/fs/xfs/xfs_bmap.c 2010-07-09 14:50:38.000000000 -0400 34625+++ linux-2.6.32.18/fs/xfs/xfs_bmap.c 2010-08-11 18:57:32.000000000 -0400
34582@@ -360,7 +360,7 @@ xfs_bmap_validate_ret( 34626@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
34583 int nmap, 34627 int nmap,
34584 int ret_nmap); 34628 int ret_nmap);
@@ -34588,9 +34632,9 @@ diff -urNp linux-2.6.32.16/fs/xfs/xfs_bmap.c linux-2.6.32.16/fs/xfs/xfs_bmap.c
34588 #endif /* DEBUG */ 34632 #endif /* DEBUG */
34589 34633
34590 #if defined(XFS_RW_TRACE) 34634 #if defined(XFS_RW_TRACE)
34591diff -urNp linux-2.6.32.16/grsecurity/gracl_alloc.c linux-2.6.32.16/grsecurity/gracl_alloc.c 34635diff -urNp linux-2.6.32.18/grsecurity/gracl_alloc.c linux-2.6.32.18/grsecurity/gracl_alloc.c
34592--- linux-2.6.32.16/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 34636--- linux-2.6.32.18/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
34593+++ linux-2.6.32.16/grsecurity/gracl_alloc.c 2010-07-09 14:50:38.000000000 -0400 34637+++ linux-2.6.32.18/grsecurity/gracl_alloc.c 2010-08-11 18:57:32.000000000 -0400
34594@@ -0,0 +1,105 @@ 34638@@ -0,0 +1,105 @@
34595+#include <linux/kernel.h> 34639+#include <linux/kernel.h>
34596+#include <linux/mm.h> 34640+#include <linux/mm.h>
@@ -34697,9 +34741,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_alloc.c linux-2.6.32.16/grsecurity/g
34697+ else 34741+ else
34698+ return 1; 34742+ return 1;
34699+} 34743+}
34700diff -urNp linux-2.6.32.16/grsecurity/gracl.c linux-2.6.32.16/grsecurity/gracl.c 34744diff -urNp linux-2.6.32.18/grsecurity/gracl.c linux-2.6.32.18/grsecurity/gracl.c
34701--- linux-2.6.32.16/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 34745--- linux-2.6.32.18/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
34702+++ linux-2.6.32.16/grsecurity/gracl.c 2010-07-10 08:10:31.000000000 -0400 34746+++ linux-2.6.32.18/grsecurity/gracl.c 2010-08-11 18:59:54.000000000 -0400
34703@@ -0,0 +1,3919 @@ 34747@@ -0,0 +1,3919 @@
34704+#include <linux/kernel.h> 34748+#include <linux/kernel.h>
34705+#include <linux/module.h> 34749+#include <linux/module.h>
@@ -38374,7 +38418,7 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl.c linux-2.6.32.16/grsecurity/gracl.c
38374+ struct acl_object_label *obj, *obj2; 38418+ struct acl_object_label *obj, *obj2;
38375+ 38419+
38376+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) && 38420+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
38377+ !task->is_writable && S_ISREG(filp->f_path.dentry->d_inode->i_mode)) { 38421+ !task->is_writable && S_ISREG(filp->f_path.dentry->d_inode->i_mode) && filp->f_path.mnt != shm_mnt) {
38378+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label); 38422+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
38379+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, 38423+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
38380+ task->role->root_label); 38424+ task->role->root_label);
@@ -38620,9 +38664,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl.c linux-2.6.32.16/grsecurity/gracl.c
38620+EXPORT_SYMBOL(gr_check_group_change); 38664+EXPORT_SYMBOL(gr_check_group_change);
38621+#endif 38665+#endif
38622+ 38666+
38623diff -urNp linux-2.6.32.16/grsecurity/gracl_cap.c linux-2.6.32.16/grsecurity/gracl_cap.c 38667diff -urNp linux-2.6.32.18/grsecurity/gracl_cap.c linux-2.6.32.18/grsecurity/gracl_cap.c
38624--- linux-2.6.32.16/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 38668--- linux-2.6.32.18/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
38625+++ linux-2.6.32.16/grsecurity/gracl_cap.c 2010-07-09 14:50:38.000000000 -0400 38669+++ linux-2.6.32.18/grsecurity/gracl_cap.c 2010-08-11 18:57:32.000000000 -0400
38626@@ -0,0 +1,138 @@ 38670@@ -0,0 +1,138 @@
38627+#include <linux/kernel.h> 38671+#include <linux/kernel.h>
38628+#include <linux/module.h> 38672+#include <linux/module.h>
@@ -38762,9 +38806,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_cap.c linux-2.6.32.16/grsecurity/gra
38762+ return 0; 38806+ return 0;
38763+} 38807+}
38764+ 38808+
38765diff -urNp linux-2.6.32.16/grsecurity/gracl_fs.c linux-2.6.32.16/grsecurity/gracl_fs.c 38809diff -urNp linux-2.6.32.18/grsecurity/gracl_fs.c linux-2.6.32.18/grsecurity/gracl_fs.c
38766--- linux-2.6.32.16/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 38810--- linux-2.6.32.18/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
38767+++ linux-2.6.32.16/grsecurity/gracl_fs.c 2010-07-09 14:50:38.000000000 -0400 38811+++ linux-2.6.32.18/grsecurity/gracl_fs.c 2010-08-11 18:57:32.000000000 -0400
38768@@ -0,0 +1,424 @@ 38812@@ -0,0 +1,424 @@
38769+#include <linux/kernel.h> 38813+#include <linux/kernel.h>
38770+#include <linux/sched.h> 38814+#include <linux/sched.h>
@@ -39190,9 +39234,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_fs.c linux-2.6.32.16/grsecurity/grac
39190+ 39234+
39191+ return 0; 39235+ return 0;
39192+} 39236+}
39193diff -urNp linux-2.6.32.16/grsecurity/gracl_ip.c linux-2.6.32.16/grsecurity/gracl_ip.c 39237diff -urNp linux-2.6.32.18/grsecurity/gracl_ip.c linux-2.6.32.18/grsecurity/gracl_ip.c
39194--- linux-2.6.32.16/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 39238--- linux-2.6.32.18/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
39195+++ linux-2.6.32.16/grsecurity/gracl_ip.c 2010-07-09 14:50:38.000000000 -0400 39239+++ linux-2.6.32.18/grsecurity/gracl_ip.c 2010-08-11 18:57:32.000000000 -0400
39196@@ -0,0 +1,339 @@ 39240@@ -0,0 +1,339 @@
39197+#include <linux/kernel.h> 39241+#include <linux/kernel.h>
39198+#include <asm/uaccess.h> 39242+#include <asm/uaccess.h>
@@ -39533,9 +39577,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_ip.c linux-2.6.32.16/grsecurity/grac
39533+ 39577+
39534+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); 39578+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
39535+} 39579+}
39536diff -urNp linux-2.6.32.16/grsecurity/gracl_learn.c linux-2.6.32.16/grsecurity/gracl_learn.c 39580diff -urNp linux-2.6.32.18/grsecurity/gracl_learn.c linux-2.6.32.18/grsecurity/gracl_learn.c
39537--- linux-2.6.32.16/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 39581--- linux-2.6.32.18/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
39538+++ linux-2.6.32.16/grsecurity/gracl_learn.c 2010-07-09 14:50:38.000000000 -0400 39582+++ linux-2.6.32.18/grsecurity/gracl_learn.c 2010-08-11 18:57:32.000000000 -0400
39539@@ -0,0 +1,211 @@ 39583@@ -0,0 +1,211 @@
39540+#include <linux/kernel.h> 39584+#include <linux/kernel.h>
39541+#include <linux/mm.h> 39585+#include <linux/mm.h>
@@ -39748,9 +39792,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_learn.c linux-2.6.32.16/grsecurity/g
39748+ .release = close_learn, 39792+ .release = close_learn,
39749+ .poll = poll_learn, 39793+ .poll = poll_learn,
39750+}; 39794+};
39751diff -urNp linux-2.6.32.16/grsecurity/gracl_res.c linux-2.6.32.16/grsecurity/gracl_res.c 39795diff -urNp linux-2.6.32.18/grsecurity/gracl_res.c linux-2.6.32.18/grsecurity/gracl_res.c
39752--- linux-2.6.32.16/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 39796--- linux-2.6.32.18/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
39753+++ linux-2.6.32.16/grsecurity/gracl_res.c 2010-07-09 14:50:38.000000000 -0400 39797+++ linux-2.6.32.18/grsecurity/gracl_res.c 2010-08-11 18:57:32.000000000 -0400
39754@@ -0,0 +1,67 @@ 39798@@ -0,0 +1,67 @@
39755+#include <linux/kernel.h> 39799+#include <linux/kernel.h>
39756+#include <linux/sched.h> 39800+#include <linux/sched.h>
@@ -39819,9 +39863,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_res.c linux-2.6.32.16/grsecurity/gra
39819+ rcu_read_unlock(); 39863+ rcu_read_unlock();
39820+ return; 39864+ return;
39821+} 39865+}
39822diff -urNp linux-2.6.32.16/grsecurity/gracl_segv.c linux-2.6.32.16/grsecurity/gracl_segv.c 39866diff -urNp linux-2.6.32.18/grsecurity/gracl_segv.c linux-2.6.32.18/grsecurity/gracl_segv.c
39823--- linux-2.6.32.16/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 39867--- linux-2.6.32.18/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
39824+++ linux-2.6.32.16/grsecurity/gracl_segv.c 2010-07-09 14:50:38.000000000 -0400 39868+++ linux-2.6.32.18/grsecurity/gracl_segv.c 2010-08-11 18:57:32.000000000 -0400
39825@@ -0,0 +1,310 @@ 39869@@ -0,0 +1,310 @@
39826+#include <linux/kernel.h> 39870+#include <linux/kernel.h>
39827+#include <linux/mm.h> 39871+#include <linux/mm.h>
@@ -40133,9 +40177,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_segv.c linux-2.6.32.16/grsecurity/gr
40133+ 40177+
40134+ return; 40178+ return;
40135+} 40179+}
40136diff -urNp linux-2.6.32.16/grsecurity/gracl_shm.c linux-2.6.32.16/grsecurity/gracl_shm.c 40180diff -urNp linux-2.6.32.18/grsecurity/gracl_shm.c linux-2.6.32.18/grsecurity/gracl_shm.c
40137--- linux-2.6.32.16/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 40181--- linux-2.6.32.18/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
40138+++ linux-2.6.32.16/grsecurity/gracl_shm.c 2010-07-09 14:50:38.000000000 -0400 40182+++ linux-2.6.32.18/grsecurity/gracl_shm.c 2010-08-11 18:57:32.000000000 -0400
40139@@ -0,0 +1,40 @@ 40183@@ -0,0 +1,40 @@
40140+#include <linux/kernel.h> 40184+#include <linux/kernel.h>
40141+#include <linux/mm.h> 40185+#include <linux/mm.h>
@@ -40177,9 +40221,9 @@ diff -urNp linux-2.6.32.16/grsecurity/gracl_shm.c linux-2.6.32.16/grsecurity/gra
40177+ 40221+
40178+ return 1; 40222+ return 1;
40179+} 40223+}
40180diff -urNp linux-2.6.32.16/grsecurity/grsec_chdir.c linux-2.6.32.16/grsecurity/grsec_chdir.c 40224diff -urNp linux-2.6.32.18/grsecurity/grsec_chdir.c linux-2.6.32.18/grsecurity/grsec_chdir.c
40181--- linux-2.6.32.16/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 40225--- linux-2.6.32.18/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
40182+++ linux-2.6.32.16/grsecurity/grsec_chdir.c 2010-07-09 14:50:38.000000000 -0400 40226+++ linux-2.6.32.18/grsecurity/grsec_chdir.c 2010-08-11 18:57:32.000000000 -0400
40183@@ -0,0 +1,19 @@ 40227@@ -0,0 +1,19 @@
40184+#include <linux/kernel.h> 40228+#include <linux/kernel.h>
40185+#include <linux/sched.h> 40229+#include <linux/sched.h>
@@ -40200,9 +40244,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_chdir.c linux-2.6.32.16/grsecurity/g
40200+#endif 40244+#endif
40201+ return; 40245+ return;
40202+} 40246+}
40203diff -urNp linux-2.6.32.16/grsecurity/grsec_chroot.c linux-2.6.32.16/grsecurity/grsec_chroot.c 40247diff -urNp linux-2.6.32.18/grsecurity/grsec_chroot.c linux-2.6.32.18/grsecurity/grsec_chroot.c
40204--- linux-2.6.32.16/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 40248--- linux-2.6.32.18/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
40205+++ linux-2.6.32.16/grsecurity/grsec_chroot.c 2010-07-10 08:10:14.000000000 -0400 40249+++ linux-2.6.32.18/grsecurity/grsec_chroot.c 2010-08-11 18:57:32.000000000 -0400
40206@@ -0,0 +1,389 @@ 40250@@ -0,0 +1,389 @@
40207+#include <linux/kernel.h> 40251+#include <linux/kernel.h>
40208+#include <linux/module.h> 40252+#include <linux/module.h>
@@ -40593,9 +40637,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_chroot.c linux-2.6.32.16/grsecurity/
40593+#ifdef CONFIG_SECURITY 40637+#ifdef CONFIG_SECURITY
40594+EXPORT_SYMBOL(gr_handle_chroot_caps); 40638+EXPORT_SYMBOL(gr_handle_chroot_caps);
40595+#endif 40639+#endif
40596diff -urNp linux-2.6.32.16/grsecurity/grsec_disabled.c linux-2.6.32.16/grsecurity/grsec_disabled.c 40640diff -urNp linux-2.6.32.18/grsecurity/grsec_disabled.c linux-2.6.32.18/grsecurity/grsec_disabled.c
40597--- linux-2.6.32.16/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 40641--- linux-2.6.32.18/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
40598+++ linux-2.6.32.16/grsecurity/grsec_disabled.c 2010-07-10 07:45:05.000000000 -0400 40642+++ linux-2.6.32.18/grsecurity/grsec_disabled.c 2010-08-11 18:57:32.000000000 -0400
40599@@ -0,0 +1,431 @@ 40643@@ -0,0 +1,431 @@
40600+#include <linux/kernel.h> 40644+#include <linux/kernel.h>
40601+#include <linux/module.h> 40645+#include <linux/module.h>
@@ -41028,9 +41072,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_disabled.c linux-2.6.32.16/grsecurit
41028+EXPORT_SYMBOL(gr_check_user_change); 41072+EXPORT_SYMBOL(gr_check_user_change);
41029+EXPORT_SYMBOL(gr_check_group_change); 41073+EXPORT_SYMBOL(gr_check_group_change);
41030+#endif 41074+#endif
41031diff -urNp linux-2.6.32.16/grsecurity/grsec_exec.c linux-2.6.32.16/grsecurity/grsec_exec.c 41075diff -urNp linux-2.6.32.18/grsecurity/grsec_exec.c linux-2.6.32.18/grsecurity/grsec_exec.c
41032--- linux-2.6.32.16/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 41076--- linux-2.6.32.18/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
41033+++ linux-2.6.32.16/grsecurity/grsec_exec.c 2010-07-09 14:50:38.000000000 -0400 41077+++ linux-2.6.32.18/grsecurity/grsec_exec.c 2010-08-11 18:57:32.000000000 -0400
41034@@ -0,0 +1,89 @@ 41078@@ -0,0 +1,89 @@
41035+#include <linux/kernel.h> 41079+#include <linux/kernel.h>
41036+#include <linux/sched.h> 41080+#include <linux/sched.h>
@@ -41121,9 +41165,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_exec.c linux-2.6.32.16/grsecurity/gr
41121+#endif 41165+#endif
41122+ return; 41166+ return;
41123+} 41167+}
41124diff -urNp linux-2.6.32.16/grsecurity/grsec_fifo.c linux-2.6.32.16/grsecurity/grsec_fifo.c 41168diff -urNp linux-2.6.32.18/grsecurity/grsec_fifo.c linux-2.6.32.18/grsecurity/grsec_fifo.c
41125--- linux-2.6.32.16/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 41169--- linux-2.6.32.18/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
41126+++ linux-2.6.32.16/grsecurity/grsec_fifo.c 2010-07-09 14:50:38.000000000 -0400 41170+++ linux-2.6.32.18/grsecurity/grsec_fifo.c 2010-08-11 18:57:32.000000000 -0400
41127@@ -0,0 +1,24 @@ 41171@@ -0,0 +1,24 @@
41128+#include <linux/kernel.h> 41172+#include <linux/kernel.h>
41129+#include <linux/sched.h> 41173+#include <linux/sched.h>
@@ -41149,9 +41193,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_fifo.c linux-2.6.32.16/grsecurity/gr
41149+#endif 41193+#endif
41150+ return 0; 41194+ return 0;
41151+} 41195+}
41152diff -urNp linux-2.6.32.16/grsecurity/grsec_fork.c linux-2.6.32.16/grsecurity/grsec_fork.c 41196diff -urNp linux-2.6.32.18/grsecurity/grsec_fork.c linux-2.6.32.18/grsecurity/grsec_fork.c
41153--- linux-2.6.32.16/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 41197--- linux-2.6.32.18/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
41154+++ linux-2.6.32.16/grsecurity/grsec_fork.c 2010-07-09 14:50:38.000000000 -0400 41198+++ linux-2.6.32.18/grsecurity/grsec_fork.c 2010-08-11 18:57:32.000000000 -0400
41155@@ -0,0 +1,15 @@ 41199@@ -0,0 +1,15 @@
41156+#include <linux/kernel.h> 41200+#include <linux/kernel.h>
41157+#include <linux/sched.h> 41201+#include <linux/sched.h>
@@ -41168,9 +41212,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_fork.c linux-2.6.32.16/grsecurity/gr
41168+#endif 41212+#endif
41169+ return; 41213+ return;
41170+} 41214+}
41171diff -urNp linux-2.6.32.16/grsecurity/grsec_init.c linux-2.6.32.16/grsecurity/grsec_init.c 41215diff -urNp linux-2.6.32.18/grsecurity/grsec_init.c linux-2.6.32.18/grsecurity/grsec_init.c
41172--- linux-2.6.32.16/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 41216--- linux-2.6.32.18/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
41173+++ linux-2.6.32.16/grsecurity/grsec_init.c 2010-07-09 14:50:38.000000000 -0400 41217+++ linux-2.6.32.18/grsecurity/grsec_init.c 2010-08-11 18:57:32.000000000 -0400
41174@@ -0,0 +1,258 @@ 41218@@ -0,0 +1,258 @@
41175+#include <linux/kernel.h> 41219+#include <linux/kernel.h>
41176+#include <linux/sched.h> 41220+#include <linux/sched.h>
@@ -41430,9 +41474,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_init.c linux-2.6.32.16/grsecurity/gr
41430+ 41474+
41431+ return; 41475+ return;
41432+} 41476+}
41433diff -urNp linux-2.6.32.16/grsecurity/grsec_link.c linux-2.6.32.16/grsecurity/grsec_link.c 41477diff -urNp linux-2.6.32.18/grsecurity/grsec_link.c linux-2.6.32.18/grsecurity/grsec_link.c
41434--- linux-2.6.32.16/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 41478--- linux-2.6.32.18/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
41435+++ linux-2.6.32.16/grsecurity/grsec_link.c 2010-07-09 14:50:38.000000000 -0400 41479+++ linux-2.6.32.18/grsecurity/grsec_link.c 2010-08-11 18:57:32.000000000 -0400
41436@@ -0,0 +1,43 @@ 41480@@ -0,0 +1,43 @@
41437+#include <linux/kernel.h> 41481+#include <linux/kernel.h>
41438+#include <linux/sched.h> 41482+#include <linux/sched.h>
@@ -41477,9 +41521,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_link.c linux-2.6.32.16/grsecurity/gr
41477+#endif 41521+#endif
41478+ return 0; 41522+ return 0;
41479+} 41523+}
41480diff -urNp linux-2.6.32.16/grsecurity/grsec_log.c linux-2.6.32.16/grsecurity/grsec_log.c 41524diff -urNp linux-2.6.32.18/grsecurity/grsec_log.c linux-2.6.32.18/grsecurity/grsec_log.c
41481--- linux-2.6.32.16/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 41525--- linux-2.6.32.18/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
41482+++ linux-2.6.32.16/grsecurity/grsec_log.c 2010-07-09 14:50:38.000000000 -0400 41526+++ linux-2.6.32.18/grsecurity/grsec_log.c 2010-08-11 18:57:32.000000000 -0400
41483@@ -0,0 +1,306 @@ 41527@@ -0,0 +1,306 @@
41484+#include <linux/kernel.h> 41528+#include <linux/kernel.h>
41485+#include <linux/sched.h> 41529+#include <linux/sched.h>
@@ -41787,9 +41831,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_log.c linux-2.6.32.16/grsecurity/grs
41787+ gr_log_end(audit); 41831+ gr_log_end(audit);
41788+ END_LOCKS(audit); 41832+ END_LOCKS(audit);
41789+} 41833+}
41790diff -urNp linux-2.6.32.16/grsecurity/grsec_mem.c linux-2.6.32.16/grsecurity/grsec_mem.c 41834diff -urNp linux-2.6.32.18/grsecurity/grsec_mem.c linux-2.6.32.18/grsecurity/grsec_mem.c
41791--- linux-2.6.32.16/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 41835--- linux-2.6.32.18/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
41792+++ linux-2.6.32.16/grsecurity/grsec_mem.c 2010-07-09 14:50:38.000000000 -0400 41836+++ linux-2.6.32.18/grsecurity/grsec_mem.c 2010-08-11 18:57:32.000000000 -0400
41793@@ -0,0 +1,85 @@ 41837@@ -0,0 +1,85 @@
41794+#include <linux/kernel.h> 41838+#include <linux/kernel.h>
41795+#include <linux/sched.h> 41839+#include <linux/sched.h>
@@ -41876,9 +41920,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_mem.c linux-2.6.32.16/grsecurity/grs
41876+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); 41920+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
41877+ return; 41921+ return;
41878+} 41922+}
41879diff -urNp linux-2.6.32.16/grsecurity/grsec_mount.c linux-2.6.32.16/grsecurity/grsec_mount.c 41923diff -urNp linux-2.6.32.18/grsecurity/grsec_mount.c linux-2.6.32.18/grsecurity/grsec_mount.c
41880--- linux-2.6.32.16/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 41924--- linux-2.6.32.18/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
41881+++ linux-2.6.32.16/grsecurity/grsec_mount.c 2010-07-09 14:50:38.000000000 -0400 41925+++ linux-2.6.32.18/grsecurity/grsec_mount.c 2010-08-11 18:57:32.000000000 -0400
41882@@ -0,0 +1,62 @@ 41926@@ -0,0 +1,62 @@
41883+#include <linux/kernel.h> 41927+#include <linux/kernel.h>
41884+#include <linux/sched.h> 41928+#include <linux/sched.h>
@@ -41942,9 +41986,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_mount.c linux-2.6.32.16/grsecurity/g
41942+#endif 41986+#endif
41943+ return 0; 41987+ return 0;
41944+} 41988+}
41945diff -urNp linux-2.6.32.16/grsecurity/grsec_ptrace.c linux-2.6.32.16/grsecurity/grsec_ptrace.c 41989diff -urNp linux-2.6.32.18/grsecurity/grsec_ptrace.c linux-2.6.32.18/grsecurity/grsec_ptrace.c
41946--- linux-2.6.32.16/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 41990--- linux-2.6.32.18/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
41947+++ linux-2.6.32.16/grsecurity/grsec_ptrace.c 2010-07-09 14:50:38.000000000 -0400 41991+++ linux-2.6.32.18/grsecurity/grsec_ptrace.c 2010-08-11 18:57:32.000000000 -0400
41948@@ -0,0 +1,14 @@ 41992@@ -0,0 +1,14 @@
41949+#include <linux/kernel.h> 41993+#include <linux/kernel.h>
41950+#include <linux/sched.h> 41994+#include <linux/sched.h>
@@ -41960,9 +42004,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_ptrace.c linux-2.6.32.16/grsecurity/
41960+#endif 42004+#endif
41961+ return; 42005+ return;
41962+} 42006+}
41963diff -urNp linux-2.6.32.16/grsecurity/grsec_sig.c linux-2.6.32.16/grsecurity/grsec_sig.c 42007diff -urNp linux-2.6.32.18/grsecurity/grsec_sig.c linux-2.6.32.18/grsecurity/grsec_sig.c
41964--- linux-2.6.32.16/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 42008--- linux-2.6.32.18/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
41965+++ linux-2.6.32.16/grsecurity/grsec_sig.c 2010-07-09 14:50:38.000000000 -0400 42009+++ linux-2.6.32.18/grsecurity/grsec_sig.c 2010-08-11 18:57:32.000000000 -0400
41966@@ -0,0 +1,65 @@ 42010@@ -0,0 +1,65 @@
41967+#include <linux/kernel.h> 42011+#include <linux/kernel.h>
41968+#include <linux/sched.h> 42012+#include <linux/sched.h>
@@ -42029,9 +42073,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_sig.c linux-2.6.32.16/grsecurity/grs
42029+ return; 42073+ return;
42030+} 42074+}
42031+ 42075+
42032diff -urNp linux-2.6.32.16/grsecurity/grsec_sock.c linux-2.6.32.16/grsecurity/grsec_sock.c 42076diff -urNp linux-2.6.32.18/grsecurity/grsec_sock.c linux-2.6.32.18/grsecurity/grsec_sock.c
42033--- linux-2.6.32.16/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 42077--- linux-2.6.32.18/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
42034+++ linux-2.6.32.16/grsecurity/grsec_sock.c 2010-07-09 14:50:38.000000000 -0400 42078+++ linux-2.6.32.18/grsecurity/grsec_sock.c 2010-08-11 18:57:32.000000000 -0400
42035@@ -0,0 +1,271 @@ 42079@@ -0,0 +1,271 @@
42036+#include <linux/kernel.h> 42080+#include <linux/kernel.h>
42037+#include <linux/module.h> 42081+#include <linux/module.h>
@@ -42304,9 +42348,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_sock.c linux-2.6.32.16/grsecurity/gr
42304+ return current_cap(); 42348+ return current_cap();
42305+#endif 42349+#endif
42306+} 42350+}
42307diff -urNp linux-2.6.32.16/grsecurity/grsec_sysctl.c linux-2.6.32.16/grsecurity/grsec_sysctl.c 42351diff -urNp linux-2.6.32.18/grsecurity/grsec_sysctl.c linux-2.6.32.18/grsecurity/grsec_sysctl.c
42308--- linux-2.6.32.16/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 42352--- linux-2.6.32.18/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
42309+++ linux-2.6.32.16/grsecurity/grsec_sysctl.c 2010-07-09 14:50:38.000000000 -0400 42353+++ linux-2.6.32.18/grsecurity/grsec_sysctl.c 2010-08-11 18:57:32.000000000 -0400
42310@@ -0,0 +1,459 @@ 42354@@ -0,0 +1,459 @@
42311+#include <linux/kernel.h> 42355+#include <linux/kernel.h>
42312+#include <linux/sched.h> 42356+#include <linux/sched.h>
@@ -42767,9 +42811,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_sysctl.c linux-2.6.32.16/grsecurity/
42767+ { .ctl_name = 0 } 42811+ { .ctl_name = 0 }
42768+}; 42812+};
42769+#endif 42813+#endif
42770diff -urNp linux-2.6.32.16/grsecurity/grsec_textrel.c linux-2.6.32.16/grsecurity/grsec_textrel.c 42814diff -urNp linux-2.6.32.18/grsecurity/grsec_textrel.c linux-2.6.32.18/grsecurity/grsec_textrel.c
42771--- linux-2.6.32.16/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 42815--- linux-2.6.32.18/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
42772+++ linux-2.6.32.16/grsecurity/grsec_textrel.c 2010-07-09 14:50:38.000000000 -0400 42816+++ linux-2.6.32.18/grsecurity/grsec_textrel.c 2010-08-11 18:57:32.000000000 -0400
42773@@ -0,0 +1,16 @@ 42817@@ -0,0 +1,16 @@
42774+#include <linux/kernel.h> 42818+#include <linux/kernel.h>
42775+#include <linux/sched.h> 42819+#include <linux/sched.h>
@@ -42787,9 +42831,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_textrel.c linux-2.6.32.16/grsecurity
42787+#endif 42831+#endif
42788+ return; 42832+ return;
42789+} 42833+}
42790diff -urNp linux-2.6.32.16/grsecurity/grsec_time.c linux-2.6.32.16/grsecurity/grsec_time.c 42834diff -urNp linux-2.6.32.18/grsecurity/grsec_time.c linux-2.6.32.18/grsecurity/grsec_time.c
42791--- linux-2.6.32.16/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 42835--- linux-2.6.32.18/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
42792+++ linux-2.6.32.16/grsecurity/grsec_time.c 2010-07-09 14:50:38.000000000 -0400 42836+++ linux-2.6.32.18/grsecurity/grsec_time.c 2010-08-11 18:57:32.000000000 -0400
42793@@ -0,0 +1,13 @@ 42837@@ -0,0 +1,13 @@
42794+#include <linux/kernel.h> 42838+#include <linux/kernel.h>
42795+#include <linux/sched.h> 42839+#include <linux/sched.h>
@@ -42804,9 +42848,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_time.c linux-2.6.32.16/grsecurity/gr
42804+#endif 42848+#endif
42805+ return; 42849+ return;
42806+} 42850+}
42807diff -urNp linux-2.6.32.16/grsecurity/grsec_tpe.c linux-2.6.32.16/grsecurity/grsec_tpe.c 42851diff -urNp linux-2.6.32.18/grsecurity/grsec_tpe.c linux-2.6.32.18/grsecurity/grsec_tpe.c
42808--- linux-2.6.32.16/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 42852--- linux-2.6.32.18/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
42809+++ linux-2.6.32.16/grsecurity/grsec_tpe.c 2010-07-09 14:50:38.000000000 -0400 42853+++ linux-2.6.32.18/grsecurity/grsec_tpe.c 2010-08-11 18:57:32.000000000 -0400
42810@@ -0,0 +1,38 @@ 42854@@ -0,0 +1,38 @@
42811+#include <linux/kernel.h> 42855+#include <linux/kernel.h>
42812+#include <linux/sched.h> 42856+#include <linux/sched.h>
@@ -42846,9 +42890,9 @@ diff -urNp linux-2.6.32.16/grsecurity/grsec_tpe.c linux-2.6.32.16/grsecurity/grs
42846+#endif 42890+#endif
42847+ return 1; 42891+ return 1;
42848+} 42892+}
42849diff -urNp linux-2.6.32.16/grsecurity/grsum.c linux-2.6.32.16/grsecurity/grsum.c 42893diff -urNp linux-2.6.32.18/grsecurity/grsum.c linux-2.6.32.18/grsecurity/grsum.c
42850--- linux-2.6.32.16/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 42894--- linux-2.6.32.18/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
42851+++ linux-2.6.32.16/grsecurity/grsum.c 2010-07-09 14:50:38.000000000 -0400 42895+++ linux-2.6.32.18/grsecurity/grsum.c 2010-08-11 18:57:32.000000000 -0400
42852@@ -0,0 +1,61 @@ 42896@@ -0,0 +1,61 @@
42853+#include <linux/err.h> 42897+#include <linux/err.h>
42854+#include <linux/kernel.h> 42898+#include <linux/kernel.h>
@@ -42911,10 +42955,10 @@ diff -urNp linux-2.6.32.16/grsecurity/grsum.c linux-2.6.32.16/grsecurity/grsum.c
42911+ 42955+
42912+ return retval; 42956+ return retval;
42913+} 42957+}
42914diff -urNp linux-2.6.32.16/grsecurity/Kconfig linux-2.6.32.16/grsecurity/Kconfig 42958diff -urNp linux-2.6.32.18/grsecurity/Kconfig linux-2.6.32.18/grsecurity/Kconfig
42915--- linux-2.6.32.16/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 42959--- linux-2.6.32.18/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
42916+++ linux-2.6.32.16/grsecurity/Kconfig 2010-07-09 14:50:38.000000000 -0400 42960+++ linux-2.6.32.18/grsecurity/Kconfig 2010-08-11 22:07:12.000000000 -0400
42917@@ -0,0 +1,981 @@ 42961@@ -0,0 +1,982 @@
42918+# 42962+#
42919+# grecurity configuration 42963+# grecurity configuration
42920+# 42964+#
@@ -42993,7 +43037,7 @@ diff -urNp linux-2.6.32.16/grsecurity/Kconfig linux-2.6.32.16/grsecurity/Kconfig
42993+ select PAX_ASLR 43037+ select PAX_ASLR
42994+ select PAX_RANDMMAP 43038+ select PAX_RANDMMAP
42995+ select PAX_REFCOUNT if (X86 || SPARC64) 43039+ select PAX_REFCOUNT if (X86 || SPARC64)
42996+ select PAX_USERCOPY if ((X86 || SPARC32 || SPARC64 || PPC32 || PPC64) && (SLAB || SLUB || SLOB)) 43040+ select PAX_USERCOPY if ((X86 || SPARC32 || SPARC64 || PPC) && (SLAB || SLUB || SLOB))
42997+ 43041+
42998+ help 43042+ help
42999+ If you say Y here, several features in addition to those included 43043+ If you say Y here, several features in addition to those included
@@ -43065,7 +43109,7 @@ diff -urNp linux-2.6.32.16/grsecurity/Kconfig linux-2.6.32.16/grsecurity/Kconfig
43065+ select PAX_EI_PAX 43109+ select PAX_EI_PAX
43066+ select PAX_PT_PAX_FLAGS 43110+ select PAX_PT_PAX_FLAGS
43067+ select PAX_HAVE_ACL_FLAGS 43111+ select PAX_HAVE_ACL_FLAGS
43068+ select PAX_KERNEXEC if ((PPC32 || PPC64 || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN) 43112+ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
43069+ select PAX_MEMORY_UDEREF if (X86_32 && !XEN) 43113+ select PAX_MEMORY_UDEREF if (X86_32 && !XEN)
43070+ select PAX_RANDKSTACK if (X86_TSC && !X86_64) 43114+ select PAX_RANDKSTACK if (X86_TSC && !X86_64)
43071+ select PAX_SEGMEXEC if (X86_32) 43115+ select PAX_SEGMEXEC if (X86_32)
@@ -43074,8 +43118,9 @@ diff -urNp linux-2.6.32.16/grsecurity/Kconfig linux-2.6.32.16/grsecurity/Kconfig
43074+ select PAX_EMUTRAMP if (PARISC) 43118+ select PAX_EMUTRAMP if (PARISC)
43075+ select PAX_EMUSIGRT if (PARISC) 43119+ select PAX_EMUSIGRT if (PARISC)
43076+ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC) 43120+ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
43121+ select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
43077+ select PAX_REFCOUNT if (X86 || SPARC64) 43122+ select PAX_REFCOUNT if (X86 || SPARC64)
43078+ select PAX_USERCOPY if ((X86 || PPC32 || PPC64 || SPARC32 || SPARC64) && (SLAB || SLUB || SLOB)) 43123+ select PAX_USERCOPY if ((X86 || PPC || SPARC32 || SPARC64) && (SLAB || SLUB || SLOB))
43079+ help 43124+ help
43080+ If you say Y here, many of the features of grsecurity will be 43125+ If you say Y here, many of the features of grsecurity will be
43081+ enabled, which will protect you against many kinds of attacks 43126+ enabled, which will protect you against many kinds of attacks
@@ -43896,9 +43941,9 @@ diff -urNp linux-2.6.32.16/grsecurity/Kconfig linux-2.6.32.16/grsecurity/Kconfig
43896+endmenu 43941+endmenu
43897+ 43942+
43898+endmenu 43943+endmenu
43899diff -urNp linux-2.6.32.16/grsecurity/Makefile linux-2.6.32.16/grsecurity/Makefile 43944diff -urNp linux-2.6.32.18/grsecurity/Makefile linux-2.6.32.18/grsecurity/Makefile
43900--- linux-2.6.32.16/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 43945--- linux-2.6.32.18/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
43901+++ linux-2.6.32.16/grsecurity/Makefile 2010-07-09 14:50:38.000000000 -0400 43946+++ linux-2.6.32.18/grsecurity/Makefile 2010-08-11 18:57:32.000000000 -0400
43902@@ -0,0 +1,29 @@ 43947@@ -0,0 +1,29 @@
43903+# grsecurity's ACL system was originally written in 2001 by Michael Dalton 43948+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
43904+# during 2001-2009 it has been completely redesigned by Brad Spengler 43949+# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -43929,9 +43974,9 @@ diff -urNp linux-2.6.32.16/grsecurity/Makefile linux-2.6.32.16/grsecurity/Makefi
43929+ @-chmod -f 700 . 43974+ @-chmod -f 700 .
43930+ @echo ' grsec: protected kernel image paths' 43975+ @echo ' grsec: protected kernel image paths'
43931+endif 43976+endif
43932diff -urNp linux-2.6.32.16/include/acpi/acoutput.h linux-2.6.32.16/include/acpi/acoutput.h 43977diff -urNp linux-2.6.32.18/include/acpi/acoutput.h linux-2.6.32.18/include/acpi/acoutput.h
43933--- linux-2.6.32.16/include/acpi/acoutput.h 2010-07-05 14:14:00.000000000 -0400 43978--- linux-2.6.32.18/include/acpi/acoutput.h 2010-08-10 13:45:57.000000000 -0400
43934+++ linux-2.6.32.16/include/acpi/acoutput.h 2010-07-09 14:50:38.000000000 -0400 43979+++ linux-2.6.32.18/include/acpi/acoutput.h 2010-08-11 18:57:32.000000000 -0400
43935@@ -264,8 +264,8 @@ 43980@@ -264,8 +264,8 @@
43936 * leaving no executable debug code! 43981 * leaving no executable debug code!
43937 */ 43982 */
@@ -43943,9 +43988,9 @@ diff -urNp linux-2.6.32.16/include/acpi/acoutput.h linux-2.6.32.16/include/acpi/
43943 43988
43944 #endif /* ACPI_DEBUG_OUTPUT */ 43989 #endif /* ACPI_DEBUG_OUTPUT */
43945 43990
43946diff -urNp linux-2.6.32.16/include/acpi/acpi_drivers.h linux-2.6.32.16/include/acpi/acpi_drivers.h 43991diff -urNp linux-2.6.32.18/include/acpi/acpi_drivers.h linux-2.6.32.18/include/acpi/acpi_drivers.h
43947--- linux-2.6.32.16/include/acpi/acpi_drivers.h 2010-07-05 14:14:00.000000000 -0400 43992--- linux-2.6.32.18/include/acpi/acpi_drivers.h 2010-08-10 13:45:57.000000000 -0400
43948+++ linux-2.6.32.16/include/acpi/acpi_drivers.h 2010-07-09 14:50:38.000000000 -0400 43993+++ linux-2.6.32.18/include/acpi/acpi_drivers.h 2010-08-11 18:57:32.000000000 -0400
43949@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp 43994@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
43950 Dock Station 43995 Dock Station
43951 -------------------------------------------------------------------------- */ 43996 -------------------------------------------------------------------------- */
@@ -43975,9 +44020,9 @@ diff -urNp linux-2.6.32.16/include/acpi/acpi_drivers.h linux-2.6.32.16/include/a
43975 void *context) 44020 void *context)
43976 { 44021 {
43977 return -ENODEV; 44022 return -ENODEV;
43978diff -urNp linux-2.6.32.16/include/asm-generic/atomic-long.h linux-2.6.32.16/include/asm-generic/atomic-long.h 44023diff -urNp linux-2.6.32.18/include/asm-generic/atomic-long.h linux-2.6.32.18/include/asm-generic/atomic-long.h
43979--- linux-2.6.32.16/include/asm-generic/atomic-long.h 2010-07-05 14:14:00.000000000 -0400 44024--- linux-2.6.32.18/include/asm-generic/atomic-long.h 2010-08-10 13:45:57.000000000 -0400
43980+++ linux-2.6.32.16/include/asm-generic/atomic-long.h 2010-07-09 14:50:38.000000000 -0400 44025+++ linux-2.6.32.18/include/asm-generic/atomic-long.h 2010-08-11 18:57:32.000000000 -0400
43981@@ -22,6 +22,12 @@ 44026@@ -22,6 +22,12 @@
43982 44027
43983 typedef atomic64_t atomic_long_t; 44028 typedef atomic64_t atomic_long_t;
@@ -44232,9 +44277,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/atomic-long.h linux-2.6.32.16/inc
44232+#endif 44277+#endif
44233+ 44278+
44234 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ 44279 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
44235diff -urNp linux-2.6.32.16/include/asm-generic/dma-mapping-common.h linux-2.6.32.16/include/asm-generic/dma-mapping-common.h 44280diff -urNp linux-2.6.32.18/include/asm-generic/dma-mapping-common.h linux-2.6.32.18/include/asm-generic/dma-mapping-common.h
44236--- linux-2.6.32.16/include/asm-generic/dma-mapping-common.h 2010-07-05 14:14:00.000000000 -0400 44281--- linux-2.6.32.18/include/asm-generic/dma-mapping-common.h 2010-08-10 13:45:57.000000000 -0400
44237+++ linux-2.6.32.16/include/asm-generic/dma-mapping-common.h 2010-07-09 14:50:38.000000000 -0400 44282+++ linux-2.6.32.18/include/asm-generic/dma-mapping-common.h 2010-08-11 18:57:32.000000000 -0400
44238@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ 44283@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
44239 enum dma_data_direction dir, 44284 enum dma_data_direction dir,
44240 struct dma_attrs *attrs) 44285 struct dma_attrs *attrs)
@@ -44343,9 +44388,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/dma-mapping-common.h linux-2.6.32
44343 44388
44344 BUG_ON(!valid_dma_direction(dir)); 44389 BUG_ON(!valid_dma_direction(dir));
44345 if (ops->sync_sg_for_device) 44390 if (ops->sync_sg_for_device)
44346diff -urNp linux-2.6.32.16/include/asm-generic/futex.h linux-2.6.32.16/include/asm-generic/futex.h 44391diff -urNp linux-2.6.32.18/include/asm-generic/futex.h linux-2.6.32.18/include/asm-generic/futex.h
44347--- linux-2.6.32.16/include/asm-generic/futex.h 2010-07-05 14:14:00.000000000 -0400 44392--- linux-2.6.32.18/include/asm-generic/futex.h 2010-08-10 13:45:57.000000000 -0400
44348+++ linux-2.6.32.16/include/asm-generic/futex.h 2010-07-09 14:50:38.000000000 -0400 44393+++ linux-2.6.32.18/include/asm-generic/futex.h 2010-08-11 18:57:32.000000000 -0400
44349@@ -6,7 +6,7 @@ 44394@@ -6,7 +6,7 @@
44350 #include <asm/errno.h> 44395 #include <asm/errno.h>
44351 44396
@@ -44364,9 +44409,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/futex.h linux-2.6.32.16/include/a
44364 { 44409 {
44365 return -ENOSYS; 44410 return -ENOSYS;
44366 } 44411 }
44367diff -urNp linux-2.6.32.16/include/asm-generic/int-l64.h linux-2.6.32.16/include/asm-generic/int-l64.h 44412diff -urNp linux-2.6.32.18/include/asm-generic/int-l64.h linux-2.6.32.18/include/asm-generic/int-l64.h
44368--- linux-2.6.32.16/include/asm-generic/int-l64.h 2010-07-05 14:14:00.000000000 -0400 44413--- linux-2.6.32.18/include/asm-generic/int-l64.h 2010-08-10 13:45:57.000000000 -0400
44369+++ linux-2.6.32.16/include/asm-generic/int-l64.h 2010-07-09 14:50:38.000000000 -0400 44414+++ linux-2.6.32.18/include/asm-generic/int-l64.h 2010-08-11 18:57:32.000000000 -0400
44370@@ -46,6 +46,8 @@ typedef unsigned int u32; 44415@@ -46,6 +46,8 @@ typedef unsigned int u32;
44371 typedef signed long s64; 44416 typedef signed long s64;
44372 typedef unsigned long u64; 44417 typedef unsigned long u64;
@@ -44376,9 +44421,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/int-l64.h linux-2.6.32.16/include
44376 #define S8_C(x) x 44421 #define S8_C(x) x
44377 #define U8_C(x) x ## U 44422 #define U8_C(x) x ## U
44378 #define S16_C(x) x 44423 #define S16_C(x) x
44379diff -urNp linux-2.6.32.16/include/asm-generic/int-ll64.h linux-2.6.32.16/include/asm-generic/int-ll64.h 44424diff -urNp linux-2.6.32.18/include/asm-generic/int-ll64.h linux-2.6.32.18/include/asm-generic/int-ll64.h
44380--- linux-2.6.32.16/include/asm-generic/int-ll64.h 2010-07-05 14:14:00.000000000 -0400 44425--- linux-2.6.32.18/include/asm-generic/int-ll64.h 2010-08-10 13:45:57.000000000 -0400
44381+++ linux-2.6.32.16/include/asm-generic/int-ll64.h 2010-07-09 14:50:38.000000000 -0400 44426+++ linux-2.6.32.18/include/asm-generic/int-ll64.h 2010-08-11 18:57:32.000000000 -0400
44382@@ -51,6 +51,8 @@ typedef unsigned int u32; 44427@@ -51,6 +51,8 @@ typedef unsigned int u32;
44383 typedef signed long long s64; 44428 typedef signed long long s64;
44384 typedef unsigned long long u64; 44429 typedef unsigned long long u64;
@@ -44388,9 +44433,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/int-ll64.h linux-2.6.32.16/includ
44388 #define S8_C(x) x 44433 #define S8_C(x) x
44389 #define U8_C(x) x ## U 44434 #define U8_C(x) x ## U
44390 #define S16_C(x) x 44435 #define S16_C(x) x
44391diff -urNp linux-2.6.32.16/include/asm-generic/kmap_types.h linux-2.6.32.16/include/asm-generic/kmap_types.h 44436diff -urNp linux-2.6.32.18/include/asm-generic/kmap_types.h linux-2.6.32.18/include/asm-generic/kmap_types.h
44392--- linux-2.6.32.16/include/asm-generic/kmap_types.h 2010-07-05 14:14:00.000000000 -0400 44437--- linux-2.6.32.18/include/asm-generic/kmap_types.h 2010-08-10 13:45:57.000000000 -0400
44393+++ linux-2.6.32.16/include/asm-generic/kmap_types.h 2010-07-09 14:50:38.000000000 -0400 44438+++ linux-2.6.32.18/include/asm-generic/kmap_types.h 2010-08-11 18:57:32.000000000 -0400
44394@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, 44439@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
44395 KMAP_D(16) KM_IRQ_PTE, 44440 KMAP_D(16) KM_IRQ_PTE,
44396 KMAP_D(17) KM_NMI, 44441 KMAP_D(17) KM_NMI,
@@ -44401,9 +44446,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/kmap_types.h linux-2.6.32.16/incl
44401 }; 44446 };
44402 44447
44403 #undef KMAP_D 44448 #undef KMAP_D
44404diff -urNp linux-2.6.32.16/include/asm-generic/pgtable.h linux-2.6.32.16/include/asm-generic/pgtable.h 44449diff -urNp linux-2.6.32.18/include/asm-generic/pgtable.h linux-2.6.32.18/include/asm-generic/pgtable.h
44405--- linux-2.6.32.16/include/asm-generic/pgtable.h 2010-07-05 14:14:00.000000000 -0400 44450--- linux-2.6.32.18/include/asm-generic/pgtable.h 2010-08-10 13:45:57.000000000 -0400
44406+++ linux-2.6.32.16/include/asm-generic/pgtable.h 2010-07-09 14:50:38.000000000 -0400 44451+++ linux-2.6.32.18/include/asm-generic/pgtable.h 2010-08-11 18:57:32.000000000 -0400
44407@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar 44452@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
44408 unsigned long size); 44453 unsigned long size);
44409 #endif 44454 #endif
@@ -44419,9 +44464,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/pgtable.h linux-2.6.32.16/include
44419 #endif /* !__ASSEMBLY__ */ 44464 #endif /* !__ASSEMBLY__ */
44420 44465
44421 #endif /* _ASM_GENERIC_PGTABLE_H */ 44466 #endif /* _ASM_GENERIC_PGTABLE_H */
44422diff -urNp linux-2.6.32.16/include/asm-generic/pgtable-nopmd.h linux-2.6.32.16/include/asm-generic/pgtable-nopmd.h 44467diff -urNp linux-2.6.32.18/include/asm-generic/pgtable-nopmd.h linux-2.6.32.18/include/asm-generic/pgtable-nopmd.h
44423--- linux-2.6.32.16/include/asm-generic/pgtable-nopmd.h 2010-07-05 14:14:00.000000000 -0400 44468--- linux-2.6.32.18/include/asm-generic/pgtable-nopmd.h 2010-08-10 13:45:57.000000000 -0400
44424+++ linux-2.6.32.16/include/asm-generic/pgtable-nopmd.h 2010-07-16 21:06:43.000000000 -0400 44469+++ linux-2.6.32.18/include/asm-generic/pgtable-nopmd.h 2010-08-11 18:57:32.000000000 -0400
44425@@ -1,14 +1,19 @@ 44470@@ -1,14 +1,19 @@
44426 #ifndef _PGTABLE_NOPMD_H 44471 #ifndef _PGTABLE_NOPMD_H
44427 #define _PGTABLE_NOPMD_H 44472 #define _PGTABLE_NOPMD_H
@@ -44458,9 +44503,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/pgtable-nopmd.h linux-2.6.32.16/i
44458 /* 44503 /*
44459 * The "pud_xxx()" functions here are trivial for a folded two-level 44504 * The "pud_xxx()" functions here are trivial for a folded two-level
44460 * setup: the pmd is never bad, and a pmd always exists (as it's folded 44505 * setup: the pmd is never bad, and a pmd always exists (as it's folded
44461diff -urNp linux-2.6.32.16/include/asm-generic/pgtable-nopud.h linux-2.6.32.16/include/asm-generic/pgtable-nopud.h 44506diff -urNp linux-2.6.32.18/include/asm-generic/pgtable-nopud.h linux-2.6.32.18/include/asm-generic/pgtable-nopud.h
44462--- linux-2.6.32.16/include/asm-generic/pgtable-nopud.h 2010-07-05 14:14:00.000000000 -0400 44507--- linux-2.6.32.18/include/asm-generic/pgtable-nopud.h 2010-08-10 13:45:57.000000000 -0400
44463+++ linux-2.6.32.16/include/asm-generic/pgtable-nopud.h 2010-07-16 21:06:43.000000000 -0400 44508+++ linux-2.6.32.18/include/asm-generic/pgtable-nopud.h 2010-08-11 18:57:32.000000000 -0400
44464@@ -1,10 +1,15 @@ 44509@@ -1,10 +1,15 @@
44465 #ifndef _PGTABLE_NOPUD_H 44510 #ifndef _PGTABLE_NOPUD_H
44466 #define _PGTABLE_NOPUD_H 44511 #define _PGTABLE_NOPUD_H
@@ -44491,9 +44536,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/pgtable-nopud.h linux-2.6.32.16/i
44491 /* 44536 /*
44492 * The "pgd_xxx()" functions here are trivial for a folded two-level 44537 * The "pgd_xxx()" functions here are trivial for a folded two-level
44493 * setup: the pud is never bad, and a pud always exists (as it's folded 44538 * setup: the pud is never bad, and a pud always exists (as it's folded
44494diff -urNp linux-2.6.32.16/include/asm-generic/vmlinux.lds.h linux-2.6.32.16/include/asm-generic/vmlinux.lds.h 44539diff -urNp linux-2.6.32.18/include/asm-generic/vmlinux.lds.h linux-2.6.32.18/include/asm-generic/vmlinux.lds.h
44495--- linux-2.6.32.16/include/asm-generic/vmlinux.lds.h 2010-07-05 14:14:00.000000000 -0400 44540--- linux-2.6.32.18/include/asm-generic/vmlinux.lds.h 2010-08-10 13:45:57.000000000 -0400
44496+++ linux-2.6.32.16/include/asm-generic/vmlinux.lds.h 2010-07-09 14:50:38.000000000 -0400 44541+++ linux-2.6.32.18/include/asm-generic/vmlinux.lds.h 2010-08-11 18:57:32.000000000 -0400
44497@@ -199,6 +199,7 @@ 44542@@ -199,6 +199,7 @@
44498 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ 44543 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
44499 VMLINUX_SYMBOL(__start_rodata) = .; \ 44544 VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -44532,9 +44577,9 @@ diff -urNp linux-2.6.32.16/include/asm-generic/vmlinux.lds.h linux-2.6.32.16/inc
44532 44577
44533 /** 44578 /**
44534 * PERCPU - define output section for percpu area, simple version 44579 * PERCPU - define output section for percpu area, simple version
44535diff -urNp linux-2.6.32.16/include/drm/drm_pciids.h linux-2.6.32.16/include/drm/drm_pciids.h 44580diff -urNp linux-2.6.32.18/include/drm/drm_pciids.h linux-2.6.32.18/include/drm/drm_pciids.h
44536--- linux-2.6.32.16/include/drm/drm_pciids.h 2010-07-05 14:14:00.000000000 -0400 44581--- linux-2.6.32.18/include/drm/drm_pciids.h 2010-08-10 13:45:57.000000000 -0400
44537+++ linux-2.6.32.16/include/drm/drm_pciids.h 2010-07-09 14:50:38.000000000 -0400 44582+++ linux-2.6.32.18/include/drm/drm_pciids.h 2010-08-11 18:57:32.000000000 -0400
44538@@ -377,7 +377,7 @@ 44583@@ -377,7 +377,7 @@
44539 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 44584 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
44540 {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 44585 {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -44638,9 +44683,9 @@ diff -urNp linux-2.6.32.16/include/drm/drm_pciids.h linux-2.6.32.16/include/drm/
44638 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 44683 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
44639- {0, 0, 0} 44684- {0, 0, 0}
44640+ {0, 0, 0, 0, 0, 0} 44685+ {0, 0, 0, 0, 0, 0}
44641diff -urNp linux-2.6.32.16/include/drm/drmP.h linux-2.6.32.16/include/drm/drmP.h 44686diff -urNp linux-2.6.32.18/include/drm/drmP.h linux-2.6.32.18/include/drm/drmP.h
44642--- linux-2.6.32.16/include/drm/drmP.h 2010-07-05 14:14:00.000000000 -0400 44687--- linux-2.6.32.18/include/drm/drmP.h 2010-08-10 13:45:57.000000000 -0400
44643+++ linux-2.6.32.16/include/drm/drmP.h 2010-07-09 14:50:38.000000000 -0400 44688+++ linux-2.6.32.18/include/drm/drmP.h 2010-08-11 18:57:32.000000000 -0400
44644@@ -814,7 +814,7 @@ struct drm_driver { 44689@@ -814,7 +814,7 @@ struct drm_driver {
44645 void (*vgaarb_irq)(struct drm_device *dev, bool state); 44690 void (*vgaarb_irq)(struct drm_device *dev, bool state);
44646 44691
@@ -44668,9 +44713,9 @@ diff -urNp linux-2.6.32.16/include/drm/drmP.h linux-2.6.32.16/include/drm/drmP.h
44668 /*@} */ 44713 /*@} */
44669 44714
44670 struct list_head filelist; 44715 struct list_head filelist;
44671diff -urNp linux-2.6.32.16/include/linux/a.out.h linux-2.6.32.16/include/linux/a.out.h 44716diff -urNp linux-2.6.32.18/include/linux/a.out.h linux-2.6.32.18/include/linux/a.out.h
44672--- linux-2.6.32.16/include/linux/a.out.h 2010-07-05 14:14:00.000000000 -0400 44717--- linux-2.6.32.18/include/linux/a.out.h 2010-08-10 13:45:57.000000000 -0400
44673+++ linux-2.6.32.16/include/linux/a.out.h 2010-07-09 14:50:38.000000000 -0400 44718+++ linux-2.6.32.18/include/linux/a.out.h 2010-08-11 18:57:32.000000000 -0400
44674@@ -39,6 +39,14 @@ enum machine_type { 44719@@ -39,6 +39,14 @@ enum machine_type {
44675 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ 44720 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
44676 }; 44721 };
@@ -44686,9 +44731,9 @@ diff -urNp linux-2.6.32.16/include/linux/a.out.h linux-2.6.32.16/include/linux/a
44686 #if !defined (N_MAGIC) 44731 #if !defined (N_MAGIC)
44687 #define N_MAGIC(exec) ((exec).a_info & 0xffff) 44732 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
44688 #endif 44733 #endif
44689diff -urNp linux-2.6.32.16/include/linux/atmdev.h linux-2.6.32.16/include/linux/atmdev.h 44734diff -urNp linux-2.6.32.18/include/linux/atmdev.h linux-2.6.32.18/include/linux/atmdev.h
44690--- linux-2.6.32.16/include/linux/atmdev.h 2010-07-05 14:14:00.000000000 -0400 44735--- linux-2.6.32.18/include/linux/atmdev.h 2010-08-10 13:45:57.000000000 -0400
44691+++ linux-2.6.32.16/include/linux/atmdev.h 2010-07-09 14:50:38.000000000 -0400 44736+++ linux-2.6.32.18/include/linux/atmdev.h 2010-08-11 18:57:32.000000000 -0400
44692@@ -237,7 +237,7 @@ struct compat_atm_iobuf { 44737@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
44693 #endif 44738 #endif
44694 44739
@@ -44698,9 +44743,9 @@ diff -urNp linux-2.6.32.16/include/linux/atmdev.h linux-2.6.32.16/include/linux/
44698 __AAL_STAT_ITEMS 44743 __AAL_STAT_ITEMS
44699 #undef __HANDLE_ITEM 44744 #undef __HANDLE_ITEM
44700 }; 44745 };
44701diff -urNp linux-2.6.32.16/include/linux/backlight.h linux-2.6.32.16/include/linux/backlight.h 44746diff -urNp linux-2.6.32.18/include/linux/backlight.h linux-2.6.32.18/include/linux/backlight.h
44702--- linux-2.6.32.16/include/linux/backlight.h 2010-07-05 14:14:00.000000000 -0400 44747--- linux-2.6.32.18/include/linux/backlight.h 2010-08-10 13:45:57.000000000 -0400
44703+++ linux-2.6.32.16/include/linux/backlight.h 2010-07-09 14:50:38.000000000 -0400 44748+++ linux-2.6.32.18/include/linux/backlight.h 2010-08-11 18:57:32.000000000 -0400
44704@@ -36,18 +36,18 @@ struct backlight_device; 44749@@ -36,18 +36,18 @@ struct backlight_device;
44705 struct fb_info; 44750 struct fb_info;
44706 44751
@@ -44742,9 +44787,9 @@ diff -urNp linux-2.6.32.16/include/linux/backlight.h linux-2.6.32.16/include/lin
44742 extern void backlight_device_unregister(struct backlight_device *bd); 44787 extern void backlight_device_unregister(struct backlight_device *bd);
44743 extern void backlight_force_update(struct backlight_device *bd, 44788 extern void backlight_force_update(struct backlight_device *bd,
44744 enum backlight_update_reason reason); 44789 enum backlight_update_reason reason);
44745diff -urNp linux-2.6.32.16/include/linux/binfmts.h linux-2.6.32.16/include/linux/binfmts.h 44790diff -urNp linux-2.6.32.18/include/linux/binfmts.h linux-2.6.32.18/include/linux/binfmts.h
44746--- linux-2.6.32.16/include/linux/binfmts.h 2010-07-05 14:14:00.000000000 -0400 44791--- linux-2.6.32.18/include/linux/binfmts.h 2010-08-10 13:45:57.000000000 -0400
44747+++ linux-2.6.32.16/include/linux/binfmts.h 2010-07-09 14:50:38.000000000 -0400 44792+++ linux-2.6.32.18/include/linux/binfmts.h 2010-08-11 18:57:32.000000000 -0400
44748@@ -78,6 +78,7 @@ struct linux_binfmt { 44793@@ -78,6 +78,7 @@ struct linux_binfmt {
44749 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); 44794 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
44750 int (*load_shlib)(struct file *); 44795 int (*load_shlib)(struct file *);
@@ -44753,9 +44798,9 @@ diff -urNp linux-2.6.32.16/include/linux/binfmts.h linux-2.6.32.16/include/linux
44753 unsigned long min_coredump; /* minimal dump size */ 44798 unsigned long min_coredump; /* minimal dump size */
44754 int hasvdso; 44799 int hasvdso;
44755 }; 44800 };
44756diff -urNp linux-2.6.32.16/include/linux/blkdev.h linux-2.6.32.16/include/linux/blkdev.h 44801diff -urNp linux-2.6.32.18/include/linux/blkdev.h linux-2.6.32.18/include/linux/blkdev.h
44757--- linux-2.6.32.16/include/linux/blkdev.h 2010-07-05 14:14:00.000000000 -0400 44802--- linux-2.6.32.18/include/linux/blkdev.h 2010-08-10 13:45:57.000000000 -0400
44758+++ linux-2.6.32.16/include/linux/blkdev.h 2010-07-09 14:50:38.000000000 -0400 44803+++ linux-2.6.32.18/include/linux/blkdev.h 2010-08-11 18:57:32.000000000 -0400
44759@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc 44804@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc
44760 #endif /* CONFIG_BLK_DEV_INTEGRITY */ 44805 #endif /* CONFIG_BLK_DEV_INTEGRITY */
44761 44806
@@ -44787,9 +44832,9 @@ diff -urNp linux-2.6.32.16/include/linux/blkdev.h linux-2.6.32.16/include/linux/
44787 }; 44832 };
44788 44833
44789 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, 44834 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
44790diff -urNp linux-2.6.32.16/include/linux/cache.h linux-2.6.32.16/include/linux/cache.h 44835diff -urNp linux-2.6.32.18/include/linux/cache.h linux-2.6.32.18/include/linux/cache.h
44791--- linux-2.6.32.16/include/linux/cache.h 2010-07-05 14:14:00.000000000 -0400 44836--- linux-2.6.32.18/include/linux/cache.h 2010-08-10 13:45:57.000000000 -0400
44792+++ linux-2.6.32.16/include/linux/cache.h 2010-07-09 14:50:38.000000000 -0400 44837+++ linux-2.6.32.18/include/linux/cache.h 2010-08-11 18:57:32.000000000 -0400
44793@@ -16,6 +16,10 @@ 44838@@ -16,6 +16,10 @@
44794 #define __read_mostly 44839 #define __read_mostly
44795 #endif 44840 #endif
@@ -44801,9 +44846,9 @@ diff -urNp linux-2.6.32.16/include/linux/cache.h linux-2.6.32.16/include/linux/c
44801 #ifndef ____cacheline_aligned 44846 #ifndef ____cacheline_aligned
44802 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) 44847 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
44803 #endif 44848 #endif
44804diff -urNp linux-2.6.32.16/include/linux/capability.h linux-2.6.32.16/include/linux/capability.h 44849diff -urNp linux-2.6.32.18/include/linux/capability.h linux-2.6.32.18/include/linux/capability.h
44805--- linux-2.6.32.16/include/linux/capability.h 2010-07-05 14:14:00.000000000 -0400 44850--- linux-2.6.32.18/include/linux/capability.h 2010-08-10 13:45:57.000000000 -0400
44806+++ linux-2.6.32.16/include/linux/capability.h 2010-07-09 14:50:38.000000000 -0400 44851+++ linux-2.6.32.18/include/linux/capability.h 2010-08-11 18:57:32.000000000 -0400
44807@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff 44852@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
44808 (security_real_capable_noaudit((t), (cap)) == 0) 44853 (security_real_capable_noaudit((t), (cap)) == 0)
44809 44854
@@ -44812,9 +44857,9 @@ diff -urNp linux-2.6.32.16/include/linux/capability.h linux-2.6.32.16/include/li
44812 44857
44813 /* audit system wants to get cap info from files as well */ 44858 /* audit system wants to get cap info from files as well */
44814 struct dentry; 44859 struct dentry;
44815diff -urNp linux-2.6.32.16/include/linux/compiler-gcc4.h linux-2.6.32.16/include/linux/compiler-gcc4.h 44860diff -urNp linux-2.6.32.18/include/linux/compiler-gcc4.h linux-2.6.32.18/include/linux/compiler-gcc4.h
44816--- linux-2.6.32.16/include/linux/compiler-gcc4.h 2010-07-05 14:14:00.000000000 -0400 44861--- linux-2.6.32.18/include/linux/compiler-gcc4.h 2010-08-10 13:45:57.000000000 -0400
44817+++ linux-2.6.32.16/include/linux/compiler-gcc4.h 2010-07-09 14:50:38.000000000 -0400 44862+++ linux-2.6.32.18/include/linux/compiler-gcc4.h 2010-08-11 18:57:32.000000000 -0400
44818@@ -36,4 +36,8 @@ 44863@@ -36,4 +36,8 @@
44819 the kernel context */ 44864 the kernel context */
44820 #define __cold __attribute__((__cold__)) 44865 #define __cold __attribute__((__cold__))
@@ -44824,9 +44869,9 @@ diff -urNp linux-2.6.32.16/include/linux/compiler-gcc4.h linux-2.6.32.16/include
44824+#define __bos0(ptr) __bos((ptr), 0) 44869+#define __bos0(ptr) __bos((ptr), 0)
44825+#define __bos1(ptr) __bos((ptr), 1) 44870+#define __bos1(ptr) __bos((ptr), 1)
44826 #endif 44871 #endif
44827diff -urNp linux-2.6.32.16/include/linux/compiler.h linux-2.6.32.16/include/linux/compiler.h 44872diff -urNp linux-2.6.32.18/include/linux/compiler.h linux-2.6.32.18/include/linux/compiler.h
44828--- linux-2.6.32.16/include/linux/compiler.h 2010-07-05 14:14:00.000000000 -0400 44873--- linux-2.6.32.18/include/linux/compiler.h 2010-08-10 13:45:57.000000000 -0400
44829+++ linux-2.6.32.16/include/linux/compiler.h 2010-07-09 14:50:38.000000000 -0400 44874+++ linux-2.6.32.18/include/linux/compiler.h 2010-08-11 18:57:32.000000000 -0400
44830@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ 44875@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
44831 #define __cold 44876 #define __cold
44832 #endif 44877 #endif
@@ -44850,9 +44895,9 @@ diff -urNp linux-2.6.32.16/include/linux/compiler.h linux-2.6.32.16/include/linu
44850 /* Simple shorthand for a section definition */ 44895 /* Simple shorthand for a section definition */
44851 #ifndef __section 44896 #ifndef __section
44852 # define __section(S) __attribute__ ((__section__(#S))) 44897 # define __section(S) __attribute__ ((__section__(#S)))
44853diff -urNp linux-2.6.32.16/include/linux/decompress/mm.h linux-2.6.32.16/include/linux/decompress/mm.h 44898diff -urNp linux-2.6.32.18/include/linux/decompress/mm.h linux-2.6.32.18/include/linux/decompress/mm.h
44854--- linux-2.6.32.16/include/linux/decompress/mm.h 2010-07-05 14:14:00.000000000 -0400 44899--- linux-2.6.32.18/include/linux/decompress/mm.h 2010-08-10 13:45:57.000000000 -0400
44855+++ linux-2.6.32.16/include/linux/decompress/mm.h 2010-07-09 14:50:38.000000000 -0400 44900+++ linux-2.6.32.18/include/linux/decompress/mm.h 2010-08-11 18:57:32.000000000 -0400
44856@@ -78,7 +78,7 @@ static void free(void *where) 44901@@ -78,7 +78,7 @@ static void free(void *where)
44857 * warnings when not needed (indeed large_malloc / large_free are not 44902 * warnings when not needed (indeed large_malloc / large_free are not
44858 * needed by inflate */ 44903 * needed by inflate */
@@ -44862,9 +44907,9 @@ diff -urNp linux-2.6.32.16/include/linux/decompress/mm.h linux-2.6.32.16/include
44862 #define free(a) kfree(a) 44907 #define free(a) kfree(a)
44863 44908
44864 #define large_malloc(a) vmalloc(a) 44909 #define large_malloc(a) vmalloc(a)
44865diff -urNp linux-2.6.32.16/include/linux/dma-mapping.h linux-2.6.32.16/include/linux/dma-mapping.h 44910diff -urNp linux-2.6.32.18/include/linux/dma-mapping.h linux-2.6.32.18/include/linux/dma-mapping.h
44866--- linux-2.6.32.16/include/linux/dma-mapping.h 2010-07-05 14:14:00.000000000 -0400 44911--- linux-2.6.32.18/include/linux/dma-mapping.h 2010-08-10 13:45:57.000000000 -0400
44867+++ linux-2.6.32.16/include/linux/dma-mapping.h 2010-07-09 14:50:38.000000000 -0400 44912+++ linux-2.6.32.18/include/linux/dma-mapping.h 2010-08-11 18:57:32.000000000 -0400
44868@@ -16,50 +16,50 @@ enum dma_data_direction { 44913@@ -16,50 +16,50 @@ enum dma_data_direction {
44869 }; 44914 };
44870 44915
@@ -44931,9 +44976,9 @@ diff -urNp linux-2.6.32.16/include/linux/dma-mapping.h linux-2.6.32.16/include/l
44931 }; 44976 };
44932 44977
44933 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) 44978 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
44934diff -urNp linux-2.6.32.16/include/linux/dst.h linux-2.6.32.16/include/linux/dst.h 44979diff -urNp linux-2.6.32.18/include/linux/dst.h linux-2.6.32.18/include/linux/dst.h
44935--- linux-2.6.32.16/include/linux/dst.h 2010-07-05 14:14:00.000000000 -0400 44980--- linux-2.6.32.18/include/linux/dst.h 2010-08-10 13:45:57.000000000 -0400
44936+++ linux-2.6.32.16/include/linux/dst.h 2010-07-09 14:50:38.000000000 -0400 44981+++ linux-2.6.32.18/include/linux/dst.h 2010-08-11 18:57:32.000000000 -0400
44937@@ -380,7 +380,7 @@ struct dst_node 44982@@ -380,7 +380,7 @@ struct dst_node
44938 struct thread_pool *pool; 44983 struct thread_pool *pool;
44939 44984
@@ -44943,9 +44988,9 @@ diff -urNp linux-2.6.32.16/include/linux/dst.h linux-2.6.32.16/include/linux/dst
44943 44988
44944 /* 44989 /*
44945 * How frequently and how many times transaction 44990 * How frequently and how many times transaction
44946diff -urNp linux-2.6.32.16/include/linux/elf.h linux-2.6.32.16/include/linux/elf.h 44991diff -urNp linux-2.6.32.18/include/linux/elf.h linux-2.6.32.18/include/linux/elf.h
44947--- linux-2.6.32.16/include/linux/elf.h 2010-07-05 14:14:00.000000000 -0400 44992--- linux-2.6.32.18/include/linux/elf.h 2010-08-10 13:45:57.000000000 -0400
44948+++ linux-2.6.32.16/include/linux/elf.h 2010-07-09 14:50:38.000000000 -0400 44993+++ linux-2.6.32.18/include/linux/elf.h 2010-08-11 18:57:32.000000000 -0400
44949@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; 44994@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
44950 #define PT_GNU_EH_FRAME 0x6474e550 44995 #define PT_GNU_EH_FRAME 0x6474e550
44951 44996
@@ -45018,9 +45063,9 @@ diff -urNp linux-2.6.32.16/include/linux/elf.h linux-2.6.32.16/include/linux/elf
45018 45063
45019 #endif 45064 #endif
45020 45065
45021diff -urNp linux-2.6.32.16/include/linux/fs.h linux-2.6.32.16/include/linux/fs.h 45066diff -urNp linux-2.6.32.18/include/linux/fs.h linux-2.6.32.18/include/linux/fs.h
45022--- linux-2.6.32.16/include/linux/fs.h 2010-07-05 14:14:00.000000000 -0400 45067--- linux-2.6.32.18/include/linux/fs.h 2010-08-10 13:45:57.000000000 -0400
45023+++ linux-2.6.32.16/include/linux/fs.h 2010-07-10 08:00:09.000000000 -0400 45068+++ linux-2.6.32.18/include/linux/fs.h 2010-08-11 18:57:32.000000000 -0400
45024@@ -90,6 +90,11 @@ struct inodes_stat_t { 45069@@ -90,6 +90,11 @@ struct inodes_stat_t {
45025 /* Expect random access pattern */ 45070 /* Expect random access pattern */
45026 #define FMODE_RANDOM ((__force fmode_t)4096) 45071 #define FMODE_RANDOM ((__force fmode_t)4096)
@@ -45182,9 +45227,9 @@ diff -urNp linux-2.6.32.16/include/linux/fs.h linux-2.6.32.16/include/linux/fs.h
45182 }; 45227 };
45183 45228
45184 /* 45229 /*
45185diff -urNp linux-2.6.32.16/include/linux/fs_struct.h linux-2.6.32.16/include/linux/fs_struct.h 45230diff -urNp linux-2.6.32.18/include/linux/fs_struct.h linux-2.6.32.18/include/linux/fs_struct.h
45186--- linux-2.6.32.16/include/linux/fs_struct.h 2010-07-05 14:14:00.000000000 -0400 45231--- linux-2.6.32.18/include/linux/fs_struct.h 2010-08-10 13:45:57.000000000 -0400
45187+++ linux-2.6.32.16/include/linux/fs_struct.h 2010-07-09 14:50:38.000000000 -0400 45232+++ linux-2.6.32.18/include/linux/fs_struct.h 2010-08-11 18:57:32.000000000 -0400
45188@@ -4,7 +4,7 @@ 45233@@ -4,7 +4,7 @@
45189 #include <linux/path.h> 45234 #include <linux/path.h>
45190 45235
@@ -45194,9 +45239,9 @@ diff -urNp linux-2.6.32.16/include/linux/fs_struct.h linux-2.6.32.16/include/lin
45194 rwlock_t lock; 45239 rwlock_t lock;
45195 int umask; 45240 int umask;
45196 int in_exec; 45241 int in_exec;
45197diff -urNp linux-2.6.32.16/include/linux/genhd.h linux-2.6.32.16/include/linux/genhd.h 45242diff -urNp linux-2.6.32.18/include/linux/genhd.h linux-2.6.32.18/include/linux/genhd.h
45198--- linux-2.6.32.16/include/linux/genhd.h 2010-07-05 14:14:00.000000000 -0400 45243--- linux-2.6.32.18/include/linux/genhd.h 2010-08-10 13:45:57.000000000 -0400
45199+++ linux-2.6.32.16/include/linux/genhd.h 2010-07-09 14:50:38.000000000 -0400 45244+++ linux-2.6.32.18/include/linux/genhd.h 2010-08-11 18:57:32.000000000 -0400
45200@@ -161,7 +161,7 @@ struct gendisk { 45245@@ -161,7 +161,7 @@ struct gendisk {
45201 45246
45202 struct timer_rand_state *random; 45247 struct timer_rand_state *random;
@@ -45206,9 +45251,9 @@ diff -urNp linux-2.6.32.16/include/linux/genhd.h linux-2.6.32.16/include/linux/g
45206 struct work_struct async_notify; 45251 struct work_struct async_notify;
45207 #ifdef CONFIG_BLK_DEV_INTEGRITY 45252 #ifdef CONFIG_BLK_DEV_INTEGRITY
45208 struct blk_integrity *integrity; 45253 struct blk_integrity *integrity;
45209diff -urNp linux-2.6.32.16/include/linux/gracl.h linux-2.6.32.16/include/linux/gracl.h 45254diff -urNp linux-2.6.32.18/include/linux/gracl.h linux-2.6.32.18/include/linux/gracl.h
45210--- linux-2.6.32.16/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 45255--- linux-2.6.32.18/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
45211+++ linux-2.6.32.16/include/linux/gracl.h 2010-07-09 14:50:38.000000000 -0400 45256+++ linux-2.6.32.18/include/linux/gracl.h 2010-08-11 18:57:32.000000000 -0400
45212@@ -0,0 +1,310 @@ 45257@@ -0,0 +1,310 @@
45213+#ifndef GR_ACL_H 45258+#ifndef GR_ACL_H
45214+#define GR_ACL_H 45259+#define GR_ACL_H
@@ -45520,9 +45565,9 @@ diff -urNp linux-2.6.32.16/include/linux/gracl.h linux-2.6.32.16/include/linux/g
45520+ 45565+
45521+#endif 45566+#endif
45522+ 45567+
45523diff -urNp linux-2.6.32.16/include/linux/gralloc.h linux-2.6.32.16/include/linux/gralloc.h 45568diff -urNp linux-2.6.32.18/include/linux/gralloc.h linux-2.6.32.18/include/linux/gralloc.h
45524--- linux-2.6.32.16/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 45569--- linux-2.6.32.18/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
45525+++ linux-2.6.32.16/include/linux/gralloc.h 2010-07-09 14:50:38.000000000 -0400 45570+++ linux-2.6.32.18/include/linux/gralloc.h 2010-08-11 18:57:32.000000000 -0400
45526@@ -0,0 +1,9 @@ 45571@@ -0,0 +1,9 @@
45527+#ifndef __GRALLOC_H 45572+#ifndef __GRALLOC_H
45528+#define __GRALLOC_H 45573+#define __GRALLOC_H
@@ -45533,9 +45578,9 @@ diff -urNp linux-2.6.32.16/include/linux/gralloc.h linux-2.6.32.16/include/linux
45533+void *acl_alloc_num(unsigned long num, unsigned long len); 45578+void *acl_alloc_num(unsigned long num, unsigned long len);
45534+ 45579+
45535+#endif 45580+#endif
45536diff -urNp linux-2.6.32.16/include/linux/grdefs.h linux-2.6.32.16/include/linux/grdefs.h 45581diff -urNp linux-2.6.32.18/include/linux/grdefs.h linux-2.6.32.18/include/linux/grdefs.h
45537--- linux-2.6.32.16/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 45582--- linux-2.6.32.18/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
45538+++ linux-2.6.32.16/include/linux/grdefs.h 2010-07-09 14:50:38.000000000 -0400 45583+++ linux-2.6.32.18/include/linux/grdefs.h 2010-08-11 18:57:32.000000000 -0400
45539@@ -0,0 +1,136 @@ 45584@@ -0,0 +1,136 @@
45540+#ifndef GRDEFS_H 45585+#ifndef GRDEFS_H
45541+#define GRDEFS_H 45586+#define GRDEFS_H
@@ -45673,9 +45718,9 @@ diff -urNp linux-2.6.32.16/include/linux/grdefs.h linux-2.6.32.16/include/linux/
45673+}; 45718+};
45674+ 45719+
45675+#endif 45720+#endif
45676diff -urNp linux-2.6.32.16/include/linux/grinternal.h linux-2.6.32.16/include/linux/grinternal.h 45721diff -urNp linux-2.6.32.18/include/linux/grinternal.h linux-2.6.32.18/include/linux/grinternal.h
45677--- linux-2.6.32.16/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 45722--- linux-2.6.32.18/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
45678+++ linux-2.6.32.16/include/linux/grinternal.h 2010-07-09 14:50:38.000000000 -0400 45723+++ linux-2.6.32.18/include/linux/grinternal.h 2010-08-11 18:57:32.000000000 -0400
45679@@ -0,0 +1,211 @@ 45724@@ -0,0 +1,211 @@
45680+#ifndef __GRINTERNAL_H 45725+#ifndef __GRINTERNAL_H
45681+#define __GRINTERNAL_H 45726+#define __GRINTERNAL_H
@@ -45888,9 +45933,9 @@ diff -urNp linux-2.6.32.16/include/linux/grinternal.h linux-2.6.32.16/include/li
45888+#endif 45933+#endif
45889+ 45934+
45890+#endif 45935+#endif
45891diff -urNp linux-2.6.32.16/include/linux/grmsg.h linux-2.6.32.16/include/linux/grmsg.h 45936diff -urNp linux-2.6.32.18/include/linux/grmsg.h linux-2.6.32.18/include/linux/grmsg.h
45892--- linux-2.6.32.16/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 45937--- linux-2.6.32.18/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
45893+++ linux-2.6.32.16/include/linux/grmsg.h 2010-07-09 14:50:38.000000000 -0400 45938+++ linux-2.6.32.18/include/linux/grmsg.h 2010-08-11 18:57:32.000000000 -0400
45894@@ -0,0 +1,108 @@ 45939@@ -0,0 +1,108 @@
45895+#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" 45940+#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"
45896+#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" 45941+#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"
@@ -46000,9 +46045,9 @@ diff -urNp linux-2.6.32.16/include/linux/grmsg.h linux-2.6.32.16/include/linux/g
46000+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " 46045+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
46001+#define GR_VM86_MSG "denied use of vm86 by " 46046+#define GR_VM86_MSG "denied use of vm86 by "
46002+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " 46047+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
46003diff -urNp linux-2.6.32.16/include/linux/grsecurity.h linux-2.6.32.16/include/linux/grsecurity.h 46048diff -urNp linux-2.6.32.18/include/linux/grsecurity.h linux-2.6.32.18/include/linux/grsecurity.h
46004--- linux-2.6.32.16/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 46049--- linux-2.6.32.18/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
46005+++ linux-2.6.32.16/include/linux/grsecurity.h 2010-07-10 07:56:56.000000000 -0400 46050+++ linux-2.6.32.18/include/linux/grsecurity.h 2010-08-11 18:57:32.000000000 -0400
46006@@ -0,0 +1,203 @@ 46051@@ -0,0 +1,203 @@
46007+#ifndef GR_SECURITY_H 46052+#ifndef GR_SECURITY_H
46008+#define GR_SECURITY_H 46053+#define GR_SECURITY_H
@@ -46207,9 +46252,9 @@ diff -urNp linux-2.6.32.16/include/linux/grsecurity.h linux-2.6.32.16/include/li
46207+#endif 46252+#endif
46208+ 46253+
46209+#endif 46254+#endif
46210diff -urNp linux-2.6.32.16/include/linux/hdpu_features.h linux-2.6.32.16/include/linux/hdpu_features.h 46255diff -urNp linux-2.6.32.18/include/linux/hdpu_features.h linux-2.6.32.18/include/linux/hdpu_features.h
46211--- linux-2.6.32.16/include/linux/hdpu_features.h 2010-07-05 14:14:00.000000000 -0400 46256--- linux-2.6.32.18/include/linux/hdpu_features.h 2010-08-10 13:45:57.000000000 -0400
46212+++ linux-2.6.32.16/include/linux/hdpu_features.h 2010-07-09 14:50:38.000000000 -0400 46257+++ linux-2.6.32.18/include/linux/hdpu_features.h 2010-08-11 18:57:32.000000000 -0400
46213@@ -3,7 +3,7 @@ 46258@@ -3,7 +3,7 @@
46214 struct cpustate_t { 46259 struct cpustate_t {
46215 spinlock_t lock; 46260 spinlock_t lock;
@@ -46219,9 +46264,9 @@ diff -urNp linux-2.6.32.16/include/linux/hdpu_features.h linux-2.6.32.16/include
46219 unsigned char cached_val; 46264 unsigned char cached_val;
46220 int inited; 46265 int inited;
46221 unsigned long *set_addr; 46266 unsigned long *set_addr;
46222diff -urNp linux-2.6.32.16/include/linux/highmem.h linux-2.6.32.16/include/linux/highmem.h 46267diff -urNp linux-2.6.32.18/include/linux/highmem.h linux-2.6.32.18/include/linux/highmem.h
46223--- linux-2.6.32.16/include/linux/highmem.h 2010-07-05 14:14:00.000000000 -0400 46268--- linux-2.6.32.18/include/linux/highmem.h 2010-08-10 13:45:57.000000000 -0400
46224+++ linux-2.6.32.16/include/linux/highmem.h 2010-07-09 14:50:38.000000000 -0400 46269+++ linux-2.6.32.18/include/linux/highmem.h 2010-08-11 18:57:32.000000000 -0400
46225@@ -137,6 +137,18 @@ static inline void clear_highpage(struct 46270@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
46226 kunmap_atomic(kaddr, KM_USER0); 46271 kunmap_atomic(kaddr, KM_USER0);
46227 } 46272 }
@@ -46241,9 +46286,9 @@ diff -urNp linux-2.6.32.16/include/linux/highmem.h linux-2.6.32.16/include/linux
46241 static inline void zero_user_segments(struct page *page, 46286 static inline void zero_user_segments(struct page *page,
46242 unsigned start1, unsigned end1, 46287 unsigned start1, unsigned end1,
46243 unsigned start2, unsigned end2) 46288 unsigned start2, unsigned end2)
46244diff -urNp linux-2.6.32.16/include/linux/interrupt.h linux-2.6.32.16/include/linux/interrupt.h 46289diff -urNp linux-2.6.32.18/include/linux/interrupt.h linux-2.6.32.18/include/linux/interrupt.h
46245--- linux-2.6.32.16/include/linux/interrupt.h 2010-07-05 14:14:00.000000000 -0400 46290--- linux-2.6.32.18/include/linux/interrupt.h 2010-08-10 13:45:57.000000000 -0400
46246+++ linux-2.6.32.16/include/linux/interrupt.h 2010-07-09 14:50:38.000000000 -0400 46291+++ linux-2.6.32.18/include/linux/interrupt.h 2010-08-11 18:57:32.000000000 -0400
46247@@ -357,7 +357,7 @@ enum 46292@@ -357,7 +357,7 @@ enum
46248 /* map softirq index to softirq name. update 'softirq_to_name' in 46293 /* map softirq index to softirq name. update 'softirq_to_name' in
46249 * kernel/softirq.c when adding a new softirq. 46294 * kernel/softirq.c when adding a new softirq.
@@ -46268,9 +46313,9 @@ diff -urNp linux-2.6.32.16/include/linux/interrupt.h linux-2.6.32.16/include/lin
46268 extern void softirq_init(void); 46313 extern void softirq_init(void);
46269 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) 46314 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
46270 extern void raise_softirq_irqoff(unsigned int nr); 46315 extern void raise_softirq_irqoff(unsigned int nr);
46271diff -urNp linux-2.6.32.16/include/linux/jbd2.h linux-2.6.32.16/include/linux/jbd2.h 46316diff -urNp linux-2.6.32.18/include/linux/jbd2.h linux-2.6.32.18/include/linux/jbd2.h
46272--- linux-2.6.32.16/include/linux/jbd2.h 2010-07-05 14:14:00.000000000 -0400 46317--- linux-2.6.32.18/include/linux/jbd2.h 2010-08-10 13:45:57.000000000 -0400
46273+++ linux-2.6.32.16/include/linux/jbd2.h 2010-07-09 14:50:38.000000000 -0400 46318+++ linux-2.6.32.18/include/linux/jbd2.h 2010-08-11 18:57:32.000000000 -0400
46274@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; 46319@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
46275 } \ 46320 } \
46276 } while (0) 46321 } while (0)
@@ -46280,9 +46325,9 @@ diff -urNp linux-2.6.32.16/include/linux/jbd2.h linux-2.6.32.16/include/linux/jb
46280 #endif 46325 #endif
46281 46326
46282 static inline void *jbd2_alloc(size_t size, gfp_t flags) 46327 static inline void *jbd2_alloc(size_t size, gfp_t flags)
46283diff -urNp linux-2.6.32.16/include/linux/jbd.h linux-2.6.32.16/include/linux/jbd.h 46328diff -urNp linux-2.6.32.18/include/linux/jbd.h linux-2.6.32.18/include/linux/jbd.h
46284--- linux-2.6.32.16/include/linux/jbd.h 2010-07-05 14:14:00.000000000 -0400 46329--- linux-2.6.32.18/include/linux/jbd.h 2010-08-10 13:45:57.000000000 -0400
46285+++ linux-2.6.32.16/include/linux/jbd.h 2010-07-09 14:50:38.000000000 -0400 46330+++ linux-2.6.32.18/include/linux/jbd.h 2010-08-11 18:57:32.000000000 -0400
46286@@ -66,7 +66,7 @@ extern u8 journal_enable_debug; 46331@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
46287 } \ 46332 } \
46288 } while (0) 46333 } while (0)
@@ -46292,9 +46337,9 @@ diff -urNp linux-2.6.32.16/include/linux/jbd.h linux-2.6.32.16/include/linux/jbd
46292 #endif 46337 #endif
46293 46338
46294 static inline void *jbd_alloc(size_t size, gfp_t flags) 46339 static inline void *jbd_alloc(size_t size, gfp_t flags)
46295diff -urNp linux-2.6.32.16/include/linux/kallsyms.h linux-2.6.32.16/include/linux/kallsyms.h 46340diff -urNp linux-2.6.32.18/include/linux/kallsyms.h linux-2.6.32.18/include/linux/kallsyms.h
46296--- linux-2.6.32.16/include/linux/kallsyms.h 2010-07-05 14:14:00.000000000 -0400 46341--- linux-2.6.32.18/include/linux/kallsyms.h 2010-08-10 13:45:57.000000000 -0400
46297+++ linux-2.6.32.16/include/linux/kallsyms.h 2010-07-09 14:50:38.000000000 -0400 46342+++ linux-2.6.32.18/include/linux/kallsyms.h 2010-08-11 18:57:32.000000000 -0400
46298@@ -15,7 +15,8 @@ 46343@@ -15,7 +15,8 @@
46299 46344
46300 struct module; 46345 struct module;
@@ -46315,9 +46360,9 @@ diff -urNp linux-2.6.32.16/include/linux/kallsyms.h linux-2.6.32.16/include/linu
46315 46360
46316 /* This macro allows us to keep printk typechecking */ 46361 /* This macro allows us to keep printk typechecking */
46317 static void __check_printsym_format(const char *fmt, ...) 46362 static void __check_printsym_format(const char *fmt, ...)
46318diff -urNp linux-2.6.32.16/include/linux/kgdb.h linux-2.6.32.16/include/linux/kgdb.h 46363diff -urNp linux-2.6.32.18/include/linux/kgdb.h linux-2.6.32.18/include/linux/kgdb.h
46319--- linux-2.6.32.16/include/linux/kgdb.h 2010-07-05 14:14:00.000000000 -0400 46364--- linux-2.6.32.18/include/linux/kgdb.h 2010-08-10 13:45:57.000000000 -0400
46320+++ linux-2.6.32.16/include/linux/kgdb.h 2010-07-09 14:50:38.000000000 -0400 46365+++ linux-2.6.32.18/include/linux/kgdb.h 2010-08-11 18:57:32.000000000 -0400
46321@@ -251,20 +251,20 @@ struct kgdb_arch { 46366@@ -251,20 +251,20 @@ struct kgdb_arch {
46322 */ 46367 */
46323 struct kgdb_io { 46368 struct kgdb_io {
@@ -46348,9 +46393,9 @@ diff -urNp linux-2.6.32.16/include/linux/kgdb.h linux-2.6.32.16/include/linux/kg
46348 46393
46349 extern int kgdb_hex2long(char **ptr, unsigned long *long_val); 46394 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
46350 extern int kgdb_mem2hex(char *mem, char *buf, int count); 46395 extern int kgdb_mem2hex(char *mem, char *buf, int count);
46351diff -urNp linux-2.6.32.16/include/linux/kobject.h linux-2.6.32.16/include/linux/kobject.h 46396diff -urNp linux-2.6.32.18/include/linux/kobject.h linux-2.6.32.18/include/linux/kobject.h
46352--- linux-2.6.32.16/include/linux/kobject.h 2010-07-05 14:14:00.000000000 -0400 46397--- linux-2.6.32.18/include/linux/kobject.h 2010-08-10 13:45:57.000000000 -0400
46353+++ linux-2.6.32.16/include/linux/kobject.h 2010-07-09 14:50:38.000000000 -0400 46398+++ linux-2.6.32.18/include/linux/kobject.h 2010-08-11 18:57:32.000000000 -0400
46354@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob 46399@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
46355 46400
46356 struct kobj_type { 46401 struct kobj_type {
@@ -46399,9 +46444,9 @@ diff -urNp linux-2.6.32.16/include/linux/kobject.h linux-2.6.32.16/include/linux
46399 struct kobject *parent_kobj); 46444 struct kobject *parent_kobj);
46400 46445
46401 static inline struct kset *to_kset(struct kobject *kobj) 46446 static inline struct kset *to_kset(struct kobject *kobj)
46402diff -urNp linux-2.6.32.16/include/linux/kvm_host.h linux-2.6.32.16/include/linux/kvm_host.h 46447diff -urNp linux-2.6.32.18/include/linux/kvm_host.h linux-2.6.32.18/include/linux/kvm_host.h
46403--- linux-2.6.32.16/include/linux/kvm_host.h 2010-07-05 14:14:00.000000000 -0400 46448--- linux-2.6.32.18/include/linux/kvm_host.h 2010-08-10 13:45:57.000000000 -0400
46404+++ linux-2.6.32.16/include/linux/kvm_host.h 2010-07-09 14:50:38.000000000 -0400 46449+++ linux-2.6.32.18/include/linux/kvm_host.h 2010-08-11 18:57:32.000000000 -0400
46405@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc 46450@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
46406 void vcpu_load(struct kvm_vcpu *vcpu); 46451 void vcpu_load(struct kvm_vcpu *vcpu);
46407 void vcpu_put(struct kvm_vcpu *vcpu); 46452 void vcpu_put(struct kvm_vcpu *vcpu);
@@ -46420,9 +46465,9 @@ diff -urNp linux-2.6.32.16/include/linux/kvm_host.h linux-2.6.32.16/include/linu
46420 void kvm_arch_exit(void); 46465 void kvm_arch_exit(void);
46421 46466
46422 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); 46467 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
46423diff -urNp linux-2.6.32.16/include/linux/libata.h linux-2.6.32.16/include/linux/libata.h 46468diff -urNp linux-2.6.32.18/include/linux/libata.h linux-2.6.32.18/include/linux/libata.h
46424--- linux-2.6.32.16/include/linux/libata.h 2010-07-05 14:14:00.000000000 -0400 46469--- linux-2.6.32.18/include/linux/libata.h 2010-08-10 13:45:57.000000000 -0400
46425+++ linux-2.6.32.16/include/linux/libata.h 2010-07-09 14:50:38.000000000 -0400 46470+++ linux-2.6.32.18/include/linux/libata.h 2010-08-11 18:57:32.000000000 -0400
46426@@ -64,11 +64,11 @@ 46471@@ -64,11 +64,11 @@
46427 #ifdef ATA_VERBOSE_DEBUG 46472 #ifdef ATA_VERBOSE_DEBUG
46428 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) 46473 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -46488,9 +46533,9 @@ diff -urNp linux-2.6.32.16/include/linux/libata.h linux-2.6.32.16/include/linux/
46488 extern int ata_scsi_detect(struct scsi_host_template *sht); 46533 extern int ata_scsi_detect(struct scsi_host_template *sht);
46489 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); 46534 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
46490 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); 46535 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
46491diff -urNp linux-2.6.32.16/include/linux/lockd/bind.h linux-2.6.32.16/include/linux/lockd/bind.h 46536diff -urNp linux-2.6.32.18/include/linux/lockd/bind.h linux-2.6.32.18/include/linux/lockd/bind.h
46492--- linux-2.6.32.16/include/linux/lockd/bind.h 2010-07-05 14:14:00.000000000 -0400 46537--- linux-2.6.32.18/include/linux/lockd/bind.h 2010-08-10 13:45:57.000000000 -0400
46493+++ linux-2.6.32.16/include/linux/lockd/bind.h 2010-07-09 14:50:38.000000000 -0400 46538+++ linux-2.6.32.18/include/linux/lockd/bind.h 2010-08-11 18:57:32.000000000 -0400
46494@@ -23,13 +23,13 @@ struct svc_rqst; 46539@@ -23,13 +23,13 @@ struct svc_rqst;
46495 * This is the set of functions for lockd->nfsd communication 46540 * This is the set of functions for lockd->nfsd communication
46496 */ 46541 */
@@ -46508,9 +46553,9 @@ diff -urNp linux-2.6.32.16/include/linux/lockd/bind.h linux-2.6.32.16/include/li
46508 46553
46509 /* 46554 /*
46510 * Similar to nfs_client_initdata, but without the NFS-specific 46555 * Similar to nfs_client_initdata, but without the NFS-specific
46511diff -urNp linux-2.6.32.16/include/linux/mm.h linux-2.6.32.16/include/linux/mm.h 46556diff -urNp linux-2.6.32.18/include/linux/mm.h linux-2.6.32.18/include/linux/mm.h
46512--- linux-2.6.32.16/include/linux/mm.h 2010-07-05 14:14:00.000000000 -0400 46557--- linux-2.6.32.18/include/linux/mm.h 2010-08-10 13:45:57.000000000 -0400
46513+++ linux-2.6.32.16/include/linux/mm.h 2010-07-09 14:50:38.000000000 -0400 46558+++ linux-2.6.32.18/include/linux/mm.h 2010-08-11 18:57:32.000000000 -0400
46514@@ -102,7 +102,14 @@ extern unsigned int kobjsize(const void 46559@@ -102,7 +102,14 @@ extern unsigned int kobjsize(const void
46515 46560
46516 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */ 46561 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
@@ -46577,9 +46622,9 @@ diff -urNp linux-2.6.32.16/include/linux/mm.h linux-2.6.32.16/include/linux/mm.h
46577 46622
46578 #endif /* __KERNEL__ */ 46623 #endif /* __KERNEL__ */
46579 #endif /* _LINUX_MM_H */ 46624 #endif /* _LINUX_MM_H */
46580diff -urNp linux-2.6.32.16/include/linux/mm_types.h linux-2.6.32.16/include/linux/mm_types.h 46625diff -urNp linux-2.6.32.18/include/linux/mm_types.h linux-2.6.32.18/include/linux/mm_types.h
46581--- linux-2.6.32.16/include/linux/mm_types.h 2010-07-05 14:14:00.000000000 -0400 46626--- linux-2.6.32.18/include/linux/mm_types.h 2010-08-10 13:45:57.000000000 -0400
46582+++ linux-2.6.32.16/include/linux/mm_types.h 2010-07-09 14:50:38.000000000 -0400 46627+++ linux-2.6.32.18/include/linux/mm_types.h 2010-08-11 18:57:32.000000000 -0400
46583@@ -186,6 +186,8 @@ struct vm_area_struct { 46628@@ -186,6 +186,8 @@ struct vm_area_struct {
46584 #ifdef CONFIG_NUMA 46629 #ifdef CONFIG_NUMA
46585 struct mempolicy *vm_policy; /* NUMA policy for the VMA */ 46630 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -46614,9 +46659,9 @@ diff -urNp linux-2.6.32.16/include/linux/mm_types.h linux-2.6.32.16/include/linu
46614 }; 46659 };
46615 46660
46616 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ 46661 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
46617diff -urNp linux-2.6.32.16/include/linux/mmu_notifier.h linux-2.6.32.16/include/linux/mmu_notifier.h 46662diff -urNp linux-2.6.32.18/include/linux/mmu_notifier.h linux-2.6.32.18/include/linux/mmu_notifier.h
46618--- linux-2.6.32.16/include/linux/mmu_notifier.h 2010-07-05 14:14:00.000000000 -0400 46663--- linux-2.6.32.18/include/linux/mmu_notifier.h 2010-08-10 13:45:57.000000000 -0400
46619+++ linux-2.6.32.16/include/linux/mmu_notifier.h 2010-07-09 14:50:38.000000000 -0400 46664+++ linux-2.6.32.18/include/linux/mmu_notifier.h 2010-08-11 18:57:32.000000000 -0400
46620@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr 46665@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
46621 */ 46666 */
46622 #define ptep_clear_flush_notify(__vma, __address, __ptep) \ 46667 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -46633,9 +46678,9 @@ diff -urNp linux-2.6.32.16/include/linux/mmu_notifier.h linux-2.6.32.16/include/
46633 }) 46678 })
46634 46679
46635 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ 46680 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
46636diff -urNp linux-2.6.32.16/include/linux/mmzone.h linux-2.6.32.16/include/linux/mmzone.h 46681diff -urNp linux-2.6.32.18/include/linux/mmzone.h linux-2.6.32.18/include/linux/mmzone.h
46637--- linux-2.6.32.16/include/linux/mmzone.h 2010-07-05 14:14:00.000000000 -0400 46682--- linux-2.6.32.18/include/linux/mmzone.h 2010-08-10 13:45:57.000000000 -0400
46638+++ linux-2.6.32.16/include/linux/mmzone.h 2010-07-16 21:06:43.000000000 -0400 46683+++ linux-2.6.32.18/include/linux/mmzone.h 2010-08-11 18:57:32.000000000 -0400
46639@@ -343,7 +343,7 @@ struct zone { 46684@@ -343,7 +343,7 @@ struct zone {
46640 unsigned long flags; /* zone flags, see below */ 46685 unsigned long flags; /* zone flags, see below */
46641 46686
@@ -46645,9 +46690,9 @@ diff -urNp linux-2.6.32.16/include/linux/mmzone.h linux-2.6.32.16/include/linux/
46645 46690
46646 /* 46691 /*
46647 * prev_priority holds the scanning priority for this zone. It is 46692 * prev_priority holds the scanning priority for this zone. It is
46648diff -urNp linux-2.6.32.16/include/linux/mod_devicetable.h linux-2.6.32.16/include/linux/mod_devicetable.h 46693diff -urNp linux-2.6.32.18/include/linux/mod_devicetable.h linux-2.6.32.18/include/linux/mod_devicetable.h
46649--- linux-2.6.32.16/include/linux/mod_devicetable.h 2010-07-05 14:14:00.000000000 -0400 46694--- linux-2.6.32.18/include/linux/mod_devicetable.h 2010-08-10 13:45:57.000000000 -0400
46650+++ linux-2.6.32.16/include/linux/mod_devicetable.h 2010-07-09 14:50:38.000000000 -0400 46695+++ linux-2.6.32.18/include/linux/mod_devicetable.h 2010-08-11 18:57:32.000000000 -0400
46651@@ -12,7 +12,7 @@ 46696@@ -12,7 +12,7 @@
46652 typedef unsigned long kernel_ulong_t; 46697 typedef unsigned long kernel_ulong_t;
46653 #endif 46698 #endif
@@ -46666,9 +46711,9 @@ diff -urNp linux-2.6.32.16/include/linux/mod_devicetable.h linux-2.6.32.16/inclu
46666 46711
46667 struct hid_device_id { 46712 struct hid_device_id {
46668 __u16 bus; 46713 __u16 bus;
46669diff -urNp linux-2.6.32.16/include/linux/module.h linux-2.6.32.16/include/linux/module.h 46714diff -urNp linux-2.6.32.18/include/linux/module.h linux-2.6.32.18/include/linux/module.h
46670--- linux-2.6.32.16/include/linux/module.h 2010-07-05 14:14:00.000000000 -0400 46715--- linux-2.6.32.18/include/linux/module.h 2010-08-10 13:45:57.000000000 -0400
46671+++ linux-2.6.32.16/include/linux/module.h 2010-07-09 14:50:38.000000000 -0400 46716+++ linux-2.6.32.18/include/linux/module.h 2010-08-11 18:57:32.000000000 -0400
46672@@ -287,16 +287,16 @@ struct module 46717@@ -287,16 +287,16 @@ struct module
46673 int (*init)(void); 46718 int (*init)(void);
46674 46719
@@ -46741,9 +46786,9 @@ diff -urNp linux-2.6.32.16/include/linux/module.h linux-2.6.32.16/include/linux/
46741 } 46786 }
46742 46787
46743 /* Search for module by name: must hold module_mutex. */ 46788 /* Search for module by name: must hold module_mutex. */
46744diff -urNp linux-2.6.32.16/include/linux/moduleloader.h linux-2.6.32.16/include/linux/moduleloader.h 46789diff -urNp linux-2.6.32.18/include/linux/moduleloader.h linux-2.6.32.18/include/linux/moduleloader.h
46745--- linux-2.6.32.16/include/linux/moduleloader.h 2010-07-05 14:14:00.000000000 -0400 46790--- linux-2.6.32.18/include/linux/moduleloader.h 2010-08-10 13:45:57.000000000 -0400
46746+++ linux-2.6.32.16/include/linux/moduleloader.h 2010-07-09 14:50:38.000000000 -0400 46791+++ linux-2.6.32.18/include/linux/moduleloader.h 2010-08-11 18:57:32.000000000 -0400
46747@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st 46792@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
46748 sections. Returns NULL on failure. */ 46793 sections. Returns NULL on failure. */
46749 void *module_alloc(unsigned long size); 46794 void *module_alloc(unsigned long size);
@@ -46766,9 +46811,9 @@ diff -urNp linux-2.6.32.16/include/linux/moduleloader.h linux-2.6.32.16/include/
46766 /* Apply the given relocation to the (simplified) ELF. Return -error 46811 /* Apply the given relocation to the (simplified) ELF. Return -error
46767 or 0. */ 46812 or 0. */
46768 int apply_relocate(Elf_Shdr *sechdrs, 46813 int apply_relocate(Elf_Shdr *sechdrs,
46769diff -urNp linux-2.6.32.16/include/linux/namei.h linux-2.6.32.16/include/linux/namei.h 46814diff -urNp linux-2.6.32.18/include/linux/namei.h linux-2.6.32.18/include/linux/namei.h
46770--- linux-2.6.32.16/include/linux/namei.h 2010-07-05 14:14:00.000000000 -0400 46815--- linux-2.6.32.18/include/linux/namei.h 2010-08-10 13:45:57.000000000 -0400
46771+++ linux-2.6.32.16/include/linux/namei.h 2010-07-09 14:50:38.000000000 -0400 46816+++ linux-2.6.32.18/include/linux/namei.h 2010-08-11 18:57:32.000000000 -0400
46772@@ -22,7 +22,7 @@ struct nameidata { 46817@@ -22,7 +22,7 @@ struct nameidata {
46773 unsigned int flags; 46818 unsigned int flags;
46774 int last_type; 46819 int last_type;
@@ -46793,9 +46838,9 @@ diff -urNp linux-2.6.32.16/include/linux/namei.h linux-2.6.32.16/include/linux/n
46793 { 46838 {
46794 return nd->saved_names[nd->depth]; 46839 return nd->saved_names[nd->depth];
46795 } 46840 }
46796diff -urNp linux-2.6.32.16/include/linux/nodemask.h linux-2.6.32.16/include/linux/nodemask.h 46841diff -urNp linux-2.6.32.18/include/linux/nodemask.h linux-2.6.32.18/include/linux/nodemask.h
46797--- linux-2.6.32.16/include/linux/nodemask.h 2010-07-05 14:14:00.000000000 -0400 46842--- linux-2.6.32.18/include/linux/nodemask.h 2010-08-10 13:45:57.000000000 -0400
46798+++ linux-2.6.32.16/include/linux/nodemask.h 2010-07-09 14:50:38.000000000 -0400 46843+++ linux-2.6.32.18/include/linux/nodemask.h 2010-08-11 18:57:32.000000000 -0400
46799@@ -464,11 +464,11 @@ static inline int num_node_state(enum no 46844@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
46800 46845
46801 #define any_online_node(mask) \ 46846 #define any_online_node(mask) \
@@ -46812,9 +46857,9 @@ diff -urNp linux-2.6.32.16/include/linux/nodemask.h linux-2.6.32.16/include/linu
46812 }) 46857 })
46813 46858
46814 #define num_online_nodes() num_node_state(N_ONLINE) 46859 #define num_online_nodes() num_node_state(N_ONLINE)
46815diff -urNp linux-2.6.32.16/include/linux/oprofile.h linux-2.6.32.16/include/linux/oprofile.h 46860diff -urNp linux-2.6.32.18/include/linux/oprofile.h linux-2.6.32.18/include/linux/oprofile.h
46816--- linux-2.6.32.16/include/linux/oprofile.h 2010-07-05 14:14:00.000000000 -0400 46861--- linux-2.6.32.18/include/linux/oprofile.h 2010-08-10 13:45:57.000000000 -0400
46817+++ linux-2.6.32.16/include/linux/oprofile.h 2010-07-09 14:50:38.000000000 -0400 46862+++ linux-2.6.32.18/include/linux/oprofile.h 2010-08-11 18:57:32.000000000 -0400
46818@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super 46863@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
46819 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, 46864 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
46820 char const * name, ulong * val); 46865 char const * name, ulong * val);
@@ -46827,9 +46872,9 @@ diff -urNp linux-2.6.32.16/include/linux/oprofile.h linux-2.6.32.16/include/linu
46827 46872
46828 /** create a directory */ 46873 /** create a directory */
46829 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, 46874 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
46830diff -urNp linux-2.6.32.16/include/linux/pipe_fs_i.h linux-2.6.32.16/include/linux/pipe_fs_i.h 46875diff -urNp linux-2.6.32.18/include/linux/pipe_fs_i.h linux-2.6.32.18/include/linux/pipe_fs_i.h
46831--- linux-2.6.32.16/include/linux/pipe_fs_i.h 2010-07-05 14:14:00.000000000 -0400 46876--- linux-2.6.32.18/include/linux/pipe_fs_i.h 2010-08-10 13:45:57.000000000 -0400
46832+++ linux-2.6.32.16/include/linux/pipe_fs_i.h 2010-07-09 14:50:38.000000000 -0400 46877+++ linux-2.6.32.18/include/linux/pipe_fs_i.h 2010-08-11 18:57:32.000000000 -0400
46833@@ -46,9 +46,9 @@ struct pipe_inode_info { 46878@@ -46,9 +46,9 @@ struct pipe_inode_info {
46834 wait_queue_head_t wait; 46879 wait_queue_head_t wait;
46835 unsigned int nrbufs, curbuf; 46880 unsigned int nrbufs, curbuf;
@@ -46843,9 +46888,9 @@ diff -urNp linux-2.6.32.16/include/linux/pipe_fs_i.h linux-2.6.32.16/include/lin
46843 unsigned int r_counter; 46888 unsigned int r_counter;
46844 unsigned int w_counter; 46889 unsigned int w_counter;
46845 struct fasync_struct *fasync_readers; 46890 struct fasync_struct *fasync_readers;
46846diff -urNp linux-2.6.32.16/include/linux/poison.h linux-2.6.32.16/include/linux/poison.h 46891diff -urNp linux-2.6.32.18/include/linux/poison.h linux-2.6.32.18/include/linux/poison.h
46847--- linux-2.6.32.16/include/linux/poison.h 2010-07-05 14:14:00.000000000 -0400 46892--- linux-2.6.32.18/include/linux/poison.h 2010-08-10 13:45:57.000000000 -0400
46848+++ linux-2.6.32.16/include/linux/poison.h 2010-07-09 14:50:38.000000000 -0400 46893+++ linux-2.6.32.18/include/linux/poison.h 2010-08-11 18:57:32.000000000 -0400
46849@@ -19,8 +19,8 @@ 46894@@ -19,8 +19,8 @@
46850 * under normal circumstances, used to verify that nobody uses 46895 * under normal circumstances, used to verify that nobody uses
46851 * non-initialized list entries. 46896 * non-initialized list entries.
@@ -46857,9 +46902,9 @@ diff -urNp linux-2.6.32.16/include/linux/poison.h linux-2.6.32.16/include/linux/
46857 46902
46858 /********** include/linux/timer.h **********/ 46903 /********** include/linux/timer.h **********/
46859 /* 46904 /*
46860diff -urNp linux-2.6.32.16/include/linux/proc_fs.h linux-2.6.32.16/include/linux/proc_fs.h 46905diff -urNp linux-2.6.32.18/include/linux/proc_fs.h linux-2.6.32.18/include/linux/proc_fs.h
46861--- linux-2.6.32.16/include/linux/proc_fs.h 2010-07-05 14:14:00.000000000 -0400 46906--- linux-2.6.32.18/include/linux/proc_fs.h 2010-08-10 13:45:57.000000000 -0400
46862+++ linux-2.6.32.16/include/linux/proc_fs.h 2010-07-09 14:50:38.000000000 -0400 46907+++ linux-2.6.32.18/include/linux/proc_fs.h 2010-08-11 18:57:32.000000000 -0400
46863@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro 46908@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
46864 return proc_create_data(name, mode, parent, proc_fops, NULL); 46909 return proc_create_data(name, mode, parent, proc_fops, NULL);
46865 } 46910 }
@@ -46880,9 +46925,9 @@ diff -urNp linux-2.6.32.16/include/linux/proc_fs.h linux-2.6.32.16/include/linux
46880 static inline struct proc_dir_entry *create_proc_read_entry(const char *name, 46925 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
46881 mode_t mode, struct proc_dir_entry *base, 46926 mode_t mode, struct proc_dir_entry *base,
46882 read_proc_t *read_proc, void * data) 46927 read_proc_t *read_proc, void * data)
46883diff -urNp linux-2.6.32.16/include/linux/random.h linux-2.6.32.16/include/linux/random.h 46928diff -urNp linux-2.6.32.18/include/linux/random.h linux-2.6.32.18/include/linux/random.h
46884--- linux-2.6.32.16/include/linux/random.h 2010-07-05 14:14:00.000000000 -0400 46929--- linux-2.6.32.18/include/linux/random.h 2010-08-10 13:45:57.000000000 -0400
46885+++ linux-2.6.32.16/include/linux/random.h 2010-07-09 14:50:38.000000000 -0400 46930+++ linux-2.6.32.18/include/linux/random.h 2010-08-11 18:57:32.000000000 -0400
46886@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l 46931@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
46887 u32 random32(void); 46932 u32 random32(void);
46888 void srandom32(u32 seed); 46933 void srandom32(u32 seed);
@@ -46895,9 +46940,9 @@ diff -urNp linux-2.6.32.16/include/linux/random.h linux-2.6.32.16/include/linux/
46895 #endif /* __KERNEL___ */ 46940 #endif /* __KERNEL___ */
46896 46941
46897 #endif /* _LINUX_RANDOM_H */ 46942 #endif /* _LINUX_RANDOM_H */
46898diff -urNp linux-2.6.32.16/include/linux/reiserfs_fs.h linux-2.6.32.16/include/linux/reiserfs_fs.h 46943diff -urNp linux-2.6.32.18/include/linux/reiserfs_fs.h linux-2.6.32.18/include/linux/reiserfs_fs.h
46899--- linux-2.6.32.16/include/linux/reiserfs_fs.h 2010-07-05 14:14:00.000000000 -0400 46944--- linux-2.6.32.18/include/linux/reiserfs_fs.h 2010-08-10 13:45:57.000000000 -0400
46900+++ linux-2.6.32.16/include/linux/reiserfs_fs.h 2010-07-09 14:50:38.000000000 -0400 46945+++ linux-2.6.32.18/include/linux/reiserfs_fs.h 2010-08-11 18:57:32.000000000 -0400
46901@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset 46946@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
46902 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ 46947 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
46903 46948
@@ -46944,9 +46989,9 @@ diff -urNp linux-2.6.32.16/include/linux/reiserfs_fs.h linux-2.6.32.16/include/l
46944 46989
46945 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) 46990 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
46946 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) 46991 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
46947diff -urNp linux-2.6.32.16/include/linux/reiserfs_fs_sb.h linux-2.6.32.16/include/linux/reiserfs_fs_sb.h 46992diff -urNp linux-2.6.32.18/include/linux/reiserfs_fs_sb.h linux-2.6.32.18/include/linux/reiserfs_fs_sb.h
46948--- linux-2.6.32.16/include/linux/reiserfs_fs_sb.h 2010-07-05 14:14:00.000000000 -0400 46993--- linux-2.6.32.18/include/linux/reiserfs_fs_sb.h 2010-08-10 13:45:57.000000000 -0400
46949+++ linux-2.6.32.16/include/linux/reiserfs_fs_sb.h 2010-07-09 14:50:38.000000000 -0400 46994+++ linux-2.6.32.18/include/linux/reiserfs_fs_sb.h 2010-08-11 18:57:32.000000000 -0400
46950@@ -377,7 +377,7 @@ struct reiserfs_sb_info { 46995@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
46951 /* Comment? -Hans */ 46996 /* Comment? -Hans */
46952 wait_queue_head_t s_wait; 46997 wait_queue_head_t s_wait;
@@ -46956,9 +47001,9 @@ diff -urNp linux-2.6.32.16/include/linux/reiserfs_fs_sb.h linux-2.6.32.16/includ
46956 // tree gets re-balanced 47001 // tree gets re-balanced
46957 unsigned long s_properties; /* File system properties. Currently holds 47002 unsigned long s_properties; /* File system properties. Currently holds
46958 on-disk FS format */ 47003 on-disk FS format */
46959diff -urNp linux-2.6.32.16/include/linux/sched.h linux-2.6.32.16/include/linux/sched.h 47004diff -urNp linux-2.6.32.18/include/linux/sched.h linux-2.6.32.18/include/linux/sched.h
46960--- linux-2.6.32.16/include/linux/sched.h 2010-07-05 14:14:00.000000000 -0400 47005--- linux-2.6.32.18/include/linux/sched.h 2010-08-10 13:45:57.000000000 -0400
46961+++ linux-2.6.32.16/include/linux/sched.h 2010-07-09 14:50:38.000000000 -0400 47006+++ linux-2.6.32.18/include/linux/sched.h 2010-08-11 18:57:32.000000000 -0400
46962@@ -101,6 +101,7 @@ struct bio; 47007@@ -101,6 +101,7 @@ struct bio;
46963 struct fs_struct; 47008 struct fs_struct;
46964 struct bts_context; 47009 struct bts_context;
@@ -47174,9 +47219,9 @@ diff -urNp linux-2.6.32.16/include/linux/sched.h linux-2.6.32.16/include/linux/s
47174 extern void thread_info_cache_init(void); 47219 extern void thread_info_cache_init(void);
47175 47220
47176 #ifdef CONFIG_DEBUG_STACK_USAGE 47221 #ifdef CONFIG_DEBUG_STACK_USAGE
47177diff -urNp linux-2.6.32.16/include/linux/screen_info.h linux-2.6.32.16/include/linux/screen_info.h 47222diff -urNp linux-2.6.32.18/include/linux/screen_info.h linux-2.6.32.18/include/linux/screen_info.h
47178--- linux-2.6.32.16/include/linux/screen_info.h 2010-07-05 14:14:00.000000000 -0400 47223--- linux-2.6.32.18/include/linux/screen_info.h 2010-08-10 13:45:57.000000000 -0400
47179+++ linux-2.6.32.16/include/linux/screen_info.h 2010-07-09 14:50:38.000000000 -0400 47224+++ linux-2.6.32.18/include/linux/screen_info.h 2010-08-11 18:57:32.000000000 -0400
47180@@ -42,7 +42,8 @@ struct screen_info { 47225@@ -42,7 +42,8 @@ struct screen_info {
47181 __u16 pages; /* 0x32 */ 47226 __u16 pages; /* 0x32 */
47182 __u16 vesa_attributes; /* 0x34 */ 47227 __u16 vesa_attributes; /* 0x34 */
@@ -47187,9 +47232,9 @@ diff -urNp linux-2.6.32.16/include/linux/screen_info.h linux-2.6.32.16/include/l
47187 } __attribute__((packed)); 47232 } __attribute__((packed));
47188 47233
47189 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ 47234 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
47190diff -urNp linux-2.6.32.16/include/linux/security.h linux-2.6.32.16/include/linux/security.h 47235diff -urNp linux-2.6.32.18/include/linux/security.h linux-2.6.32.18/include/linux/security.h
47191--- linux-2.6.32.16/include/linux/security.h 2010-07-05 14:14:00.000000000 -0400 47236--- linux-2.6.32.18/include/linux/security.h 2010-08-10 13:45:57.000000000 -0400
47192+++ linux-2.6.32.16/include/linux/security.h 2010-07-09 14:50:38.000000000 -0400 47237+++ linux-2.6.32.18/include/linux/security.h 2010-08-11 18:57:32.000000000 -0400
47193@@ -34,6 +34,7 @@ 47238@@ -34,6 +34,7 @@
47194 #include <linux/key.h> 47239 #include <linux/key.h>
47195 #include <linux/xfrm.h> 47240 #include <linux/xfrm.h>
@@ -47198,9 +47243,9 @@ diff -urNp linux-2.6.32.16/include/linux/security.h linux-2.6.32.16/include/linu
47198 #include <net/flow.h> 47243 #include <net/flow.h>
47199 47244
47200 /* Maximum number of letters for an LSM name string */ 47245 /* Maximum number of letters for an LSM name string */
47201diff -urNp linux-2.6.32.16/include/linux/shm.h linux-2.6.32.16/include/linux/shm.h 47246diff -urNp linux-2.6.32.18/include/linux/shm.h linux-2.6.32.18/include/linux/shm.h
47202--- linux-2.6.32.16/include/linux/shm.h 2010-07-05 14:14:00.000000000 -0400 47247--- linux-2.6.32.18/include/linux/shm.h 2010-08-10 13:45:57.000000000 -0400
47203+++ linux-2.6.32.16/include/linux/shm.h 2010-07-09 14:50:38.000000000 -0400 47248+++ linux-2.6.32.18/include/linux/shm.h 2010-08-11 18:57:32.000000000 -0400
47204@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke 47249@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
47205 pid_t shm_cprid; 47250 pid_t shm_cprid;
47206 pid_t shm_lprid; 47251 pid_t shm_lprid;
@@ -47212,9 +47257,9 @@ diff -urNp linux-2.6.32.16/include/linux/shm.h linux-2.6.32.16/include/linux/shm
47212 }; 47257 };
47213 47258
47214 /* shm_mode upper byte flags */ 47259 /* shm_mode upper byte flags */
47215diff -urNp linux-2.6.32.16/include/linux/slab.h linux-2.6.32.16/include/linux/slab.h 47260diff -urNp linux-2.6.32.18/include/linux/slab.h linux-2.6.32.18/include/linux/slab.h
47216--- linux-2.6.32.16/include/linux/slab.h 2010-07-05 14:14:00.000000000 -0400 47261--- linux-2.6.32.18/include/linux/slab.h 2010-08-10 13:45:57.000000000 -0400
47217+++ linux-2.6.32.16/include/linux/slab.h 2010-07-09 14:50:38.000000000 -0400 47262+++ linux-2.6.32.18/include/linux/slab.h 2010-08-11 18:57:32.000000000 -0400
47218@@ -11,6 +11,7 @@ 47263@@ -11,6 +11,7 @@
47219 47264
47220 #include <linux/gfp.h> 47265 #include <linux/gfp.h>
@@ -47286,9 +47331,9 @@ diff -urNp linux-2.6.32.16/include/linux/slab.h linux-2.6.32.16/include/linux/sl
47286+}) 47331+})
47287+ 47332+
47288 #endif /* _LINUX_SLAB_H */ 47333 #endif /* _LINUX_SLAB_H */
47289diff -urNp linux-2.6.32.16/include/linux/slub_def.h linux-2.6.32.16/include/linux/slub_def.h 47334diff -urNp linux-2.6.32.18/include/linux/slub_def.h linux-2.6.32.18/include/linux/slub_def.h
47290--- linux-2.6.32.16/include/linux/slub_def.h 2010-07-05 14:14:00.000000000 -0400 47335--- linux-2.6.32.18/include/linux/slub_def.h 2010-08-10 13:45:57.000000000 -0400
47291+++ linux-2.6.32.16/include/linux/slub_def.h 2010-07-09 14:50:38.000000000 -0400 47336+++ linux-2.6.32.18/include/linux/slub_def.h 2010-08-11 18:57:32.000000000 -0400
47292@@ -86,7 +86,7 @@ struct kmem_cache { 47337@@ -86,7 +86,7 @@ struct kmem_cache {
47293 struct kmem_cache_order_objects max; 47338 struct kmem_cache_order_objects max;
47294 struct kmem_cache_order_objects min; 47339 struct kmem_cache_order_objects min;
@@ -47298,9 +47343,9 @@ diff -urNp linux-2.6.32.16/include/linux/slub_def.h linux-2.6.32.16/include/linu
47298 void (*ctor)(void *); 47343 void (*ctor)(void *);
47299 int inuse; /* Offset to metadata */ 47344 int inuse; /* Offset to metadata */
47300 int align; /* Alignment */ 47345 int align; /* Alignment */
47301diff -urNp linux-2.6.32.16/include/linux/sonet.h linux-2.6.32.16/include/linux/sonet.h 47346diff -urNp linux-2.6.32.18/include/linux/sonet.h linux-2.6.32.18/include/linux/sonet.h
47302--- linux-2.6.32.16/include/linux/sonet.h 2010-07-05 14:14:00.000000000 -0400 47347--- linux-2.6.32.18/include/linux/sonet.h 2010-08-10 13:45:57.000000000 -0400
47303+++ linux-2.6.32.16/include/linux/sonet.h 2010-07-09 14:50:38.000000000 -0400 47348+++ linux-2.6.32.18/include/linux/sonet.h 2010-08-11 18:57:32.000000000 -0400
47304@@ -61,7 +61,7 @@ struct sonet_stats { 47349@@ -61,7 +61,7 @@ struct sonet_stats {
47305 #include <asm/atomic.h> 47350 #include <asm/atomic.h>
47306 47351
@@ -47310,9 +47355,9 @@ diff -urNp linux-2.6.32.16/include/linux/sonet.h linux-2.6.32.16/include/linux/s
47310 __SONET_ITEMS 47355 __SONET_ITEMS
47311 #undef __HANDLE_ITEM 47356 #undef __HANDLE_ITEM
47312 }; 47357 };
47313diff -urNp linux-2.6.32.16/include/linux/suspend.h linux-2.6.32.16/include/linux/suspend.h 47358diff -urNp linux-2.6.32.18/include/linux/suspend.h linux-2.6.32.18/include/linux/suspend.h
47314--- linux-2.6.32.16/include/linux/suspend.h 2010-07-05 14:14:00.000000000 -0400 47359--- linux-2.6.32.18/include/linux/suspend.h 2010-08-10 13:45:57.000000000 -0400
47315+++ linux-2.6.32.16/include/linux/suspend.h 2010-07-09 14:50:38.000000000 -0400 47360+++ linux-2.6.32.18/include/linux/suspend.h 2010-08-11 18:57:32.000000000 -0400
47316@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; 47361@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
47317 * which require special recovery actions in that situation. 47362 * which require special recovery actions in that situation.
47318 */ 47363 */
@@ -47401,9 +47446,9 @@ diff -urNp linux-2.6.32.16/include/linux/suspend.h linux-2.6.32.16/include/linux
47401 static inline int hibernate(void) { return -ENOSYS; } 47446 static inline int hibernate(void) { return -ENOSYS; }
47402 static inline bool system_entering_hibernation(void) { return false; } 47447 static inline bool system_entering_hibernation(void) { return false; }
47403 #endif /* CONFIG_HIBERNATION */ 47448 #endif /* CONFIG_HIBERNATION */
47404diff -urNp linux-2.6.32.16/include/linux/sysctl.h linux-2.6.32.16/include/linux/sysctl.h 47449diff -urNp linux-2.6.32.18/include/linux/sysctl.h linux-2.6.32.18/include/linux/sysctl.h
47405--- linux-2.6.32.16/include/linux/sysctl.h 2010-07-05 14:14:00.000000000 -0400 47450--- linux-2.6.32.18/include/linux/sysctl.h 2010-08-10 13:45:57.000000000 -0400
47406+++ linux-2.6.32.16/include/linux/sysctl.h 2010-07-09 14:50:38.000000000 -0400 47451+++ linux-2.6.32.18/include/linux/sysctl.h 2010-08-11 18:57:32.000000000 -0400
47407@@ -164,7 +164,11 @@ enum 47452@@ -164,7 +164,11 @@ enum
47408 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ 47453 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
47409 }; 47454 };
@@ -47417,9 +47462,9 @@ diff -urNp linux-2.6.32.16/include/linux/sysctl.h linux-2.6.32.16/include/linux/
47417 47462
47418 /* CTL_VM names: */ 47463 /* CTL_VM names: */
47419 enum 47464 enum
47420diff -urNp linux-2.6.32.16/include/linux/sysfs.h linux-2.6.32.16/include/linux/sysfs.h 47465diff -urNp linux-2.6.32.18/include/linux/sysfs.h linux-2.6.32.18/include/linux/sysfs.h
47421--- linux-2.6.32.16/include/linux/sysfs.h 2010-07-05 14:14:00.000000000 -0400 47466--- linux-2.6.32.18/include/linux/sysfs.h 2010-08-10 13:45:57.000000000 -0400
47422+++ linux-2.6.32.16/include/linux/sysfs.h 2010-07-09 14:50:38.000000000 -0400 47467+++ linux-2.6.32.18/include/linux/sysfs.h 2010-08-11 18:57:32.000000000 -0400
47423@@ -75,8 +75,8 @@ struct bin_attribute { 47468@@ -75,8 +75,8 @@ struct bin_attribute {
47424 }; 47469 };
47425 47470
@@ -47431,9 +47476,9 @@ diff -urNp linux-2.6.32.16/include/linux/sysfs.h linux-2.6.32.16/include/linux/s
47431 }; 47476 };
47432 47477
47433 struct sysfs_dirent; 47478 struct sysfs_dirent;
47434diff -urNp linux-2.6.32.16/include/linux/thread_info.h linux-2.6.32.16/include/linux/thread_info.h 47479diff -urNp linux-2.6.32.18/include/linux/thread_info.h linux-2.6.32.18/include/linux/thread_info.h
47435--- linux-2.6.32.16/include/linux/thread_info.h 2010-07-05 14:14:00.000000000 -0400 47480--- linux-2.6.32.18/include/linux/thread_info.h 2010-08-10 13:45:57.000000000 -0400
47436+++ linux-2.6.32.16/include/linux/thread_info.h 2010-07-09 14:50:38.000000000 -0400 47481+++ linux-2.6.32.18/include/linux/thread_info.h 2010-08-11 18:57:32.000000000 -0400
47437@@ -23,7 +23,7 @@ struct restart_block { 47482@@ -23,7 +23,7 @@ struct restart_block {
47438 }; 47483 };
47439 /* For futex_wait and futex_wait_requeue_pi */ 47484 /* For futex_wait and futex_wait_requeue_pi */
@@ -47443,9 +47488,9 @@ diff -urNp linux-2.6.32.16/include/linux/thread_info.h linux-2.6.32.16/include/l
47443 u32 val; 47488 u32 val;
47444 u32 flags; 47489 u32 flags;
47445 u32 bitset; 47490 u32 bitset;
47446diff -urNp linux-2.6.32.16/include/linux/tty.h linux-2.6.32.16/include/linux/tty.h 47491diff -urNp linux-2.6.32.18/include/linux/tty.h linux-2.6.32.18/include/linux/tty.h
47447--- linux-2.6.32.16/include/linux/tty.h 2010-07-05 14:14:00.000000000 -0400 47492--- linux-2.6.32.18/include/linux/tty.h 2010-08-10 13:45:57.000000000 -0400
47448+++ linux-2.6.32.16/include/linux/tty.h 2010-07-09 14:50:38.000000000 -0400 47493+++ linux-2.6.32.18/include/linux/tty.h 2010-08-11 18:57:32.000000000 -0400
47449@@ -13,6 +13,7 @@ 47494@@ -13,6 +13,7 @@
47450 #include <linux/tty_driver.h> 47495 #include <linux/tty_driver.h>
47451 #include <linux/tty_ldisc.h> 47496 #include <linux/tty_ldisc.h>
@@ -47481,9 +47526,9 @@ diff -urNp linux-2.6.32.16/include/linux/tty.h linux-2.6.32.16/include/linux/tty
47481 47526
47482 /* n_tty.c */ 47527 /* n_tty.c */
47483 extern struct tty_ldisc_ops tty_ldisc_N_TTY; 47528 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
47484diff -urNp linux-2.6.32.16/include/linux/tty_ldisc.h linux-2.6.32.16/include/linux/tty_ldisc.h 47529diff -urNp linux-2.6.32.18/include/linux/tty_ldisc.h linux-2.6.32.18/include/linux/tty_ldisc.h
47485--- linux-2.6.32.16/include/linux/tty_ldisc.h 2010-07-05 14:14:00.000000000 -0400 47530--- linux-2.6.32.18/include/linux/tty_ldisc.h 2010-08-10 13:45:57.000000000 -0400
47486+++ linux-2.6.32.16/include/linux/tty_ldisc.h 2010-07-09 14:50:38.000000000 -0400 47531+++ linux-2.6.32.18/include/linux/tty_ldisc.h 2010-08-11 18:57:32.000000000 -0400
47487@@ -139,7 +139,7 @@ struct tty_ldisc_ops { 47532@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
47488 47533
47489 struct module *owner; 47534 struct module *owner;
@@ -47493,9 +47538,9 @@ diff -urNp linux-2.6.32.16/include/linux/tty_ldisc.h linux-2.6.32.16/include/lin
47493 }; 47538 };
47494 47539
47495 struct tty_ldisc { 47540 struct tty_ldisc {
47496diff -urNp linux-2.6.32.16/include/linux/types.h linux-2.6.32.16/include/linux/types.h 47541diff -urNp linux-2.6.32.18/include/linux/types.h linux-2.6.32.18/include/linux/types.h
47497--- linux-2.6.32.16/include/linux/types.h 2010-07-05 14:14:00.000000000 -0400 47542--- linux-2.6.32.18/include/linux/types.h 2010-08-10 13:45:57.000000000 -0400
47498+++ linux-2.6.32.16/include/linux/types.h 2010-07-09 14:50:38.000000000 -0400 47543+++ linux-2.6.32.18/include/linux/types.h 2010-08-11 18:57:32.000000000 -0400
47499@@ -191,10 +191,26 @@ typedef struct { 47544@@ -191,10 +191,26 @@ typedef struct {
47500 volatile int counter; 47545 volatile int counter;
47501 } atomic_t; 47546 } atomic_t;
@@ -47523,9 +47568,9 @@ diff -urNp linux-2.6.32.16/include/linux/types.h linux-2.6.32.16/include/linux/t
47523 #endif 47568 #endif
47524 47569
47525 struct ustat { 47570 struct ustat {
47526diff -urNp linux-2.6.32.16/include/linux/uaccess.h linux-2.6.32.16/include/linux/uaccess.h 47571diff -urNp linux-2.6.32.18/include/linux/uaccess.h linux-2.6.32.18/include/linux/uaccess.h
47527--- linux-2.6.32.16/include/linux/uaccess.h 2010-07-05 14:14:00.000000000 -0400 47572--- linux-2.6.32.18/include/linux/uaccess.h 2010-08-10 13:45:57.000000000 -0400
47528+++ linux-2.6.32.16/include/linux/uaccess.h 2010-07-09 14:50:38.000000000 -0400 47573+++ linux-2.6.32.18/include/linux/uaccess.h 2010-08-11 18:57:32.000000000 -0400
47529@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ 47574@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
47530 long ret; \ 47575 long ret; \
47531 mm_segment_t old_fs = get_fs(); \ 47576 mm_segment_t old_fs = get_fs(); \
@@ -47557,9 +47602,9 @@ diff -urNp linux-2.6.32.16/include/linux/uaccess.h linux-2.6.32.16/include/linux
47557+extern long probe_kernel_write(void *dst, const void *src, size_t size); 47602+extern long probe_kernel_write(void *dst, const void *src, size_t size);
47558 47603
47559 #endif /* __LINUX_UACCESS_H__ */ 47604 #endif /* __LINUX_UACCESS_H__ */
47560diff -urNp linux-2.6.32.16/include/linux/vmalloc.h linux-2.6.32.16/include/linux/vmalloc.h 47605diff -urNp linux-2.6.32.18/include/linux/vmalloc.h linux-2.6.32.18/include/linux/vmalloc.h
47561--- linux-2.6.32.16/include/linux/vmalloc.h 2010-07-05 14:14:00.000000000 -0400 47606--- linux-2.6.32.18/include/linux/vmalloc.h 2010-08-10 13:45:57.000000000 -0400
47562+++ linux-2.6.32.16/include/linux/vmalloc.h 2010-07-09 14:50:38.000000000 -0400 47607+++ linux-2.6.32.18/include/linux/vmalloc.h 2010-08-11 18:57:32.000000000 -0400
47563@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining 47608@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
47564 #define VM_MAP 0x00000004 /* vmap()ed pages */ 47609 #define VM_MAP 0x00000004 /* vmap()ed pages */
47565 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ 47610 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
@@ -47654,9 +47699,9 @@ diff -urNp linux-2.6.32.16/include/linux/vmalloc.h linux-2.6.32.16/include/linux
47654+}) 47699+})
47655+ 47700+
47656 #endif /* _LINUX_VMALLOC_H */ 47701 #endif /* _LINUX_VMALLOC_H */
47657diff -urNp linux-2.6.32.16/include/linux/vmstat.h linux-2.6.32.16/include/linux/vmstat.h 47702diff -urNp linux-2.6.32.18/include/linux/vmstat.h linux-2.6.32.18/include/linux/vmstat.h
47658--- linux-2.6.32.16/include/linux/vmstat.h 2010-07-05 14:14:00.000000000 -0400 47703--- linux-2.6.32.18/include/linux/vmstat.h 2010-08-10 13:45:57.000000000 -0400
47659+++ linux-2.6.32.16/include/linux/vmstat.h 2010-07-16 21:06:43.000000000 -0400 47704+++ linux-2.6.32.18/include/linux/vmstat.h 2010-08-11 18:57:32.000000000 -0400
47660@@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in 47705@@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in
47661 /* 47706 /*
47662 * Zone based page accounting with per cpu differentials. 47707 * Zone based page accounting with per cpu differentials.
@@ -47711,9 +47756,9 @@ diff -urNp linux-2.6.32.16/include/linux/vmstat.h linux-2.6.32.16/include/linux/
47711 } 47756 }
47712 47757
47713 static inline void __dec_zone_page_state(struct page *page, 47758 static inline void __dec_zone_page_state(struct page *page,
47714diff -urNp linux-2.6.32.16/include/net/irda/ircomm_tty.h linux-2.6.32.16/include/net/irda/ircomm_tty.h 47759diff -urNp linux-2.6.32.18/include/net/irda/ircomm_tty.h linux-2.6.32.18/include/net/irda/ircomm_tty.h
47715--- linux-2.6.32.16/include/net/irda/ircomm_tty.h 2010-07-05 14:14:00.000000000 -0400 47760--- linux-2.6.32.18/include/net/irda/ircomm_tty.h 2010-08-10 13:45:57.000000000 -0400
47716+++ linux-2.6.32.16/include/net/irda/ircomm_tty.h 2010-07-09 14:50:38.000000000 -0400 47761+++ linux-2.6.32.18/include/net/irda/ircomm_tty.h 2010-08-11 18:57:32.000000000 -0400
47717@@ -105,8 +105,8 @@ struct ircomm_tty_cb { 47762@@ -105,8 +105,8 @@ struct ircomm_tty_cb {
47718 unsigned short close_delay; 47763 unsigned short close_delay;
47719 unsigned short closing_wait; /* time to wait before closing */ 47764 unsigned short closing_wait; /* time to wait before closing */
@@ -47725,9 +47770,9 @@ diff -urNp linux-2.6.32.16/include/net/irda/ircomm_tty.h linux-2.6.32.16/include
47725 47770
47726 /* Protect concurent access to : 47771 /* Protect concurent access to :
47727 * o self->open_count 47772 * o self->open_count
47728diff -urNp linux-2.6.32.16/include/net/neighbour.h linux-2.6.32.16/include/net/neighbour.h 47773diff -urNp linux-2.6.32.18/include/net/neighbour.h linux-2.6.32.18/include/net/neighbour.h
47729--- linux-2.6.32.16/include/net/neighbour.h 2010-07-05 14:14:00.000000000 -0400 47774--- linux-2.6.32.18/include/net/neighbour.h 2010-08-10 13:45:57.000000000 -0400
47730+++ linux-2.6.32.16/include/net/neighbour.h 2010-07-09 14:50:38.000000000 -0400 47775+++ linux-2.6.32.18/include/net/neighbour.h 2010-08-11 18:57:32.000000000 -0400
47731@@ -125,12 +125,12 @@ struct neighbour 47776@@ -125,12 +125,12 @@ struct neighbour
47732 struct neigh_ops 47777 struct neigh_ops
47733 { 47778 {
@@ -47747,9 +47792,9 @@ diff -urNp linux-2.6.32.16/include/net/neighbour.h linux-2.6.32.16/include/net/n
47747 }; 47792 };
47748 47793
47749 struct pneigh_entry 47794 struct pneigh_entry
47750diff -urNp linux-2.6.32.16/include/net/sctp/sctp.h linux-2.6.32.16/include/net/sctp/sctp.h 47795diff -urNp linux-2.6.32.18/include/net/sctp/sctp.h linux-2.6.32.18/include/net/sctp/sctp.h
47751--- linux-2.6.32.16/include/net/sctp/sctp.h 2010-07-05 14:14:00.000000000 -0400 47796--- linux-2.6.32.18/include/net/sctp/sctp.h 2010-08-10 13:45:57.000000000 -0400
47752+++ linux-2.6.32.16/include/net/sctp/sctp.h 2010-07-09 14:50:38.000000000 -0400 47797+++ linux-2.6.32.18/include/net/sctp/sctp.h 2010-08-11 18:57:32.000000000 -0400
47753@@ -305,8 +305,8 @@ extern int sctp_debug_flag; 47798@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
47754 47799
47755 #else /* SCTP_DEBUG */ 47800 #else /* SCTP_DEBUG */
@@ -47761,9 +47806,9 @@ diff -urNp linux-2.6.32.16/include/net/sctp/sctp.h linux-2.6.32.16/include/net/s
47761 #define SCTP_ENABLE_DEBUG 47806 #define SCTP_ENABLE_DEBUG
47762 #define SCTP_DISABLE_DEBUG 47807 #define SCTP_DISABLE_DEBUG
47763 #define SCTP_ASSERT(expr, str, func) 47808 #define SCTP_ASSERT(expr, str, func)
47764diff -urNp linux-2.6.32.16/include/net/tcp.h linux-2.6.32.16/include/net/tcp.h 47809diff -urNp linux-2.6.32.18/include/net/tcp.h linux-2.6.32.18/include/net/tcp.h
47765--- linux-2.6.32.16/include/net/tcp.h 2010-07-05 14:14:00.000000000 -0400 47810--- linux-2.6.32.18/include/net/tcp.h 2010-08-10 13:45:57.000000000 -0400
47766+++ linux-2.6.32.16/include/net/tcp.h 2010-07-09 14:50:38.000000000 -0400 47811+++ linux-2.6.32.18/include/net/tcp.h 2010-08-11 18:57:32.000000000 -0400
47767@@ -1420,6 +1420,7 @@ enum tcp_seq_states { 47812@@ -1420,6 +1420,7 @@ enum tcp_seq_states {
47768 struct tcp_seq_afinfo { 47813 struct tcp_seq_afinfo {
47769 char *name; 47814 char *name;
@@ -47772,9 +47817,9 @@ diff -urNp linux-2.6.32.16/include/net/tcp.h linux-2.6.32.16/include/net/tcp.h
47772 struct file_operations seq_fops; 47817 struct file_operations seq_fops;
47773 struct seq_operations seq_ops; 47818 struct seq_operations seq_ops;
47774 }; 47819 };
47775diff -urNp linux-2.6.32.16/include/net/udp.h linux-2.6.32.16/include/net/udp.h 47820diff -urNp linux-2.6.32.18/include/net/udp.h linux-2.6.32.18/include/net/udp.h
47776--- linux-2.6.32.16/include/net/udp.h 2010-07-05 14:14:00.000000000 -0400 47821--- linux-2.6.32.18/include/net/udp.h 2010-08-10 13:45:57.000000000 -0400
47777+++ linux-2.6.32.16/include/net/udp.h 2010-07-09 14:50:38.000000000 -0400 47822+++ linux-2.6.32.18/include/net/udp.h 2010-08-11 18:57:32.000000000 -0400
47778@@ -187,6 +187,7 @@ struct udp_seq_afinfo { 47823@@ -187,6 +187,7 @@ struct udp_seq_afinfo {
47779 char *name; 47824 char *name;
47780 sa_family_t family; 47825 sa_family_t family;
@@ -47783,9 +47828,9 @@ diff -urNp linux-2.6.32.16/include/net/udp.h linux-2.6.32.16/include/net/udp.h
47783 struct file_operations seq_fops; 47828 struct file_operations seq_fops;
47784 struct seq_operations seq_ops; 47829 struct seq_operations seq_ops;
47785 }; 47830 };
47786diff -urNp linux-2.6.32.16/include/sound/ac97_codec.h linux-2.6.32.16/include/sound/ac97_codec.h 47831diff -urNp linux-2.6.32.18/include/sound/ac97_codec.h linux-2.6.32.18/include/sound/ac97_codec.h
47787--- linux-2.6.32.16/include/sound/ac97_codec.h 2010-07-05 14:14:00.000000000 -0400 47832--- linux-2.6.32.18/include/sound/ac97_codec.h 2010-08-10 13:45:57.000000000 -0400
47788+++ linux-2.6.32.16/include/sound/ac97_codec.h 2010-07-09 14:50:38.000000000 -0400 47833+++ linux-2.6.32.18/include/sound/ac97_codec.h 2010-08-11 18:57:32.000000000 -0400
47789@@ -419,15 +419,15 @@ 47834@@ -419,15 +419,15 @@
47790 struct snd_ac97; 47835 struct snd_ac97;
47791 47836
@@ -47818,9 +47863,9 @@ diff -urNp linux-2.6.32.16/include/sound/ac97_codec.h linux-2.6.32.16/include/so
47818 void *private_data; 47863 void *private_data;
47819 void (*private_free) (struct snd_ac97 *ac97); 47864 void (*private_free) (struct snd_ac97 *ac97);
47820 /* --- */ 47865 /* --- */
47821diff -urNp linux-2.6.32.16/include/trace/events/irq.h linux-2.6.32.16/include/trace/events/irq.h 47866diff -urNp linux-2.6.32.18/include/trace/events/irq.h linux-2.6.32.18/include/trace/events/irq.h
47822--- linux-2.6.32.16/include/trace/events/irq.h 2010-07-05 14:14:00.000000000 -0400 47867--- linux-2.6.32.18/include/trace/events/irq.h 2010-08-10 13:45:57.000000000 -0400
47823+++ linux-2.6.32.16/include/trace/events/irq.h 2010-07-09 14:50:38.000000000 -0400 47868+++ linux-2.6.32.18/include/trace/events/irq.h 2010-08-11 18:57:32.000000000 -0400
47824@@ -34,7 +34,7 @@ 47869@@ -34,7 +34,7 @@
47825 */ 47870 */
47826 TRACE_EVENT(irq_handler_entry, 47871 TRACE_EVENT(irq_handler_entry,
@@ -47857,9 +47902,9 @@ diff -urNp linux-2.6.32.16/include/trace/events/irq.h linux-2.6.32.16/include/tr
47857 47902
47858 TP_ARGS(h, vec), 47903 TP_ARGS(h, vec),
47859 47904
47860diff -urNp linux-2.6.32.16/include/video/uvesafb.h linux-2.6.32.16/include/video/uvesafb.h 47905diff -urNp linux-2.6.32.18/include/video/uvesafb.h linux-2.6.32.18/include/video/uvesafb.h
47861--- linux-2.6.32.16/include/video/uvesafb.h 2010-07-05 14:14:00.000000000 -0400 47906--- linux-2.6.32.18/include/video/uvesafb.h 2010-08-10 13:45:57.000000000 -0400
47862+++ linux-2.6.32.16/include/video/uvesafb.h 2010-07-09 14:50:38.000000000 -0400 47907+++ linux-2.6.32.18/include/video/uvesafb.h 2010-08-11 18:57:32.000000000 -0400
47863@@ -177,6 +177,7 @@ struct uvesafb_par { 47908@@ -177,6 +177,7 @@ struct uvesafb_par {
47864 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ 47909 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
47865 u8 pmi_setpal; /* PMI for palette changes */ 47910 u8 pmi_setpal; /* PMI for palette changes */
@@ -47868,9 +47913,9 @@ diff -urNp linux-2.6.32.16/include/video/uvesafb.h linux-2.6.32.16/include/video
47868 void *pmi_start; 47913 void *pmi_start;
47869 void *pmi_pal; 47914 void *pmi_pal;
47870 u8 *vbe_state_orig; /* 47915 u8 *vbe_state_orig; /*
47871diff -urNp linux-2.6.32.16/init/do_mounts.c linux-2.6.32.16/init/do_mounts.c 47916diff -urNp linux-2.6.32.18/init/do_mounts.c linux-2.6.32.18/init/do_mounts.c
47872--- linux-2.6.32.16/init/do_mounts.c 2010-07-05 14:14:00.000000000 -0400 47917--- linux-2.6.32.18/init/do_mounts.c 2010-08-10 13:45:57.000000000 -0400
47873+++ linux-2.6.32.16/init/do_mounts.c 2010-07-09 14:50:38.000000000 -0400 47918+++ linux-2.6.32.18/init/do_mounts.c 2010-08-11 18:57:32.000000000 -0400
47874@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa 47919@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
47875 47920
47876 static int __init do_mount_root(char *name, char *fs, int flags, void *data) 47921 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -47916,9 +47961,9 @@ diff -urNp linux-2.6.32.16/init/do_mounts.c linux-2.6.32.16/init/do_mounts.c
47916+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); 47961+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
47917+ sys_chroot((__force char __user *)"."); 47962+ sys_chroot((__force char __user *)".");
47918 } 47963 }
47919diff -urNp linux-2.6.32.16/init/do_mounts.h linux-2.6.32.16/init/do_mounts.h 47964diff -urNp linux-2.6.32.18/init/do_mounts.h linux-2.6.32.18/init/do_mounts.h
47920--- linux-2.6.32.16/init/do_mounts.h 2010-07-05 14:14:00.000000000 -0400 47965--- linux-2.6.32.18/init/do_mounts.h 2010-08-10 13:45:57.000000000 -0400
47921+++ linux-2.6.32.16/init/do_mounts.h 2010-07-09 14:50:38.000000000 -0400 47966+++ linux-2.6.32.18/init/do_mounts.h 2010-08-11 18:57:32.000000000 -0400
47922@@ -15,15 +15,15 @@ extern int root_mountflags; 47967@@ -15,15 +15,15 @@ extern int root_mountflags;
47923 47968
47924 static inline int create_dev(char *name, dev_t dev) 47969 static inline int create_dev(char *name, dev_t dev)
@@ -47938,9 +47983,9 @@ diff -urNp linux-2.6.32.16/init/do_mounts.h linux-2.6.32.16/init/do_mounts.h
47938 return 0; 47983 return 0;
47939 if (!S_ISBLK(stat.st_mode)) 47984 if (!S_ISBLK(stat.st_mode))
47940 return 0; 47985 return 0;
47941diff -urNp linux-2.6.32.16/init/do_mounts_initrd.c linux-2.6.32.16/init/do_mounts_initrd.c 47986diff -urNp linux-2.6.32.18/init/do_mounts_initrd.c linux-2.6.32.18/init/do_mounts_initrd.c
47942--- linux-2.6.32.16/init/do_mounts_initrd.c 2010-07-05 14:14:00.000000000 -0400 47987--- linux-2.6.32.18/init/do_mounts_initrd.c 2010-08-10 13:45:57.000000000 -0400
47943+++ linux-2.6.32.16/init/do_mounts_initrd.c 2010-07-09 14:50:38.000000000 -0400 47988+++ linux-2.6.32.18/init/do_mounts_initrd.c 2010-08-11 18:57:32.000000000 -0400
47944@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel 47989@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
47945 sys_close(old_fd);sys_close(root_fd); 47990 sys_close(old_fd);sys_close(root_fd);
47946 sys_close(0);sys_close(1);sys_close(2); 47991 sys_close(0);sys_close(1);sys_close(2);
@@ -48024,9 +48069,9 @@ diff -urNp linux-2.6.32.16/init/do_mounts_initrd.c linux-2.6.32.16/init/do_mount
48024+ sys_unlink((__force const char __user *)"/initrd.image"); 48069+ sys_unlink((__force const char __user *)"/initrd.image");
48025 return 0; 48070 return 0;
48026 } 48071 }
48027diff -urNp linux-2.6.32.16/init/do_mounts_md.c linux-2.6.32.16/init/do_mounts_md.c 48072diff -urNp linux-2.6.32.18/init/do_mounts_md.c linux-2.6.32.18/init/do_mounts_md.c
48028--- linux-2.6.32.16/init/do_mounts_md.c 2010-07-05 14:14:00.000000000 -0400 48073--- linux-2.6.32.18/init/do_mounts_md.c 2010-08-10 13:45:57.000000000 -0400
48029+++ linux-2.6.32.16/init/do_mounts_md.c 2010-07-09 14:50:38.000000000 -0400 48074+++ linux-2.6.32.18/init/do_mounts_md.c 2010-08-11 18:57:32.000000000 -0400
48030@@ -170,7 +170,7 @@ static void __init md_setup_drive(void) 48075@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
48031 partitioned ? "_d" : "", minor, 48076 partitioned ? "_d" : "", minor,
48032 md_setup_args[ent].device_names); 48077 md_setup_args[ent].device_names);
@@ -48054,9 +48099,9 @@ diff -urNp linux-2.6.32.16/init/do_mounts_md.c linux-2.6.32.16/init/do_mounts_md
48054 if (fd >= 0) { 48099 if (fd >= 0) {
48055 sys_ioctl(fd, RAID_AUTORUN, raid_autopart); 48100 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
48056 sys_close(fd); 48101 sys_close(fd);
48057diff -urNp linux-2.6.32.16/init/initramfs.c linux-2.6.32.16/init/initramfs.c 48102diff -urNp linux-2.6.32.18/init/initramfs.c linux-2.6.32.18/init/initramfs.c
48058--- linux-2.6.32.16/init/initramfs.c 2010-07-05 14:14:00.000000000 -0400 48103--- linux-2.6.32.18/init/initramfs.c 2010-08-10 13:45:57.000000000 -0400
48059+++ linux-2.6.32.16/init/initramfs.c 2010-07-09 14:50:38.000000000 -0400 48104+++ linux-2.6.32.18/init/initramfs.c 2010-08-11 18:57:32.000000000 -0400
48060@@ -74,7 +74,7 @@ static void __init free_hash(void) 48105@@ -74,7 +74,7 @@ static void __init free_hash(void)
48061 } 48106 }
48062 } 48107 }
@@ -48165,9 +48210,9 @@ diff -urNp linux-2.6.32.16/init/initramfs.c linux-2.6.32.16/init/initramfs.c
48165 state = SkipIt; 48210 state = SkipIt;
48166 next_state = Reset; 48211 next_state = Reset;
48167 return 0; 48212 return 0;
48168diff -urNp linux-2.6.32.16/init/Kconfig linux-2.6.32.16/init/Kconfig 48213diff -urNp linux-2.6.32.18/init/Kconfig linux-2.6.32.18/init/Kconfig
48169--- linux-2.6.32.16/init/Kconfig 2010-07-05 14:14:00.000000000 -0400 48214--- linux-2.6.32.18/init/Kconfig 2010-08-10 13:45:57.000000000 -0400
48170+++ linux-2.6.32.16/init/Kconfig 2010-07-09 14:50:38.000000000 -0400 48215+++ linux-2.6.32.18/init/Kconfig 2010-08-11 18:57:32.000000000 -0400
48171@@ -1026,7 +1026,7 @@ config SLUB_DEBUG 48216@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
48172 48217
48173 config COMPAT_BRK 48218 config COMPAT_BRK
@@ -48177,9 +48222,9 @@ diff -urNp linux-2.6.32.16/init/Kconfig linux-2.6.32.16/init/Kconfig
48177 help 48222 help
48178 Randomizing heap placement makes heap exploits harder, but it 48223 Randomizing heap placement makes heap exploits harder, but it
48179 also breaks ancient binaries (including anything libc5 based). 48224 also breaks ancient binaries (including anything libc5 based).
48180diff -urNp linux-2.6.32.16/init/main.c linux-2.6.32.16/init/main.c 48225diff -urNp linux-2.6.32.18/init/main.c linux-2.6.32.18/init/main.c
48181--- linux-2.6.32.16/init/main.c 2010-07-05 14:14:00.000000000 -0400 48226--- linux-2.6.32.18/init/main.c 2010-08-10 13:45:57.000000000 -0400
48182+++ linux-2.6.32.16/init/main.c 2010-07-09 14:50:38.000000000 -0400 48227+++ linux-2.6.32.18/init/main.c 2010-08-11 18:57:32.000000000 -0400
48183@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) 48228@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
48184 #ifdef CONFIG_TC 48229 #ifdef CONFIG_TC
48185 extern void tc_init(void); 48230 extern void tc_init(void);
@@ -48324,9 +48369,9 @@ diff -urNp linux-2.6.32.16/init/main.c linux-2.6.32.16/init/main.c
48324 /* 48369 /*
48325 * Ok, we have completed the initial bootup, and 48370 * Ok, we have completed the initial bootup, and
48326 * we're essentially up and running. Get rid of the 48371 * we're essentially up and running. Get rid of the
48327diff -urNp linux-2.6.32.16/init/noinitramfs.c linux-2.6.32.16/init/noinitramfs.c 48372diff -urNp linux-2.6.32.18/init/noinitramfs.c linux-2.6.32.18/init/noinitramfs.c
48328--- linux-2.6.32.16/init/noinitramfs.c 2010-07-05 14:14:00.000000000 -0400 48373--- linux-2.6.32.18/init/noinitramfs.c 2010-08-10 13:45:57.000000000 -0400
48329+++ linux-2.6.32.16/init/noinitramfs.c 2010-07-09 14:50:38.000000000 -0400 48374+++ linux-2.6.32.18/init/noinitramfs.c 2010-08-11 18:57:32.000000000 -0400
48330@@ -29,7 +29,7 @@ static int __init default_rootfs(void) 48375@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
48331 { 48376 {
48332 int err; 48377 int err;
@@ -48345,9 +48390,9 @@ diff -urNp linux-2.6.32.16/init/noinitramfs.c linux-2.6.32.16/init/noinitramfs.c
48345 if (err < 0) 48390 if (err < 0)
48346 goto out; 48391 goto out;
48347 48392
48348diff -urNp linux-2.6.32.16/ipc/ipc_sysctl.c linux-2.6.32.16/ipc/ipc_sysctl.c 48393diff -urNp linux-2.6.32.18/ipc/ipc_sysctl.c linux-2.6.32.18/ipc/ipc_sysctl.c
48349--- linux-2.6.32.16/ipc/ipc_sysctl.c 2010-07-05 14:14:00.000000000 -0400 48394--- linux-2.6.32.18/ipc/ipc_sysctl.c 2010-08-10 13:45:57.000000000 -0400
48350+++ linux-2.6.32.16/ipc/ipc_sysctl.c 2010-07-09 14:50:38.000000000 -0400 48395+++ linux-2.6.32.18/ipc/ipc_sysctl.c 2010-08-11 18:57:32.000000000 -0400
48351@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] 48396@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
48352 .extra1 = &zero, 48397 .extra1 = &zero,
48353 .extra2 = &one, 48398 .extra2 = &one,
@@ -48366,9 +48411,9 @@ diff -urNp linux-2.6.32.16/ipc/ipc_sysctl.c linux-2.6.32.16/ipc/ipc_sysctl.c
48366 }; 48411 };
48367 48412
48368 static int __init ipc_sysctl_init(void) 48413 static int __init ipc_sysctl_init(void)
48369diff -urNp linux-2.6.32.16/ipc/mqueue.c linux-2.6.32.16/ipc/mqueue.c 48414diff -urNp linux-2.6.32.18/ipc/mqueue.c linux-2.6.32.18/ipc/mqueue.c
48370--- linux-2.6.32.16/ipc/mqueue.c 2010-07-05 14:14:00.000000000 -0400 48415--- linux-2.6.32.18/ipc/mqueue.c 2010-08-10 13:45:57.000000000 -0400
48371+++ linux-2.6.32.16/ipc/mqueue.c 2010-07-09 14:50:38.000000000 -0400 48416+++ linux-2.6.32.18/ipc/mqueue.c 2010-08-11 18:57:32.000000000 -0400
48372@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st 48417@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
48373 mq_bytes = (mq_msg_tblsz + 48418 mq_bytes = (mq_msg_tblsz +
48374 (info->attr.mq_maxmsg * info->attr.mq_msgsize)); 48419 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -48377,9 +48422,9 @@ diff -urNp linux-2.6.32.16/ipc/mqueue.c linux-2.6.32.16/ipc/mqueue.c
48377 spin_lock(&mq_lock); 48422 spin_lock(&mq_lock);
48378 if (u->mq_bytes + mq_bytes < u->mq_bytes || 48423 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
48379 u->mq_bytes + mq_bytes > 48424 u->mq_bytes + mq_bytes >
48380diff -urNp linux-2.6.32.16/ipc/shm.c linux-2.6.32.16/ipc/shm.c 48425diff -urNp linux-2.6.32.18/ipc/shm.c linux-2.6.32.18/ipc/shm.c
48381--- linux-2.6.32.16/ipc/shm.c 2010-07-05 14:14:00.000000000 -0400 48426--- linux-2.6.32.18/ipc/shm.c 2010-08-10 13:45:57.000000000 -0400
48382+++ linux-2.6.32.16/ipc/shm.c 2010-07-09 14:50:38.000000000 -0400 48427+++ linux-2.6.32.18/ipc/shm.c 2010-08-11 18:57:32.000000000 -0400
48383@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name 48428@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
48384 static int sysvipc_shm_proc_show(struct seq_file *s, void *it); 48429 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
48385 #endif 48430 #endif
@@ -48432,9 +48477,9 @@ diff -urNp linux-2.6.32.16/ipc/shm.c linux-2.6.32.16/ipc/shm.c
48432 size = i_size_read(path.dentry->d_inode); 48477 size = i_size_read(path.dentry->d_inode);
48433 shm_unlock(shp); 48478 shm_unlock(shp);
48434 48479
48435diff -urNp linux-2.6.32.16/kernel/acct.c linux-2.6.32.16/kernel/acct.c 48480diff -urNp linux-2.6.32.18/kernel/acct.c linux-2.6.32.18/kernel/acct.c
48436--- linux-2.6.32.16/kernel/acct.c 2010-07-05 14:14:00.000000000 -0400 48481--- linux-2.6.32.18/kernel/acct.c 2010-08-10 13:45:57.000000000 -0400
48437+++ linux-2.6.32.16/kernel/acct.c 2010-07-09 14:50:38.000000000 -0400 48482+++ linux-2.6.32.18/kernel/acct.c 2010-08-11 18:57:32.000000000 -0400
48438@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a 48483@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
48439 */ 48484 */
48440 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; 48485 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -48444,9 +48489,9 @@ diff -urNp linux-2.6.32.16/kernel/acct.c linux-2.6.32.16/kernel/acct.c
48444 sizeof(acct_t), &file->f_pos); 48489 sizeof(acct_t), &file->f_pos);
48445 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; 48490 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
48446 set_fs(fs); 48491 set_fs(fs);
48447diff -urNp linux-2.6.32.16/kernel/capability.c linux-2.6.32.16/kernel/capability.c 48492diff -urNp linux-2.6.32.18/kernel/capability.c linux-2.6.32.18/kernel/capability.c
48448--- linux-2.6.32.16/kernel/capability.c 2010-07-05 14:14:00.000000000 -0400 48493--- linux-2.6.32.18/kernel/capability.c 2010-08-10 13:45:57.000000000 -0400
48449+++ linux-2.6.32.16/kernel/capability.c 2010-07-09 14:50:38.000000000 -0400 48494+++ linux-2.6.32.18/kernel/capability.c 2010-08-11 18:57:32.000000000 -0400
48450@@ -306,10 +306,21 @@ int capable(int cap) 48495@@ -306,10 +306,21 @@ int capable(int cap)
48451 BUG(); 48496 BUG();
48452 } 48497 }
@@ -48470,9 +48515,9 @@ diff -urNp linux-2.6.32.16/kernel/capability.c linux-2.6.32.16/kernel/capability
48470+ 48515+
48471 EXPORT_SYMBOL(capable); 48516 EXPORT_SYMBOL(capable);
48472+EXPORT_SYMBOL(capable_nolog); 48517+EXPORT_SYMBOL(capable_nolog);
48473diff -urNp linux-2.6.32.16/kernel/configs.c linux-2.6.32.16/kernel/configs.c 48518diff -urNp linux-2.6.32.18/kernel/configs.c linux-2.6.32.18/kernel/configs.c
48474--- linux-2.6.32.16/kernel/configs.c 2010-07-05 14:14:00.000000000 -0400 48519--- linux-2.6.32.18/kernel/configs.c 2010-08-10 13:45:57.000000000 -0400
48475+++ linux-2.6.32.16/kernel/configs.c 2010-07-09 14:50:38.000000000 -0400 48520+++ linux-2.6.32.18/kernel/configs.c 2010-08-11 18:57:32.000000000 -0400
48476@@ -73,8 +73,19 @@ static int __init ikconfig_init(void) 48521@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
48477 struct proc_dir_entry *entry; 48522 struct proc_dir_entry *entry;
48478 48523
@@ -48493,9 +48538,9 @@ diff -urNp linux-2.6.32.16/kernel/configs.c linux-2.6.32.16/kernel/configs.c
48493 if (!entry) 48538 if (!entry)
48494 return -ENOMEM; 48539 return -ENOMEM;
48495 48540
48496diff -urNp linux-2.6.32.16/kernel/cpu.c linux-2.6.32.16/kernel/cpu.c 48541diff -urNp linux-2.6.32.18/kernel/cpu.c linux-2.6.32.18/kernel/cpu.c
48497--- linux-2.6.32.16/kernel/cpu.c 2010-07-05 14:14:00.000000000 -0400 48542--- linux-2.6.32.18/kernel/cpu.c 2010-08-10 13:45:57.000000000 -0400
48498+++ linux-2.6.32.16/kernel/cpu.c 2010-07-09 14:50:38.000000000 -0400 48543+++ linux-2.6.32.18/kernel/cpu.c 2010-08-11 18:57:32.000000000 -0400
48499@@ -19,7 +19,7 @@ 48544@@ -19,7 +19,7 @@
48500 /* Serializes the updates to cpu_online_mask, cpu_present_mask */ 48545 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
48501 static DEFINE_MUTEX(cpu_add_remove_lock); 48546 static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -48505,9 +48550,9 @@ diff -urNp linux-2.6.32.16/kernel/cpu.c linux-2.6.32.16/kernel/cpu.c
48505 48550
48506 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. 48551 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
48507 * Should always be manipulated under cpu_add_remove_lock 48552 * Should always be manipulated under cpu_add_remove_lock
48508diff -urNp linux-2.6.32.16/kernel/cred.c linux-2.6.32.16/kernel/cred.c 48553diff -urNp linux-2.6.32.18/kernel/cred.c linux-2.6.32.18/kernel/cred.c
48509--- linux-2.6.32.16/kernel/cred.c 2010-07-05 14:14:00.000000000 -0400 48554--- linux-2.6.32.18/kernel/cred.c 2010-08-10 13:45:57.000000000 -0400
48510+++ linux-2.6.32.16/kernel/cred.c 2010-07-09 14:50:38.000000000 -0400 48555+++ linux-2.6.32.18/kernel/cred.c 2010-08-11 18:57:32.000000000 -0400
48511@@ -520,6 +520,8 @@ int commit_creds(struct cred *new) 48556@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
48512 48557
48513 get_cred(new); /* we will require a ref for the subj creds too */ 48558 get_cred(new); /* we will require a ref for the subj creds too */
@@ -48517,9 +48562,9 @@ diff -urNp linux-2.6.32.16/kernel/cred.c linux-2.6.32.16/kernel/cred.c
48517 /* dumpability changes */ 48562 /* dumpability changes */
48518 if (old->euid != new->euid || 48563 if (old->euid != new->euid ||
48519 old->egid != new->egid || 48564 old->egid != new->egid ||
48520diff -urNp linux-2.6.32.16/kernel/exit.c linux-2.6.32.16/kernel/exit.c 48565diff -urNp linux-2.6.32.18/kernel/exit.c linux-2.6.32.18/kernel/exit.c
48521--- linux-2.6.32.16/kernel/exit.c 2010-07-05 14:14:00.000000000 -0400 48566--- linux-2.6.32.18/kernel/exit.c 2010-08-10 13:45:57.000000000 -0400
48522+++ linux-2.6.32.16/kernel/exit.c 2010-07-09 14:50:38.000000000 -0400 48567+++ linux-2.6.32.18/kernel/exit.c 2010-08-11 18:57:32.000000000 -0400
48523@@ -56,6 +56,10 @@ 48568@@ -56,6 +56,10 @@
48524 #include <asm/mmu_context.h> 48569 #include <asm/mmu_context.h>
48525 #include "cred-internals.h" 48570 #include "cred-internals.h"
@@ -48609,9 +48654,9 @@ diff -urNp linux-2.6.32.16/kernel/exit.c linux-2.6.32.16/kernel/exit.c
48609 48654
48610 get_task_struct(p); 48655 get_task_struct(p);
48611 read_unlock(&tasklist_lock); 48656 read_unlock(&tasklist_lock);
48612diff -urNp linux-2.6.32.16/kernel/fork.c linux-2.6.32.16/kernel/fork.c 48657diff -urNp linux-2.6.32.18/kernel/fork.c linux-2.6.32.18/kernel/fork.c
48613--- linux-2.6.32.16/kernel/fork.c 2010-07-05 14:14:00.000000000 -0400 48658--- linux-2.6.32.18/kernel/fork.c 2010-08-10 13:45:57.000000000 -0400
48614+++ linux-2.6.32.16/kernel/fork.c 2010-07-09 14:50:38.000000000 -0400 48659+++ linux-2.6.32.18/kernel/fork.c 2010-08-11 18:57:32.000000000 -0400
48615@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru 48660@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
48616 *stackend = STACK_END_MAGIC; /* for overflow detection */ 48661 *stackend = STACK_END_MAGIC; /* for overflow detection */
48617 48662
@@ -48750,9 +48795,9 @@ diff -urNp linux-2.6.32.16/kernel/fork.c linux-2.6.32.16/kernel/fork.c
48750 new_fs = NULL; 48795 new_fs = NULL;
48751 else 48796 else
48752 new_fs = fs; 48797 new_fs = fs;
48753diff -urNp linux-2.6.32.16/kernel/futex.c linux-2.6.32.16/kernel/futex.c 48798diff -urNp linux-2.6.32.18/kernel/futex.c linux-2.6.32.18/kernel/futex.c
48754--- linux-2.6.32.16/kernel/futex.c 2010-07-05 14:14:00.000000000 -0400 48799--- linux-2.6.32.18/kernel/futex.c 2010-08-10 13:45:57.000000000 -0400
48755+++ linux-2.6.32.16/kernel/futex.c 2010-07-09 14:50:38.000000000 -0400 48800+++ linux-2.6.32.18/kernel/futex.c 2010-08-11 18:57:32.000000000 -0400
48756@@ -54,6 +54,7 @@ 48801@@ -54,6 +54,7 @@
48757 #include <linux/mount.h> 48802 #include <linux/mount.h>
48758 #include <linux/pagemap.h> 48803 #include <linux/pagemap.h>
@@ -48773,7 +48818,7 @@ diff -urNp linux-2.6.32.16/kernel/futex.c linux-2.6.32.16/kernel/futex.c
48773 /* 48818 /*
48774 * The futex address must be "naturally" aligned. 48819 * The futex address must be "naturally" aligned.
48775 */ 48820 */
48776@@ -1852,7 +1858,7 @@ retry: 48821@@ -1843,7 +1849,7 @@ retry:
48777 48822
48778 restart = &current_thread_info()->restart_block; 48823 restart = &current_thread_info()->restart_block;
48779 restart->fn = futex_wait_restart; 48824 restart->fn = futex_wait_restart;
@@ -48782,7 +48827,7 @@ diff -urNp linux-2.6.32.16/kernel/futex.c linux-2.6.32.16/kernel/futex.c
48782 restart->futex.val = val; 48827 restart->futex.val = val;
48783 restart->futex.time = abs_time->tv64; 48828 restart->futex.time = abs_time->tv64;
48784 restart->futex.bitset = bitset; 48829 restart->futex.bitset = bitset;
48785@@ -2385,7 +2391,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pi 48830@@ -2376,7 +2382,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
48786 { 48831 {
48787 struct robust_list_head __user *head; 48832 struct robust_list_head __user *head;
48788 unsigned long ret; 48833 unsigned long ret;
@@ -48794,7 +48839,7 @@ diff -urNp linux-2.6.32.16/kernel/futex.c linux-2.6.32.16/kernel/futex.c
48794 48839
48795 if (!futex_cmpxchg_enabled) 48840 if (!futex_cmpxchg_enabled)
48796 return -ENOSYS; 48841 return -ENOSYS;
48797@@ -2401,11 +2410,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi 48842@@ -2392,11 +2401,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
48798 if (!p) 48843 if (!p)
48799 goto err_unlock; 48844 goto err_unlock;
48800 ret = -EPERM; 48845 ret = -EPERM;
@@ -48811,7 +48856,7 @@ diff -urNp linux-2.6.32.16/kernel/futex.c linux-2.6.32.16/kernel/futex.c
48811 head = p->robust_list; 48856 head = p->robust_list;
48812 rcu_read_unlock(); 48857 rcu_read_unlock();
48813 } 48858 }
48814@@ -2467,7 +2481,7 @@ retry: 48859@@ -2458,7 +2472,7 @@ retry:
48815 */ 48860 */
48816 static inline int fetch_robust_entry(struct robust_list __user **entry, 48861 static inline int fetch_robust_entry(struct robust_list __user **entry,
48817 struct robust_list __user * __user *head, 48862 struct robust_list __user * __user *head,
@@ -48820,9 +48865,9 @@ diff -urNp linux-2.6.32.16/kernel/futex.c linux-2.6.32.16/kernel/futex.c
48820 { 48865 {
48821 unsigned long uentry; 48866 unsigned long uentry;
48822 48867
48823diff -urNp linux-2.6.32.16/kernel/futex_compat.c linux-2.6.32.16/kernel/futex_compat.c 48868diff -urNp linux-2.6.32.18/kernel/futex_compat.c linux-2.6.32.18/kernel/futex_compat.c
48824--- linux-2.6.32.16/kernel/futex_compat.c 2010-07-05 14:14:00.000000000 -0400 48869--- linux-2.6.32.18/kernel/futex_compat.c 2010-08-10 13:45:57.000000000 -0400
48825+++ linux-2.6.32.16/kernel/futex_compat.c 2010-07-09 15:16:46.000000000 -0400 48870+++ linux-2.6.32.18/kernel/futex_compat.c 2010-08-11 18:57:32.000000000 -0400
48826@@ -10,6 +10,7 @@ 48871@@ -10,6 +10,7 @@
48827 #include <linux/compat.h> 48872 #include <linux/compat.h>
48828 #include <linux/nsproxy.h> 48873 #include <linux/nsproxy.h>
@@ -48860,9 +48905,9 @@ diff -urNp linux-2.6.32.16/kernel/futex_compat.c linux-2.6.32.16/kernel/futex_co
48860 head = p->compat_robust_list; 48905 head = p->compat_robust_list;
48861 read_unlock(&tasklist_lock); 48906 read_unlock(&tasklist_lock);
48862 } 48907 }
48863diff -urNp linux-2.6.32.16/kernel/gcov/base.c linux-2.6.32.16/kernel/gcov/base.c 48908diff -urNp linux-2.6.32.18/kernel/gcov/base.c linux-2.6.32.18/kernel/gcov/base.c
48864--- linux-2.6.32.16/kernel/gcov/base.c 2010-07-05 14:14:00.000000000 -0400 48909--- linux-2.6.32.18/kernel/gcov/base.c 2010-08-10 13:45:57.000000000 -0400
48865+++ linux-2.6.32.16/kernel/gcov/base.c 2010-07-09 14:50:38.000000000 -0400 48910+++ linux-2.6.32.18/kernel/gcov/base.c 2010-08-11 18:57:32.000000000 -0400
48866@@ -102,11 +102,6 @@ void gcov_enable_events(void) 48911@@ -102,11 +102,6 @@ void gcov_enable_events(void)
48867 } 48912 }
48868 48913
@@ -48884,9 +48929,9 @@ diff -urNp linux-2.6.32.16/kernel/gcov/base.c linux-2.6.32.16/kernel/gcov/base.c
48884 if (prev) 48929 if (prev)
48885 prev->next = info->next; 48930 prev->next = info->next;
48886 else 48931 else
48887diff -urNp linux-2.6.32.16/kernel/hrtimer.c linux-2.6.32.16/kernel/hrtimer.c 48932diff -urNp linux-2.6.32.18/kernel/hrtimer.c linux-2.6.32.18/kernel/hrtimer.c
48888--- linux-2.6.32.16/kernel/hrtimer.c 2010-07-05 14:14:00.000000000 -0400 48933--- linux-2.6.32.18/kernel/hrtimer.c 2010-08-10 13:45:57.000000000 -0400
48889+++ linux-2.6.32.16/kernel/hrtimer.c 2010-07-09 14:50:38.000000000 -0400 48934+++ linux-2.6.32.18/kernel/hrtimer.c 2010-08-11 18:57:32.000000000 -0400
48890@@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void) 48935@@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void)
48891 local_irq_restore(flags); 48936 local_irq_restore(flags);
48892 } 48937 }
@@ -48896,9 +48941,9 @@ diff -urNp linux-2.6.32.16/kernel/hrtimer.c linux-2.6.32.16/kernel/hrtimer.c
48896 { 48941 {
48897 hrtimer_peek_ahead_timers(); 48942 hrtimer_peek_ahead_timers();
48898 } 48943 }
48899diff -urNp linux-2.6.32.16/kernel/kallsyms.c linux-2.6.32.16/kernel/kallsyms.c 48944diff -urNp linux-2.6.32.18/kernel/kallsyms.c linux-2.6.32.18/kernel/kallsyms.c
48900--- linux-2.6.32.16/kernel/kallsyms.c 2010-07-05 14:14:00.000000000 -0400 48945--- linux-2.6.32.18/kernel/kallsyms.c 2010-08-10 13:45:57.000000000 -0400
48901+++ linux-2.6.32.16/kernel/kallsyms.c 2010-07-09 14:50:44.000000000 -0400 48946+++ linux-2.6.32.18/kernel/kallsyms.c 2010-08-11 18:57:32.000000000 -0400
48902@@ -11,6 +11,9 @@ 48947@@ -11,6 +11,9 @@
48903 * Changed the compression method from stem compression to "table lookup" 48948 * Changed the compression method from stem compression to "table lookup"
48904 * compression (see scripts/kallsyms.c for a more complete description) 48949 * compression (see scripts/kallsyms.c for a more complete description)
@@ -48987,9 +49032,9 @@ diff -urNp linux-2.6.32.16/kernel/kallsyms.c linux-2.6.32.16/kernel/kallsyms.c
48987 if (!iter) 49032 if (!iter)
48988 return -ENOMEM; 49033 return -ENOMEM;
48989 reset_iter(iter, 0); 49034 reset_iter(iter, 0);
48990diff -urNp linux-2.6.32.16/kernel/kgdb.c linux-2.6.32.16/kernel/kgdb.c 49035diff -urNp linux-2.6.32.18/kernel/kgdb.c linux-2.6.32.18/kernel/kgdb.c
48991--- linux-2.6.32.16/kernel/kgdb.c 2010-07-05 14:14:00.000000000 -0400 49036--- linux-2.6.32.18/kernel/kgdb.c 2010-08-10 13:45:57.000000000 -0400
48992+++ linux-2.6.32.16/kernel/kgdb.c 2010-07-09 14:50:38.000000000 -0400 49037+++ linux-2.6.32.18/kernel/kgdb.c 2010-08-11 18:57:32.000000000 -0400
48993@@ -86,7 +86,7 @@ static int kgdb_io_module_registered; 49038@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
48994 /* Guard for recursive entry */ 49039 /* Guard for recursive entry */
48995 static int exception_level; 49040 static int exception_level;
@@ -49017,9 +49062,9 @@ diff -urNp linux-2.6.32.16/kernel/kgdb.c linux-2.6.32.16/kernel/kgdb.c
49017 { 49062 {
49018 BUG_ON(kgdb_connected); 49063 BUG_ON(kgdb_connected);
49019 49064
49020diff -urNp linux-2.6.32.16/kernel/kmod.c linux-2.6.32.16/kernel/kmod.c 49065diff -urNp linux-2.6.32.18/kernel/kmod.c linux-2.6.32.18/kernel/kmod.c
49021--- linux-2.6.32.16/kernel/kmod.c 2010-07-05 14:14:00.000000000 -0400 49066--- linux-2.6.32.18/kernel/kmod.c 2010-08-10 13:45:57.000000000 -0400
49022+++ linux-2.6.32.16/kernel/kmod.c 2010-07-09 14:50:38.000000000 -0400 49067+++ linux-2.6.32.18/kernel/kmod.c 2010-08-11 18:57:32.000000000 -0400
49023@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch 49068@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
49024 if (ret >= MODULE_NAME_LEN) 49069 if (ret >= MODULE_NAME_LEN)
49025 return -ENAMETOOLONG; 49070 return -ENAMETOOLONG;
@@ -49039,9 +49084,9 @@ diff -urNp linux-2.6.32.16/kernel/kmod.c linux-2.6.32.16/kernel/kmod.c
49039 /* If modprobe needs a service that is in a module, we get a recursive 49084 /* If modprobe needs a service that is in a module, we get a recursive
49040 * loop. Limit the number of running kmod threads to max_threads/2 or 49085 * loop. Limit the number of running kmod threads to max_threads/2 or
49041 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method 49086 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
49042diff -urNp linux-2.6.32.16/kernel/kprobes.c linux-2.6.32.16/kernel/kprobes.c 49087diff -urNp linux-2.6.32.18/kernel/kprobes.c linux-2.6.32.18/kernel/kprobes.c
49043--- linux-2.6.32.16/kernel/kprobes.c 2010-07-05 14:14:00.000000000 -0400 49088--- linux-2.6.32.18/kernel/kprobes.c 2010-08-10 13:45:57.000000000 -0400
49044+++ linux-2.6.32.16/kernel/kprobes.c 2010-07-09 14:50:38.000000000 -0400 49089+++ linux-2.6.32.18/kernel/kprobes.c 2010-08-11 18:57:32.000000000 -0400
49045@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ 49090@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
49046 * kernel image and loaded module images reside. This is required 49091 * kernel image and loaded module images reside. This is required
49047 * so x86_64 can correctly handle the %rip-relative fixups. 49092 * so x86_64 can correctly handle the %rip-relative fixups.
@@ -49078,9 +49123,9 @@ diff -urNp linux-2.6.32.16/kernel/kprobes.c linux-2.6.32.16/kernel/kprobes.c
49078 49123
49079 head = &kprobe_table[i]; 49124 head = &kprobe_table[i];
49080 preempt_disable(); 49125 preempt_disable();
49081diff -urNp linux-2.6.32.16/kernel/lockdep.c linux-2.6.32.16/kernel/lockdep.c 49126diff -urNp linux-2.6.32.18/kernel/lockdep.c linux-2.6.32.18/kernel/lockdep.c
49082--- linux-2.6.32.16/kernel/lockdep.c 2010-07-05 14:14:00.000000000 -0400 49127--- linux-2.6.32.18/kernel/lockdep.c 2010-08-10 13:45:57.000000000 -0400
49083+++ linux-2.6.32.16/kernel/lockdep.c 2010-07-09 14:50:38.000000000 -0400 49128+++ linux-2.6.32.18/kernel/lockdep.c 2010-08-11 18:57:32.000000000 -0400
49084@@ -577,6 +577,10 @@ static int static_obj(void *obj) 49129@@ -577,6 +577,10 @@ static int static_obj(void *obj)
49085 int i; 49130 int i;
49086 #endif 49131 #endif
@@ -49110,9 +49155,9 @@ diff -urNp linux-2.6.32.16/kernel/lockdep.c linux-2.6.32.16/kernel/lockdep.c
49110 printk("the code is fine but needs lockdep annotation.\n"); 49155 printk("the code is fine but needs lockdep annotation.\n");
49111 printk("turning off the locking correctness validator.\n"); 49156 printk("turning off the locking correctness validator.\n");
49112 dump_stack(); 49157 dump_stack();
49113diff -urNp linux-2.6.32.16/kernel/lockdep_proc.c linux-2.6.32.16/kernel/lockdep_proc.c 49158diff -urNp linux-2.6.32.18/kernel/lockdep_proc.c linux-2.6.32.18/kernel/lockdep_proc.c
49114--- linux-2.6.32.16/kernel/lockdep_proc.c 2010-07-05 14:14:00.000000000 -0400 49159--- linux-2.6.32.18/kernel/lockdep_proc.c 2010-08-10 13:45:57.000000000 -0400
49115+++ linux-2.6.32.16/kernel/lockdep_proc.c 2010-07-09 14:50:38.000000000 -0400 49160+++ linux-2.6.32.18/kernel/lockdep_proc.c 2010-08-11 18:57:32.000000000 -0400
49116@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v 49161@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
49117 49162
49118 static void print_name(struct seq_file *m, struct lock_class *class) 49163 static void print_name(struct seq_file *m, struct lock_class *class)
@@ -49122,9 +49167,9 @@ diff -urNp linux-2.6.32.16/kernel/lockdep_proc.c linux-2.6.32.16/kernel/lockdep_
49122 const char *name = class->name; 49167 const char *name = class->name;
49123 49168
49124 if (!name) { 49169 if (!name) {
49125diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c 49170diff -urNp linux-2.6.32.18/kernel/module.c linux-2.6.32.18/kernel/module.c
49126--- linux-2.6.32.16/kernel/module.c 2010-07-05 14:14:00.000000000 -0400 49171--- linux-2.6.32.18/kernel/module.c 2010-08-10 13:45:57.000000000 -0400
49127+++ linux-2.6.32.16/kernel/module.c 2010-07-09 14:50:38.000000000 -0400 49172+++ linux-2.6.32.18/kernel/module.c 2010-08-11 18:57:32.000000000 -0400
49128@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq 49173@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
49129 static BLOCKING_NOTIFIER_HEAD(module_notify_list); 49174 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
49130 49175
@@ -49162,7 +49207,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49162 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n", 49207 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
49163 name, align, PAGE_SIZE); 49208 name, align, PAGE_SIZE);
49164 align = PAGE_SIZE; 49209 align = PAGE_SIZE;
49165@@ -1543,7 +1544,8 @@ static void free_module(struct module *m 49210@@ -1545,7 +1546,8 @@ static void free_module(struct module *m
49166 destroy_params(mod->kp, mod->num_kp); 49211 destroy_params(mod->kp, mod->num_kp);
49167 49212
49168 /* This may be NULL, but that's OK */ 49213 /* This may be NULL, but that's OK */
@@ -49172,7 +49217,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49172 kfree(mod->args); 49217 kfree(mod->args);
49173 if (mod->percpu) 49218 if (mod->percpu)
49174 percpu_modfree(mod->percpu); 49219 percpu_modfree(mod->percpu);
49175@@ -1552,10 +1554,12 @@ static void free_module(struct module *m 49220@@ -1554,10 +1556,12 @@ static void free_module(struct module *m
49176 percpu_modfree(mod->refptr); 49221 percpu_modfree(mod->refptr);
49177 #endif 49222 #endif
49178 /* Free lock-classes: */ 49223 /* Free lock-classes: */
@@ -49187,7 +49232,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49187 49232
49188 #ifdef CONFIG_MPU 49233 #ifdef CONFIG_MPU
49189 update_protections(current->mm); 49234 update_protections(current->mm);
49190@@ -1649,7 +1653,9 @@ static int simplify_symbols(Elf_Shdr *se 49235@@ -1651,7 +1655,9 @@ static int simplify_symbols(Elf_Shdr *se
49191 strtab + sym[i].st_name, mod); 49236 strtab + sym[i].st_name, mod);
49192 /* Ok if resolved. */ 49237 /* Ok if resolved. */
49193 if (ksym) { 49238 if (ksym) {
@@ -49197,7 +49242,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49197 break; 49242 break;
49198 } 49243 }
49199 49244
49200@@ -1668,7 +1674,9 @@ static int simplify_symbols(Elf_Shdr *se 49245@@ -1670,7 +1676,9 @@ static int simplify_symbols(Elf_Shdr *se
49201 secbase = (unsigned long)mod->percpu; 49246 secbase = (unsigned long)mod->percpu;
49202 else 49247 else
49203 secbase = sechdrs[sym[i].st_shndx].sh_addr; 49248 secbase = sechdrs[sym[i].st_shndx].sh_addr;
@@ -49207,7 +49252,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49207 break; 49252 break;
49208 } 49253 }
49209 } 49254 }
49210@@ -1729,11 +1737,12 @@ static void layout_sections(struct modul 49255@@ -1731,11 +1739,12 @@ static void layout_sections(struct modul
49211 || s->sh_entsize != ~0UL 49256 || s->sh_entsize != ~0UL
49212 || strstarts(secstrings + s->sh_name, ".init")) 49257 || strstarts(secstrings + s->sh_name, ".init"))
49213 continue; 49258 continue;
@@ -49223,7 +49268,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49223 } 49268 }
49224 49269
49225 DEBUGP("Init section allocation order:\n"); 49270 DEBUGP("Init section allocation order:\n");
49226@@ -1746,12 +1755,13 @@ static void layout_sections(struct modul 49271@@ -1748,12 +1757,13 @@ static void layout_sections(struct modul
49227 || s->sh_entsize != ~0UL 49272 || s->sh_entsize != ~0UL
49228 || !strstarts(secstrings + s->sh_name, ".init")) 49273 || !strstarts(secstrings + s->sh_name, ".init"))
49229 continue; 49274 continue;
@@ -49241,7 +49286,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49241 } 49286 }
49242 } 49287 }
49243 49288
49244@@ -1855,9 +1865,8 @@ static int is_exported(const char *name, 49289@@ -1857,9 +1867,8 @@ static int is_exported(const char *name,
49245 49290
49246 /* As per nm */ 49291 /* As per nm */
49247 static char elf_type(const Elf_Sym *sym, 49292 static char elf_type(const Elf_Sym *sym,
@@ -49253,7 +49298,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49253 { 49298 {
49254 if (ELF_ST_BIND(sym->st_info) == STB_WEAK) { 49299 if (ELF_ST_BIND(sym->st_info) == STB_WEAK) {
49255 if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT) 49300 if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT)
49256@@ -1932,7 +1941,7 @@ static unsigned long layout_symtab(struc 49301@@ -1934,7 +1943,7 @@ static unsigned long layout_symtab(struc
49257 49302
49258 /* Put symbol section at end of init part of module. */ 49303 /* Put symbol section at end of init part of module. */
49259 symsect->sh_flags |= SHF_ALLOC; 49304 symsect->sh_flags |= SHF_ALLOC;
@@ -49262,7 +49307,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49262 symindex) | INIT_OFFSET_MASK; 49307 symindex) | INIT_OFFSET_MASK;
49263 DEBUGP("\t%s\n", secstrings + symsect->sh_name); 49308 DEBUGP("\t%s\n", secstrings + symsect->sh_name);
49264 49309
49265@@ -1949,19 +1958,19 @@ static unsigned long layout_symtab(struc 49310@@ -1951,19 +1960,19 @@ static unsigned long layout_symtab(struc
49266 } 49311 }
49267 49312
49268 /* Append room for core symbols at end of core part. */ 49313 /* Append room for core symbols at end of core part. */
@@ -49287,7 +49332,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49287 49332
49288 return symoffs; 49333 return symoffs;
49289 } 49334 }
49290@@ -1985,12 +1994,14 @@ static void add_kallsyms(struct module * 49335@@ -1987,12 +1996,14 @@ static void add_kallsyms(struct module *
49291 mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym); 49336 mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
49292 mod->strtab = (void *)sechdrs[strindex].sh_addr; 49337 mod->strtab = (void *)sechdrs[strindex].sh_addr;
49293 49338
@@ -49304,7 +49349,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49304 src = mod->symtab; 49349 src = mod->symtab;
49305 *dst = *src; 49350 *dst = *src;
49306 for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) { 49351 for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
49307@@ -2002,10 +2013,12 @@ static void add_kallsyms(struct module * 49352@@ -2004,10 +2015,12 @@ static void add_kallsyms(struct module *
49308 } 49353 }
49309 mod->core_num_syms = ndst; 49354 mod->core_num_syms = ndst;
49310 49355
@@ -49318,7 +49363,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49318 } 49363 }
49319 #else 49364 #else
49320 static inline unsigned long layout_symtab(struct module *mod, 49365 static inline unsigned long layout_symtab(struct module *mod,
49321@@ -2042,16 +2055,30 @@ static void dynamic_debug_setup(struct _ 49366@@ -2044,16 +2057,30 @@ static void dynamic_debug_setup(struct _
49322 #endif 49367 #endif
49323 } 49368 }
49324 49369
@@ -49354,7 +49399,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49354 } 49399 }
49355 return ret; 49400 return ret;
49356 } 49401 }
49357@@ -2063,8 +2090,8 @@ static void kmemleak_load_module(struct 49402@@ -2065,8 +2092,8 @@ static void kmemleak_load_module(struct
49358 unsigned int i; 49403 unsigned int i;
49359 49404
49360 /* only scan the sections containing data */ 49405 /* only scan the sections containing data */
@@ -49365,7 +49410,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49365 sizeof(struct module), GFP_KERNEL); 49410 sizeof(struct module), GFP_KERNEL);
49366 49411
49367 for (i = 1; i < hdr->e_shnum; i++) { 49412 for (i = 1; i < hdr->e_shnum; i++) {
49368@@ -2074,8 +2101,8 @@ static void kmemleak_load_module(struct 49413@@ -2076,8 +2103,8 @@ static void kmemleak_load_module(struct
49369 && strncmp(secstrings + sechdrs[i].sh_name, ".bss", 4) != 0) 49414 && strncmp(secstrings + sechdrs[i].sh_name, ".bss", 4) != 0)
49370 continue; 49415 continue;
49371 49416
@@ -49376,7 +49421,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49376 sechdrs[i].sh_size, GFP_KERNEL); 49421 sechdrs[i].sh_size, GFP_KERNEL);
49377 } 49422 }
49378 } 49423 }
49379@@ -2261,7 +2288,7 @@ static noinline struct module *load_modu 49424@@ -2263,7 +2290,7 @@ static noinline struct module *load_modu
49380 secstrings, &stroffs, strmap); 49425 secstrings, &stroffs, strmap);
49381 49426
49382 /* Do the allocs. */ 49427 /* Do the allocs. */
@@ -49385,7 +49430,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49385 /* 49430 /*
49386 * The pointer to this block is stored in the module structure 49431 * The pointer to this block is stored in the module structure
49387 * which is inside the block. Just mark it as not being a 49432 * which is inside the block. Just mark it as not being a
49388@@ -2272,23 +2299,47 @@ static noinline struct module *load_modu 49433@@ -2274,23 +2301,47 @@ static noinline struct module *load_modu
49389 err = -ENOMEM; 49434 err = -ENOMEM;
49390 goto free_percpu; 49435 goto free_percpu;
49391 } 49436 }
@@ -49441,7 +49486,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49441 49486
49442 /* Transfer each section which specifies SHF_ALLOC */ 49487 /* Transfer each section which specifies SHF_ALLOC */
49443 DEBUGP("final section addresses:\n"); 49488 DEBUGP("final section addresses:\n");
49444@@ -2298,17 +2349,41 @@ static noinline struct module *load_modu 49489@@ -2300,17 +2351,41 @@ static noinline struct module *load_modu
49445 if (!(sechdrs[i].sh_flags & SHF_ALLOC)) 49490 if (!(sechdrs[i].sh_flags & SHF_ALLOC))
49446 continue; 49491 continue;
49447 49492
@@ -49492,7 +49537,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49492 DEBUGP("\t0x%lx %s\n", sechdrs[i].sh_addr, secstrings + sechdrs[i].sh_name); 49537 DEBUGP("\t0x%lx %s\n", sechdrs[i].sh_addr, secstrings + sechdrs[i].sh_name);
49493 } 49538 }
49494 /* Module has been moved. */ 49539 /* Module has been moved. */
49495@@ -2320,7 +2395,7 @@ static noinline struct module *load_modu 49540@@ -2322,7 +2397,7 @@ static noinline struct module *load_modu
49496 mod->name); 49541 mod->name);
49497 if (!mod->refptr) { 49542 if (!mod->refptr) {
49498 err = -ENOMEM; 49543 err = -ENOMEM;
@@ -49501,7 +49546,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49501 } 49546 }
49502 #endif 49547 #endif
49503 /* Now we've moved module, initialize linked lists, etc. */ 49548 /* Now we've moved module, initialize linked lists, etc. */
49504@@ -2429,8 +2504,8 @@ static noinline struct module *load_modu 49549@@ -2431,8 +2506,8 @@ static noinline struct module *load_modu
49505 49550
49506 /* Now do relocations. */ 49551 /* Now do relocations. */
49507 for (i = 1; i < hdr->e_shnum; i++) { 49552 for (i = 1; i < hdr->e_shnum; i++) {
@@ -49511,7 +49556,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49511 49556
49512 /* Not a valid relocation section? */ 49557 /* Not a valid relocation section? */
49513 if (info >= hdr->e_shnum) 49558 if (info >= hdr->e_shnum)
49514@@ -2491,12 +2566,12 @@ static noinline struct module *load_modu 49559@@ -2493,12 +2568,12 @@ static noinline struct module *load_modu
49515 * Do it before processing of module parameters, so the module 49560 * Do it before processing of module parameters, so the module
49516 * can provide parameter accessor functions of its own. 49561 * can provide parameter accessor functions of its own.
49517 */ 49562 */
@@ -49530,7 +49575,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49530 49575
49531 set_fs(old_fs); 49576 set_fs(old_fs);
49532 49577
49533@@ -2544,12 +2619,16 @@ static noinline struct module *load_modu 49578@@ -2546,12 +2621,16 @@ static noinline struct module *load_modu
49534 free_unload: 49579 free_unload:
49535 module_unload_free(mod); 49580 module_unload_free(mod);
49536 #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP) 49581 #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP)
@@ -49551,7 +49596,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49551 /* mod will be freed with core. Don't access it beyond this line! */ 49596 /* mod will be freed with core. Don't access it beyond this line! */
49552 free_percpu: 49597 free_percpu:
49553 if (percpu) 49598 if (percpu)
49554@@ -2651,10 +2730,12 @@ SYSCALL_DEFINE3(init_module, void __user 49599@@ -2653,10 +2732,12 @@ SYSCALL_DEFINE3(init_module, void __user
49555 mod->symtab = mod->core_symtab; 49600 mod->symtab = mod->core_symtab;
49556 mod->strtab = mod->core_strtab; 49601 mod->strtab = mod->core_strtab;
49557 #endif 49602 #endif
@@ -49568,7 +49613,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49568 mutex_unlock(&module_mutex); 49613 mutex_unlock(&module_mutex);
49569 49614
49570 return 0; 49615 return 0;
49571@@ -2685,10 +2766,16 @@ static const char *get_ksymbol(struct mo 49616@@ -2687,10 +2768,16 @@ static const char *get_ksymbol(struct mo
49572 unsigned long nextval; 49617 unsigned long nextval;
49573 49618
49574 /* At worse, next value is at end of module */ 49619 /* At worse, next value is at end of module */
@@ -49588,7 +49633,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49588 49633
49589 /* Scan for closest preceeding symbol, and next symbol. (ELF 49634 /* Scan for closest preceeding symbol, and next symbol. (ELF
49590 starts real symbols at 1). */ 49635 starts real symbols at 1). */
49591@@ -2934,7 +3021,7 @@ static int m_show(struct seq_file *m, vo 49636@@ -2936,7 +3023,7 @@ static int m_show(struct seq_file *m, vo
49592 char buf[8]; 49637 char buf[8];
49593 49638
49594 seq_printf(m, "%s %u", 49639 seq_printf(m, "%s %u",
@@ -49597,7 +49642,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49597 print_unload_info(m, mod); 49642 print_unload_info(m, mod);
49598 49643
49599 /* Informative for users. */ 49644 /* Informative for users. */
49600@@ -2943,7 +3030,7 @@ static int m_show(struct seq_file *m, vo 49645@@ -2945,7 +3032,7 @@ static int m_show(struct seq_file *m, vo
49601 mod->state == MODULE_STATE_COMING ? "Loading": 49646 mod->state == MODULE_STATE_COMING ? "Loading":
49602 "Live"); 49647 "Live");
49603 /* Used by oprofile and other similar tools. */ 49648 /* Used by oprofile and other similar tools. */
@@ -49606,7 +49651,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49606 49651
49607 /* Taints info */ 49652 /* Taints info */
49608 if (mod->taints) 49653 if (mod->taints)
49609@@ -2979,7 +3066,17 @@ static const struct file_operations proc 49654@@ -2981,7 +3068,17 @@ static const struct file_operations proc
49610 49655
49611 static int __init proc_modules_init(void) 49656 static int __init proc_modules_init(void)
49612 { 49657 {
@@ -49624,7 +49669,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49624 return 0; 49669 return 0;
49625 } 49670 }
49626 module_init(proc_modules_init); 49671 module_init(proc_modules_init);
49627@@ -3038,12 +3135,12 @@ struct module *__module_address(unsigned 49672@@ -3040,12 +3137,12 @@ struct module *__module_address(unsigned
49628 { 49673 {
49629 struct module *mod; 49674 struct module *mod;
49630 49675
@@ -49640,7 +49685,7 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49640 return mod; 49685 return mod;
49641 return NULL; 49686 return NULL;
49642 } 49687 }
49643@@ -3077,11 +3174,20 @@ bool is_module_text_address(unsigned lon 49688@@ -3079,11 +3176,20 @@ bool is_module_text_address(unsigned lon
49644 */ 49689 */
49645 struct module *__module_text_address(unsigned long addr) 49690 struct module *__module_text_address(unsigned long addr)
49646 { 49691 {
@@ -49664,9 +49709,9 @@ diff -urNp linux-2.6.32.16/kernel/module.c linux-2.6.32.16/kernel/module.c
49664 mod = NULL; 49709 mod = NULL;
49665 } 49710 }
49666 return mod; 49711 return mod;
49667diff -urNp linux-2.6.32.16/kernel/panic.c linux-2.6.32.16/kernel/panic.c 49712diff -urNp linux-2.6.32.18/kernel/panic.c linux-2.6.32.18/kernel/panic.c
49668--- linux-2.6.32.16/kernel/panic.c 2010-07-05 14:14:00.000000000 -0400 49713--- linux-2.6.32.18/kernel/panic.c 2010-08-10 13:45:57.000000000 -0400
49669+++ linux-2.6.32.16/kernel/panic.c 2010-07-09 14:50:38.000000000 -0400 49714+++ linux-2.6.32.18/kernel/panic.c 2010-08-11 18:57:32.000000000 -0400
49670@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); 49715@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
49671 */ 49716 */
49672 void __stack_chk_fail(void) 49717 void __stack_chk_fail(void)
@@ -49677,9 +49722,9 @@ diff -urNp linux-2.6.32.16/kernel/panic.c linux-2.6.32.16/kernel/panic.c
49677 __builtin_return_address(0)); 49722 __builtin_return_address(0));
49678 } 49723 }
49679 EXPORT_SYMBOL(__stack_chk_fail); 49724 EXPORT_SYMBOL(__stack_chk_fail);
49680diff -urNp linux-2.6.32.16/kernel/params.c linux-2.6.32.16/kernel/params.c 49725diff -urNp linux-2.6.32.18/kernel/params.c linux-2.6.32.18/kernel/params.c
49681--- linux-2.6.32.16/kernel/params.c 2010-07-05 14:14:00.000000000 -0400 49726--- linux-2.6.32.18/kernel/params.c 2010-08-10 13:45:57.000000000 -0400
49682+++ linux-2.6.32.16/kernel/params.c 2010-07-09 14:50:38.000000000 -0400 49727+++ linux-2.6.32.18/kernel/params.c 2010-08-11 18:57:32.000000000 -0400
49683@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct 49728@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
49684 return ret; 49729 return ret;
49685 } 49730 }
@@ -49698,9 +49743,9 @@ diff -urNp linux-2.6.32.16/kernel/params.c linux-2.6.32.16/kernel/params.c
49698 .filter = uevent_filter, 49743 .filter = uevent_filter,
49699 }; 49744 };
49700 49745
49701diff -urNp linux-2.6.32.16/kernel/pid.c linux-2.6.32.16/kernel/pid.c 49746diff -urNp linux-2.6.32.18/kernel/pid.c linux-2.6.32.18/kernel/pid.c
49702--- linux-2.6.32.16/kernel/pid.c 2010-07-05 14:14:00.000000000 -0400 49747--- linux-2.6.32.18/kernel/pid.c 2010-08-10 13:45:57.000000000 -0400
49703+++ linux-2.6.32.16/kernel/pid.c 2010-07-09 14:50:38.000000000 -0400 49748+++ linux-2.6.32.18/kernel/pid.c 2010-08-11 18:57:32.000000000 -0400
49704@@ -33,6 +33,7 @@ 49749@@ -33,6 +33,7 @@
49705 #include <linux/rculist.h> 49750 #include <linux/rculist.h>
49706 #include <linux/bootmem.h> 49751 #include <linux/bootmem.h>
@@ -49734,9 +49779,9 @@ diff -urNp linux-2.6.32.16/kernel/pid.c linux-2.6.32.16/kernel/pid.c
49734 } 49779 }
49735 49780
49736 struct task_struct *find_task_by_vpid(pid_t vnr) 49781 struct task_struct *find_task_by_vpid(pid_t vnr)
49737diff -urNp linux-2.6.32.16/kernel/posix-cpu-timers.c linux-2.6.32.16/kernel/posix-cpu-timers.c 49782diff -urNp linux-2.6.32.18/kernel/posix-cpu-timers.c linux-2.6.32.18/kernel/posix-cpu-timers.c
49738--- linux-2.6.32.16/kernel/posix-cpu-timers.c 2010-07-05 14:14:00.000000000 -0400 49783--- linux-2.6.32.18/kernel/posix-cpu-timers.c 2010-08-10 13:45:57.000000000 -0400
49739+++ linux-2.6.32.16/kernel/posix-cpu-timers.c 2010-07-09 14:50:38.000000000 -0400 49784+++ linux-2.6.32.18/kernel/posix-cpu-timers.c 2010-08-11 18:57:32.000000000 -0400
49740@@ -6,6 +6,7 @@ 49785@@ -6,6 +6,7 @@
49741 #include <linux/posix-timers.h> 49786 #include <linux/posix-timers.h>
49742 #include <linux/errno.h> 49787 #include <linux/errno.h>
@@ -49761,9 +49806,9 @@ diff -urNp linux-2.6.32.16/kernel/posix-cpu-timers.c linux-2.6.32.16/kernel/posi
49761 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_max) { 49806 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_max) {
49762 /* 49807 /*
49763 * At the hard limit, we just die. 49808 * At the hard limit, we just die.
49764diff -urNp linux-2.6.32.16/kernel/power/hibernate.c linux-2.6.32.16/kernel/power/hibernate.c 49809diff -urNp linux-2.6.32.18/kernel/power/hibernate.c linux-2.6.32.18/kernel/power/hibernate.c
49765--- linux-2.6.32.16/kernel/power/hibernate.c 2010-07-05 14:14:00.000000000 -0400 49810--- linux-2.6.32.18/kernel/power/hibernate.c 2010-08-10 13:45:57.000000000 -0400
49766+++ linux-2.6.32.16/kernel/power/hibernate.c 2010-07-09 14:50:38.000000000 -0400 49811+++ linux-2.6.32.18/kernel/power/hibernate.c 2010-08-11 18:57:32.000000000 -0400
49767@@ -48,14 +48,14 @@ enum { 49812@@ -48,14 +48,14 @@ enum {
49768 49813
49769 static int hibernation_mode = HIBERNATION_SHUTDOWN; 49814 static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -49781,9 +49826,9 @@ diff -urNp linux-2.6.32.16/kernel/power/hibernate.c linux-2.6.32.16/kernel/power
49781 { 49826 {
49782 if (ops && !(ops->begin && ops->end && ops->pre_snapshot 49827 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
49783 && ops->prepare && ops->finish && ops->enter && ops->pre_restore 49828 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
49784diff -urNp linux-2.6.32.16/kernel/power/poweroff.c linux-2.6.32.16/kernel/power/poweroff.c 49829diff -urNp linux-2.6.32.18/kernel/power/poweroff.c linux-2.6.32.18/kernel/power/poweroff.c
49785--- linux-2.6.32.16/kernel/power/poweroff.c 2010-07-05 14:14:00.000000000 -0400 49830--- linux-2.6.32.18/kernel/power/poweroff.c 2010-08-10 13:45:57.000000000 -0400
49786+++ linux-2.6.32.16/kernel/power/poweroff.c 2010-07-09 14:50:38.000000000 -0400 49831+++ linux-2.6.32.18/kernel/power/poweroff.c 2010-08-11 18:57:32.000000000 -0400
49787@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof 49832@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
49788 .enable_mask = SYSRQ_ENABLE_BOOT, 49833 .enable_mask = SYSRQ_ENABLE_BOOT,
49789 }; 49834 };
@@ -49793,9 +49838,9 @@ diff -urNp linux-2.6.32.16/kernel/power/poweroff.c linux-2.6.32.16/kernel/power/
49793 { 49838 {
49794 register_sysrq_key('o', &sysrq_poweroff_op); 49839 register_sysrq_key('o', &sysrq_poweroff_op);
49795 return 0; 49840 return 0;
49796diff -urNp linux-2.6.32.16/kernel/power/process.c linux-2.6.32.16/kernel/power/process.c 49841diff -urNp linux-2.6.32.18/kernel/power/process.c linux-2.6.32.18/kernel/power/process.c
49797--- linux-2.6.32.16/kernel/power/process.c 2010-07-05 14:14:00.000000000 -0400 49842--- linux-2.6.32.18/kernel/power/process.c 2010-08-10 13:45:57.000000000 -0400
49798+++ linux-2.6.32.16/kernel/power/process.c 2010-07-09 14:50:38.000000000 -0400 49843+++ linux-2.6.32.18/kernel/power/process.c 2010-08-11 18:57:32.000000000 -0400
49799@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ 49844@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
49800 struct timeval start, end; 49845 struct timeval start, end;
49801 u64 elapsed_csecs64; 49846 u64 elapsed_csecs64;
@@ -49835,9 +49880,9 @@ diff -urNp linux-2.6.32.16/kernel/power/process.c linux-2.6.32.16/kernel/power/p
49835 49880
49836 do_gettimeofday(&end); 49881 do_gettimeofday(&end);
49837 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); 49882 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
49838diff -urNp linux-2.6.32.16/kernel/power/suspend.c linux-2.6.32.16/kernel/power/suspend.c 49883diff -urNp linux-2.6.32.18/kernel/power/suspend.c linux-2.6.32.18/kernel/power/suspend.c
49839--- linux-2.6.32.16/kernel/power/suspend.c 2010-07-05 14:14:00.000000000 -0400 49884--- linux-2.6.32.18/kernel/power/suspend.c 2010-08-10 13:45:57.000000000 -0400
49840+++ linux-2.6.32.16/kernel/power/suspend.c 2010-07-09 14:50:38.000000000 -0400 49885+++ linux-2.6.32.18/kernel/power/suspend.c 2010-08-11 18:57:32.000000000 -0400
49841@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M 49886@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
49842 [PM_SUSPEND_MEM] = "mem", 49887 [PM_SUSPEND_MEM] = "mem",
49843 }; 49888 };
@@ -49854,9 +49899,9 @@ diff -urNp linux-2.6.32.16/kernel/power/suspend.c linux-2.6.32.16/kernel/power/s
49854 { 49899 {
49855 mutex_lock(&pm_mutex); 49900 mutex_lock(&pm_mutex);
49856 suspend_ops = ops; 49901 suspend_ops = ops;
49857diff -urNp linux-2.6.32.16/kernel/printk.c linux-2.6.32.16/kernel/printk.c 49902diff -urNp linux-2.6.32.18/kernel/printk.c linux-2.6.32.18/kernel/printk.c
49858--- linux-2.6.32.16/kernel/printk.c 2010-07-05 14:14:00.000000000 -0400 49903--- linux-2.6.32.18/kernel/printk.c 2010-08-10 13:45:57.000000000 -0400
49859+++ linux-2.6.32.16/kernel/printk.c 2010-07-09 14:50:38.000000000 -0400 49904+++ linux-2.6.32.18/kernel/printk.c 2010-08-11 18:57:32.000000000 -0400
49860@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf 49905@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
49861 char c; 49906 char c;
49862 int error = 0; 49907 int error = 0;
@@ -49869,9 +49914,9 @@ diff -urNp linux-2.6.32.16/kernel/printk.c linux-2.6.32.16/kernel/printk.c
49869 error = security_syslog(type); 49914 error = security_syslog(type);
49870 if (error) 49915 if (error)
49871 return error; 49916 return error;
49872diff -urNp linux-2.6.32.16/kernel/ptrace.c linux-2.6.32.16/kernel/ptrace.c 49917diff -urNp linux-2.6.32.18/kernel/ptrace.c linux-2.6.32.18/kernel/ptrace.c
49873--- linux-2.6.32.16/kernel/ptrace.c 2010-07-05 14:14:00.000000000 -0400 49918--- linux-2.6.32.18/kernel/ptrace.c 2010-08-10 13:45:57.000000000 -0400
49874+++ linux-2.6.32.16/kernel/ptrace.c 2010-07-09 14:50:38.000000000 -0400 49919+++ linux-2.6.32.18/kernel/ptrace.c 2010-08-11 18:57:32.000000000 -0400
49875@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru 49920@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
49876 cred->gid != tcred->egid || 49921 cred->gid != tcred->egid ||
49877 cred->gid != tcred->sgid || 49922 cred->gid != tcred->sgid ||
@@ -49953,9 +49998,9 @@ diff -urNp linux-2.6.32.16/kernel/ptrace.c linux-2.6.32.16/kernel/ptrace.c
49953 } 49998 }
49954 49999
49955 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) 50000 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
49956diff -urNp linux-2.6.32.16/kernel/rcutree.c linux-2.6.32.16/kernel/rcutree.c 50001diff -urNp linux-2.6.32.18/kernel/rcutree.c linux-2.6.32.18/kernel/rcutree.c
49957--- linux-2.6.32.16/kernel/rcutree.c 2010-07-05 14:14:00.000000000 -0400 50002--- linux-2.6.32.18/kernel/rcutree.c 2010-08-10 13:45:57.000000000 -0400
49958+++ linux-2.6.32.16/kernel/rcutree.c 2010-07-09 14:50:38.000000000 -0400 50003+++ linux-2.6.32.18/kernel/rcutree.c 2010-08-11 18:57:32.000000000 -0400
49959@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state 50004@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
49960 /* 50005 /*
49961 * Do softirq processing for the current CPU. 50006 * Do softirq processing for the current CPU.
@@ -49965,9 +50010,9 @@ diff -urNp linux-2.6.32.16/kernel/rcutree.c linux-2.6.32.16/kernel/rcutree.c
49965 { 50010 {
49966 /* 50011 /*
49967 * Memory references from any prior RCU read-side critical sections 50012 * Memory references from any prior RCU read-side critical sections
49968diff -urNp linux-2.6.32.16/kernel/relay.c linux-2.6.32.16/kernel/relay.c 50013diff -urNp linux-2.6.32.18/kernel/relay.c linux-2.6.32.18/kernel/relay.c
49969--- linux-2.6.32.16/kernel/relay.c 2010-07-05 14:14:00.000000000 -0400 50014--- linux-2.6.32.18/kernel/relay.c 2010-08-10 13:45:57.000000000 -0400
49970+++ linux-2.6.32.16/kernel/relay.c 2010-07-09 14:50:38.000000000 -0400 50015+++ linux-2.6.32.18/kernel/relay.c 2010-08-11 18:57:32.000000000 -0400
49971@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi 50016@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi
49972 return 0; 50017 return 0;
49973 50018
@@ -49977,9 +50022,9 @@ diff -urNp linux-2.6.32.16/kernel/relay.c linux-2.6.32.16/kernel/relay.c
49977 return ret; 50022 return ret;
49978 50023
49979 if (read_start + ret == nonpad_end) 50024 if (read_start + ret == nonpad_end)
49980diff -urNp linux-2.6.32.16/kernel/resource.c linux-2.6.32.16/kernel/resource.c 50025diff -urNp linux-2.6.32.18/kernel/resource.c linux-2.6.32.18/kernel/resource.c
49981--- linux-2.6.32.16/kernel/resource.c 2010-07-05 14:14:00.000000000 -0400 50026--- linux-2.6.32.18/kernel/resource.c 2010-08-10 13:45:57.000000000 -0400
49982+++ linux-2.6.32.16/kernel/resource.c 2010-07-09 14:50:38.000000000 -0400 50027+++ linux-2.6.32.18/kernel/resource.c 2010-08-11 18:57:32.000000000 -0400
49983@@ -132,8 +132,18 @@ static const struct file_operations proc 50028@@ -132,8 +132,18 @@ static const struct file_operations proc
49984 50029
49985 static int __init ioresources_init(void) 50030 static int __init ioresources_init(void)
@@ -49999,10 +50044,10 @@ diff -urNp linux-2.6.32.16/kernel/resource.c linux-2.6.32.16/kernel/resource.c
49999 return 0; 50044 return 0;
50000 } 50045 }
50001 __initcall(ioresources_init); 50046 __initcall(ioresources_init);
50002diff -urNp linux-2.6.32.16/kernel/sched.c linux-2.6.32.16/kernel/sched.c 50047diff -urNp linux-2.6.32.18/kernel/sched.c linux-2.6.32.18/kernel/sched.c
50003--- linux-2.6.32.16/kernel/sched.c 2010-07-05 14:14:00.000000000 -0400 50048--- linux-2.6.32.18/kernel/sched.c 2010-08-10 13:45:57.000000000 -0400
50004+++ linux-2.6.32.16/kernel/sched.c 2010-07-09 14:50:38.000000000 -0400 50049+++ linux-2.6.32.18/kernel/sched.c 2010-08-11 18:57:32.000000000 -0400
50005@@ -4841,7 +4841,7 @@ out: 50050@@ -4848,7 +4848,7 @@ out:
50006 * In CONFIG_NO_HZ case, the idle load balance owner will do the 50051 * In CONFIG_NO_HZ case, the idle load balance owner will do the
50007 * rebalancing for all the cpus for whom scheduler ticks are stopped. 50052 * rebalancing for all the cpus for whom scheduler ticks are stopped.
50008 */ 50053 */
@@ -50011,7 +50056,7 @@ diff -urNp linux-2.6.32.16/kernel/sched.c linux-2.6.32.16/kernel/sched.c
50011 { 50056 {
50012 int this_cpu = smp_processor_id(); 50057 int this_cpu = smp_processor_id();
50013 struct rq *this_rq = cpu_rq(this_cpu); 50058 struct rq *this_rq = cpu_rq(this_cpu);
50014@@ -6110,6 +6110,8 @@ int can_nice(const struct task_struct *p 50059@@ -6117,6 +6117,8 @@ int can_nice(const struct task_struct *p
50015 /* convert nice value [19,-20] to rlimit style value [1,40] */ 50060 /* convert nice value [19,-20] to rlimit style value [1,40] */
50016 int nice_rlim = 20 - nice; 50061 int nice_rlim = 20 - nice;
50017 50062
@@ -50020,7 +50065,7 @@ diff -urNp linux-2.6.32.16/kernel/sched.c linux-2.6.32.16/kernel/sched.c
50020 return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || 50065 return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
50021 capable(CAP_SYS_NICE)); 50066 capable(CAP_SYS_NICE));
50022 } 50067 }
50023@@ -6143,7 +6145,8 @@ SYSCALL_DEFINE1(nice, int, increment) 50068@@ -6150,7 +6152,8 @@ SYSCALL_DEFINE1(nice, int, increment)
50024 if (nice > 19) 50069 if (nice > 19)
50025 nice = 19; 50070 nice = 19;
50026 50071
@@ -50030,7 +50075,7 @@ diff -urNp linux-2.6.32.16/kernel/sched.c linux-2.6.32.16/kernel/sched.c
50030 return -EPERM; 50075 return -EPERM;
50031 50076
50032 retval = security_task_setnice(current, nice); 50077 retval = security_task_setnice(current, nice);
50033@@ -7452,7 +7455,7 @@ static struct ctl_table sd_ctl_dir[] = { 50078@@ -7459,7 +7462,7 @@ static struct ctl_table sd_ctl_dir[] = {
50034 .procname = "sched_domain", 50079 .procname = "sched_domain",
50035 .mode = 0555, 50080 .mode = 0555,
50036 }, 50081 },
@@ -50039,7 +50084,7 @@ diff -urNp linux-2.6.32.16/kernel/sched.c linux-2.6.32.16/kernel/sched.c
50039 }; 50084 };
50040 50085
50041 static struct ctl_table sd_ctl_root[] = { 50086 static struct ctl_table sd_ctl_root[] = {
50042@@ -7462,7 +7465,7 @@ static struct ctl_table sd_ctl_root[] = 50087@@ -7469,7 +7472,7 @@ static struct ctl_table sd_ctl_root[] =
50043 .mode = 0555, 50088 .mode = 0555,
50044 .child = sd_ctl_dir, 50089 .child = sd_ctl_dir,
50045 }, 50090 },
@@ -50048,9 +50093,9 @@ diff -urNp linux-2.6.32.16/kernel/sched.c linux-2.6.32.16/kernel/sched.c
50048 }; 50093 };
50049 50094
50050 static struct ctl_table *sd_alloc_ctl_entry(int n) 50095 static struct ctl_table *sd_alloc_ctl_entry(int n)
50051diff -urNp linux-2.6.32.16/kernel/signal.c linux-2.6.32.16/kernel/signal.c 50096diff -urNp linux-2.6.32.18/kernel/signal.c linux-2.6.32.18/kernel/signal.c
50052--- linux-2.6.32.16/kernel/signal.c 2010-07-05 14:14:00.000000000 -0400 50097--- linux-2.6.32.18/kernel/signal.c 2010-08-10 13:45:57.000000000 -0400
50053+++ linux-2.6.32.16/kernel/signal.c 2010-07-09 14:50:38.000000000 -0400 50098+++ linux-2.6.32.18/kernel/signal.c 2010-08-11 18:57:32.000000000 -0400
50054@@ -41,12 +41,12 @@ 50099@@ -41,12 +41,12 @@
50055 50100
50056 static struct kmem_cache *sigqueue_cachep; 50101 static struct kmem_cache *sigqueue_cachep;
@@ -50136,9 +50181,9 @@ diff -urNp linux-2.6.32.16/kernel/signal.c linux-2.6.32.16/kernel/signal.c
50136 50181
50137 return ret; 50182 return ret;
50138 } 50183 }
50139diff -urNp linux-2.6.32.16/kernel/smp.c linux-2.6.32.16/kernel/smp.c 50184diff -urNp linux-2.6.32.18/kernel/smp.c linux-2.6.32.18/kernel/smp.c
50140--- linux-2.6.32.16/kernel/smp.c 2010-07-05 14:14:00.000000000 -0400 50185--- linux-2.6.32.18/kernel/smp.c 2010-08-10 13:45:57.000000000 -0400
50141+++ linux-2.6.32.16/kernel/smp.c 2010-07-09 14:50:38.000000000 -0400 50186+++ linux-2.6.32.18/kernel/smp.c 2010-08-11 18:57:32.000000000 -0400
50142@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void 50187@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void
50143 } 50188 }
50144 EXPORT_SYMBOL(smp_call_function); 50189 EXPORT_SYMBOL(smp_call_function);
@@ -50166,9 +50211,9 @@ diff -urNp linux-2.6.32.16/kernel/smp.c linux-2.6.32.16/kernel/smp.c
50166 { 50211 {
50167 spin_unlock_irq(&call_function.lock); 50212 spin_unlock_irq(&call_function.lock);
50168 } 50213 }
50169diff -urNp linux-2.6.32.16/kernel/softirq.c linux-2.6.32.16/kernel/softirq.c 50214diff -urNp linux-2.6.32.18/kernel/softirq.c linux-2.6.32.18/kernel/softirq.c
50170--- linux-2.6.32.16/kernel/softirq.c 2010-07-05 14:14:00.000000000 -0400 50215--- linux-2.6.32.18/kernel/softirq.c 2010-08-10 13:45:57.000000000 -0400
50171+++ linux-2.6.32.16/kernel/softirq.c 2010-07-09 14:50:38.000000000 -0400 50216+++ linux-2.6.32.18/kernel/softirq.c 2010-08-11 18:57:32.000000000 -0400
50172@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec 50217@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
50173 50218
50174 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); 50219 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -50223,9 +50268,9 @@ diff -urNp linux-2.6.32.16/kernel/softirq.c linux-2.6.32.16/kernel/softirq.c
50223 { 50268 {
50224 struct tasklet_struct *list; 50269 struct tasklet_struct *list;
50225 50270
50226diff -urNp linux-2.6.32.16/kernel/sys.c linux-2.6.32.16/kernel/sys.c 50271diff -urNp linux-2.6.32.18/kernel/sys.c linux-2.6.32.18/kernel/sys.c
50227--- linux-2.6.32.16/kernel/sys.c 2010-07-05 14:14:00.000000000 -0400 50272--- linux-2.6.32.18/kernel/sys.c 2010-08-10 13:45:57.000000000 -0400
50228+++ linux-2.6.32.16/kernel/sys.c 2010-07-09 14:50:38.000000000 -0400 50273+++ linux-2.6.32.18/kernel/sys.c 2010-08-11 18:57:32.000000000 -0400
50229@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru 50274@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
50230 error = -EACCES; 50275 error = -EACCES;
50231 goto out; 50276 goto out;
@@ -50361,9 +50406,9 @@ diff -urNp linux-2.6.32.16/kernel/sys.c linux-2.6.32.16/kernel/sys.c
50361 error = -EINVAL; 50406 error = -EINVAL;
50362 break; 50407 break;
50363 } 50408 }
50364diff -urNp linux-2.6.32.16/kernel/sysctl.c linux-2.6.32.16/kernel/sysctl.c 50409diff -urNp linux-2.6.32.18/kernel/sysctl.c linux-2.6.32.18/kernel/sysctl.c
50365--- linux-2.6.32.16/kernel/sysctl.c 2010-07-05 14:14:00.000000000 -0400 50410--- linux-2.6.32.18/kernel/sysctl.c 2010-08-10 13:45:57.000000000 -0400
50366+++ linux-2.6.32.16/kernel/sysctl.c 2010-07-09 14:50:38.000000000 -0400 50411+++ linux-2.6.32.18/kernel/sysctl.c 2010-08-11 18:57:32.000000000 -0400
50367@@ -63,6 +63,13 @@ 50412@@ -63,6 +63,13 @@
50368 static int deprecated_sysctl_warning(struct __sysctl_args *args); 50413 static int deprecated_sysctl_warning(struct __sysctl_args *args);
50369 50414
@@ -50485,9 +50530,9 @@ diff -urNp linux-2.6.32.16/kernel/sysctl.c linux-2.6.32.16/kernel/sysctl.c
50485 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); 50530 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
50486 if (error) 50531 if (error)
50487 return error; 50532 return error;
50488diff -urNp linux-2.6.32.16/kernel/taskstats.c linux-2.6.32.16/kernel/taskstats.c 50533diff -urNp linux-2.6.32.18/kernel/taskstats.c linux-2.6.32.18/kernel/taskstats.c
50489--- linux-2.6.32.16/kernel/taskstats.c 2010-07-05 14:14:00.000000000 -0400 50534--- linux-2.6.32.18/kernel/taskstats.c 2010-08-10 13:45:57.000000000 -0400
50490+++ linux-2.6.32.16/kernel/taskstats.c 2010-07-09 14:50:38.000000000 -0400 50535+++ linux-2.6.32.18/kernel/taskstats.c 2010-08-11 18:57:32.000000000 -0400
50491@@ -26,9 +26,12 @@ 50536@@ -26,9 +26,12 @@
50492 #include <linux/cgroup.h> 50537 #include <linux/cgroup.h>
50493 #include <linux/fs.h> 50538 #include <linux/fs.h>
@@ -50511,9 +50556,9 @@ diff -urNp linux-2.6.32.16/kernel/taskstats.c linux-2.6.32.16/kernel/taskstats.c
50511 if (!alloc_cpumask_var(&mask, GFP_KERNEL)) 50556 if (!alloc_cpumask_var(&mask, GFP_KERNEL))
50512 return -ENOMEM; 50557 return -ENOMEM;
50513 50558
50514diff -urNp linux-2.6.32.16/kernel/time/tick-broadcast.c linux-2.6.32.16/kernel/time/tick-broadcast.c 50559diff -urNp linux-2.6.32.18/kernel/time/tick-broadcast.c linux-2.6.32.18/kernel/time/tick-broadcast.c
50515--- linux-2.6.32.16/kernel/time/tick-broadcast.c 2010-07-05 14:14:00.000000000 -0400 50560--- linux-2.6.32.18/kernel/time/tick-broadcast.c 2010-08-10 13:45:57.000000000 -0400
50516+++ linux-2.6.32.16/kernel/time/tick-broadcast.c 2010-07-09 14:50:38.000000000 -0400 50561+++ linux-2.6.32.18/kernel/time/tick-broadcast.c 2010-08-11 18:57:32.000000000 -0400
50517@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl 50562@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
50518 * then clear the broadcast bit. 50563 * then clear the broadcast bit.
50519 */ 50564 */
@@ -50523,9 +50568,9 @@ diff -urNp linux-2.6.32.16/kernel/time/tick-broadcast.c linux-2.6.32.16/kernel/t
50523 50568
50524 cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); 50569 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
50525 tick_broadcast_clear_oneshot(cpu); 50570 tick_broadcast_clear_oneshot(cpu);
50526diff -urNp linux-2.6.32.16/kernel/time.c linux-2.6.32.16/kernel/time.c 50571diff -urNp linux-2.6.32.18/kernel/time.c linux-2.6.32.18/kernel/time.c
50527--- linux-2.6.32.16/kernel/time.c 2010-07-05 14:14:00.000000000 -0400 50572--- linux-2.6.32.18/kernel/time.c 2010-08-10 13:45:57.000000000 -0400
50528+++ linux-2.6.32.16/kernel/time.c 2010-07-09 14:50:38.000000000 -0400 50573+++ linux-2.6.32.18/kernel/time.c 2010-08-11 18:57:32.000000000 -0400
50529@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, 50574@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *,
50530 return err; 50575 return err;
50531 50576
@@ -50563,9 +50608,9 @@ diff -urNp linux-2.6.32.16/kernel/time.c linux-2.6.32.16/kernel/time.c
50563 { 50608 {
50564 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) 50609 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
50565 return (USEC_PER_SEC / HZ) * j; 50610 return (USEC_PER_SEC / HZ) * j;
50566diff -urNp linux-2.6.32.16/kernel/timer.c linux-2.6.32.16/kernel/timer.c 50611diff -urNp linux-2.6.32.18/kernel/timer.c linux-2.6.32.18/kernel/timer.c
50567--- linux-2.6.32.16/kernel/timer.c 2010-07-05 14:14:00.000000000 -0400 50612--- linux-2.6.32.18/kernel/timer.c 2010-08-10 13:45:57.000000000 -0400
50568+++ linux-2.6.32.16/kernel/timer.c 2010-07-09 14:50:38.000000000 -0400 50613+++ linux-2.6.32.18/kernel/timer.c 2010-08-11 18:57:32.000000000 -0400
50569@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) 50614@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick)
50570 /* 50615 /*
50571 * This function runs timers and the timer-tq in bottom half context. 50616 * This function runs timers and the timer-tq in bottom half context.
@@ -50575,9 +50620,9 @@ diff -urNp linux-2.6.32.16/kernel/timer.c linux-2.6.32.16/kernel/timer.c
50575 { 50620 {
50576 struct tvec_base *base = __get_cpu_var(tvec_bases); 50621 struct tvec_base *base = __get_cpu_var(tvec_bases);
50577 50622
50578diff -urNp linux-2.6.32.16/kernel/trace/ftrace.c linux-2.6.32.16/kernel/trace/ftrace.c 50623diff -urNp linux-2.6.32.18/kernel/trace/ftrace.c linux-2.6.32.18/kernel/trace/ftrace.c
50579--- linux-2.6.32.16/kernel/trace/ftrace.c 2010-07-05 14:14:00.000000000 -0400 50624--- linux-2.6.32.18/kernel/trace/ftrace.c 2010-08-10 13:45:57.000000000 -0400
50580+++ linux-2.6.32.16/kernel/trace/ftrace.c 2010-07-09 14:50:38.000000000 -0400 50625+++ linux-2.6.32.18/kernel/trace/ftrace.c 2010-08-11 18:57:32.000000000 -0400
50581@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, 50626@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod,
50582 50627
50583 ip = rec->ip; 50628 ip = rec->ip;
@@ -50599,9 +50644,9 @@ diff -urNp linux-2.6.32.16/kernel/trace/ftrace.c linux-2.6.32.16/kernel/trace/ft
50599 } 50644 }
50600 50645
50601 /* 50646 /*
50602diff -urNp linux-2.6.32.16/kernel/trace/Kconfig linux-2.6.32.16/kernel/trace/Kconfig 50647diff -urNp linux-2.6.32.18/kernel/trace/Kconfig linux-2.6.32.18/kernel/trace/Kconfig
50603--- linux-2.6.32.16/kernel/trace/Kconfig 2010-07-05 14:14:00.000000000 -0400 50648--- linux-2.6.32.18/kernel/trace/Kconfig 2010-08-10 13:45:57.000000000 -0400
50604+++ linux-2.6.32.16/kernel/trace/Kconfig 2010-07-09 14:50:38.000000000 -0400 50649+++ linux-2.6.32.18/kernel/trace/Kconfig 2010-08-11 18:57:32.000000000 -0400
50605@@ -126,6 +126,7 @@ if FTRACE 50650@@ -126,6 +126,7 @@ if FTRACE
50606 config FUNCTION_TRACER 50651 config FUNCTION_TRACER
50607 bool "Kernel Function Tracer" 50652 bool "Kernel Function Tracer"
@@ -50618,9 +50663,9 @@ diff -urNp linux-2.6.32.16/kernel/trace/Kconfig linux-2.6.32.16/kernel/trace/Kco
50618 select FUNCTION_TRACER 50663 select FUNCTION_TRACER
50619 select STACKTRACE 50664 select STACKTRACE
50620 select KALLSYMS 50665 select KALLSYMS
50621diff -urNp linux-2.6.32.16/kernel/trace/ring_buffer.c linux-2.6.32.16/kernel/trace/ring_buffer.c 50666diff -urNp linux-2.6.32.18/kernel/trace/ring_buffer.c linux-2.6.32.18/kernel/trace/ring_buffer.c
50622--- linux-2.6.32.16/kernel/trace/ring_buffer.c 2010-07-05 14:14:00.000000000 -0400 50667--- linux-2.6.32.18/kernel/trace/ring_buffer.c 2010-08-10 13:45:57.000000000 -0400
50623+++ linux-2.6.32.16/kernel/trace/ring_buffer.c 2010-07-09 14:50:38.000000000 -0400 50668+++ linux-2.6.32.18/kernel/trace/ring_buffer.c 2010-08-11 18:57:32.000000000 -0400
50624@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st 50669@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st
50625 * the reader page). But if the next page is a header page, 50670 * the reader page). But if the next page is a header page,
50626 * its flags will be non zero. 50671 * its flags will be non zero.
@@ -50630,9 +50675,9 @@ diff -urNp linux-2.6.32.16/kernel/trace/ring_buffer.c linux-2.6.32.16/kernel/tra
50630 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, 50675 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
50631 struct buffer_page *page, struct list_head *list) 50676 struct buffer_page *page, struct list_head *list)
50632 { 50677 {
50633diff -urNp linux-2.6.32.16/kernel/trace/trace.c linux-2.6.32.16/kernel/trace/trace.c 50678diff -urNp linux-2.6.32.18/kernel/trace/trace.c linux-2.6.32.18/kernel/trace/trace.c
50634--- linux-2.6.32.16/kernel/trace/trace.c 2010-07-05 14:14:00.000000000 -0400 50679--- linux-2.6.32.18/kernel/trace/trace.c 2010-08-10 13:45:57.000000000 -0400
50635+++ linux-2.6.32.16/kernel/trace/trace.c 2010-07-09 14:50:38.000000000 -0400 50680+++ linux-2.6.32.18/kernel/trace/trace.c 2010-08-11 18:57:32.000000000 -0400
50636@@ -3808,10 +3808,9 @@ static const struct file_operations trac 50681@@ -3808,10 +3808,9 @@ static const struct file_operations trac
50637 }; 50682 };
50638 #endif 50683 #endif
@@ -50657,9 +50702,9 @@ diff -urNp linux-2.6.32.16/kernel/trace/trace.c linux-2.6.32.16/kernel/trace/tra
50657 static int once; 50702 static int once;
50658 struct dentry *d_tracer; 50703 struct dentry *d_tracer;
50659 50704
50660diff -urNp linux-2.6.32.16/kernel/trace/trace_events.c linux-2.6.32.16/kernel/trace/trace_events.c 50705diff -urNp linux-2.6.32.18/kernel/trace/trace_events.c linux-2.6.32.18/kernel/trace/trace_events.c
50661--- linux-2.6.32.16/kernel/trace/trace_events.c 2010-07-05 14:14:00.000000000 -0400 50706--- linux-2.6.32.18/kernel/trace/trace_events.c 2010-08-10 13:45:57.000000000 -0400
50662+++ linux-2.6.32.16/kernel/trace/trace_events.c 2010-07-09 14:50:38.000000000 -0400 50707+++ linux-2.6.32.18/kernel/trace/trace_events.c 2010-08-11 18:57:32.000000000 -0400
50663@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list 50708@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
50664 * Modules must own their file_operations to keep up with 50709 * Modules must own their file_operations to keep up with
50665 * reference counting. 50710 * reference counting.
@@ -50669,9 +50714,9 @@ diff -urNp linux-2.6.32.16/kernel/trace/trace_events.c linux-2.6.32.16/kernel/tr
50669 struct ftrace_module_file_ops { 50714 struct ftrace_module_file_ops {
50670 struct list_head list; 50715 struct list_head list;
50671 struct module *mod; 50716 struct module *mod;
50672diff -urNp linux-2.6.32.16/kernel/trace/trace_output.c linux-2.6.32.16/kernel/trace/trace_output.c 50717diff -urNp linux-2.6.32.18/kernel/trace/trace_output.c linux-2.6.32.18/kernel/trace/trace_output.c
50673--- linux-2.6.32.16/kernel/trace/trace_output.c 2010-07-05 14:14:00.000000000 -0400 50718--- linux-2.6.32.18/kernel/trace/trace_output.c 2010-08-10 13:45:57.000000000 -0400
50674+++ linux-2.6.32.16/kernel/trace/trace_output.c 2010-07-09 14:50:38.000000000 -0400 50719+++ linux-2.6.32.18/kernel/trace/trace_output.c 2010-08-11 18:57:32.000000000 -0400
50675@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, 50720@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
50676 return 0; 50721 return 0;
50677 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); 50722 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -50681,9 +50726,9 @@ diff -urNp linux-2.6.32.16/kernel/trace/trace_output.c linux-2.6.32.16/kernel/tr
50681 if (p) { 50726 if (p) {
50682 s->len = p - s->buffer; 50727 s->len = p - s->buffer;
50683 return 1; 50728 return 1;
50684diff -urNp linux-2.6.32.16/kernel/trace/trace_stack.c linux-2.6.32.16/kernel/trace/trace_stack.c 50729diff -urNp linux-2.6.32.18/kernel/trace/trace_stack.c linux-2.6.32.18/kernel/trace/trace_stack.c
50685--- linux-2.6.32.16/kernel/trace/trace_stack.c 2010-07-05 14:14:00.000000000 -0400 50730--- linux-2.6.32.18/kernel/trace/trace_stack.c 2010-08-10 13:45:57.000000000 -0400
50686+++ linux-2.6.32.16/kernel/trace/trace_stack.c 2010-07-09 14:50:38.000000000 -0400 50731+++ linux-2.6.32.18/kernel/trace/trace_stack.c 2010-08-11 18:57:32.000000000 -0400
50687@@ -50,7 +50,7 @@ static inline void check_stack(void) 50732@@ -50,7 +50,7 @@ static inline void check_stack(void)
50688 return; 50733 return;
50689 50734
@@ -50693,9 +50738,9 @@ diff -urNp linux-2.6.32.16/kernel/trace/trace_stack.c linux-2.6.32.16/kernel/tra
50693 return; 50738 return;
50694 50739
50695 local_irq_save(flags); 50740 local_irq_save(flags);
50696diff -urNp linux-2.6.32.16/kernel/utsname_sysctl.c linux-2.6.32.16/kernel/utsname_sysctl.c 50741diff -urNp linux-2.6.32.18/kernel/utsname_sysctl.c linux-2.6.32.18/kernel/utsname_sysctl.c
50697--- linux-2.6.32.16/kernel/utsname_sysctl.c 2010-07-05 14:14:00.000000000 -0400 50742--- linux-2.6.32.18/kernel/utsname_sysctl.c 2010-08-10 13:45:57.000000000 -0400
50698+++ linux-2.6.32.16/kernel/utsname_sysctl.c 2010-07-09 14:50:38.000000000 -0400 50743+++ linux-2.6.32.18/kernel/utsname_sysctl.c 2010-08-11 18:57:32.000000000 -0400
50699@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] 50744@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
50700 .proc_handler = proc_do_uts_string, 50745 .proc_handler = proc_do_uts_string,
50701 .strategy = sysctl_uts_string, 50746 .strategy = sysctl_uts_string,
@@ -50714,9 +50759,9 @@ diff -urNp linux-2.6.32.16/kernel/utsname_sysctl.c linux-2.6.32.16/kernel/utsnam
50714 }; 50759 };
50715 50760
50716 static int __init utsname_sysctl_init(void) 50761 static int __init utsname_sysctl_init(void)
50717diff -urNp linux-2.6.32.16/lib/bug.c linux-2.6.32.16/lib/bug.c 50762diff -urNp linux-2.6.32.18/lib/bug.c linux-2.6.32.18/lib/bug.c
50718--- linux-2.6.32.16/lib/bug.c 2010-07-05 14:14:00.000000000 -0400 50763--- linux-2.6.32.18/lib/bug.c 2010-08-10 13:45:57.000000000 -0400
50719+++ linux-2.6.32.16/lib/bug.c 2010-07-09 14:50:38.000000000 -0400 50764+++ linux-2.6.32.18/lib/bug.c 2010-08-11 18:57:32.000000000 -0400
50720@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l 50765@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
50721 return BUG_TRAP_TYPE_NONE; 50766 return BUG_TRAP_TYPE_NONE;
50722 50767
@@ -50726,9 +50771,9 @@ diff -urNp linux-2.6.32.16/lib/bug.c linux-2.6.32.16/lib/bug.c
50726 50771
50727 printk(KERN_EMERG "------------[ cut here ]------------\n"); 50772 printk(KERN_EMERG "------------[ cut here ]------------\n");
50728 50773
50729diff -urNp linux-2.6.32.16/lib/debugobjects.c linux-2.6.32.16/lib/debugobjects.c 50774diff -urNp linux-2.6.32.18/lib/debugobjects.c linux-2.6.32.18/lib/debugobjects.c
50730--- linux-2.6.32.16/lib/debugobjects.c 2010-07-05 14:14:00.000000000 -0400 50775--- linux-2.6.32.18/lib/debugobjects.c 2010-08-10 13:45:57.000000000 -0400
50731+++ linux-2.6.32.16/lib/debugobjects.c 2010-07-09 14:50:38.000000000 -0400 50776+++ linux-2.6.32.18/lib/debugobjects.c 2010-08-11 18:57:32.000000000 -0400
50732@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi 50777@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
50733 if (limit > 4) 50778 if (limit > 4)
50734 return; 50779 return;
@@ -50738,9 +50783,9 @@ diff -urNp linux-2.6.32.16/lib/debugobjects.c linux-2.6.32.16/lib/debugobjects.c
50738 if (is_on_stack == onstack) 50783 if (is_on_stack == onstack)
50739 return; 50784 return;
50740 50785
50741diff -urNp linux-2.6.32.16/lib/dma-debug.c linux-2.6.32.16/lib/dma-debug.c 50786diff -urNp linux-2.6.32.18/lib/dma-debug.c linux-2.6.32.18/lib/dma-debug.c
50742--- linux-2.6.32.16/lib/dma-debug.c 2010-07-05 14:14:00.000000000 -0400 50787--- linux-2.6.32.18/lib/dma-debug.c 2010-08-10 13:45:57.000000000 -0400
50743+++ linux-2.6.32.16/lib/dma-debug.c 2010-07-09 14:50:38.000000000 -0400 50788+++ linux-2.6.32.18/lib/dma-debug.c 2010-08-11 18:57:32.000000000 -0400
50744@@ -861,7 +861,7 @@ out: 50789@@ -861,7 +861,7 @@ out:
50745 50790
50746 static void check_for_stack(struct device *dev, void *addr) 50791 static void check_for_stack(struct device *dev, void *addr)
@@ -50750,9 +50795,9 @@ diff -urNp linux-2.6.32.16/lib/dma-debug.c linux-2.6.32.16/lib/dma-debug.c
50750 err_printk(dev, NULL, "DMA-API: device driver maps memory from" 50795 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
50751 "stack [addr=%p]\n", addr); 50796 "stack [addr=%p]\n", addr);
50752 } 50797 }
50753diff -urNp linux-2.6.32.16/lib/idr.c linux-2.6.32.16/lib/idr.c 50798diff -urNp linux-2.6.32.18/lib/idr.c linux-2.6.32.18/lib/idr.c
50754--- linux-2.6.32.16/lib/idr.c 2010-07-05 14:14:00.000000000 -0400 50799--- linux-2.6.32.18/lib/idr.c 2010-08-10 13:45:57.000000000 -0400
50755+++ linux-2.6.32.16/lib/idr.c 2010-07-09 14:50:38.000000000 -0400 50800+++ linux-2.6.32.18/lib/idr.c 2010-08-11 18:57:32.000000000 -0400
50756@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in 50801@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
50757 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; 50802 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
50758 50803
@@ -50762,9 +50807,9 @@ diff -urNp linux-2.6.32.16/lib/idr.c linux-2.6.32.16/lib/idr.c
50762 *starting_id = id; 50807 *starting_id = id;
50763 return IDR_NEED_TO_GROW; 50808 return IDR_NEED_TO_GROW;
50764 } 50809 }
50765diff -urNp linux-2.6.32.16/lib/inflate.c linux-2.6.32.16/lib/inflate.c 50810diff -urNp linux-2.6.32.18/lib/inflate.c linux-2.6.32.18/lib/inflate.c
50766--- linux-2.6.32.16/lib/inflate.c 2010-07-05 14:14:00.000000000 -0400 50811--- linux-2.6.32.18/lib/inflate.c 2010-08-10 13:45:57.000000000 -0400
50767+++ linux-2.6.32.16/lib/inflate.c 2010-07-09 14:50:38.000000000 -0400 50812+++ linux-2.6.32.18/lib/inflate.c 2010-08-11 18:57:32.000000000 -0400
50768@@ -266,7 +266,7 @@ static void free(void *where) 50813@@ -266,7 +266,7 @@ static void free(void *where)
50769 malloc_ptr = free_mem_ptr; 50814 malloc_ptr = free_mem_ptr;
50770 } 50815 }
@@ -50774,9 +50819,9 @@ diff -urNp linux-2.6.32.16/lib/inflate.c linux-2.6.32.16/lib/inflate.c
50774 #define free(a) kfree(a) 50819 #define free(a) kfree(a)
50775 #endif 50820 #endif
50776 50821
50777diff -urNp linux-2.6.32.16/lib/Kconfig.debug linux-2.6.32.16/lib/Kconfig.debug 50822diff -urNp linux-2.6.32.18/lib/Kconfig.debug linux-2.6.32.18/lib/Kconfig.debug
50778--- linux-2.6.32.16/lib/Kconfig.debug 2010-07-05 14:14:00.000000000 -0400 50823--- linux-2.6.32.18/lib/Kconfig.debug 2010-08-10 13:45:57.000000000 -0400
50779+++ linux-2.6.32.16/lib/Kconfig.debug 2010-07-09 14:50:38.000000000 -0400 50824+++ linux-2.6.32.18/lib/Kconfig.debug 2010-08-11 18:57:32.000000000 -0400
50780@@ -905,7 +905,7 @@ config LATENCYTOP 50825@@ -905,7 +905,7 @@ config LATENCYTOP
50781 select STACKTRACE 50826 select STACKTRACE
50782 select SCHEDSTATS 50827 select SCHEDSTATS
@@ -50786,9 +50831,9 @@ diff -urNp linux-2.6.32.16/lib/Kconfig.debug linux-2.6.32.16/lib/Kconfig.debug
50786 help 50831 help
50787 Enable this option if you want to use the LatencyTOP tool 50832 Enable this option if you want to use the LatencyTOP tool
50788 to find out which userspace is blocking on what kernel operations. 50833 to find out which userspace is blocking on what kernel operations.
50789diff -urNp linux-2.6.32.16/lib/kobject.c linux-2.6.32.16/lib/kobject.c 50834diff -urNp linux-2.6.32.18/lib/kobject.c linux-2.6.32.18/lib/kobject.c
50790--- linux-2.6.32.16/lib/kobject.c 2010-07-05 14:14:00.000000000 -0400 50835--- linux-2.6.32.18/lib/kobject.c 2010-08-10 13:45:57.000000000 -0400
50791+++ linux-2.6.32.16/lib/kobject.c 2010-07-09 14:50:38.000000000 -0400 50836+++ linux-2.6.32.18/lib/kobject.c 2010-08-11 18:57:32.000000000 -0400
50792@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko 50837@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
50793 return ret; 50838 return ret;
50794 } 50839 }
@@ -50816,9 +50861,9 @@ diff -urNp linux-2.6.32.16/lib/kobject.c linux-2.6.32.16/lib/kobject.c
50816 struct kobject *parent_kobj) 50861 struct kobject *parent_kobj)
50817 { 50862 {
50818 struct kset *kset; 50863 struct kset *kset;
50819diff -urNp linux-2.6.32.16/lib/kobject_uevent.c linux-2.6.32.16/lib/kobject_uevent.c 50864diff -urNp linux-2.6.32.18/lib/kobject_uevent.c linux-2.6.32.18/lib/kobject_uevent.c
50820--- linux-2.6.32.16/lib/kobject_uevent.c 2010-07-05 14:14:00.000000000 -0400 50865--- linux-2.6.32.18/lib/kobject_uevent.c 2010-08-10 13:45:57.000000000 -0400
50821+++ linux-2.6.32.16/lib/kobject_uevent.c 2010-07-09 14:50:38.000000000 -0400 50866+++ linux-2.6.32.18/lib/kobject_uevent.c 2010-08-11 18:57:32.000000000 -0400
50822@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k 50867@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
50823 const char *subsystem; 50868 const char *subsystem;
50824 struct kobject *top_kobj; 50869 struct kobject *top_kobj;
@@ -50828,9 +50873,9 @@ diff -urNp linux-2.6.32.16/lib/kobject_uevent.c linux-2.6.32.16/lib/kobject_ueve
50828 u64 seq; 50873 u64 seq;
50829 int i = 0; 50874 int i = 0;
50830 int retval = 0; 50875 int retval = 0;
50831diff -urNp linux-2.6.32.16/lib/parser.c linux-2.6.32.16/lib/parser.c 50876diff -urNp linux-2.6.32.18/lib/parser.c linux-2.6.32.18/lib/parser.c
50832--- linux-2.6.32.16/lib/parser.c 2010-07-05 14:14:00.000000000 -0400 50877--- linux-2.6.32.18/lib/parser.c 2010-08-10 13:45:57.000000000 -0400
50833+++ linux-2.6.32.16/lib/parser.c 2010-07-09 14:50:38.000000000 -0400 50878+++ linux-2.6.32.18/lib/parser.c 2010-08-11 18:57:32.000000000 -0400
50834@@ -126,7 +126,7 @@ static int match_number(substring_t *s, 50879@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
50835 char *buf; 50880 char *buf;
50836 int ret; 50881 int ret;
@@ -50840,9 +50885,9 @@ diff -urNp linux-2.6.32.16/lib/parser.c linux-2.6.32.16/lib/parser.c
50840 if (!buf) 50885 if (!buf)
50841 return -ENOMEM; 50886 return -ENOMEM;
50842 memcpy(buf, s->from, s->to - s->from); 50887 memcpy(buf, s->from, s->to - s->from);
50843diff -urNp linux-2.6.32.16/lib/radix-tree.c linux-2.6.32.16/lib/radix-tree.c 50888diff -urNp linux-2.6.32.18/lib/radix-tree.c linux-2.6.32.18/lib/radix-tree.c
50844--- linux-2.6.32.16/lib/radix-tree.c 2010-07-05 14:14:00.000000000 -0400 50889--- linux-2.6.32.18/lib/radix-tree.c 2010-08-10 13:45:57.000000000 -0400
50845+++ linux-2.6.32.16/lib/radix-tree.c 2010-07-09 14:50:38.000000000 -0400 50890+++ linux-2.6.32.18/lib/radix-tree.c 2010-08-11 18:57:32.000000000 -0400
50846@@ -81,7 +81,7 @@ struct radix_tree_preload { 50891@@ -81,7 +81,7 @@ struct radix_tree_preload {
50847 int nr; 50892 int nr;
50848 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; 50893 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -50852,9 +50897,9 @@ diff -urNp linux-2.6.32.16/lib/radix-tree.c linux-2.6.32.16/lib/radix-tree.c
50852 50897
50853 static inline gfp_t root_gfp_mask(struct radix_tree_root *root) 50898 static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
50854 { 50899 {
50855diff -urNp linux-2.6.32.16/lib/random32.c linux-2.6.32.16/lib/random32.c 50900diff -urNp linux-2.6.32.18/lib/random32.c linux-2.6.32.18/lib/random32.c
50856--- linux-2.6.32.16/lib/random32.c 2010-07-05 14:14:00.000000000 -0400 50901--- linux-2.6.32.18/lib/random32.c 2010-08-10 13:45:57.000000000 -0400
50857+++ linux-2.6.32.16/lib/random32.c 2010-07-09 14:50:38.000000000 -0400 50902+++ linux-2.6.32.18/lib/random32.c 2010-08-11 18:57:32.000000000 -0400
50858@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * 50903@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
50859 */ 50904 */
50860 static inline u32 __seed(u32 x, u32 m) 50905 static inline u32 __seed(u32 x, u32 m)
@@ -50864,14 +50909,14 @@ diff -urNp linux-2.6.32.16/lib/random32.c linux-2.6.32.16/lib/random32.c
50864 } 50909 }
50865 50910
50866 /** 50911 /**
50867diff -urNp linux-2.6.32.16/localversion-grsec linux-2.6.32.16/localversion-grsec 50912diff -urNp linux-2.6.32.18/localversion-grsec linux-2.6.32.18/localversion-grsec
50868--- linux-2.6.32.16/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 50913--- linux-2.6.32.18/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
50869+++ linux-2.6.32.16/localversion-grsec 2010-07-09 14:50:38.000000000 -0400 50914+++ linux-2.6.32.18/localversion-grsec 2010-08-11 18:57:32.000000000 -0400
50870@@ -0,0 +1 @@ 50915@@ -0,0 +1 @@
50871+-grsec 50916+-grsec
50872diff -urNp linux-2.6.32.16/Makefile linux-2.6.32.16/Makefile 50917diff -urNp linux-2.6.32.18/Makefile linux-2.6.32.18/Makefile
50873--- linux-2.6.32.16/Makefile 2010-07-05 14:14:00.000000000 -0400 50918--- linux-2.6.32.18/Makefile 2010-08-10 13:45:57.000000000 -0400
50874+++ linux-2.6.32.16/Makefile 2010-07-09 14:50:38.000000000 -0400 50919+++ linux-2.6.32.18/Makefile 2010-08-11 18:57:32.000000000 -0400
50875@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" 50920@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
50876 50921
50877 HOSTCC = gcc 50922 HOSTCC = gcc
@@ -50892,9 +50937,9 @@ diff -urNp linux-2.6.32.16/Makefile linux-2.6.32.16/Makefile
50892 50937
50893 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ 50938 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
50894 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ 50939 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
50895diff -urNp linux-2.6.32.16/mm/filemap.c linux-2.6.32.16/mm/filemap.c 50940diff -urNp linux-2.6.32.18/mm/filemap.c linux-2.6.32.18/mm/filemap.c
50896--- linux-2.6.32.16/mm/filemap.c 2010-07-05 14:14:00.000000000 -0400 50941--- linux-2.6.32.18/mm/filemap.c 2010-08-10 13:45:57.000000000 -0400
50897+++ linux-2.6.32.16/mm/filemap.c 2010-07-09 14:50:38.000000000 -0400 50942+++ linux-2.6.32.18/mm/filemap.c 2010-08-11 18:57:32.000000000 -0400
50898@@ -1628,7 +1628,7 @@ int generic_file_mmap(struct file * file 50943@@ -1628,7 +1628,7 @@ int generic_file_mmap(struct file * file
50899 struct address_space *mapping = file->f_mapping; 50944 struct address_space *mapping = file->f_mapping;
50900 50945
@@ -50912,9 +50957,9 @@ diff -urNp linux-2.6.32.16/mm/filemap.c linux-2.6.32.16/mm/filemap.c
50912 if (*pos >= limit) { 50957 if (*pos >= limit) {
50913 send_sig(SIGXFSZ, current, 0); 50958 send_sig(SIGXFSZ, current, 0);
50914 return -EFBIG; 50959 return -EFBIG;
50915diff -urNp linux-2.6.32.16/mm/fremap.c linux-2.6.32.16/mm/fremap.c 50960diff -urNp linux-2.6.32.18/mm/fremap.c linux-2.6.32.18/mm/fremap.c
50916--- linux-2.6.32.16/mm/fremap.c 2010-07-05 14:14:00.000000000 -0400 50961--- linux-2.6.32.18/mm/fremap.c 2010-08-10 13:45:57.000000000 -0400
50917+++ linux-2.6.32.16/mm/fremap.c 2010-07-09 14:50:38.000000000 -0400 50962+++ linux-2.6.32.18/mm/fremap.c 2010-08-11 18:57:32.000000000 -0400
50918@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign 50963@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
50919 retry: 50964 retry:
50920 vma = find_vma(mm, start); 50965 vma = find_vma(mm, start);
@@ -50927,9 +50972,9 @@ diff -urNp linux-2.6.32.16/mm/fremap.c linux-2.6.32.16/mm/fremap.c
50927 /* 50972 /*
50928 * Make sure the vma is shared, that it supports prefaulting, 50973 * Make sure the vma is shared, that it supports prefaulting,
50929 * and that the remapped range is valid and fully within 50974 * and that the remapped range is valid and fully within
50930diff -urNp linux-2.6.32.16/mm/highmem.c linux-2.6.32.16/mm/highmem.c 50975diff -urNp linux-2.6.32.18/mm/highmem.c linux-2.6.32.18/mm/highmem.c
50931--- linux-2.6.32.16/mm/highmem.c 2010-07-05 14:14:00.000000000 -0400 50976--- linux-2.6.32.18/mm/highmem.c 2010-08-10 13:45:57.000000000 -0400
50932+++ linux-2.6.32.16/mm/highmem.c 2010-07-09 14:50:38.000000000 -0400 50977+++ linux-2.6.32.18/mm/highmem.c 2010-08-11 18:57:32.000000000 -0400
50933@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) 50978@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
50934 * So no dangers, even with speculative execution. 50979 * So no dangers, even with speculative execution.
50935 */ 50980 */
@@ -50955,9 +51000,9 @@ diff -urNp linux-2.6.32.16/mm/highmem.c linux-2.6.32.16/mm/highmem.c
50955 pkmap_count[last_pkmap_nr] = 1; 51000 pkmap_count[last_pkmap_nr] = 1;
50956 set_page_address(page, (void *)vaddr); 51001 set_page_address(page, (void *)vaddr);
50957 51002
50958diff -urNp linux-2.6.32.16/mm/hugetlb.c linux-2.6.32.16/mm/hugetlb.c 51003diff -urNp linux-2.6.32.18/mm/hugetlb.c linux-2.6.32.18/mm/hugetlb.c
50959--- linux-2.6.32.16/mm/hugetlb.c 2010-07-05 14:14:00.000000000 -0400 51004--- linux-2.6.32.18/mm/hugetlb.c 2010-08-10 13:45:57.000000000 -0400
50960+++ linux-2.6.32.16/mm/hugetlb.c 2010-07-09 14:50:38.000000000 -0400 51005+++ linux-2.6.32.18/mm/hugetlb.c 2010-08-11 18:57:32.000000000 -0400
50961@@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s 51006@@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s
50962 return 1; 51007 return 1;
50963 } 51008 }
@@ -51037,9 +51082,9 @@ diff -urNp linux-2.6.32.16/mm/hugetlb.c linux-2.6.32.16/mm/hugetlb.c
51037 ptep = huge_pte_alloc(mm, address, huge_page_size(h)); 51082 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
51038 if (!ptep) 51083 if (!ptep)
51039 return VM_FAULT_OOM; 51084 return VM_FAULT_OOM;
51040diff -urNp linux-2.6.32.16/mm/Kconfig linux-2.6.32.16/mm/Kconfig 51085diff -urNp linux-2.6.32.18/mm/Kconfig linux-2.6.32.18/mm/Kconfig
51041--- linux-2.6.32.16/mm/Kconfig 2010-07-05 14:14:00.000000000 -0400 51086--- linux-2.6.32.18/mm/Kconfig 2010-08-10 13:45:57.000000000 -0400
51042+++ linux-2.6.32.16/mm/Kconfig 2010-07-09 14:50:38.000000000 -0400 51087+++ linux-2.6.32.18/mm/Kconfig 2010-08-11 18:57:32.000000000 -0400
51043@@ -228,7 +228,7 @@ config KSM 51088@@ -228,7 +228,7 @@ config KSM
51044 config DEFAULT_MMAP_MIN_ADDR 51089 config DEFAULT_MMAP_MIN_ADDR
51045 int "Low address space to protect from user allocation" 51090 int "Low address space to protect from user allocation"
@@ -51049,9 +51094,9 @@ diff -urNp linux-2.6.32.16/mm/Kconfig linux-2.6.32.16/mm/Kconfig
51049 help 51094 help
51050 This is the portion of low virtual memory which should be protected 51095 This is the portion of low virtual memory which should be protected
51051 from userspace allocation. Keeping a user from writing to low pages 51096 from userspace allocation. Keeping a user from writing to low pages
51052diff -urNp linux-2.6.32.16/mm/maccess.c linux-2.6.32.16/mm/maccess.c 51097diff -urNp linux-2.6.32.18/mm/maccess.c linux-2.6.32.18/mm/maccess.c
51053--- linux-2.6.32.16/mm/maccess.c 2010-07-05 14:14:00.000000000 -0400 51098--- linux-2.6.32.18/mm/maccess.c 2010-08-10 13:45:57.000000000 -0400
51054+++ linux-2.6.32.16/mm/maccess.c 2010-07-09 14:50:38.000000000 -0400 51099+++ linux-2.6.32.18/mm/maccess.c 2010-08-11 18:57:32.000000000 -0400
51055@@ -14,7 +14,7 @@ 51100@@ -14,7 +14,7 @@
51056 * Safely read from address @src to the buffer at @dst. If a kernel fault 51101 * Safely read from address @src to the buffer at @dst. If a kernel fault
51057 * happens, handle that and return -EFAULT. 51102 * happens, handle that and return -EFAULT.
@@ -51070,9 +51115,9 @@ diff -urNp linux-2.6.32.16/mm/maccess.c linux-2.6.32.16/mm/maccess.c
51070 { 51115 {
51071 long ret; 51116 long ret;
51072 mm_segment_t old_fs = get_fs(); 51117 mm_segment_t old_fs = get_fs();
51073diff -urNp linux-2.6.32.16/mm/madvise.c linux-2.6.32.16/mm/madvise.c 51118diff -urNp linux-2.6.32.18/mm/madvise.c linux-2.6.32.18/mm/madvise.c
51074--- linux-2.6.32.16/mm/madvise.c 2010-07-05 14:14:00.000000000 -0400 51119--- linux-2.6.32.18/mm/madvise.c 2010-08-10 13:45:57.000000000 -0400
51075+++ linux-2.6.32.16/mm/madvise.c 2010-07-09 14:50:38.000000000 -0400 51120+++ linux-2.6.32.18/mm/madvise.c 2010-08-11 18:57:32.000000000 -0400
51076@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a 51121@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
51077 pgoff_t pgoff; 51122 pgoff_t pgoff;
51078 unsigned long new_flags = vma->vm_flags; 51123 unsigned long new_flags = vma->vm_flags;
@@ -51149,9 +51194,9 @@ diff -urNp linux-2.6.32.16/mm/madvise.c linux-2.6.32.16/mm/madvise.c
51149 error = 0; 51194 error = 0;
51150 if (end == start) 51195 if (end == start)
51151 goto out; 51196 goto out;
51152diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c 51197diff -urNp linux-2.6.32.18/mm/memory.c linux-2.6.32.18/mm/memory.c
51153--- linux-2.6.32.16/mm/memory.c 2010-07-05 14:14:00.000000000 -0400 51198--- linux-2.6.32.18/mm/memory.c 2010-08-10 13:45:57.000000000 -0400
51154+++ linux-2.6.32.16/mm/memory.c 2010-07-09 14:50:38.000000000 -0400 51199+++ linux-2.6.32.18/mm/memory.c 2010-08-11 18:57:32.000000000 -0400
51155@@ -48,6 +48,7 @@ 51200@@ -48,6 +48,7 @@
51156 #include <linux/ksm.h> 51201 #include <linux/ksm.h>
51157 #include <linux/rmap.h> 51202 #include <linux/rmap.h>
@@ -51199,7 +51244,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51199 if (!vma && in_gate_area(tsk, start)) { 51244 if (!vma && in_gate_area(tsk, start)) {
51200 unsigned long pg = start & PAGE_MASK; 51245 unsigned long pg = start & PAGE_MASK;
51201 struct vm_area_struct *gate_vma = get_gate_vma(tsk); 51246 struct vm_area_struct *gate_vma = get_gate_vma(tsk);
51202@@ -1296,7 +1305,7 @@ int __get_user_pages(struct task_struct 51247@@ -1306,7 +1315,7 @@ int __get_user_pages(struct task_struct
51203 continue; 51248 continue;
51204 } 51249 }
51205 51250
@@ -51208,7 +51253,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51208 (vma->vm_flags & (VM_IO | VM_PFNMAP)) || 51253 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
51209 !(vm_flags & vma->vm_flags)) 51254 !(vm_flags & vma->vm_flags))
51210 return i ? : -EFAULT; 51255 return i ? : -EFAULT;
51211@@ -1371,7 +1380,7 @@ int __get_user_pages(struct task_struct 51256@@ -1381,7 +1390,7 @@ int __get_user_pages(struct task_struct
51212 start += PAGE_SIZE; 51257 start += PAGE_SIZE;
51213 nr_pages--; 51258 nr_pages--;
51214 } while (nr_pages && start < vma->vm_end); 51259 } while (nr_pages && start < vma->vm_end);
@@ -51217,7 +51262,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51217 return i; 51262 return i;
51218 } 51263 }
51219 51264
51220@@ -1967,6 +1976,186 @@ static inline void cow_user_page(struct 51265@@ -1977,6 +1986,186 @@ static inline void cow_user_page(struct
51221 copy_user_highpage(dst, src, va, vma); 51266 copy_user_highpage(dst, src, va, vma);
51222 } 51267 }
51223 51268
@@ -51404,7 +51449,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51404 /* 51449 /*
51405 * This routine handles present pages, when users try to write 51450 * This routine handles present pages, when users try to write
51406 * to a shared page. It is done by copying the page to a new address 51451 * to a shared page. It is done by copying the page to a new address
51407@@ -2146,6 +2335,12 @@ gotten: 51452@@ -2156,6 +2345,12 @@ gotten:
51408 */ 51453 */
51409 page_table = pte_offset_map_lock(mm, pmd, address, &ptl); 51454 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
51410 if (likely(pte_same(*page_table, orig_pte))) { 51455 if (likely(pte_same(*page_table, orig_pte))) {
@@ -51417,7 +51462,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51417 if (old_page) { 51462 if (old_page) {
51418 if (!PageAnon(old_page)) { 51463 if (!PageAnon(old_page)) {
51419 dec_mm_counter(mm, file_rss); 51464 dec_mm_counter(mm, file_rss);
51420@@ -2197,6 +2392,10 @@ gotten: 51465@@ -2207,6 +2402,10 @@ gotten:
51421 page_remove_rmap(old_page); 51466 page_remove_rmap(old_page);
51422 } 51467 }
51423 51468
@@ -51428,7 +51473,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51428 /* Free the old page.. */ 51473 /* Free the old page.. */
51429 new_page = old_page; 51474 new_page = old_page;
51430 ret |= VM_FAULT_WRITE; 51475 ret |= VM_FAULT_WRITE;
51431@@ -2594,6 +2793,11 @@ static int do_swap_page(struct mm_struct 51476@@ -2604,6 +2803,11 @@ static int do_swap_page(struct mm_struct
51432 swap_free(entry); 51477 swap_free(entry);
51433 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page)) 51478 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
51434 try_to_free_swap(page); 51479 try_to_free_swap(page);
@@ -51440,7 +51485,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51440 unlock_page(page); 51485 unlock_page(page);
51441 51486
51442 if (flags & FAULT_FLAG_WRITE) { 51487 if (flags & FAULT_FLAG_WRITE) {
51443@@ -2605,6 +2809,11 @@ static int do_swap_page(struct mm_struct 51488@@ -2615,6 +2819,11 @@ static int do_swap_page(struct mm_struct
51444 51489
51445 /* No need to invalidate - it was non-present before */ 51490 /* No need to invalidate - it was non-present before */
51446 update_mmu_cache(vma, address, pte); 51491 update_mmu_cache(vma, address, pte);
@@ -51452,7 +51497,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51452 unlock: 51497 unlock:
51453 pte_unmap_unlock(page_table, ptl); 51498 pte_unmap_unlock(page_table, ptl);
51454 out: 51499 out:
51455@@ -2628,7 +2837,7 @@ static int do_anonymous_page(struct mm_s 51500@@ -2638,7 +2847,7 @@ static int do_anonymous_page(struct mm_s
51456 unsigned long address, pte_t *page_table, pmd_t *pmd, 51501 unsigned long address, pte_t *page_table, pmd_t *pmd,
51457 unsigned int flags) 51502 unsigned int flags)
51458 { 51503 {
@@ -51461,7 +51506,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51461 spinlock_t *ptl; 51506 spinlock_t *ptl;
51462 pte_t entry; 51507 pte_t entry;
51463 51508
51464@@ -2663,6 +2872,11 @@ static int do_anonymous_page(struct mm_s 51509@@ -2673,6 +2882,11 @@ static int do_anonymous_page(struct mm_s
51465 if (!pte_none(*page_table)) 51510 if (!pte_none(*page_table))
51466 goto release; 51511 goto release;
51467 51512
@@ -51473,7 +51518,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51473 inc_mm_counter(mm, anon_rss); 51518 inc_mm_counter(mm, anon_rss);
51474 page_add_new_anon_rmap(page, vma, address); 51519 page_add_new_anon_rmap(page, vma, address);
51475 setpte: 51520 setpte:
51476@@ -2670,6 +2884,12 @@ setpte: 51521@@ -2680,6 +2894,12 @@ setpte:
51477 51522
51478 /* No need to invalidate - it was non-present before */ 51523 /* No need to invalidate - it was non-present before */
51479 update_mmu_cache(vma, address, entry); 51524 update_mmu_cache(vma, address, entry);
@@ -51486,7 +51531,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51486 unlock: 51531 unlock:
51487 pte_unmap_unlock(page_table, ptl); 51532 pte_unmap_unlock(page_table, ptl);
51488 return 0; 51533 return 0;
51489@@ -2812,6 +3032,12 @@ static int __do_fault(struct mm_struct * 51534@@ -2822,6 +3042,12 @@ static int __do_fault(struct mm_struct *
51490 */ 51535 */
51491 /* Only go through if we didn't race with anybody else... */ 51536 /* Only go through if we didn't race with anybody else... */
51492 if (likely(pte_same(*page_table, orig_pte))) { 51537 if (likely(pte_same(*page_table, orig_pte))) {
@@ -51499,7 +51544,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51499 flush_icache_page(vma, page); 51544 flush_icache_page(vma, page);
51500 entry = mk_pte(page, vma->vm_page_prot); 51545 entry = mk_pte(page, vma->vm_page_prot);
51501 if (flags & FAULT_FLAG_WRITE) 51546 if (flags & FAULT_FLAG_WRITE)
51502@@ -2831,6 +3057,14 @@ static int __do_fault(struct mm_struct * 51547@@ -2841,6 +3067,14 @@ static int __do_fault(struct mm_struct *
51503 51548
51504 /* no need to invalidate: a not-present page won't be cached */ 51549 /* no need to invalidate: a not-present page won't be cached */
51505 update_mmu_cache(vma, address, entry); 51550 update_mmu_cache(vma, address, entry);
@@ -51514,7 +51559,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51514 } else { 51559 } else {
51515 if (charged) 51560 if (charged)
51516 mem_cgroup_uncharge_page(page); 51561 mem_cgroup_uncharge_page(page);
51517@@ -2978,6 +3212,12 @@ static inline int handle_pte_fault(struc 51562@@ -2988,6 +3222,12 @@ static inline int handle_pte_fault(struc
51518 if (flags & FAULT_FLAG_WRITE) 51563 if (flags & FAULT_FLAG_WRITE)
51519 flush_tlb_page(vma, address); 51564 flush_tlb_page(vma, address);
51520 } 51565 }
@@ -51527,7 +51572,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51527 unlock: 51572 unlock:
51528 pte_unmap_unlock(pte, ptl); 51573 pte_unmap_unlock(pte, ptl);
51529 return 0; 51574 return 0;
51530@@ -2994,6 +3234,10 @@ int handle_mm_fault(struct mm_struct *mm 51575@@ -3004,6 +3244,10 @@ int handle_mm_fault(struct mm_struct *mm
51531 pmd_t *pmd; 51576 pmd_t *pmd;
51532 pte_t *pte; 51577 pte_t *pte;
51533 51578
@@ -51538,7 +51583,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51538 __set_current_state(TASK_RUNNING); 51583 __set_current_state(TASK_RUNNING);
51539 51584
51540 count_vm_event(PGFAULT); 51585 count_vm_event(PGFAULT);
51541@@ -3001,6 +3245,34 @@ int handle_mm_fault(struct mm_struct *mm 51586@@ -3011,6 +3255,34 @@ int handle_mm_fault(struct mm_struct *mm
51542 if (unlikely(is_vm_hugetlb_page(vma))) 51587 if (unlikely(is_vm_hugetlb_page(vma)))
51543 return hugetlb_fault(mm, vma, address, flags); 51588 return hugetlb_fault(mm, vma, address, flags);
51544 51589
@@ -51573,7 +51618,7 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51573 pgd = pgd_offset(mm, address); 51618 pgd = pgd_offset(mm, address);
51574 pud = pud_alloc(mm, pgd, address); 51619 pud = pud_alloc(mm, pgd, address);
51575 if (!pud) 51620 if (!pud)
51576@@ -3098,7 +3370,7 @@ static int __init gate_vma_init(void) 51621@@ -3108,7 +3380,7 @@ static int __init gate_vma_init(void)
51577 gate_vma.vm_start = FIXADDR_USER_START; 51622 gate_vma.vm_start = FIXADDR_USER_START;
51578 gate_vma.vm_end = FIXADDR_USER_END; 51623 gate_vma.vm_end = FIXADDR_USER_END;
51579 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; 51624 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
@@ -51582,9 +51627,9 @@ diff -urNp linux-2.6.32.16/mm/memory.c linux-2.6.32.16/mm/memory.c
51582 /* 51627 /*
51583 * Make sure the vDSO gets into every core dump. 51628 * Make sure the vDSO gets into every core dump.
51584 * Dumping its contents makes post-mortem fully interpretable later 51629 * Dumping its contents makes post-mortem fully interpretable later
51585diff -urNp linux-2.6.32.16/mm/memory-failure.c linux-2.6.32.16/mm/memory-failure.c 51630diff -urNp linux-2.6.32.18/mm/memory-failure.c linux-2.6.32.18/mm/memory-failure.c
51586--- linux-2.6.32.16/mm/memory-failure.c 2010-07-05 14:14:00.000000000 -0400 51631--- linux-2.6.32.18/mm/memory-failure.c 2010-08-10 13:45:57.000000000 -0400
51587+++ linux-2.6.32.16/mm/memory-failure.c 2010-07-09 14:50:38.000000000 -0400 51632+++ linux-2.6.32.18/mm/memory-failure.c 2010-08-11 18:57:32.000000000 -0400
51588@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r 51633@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
51589 51634
51590 int sysctl_memory_failure_recovery __read_mostly = 1; 51635 int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -51603,9 +51648,9 @@ diff -urNp linux-2.6.32.16/mm/memory-failure.c linux-2.6.32.16/mm/memory-failure
51603 51648
51604 /* 51649 /*
51605 * We need/can do nothing about count=0 pages. 51650 * We need/can do nothing about count=0 pages.
51606diff -urNp linux-2.6.32.16/mm/mempolicy.c linux-2.6.32.16/mm/mempolicy.c 51651diff -urNp linux-2.6.32.18/mm/mempolicy.c linux-2.6.32.18/mm/mempolicy.c
51607--- linux-2.6.32.16/mm/mempolicy.c 2010-07-05 14:14:00.000000000 -0400 51652--- linux-2.6.32.18/mm/mempolicy.c 2010-08-10 13:45:57.000000000 -0400
51608+++ linux-2.6.32.16/mm/mempolicy.c 2010-07-09 14:50:38.000000000 -0400 51653+++ linux-2.6.32.18/mm/mempolicy.c 2010-08-11 18:57:32.000000000 -0400
51609@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st 51654@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
51610 struct vm_area_struct *next; 51655 struct vm_area_struct *next;
51611 int err; 51656 int err;
@@ -51686,9 +51731,9 @@ diff -urNp linux-2.6.32.16/mm/mempolicy.c linux-2.6.32.16/mm/mempolicy.c
51686 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { 51731 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
51687 seq_printf(m, " heap"); 51732 seq_printf(m, " heap");
51688 } else if (vma->vm_start <= mm->start_stack && 51733 } else if (vma->vm_start <= mm->start_stack &&
51689diff -urNp linux-2.6.32.16/mm/migrate.c linux-2.6.32.16/mm/migrate.c 51734diff -urNp linux-2.6.32.18/mm/migrate.c linux-2.6.32.18/mm/migrate.c
51690--- linux-2.6.32.16/mm/migrate.c 2010-07-05 14:14:00.000000000 -0400 51735--- linux-2.6.32.18/mm/migrate.c 2010-08-10 13:45:57.000000000 -0400
51691+++ linux-2.6.32.16/mm/migrate.c 2010-07-09 14:50:38.000000000 -0400 51736+++ linux-2.6.32.18/mm/migrate.c 2010-08-11 18:57:32.000000000 -0400
51692@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 51737@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
51693 if (!mm) 51738 if (!mm)
51694 return -EINVAL; 51739 return -EINVAL;
@@ -51714,9 +51759,9 @@ diff -urNp linux-2.6.32.16/mm/migrate.c linux-2.6.32.16/mm/migrate.c
51714 rcu_read_unlock(); 51759 rcu_read_unlock();
51715 err = -EPERM; 51760 err = -EPERM;
51716 goto out; 51761 goto out;
51717diff -urNp linux-2.6.32.16/mm/mlock.c linux-2.6.32.16/mm/mlock.c 51762diff -urNp linux-2.6.32.18/mm/mlock.c linux-2.6.32.18/mm/mlock.c
51718--- linux-2.6.32.16/mm/mlock.c 2010-07-05 14:14:00.000000000 -0400 51763--- linux-2.6.32.18/mm/mlock.c 2010-08-10 13:45:57.000000000 -0400
51719+++ linux-2.6.32.16/mm/mlock.c 2010-07-09 14:50:38.000000000 -0400 51764+++ linux-2.6.32.18/mm/mlock.c 2010-08-11 18:57:32.000000000 -0400
51720@@ -13,6 +13,7 @@ 51765@@ -13,6 +13,7 @@
51721 #include <linux/pagemap.h> 51766 #include <linux/pagemap.h>
51722 #include <linux/mempolicy.h> 51767 #include <linux/mempolicy.h>
@@ -51785,9 +51830,9 @@ diff -urNp linux-2.6.32.16/mm/mlock.c linux-2.6.32.16/mm/mlock.c
51785 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || 51830 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
51786 capable(CAP_IPC_LOCK)) 51831 capable(CAP_IPC_LOCK))
51787 ret = do_mlockall(flags); 51832 ret = do_mlockall(flags);
51788diff -urNp linux-2.6.32.16/mm/mmap.c linux-2.6.32.16/mm/mmap.c 51833diff -urNp linux-2.6.32.18/mm/mmap.c linux-2.6.32.18/mm/mmap.c
51789--- linux-2.6.32.16/mm/mmap.c 2010-07-05 14:14:00.000000000 -0400 51834--- linux-2.6.32.18/mm/mmap.c 2010-08-10 13:45:57.000000000 -0400
51790+++ linux-2.6.32.16/mm/mmap.c 2010-07-16 21:06:43.000000000 -0400 51835+++ linux-2.6.32.18/mm/mmap.c 2010-08-11 18:57:32.000000000 -0400
51791@@ -45,6 +45,16 @@ 51836@@ -45,6 +45,16 @@
51792 #define arch_rebalance_pgtables(addr, len) (addr) 51837 #define arch_rebalance_pgtables(addr, len) (addr)
51793 #endif 51838 #endif
@@ -52856,9 +52901,9 @@ diff -urNp linux-2.6.32.16/mm/mmap.c linux-2.6.32.16/mm/mmap.c
52856 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; 52901 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
52857 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 52902 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
52858 52903
52859diff -urNp linux-2.6.32.16/mm/mprotect.c linux-2.6.32.16/mm/mprotect.c 52904diff -urNp linux-2.6.32.18/mm/mprotect.c linux-2.6.32.18/mm/mprotect.c
52860--- linux-2.6.32.16/mm/mprotect.c 2010-07-05 14:14:00.000000000 -0400 52905--- linux-2.6.32.18/mm/mprotect.c 2010-08-10 13:45:57.000000000 -0400
52861+++ linux-2.6.32.16/mm/mprotect.c 2010-07-09 14:50:38.000000000 -0400 52906+++ linux-2.6.32.18/mm/mprotect.c 2010-08-11 18:57:32.000000000 -0400
52862@@ -24,10 +24,16 @@ 52907@@ -24,10 +24,16 @@
52863 #include <linux/mmu_notifier.h> 52908 #include <linux/mmu_notifier.h>
52864 #include <linux/migrate.h> 52909 #include <linux/migrate.h>
@@ -53056,9 +53101,9 @@ diff -urNp linux-2.6.32.16/mm/mprotect.c linux-2.6.32.16/mm/mprotect.c
53056 nstart = tmp; 53101 nstart = tmp;
53057 53102
53058 if (nstart < prev->vm_end) 53103 if (nstart < prev->vm_end)
53059diff -urNp linux-2.6.32.16/mm/mremap.c linux-2.6.32.16/mm/mremap.c 53104diff -urNp linux-2.6.32.18/mm/mremap.c linux-2.6.32.18/mm/mremap.c
53060--- linux-2.6.32.16/mm/mremap.c 2010-07-05 14:14:00.000000000 -0400 53105--- linux-2.6.32.18/mm/mremap.c 2010-08-10 13:45:57.000000000 -0400
53061+++ linux-2.6.32.16/mm/mremap.c 2010-07-09 14:50:38.000000000 -0400 53106+++ linux-2.6.32.18/mm/mremap.c 2010-08-11 18:57:32.000000000 -0400
53062@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str 53107@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
53063 continue; 53108 continue;
53064 pte = ptep_clear_flush(vma, old_addr, old_pte); 53109 pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -53159,9 +53204,9 @@ diff -urNp linux-2.6.32.16/mm/mremap.c linux-2.6.32.16/mm/mremap.c
53159 } 53204 }
53160 out: 53205 out:
53161 if (ret & ~PAGE_MASK) 53206 if (ret & ~PAGE_MASK)
53162diff -urNp linux-2.6.32.16/mm/nommu.c linux-2.6.32.16/mm/nommu.c 53207diff -urNp linux-2.6.32.18/mm/nommu.c linux-2.6.32.18/mm/nommu.c
53163--- linux-2.6.32.16/mm/nommu.c 2010-07-05 14:14:00.000000000 -0400 53208--- linux-2.6.32.18/mm/nommu.c 2010-08-10 13:45:57.000000000 -0400
53164+++ linux-2.6.32.16/mm/nommu.c 2010-07-09 14:50:38.000000000 -0400 53209+++ linux-2.6.32.18/mm/nommu.c 2010-08-11 18:57:32.000000000 -0400
53165@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m 53210@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m
53166 EXPORT_SYMBOL(find_vma); 53211 EXPORT_SYMBOL(find_vma);
53167 53212
@@ -53178,9 +53223,9 @@ diff -urNp linux-2.6.32.16/mm/nommu.c linux-2.6.32.16/mm/nommu.c
53178 * expand a stack to a given address 53223 * expand a stack to a given address
53179 * - not supported under NOMMU conditions 53224 * - not supported under NOMMU conditions
53180 */ 53225 */
53181diff -urNp linux-2.6.32.16/mm/page_alloc.c linux-2.6.32.16/mm/page_alloc.c 53226diff -urNp linux-2.6.32.18/mm/page_alloc.c linux-2.6.32.18/mm/page_alloc.c
53182--- linux-2.6.32.16/mm/page_alloc.c 2010-07-05 14:14:00.000000000 -0400 53227--- linux-2.6.32.18/mm/page_alloc.c 2010-08-10 13:45:57.000000000 -0400
53183+++ linux-2.6.32.16/mm/page_alloc.c 2010-07-09 14:50:38.000000000 -0400 53228+++ linux-2.6.32.18/mm/page_alloc.c 2010-08-11 18:57:32.000000000 -0400
53184@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page 53229@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page
53185 int bad = 0; 53230 int bad = 0;
53186 int wasMlocked = __TestClearPageMlocked(page); 53231 int wasMlocked = __TestClearPageMlocked(page);
@@ -53237,9 +53282,9 @@ diff -urNp linux-2.6.32.16/mm/page_alloc.c linux-2.6.32.16/mm/page_alloc.c
53237 struct zone *zone, unsigned long zonesize) {} 53282 struct zone *zone, unsigned long zonesize) {}
53238 #endif /* CONFIG_SPARSEMEM */ 53283 #endif /* CONFIG_SPARSEMEM */
53239 53284
53240diff -urNp linux-2.6.32.16/mm/percpu.c linux-2.6.32.16/mm/percpu.c 53285diff -urNp linux-2.6.32.18/mm/percpu.c linux-2.6.32.18/mm/percpu.c
53241--- linux-2.6.32.16/mm/percpu.c 2010-07-05 14:14:00.000000000 -0400 53286--- linux-2.6.32.18/mm/percpu.c 2010-08-10 13:45:57.000000000 -0400
53242+++ linux-2.6.32.16/mm/percpu.c 2010-07-09 14:50:38.000000000 -0400 53287+++ linux-2.6.32.18/mm/percpu.c 2010-08-11 18:57:32.000000000 -0400
53243@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu 53288@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
53244 static unsigned int pcpu_last_unit_cpu __read_mostly; 53289 static unsigned int pcpu_last_unit_cpu __read_mostly;
53245 53290
@@ -53249,9 +53294,9 @@ diff -urNp linux-2.6.32.16/mm/percpu.c linux-2.6.32.16/mm/percpu.c
53249 EXPORT_SYMBOL_GPL(pcpu_base_addr); 53294 EXPORT_SYMBOL_GPL(pcpu_base_addr);
53250 53295
53251 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ 53296 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
53252diff -urNp linux-2.6.32.16/mm/rmap.c linux-2.6.32.16/mm/rmap.c 53297diff -urNp linux-2.6.32.18/mm/rmap.c linux-2.6.32.18/mm/rmap.c
53253--- linux-2.6.32.16/mm/rmap.c 2010-07-05 14:14:00.000000000 -0400 53298--- linux-2.6.32.18/mm/rmap.c 2010-08-10 13:45:57.000000000 -0400
53254+++ linux-2.6.32.16/mm/rmap.c 2010-07-09 14:50:38.000000000 -0400 53299+++ linux-2.6.32.18/mm/rmap.c 2010-08-11 18:57:32.000000000 -0400
53255@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru 53300@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru
53256 struct mm_struct *mm = vma->vm_mm; 53301 struct mm_struct *mm = vma->vm_mm;
53257 struct anon_vma *allocated; 53302 struct anon_vma *allocated;
@@ -53280,9 +53325,9 @@ diff -urNp linux-2.6.32.16/mm/rmap.c linux-2.6.32.16/mm/rmap.c
53280 vma->anon_vma = anon_vma; 53325 vma->anon_vma = anon_vma;
53281 list_add_tail(&vma->anon_vma_node, &anon_vma->head); 53326 list_add_tail(&vma->anon_vma_node, &anon_vma->head);
53282 allocated = NULL; 53327 allocated = NULL;
53283diff -urNp linux-2.6.32.16/mm/shmem.c linux-2.6.32.16/mm/shmem.c 53328diff -urNp linux-2.6.32.18/mm/shmem.c linux-2.6.32.18/mm/shmem.c
53284--- linux-2.6.32.16/mm/shmem.c 2010-07-05 14:14:00.000000000 -0400 53329--- linux-2.6.32.18/mm/shmem.c 2010-08-10 13:45:57.000000000 -0400
53285+++ linux-2.6.32.16/mm/shmem.c 2010-07-09 14:50:38.000000000 -0400 53330+++ linux-2.6.32.18/mm/shmem.c 2010-08-11 18:57:32.000000000 -0400
53286@@ -31,7 +31,7 @@ 53331@@ -31,7 +31,7 @@
53287 #include <linux/swap.h> 53332 #include <linux/swap.h>
53288 #include <linux/ima.h> 53333 #include <linux/ima.h>
@@ -53292,9 +53337,9 @@ diff -urNp linux-2.6.32.16/mm/shmem.c linux-2.6.32.16/mm/shmem.c
53292 53337
53293 #ifdef CONFIG_SHMEM 53338 #ifdef CONFIG_SHMEM
53294 /* 53339 /*
53295diff -urNp linux-2.6.32.16/mm/slab.c linux-2.6.32.16/mm/slab.c 53340diff -urNp linux-2.6.32.18/mm/slab.c linux-2.6.32.18/mm/slab.c
53296--- linux-2.6.32.16/mm/slab.c 2010-07-05 14:14:00.000000000 -0400 53341--- linux-2.6.32.18/mm/slab.c 2010-08-10 13:45:57.000000000 -0400
53297+++ linux-2.6.32.16/mm/slab.c 2010-07-09 14:50:38.000000000 -0400 53342+++ linux-2.6.32.18/mm/slab.c 2010-08-11 18:57:32.000000000 -0400
53298@@ -308,7 +308,7 @@ struct kmem_list3 { 53343@@ -308,7 +308,7 @@ struct kmem_list3 {
53299 * Need this for bootstrapping a per node allocator. 53344 * Need this for bootstrapping a per node allocator.
53300 */ 53345 */
@@ -53400,9 +53445,9 @@ diff -urNp linux-2.6.32.16/mm/slab.c linux-2.6.32.16/mm/slab.c
53400 /** 53445 /**
53401 * ksize - get the actual amount of memory allocated for a given object 53446 * ksize - get the actual amount of memory allocated for a given object
53402 * @objp: Pointer to the object 53447 * @objp: Pointer to the object
53403diff -urNp linux-2.6.32.16/mm/slob.c linux-2.6.32.16/mm/slob.c 53448diff -urNp linux-2.6.32.18/mm/slob.c linux-2.6.32.18/mm/slob.c
53404--- linux-2.6.32.16/mm/slob.c 2010-07-05 14:14:00.000000000 -0400 53449--- linux-2.6.32.18/mm/slob.c 2010-08-10 13:45:57.000000000 -0400
53405+++ linux-2.6.32.16/mm/slob.c 2010-07-09 14:50:38.000000000 -0400 53450+++ linux-2.6.32.18/mm/slob.c 2010-08-11 18:57:32.000000000 -0400
53406@@ -29,7 +29,7 @@ 53451@@ -29,7 +29,7 @@
53407 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls 53452 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
53408 * alloc_pages() directly, allocating compound pages so the page order 53453 * alloc_pages() directly, allocating compound pages so the page order
@@ -53723,9 +53768,9 @@ diff -urNp linux-2.6.32.16/mm/slob.c linux-2.6.32.16/mm/slob.c
53723 } 53768 }
53724 53769
53725 trace_kmem_cache_free(_RET_IP_, b); 53770 trace_kmem_cache_free(_RET_IP_, b);
53726diff -urNp linux-2.6.32.16/mm/slub.c linux-2.6.32.16/mm/slub.c 53771diff -urNp linux-2.6.32.18/mm/slub.c linux-2.6.32.18/mm/slub.c
53727--- linux-2.6.32.16/mm/slub.c 2010-07-05 14:14:00.000000000 -0400 53772--- linux-2.6.32.18/mm/slub.c 2010-08-10 13:45:57.000000000 -0400
53728+++ linux-2.6.32.16/mm/slub.c 2010-07-09 14:50:38.000000000 -0400 53773+++ linux-2.6.32.18/mm/slub.c 2010-08-11 18:57:32.000000000 -0400
53729@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * 53774@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *
53730 53775
53731 page = virt_to_head_page(x); 53776 page = virt_to_head_page(x);
@@ -53888,9 +53933,9 @@ diff -urNp linux-2.6.32.16/mm/slub.c linux-2.6.32.16/mm/slub.c
53888 return 0; 53933 return 0;
53889 } 53934 }
53890 module_init(slab_proc_init); 53935 module_init(slab_proc_init);
53891diff -urNp linux-2.6.32.16/mm/util.c linux-2.6.32.16/mm/util.c 53936diff -urNp linux-2.6.32.18/mm/util.c linux-2.6.32.18/mm/util.c
53892--- linux-2.6.32.16/mm/util.c 2010-07-05 14:14:00.000000000 -0400 53937--- linux-2.6.32.18/mm/util.c 2010-08-10 13:45:57.000000000 -0400
53893+++ linux-2.6.32.16/mm/util.c 2010-07-09 14:50:38.000000000 -0400 53938+++ linux-2.6.32.18/mm/util.c 2010-08-11 18:57:32.000000000 -0400
53894@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); 53939@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
53895 void arch_pick_mmap_layout(struct mm_struct *mm) 53940 void arch_pick_mmap_layout(struct mm_struct *mm)
53896 { 53941 {
@@ -53904,9 +53949,9 @@ diff -urNp linux-2.6.32.16/mm/util.c linux-2.6.32.16/mm/util.c
53904 mm->get_unmapped_area = arch_get_unmapped_area; 53949 mm->get_unmapped_area = arch_get_unmapped_area;
53905 mm->unmap_area = arch_unmap_area; 53950 mm->unmap_area = arch_unmap_area;
53906 } 53951 }
53907diff -urNp linux-2.6.32.16/mm/vmalloc.c linux-2.6.32.16/mm/vmalloc.c 53952diff -urNp linux-2.6.32.18/mm/vmalloc.c linux-2.6.32.18/mm/vmalloc.c
53908--- linux-2.6.32.16/mm/vmalloc.c 2010-07-05 14:14:00.000000000 -0400 53953--- linux-2.6.32.18/mm/vmalloc.c 2010-08-10 13:45:57.000000000 -0400
53909+++ linux-2.6.32.16/mm/vmalloc.c 2010-07-09 14:50:44.000000000 -0400 53954+++ linux-2.6.32.18/mm/vmalloc.c 2010-08-11 18:57:32.000000000 -0400
53910@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, 53955@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
53911 53956
53912 pte = pte_offset_kernel(pmd, addr); 53957 pte = pte_offset_kernel(pmd, addr);
@@ -54134,9 +54179,9 @@ diff -urNp linux-2.6.32.16/mm/vmalloc.c linux-2.6.32.16/mm/vmalloc.c
54134 void *vmalloc_32_user(unsigned long size) 54179 void *vmalloc_32_user(unsigned long size)
54135 { 54180 {
54136 struct vm_struct *area; 54181 struct vm_struct *area;
54137diff -urNp linux-2.6.32.16/mm/vmstat.c linux-2.6.32.16/mm/vmstat.c 54182diff -urNp linux-2.6.32.18/mm/vmstat.c linux-2.6.32.18/mm/vmstat.c
54138--- linux-2.6.32.16/mm/vmstat.c 2010-07-05 14:14:00.000000000 -0400 54183--- linux-2.6.32.18/mm/vmstat.c 2010-08-10 13:45:57.000000000 -0400
54139+++ linux-2.6.32.16/mm/vmstat.c 2010-07-16 21:06:43.000000000 -0400 54184+++ linux-2.6.32.18/mm/vmstat.c 2010-08-11 18:57:32.000000000 -0400
54140@@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu) 54185@@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu)
54141 * 54186 *
54142 * vm_stat contains the global counters 54187 * vm_stat contains the global counters
@@ -54185,9 +54230,9 @@ diff -urNp linux-2.6.32.16/mm/vmstat.c linux-2.6.32.16/mm/vmstat.c
54185 #endif 54230 #endif
54186 return 0; 54231 return 0;
54187 } 54232 }
54188diff -urNp linux-2.6.32.16/net/8021q/vlan.c linux-2.6.32.16/net/8021q/vlan.c 54233diff -urNp linux-2.6.32.18/net/8021q/vlan.c linux-2.6.32.18/net/8021q/vlan.c
54189--- linux-2.6.32.16/net/8021q/vlan.c 2010-07-05 14:14:00.000000000 -0400 54234--- linux-2.6.32.18/net/8021q/vlan.c 2010-08-10 13:45:57.000000000 -0400
54190+++ linux-2.6.32.16/net/8021q/vlan.c 2010-07-09 14:50:38.000000000 -0400 54235+++ linux-2.6.32.18/net/8021q/vlan.c 2010-08-11 18:57:32.000000000 -0400
54191@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net 54236@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
54192 err = -EPERM; 54237 err = -EPERM;
54193 if (!capable(CAP_NET_ADMIN)) 54238 if (!capable(CAP_NET_ADMIN))
@@ -54198,9 +54243,9 @@ diff -urNp linux-2.6.32.16/net/8021q/vlan.c linux-2.6.32.16/net/8021q/vlan.c
54198 struct vlan_net *vn; 54243 struct vlan_net *vn;
54199 54244
54200 vn = net_generic(net, vlan_net_id); 54245 vn = net_generic(net, vlan_net_id);
54201diff -urNp linux-2.6.32.16/net/atm/atm_misc.c linux-2.6.32.16/net/atm/atm_misc.c 54246diff -urNp linux-2.6.32.18/net/atm/atm_misc.c linux-2.6.32.18/net/atm/atm_misc.c
54202--- linux-2.6.32.16/net/atm/atm_misc.c 2010-07-05 14:14:00.000000000 -0400 54247--- linux-2.6.32.18/net/atm/atm_misc.c 2010-08-10 13:45:57.000000000 -0400
54203+++ linux-2.6.32.16/net/atm/atm_misc.c 2010-07-09 14:50:38.000000000 -0400 54248+++ linux-2.6.32.18/net/atm/atm_misc.c 2010-08-11 18:57:32.000000000 -0400
54204@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t 54249@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
54205 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) 54250 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
54206 return 1; 54251 return 1;
@@ -54237,9 +54282,9 @@ diff -urNp linux-2.6.32.16/net/atm/atm_misc.c linux-2.6.32.16/net/atm/atm_misc.c
54237 __SONET_ITEMS 54282 __SONET_ITEMS
54238 #undef __HANDLE_ITEM 54283 #undef __HANDLE_ITEM
54239 } 54284 }
54240diff -urNp linux-2.6.32.16/net/atm/proc.c linux-2.6.32.16/net/atm/proc.c 54285diff -urNp linux-2.6.32.18/net/atm/proc.c linux-2.6.32.18/net/atm/proc.c
54241--- linux-2.6.32.16/net/atm/proc.c 2010-07-05 14:14:00.000000000 -0400 54286--- linux-2.6.32.18/net/atm/proc.c 2010-08-10 13:45:57.000000000 -0400
54242+++ linux-2.6.32.16/net/atm/proc.c 2010-07-09 14:50:38.000000000 -0400 54287+++ linux-2.6.32.18/net/atm/proc.c 2010-08-11 18:57:32.000000000 -0400
54243@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s 54288@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
54244 const struct k_atm_aal_stats *stats) 54289 const struct k_atm_aal_stats *stats)
54245 { 54290 {
@@ -54253,9 +54298,9 @@ diff -urNp linux-2.6.32.16/net/atm/proc.c linux-2.6.32.16/net/atm/proc.c
54253 } 54298 }
54254 54299
54255 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) 54300 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
54256diff -urNp linux-2.6.32.16/net/atm/resources.c linux-2.6.32.16/net/atm/resources.c 54301diff -urNp linux-2.6.32.18/net/atm/resources.c linux-2.6.32.18/net/atm/resources.c
54257--- linux-2.6.32.16/net/atm/resources.c 2010-07-05 14:14:00.000000000 -0400 54302--- linux-2.6.32.18/net/atm/resources.c 2010-08-10 13:45:57.000000000 -0400
54258+++ linux-2.6.32.16/net/atm/resources.c 2010-07-09 14:50:38.000000000 -0400 54303+++ linux-2.6.32.18/net/atm/resources.c 2010-08-11 18:57:32.000000000 -0400
54259@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * 54304@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
54260 static void copy_aal_stats(struct k_atm_aal_stats *from, 54305 static void copy_aal_stats(struct k_atm_aal_stats *from,
54261 struct atm_aal_stats *to) 54306 struct atm_aal_stats *to)
@@ -54274,9 +54319,9 @@ diff -urNp linux-2.6.32.16/net/atm/resources.c linux-2.6.32.16/net/atm/resources
54274 __AAL_STAT_ITEMS 54319 __AAL_STAT_ITEMS
54275 #undef __HANDLE_ITEM 54320 #undef __HANDLE_ITEM
54276 } 54321 }
54277diff -urNp linux-2.6.32.16/net/bridge/br_private.h linux-2.6.32.16/net/bridge/br_private.h 54322diff -urNp linux-2.6.32.18/net/bridge/br_private.h linux-2.6.32.18/net/bridge/br_private.h
54278--- linux-2.6.32.16/net/bridge/br_private.h 2010-07-05 14:14:00.000000000 -0400 54323--- linux-2.6.32.18/net/bridge/br_private.h 2010-08-10 13:45:57.000000000 -0400
54279+++ linux-2.6.32.16/net/bridge/br_private.h 2010-07-09 14:50:38.000000000 -0400 54324+++ linux-2.6.32.18/net/bridge/br_private.h 2010-08-11 18:57:32.000000000 -0400
54280@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, 54325@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
54281 54326
54282 #ifdef CONFIG_SYSFS 54327 #ifdef CONFIG_SYSFS
@@ -54286,9 +54331,9 @@ diff -urNp linux-2.6.32.16/net/bridge/br_private.h linux-2.6.32.16/net/bridge/br
54286 extern int br_sysfs_addif(struct net_bridge_port *p); 54331 extern int br_sysfs_addif(struct net_bridge_port *p);
54287 54332
54288 /* br_sysfs_br.c */ 54333 /* br_sysfs_br.c */
54289diff -urNp linux-2.6.32.16/net/bridge/br_stp_if.c linux-2.6.32.16/net/bridge/br_stp_if.c 54334diff -urNp linux-2.6.32.18/net/bridge/br_stp_if.c linux-2.6.32.18/net/bridge/br_stp_if.c
54290--- linux-2.6.32.16/net/bridge/br_stp_if.c 2010-07-05 14:14:00.000000000 -0400 54335--- linux-2.6.32.18/net/bridge/br_stp_if.c 2010-08-10 13:45:57.000000000 -0400
54291+++ linux-2.6.32.16/net/bridge/br_stp_if.c 2010-07-09 14:50:38.000000000 -0400 54336+++ linux-2.6.32.18/net/bridge/br_stp_if.c 2010-08-11 18:57:32.000000000 -0400
54292@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg 54337@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
54293 char *envp[] = { NULL }; 54338 char *envp[] = { NULL };
54294 54339
@@ -54298,9 +54343,9 @@ diff -urNp linux-2.6.32.16/net/bridge/br_stp_if.c linux-2.6.32.16/net/bridge/br_
54298 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", 54343 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
54299 br->dev->name, r); 54344 br->dev->name, r);
54300 54345
54301diff -urNp linux-2.6.32.16/net/bridge/br_sysfs_if.c linux-2.6.32.16/net/bridge/br_sysfs_if.c 54346diff -urNp linux-2.6.32.18/net/bridge/br_sysfs_if.c linux-2.6.32.18/net/bridge/br_sysfs_if.c
54302--- linux-2.6.32.16/net/bridge/br_sysfs_if.c 2010-07-05 14:14:00.000000000 -0400 54347--- linux-2.6.32.18/net/bridge/br_sysfs_if.c 2010-08-10 13:45:57.000000000 -0400
54303+++ linux-2.6.32.16/net/bridge/br_sysfs_if.c 2010-07-09 14:50:38.000000000 -0400 54348+++ linux-2.6.32.18/net/bridge/br_sysfs_if.c 2010-08-11 18:57:32.000000000 -0400
54304@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje 54349@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
54305 return ret; 54350 return ret;
54306 } 54351 }
@@ -54310,9 +54355,9 @@ diff -urNp linux-2.6.32.16/net/bridge/br_sysfs_if.c linux-2.6.32.16/net/bridge/b
54310 .show = brport_show, 54355 .show = brport_show,
54311 .store = brport_store, 54356 .store = brport_store,
54312 }; 54357 };
54313diff -urNp linux-2.6.32.16/net/core/dev.c linux-2.6.32.16/net/core/dev.c 54358diff -urNp linux-2.6.32.18/net/core/dev.c linux-2.6.32.18/net/core/dev.c
54314--- linux-2.6.32.16/net/core/dev.c 2010-07-05 14:14:00.000000000 -0400 54359--- linux-2.6.32.18/net/core/dev.c 2010-08-10 13:45:57.000000000 -0400
54315+++ linux-2.6.32.16/net/core/dev.c 2010-07-09 14:50:39.000000000 -0400 54360+++ linux-2.6.32.18/net/core/dev.c 2010-08-11 18:57:32.000000000 -0400
54316@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) 54361@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb)
54317 } 54362 }
54318 EXPORT_SYMBOL(netif_rx_ni); 54363 EXPORT_SYMBOL(netif_rx_ni);
@@ -54331,9 +54376,9 @@ diff -urNp linux-2.6.32.16/net/core/dev.c linux-2.6.32.16/net/core/dev.c
54331 { 54376 {
54332 struct list_head *list = &__get_cpu_var(softnet_data).poll_list; 54377 struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
54333 unsigned long time_limit = jiffies + 2; 54378 unsigned long time_limit = jiffies + 2;
54334diff -urNp linux-2.6.32.16/net/core/flow.c linux-2.6.32.16/net/core/flow.c 54379diff -urNp linux-2.6.32.18/net/core/flow.c linux-2.6.32.18/net/core/flow.c
54335--- linux-2.6.32.16/net/core/flow.c 2010-07-05 14:14:00.000000000 -0400 54380--- linux-2.6.32.18/net/core/flow.c 2010-08-10 13:45:57.000000000 -0400
54336+++ linux-2.6.32.16/net/core/flow.c 2010-07-09 14:50:39.000000000 -0400 54381+++ linux-2.6.32.18/net/core/flow.c 2010-08-11 18:57:33.000000000 -0400
54337@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( 54382@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
54338 54383
54339 static u32 flow_hash_shift; 54384 static u32 flow_hash_shift;
@@ -54361,9 +54406,9 @@ diff -urNp linux-2.6.32.16/net/core/flow.c linux-2.6.32.16/net/core/flow.c
54361 54406
54362 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) 54407 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
54363 54408
54364diff -urNp linux-2.6.32.16/net/dccp/ccids/ccid3.c linux-2.6.32.16/net/dccp/ccids/ccid3.c 54409diff -urNp linux-2.6.32.18/net/dccp/ccids/ccid3.c linux-2.6.32.18/net/dccp/ccids/ccid3.c
54365--- linux-2.6.32.16/net/dccp/ccids/ccid3.c 2010-07-05 14:14:00.000000000 -0400 54410--- linux-2.6.32.18/net/dccp/ccids/ccid3.c 2010-08-10 13:45:57.000000000 -0400
54366+++ linux-2.6.32.16/net/dccp/ccids/ccid3.c 2010-07-09 14:50:39.000000000 -0400 54411+++ linux-2.6.32.18/net/dccp/ccids/ccid3.c 2010-08-11 18:57:33.000000000 -0400
54367@@ -41,7 +41,7 @@ 54412@@ -41,7 +41,7 @@
54368 static int ccid3_debug; 54413 static int ccid3_debug;
54369 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) 54414 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -54373,9 +54418,9 @@ diff -urNp linux-2.6.32.16/net/dccp/ccids/ccid3.c linux-2.6.32.16/net/dccp/ccids
54373 #endif 54418 #endif
54374 54419
54375 /* 54420 /*
54376diff -urNp linux-2.6.32.16/net/dccp/dccp.h linux-2.6.32.16/net/dccp/dccp.h 54421diff -urNp linux-2.6.32.18/net/dccp/dccp.h linux-2.6.32.18/net/dccp/dccp.h
54377--- linux-2.6.32.16/net/dccp/dccp.h 2010-07-05 14:14:00.000000000 -0400 54422--- linux-2.6.32.18/net/dccp/dccp.h 2010-08-10 13:45:57.000000000 -0400
54378+++ linux-2.6.32.16/net/dccp/dccp.h 2010-07-09 14:50:39.000000000 -0400 54423+++ linux-2.6.32.18/net/dccp/dccp.h 2010-08-11 18:57:33.000000000 -0400
54379@@ -44,9 +44,9 @@ extern int dccp_debug; 54424@@ -44,9 +44,9 @@ extern int dccp_debug;
54380 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) 54425 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
54381 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) 54426 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -54389,9 +54434,9 @@ diff -urNp linux-2.6.32.16/net/dccp/dccp.h linux-2.6.32.16/net/dccp/dccp.h
54389 #endif 54434 #endif
54390 54435
54391 extern struct inet_hashinfo dccp_hashinfo; 54436 extern struct inet_hashinfo dccp_hashinfo;
54392diff -urNp linux-2.6.32.16/net/decnet/sysctl_net_decnet.c linux-2.6.32.16/net/decnet/sysctl_net_decnet.c 54437diff -urNp linux-2.6.32.18/net/decnet/sysctl_net_decnet.c linux-2.6.32.18/net/decnet/sysctl_net_decnet.c
54393--- linux-2.6.32.16/net/decnet/sysctl_net_decnet.c 2010-07-05 14:14:00.000000000 -0400 54438--- linux-2.6.32.18/net/decnet/sysctl_net_decnet.c 2010-08-10 13:45:57.000000000 -0400
54394+++ linux-2.6.32.16/net/decnet/sysctl_net_decnet.c 2010-07-09 14:50:39.000000000 -0400 54439+++ linux-2.6.32.18/net/decnet/sysctl_net_decnet.c 2010-08-11 18:57:33.000000000 -0400
54395@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t 54440@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
54396 54441
54397 if (len > *lenp) len = *lenp; 54442 if (len > *lenp) len = *lenp;
@@ -54410,9 +54455,9 @@ diff -urNp linux-2.6.32.16/net/decnet/sysctl_net_decnet.c linux-2.6.32.16/net/de
54410 return -EFAULT; 54455 return -EFAULT;
54411 54456
54412 *lenp = len; 54457 *lenp = len;
54413diff -urNp linux-2.6.32.16/net/ipv4/inet_hashtables.c linux-2.6.32.16/net/ipv4/inet_hashtables.c 54458diff -urNp linux-2.6.32.18/net/ipv4/inet_hashtables.c linux-2.6.32.18/net/ipv4/inet_hashtables.c
54414--- linux-2.6.32.16/net/ipv4/inet_hashtables.c 2010-07-05 14:14:00.000000000 -0400 54459--- linux-2.6.32.18/net/ipv4/inet_hashtables.c 2010-08-10 13:45:57.000000000 -0400
54415+++ linux-2.6.32.16/net/ipv4/inet_hashtables.c 2010-07-09 14:50:39.000000000 -0400 54460+++ linux-2.6.32.18/net/ipv4/inet_hashtables.c 2010-08-11 18:57:33.000000000 -0400
54416@@ -18,11 +18,14 @@ 54461@@ -18,11 +18,14 @@
54417 #include <linux/sched.h> 54462 #include <linux/sched.h>
54418 #include <linux/slab.h> 54463 #include <linux/slab.h>
@@ -54437,9 +54482,9 @@ diff -urNp linux-2.6.32.16/net/ipv4/inet_hashtables.c linux-2.6.32.16/net/ipv4/i
54437 if (tw) { 54482 if (tw) {
54438 inet_twsk_deschedule(tw, death_row); 54483 inet_twsk_deschedule(tw, death_row);
54439 inet_twsk_put(tw); 54484 inet_twsk_put(tw);
54440diff -urNp linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c 54485diff -urNp linux-2.6.32.18/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.18/net/ipv4/netfilter/nf_nat_snmp_basic.c
54441--- linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-07-05 14:14:00.000000000 -0400 54486--- linux-2.6.32.18/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-10 13:45:57.000000000 -0400
54442+++ linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-07-09 14:50:39.000000000 -0400 54487+++ linux-2.6.32.18/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-11 18:57:33.000000000 -0400
54443@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( 54488@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
54444 54489
54445 *len = 0; 54490 *len = 0;
@@ -54449,9 +54494,9 @@ diff -urNp linux-2.6.32.16/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.1
54449 if (*octets == NULL) { 54494 if (*octets == NULL) {
54450 if (net_ratelimit()) 54495 if (net_ratelimit())
54451 printk("OOM in bsalg (%d)\n", __LINE__); 54496 printk("OOM in bsalg (%d)\n", __LINE__);
54452diff -urNp linux-2.6.32.16/net/ipv4/tcp_ipv4.c linux-2.6.32.16/net/ipv4/tcp_ipv4.c 54497diff -urNp linux-2.6.32.18/net/ipv4/tcp_ipv4.c linux-2.6.32.18/net/ipv4/tcp_ipv4.c
54453--- linux-2.6.32.16/net/ipv4/tcp_ipv4.c 2010-07-05 14:14:00.000000000 -0400 54498--- linux-2.6.32.18/net/ipv4/tcp_ipv4.c 2010-08-10 13:45:57.000000000 -0400
54454+++ linux-2.6.32.16/net/ipv4/tcp_ipv4.c 2010-07-09 14:50:39.000000000 -0400 54499+++ linux-2.6.32.18/net/ipv4/tcp_ipv4.c 2010-08-11 18:58:10.000000000 -0400
54455@@ -84,6 +84,9 @@ 54500@@ -84,6 +84,9 @@
54456 int sysctl_tcp_tw_reuse __read_mostly; 54501 int sysctl_tcp_tw_reuse __read_mostly;
54457 int sysctl_tcp_low_latency __read_mostly; 54502 int sysctl_tcp_low_latency __read_mostly;
@@ -54462,7 +54507,17 @@ diff -urNp linux-2.6.32.16/net/ipv4/tcp_ipv4.c linux-2.6.32.16/net/ipv4/tcp_ipv4
54462 54507
54463 #ifdef CONFIG_TCP_MD5SIG 54508 #ifdef CONFIG_TCP_MD5SIG
54464 static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk, 54509 static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
54465@@ -1603,12 +1606,20 @@ int tcp_v4_rcv(struct sk_buff *skb) 54510@@ -1542,6 +1545,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
54511 return 0;
54512
54513 reset:
54514+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
54515+ if (!grsec_enable_blackhole)
54516+#endif
54517 tcp_v4_send_reset(rsk, skb);
54518 discard:
54519 kfree_skb(skb);
54520@@ -1603,12 +1609,20 @@ int tcp_v4_rcv(struct sk_buff *skb)
54466 TCP_SKB_CB(skb)->sacked = 0; 54521 TCP_SKB_CB(skb)->sacked = 0;
54467 54522
54468 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest); 54523 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
@@ -54485,7 +54540,7 @@ diff -urNp linux-2.6.32.16/net/ipv4/tcp_ipv4.c linux-2.6.32.16/net/ipv4/tcp_ipv4
54485 54540
54486 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) 54541 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
54487 goto discard_and_relse; 54542 goto discard_and_relse;
54488@@ -1650,6 +1661,10 @@ no_tcp_socket: 54543@@ -1650,6 +1664,10 @@ no_tcp_socket:
54489 bad_packet: 54544 bad_packet:
54490 TCP_INC_STATS_BH(net, TCP_MIB_INERRS); 54545 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
54491 } else { 54546 } else {
@@ -54496,9 +54551,9 @@ diff -urNp linux-2.6.32.16/net/ipv4/tcp_ipv4.c linux-2.6.32.16/net/ipv4/tcp_ipv4
54496 tcp_v4_send_reset(NULL, skb); 54551 tcp_v4_send_reset(NULL, skb);
54497 } 54552 }
54498 54553
54499diff -urNp linux-2.6.32.16/net/ipv4/tcp_minisocks.c linux-2.6.32.16/net/ipv4/tcp_minisocks.c 54554diff -urNp linux-2.6.32.18/net/ipv4/tcp_minisocks.c linux-2.6.32.18/net/ipv4/tcp_minisocks.c
54500--- linux-2.6.32.16/net/ipv4/tcp_minisocks.c 2010-07-05 14:14:00.000000000 -0400 54555--- linux-2.6.32.18/net/ipv4/tcp_minisocks.c 2010-08-10 13:45:57.000000000 -0400
54501+++ linux-2.6.32.16/net/ipv4/tcp_minisocks.c 2010-07-09 14:50:39.000000000 -0400 54556+++ linux-2.6.32.18/net/ipv4/tcp_minisocks.c 2010-08-11 18:57:33.000000000 -0400
54502@@ -26,6 +26,10 @@ 54557@@ -26,6 +26,10 @@
54503 #include <net/inet_common.h> 54558 #include <net/inet_common.h>
54504 #include <net/xfrm.h> 54559 #include <net/xfrm.h>
@@ -54521,9 +54576,9 @@ diff -urNp linux-2.6.32.16/net/ipv4/tcp_minisocks.c linux-2.6.32.16/net/ipv4/tcp
54521 if (!(flg & TCP_FLAG_RST)) 54576 if (!(flg & TCP_FLAG_RST))
54522 req->rsk_ops->send_reset(sk, skb); 54577 req->rsk_ops->send_reset(sk, skb);
54523 54578
54524diff -urNp linux-2.6.32.16/net/ipv4/tcp_probe.c linux-2.6.32.16/net/ipv4/tcp_probe.c 54579diff -urNp linux-2.6.32.18/net/ipv4/tcp_probe.c linux-2.6.32.18/net/ipv4/tcp_probe.c
54525--- linux-2.6.32.16/net/ipv4/tcp_probe.c 2010-07-05 14:14:00.000000000 -0400 54580--- linux-2.6.32.18/net/ipv4/tcp_probe.c 2010-08-10 13:45:57.000000000 -0400
54526+++ linux-2.6.32.16/net/ipv4/tcp_probe.c 2010-07-09 14:50:39.000000000 -0400 54581+++ linux-2.6.32.18/net/ipv4/tcp_probe.c 2010-08-11 18:57:33.000000000 -0400
54527@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file 54582@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
54528 if (cnt + width >= len) 54583 if (cnt + width >= len)
54529 break; 54584 break;
@@ -54533,9 +54588,9 @@ diff -urNp linux-2.6.32.16/net/ipv4/tcp_probe.c linux-2.6.32.16/net/ipv4/tcp_pro
54533 return -EFAULT; 54588 return -EFAULT;
54534 cnt += width; 54589 cnt += width;
54535 } 54590 }
54536diff -urNp linux-2.6.32.16/net/ipv4/tcp_timer.c linux-2.6.32.16/net/ipv4/tcp_timer.c 54591diff -urNp linux-2.6.32.18/net/ipv4/tcp_timer.c linux-2.6.32.18/net/ipv4/tcp_timer.c
54537--- linux-2.6.32.16/net/ipv4/tcp_timer.c 2010-07-05 14:14:00.000000000 -0400 54592--- linux-2.6.32.18/net/ipv4/tcp_timer.c 2010-08-10 13:45:57.000000000 -0400
54538+++ linux-2.6.32.16/net/ipv4/tcp_timer.c 2010-07-09 14:50:39.000000000 -0400 54593+++ linux-2.6.32.18/net/ipv4/tcp_timer.c 2010-08-11 18:57:33.000000000 -0400
54539@@ -21,6 +21,10 @@ 54594@@ -21,6 +21,10 @@
54540 #include <linux/module.h> 54595 #include <linux/module.h>
54541 #include <net/tcp.h> 54596 #include <net/tcp.h>
@@ -54561,9 +54616,9 @@ diff -urNp linux-2.6.32.16/net/ipv4/tcp_timer.c linux-2.6.32.16/net/ipv4/tcp_tim
54561 if (retransmits_timed_out(sk, retry_until)) { 54616 if (retransmits_timed_out(sk, retry_until)) {
54562 /* Has it gone just too far? */ 54617 /* Has it gone just too far? */
54563 tcp_write_err(sk); 54618 tcp_write_err(sk);
54564diff -urNp linux-2.6.32.16/net/ipv4/udp.c linux-2.6.32.16/net/ipv4/udp.c 54619diff -urNp linux-2.6.32.18/net/ipv4/udp.c linux-2.6.32.18/net/ipv4/udp.c
54565--- linux-2.6.32.16/net/ipv4/udp.c 2010-07-05 14:14:00.000000000 -0400 54620--- linux-2.6.32.18/net/ipv4/udp.c 2010-08-10 13:45:57.000000000 -0400
54566+++ linux-2.6.32.16/net/ipv4/udp.c 2010-07-09 14:50:39.000000000 -0400 54621+++ linux-2.6.32.18/net/ipv4/udp.c 2010-08-11 18:57:33.000000000 -0400
54567@@ -86,6 +86,7 @@ 54622@@ -86,6 +86,7 @@
54568 #include <linux/types.h> 54623 #include <linux/types.h>
54569 #include <linux/fcntl.h> 54624 #include <linux/fcntl.h>
@@ -54633,9 +54688,9 @@ diff -urNp linux-2.6.32.16/net/ipv4/udp.c linux-2.6.32.16/net/ipv4/udp.c
54633 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); 54688 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
54634 54689
54635 /* 54690 /*
54636diff -urNp linux-2.6.32.16/net/ipv6/exthdrs.c linux-2.6.32.16/net/ipv6/exthdrs.c 54691diff -urNp linux-2.6.32.18/net/ipv6/exthdrs.c linux-2.6.32.18/net/ipv6/exthdrs.c
54637--- linux-2.6.32.16/net/ipv6/exthdrs.c 2010-07-05 14:14:00.000000000 -0400 54692--- linux-2.6.32.18/net/ipv6/exthdrs.c 2010-08-10 13:45:57.000000000 -0400
54638+++ linux-2.6.32.16/net/ipv6/exthdrs.c 2010-07-09 14:50:39.000000000 -0400 54693+++ linux-2.6.32.18/net/ipv6/exthdrs.c 2010-08-11 18:57:33.000000000 -0400
54639@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt 54694@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
54640 .type = IPV6_TLV_JUMBO, 54695 .type = IPV6_TLV_JUMBO,
54641 .func = ipv6_hop_jumbo, 54696 .func = ipv6_hop_jumbo,
@@ -54645,9 +54700,9 @@ diff -urNp linux-2.6.32.16/net/ipv6/exthdrs.c linux-2.6.32.16/net/ipv6/exthdrs.c
54645 }; 54700 };
54646 54701
54647 int ipv6_parse_hopopts(struct sk_buff *skb) 54702 int ipv6_parse_hopopts(struct sk_buff *skb)
54648diff -urNp linux-2.6.32.16/net/ipv6/raw.c linux-2.6.32.16/net/ipv6/raw.c 54703diff -urNp linux-2.6.32.18/net/ipv6/raw.c linux-2.6.32.18/net/ipv6/raw.c
54649--- linux-2.6.32.16/net/ipv6/raw.c 2010-07-05 14:14:00.000000000 -0400 54704--- linux-2.6.32.18/net/ipv6/raw.c 2010-08-10 13:45:57.000000000 -0400
54650+++ linux-2.6.32.16/net/ipv6/raw.c 2010-07-09 14:50:39.000000000 -0400 54705+++ linux-2.6.32.18/net/ipv6/raw.c 2010-08-11 18:57:33.000000000 -0400
54651@@ -600,7 +600,7 @@ out: 54706@@ -600,7 +600,7 @@ out:
54652 return err; 54707 return err;
54653 } 54708 }
@@ -54657,9 +54712,9 @@ diff -urNp linux-2.6.32.16/net/ipv6/raw.c linux-2.6.32.16/net/ipv6/raw.c
54657 struct flowi *fl, struct rt6_info *rt, 54712 struct flowi *fl, struct rt6_info *rt,
54658 unsigned int flags) 54713 unsigned int flags)
54659 { 54714 {
54660diff -urNp linux-2.6.32.16/net/ipv6/tcp_ipv6.c linux-2.6.32.16/net/ipv6/tcp_ipv6.c 54715diff -urNp linux-2.6.32.18/net/ipv6/tcp_ipv6.c linux-2.6.32.18/net/ipv6/tcp_ipv6.c
54661--- linux-2.6.32.16/net/ipv6/tcp_ipv6.c 2010-07-05 14:14:00.000000000 -0400 54716--- linux-2.6.32.18/net/ipv6/tcp_ipv6.c 2010-08-10 13:45:57.000000000 -0400
54662+++ linux-2.6.32.16/net/ipv6/tcp_ipv6.c 2010-07-09 14:50:39.000000000 -0400 54717+++ linux-2.6.32.18/net/ipv6/tcp_ipv6.c 2010-08-11 18:58:39.000000000 -0400
54663@@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 54718@@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
54664 } 54719 }
54665 #endif 54720 #endif
@@ -54671,7 +54726,17 @@ diff -urNp linux-2.6.32.16/net/ipv6/tcp_ipv6.c linux-2.6.32.16/net/ipv6/tcp_ipv6
54671 static void tcp_v6_hash(struct sock *sk) 54726 static void tcp_v6_hash(struct sock *sk)
54672 { 54727 {
54673 if (sk->sk_state != TCP_CLOSE) { 54728 if (sk->sk_state != TCP_CLOSE) {
54674@@ -1655,12 +1659,20 @@ static int tcp_v6_rcv(struct sk_buff *sk 54729@@ -1578,6 +1582,9 @@ static int tcp_v6_do_rcv(struct sock *sk
54730 return 0;
54731
54732 reset:
54733+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
54734+ if (!grsec_enable_blackhole)
54735+#endif
54736 tcp_v6_send_reset(sk, skb);
54737 discard:
54738 if (opt_skb)
54739@@ -1655,12 +1662,20 @@ static int tcp_v6_rcv(struct sk_buff *sk
54675 TCP_SKB_CB(skb)->sacked = 0; 54740 TCP_SKB_CB(skb)->sacked = 0;
54676 54741
54677 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest); 54742 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
@@ -54694,7 +54759,7 @@ diff -urNp linux-2.6.32.16/net/ipv6/tcp_ipv6.c linux-2.6.32.16/net/ipv6/tcp_ipv6
54694 54759
54695 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) 54760 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))
54696 goto discard_and_relse; 54761 goto discard_and_relse;
54697@@ -1700,6 +1712,10 @@ no_tcp_socket: 54762@@ -1700,6 +1715,10 @@ no_tcp_socket:
54698 bad_packet: 54763 bad_packet:
54699 TCP_INC_STATS_BH(net, TCP_MIB_INERRS); 54764 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
54700 } else { 54765 } else {
@@ -54705,9 +54770,9 @@ diff -urNp linux-2.6.32.16/net/ipv6/tcp_ipv6.c linux-2.6.32.16/net/ipv6/tcp_ipv6
54705 tcp_v6_send_reset(NULL, skb); 54770 tcp_v6_send_reset(NULL, skb);
54706 } 54771 }
54707 54772
54708diff -urNp linux-2.6.32.16/net/ipv6/udp.c linux-2.6.32.16/net/ipv6/udp.c 54773diff -urNp linux-2.6.32.18/net/ipv6/udp.c linux-2.6.32.18/net/ipv6/udp.c
54709--- linux-2.6.32.16/net/ipv6/udp.c 2010-07-05 14:14:00.000000000 -0400 54774--- linux-2.6.32.18/net/ipv6/udp.c 2010-08-10 13:45:57.000000000 -0400
54710+++ linux-2.6.32.16/net/ipv6/udp.c 2010-07-09 14:50:39.000000000 -0400 54775+++ linux-2.6.32.18/net/ipv6/udp.c 2010-08-11 18:57:33.000000000 -0400
54711@@ -49,6 +49,10 @@ 54776@@ -49,6 +49,10 @@
54712 #include <linux/seq_file.h> 54777 #include <linux/seq_file.h>
54713 #include "udp_impl.h" 54778 #include "udp_impl.h"
@@ -54729,9 +54794,9 @@ diff -urNp linux-2.6.32.16/net/ipv6/udp.c linux-2.6.32.16/net/ipv6/udp.c
54729 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); 54794 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
54730 54795
54731 kfree_skb(skb); 54796 kfree_skb(skb);
54732diff -urNp linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c 54797diff -urNp linux-2.6.32.18/net/irda/ircomm/ircomm_tty.c linux-2.6.32.18/net/irda/ircomm/ircomm_tty.c
54733--- linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c 2010-07-05 14:14:00.000000000 -0400 54798--- linux-2.6.32.18/net/irda/ircomm/ircomm_tty.c 2010-08-10 13:45:57.000000000 -0400
54734+++ linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c 2010-07-09 14:50:39.000000000 -0400 54799+++ linux-2.6.32.18/net/irda/ircomm/ircomm_tty.c 2010-08-11 18:57:33.000000000 -0400
54735@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st 54800@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
54736 add_wait_queue(&self->open_wait, &wait); 54801 add_wait_queue(&self->open_wait, &wait);
54737 54802
@@ -54854,9 +54919,9 @@ diff -urNp linux-2.6.32.16/net/irda/ircomm/ircomm_tty.c linux-2.6.32.16/net/irda
54854 seq_printf(m, "Max data size: %d\n", self->max_data_size); 54919 seq_printf(m, "Max data size: %d\n", self->max_data_size);
54855 seq_printf(m, "Max header size: %d\n", self->max_header_size); 54920 seq_printf(m, "Max header size: %d\n", self->max_header_size);
54856 54921
54857diff -urNp linux-2.6.32.16/net/mac80211/ieee80211_i.h linux-2.6.32.16/net/mac80211/ieee80211_i.h 54922diff -urNp linux-2.6.32.18/net/mac80211/ieee80211_i.h linux-2.6.32.18/net/mac80211/ieee80211_i.h
54858--- linux-2.6.32.16/net/mac80211/ieee80211_i.h 2010-07-05 14:14:00.000000000 -0400 54923--- linux-2.6.32.18/net/mac80211/ieee80211_i.h 2010-08-10 13:45:57.000000000 -0400
54859+++ linux-2.6.32.16/net/mac80211/ieee80211_i.h 2010-07-09 14:50:39.000000000 -0400 54924+++ linux-2.6.32.18/net/mac80211/ieee80211_i.h 2010-08-11 18:57:33.000000000 -0400
54860@@ -635,7 +635,7 @@ struct ieee80211_local { 54925@@ -635,7 +635,7 @@ struct ieee80211_local {
54861 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ 54926 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
54862 spinlock_t queue_stop_reason_lock; 54927 spinlock_t queue_stop_reason_lock;
@@ -54866,9 +54931,9 @@ diff -urNp linux-2.6.32.16/net/mac80211/ieee80211_i.h linux-2.6.32.16/net/mac802
54866 int monitors, cooked_mntrs; 54931 int monitors, cooked_mntrs;
54867 /* number of interfaces with corresponding FIF_ flags */ 54932 /* number of interfaces with corresponding FIF_ flags */
54868 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; 54933 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
54869diff -urNp linux-2.6.32.16/net/mac80211/iface.c linux-2.6.32.16/net/mac80211/iface.c 54934diff -urNp linux-2.6.32.18/net/mac80211/iface.c linux-2.6.32.18/net/mac80211/iface.c
54870--- linux-2.6.32.16/net/mac80211/iface.c 2010-07-05 14:14:00.000000000 -0400 54935--- linux-2.6.32.18/net/mac80211/iface.c 2010-08-10 13:45:57.000000000 -0400
54871+++ linux-2.6.32.16/net/mac80211/iface.c 2010-07-09 14:50:39.000000000 -0400 54936+++ linux-2.6.32.18/net/mac80211/iface.c 2010-08-11 18:57:33.000000000 -0400
54872@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev 54937@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
54873 break; 54938 break;
54874 } 54939 }
@@ -54923,9 +54988,9 @@ diff -urNp linux-2.6.32.16/net/mac80211/iface.c linux-2.6.32.16/net/mac80211/ifa
54923 ieee80211_clear_tx_pending(local); 54988 ieee80211_clear_tx_pending(local);
54924 ieee80211_stop_device(local); 54989 ieee80211_stop_device(local);
54925 54990
54926diff -urNp linux-2.6.32.16/net/mac80211/main.c linux-2.6.32.16/net/mac80211/main.c 54991diff -urNp linux-2.6.32.18/net/mac80211/main.c linux-2.6.32.18/net/mac80211/main.c
54927--- linux-2.6.32.16/net/mac80211/main.c 2010-07-05 14:14:00.000000000 -0400 54992--- linux-2.6.32.18/net/mac80211/main.c 2010-08-10 13:45:57.000000000 -0400
54928+++ linux-2.6.32.16/net/mac80211/main.c 2010-07-09 14:50:39.000000000 -0400 54993+++ linux-2.6.32.18/net/mac80211/main.c 2010-08-11 18:57:33.000000000 -0400
54929@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 54994@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
54930 local->hw.conf.power_level = power; 54995 local->hw.conf.power_level = power;
54931 } 54996 }
@@ -54935,9 +55000,9 @@ diff -urNp linux-2.6.32.16/net/mac80211/main.c linux-2.6.32.16/net/mac80211/main
54935 ret = drv_config(local, changed); 55000 ret = drv_config(local, changed);
54936 /* 55001 /*
54937 * Goal: 55002 * Goal:
54938diff -urNp linux-2.6.32.16/net/mac80211/pm.c linux-2.6.32.16/net/mac80211/pm.c 55003diff -urNp linux-2.6.32.18/net/mac80211/pm.c linux-2.6.32.18/net/mac80211/pm.c
54939--- linux-2.6.32.16/net/mac80211/pm.c 2010-07-05 14:14:00.000000000 -0400 55004--- linux-2.6.32.18/net/mac80211/pm.c 2010-08-10 13:45:57.000000000 -0400
54940+++ linux-2.6.32.16/net/mac80211/pm.c 2010-07-09 14:50:39.000000000 -0400 55005+++ linux-2.6.32.18/net/mac80211/pm.c 2010-08-11 18:57:33.000000000 -0400
54941@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 55006@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
54942 } 55007 }
54943 55008
@@ -54947,9 +55012,9 @@ diff -urNp linux-2.6.32.16/net/mac80211/pm.c linux-2.6.32.16/net/mac80211/pm.c
54947 ieee80211_stop_device(local); 55012 ieee80211_stop_device(local);
54948 55013
54949 local->suspended = true; 55014 local->suspended = true;
54950diff -urNp linux-2.6.32.16/net/mac80211/rate.c linux-2.6.32.16/net/mac80211/rate.c 55015diff -urNp linux-2.6.32.18/net/mac80211/rate.c linux-2.6.32.18/net/mac80211/rate.c
54951--- linux-2.6.32.16/net/mac80211/rate.c 2010-07-05 14:14:00.000000000 -0400 55016--- linux-2.6.32.18/net/mac80211/rate.c 2010-08-10 13:45:57.000000000 -0400
54952+++ linux-2.6.32.16/net/mac80211/rate.c 2010-07-09 14:50:39.000000000 -0400 55017+++ linux-2.6.32.18/net/mac80211/rate.c 2010-08-11 18:57:33.000000000 -0400
54953@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct 55018@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
54954 struct rate_control_ref *ref, *old; 55019 struct rate_control_ref *ref, *old;
54955 55020
@@ -54959,9 +55024,9 @@ diff -urNp linux-2.6.32.16/net/mac80211/rate.c linux-2.6.32.16/net/mac80211/rate
54959 return -EBUSY; 55024 return -EBUSY;
54960 55025
54961 ref = rate_control_alloc(name, local); 55026 ref = rate_control_alloc(name, local);
54962diff -urNp linux-2.6.32.16/net/mac80211/tx.c linux-2.6.32.16/net/mac80211/tx.c 55027diff -urNp linux-2.6.32.18/net/mac80211/tx.c linux-2.6.32.18/net/mac80211/tx.c
54963--- linux-2.6.32.16/net/mac80211/tx.c 2010-07-05 14:14:00.000000000 -0400 55028--- linux-2.6.32.18/net/mac80211/tx.c 2010-08-10 13:45:57.000000000 -0400
54964+++ linux-2.6.32.16/net/mac80211/tx.c 2010-07-09 14:50:39.000000000 -0400 55029+++ linux-2.6.32.18/net/mac80211/tx.c 2010-08-11 18:57:33.000000000 -0400
54965@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct 55030@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
54966 return cpu_to_le16(dur); 55031 return cpu_to_le16(dur);
54967 } 55032 }
@@ -54971,9 +55036,9 @@ diff -urNp linux-2.6.32.16/net/mac80211/tx.c linux-2.6.32.16/net/mac80211/tx.c
54971 struct net_device *dev) 55036 struct net_device *dev)
54972 { 55037 {
54973 return local == wdev_priv(dev->ieee80211_ptr); 55038 return local == wdev_priv(dev->ieee80211_ptr);
54974diff -urNp linux-2.6.32.16/net/mac80211/util.c linux-2.6.32.16/net/mac80211/util.c 55039diff -urNp linux-2.6.32.18/net/mac80211/util.c linux-2.6.32.18/net/mac80211/util.c
54975--- linux-2.6.32.16/net/mac80211/util.c 2010-07-05 14:14:00.000000000 -0400 55040--- linux-2.6.32.18/net/mac80211/util.c 2010-08-10 13:45:57.000000000 -0400
54976+++ linux-2.6.32.16/net/mac80211/util.c 2010-07-09 14:50:39.000000000 -0400 55041+++ linux-2.6.32.18/net/mac80211/util.c 2010-08-11 18:57:33.000000000 -0400
54977@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ 55042@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_
54978 local->resuming = true; 55043 local->resuming = true;
54979 55044
@@ -54991,9 +55056,9 @@ diff -urNp linux-2.6.32.16/net/mac80211/util.c linux-2.6.32.16/net/mac80211/util
54991 if (res) { 55056 if (res) {
54992 WARN(local->suspended, "Harware became unavailable " 55057 WARN(local->suspended, "Harware became unavailable "
54993 "upon resume. This is could be a software issue" 55058 "upon resume. This is could be a software issue"
54994diff -urNp linux-2.6.32.16/net/sctp/socket.c linux-2.6.32.16/net/sctp/socket.c 55059diff -urNp linux-2.6.32.18/net/sctp/socket.c linux-2.6.32.18/net/sctp/socket.c
54995--- linux-2.6.32.16/net/sctp/socket.c 2010-07-05 14:14:00.000000000 -0400 55060--- linux-2.6.32.18/net/sctp/socket.c 2010-08-10 13:45:57.000000000 -0400
54996+++ linux-2.6.32.16/net/sctp/socket.c 2010-07-09 14:50:39.000000000 -0400 55061+++ linux-2.6.32.18/net/sctp/socket.c 2010-08-11 18:57:33.000000000 -0400
54997@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc 55062@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
54998 struct sctp_sndrcvinfo *sinfo; 55063 struct sctp_sndrcvinfo *sinfo;
54999 struct sctp_initmsg *sinit; 55064 struct sctp_initmsg *sinit;
@@ -55011,9 +55076,9 @@ diff -urNp linux-2.6.32.16/net/sctp/socket.c linux-2.6.32.16/net/sctp/socket.c
55011 55076
55012 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); 55077 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
55013 if (pp->fastreuse && sk->sk_reuse && 55078 if (pp->fastreuse && sk->sk_reuse &&
55014diff -urNp linux-2.6.32.16/net/socket.c linux-2.6.32.16/net/socket.c 55079diff -urNp linux-2.6.32.18/net/socket.c linux-2.6.32.18/net/socket.c
55015--- linux-2.6.32.16/net/socket.c 2010-07-05 14:14:00.000000000 -0400 55080--- linux-2.6.32.18/net/socket.c 2010-08-10 13:45:57.000000000 -0400
55016+++ linux-2.6.32.16/net/socket.c 2010-07-09 14:50:39.000000000 -0400 55081+++ linux-2.6.32.18/net/socket.c 2010-08-11 18:57:33.000000000 -0400
55017@@ -87,6 +87,7 @@ 55082@@ -87,6 +87,7 @@
55018 #include <linux/wireless.h> 55083 #include <linux/wireless.h>
55019 #include <linux/nsproxy.h> 55084 #include <linux/nsproxy.h>
@@ -55168,9 +55233,9 @@ diff -urNp linux-2.6.32.16/net/socket.c linux-2.6.32.16/net/socket.c
55168 err = 55233 err =
55169 security_socket_connect(sock, (struct sockaddr *)&address, addrlen); 55234 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
55170 if (err) 55235 if (err)
55171diff -urNp linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c 55236diff -urNp linux-2.6.32.18/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.18/net/sunrpc/xprtrdma/svc_rdma.c
55172--- linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c 2010-07-05 14:14:00.000000000 -0400 55237--- linux-2.6.32.18/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-10 13:45:57.000000000 -0400
55173+++ linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c 2010-07-09 14:50:39.000000000 -0400 55238+++ linux-2.6.32.18/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-11 18:57:33.000000000 -0400
55174@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta 55239@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
55175 len -= *ppos; 55240 len -= *ppos;
55176 if (len > *lenp) 55241 if (len > *lenp)
@@ -55180,9 +55245,9 @@ diff -urNp linux-2.6.32.16/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.16/net/su
55180 return -EFAULT; 55245 return -EFAULT;
55181 *lenp = len; 55246 *lenp = len;
55182 *ppos += len; 55247 *ppos += len;
55183diff -urNp linux-2.6.32.16/net/sysctl_net.c linux-2.6.32.16/net/sysctl_net.c 55248diff -urNp linux-2.6.32.18/net/sysctl_net.c linux-2.6.32.18/net/sysctl_net.c
55184--- linux-2.6.32.16/net/sysctl_net.c 2010-07-05 14:14:00.000000000 -0400 55249--- linux-2.6.32.18/net/sysctl_net.c 2010-08-10 13:45:57.000000000 -0400
55185+++ linux-2.6.32.16/net/sysctl_net.c 2010-07-09 14:50:39.000000000 -0400 55250+++ linux-2.6.32.18/net/sysctl_net.c 2010-08-11 18:57:33.000000000 -0400
55186@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct 55251@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
55187 struct ctl_table *table) 55252 struct ctl_table *table)
55188 { 55253 {
@@ -55192,9 +55257,9 @@ diff -urNp linux-2.6.32.16/net/sysctl_net.c linux-2.6.32.16/net/sysctl_net.c
55192 int mode = (table->mode >> 6) & 7; 55257 int mode = (table->mode >> 6) & 7;
55193 return (mode << 6) | (mode << 3) | mode; 55258 return (mode << 6) | (mode << 3) | mode;
55194 } 55259 }
55195diff -urNp linux-2.6.32.16/net/tipc/socket.c linux-2.6.32.16/net/tipc/socket.c 55260diff -urNp linux-2.6.32.18/net/tipc/socket.c linux-2.6.32.18/net/tipc/socket.c
55196--- linux-2.6.32.16/net/tipc/socket.c 2010-07-05 14:14:00.000000000 -0400 55261--- linux-2.6.32.18/net/tipc/socket.c 2010-08-10 13:45:57.000000000 -0400
55197+++ linux-2.6.32.16/net/tipc/socket.c 2010-07-09 14:50:39.000000000 -0400 55262+++ linux-2.6.32.18/net/tipc/socket.c 2010-08-11 18:57:33.000000000 -0400
55198@@ -1449,8 +1449,9 @@ static int connect(struct socket *sock, 55263@@ -1449,8 +1449,9 @@ static int connect(struct socket *sock,
55199 } else { 55264 } else {
55200 if (res == 0) 55265 if (res == 0)
@@ -55207,9 +55272,9 @@ diff -urNp linux-2.6.32.16/net/tipc/socket.c linux-2.6.32.16/net/tipc/socket.c
55207 sock->state = SS_DISCONNECTING; 55272 sock->state = SS_DISCONNECTING;
55208 } 55273 }
55209 55274
55210diff -urNp linux-2.6.32.16/net/unix/af_unix.c linux-2.6.32.16/net/unix/af_unix.c 55275diff -urNp linux-2.6.32.18/net/unix/af_unix.c linux-2.6.32.18/net/unix/af_unix.c
55211--- linux-2.6.32.16/net/unix/af_unix.c 2010-07-05 14:14:00.000000000 -0400 55276--- linux-2.6.32.18/net/unix/af_unix.c 2010-08-10 13:45:57.000000000 -0400
55212+++ linux-2.6.32.16/net/unix/af_unix.c 2010-07-09 14:50:39.000000000 -0400 55277+++ linux-2.6.32.18/net/unix/af_unix.c 2010-08-11 18:57:33.000000000 -0400
55213@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru 55278@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru
55214 err = -ECONNREFUSED; 55279 err = -ECONNREFUSED;
55215 if (!S_ISSOCK(inode->i_mode)) 55280 if (!S_ISSOCK(inode->i_mode))
@@ -55267,9 +55332,9 @@ diff -urNp linux-2.6.32.16/net/unix/af_unix.c linux-2.6.32.16/net/unix/af_unix.c
55267 list = &unix_socket_table[addr->hash]; 55332 list = &unix_socket_table[addr->hash];
55268 } else { 55333 } else {
55269 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; 55334 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
55270diff -urNp linux-2.6.32.16/net/wireless/wext.c linux-2.6.32.16/net/wireless/wext.c 55335diff -urNp linux-2.6.32.18/net/wireless/wext.c linux-2.6.32.18/net/wireless/wext.c
55271--- linux-2.6.32.16/net/wireless/wext.c 2010-07-05 14:14:00.000000000 -0400 55336--- linux-2.6.32.18/net/wireless/wext.c 2010-08-10 13:45:57.000000000 -0400
55272+++ linux-2.6.32.16/net/wireless/wext.c 2010-07-09 14:50:39.000000000 -0400 55337+++ linux-2.6.32.18/net/wireless/wext.c 2010-08-11 18:57:33.000000000 -0400
55273@@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc 55338@@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc
55274 */ 55339 */
55275 55340
@@ -55280,9 +55345,9 @@ diff -urNp linux-2.6.32.16/net/wireless/wext.c linux-2.6.32.16/net/wireless/wext
55280 /* Allow userspace to GET more than max so 55345 /* Allow userspace to GET more than max so
55281 * we can support any size GET requests. 55346 * we can support any size GET requests.
55282 * There is still a limit : -ENOMEM. 55347 * There is still a limit : -ENOMEM.
55283diff -urNp linux-2.6.32.16/net/xfrm/xfrm_policy.c linux-2.6.32.16/net/xfrm/xfrm_policy.c 55348diff -urNp linux-2.6.32.18/net/xfrm/xfrm_policy.c linux-2.6.32.18/net/xfrm/xfrm_policy.c
55284--- linux-2.6.32.16/net/xfrm/xfrm_policy.c 2010-07-05 14:14:00.000000000 -0400 55349--- linux-2.6.32.18/net/xfrm/xfrm_policy.c 2010-08-10 13:45:57.000000000 -0400
55285+++ linux-2.6.32.16/net/xfrm/xfrm_policy.c 2010-07-09 14:50:39.000000000 -0400 55350+++ linux-2.6.32.18/net/xfrm/xfrm_policy.c 2010-08-11 18:57:33.000000000 -0400
55286@@ -1477,7 +1477,7 @@ free_dst: 55351@@ -1477,7 +1477,7 @@ free_dst:
55287 goto out; 55352 goto out;
55288 } 55353 }
@@ -55310,9 +55375,9 @@ diff -urNp linux-2.6.32.16/net/xfrm/xfrm_policy.c linux-2.6.32.16/net/xfrm/xfrm_
55310 xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) 55375 xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
55311 { 55376 {
55312 #ifdef CONFIG_XFRM_SUB_POLICY 55377 #ifdef CONFIG_XFRM_SUB_POLICY
55313diff -urNp linux-2.6.32.16/samples/kobject/kset-example.c linux-2.6.32.16/samples/kobject/kset-example.c 55378diff -urNp linux-2.6.32.18/samples/kobject/kset-example.c linux-2.6.32.18/samples/kobject/kset-example.c
55314--- linux-2.6.32.16/samples/kobject/kset-example.c 2010-07-05 14:14:00.000000000 -0400 55379--- linux-2.6.32.18/samples/kobject/kset-example.c 2010-08-10 13:45:57.000000000 -0400
55315+++ linux-2.6.32.16/samples/kobject/kset-example.c 2010-07-09 14:50:39.000000000 -0400 55380+++ linux-2.6.32.18/samples/kobject/kset-example.c 2010-08-11 18:57:33.000000000 -0400
55316@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob 55381@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
55317 } 55382 }
55318 55383
@@ -55322,9 +55387,9 @@ diff -urNp linux-2.6.32.16/samples/kobject/kset-example.c linux-2.6.32.16/sample
55322 .show = foo_attr_show, 55387 .show = foo_attr_show,
55323 .store = foo_attr_store, 55388 .store = foo_attr_store,
55324 }; 55389 };
55325diff -urNp linux-2.6.32.16/scripts/basic/fixdep.c linux-2.6.32.16/scripts/basic/fixdep.c 55390diff -urNp linux-2.6.32.18/scripts/basic/fixdep.c linux-2.6.32.18/scripts/basic/fixdep.c
55326--- linux-2.6.32.16/scripts/basic/fixdep.c 2010-07-05 14:14:00.000000000 -0400 55391--- linux-2.6.32.18/scripts/basic/fixdep.c 2010-08-10 13:45:57.000000000 -0400
55327+++ linux-2.6.32.16/scripts/basic/fixdep.c 2010-07-09 14:50:39.000000000 -0400 55392+++ linux-2.6.32.18/scripts/basic/fixdep.c 2010-08-11 18:57:33.000000000 -0400
55328@@ -222,9 +222,9 @@ static void use_config(char *m, int slen 55393@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
55329 55394
55330 static void parse_config_file(char *map, size_t len) 55395 static void parse_config_file(char *map, size_t len)
@@ -55346,9 +55411,9 @@ diff -urNp linux-2.6.32.16/scripts/basic/fixdep.c linux-2.6.32.16/scripts/basic/
55346 55411
55347 if (*p != INT_CONF) { 55412 if (*p != INT_CONF) {
55348 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", 55413 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
55349diff -urNp linux-2.6.32.16/scripts/kallsyms.c linux-2.6.32.16/scripts/kallsyms.c 55414diff -urNp linux-2.6.32.18/scripts/kallsyms.c linux-2.6.32.18/scripts/kallsyms.c
55350--- linux-2.6.32.16/scripts/kallsyms.c 2010-07-05 14:14:00.000000000 -0400 55415--- linux-2.6.32.18/scripts/kallsyms.c 2010-08-10 13:45:57.000000000 -0400
55351+++ linux-2.6.32.16/scripts/kallsyms.c 2010-07-09 14:50:39.000000000 -0400 55416+++ linux-2.6.32.18/scripts/kallsyms.c 2010-08-11 18:57:33.000000000 -0400
55352@@ -43,10 +43,10 @@ struct text_range { 55417@@ -43,10 +43,10 @@ struct text_range {
55353 55418
55354 static unsigned long long _text; 55419 static unsigned long long _text;
@@ -55364,9 +55429,9 @@ diff -urNp linux-2.6.32.16/scripts/kallsyms.c linux-2.6.32.16/scripts/kallsyms.c
55364 }; 55429 };
55365 #define text_range_text (&text_ranges[0]) 55430 #define text_range_text (&text_ranges[0])
55366 #define text_range_inittext (&text_ranges[1]) 55431 #define text_range_inittext (&text_ranges[1])
55367diff -urNp linux-2.6.32.16/scripts/mod/file2alias.c linux-2.6.32.16/scripts/mod/file2alias.c 55432diff -urNp linux-2.6.32.18/scripts/mod/file2alias.c linux-2.6.32.18/scripts/mod/file2alias.c
55368--- linux-2.6.32.16/scripts/mod/file2alias.c 2010-07-05 14:14:00.000000000 -0400 55433--- linux-2.6.32.18/scripts/mod/file2alias.c 2010-08-10 13:45:57.000000000 -0400
55369+++ linux-2.6.32.16/scripts/mod/file2alias.c 2010-07-09 14:50:39.000000000 -0400 55434+++ linux-2.6.32.18/scripts/mod/file2alias.c 2010-08-11 18:57:33.000000000 -0400
55370@@ -72,7 +72,7 @@ static void device_id_check(const char * 55435@@ -72,7 +72,7 @@ static void device_id_check(const char *
55371 unsigned long size, unsigned long id_size, 55436 unsigned long size, unsigned long id_size,
55372 void *symval) 55437 void *symval)
@@ -55421,9 +55486,9 @@ diff -urNp linux-2.6.32.16/scripts/mod/file2alias.c linux-2.6.32.16/scripts/mod/
55421 55486
55422 sprintf(alias, "dmi*"); 55487 sprintf(alias, "dmi*");
55423 55488
55424diff -urNp linux-2.6.32.16/scripts/mod/modpost.c linux-2.6.32.16/scripts/mod/modpost.c 55489diff -urNp linux-2.6.32.18/scripts/mod/modpost.c linux-2.6.32.18/scripts/mod/modpost.c
55425--- linux-2.6.32.16/scripts/mod/modpost.c 2010-07-05 14:14:00.000000000 -0400 55490--- linux-2.6.32.18/scripts/mod/modpost.c 2010-08-10 13:45:57.000000000 -0400
55426+++ linux-2.6.32.16/scripts/mod/modpost.c 2010-07-09 14:50:39.000000000 -0400 55491+++ linux-2.6.32.18/scripts/mod/modpost.c 2010-08-11 18:57:33.000000000 -0400
55427@@ -835,6 +835,7 @@ enum mismatch { 55492@@ -835,6 +835,7 @@ enum mismatch {
55428 INIT_TO_EXIT, 55493 INIT_TO_EXIT,
55429 EXIT_TO_INIT, 55494 EXIT_TO_INIT,
@@ -55491,9 +55556,9 @@ diff -urNp linux-2.6.32.16/scripts/mod/modpost.c linux-2.6.32.16/scripts/mod/mod
55491 goto close_write; 55556 goto close_write;
55492 55557
55493 tmp = NOFAIL(malloc(b->pos)); 55558 tmp = NOFAIL(malloc(b->pos));
55494diff -urNp linux-2.6.32.16/scripts/mod/modpost.h linux-2.6.32.16/scripts/mod/modpost.h 55559diff -urNp linux-2.6.32.18/scripts/mod/modpost.h linux-2.6.32.18/scripts/mod/modpost.h
55495--- linux-2.6.32.16/scripts/mod/modpost.h 2010-07-05 14:14:00.000000000 -0400 55560--- linux-2.6.32.18/scripts/mod/modpost.h 2010-08-10 13:45:57.000000000 -0400
55496+++ linux-2.6.32.16/scripts/mod/modpost.h 2010-07-09 14:50:39.000000000 -0400 55561+++ linux-2.6.32.18/scripts/mod/modpost.h 2010-08-11 18:57:33.000000000 -0400
55497@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e 55562@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
55498 55563
55499 struct buffer { 55564 struct buffer {
@@ -55513,9 +55578,9 @@ diff -urNp linux-2.6.32.16/scripts/mod/modpost.h linux-2.6.32.16/scripts/mod/mod
55513 55578
55514 struct module { 55579 struct module {
55515 struct module *next; 55580 struct module *next;
55516diff -urNp linux-2.6.32.16/scripts/mod/sumversion.c linux-2.6.32.16/scripts/mod/sumversion.c 55581diff -urNp linux-2.6.32.18/scripts/mod/sumversion.c linux-2.6.32.18/scripts/mod/sumversion.c
55517--- linux-2.6.32.16/scripts/mod/sumversion.c 2010-07-05 14:14:00.000000000 -0400 55582--- linux-2.6.32.18/scripts/mod/sumversion.c 2010-08-10 13:45:57.000000000 -0400
55518+++ linux-2.6.32.16/scripts/mod/sumversion.c 2010-07-09 14:50:39.000000000 -0400 55583+++ linux-2.6.32.18/scripts/mod/sumversion.c 2010-08-11 18:57:33.000000000 -0400
55519@@ -455,7 +455,7 @@ static void write_version(const char *fi 55584@@ -455,7 +455,7 @@ static void write_version(const char *fi
55520 goto out; 55585 goto out;
55521 } 55586 }
@@ -55525,9 +55590,9 @@ diff -urNp linux-2.6.32.16/scripts/mod/sumversion.c linux-2.6.32.16/scripts/mod/
55525 warn("writing sum in %s failed: %s\n", 55590 warn("writing sum in %s failed: %s\n",
55526 filename, strerror(errno)); 55591 filename, strerror(errno));
55527 goto out; 55592 goto out;
55528diff -urNp linux-2.6.32.16/scripts/pnmtologo.c linux-2.6.32.16/scripts/pnmtologo.c 55593diff -urNp linux-2.6.32.18/scripts/pnmtologo.c linux-2.6.32.18/scripts/pnmtologo.c
55529--- linux-2.6.32.16/scripts/pnmtologo.c 2010-07-05 14:14:00.000000000 -0400 55594--- linux-2.6.32.18/scripts/pnmtologo.c 2010-08-10 13:45:57.000000000 -0400
55530+++ linux-2.6.32.16/scripts/pnmtologo.c 2010-07-09 14:50:39.000000000 -0400 55595+++ linux-2.6.32.18/scripts/pnmtologo.c 2010-08-11 18:57:33.000000000 -0400
55531@@ -237,14 +237,14 @@ static void write_header(void) 55596@@ -237,14 +237,14 @@ static void write_header(void)
55532 fprintf(out, " * Linux logo %s\n", logoname); 55597 fprintf(out, " * Linux logo %s\n", logoname);
55533 fputs(" */\n\n", out); 55598 fputs(" */\n\n", out);
@@ -55554,9 +55619,9 @@ diff -urNp linux-2.6.32.16/scripts/pnmtologo.c linux-2.6.32.16/scripts/pnmtologo
55554 logoname); 55619 logoname);
55555 write_hex_cnt = 0; 55620 write_hex_cnt = 0;
55556 for (i = 0; i < logo_clutsize; i++) { 55621 for (i = 0; i < logo_clutsize; i++) {
55557diff -urNp linux-2.6.32.16/security/commoncap.c linux-2.6.32.16/security/commoncap.c 55622diff -urNp linux-2.6.32.18/security/commoncap.c linux-2.6.32.18/security/commoncap.c
55558--- linux-2.6.32.16/security/commoncap.c 2010-07-05 14:14:00.000000000 -0400 55623--- linux-2.6.32.18/security/commoncap.c 2010-08-10 13:45:57.000000000 -0400
55559+++ linux-2.6.32.16/security/commoncap.c 2010-07-09 14:50:39.000000000 -0400 55624+++ linux-2.6.32.18/security/commoncap.c 2010-08-11 18:57:33.000000000 -0400
55560@@ -27,7 +27,7 @@ 55625@@ -27,7 +27,7 @@
55561 #include <linux/sched.h> 55626 #include <linux/sched.h>
55562 #include <linux/prctl.h> 55627 #include <linux/prctl.h>
@@ -55579,9 +55644,9 @@ diff -urNp linux-2.6.32.16/security/commoncap.c linux-2.6.32.16/security/commonc
55579 return 0; 55644 return 0;
55580 } 55645 }
55581 55646
55582diff -urNp linux-2.6.32.16/security/integrity/ima/ima_api.c linux-2.6.32.16/security/integrity/ima/ima_api.c 55647diff -urNp linux-2.6.32.18/security/integrity/ima/ima_api.c linux-2.6.32.18/security/integrity/ima/ima_api.c
55583--- linux-2.6.32.16/security/integrity/ima/ima_api.c 2010-07-05 14:14:00.000000000 -0400 55648--- linux-2.6.32.18/security/integrity/ima/ima_api.c 2010-08-10 13:45:57.000000000 -0400
55584+++ linux-2.6.32.16/security/integrity/ima/ima_api.c 2010-07-09 14:50:39.000000000 -0400 55649+++ linux-2.6.32.18/security/integrity/ima/ima_api.c 2010-08-11 18:57:33.000000000 -0400
55585@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino 55650@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
55586 int result; 55651 int result;
55587 55652
@@ -55591,9 +55656,9 @@ diff -urNp linux-2.6.32.16/security/integrity/ima/ima_api.c linux-2.6.32.16/secu
55591 55656
55592 entry = kmalloc(sizeof(*entry), GFP_KERNEL); 55657 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
55593 if (!entry) { 55658 if (!entry) {
55594diff -urNp linux-2.6.32.16/security/integrity/ima/ima_fs.c linux-2.6.32.16/security/integrity/ima/ima_fs.c 55659diff -urNp linux-2.6.32.18/security/integrity/ima/ima_fs.c linux-2.6.32.18/security/integrity/ima/ima_fs.c
55595--- linux-2.6.32.16/security/integrity/ima/ima_fs.c 2010-07-05 14:14:00.000000000 -0400 55660--- linux-2.6.32.18/security/integrity/ima/ima_fs.c 2010-08-10 13:45:57.000000000 -0400
55596+++ linux-2.6.32.16/security/integrity/ima/ima_fs.c 2010-07-09 14:50:39.000000000 -0400 55661+++ linux-2.6.32.18/security/integrity/ima/ima_fs.c 2010-08-11 18:57:33.000000000 -0400
55597@@ -27,12 +27,12 @@ 55662@@ -27,12 +27,12 @@
55598 static int valid_policy = 1; 55663 static int valid_policy = 1;
55599 #define TMPBUFLEN 12 55664 #define TMPBUFLEN 12
@@ -55609,9 +55674,9 @@ diff -urNp linux-2.6.32.16/security/integrity/ima/ima_fs.c linux-2.6.32.16/secur
55609 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); 55674 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
55610 } 55675 }
55611 55676
55612diff -urNp linux-2.6.32.16/security/integrity/ima/ima.h linux-2.6.32.16/security/integrity/ima/ima.h 55677diff -urNp linux-2.6.32.18/security/integrity/ima/ima.h linux-2.6.32.18/security/integrity/ima/ima.h
55613--- linux-2.6.32.16/security/integrity/ima/ima.h 2010-07-05 14:14:00.000000000 -0400 55678--- linux-2.6.32.18/security/integrity/ima/ima.h 2010-08-10 13:45:57.000000000 -0400
55614+++ linux-2.6.32.16/security/integrity/ima/ima.h 2010-07-09 14:50:39.000000000 -0400 55679+++ linux-2.6.32.18/security/integrity/ima/ima.h 2010-08-11 18:57:33.000000000 -0400
55615@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino 55680@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
55616 extern spinlock_t ima_queue_lock; 55681 extern spinlock_t ima_queue_lock;
55617 55682
@@ -55623,9 +55688,9 @@ diff -urNp linux-2.6.32.16/security/integrity/ima/ima.h linux-2.6.32.16/security
55623 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; 55688 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
55624 }; 55689 };
55625 extern struct ima_h_table ima_htable; 55690 extern struct ima_h_table ima_htable;
55626diff -urNp linux-2.6.32.16/security/integrity/ima/ima_queue.c linux-2.6.32.16/security/integrity/ima/ima_queue.c 55691diff -urNp linux-2.6.32.18/security/integrity/ima/ima_queue.c linux-2.6.32.18/security/integrity/ima/ima_queue.c
55627--- linux-2.6.32.16/security/integrity/ima/ima_queue.c 2010-07-05 14:14:00.000000000 -0400 55692--- linux-2.6.32.18/security/integrity/ima/ima_queue.c 2010-08-10 13:45:57.000000000 -0400
55628+++ linux-2.6.32.16/security/integrity/ima/ima_queue.c 2010-07-09 14:50:39.000000000 -0400 55693+++ linux-2.6.32.18/security/integrity/ima/ima_queue.c 2010-08-11 18:57:33.000000000 -0400
55629@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i 55694@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
55630 INIT_LIST_HEAD(&qe->later); 55695 INIT_LIST_HEAD(&qe->later);
55631 list_add_tail_rcu(&qe->later, &ima_measurements); 55696 list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -55635,10 +55700,10 @@ diff -urNp linux-2.6.32.16/security/integrity/ima/ima_queue.c linux-2.6.32.16/se
55635 key = ima_hash_key(entry->digest); 55700 key = ima_hash_key(entry->digest);
55636 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); 55701 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
55637 return 0; 55702 return 0;
55638diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig 55703diff -urNp linux-2.6.32.18/security/Kconfig linux-2.6.32.18/security/Kconfig
55639--- linux-2.6.32.16/security/Kconfig 2010-07-05 14:14:00.000000000 -0400 55704--- linux-2.6.32.18/security/Kconfig 2010-08-10 13:45:57.000000000 -0400
55640+++ linux-2.6.32.16/security/Kconfig 2010-07-09 14:50:39.000000000 -0400 55705+++ linux-2.6.32.18/security/Kconfig 2010-08-11 22:24:24.000000000 -0400
55641@@ -4,6 +4,499 @@ 55706@@ -4,6 +4,498 @@
55642 55707
55643 menu "Security options" 55708 menu "Security options"
55644 55709
@@ -55655,6 +55720,10 @@ diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig
55655+ default 47 if !PAX_PER_CPU_PGD 55720+ default 47 if !PAX_PER_CPU_PGD
55656+ default 42 if PAX_PER_CPU_PGD 55721+ default 42 if PAX_PER_CPU_PGD
55657+ 55722+
55723+ config PAX_ENABLE_PAE
55724+ bool
55725+ default y if (X86_32 && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUM4 || MK7 || MK8 || MVIAC7 || MPSC || MCORE2 || MATOM))
55726+
55658+config PAX 55727+config PAX
55659+ bool "Enable various PaX features" 55728+ bool "Enable various PaX features"
55660+ depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS32 || MIPS64 || PARISC || PPC || SPARC || X86) 55729+ depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS32 || MIPS64 || PARISC || PPC || SPARC || X86)
@@ -55774,7 +55843,7 @@ diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig
55774+ 55843+
55775+config PAX_PAGEEXEC 55844+config PAX_PAGEEXEC
55776+ bool "Paging based non-executable pages" 55845+ bool "Paging based non-executable pages"
55777+ depends on PAX_NOEXEC && (!X86_32 || M586 || M586TSC || M586MMX || M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC || MK7 || MK8 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MVIAC3_2 || MVIAC7) 55846+ depends on PAX_NOEXEC && (!X86_32 || M586 || M586TSC || M586MMX || M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MATOM || MPENTIUM4 || MPSC || MK7 || MK8 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MVIAC3_2 || MVIAC7)
55778+ select S390_SWITCH_AMODE if S390 55847+ select S390_SWITCH_AMODE if S390
55779+ select S390_EXEC_PROTECT if S390 55848+ select S390_EXEC_PROTECT if S390
55780+ help 55849+ help
@@ -55875,9 +55944,10 @@ diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig
55875+ NOTE: you can use the 'chpax' or 'paxctl' utilities to control 55944+ NOTE: you can use the 'chpax' or 'paxctl' utilities to control
55876+ this feature on a per file basis. 55945+ this feature on a per file basis.
55877+ 55946+
55878+config PAX_NOELFRELOCS 55947+config PAX_ELFRELOCS
55879+ bool "Disallow ELF text relocations" 55948+ bool "Allow ELF text relocations (read help)"
55880+ depends on PAX_MPROTECT && !PAX_ETEXECRELOCS && (IA64 || PPC || X86) 55949+ depends on PAX_MPROTECT && (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
55950+ default n
55881+ help 55951+ help
55882+ Non-executable pages and mprotect() restrictions are effective 55952+ Non-executable pages and mprotect() restrictions are effective
55883+ in preventing the introduction of new executable code into an 55953+ in preventing the introduction of new executable code into an
@@ -55891,14 +55961,8 @@ diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig
55891+ the former approach is beyond PaX, the latter can be prevented 55961+ the former approach is beyond PaX, the latter can be prevented
55892+ by having only PIC ELF libraries on one's system (which do not 55962+ by having only PIC ELF libraries on one's system (which do not
55893+ need to relocate their code). If you are sure this is your case, 55963+ need to relocate their code). If you are sure this is your case,
55894+ then enable this option otherwise be careful as you may not even 55964+ as is the case with all modern Linux distributions, then leave
55895+ be able to boot or log on your system (for example, some PAM 55965+ this option disabled. You should say 'n' here.
55896+ modules are erroneously compiled as non-PIC by default).
55897+
55898+ NOTE: if you are using dynamic ELF executables (as suggested
55899+ when using ASLR) then you must have made sure that you linked
55900+ your files using the PIC version of crt1 (the et_dyn.tar.gz package
55901+ referenced there has already been updated to support this).
55902+ 55966+
55903+config PAX_ETEXECRELOCS 55967+config PAX_ETEXECRELOCS
55904+ bool "Allow ELF ET_EXEC text relocations" 55968+ bool "Allow ELF ET_EXEC text relocations"
@@ -56138,7 +56202,7 @@ diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig
56138 config KEYS 56202 config KEYS
56139 bool "Enable access key retention support" 56203 bool "Enable access key retention support"
56140 help 56204 help
56141@@ -146,7 +639,7 @@ config INTEL_TXT 56205@@ -146,7 +638,7 @@ config INTEL_TXT
56142 config LSM_MMAP_MIN_ADDR 56206 config LSM_MMAP_MIN_ADDR
56143 int "Low address space for LSM to protect from user allocation" 56207 int "Low address space for LSM to protect from user allocation"
56144 depends on SECURITY && SECURITY_SELINUX 56208 depends on SECURITY && SECURITY_SELINUX
@@ -56147,9 +56211,9 @@ diff -urNp linux-2.6.32.16/security/Kconfig linux-2.6.32.16/security/Kconfig
56147 help 56211 help
56148 This is the portion of low virtual memory which should be protected 56212 This is the portion of low virtual memory which should be protected
56149 from userspace allocation. Keeping a user from writing to low pages 56213 from userspace allocation. Keeping a user from writing to low pages
56150diff -urNp linux-2.6.32.16/security/min_addr.c linux-2.6.32.16/security/min_addr.c 56214diff -urNp linux-2.6.32.18/security/min_addr.c linux-2.6.32.18/security/min_addr.c
56151--- linux-2.6.32.16/security/min_addr.c 2010-07-05 14:14:00.000000000 -0400 56215--- linux-2.6.32.18/security/min_addr.c 2010-08-10 13:45:57.000000000 -0400
56152+++ linux-2.6.32.16/security/min_addr.c 2010-07-09 14:50:39.000000000 -0400 56216+++ linux-2.6.32.18/security/min_addr.c 2010-08-11 18:57:33.000000000 -0400
56153@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG 56217@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
56154 */ 56218 */
56155 static void update_mmap_min_addr(void) 56219 static void update_mmap_min_addr(void)
@@ -56166,9 +56230,9 @@ diff -urNp linux-2.6.32.16/security/min_addr.c linux-2.6.32.16/security/min_addr
56166 } 56230 }
56167 56231
56168 /* 56232 /*
56169diff -urNp linux-2.6.32.16/sound/aoa/codecs/onyx.c linux-2.6.32.16/sound/aoa/codecs/onyx.c 56233diff -urNp linux-2.6.32.18/sound/aoa/codecs/onyx.c linux-2.6.32.18/sound/aoa/codecs/onyx.c
56170--- linux-2.6.32.16/sound/aoa/codecs/onyx.c 2010-07-05 14:14:00.000000000 -0400 56234--- linux-2.6.32.18/sound/aoa/codecs/onyx.c 2010-08-10 13:45:57.000000000 -0400
56171+++ linux-2.6.32.16/sound/aoa/codecs/onyx.c 2010-07-09 14:50:39.000000000 -0400 56235+++ linux-2.6.32.18/sound/aoa/codecs/onyx.c 2010-08-11 18:57:33.000000000 -0400
56172@@ -53,7 +53,7 @@ struct onyx { 56236@@ -53,7 +53,7 @@ struct onyx {
56173 spdif_locked:1, 56237 spdif_locked:1,
56174 analog_locked:1, 56238 analog_locked:1,
@@ -56197,9 +56261,9 @@ diff -urNp linux-2.6.32.16/sound/aoa/codecs/onyx.c linux-2.6.32.16/sound/aoa/cod
56197 onyx->spdif_locked = onyx->analog_locked = 0; 56261 onyx->spdif_locked = onyx->analog_locked = 0;
56198 mutex_unlock(&onyx->mutex); 56262 mutex_unlock(&onyx->mutex);
56199 56263
56200diff -urNp linux-2.6.32.16/sound/core/oss/pcm_oss.c linux-2.6.32.16/sound/core/oss/pcm_oss.c 56264diff -urNp linux-2.6.32.18/sound/core/oss/pcm_oss.c linux-2.6.32.18/sound/core/oss/pcm_oss.c
56201--- linux-2.6.32.16/sound/core/oss/pcm_oss.c 2010-07-05 14:14:00.000000000 -0400 56265--- linux-2.6.32.18/sound/core/oss/pcm_oss.c 2010-08-10 13:45:57.000000000 -0400
56202+++ linux-2.6.32.16/sound/core/oss/pcm_oss.c 2010-07-09 14:50:39.000000000 -0400 56266+++ linux-2.6.32.18/sound/core/oss/pcm_oss.c 2010-08-11 18:57:33.000000000 -0400
56203@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct 56267@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
56204 } 56268 }
56205 } 56269 }
@@ -56211,9 +56275,9 @@ diff -urNp linux-2.6.32.16/sound/core/oss/pcm_oss.c linux-2.6.32.16/sound/core/o
56211 #endif /* CONFIG_SND_VERBOSE_PROCFS */ 56275 #endif /* CONFIG_SND_VERBOSE_PROCFS */
56212 56276
56213 /* 56277 /*
56214diff -urNp linux-2.6.32.16/sound/core/seq/seq_lock.h linux-2.6.32.16/sound/core/seq/seq_lock.h 56278diff -urNp linux-2.6.32.18/sound/core/seq/seq_lock.h linux-2.6.32.18/sound/core/seq/seq_lock.h
56215--- linux-2.6.32.16/sound/core/seq/seq_lock.h 2010-07-05 14:14:00.000000000 -0400 56279--- linux-2.6.32.18/sound/core/seq/seq_lock.h 2010-08-10 13:45:57.000000000 -0400
56216+++ linux-2.6.32.16/sound/core/seq/seq_lock.h 2010-07-09 14:50:39.000000000 -0400 56280+++ linux-2.6.32.18/sound/core/seq/seq_lock.h 2010-08-11 18:57:33.000000000 -0400
56217@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo 56281@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
56218 #else /* SMP || CONFIG_SND_DEBUG */ 56282 #else /* SMP || CONFIG_SND_DEBUG */
56219 56283
@@ -56229,9 +56293,9 @@ diff -urNp linux-2.6.32.16/sound/core/seq/seq_lock.h linux-2.6.32.16/sound/core/
56229 56293
56230 #endif /* SMP || CONFIG_SND_DEBUG */ 56294 #endif /* SMP || CONFIG_SND_DEBUG */
56231 56295
56232diff -urNp linux-2.6.32.16/sound/drivers/mts64.c linux-2.6.32.16/sound/drivers/mts64.c 56296diff -urNp linux-2.6.32.18/sound/drivers/mts64.c linux-2.6.32.18/sound/drivers/mts64.c
56233--- linux-2.6.32.16/sound/drivers/mts64.c 2010-07-05 14:14:00.000000000 -0400 56297--- linux-2.6.32.18/sound/drivers/mts64.c 2010-08-10 13:45:57.000000000 -0400
56234+++ linux-2.6.32.16/sound/drivers/mts64.c 2010-07-09 14:50:39.000000000 -0400 56298+++ linux-2.6.32.18/sound/drivers/mts64.c 2010-08-11 18:57:33.000000000 -0400
56235@@ -65,7 +65,7 @@ struct mts64 { 56299@@ -65,7 +65,7 @@ struct mts64 {
56236 struct pardevice *pardev; 56300 struct pardevice *pardev;
56237 int pardev_claimed; 56301 int pardev_claimed;
@@ -56280,9 +56344,9 @@ diff -urNp linux-2.6.32.16/sound/drivers/mts64.c linux-2.6.32.16/sound/drivers/m
56280 56344
56281 return 0; 56345 return 0;
56282 } 56346 }
56283diff -urNp linux-2.6.32.16/sound/drivers/portman2x4.c linux-2.6.32.16/sound/drivers/portman2x4.c 56347diff -urNp linux-2.6.32.18/sound/drivers/portman2x4.c linux-2.6.32.18/sound/drivers/portman2x4.c
56284--- linux-2.6.32.16/sound/drivers/portman2x4.c 2010-07-05 14:14:00.000000000 -0400 56348--- linux-2.6.32.18/sound/drivers/portman2x4.c 2010-08-10 13:45:57.000000000 -0400
56285+++ linux-2.6.32.16/sound/drivers/portman2x4.c 2010-07-09 14:50:39.000000000 -0400 56349+++ linux-2.6.32.18/sound/drivers/portman2x4.c 2010-08-11 18:57:33.000000000 -0400
56286@@ -83,7 +83,7 @@ struct portman { 56350@@ -83,7 +83,7 @@ struct portman {
56287 struct pardevice *pardev; 56351 struct pardevice *pardev;
56288 int pardev_claimed; 56352 int pardev_claimed;
@@ -56292,9 +56356,9 @@ diff -urNp linux-2.6.32.16/sound/drivers/portman2x4.c linux-2.6.32.16/sound/driv
56292 int mode[PORTMAN_NUM_INPUT_PORTS]; 56356 int mode[PORTMAN_NUM_INPUT_PORTS];
56293 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; 56357 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
56294 }; 56358 };
56295diff -urNp linux-2.6.32.16/sound/oss/sb_audio.c linux-2.6.32.16/sound/oss/sb_audio.c 56359diff -urNp linux-2.6.32.18/sound/oss/sb_audio.c linux-2.6.32.18/sound/oss/sb_audio.c
56296--- linux-2.6.32.16/sound/oss/sb_audio.c 2010-07-05 14:14:00.000000000 -0400 56360--- linux-2.6.32.18/sound/oss/sb_audio.c 2010-08-10 13:45:57.000000000 -0400
56297+++ linux-2.6.32.16/sound/oss/sb_audio.c 2010-07-09 14:50:39.000000000 -0400 56361+++ linux-2.6.32.18/sound/oss/sb_audio.c 2010-08-11 18:57:33.000000000 -0400
56298@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, 56362@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
56299 buf16 = (signed short *)(localbuf + localoffs); 56363 buf16 = (signed short *)(localbuf + localoffs);
56300 while (c) 56364 while (c)
@@ -56304,9 +56368,9 @@ diff -urNp linux-2.6.32.16/sound/oss/sb_audio.c linux-2.6.32.16/sound/oss/sb_aud
56304 if (copy_from_user(lbuf8, 56368 if (copy_from_user(lbuf8,
56305 userbuf+useroffs + p, 56369 userbuf+useroffs + p,
56306 locallen)) 56370 locallen))
56307diff -urNp linux-2.6.32.16/sound/pci/ac97/ac97_codec.c linux-2.6.32.16/sound/pci/ac97/ac97_codec.c 56371diff -urNp linux-2.6.32.18/sound/pci/ac97/ac97_codec.c linux-2.6.32.18/sound/pci/ac97/ac97_codec.c
56308--- linux-2.6.32.16/sound/pci/ac97/ac97_codec.c 2010-07-05 14:14:00.000000000 -0400 56372--- linux-2.6.32.18/sound/pci/ac97/ac97_codec.c 2010-08-10 13:45:57.000000000 -0400
56309+++ linux-2.6.32.16/sound/pci/ac97/ac97_codec.c 2010-07-09 14:50:39.000000000 -0400 56373+++ linux-2.6.32.18/sound/pci/ac97/ac97_codec.c 2010-08-11 18:57:33.000000000 -0400
56310@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc 56374@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
56311 } 56375 }
56312 56376
@@ -56316,9 +56380,9 @@ diff -urNp linux-2.6.32.16/sound/pci/ac97/ac97_codec.c linux-2.6.32.16/sound/pci
56316 56380
56317 #ifdef CONFIG_SND_AC97_POWER_SAVE 56381 #ifdef CONFIG_SND_AC97_POWER_SAVE
56318 static void do_update_power(struct work_struct *work) 56382 static void do_update_power(struct work_struct *work)
56319diff -urNp linux-2.6.32.16/sound/pci/ac97/ac97_patch.c linux-2.6.32.16/sound/pci/ac97/ac97_patch.c 56383diff -urNp linux-2.6.32.18/sound/pci/ac97/ac97_patch.c linux-2.6.32.18/sound/pci/ac97/ac97_patch.c
56320--- linux-2.6.32.16/sound/pci/ac97/ac97_patch.c 2010-07-05 14:14:00.000000000 -0400 56384--- linux-2.6.32.18/sound/pci/ac97/ac97_patch.c 2010-08-10 13:45:57.000000000 -0400
56321+++ linux-2.6.32.16/sound/pci/ac97/ac97_patch.c 2010-07-09 14:50:39.000000000 -0400 56385+++ linux-2.6.32.18/sound/pci/ac97/ac97_patch.c 2010-08-11 18:57:33.000000000 -0400
56322@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd 56386@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
56323 return 0; 56387 return 0;
56324 } 56388 }
@@ -56625,9 +56689,9 @@ diff -urNp linux-2.6.32.16/sound/pci/ac97/ac97_patch.c linux-2.6.32.16/sound/pci
56625 .build_specific = patch_ucb1400_specific, 56689 .build_specific = patch_ucb1400_specific,
56626 }; 56690 };
56627 56691
56628diff -urNp linux-2.6.32.16/sound/pci/ens1370.c linux-2.6.32.16/sound/pci/ens1370.c 56692diff -urNp linux-2.6.32.18/sound/pci/ens1370.c linux-2.6.32.18/sound/pci/ens1370.c
56629--- linux-2.6.32.16/sound/pci/ens1370.c 2010-07-05 14:14:00.000000000 -0400 56693--- linux-2.6.32.18/sound/pci/ens1370.c 2010-08-10 13:45:57.000000000 -0400
56630+++ linux-2.6.32.16/sound/pci/ens1370.c 2010-07-09 14:50:39.000000000 -0400 56694+++ linux-2.6.32.18/sound/pci/ens1370.c 2010-08-11 18:57:33.000000000 -0400
56631@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci 56695@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
56632 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ 56696 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
56633 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ 56697 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
@@ -56637,9 +56701,9 @@ diff -urNp linux-2.6.32.16/sound/pci/ens1370.c linux-2.6.32.16/sound/pci/ens1370
56637 }; 56701 };
56638 56702
56639 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); 56703 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
56640diff -urNp linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c 56704diff -urNp linux-2.6.32.18/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.18/sound/pci/hda/patch_intelhdmi.c
56641--- linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c 2010-07-05 14:14:00.000000000 -0400 56705--- linux-2.6.32.18/sound/pci/hda/patch_intelhdmi.c 2010-08-10 13:45:57.000000000 -0400
56642+++ linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c 2010-07-09 14:50:39.000000000 -0400 56706+++ linux-2.6.32.18/sound/pci/hda/patch_intelhdmi.c 2010-08-11 18:57:33.000000000 -0400
56643@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str 56707@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
56644 cp_ready); 56708 cp_ready);
56645 56709
@@ -56655,9 +56719,9 @@ diff -urNp linux-2.6.32.16/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.16/sound
56655 } 56719 }
56656 56720
56657 56721
56658diff -urNp linux-2.6.32.16/sound/pci/intel8x0.c linux-2.6.32.16/sound/pci/intel8x0.c 56722diff -urNp linux-2.6.32.18/sound/pci/intel8x0.c linux-2.6.32.18/sound/pci/intel8x0.c
56659--- linux-2.6.32.16/sound/pci/intel8x0.c 2010-07-05 14:14:00.000000000 -0400 56723--- linux-2.6.32.18/sound/pci/intel8x0.c 2010-08-10 13:45:57.000000000 -0400
56660+++ linux-2.6.32.16/sound/pci/intel8x0.c 2010-07-09 14:50:39.000000000 -0400 56724+++ linux-2.6.32.18/sound/pci/intel8x0.c 2010-08-11 18:57:33.000000000 -0400
56661@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 56725@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
56662 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 56726 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
56663 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ 56727 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
@@ -56676,9 +56740,9 @@ diff -urNp linux-2.6.32.16/sound/pci/intel8x0.c linux-2.6.32.16/sound/pci/intel8
56676 }; 56740 };
56677 56741
56678 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, 56742 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
56679diff -urNp linux-2.6.32.16/sound/pci/intel8x0m.c linux-2.6.32.16/sound/pci/intel8x0m.c 56743diff -urNp linux-2.6.32.18/sound/pci/intel8x0m.c linux-2.6.32.18/sound/pci/intel8x0m.c
56680--- linux-2.6.32.16/sound/pci/intel8x0m.c 2010-07-05 14:14:00.000000000 -0400 56744--- linux-2.6.32.18/sound/pci/intel8x0m.c 2010-08-10 13:45:57.000000000 -0400
56681+++ linux-2.6.32.16/sound/pci/intel8x0m.c 2010-07-09 14:50:39.000000000 -0400 56745+++ linux-2.6.32.18/sound/pci/intel8x0m.c 2010-08-11 18:57:33.000000000 -0400
56682@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 56746@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
56683 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 56747 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
56684 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ 56748 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
@@ -56697,9 +56761,9 @@ diff -urNp linux-2.6.32.16/sound/pci/intel8x0m.c linux-2.6.32.16/sound/pci/intel
56697 }; 56761 };
56698 56762
56699 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, 56763 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
56700diff -urNp linux-2.6.32.16/usr/gen_init_cpio.c linux-2.6.32.16/usr/gen_init_cpio.c 56764diff -urNp linux-2.6.32.18/usr/gen_init_cpio.c linux-2.6.32.18/usr/gen_init_cpio.c
56701--- linux-2.6.32.16/usr/gen_init_cpio.c 2010-07-05 14:14:00.000000000 -0400 56765--- linux-2.6.32.18/usr/gen_init_cpio.c 2010-08-10 13:45:57.000000000 -0400
56702+++ linux-2.6.32.16/usr/gen_init_cpio.c 2010-07-09 14:50:39.000000000 -0400 56766+++ linux-2.6.32.18/usr/gen_init_cpio.c 2010-08-11 18:57:33.000000000 -0400
56703@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, 56767@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
56704 int retval; 56768 int retval;
56705 int rc = -1; 56769 int rc = -1;
@@ -56722,9 +56786,9 @@ diff -urNp linux-2.6.32.16/usr/gen_init_cpio.c linux-2.6.32.16/usr/gen_init_cpio
56722 } else 56786 } else
56723 break; 56787 break;
56724 } 56788 }
56725diff -urNp linux-2.6.32.16/virt/kvm/kvm_main.c linux-2.6.32.16/virt/kvm/kvm_main.c 56789diff -urNp linux-2.6.32.18/virt/kvm/kvm_main.c linux-2.6.32.18/virt/kvm/kvm_main.c
56726--- linux-2.6.32.16/virt/kvm/kvm_main.c 2010-07-05 14:14:00.000000000 -0400 56790--- linux-2.6.32.18/virt/kvm/kvm_main.c 2010-08-10 13:45:57.000000000 -0400
56727+++ linux-2.6.32.16/virt/kvm/kvm_main.c 2010-07-09 14:50:39.000000000 -0400 56791+++ linux-2.6.32.18/virt/kvm/kvm_main.c 2010-08-11 18:57:33.000000000 -0400
56728@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode 56792@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode
56729 return 0; 56793 return 0;
56730 } 56794 }
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index 5f4cb8c2b4..ec5f8db345 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32.15 3# Linux kernel version: 2.6.32.16
4# Wed Jun 16 07:30:34 2010 4# Thu Aug 12 15:19:19 2010
5# 5#
6# CONFIG_64BIT is not set 6# CONFIG_64BIT is not set
7CONFIG_X86_32=y 7CONFIG_X86_32=y
@@ -1059,6 +1059,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m
1059CONFIG_LIB80211_CRYPT_TKIP=m 1059CONFIG_LIB80211_CRYPT_TKIP=m
1060# CONFIG_LIB80211_DEBUG is not set 1060# CONFIG_LIB80211_DEBUG is not set
1061CONFIG_MAC80211=m 1061CONFIG_MAC80211=m
1062CONFIG_MAC80211_HAS_RC=y
1062CONFIG_MAC80211_RC_PID=y 1063CONFIG_MAC80211_RC_PID=y
1063CONFIG_MAC80211_RC_MINSTREL=y 1064CONFIG_MAC80211_RC_MINSTREL=y
1064CONFIG_MAC80211_RC_DEFAULT_PID=y 1065CONFIG_MAC80211_RC_DEFAULT_PID=y
@@ -4478,7 +4479,7 @@ CONFIG_PAX_PAGEEXEC=y
4478# CONFIG_PAX_SEGMEXEC is not set 4479# CONFIG_PAX_SEGMEXEC is not set
4479CONFIG_PAX_EMUTRAMP=y 4480CONFIG_PAX_EMUTRAMP=y
4480CONFIG_PAX_MPROTECT=y 4481CONFIG_PAX_MPROTECT=y
4481CONFIG_PAX_NOELFRELOCS=y 4482# CONFIG_PAX_ELFRELOCS is not set
4482CONFIG_PAX_KERNEXEC=y 4483CONFIG_PAX_KERNEXEC=y
4483CONFIG_PAX_KERNEXEC_MODULE_TEXT=4 4484CONFIG_PAX_KERNEXEC_MODULE_TEXT=4
4484 4485
© 2015 Mike Crute