aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-10-05 09:35:25 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-10-08 07:52:02 +0000
commit355351735d91fe4a6383c2407dd74f136e0cbecb (patch)
treea67ab90c656a562d382c7f3d06e4c9b7aa0b7599
parent0e3097ddb1ea7d4084e1827679fef743c4f82236 (diff)
downloadalpine_aports-355351735d91fe4a6383c2407dd74f136e0cbecb.tar.bz2
alpine_aports-355351735d91fe4a6383c2407dd74f136e0cbecb.tar.xz
alpine_aports-355351735d91fe4a6383c2407dd74f136e0cbecb.zip
main/linux-grsec: upgrade to grsecurity-2.2.0-2.6.32.24-201010021153
(cherry picked from commit 4c7f0cd5b3f49cea58da9d6efcaf5099a86f6b1c)
Diffstat
-rw-r--r--main/linux-grsec/APKBUILD12
-rw-r--r--main/linux-grsec/grsecurity-2.2.0-2.6.32.24-201010021153.patch (renamed from main/linux-grsec/grsecurity-2.2.0-2.6.32.23-201009272133.patch)7372
-rw-r--r--main/linux-grsec/kernelconfig.x8610
3 files changed, 3774 insertions, 3620 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 7395160ae6..6af7a98cf1 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.23 5pkgver=2.6.32.24
6_kernver=2.6.32 6_kernver=2.6.32
7pkgrel=1 7pkgrel=0
8pkgdesc="Linux kernel with grsecurity" 8pkgdesc="Linux kernel with grsecurity"
9url=http://grsecurity.net 9url=http://grsecurity.net
10depends="mkinitfs linux-firmware" 10depends="mkinitfs linux-firmware"
@@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
14install= 14install=
15source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 15source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
16 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 16 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
17 grsecurity-2.2.0-2.6.32.23-201009272133.patch 17 grsecurity-2.2.0-2.6.32.24-201010021153.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
@@ -149,8 +149,8 @@ firmware() {
149} 149}
150 150
151md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 151md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
1526eac9aebbf9e74546b7c44c0fb9348a7 patch-2.6.32.23.bz2 152e3346e3b4b92f048b8ecded829f45cdf patch-2.6.32.24.bz2
1531c9943454ee525a584543090486bd63f grsecurity-2.2.0-2.6.32.23-201009272133.patch 15318b64a2ec06196468d2df1a84fe51354 grsecurity-2.2.0-2.6.32.24-201010021153.patch
1541d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch 1541d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch
155437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch 155437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch
156151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch 156151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
@@ -175,4 +175,4 @@ ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch
175a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch 175a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch
176139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch 176139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch
177bf14850a0036d14bc6177adbdec23a17 hv-grsec.patch 177bf14850a0036d14bc6177adbdec23a17 hv-grsec.patch
178ca9c63def600e77ca3cb7e822c239083 kernelconfig.x86" 178f9b5bc9c592bf5a4a9ac4cd676c369d2 kernelconfig.x86"
diff --git a/main/linux-grsec/grsecurity-2.2.0-2.6.32.23-201009272133.patch b/main/linux-grsec/grsecurity-2.2.0-2.6.32.24-201010021153.patch
index b87c317d86..16dfdbec13 100644
--- a/main/linux-grsec/grsecurity-2.2.0-2.6.32.23-201009272133.patch
+++ b/main/linux-grsec/grsecurity-2.2.0-2.6.32.24-201010021153.patch
@@ -1,6 +1,6 @@
1diff -urNp linux-2.6.32.23/arch/alpha/include/asm/elf.h linux-2.6.32.23/arch/alpha/include/asm/elf.h 1diff -urNp linux-2.6.32.24/arch/alpha/include/asm/elf.h linux-2.6.32.24/arch/alpha/include/asm/elf.h
2--- linux-2.6.32.23/arch/alpha/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 2--- linux-2.6.32.24/arch/alpha/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
3+++ linux-2.6.32.23/arch/alpha/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 3+++ linux-2.6.32.24/arch/alpha/include/asm/elf.h 2010-09-04 15:54:51.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.23/arch/alpha/include/asm/elf.h linux-2.6.32.23/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.23/arch/alpha/include/asm/pgtable.h linux-2.6.32.23/arch/alpha/include/asm/pgtable.h 18diff -urNp linux-2.6.32.24/arch/alpha/include/asm/pgtable.h linux-2.6.32.24/arch/alpha/include/asm/pgtable.h
19--- linux-2.6.32.23/arch/alpha/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400 19--- linux-2.6.32.24/arch/alpha/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
20+++ linux-2.6.32.23/arch/alpha/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400 20+++ linux-2.6.32.24/arch/alpha/include/asm/pgtable.h 2010-09-04 15:54:51.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.23/arch/alpha/include/asm/pgtable.h linux-2.6.32.23/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.23/arch/alpha/kernel/module.c linux-2.6.32.23/arch/alpha/kernel/module.c 39diff -urNp linux-2.6.32.24/arch/alpha/kernel/module.c linux-2.6.32.24/arch/alpha/kernel/module.c
40--- linux-2.6.32.23/arch/alpha/kernel/module.c 2010-08-13 16:24:37.000000000 -0400 40--- linux-2.6.32.24/arch/alpha/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
41+++ linux-2.6.32.23/arch/alpha/kernel/module.c 2010-09-04 15:54:51.000000000 -0400 41+++ linux-2.6.32.24/arch/alpha/kernel/module.c 2010-09-04 15:54:51.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.23/arch/alpha/kernel/module.c linux-2.6.32.23/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.23/arch/alpha/kernel/osf_sys.c linux-2.6.32.23/arch/alpha/kernel/osf_sys.c 51diff -urNp linux-2.6.32.24/arch/alpha/kernel/osf_sys.c linux-2.6.32.24/arch/alpha/kernel/osf_sys.c
52--- linux-2.6.32.23/arch/alpha/kernel/osf_sys.c 2010-08-13 16:24:37.000000000 -0400 52--- linux-2.6.32.24/arch/alpha/kernel/osf_sys.c 2010-08-13 16:24:37.000000000 -0400
53+++ linux-2.6.32.23/arch/alpha/kernel/osf_sys.c 2010-09-17 18:34:04.000000000 -0400 53+++ linux-2.6.32.24/arch/alpha/kernel/osf_sys.c 2010-09-17 18:34:04.000000000 -0400
54@@ -1169,7 +1169,7 @@ arch_get_unmapped_area_1(unsigned long a 54@@ -1169,7 +1169,7 @@ arch_get_unmapped_area_1(unsigned long a
55 /* At this point: (!vma || addr < vma->vm_end). */ 55 /* At this point: (!vma || addr < vma->vm_end). */
56 if (limit - len < addr) 56 if (limit - len < addr)
@@ -82,9 +82,9 @@ diff -urNp linux-2.6.32.23/arch/alpha/kernel/osf_sys.c linux-2.6.32.23/arch/alph
82 if (addr != (unsigned long) -ENOMEM) 82 if (addr != (unsigned long) -ENOMEM)
83 return addr; 83 return addr;
84 84
85diff -urNp linux-2.6.32.23/arch/alpha/mm/fault.c linux-2.6.32.23/arch/alpha/mm/fault.c 85diff -urNp linux-2.6.32.24/arch/alpha/mm/fault.c linux-2.6.32.24/arch/alpha/mm/fault.c
86--- linux-2.6.32.23/arch/alpha/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 86--- linux-2.6.32.24/arch/alpha/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
87+++ linux-2.6.32.23/arch/alpha/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 87+++ linux-2.6.32.24/arch/alpha/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
88@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * 88@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
89 __reload_thread(pcb); 89 __reload_thread(pcb);
90 } 90 }
@@ -241,9 +241,9 @@ diff -urNp linux-2.6.32.23/arch/alpha/mm/fault.c linux-2.6.32.23/arch/alpha/mm/f
241 } else if (!cause) { 241 } else if (!cause) {
242 /* Allow reads even for write-only mappings */ 242 /* Allow reads even for write-only mappings */
243 if (!(vma->vm_flags & (VM_READ | VM_WRITE))) 243 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
244diff -urNp linux-2.6.32.23/arch/arm/include/asm/elf.h linux-2.6.32.23/arch/arm/include/asm/elf.h 244diff -urNp linux-2.6.32.24/arch/arm/include/asm/elf.h linux-2.6.32.24/arch/arm/include/asm/elf.h
245--- linux-2.6.32.23/arch/arm/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 245--- linux-2.6.32.24/arch/arm/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
246+++ linux-2.6.32.23/arch/arm/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 246+++ linux-2.6.32.24/arch/arm/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
247@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t 247@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
248 the loader. We need to make sure that it is out of the way of the program 248 the loader. We need to make sure that it is out of the way of the program
249 that it will "exec", and that there is sufficient room for the brk. */ 249 that it will "exec", and that there is sufficient room for the brk. */
@@ -260,9 +260,9 @@ diff -urNp linux-2.6.32.23/arch/arm/include/asm/elf.h linux-2.6.32.23/arch/arm/i
260 260
261 /* When the program starts, a1 contains a pointer to a function to be 261 /* When the program starts, a1 contains a pointer to a function to be
262 registered with atexit, as per the SVR4 ABI. A value of 0 means we 262 registered with atexit, as per the SVR4 ABI. A value of 0 means we
263diff -urNp linux-2.6.32.23/arch/arm/include/asm/kmap_types.h linux-2.6.32.23/arch/arm/include/asm/kmap_types.h 263diff -urNp linux-2.6.32.24/arch/arm/include/asm/kmap_types.h linux-2.6.32.24/arch/arm/include/asm/kmap_types.h
264--- linux-2.6.32.23/arch/arm/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400 264--- linux-2.6.32.24/arch/arm/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
265+++ linux-2.6.32.23/arch/arm/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400 265+++ linux-2.6.32.24/arch/arm/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
266@@ -19,6 +19,7 @@ enum km_type { 266@@ -19,6 +19,7 @@ enum km_type {
267 KM_SOFTIRQ0, 267 KM_SOFTIRQ0,
268 KM_SOFTIRQ1, 268 KM_SOFTIRQ1,
@@ -271,9 +271,9 @@ diff -urNp linux-2.6.32.23/arch/arm/include/asm/kmap_types.h linux-2.6.32.23/arc
271 KM_TYPE_NR 271 KM_TYPE_NR
272 }; 272 };
273 273
274diff -urNp linux-2.6.32.23/arch/arm/include/asm/uaccess.h linux-2.6.32.23/arch/arm/include/asm/uaccess.h 274diff -urNp linux-2.6.32.24/arch/arm/include/asm/uaccess.h linux-2.6.32.24/arch/arm/include/asm/uaccess.h
275--- linux-2.6.32.23/arch/arm/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400 275--- linux-2.6.32.24/arch/arm/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
276+++ linux-2.6.32.23/arch/arm/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400 276+++ linux-2.6.32.24/arch/arm/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
277@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn 277@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
278 278
279 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) 279 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -294,9 +294,9 @@ diff -urNp linux-2.6.32.23/arch/arm/include/asm/uaccess.h linux-2.6.32.23/arch/a
294 if (access_ok(VERIFY_WRITE, to, n)) 294 if (access_ok(VERIFY_WRITE, to, n))
295 n = __copy_to_user(to, from, n); 295 n = __copy_to_user(to, from, n);
296 return n; 296 return n;
297diff -urNp linux-2.6.32.23/arch/arm/kernel/kgdb.c linux-2.6.32.23/arch/arm/kernel/kgdb.c 297diff -urNp linux-2.6.32.24/arch/arm/kernel/kgdb.c linux-2.6.32.24/arch/arm/kernel/kgdb.c
298--- linux-2.6.32.23/arch/arm/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400 298--- linux-2.6.32.24/arch/arm/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
299+++ linux-2.6.32.23/arch/arm/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400 299+++ linux-2.6.32.24/arch/arm/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
300@@ -190,7 +190,7 @@ void kgdb_arch_exit(void) 300@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
301 * and we handle the normal undef case within the do_undefinstr 301 * and we handle the normal undef case within the do_undefinstr
302 * handler. 302 * handler.
@@ -306,9 +306,9 @@ diff -urNp linux-2.6.32.23/arch/arm/kernel/kgdb.c linux-2.6.32.23/arch/arm/kerne
306 #ifndef __ARMEB__ 306 #ifndef __ARMEB__
307 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} 307 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
308 #else /* ! __ARMEB__ */ 308 #else /* ! __ARMEB__ */
309diff -urNp linux-2.6.32.23/arch/arm/mach-at91/pm.c linux-2.6.32.23/arch/arm/mach-at91/pm.c 309diff -urNp linux-2.6.32.24/arch/arm/mach-at91/pm.c linux-2.6.32.24/arch/arm/mach-at91/pm.c
310--- linux-2.6.32.23/arch/arm/mach-at91/pm.c 2010-08-13 16:24:37.000000000 -0400 310--- linux-2.6.32.24/arch/arm/mach-at91/pm.c 2010-08-13 16:24:37.000000000 -0400
311+++ linux-2.6.32.23/arch/arm/mach-at91/pm.c 2010-09-04 15:54:51.000000000 -0400 311+++ linux-2.6.32.24/arch/arm/mach-at91/pm.c 2010-09-04 15:54:51.000000000 -0400
312@@ -348,7 +348,7 @@ static void at91_pm_end(void) 312@@ -348,7 +348,7 @@ static void at91_pm_end(void)
313 } 313 }
314 314
@@ -318,9 +318,9 @@ diff -urNp linux-2.6.32.23/arch/arm/mach-at91/pm.c linux-2.6.32.23/arch/arm/mach
318 .valid = at91_pm_valid_state, 318 .valid = at91_pm_valid_state,
319 .begin = at91_pm_begin, 319 .begin = at91_pm_begin,
320 .enter = at91_pm_enter, 320 .enter = at91_pm_enter,
321diff -urNp linux-2.6.32.23/arch/arm/mach-omap1/pm.c linux-2.6.32.23/arch/arm/mach-omap1/pm.c 321diff -urNp linux-2.6.32.24/arch/arm/mach-omap1/pm.c linux-2.6.32.24/arch/arm/mach-omap1/pm.c
322--- linux-2.6.32.23/arch/arm/mach-omap1/pm.c 2010-08-13 16:24:37.000000000 -0400 322--- linux-2.6.32.24/arch/arm/mach-omap1/pm.c 2010-08-13 16:24:37.000000000 -0400
323+++ linux-2.6.32.23/arch/arm/mach-omap1/pm.c 2010-09-04 15:54:51.000000000 -0400 323+++ linux-2.6.32.24/arch/arm/mach-omap1/pm.c 2010-09-04 15:54:51.000000000 -0400
324@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq 324@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
325 325
326 326
@@ -330,9 +330,9 @@ diff -urNp linux-2.6.32.23/arch/arm/mach-omap1/pm.c linux-2.6.32.23/arch/arm/mac
330 .prepare = omap_pm_prepare, 330 .prepare = omap_pm_prepare,
331 .enter = omap_pm_enter, 331 .enter = omap_pm_enter,
332 .finish = omap_pm_finish, 332 .finish = omap_pm_finish,
333diff -urNp linux-2.6.32.23/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.23/arch/arm/mach-omap2/pm24xx.c 333diff -urNp linux-2.6.32.24/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.24/arch/arm/mach-omap2/pm24xx.c
334--- linux-2.6.32.23/arch/arm/mach-omap2/pm24xx.c 2010-08-13 16:24:37.000000000 -0400 334--- linux-2.6.32.24/arch/arm/mach-omap2/pm24xx.c 2010-08-13 16:24:37.000000000 -0400
335+++ linux-2.6.32.23/arch/arm/mach-omap2/pm24xx.c 2010-09-04 15:54:51.000000000 -0400 335+++ linux-2.6.32.24/arch/arm/mach-omap2/pm24xx.c 2010-09-04 15:54:51.000000000 -0400
336@@ -326,7 +326,7 @@ static void omap2_pm_finish(void) 336@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
337 enable_hlt(); 337 enable_hlt();
338 } 338 }
@@ -342,9 +342,9 @@ diff -urNp linux-2.6.32.23/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.23/arch/arm
342 .prepare = omap2_pm_prepare, 342 .prepare = omap2_pm_prepare,
343 .enter = omap2_pm_enter, 343 .enter = omap2_pm_enter,
344 .finish = omap2_pm_finish, 344 .finish = omap2_pm_finish,
345diff -urNp linux-2.6.32.23/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.23/arch/arm/mach-omap2/pm34xx.c 345diff -urNp linux-2.6.32.24/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.24/arch/arm/mach-omap2/pm34xx.c
346--- linux-2.6.32.23/arch/arm/mach-omap2/pm34xx.c 2010-08-13 16:24:37.000000000 -0400 346--- linux-2.6.32.24/arch/arm/mach-omap2/pm34xx.c 2010-08-13 16:24:37.000000000 -0400
347+++ linux-2.6.32.23/arch/arm/mach-omap2/pm34xx.c 2010-09-04 15:54:51.000000000 -0400 347+++ linux-2.6.32.24/arch/arm/mach-omap2/pm34xx.c 2010-09-04 15:54:51.000000000 -0400
348@@ -401,7 +401,7 @@ static void omap3_pm_end(void) 348@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
349 return; 349 return;
350 } 350 }
@@ -354,9 +354,9 @@ diff -urNp linux-2.6.32.23/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.23/arch/arm
354 .begin = omap3_pm_begin, 354 .begin = omap3_pm_begin,
355 .end = omap3_pm_end, 355 .end = omap3_pm_end,
356 .prepare = omap3_pm_prepare, 356 .prepare = omap3_pm_prepare,
357diff -urNp linux-2.6.32.23/arch/arm/mach-pnx4008/pm.c linux-2.6.32.23/arch/arm/mach-pnx4008/pm.c 357diff -urNp linux-2.6.32.24/arch/arm/mach-pnx4008/pm.c linux-2.6.32.24/arch/arm/mach-pnx4008/pm.c
358--- linux-2.6.32.23/arch/arm/mach-pnx4008/pm.c 2010-08-13 16:24:37.000000000 -0400 358--- linux-2.6.32.24/arch/arm/mach-pnx4008/pm.c 2010-08-13 16:24:37.000000000 -0400
359+++ linux-2.6.32.23/arch/arm/mach-pnx4008/pm.c 2010-09-04 15:54:51.000000000 -0400 359+++ linux-2.6.32.24/arch/arm/mach-pnx4008/pm.c 2010-09-04 15:54:51.000000000 -0400
360@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat 360@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
361 (state == PM_SUSPEND_MEM); 361 (state == PM_SUSPEND_MEM);
362 } 362 }
@@ -366,9 +366,9 @@ diff -urNp linux-2.6.32.23/arch/arm/mach-pnx4008/pm.c linux-2.6.32.23/arch/arm/m
366 .enter = pnx4008_pm_enter, 366 .enter = pnx4008_pm_enter,
367 .valid = pnx4008_pm_valid, 367 .valid = pnx4008_pm_valid,
368 }; 368 };
369diff -urNp linux-2.6.32.23/arch/arm/mach-pxa/pm.c linux-2.6.32.23/arch/arm/mach-pxa/pm.c 369diff -urNp linux-2.6.32.24/arch/arm/mach-pxa/pm.c linux-2.6.32.24/arch/arm/mach-pxa/pm.c
370--- linux-2.6.32.23/arch/arm/mach-pxa/pm.c 2010-08-13 16:24:37.000000000 -0400 370--- linux-2.6.32.24/arch/arm/mach-pxa/pm.c 2010-08-13 16:24:37.000000000 -0400
371+++ linux-2.6.32.23/arch/arm/mach-pxa/pm.c 2010-09-04 15:54:51.000000000 -0400 371+++ linux-2.6.32.24/arch/arm/mach-pxa/pm.c 2010-09-04 15:54:51.000000000 -0400
372@@ -95,7 +95,7 @@ void pxa_pm_finish(void) 372@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
373 pxa_cpu_pm_fns->finish(); 373 pxa_cpu_pm_fns->finish();
374 } 374 }
@@ -378,9 +378,9 @@ diff -urNp linux-2.6.32.23/arch/arm/mach-pxa/pm.c linux-2.6.32.23/arch/arm/mach-
378 .valid = pxa_pm_valid, 378 .valid = pxa_pm_valid,
379 .enter = pxa_pm_enter, 379 .enter = pxa_pm_enter,
380 .prepare = pxa_pm_prepare, 380 .prepare = pxa_pm_prepare,
381diff -urNp linux-2.6.32.23/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.23/arch/arm/mach-pxa/sharpsl_pm.c 381diff -urNp linux-2.6.32.24/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.24/arch/arm/mach-pxa/sharpsl_pm.c
382--- linux-2.6.32.23/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-13 16:24:37.000000000 -0400 382--- linux-2.6.32.24/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-13 16:24:37.000000000 -0400
383+++ linux-2.6.32.23/arch/arm/mach-pxa/sharpsl_pm.c 2010-09-04 15:54:51.000000000 -0400 383+++ linux-2.6.32.24/arch/arm/mach-pxa/sharpsl_pm.c 2010-09-04 15:54:51.000000000 -0400
384@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status 384@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
385 } 385 }
386 386
@@ -390,9 +390,9 @@ diff -urNp linux-2.6.32.23/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.23/arch/a
390 .prepare = pxa_pm_prepare, 390 .prepare = pxa_pm_prepare,
391 .finish = pxa_pm_finish, 391 .finish = pxa_pm_finish,
392 .enter = corgi_pxa_pm_enter, 392 .enter = corgi_pxa_pm_enter,
393diff -urNp linux-2.6.32.23/arch/arm/mach-sa1100/pm.c linux-2.6.32.23/arch/arm/mach-sa1100/pm.c 393diff -urNp linux-2.6.32.24/arch/arm/mach-sa1100/pm.c linux-2.6.32.24/arch/arm/mach-sa1100/pm.c
394--- linux-2.6.32.23/arch/arm/mach-sa1100/pm.c 2010-08-13 16:24:37.000000000 -0400 394--- linux-2.6.32.24/arch/arm/mach-sa1100/pm.c 2010-08-13 16:24:37.000000000 -0400
395+++ linux-2.6.32.23/arch/arm/mach-sa1100/pm.c 2010-09-04 15:54:51.000000000 -0400 395+++ linux-2.6.32.24/arch/arm/mach-sa1100/pm.c 2010-09-04 15:54:51.000000000 -0400
396@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) 396@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
397 return virt_to_phys(sp); 397 return virt_to_phys(sp);
398 } 398 }
@@ -402,9 +402,9 @@ diff -urNp linux-2.6.32.23/arch/arm/mach-sa1100/pm.c linux-2.6.32.23/arch/arm/ma
402 .enter = sa11x0_pm_enter, 402 .enter = sa11x0_pm_enter,
403 .valid = suspend_valid_only_mem, 403 .valid = suspend_valid_only_mem,
404 }; 404 };
405diff -urNp linux-2.6.32.23/arch/arm/mm/fault.c linux-2.6.32.23/arch/arm/mm/fault.c 405diff -urNp linux-2.6.32.24/arch/arm/mm/fault.c linux-2.6.32.24/arch/arm/mm/fault.c
406--- linux-2.6.32.23/arch/arm/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 406--- linux-2.6.32.24/arch/arm/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
407+++ linux-2.6.32.23/arch/arm/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 407+++ linux-2.6.32.24/arch/arm/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
408@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, 408@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
409 } 409 }
410 #endif 410 #endif
@@ -453,9 +453,9 @@ diff -urNp linux-2.6.32.23/arch/arm/mm/fault.c linux-2.6.32.23/arch/arm/mm/fault
453 /* 453 /*
454 * First Level Translation Fault Handler 454 * First Level Translation Fault Handler
455 * 455 *
456diff -urNp linux-2.6.32.23/arch/arm/mm/mmap.c linux-2.6.32.23/arch/arm/mm/mmap.c 456diff -urNp linux-2.6.32.24/arch/arm/mm/mmap.c linux-2.6.32.24/arch/arm/mm/mmap.c
457--- linux-2.6.32.23/arch/arm/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400 457--- linux-2.6.32.24/arch/arm/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
458+++ linux-2.6.32.23/arch/arm/mm/mmap.c 2010-09-17 18:34:04.000000000 -0400 458+++ linux-2.6.32.24/arch/arm/mm/mmap.c 2010-09-17 18:34:04.000000000 -0400
459@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp 459@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
460 if (len > TASK_SIZE) 460 if (len > TASK_SIZE)
461 return -ENOMEM; 461 return -ENOMEM;
@@ -505,9 +505,9 @@ diff -urNp linux-2.6.32.23/arch/arm/mm/mmap.c linux-2.6.32.23/arch/arm/mm/mmap.c
505 /* 505 /*
506 * Remember the place where we stopped the search: 506 * Remember the place where we stopped the search:
507 */ 507 */
508diff -urNp linux-2.6.32.23/arch/arm/plat-s3c/pm.c linux-2.6.32.23/arch/arm/plat-s3c/pm.c 508diff -urNp linux-2.6.32.24/arch/arm/plat-s3c/pm.c linux-2.6.32.24/arch/arm/plat-s3c/pm.c
509--- linux-2.6.32.23/arch/arm/plat-s3c/pm.c 2010-08-13 16:24:37.000000000 -0400 509--- linux-2.6.32.24/arch/arm/plat-s3c/pm.c 2010-08-13 16:24:37.000000000 -0400
510+++ linux-2.6.32.23/arch/arm/plat-s3c/pm.c 2010-09-04 15:54:51.000000000 -0400 510+++ linux-2.6.32.24/arch/arm/plat-s3c/pm.c 2010-09-04 15:54:51.000000000 -0400
511@@ -355,7 +355,7 @@ static void s3c_pm_finish(void) 511@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
512 s3c_pm_check_cleanup(); 512 s3c_pm_check_cleanup();
513 } 513 }
@@ -517,9 +517,9 @@ diff -urNp linux-2.6.32.23/arch/arm/plat-s3c/pm.c linux-2.6.32.23/arch/arm/plat-
517 .enter = s3c_pm_enter, 517 .enter = s3c_pm_enter,
518 .prepare = s3c_pm_prepare, 518 .prepare = s3c_pm_prepare,
519 .finish = s3c_pm_finish, 519 .finish = s3c_pm_finish,
520diff -urNp linux-2.6.32.23/arch/avr32/include/asm/elf.h linux-2.6.32.23/arch/avr32/include/asm/elf.h 520diff -urNp linux-2.6.32.24/arch/avr32/include/asm/elf.h linux-2.6.32.24/arch/avr32/include/asm/elf.h
521--- linux-2.6.32.23/arch/avr32/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 521--- linux-2.6.32.24/arch/avr32/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
522+++ linux-2.6.32.23/arch/avr32/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 522+++ linux-2.6.32.24/arch/avr32/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
523@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg 523@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
524 the loader. We need to make sure that it is out of the way of the program 524 the loader. We need to make sure that it is out of the way of the program
525 that it will "exec", and that there is sufficient room for the brk. */ 525 that it will "exec", and that there is sufficient room for the brk. */
@@ -536,9 +536,9 @@ diff -urNp linux-2.6.32.23/arch/avr32/include/asm/elf.h linux-2.6.32.23/arch/avr
536 536
537 /* This yields a mask that user programs can use to figure out what 537 /* This yields a mask that user programs can use to figure out what
538 instruction set this CPU supports. This could be done in user space, 538 instruction set this CPU supports. This could be done in user space,
539diff -urNp linux-2.6.32.23/arch/avr32/include/asm/kmap_types.h linux-2.6.32.23/arch/avr32/include/asm/kmap_types.h 539diff -urNp linux-2.6.32.24/arch/avr32/include/asm/kmap_types.h linux-2.6.32.24/arch/avr32/include/asm/kmap_types.h
540--- linux-2.6.32.23/arch/avr32/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400 540--- linux-2.6.32.24/arch/avr32/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
541+++ linux-2.6.32.23/arch/avr32/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400 541+++ linux-2.6.32.24/arch/avr32/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
542@@ -22,7 +22,8 @@ D(10) KM_IRQ0, 542@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
543 D(11) KM_IRQ1, 543 D(11) KM_IRQ1,
544 D(12) KM_SOFTIRQ0, 544 D(12) KM_SOFTIRQ0,
@@ -549,9 +549,9 @@ diff -urNp linux-2.6.32.23/arch/avr32/include/asm/kmap_types.h linux-2.6.32.23/a
549 }; 549 };
550 550
551 #undef D 551 #undef D
552diff -urNp linux-2.6.32.23/arch/avr32/mach-at32ap/pm.c linux-2.6.32.23/arch/avr32/mach-at32ap/pm.c 552diff -urNp linux-2.6.32.24/arch/avr32/mach-at32ap/pm.c linux-2.6.32.24/arch/avr32/mach-at32ap/pm.c
553--- linux-2.6.32.23/arch/avr32/mach-at32ap/pm.c 2010-08-13 16:24:37.000000000 -0400 553--- linux-2.6.32.24/arch/avr32/mach-at32ap/pm.c 2010-08-13 16:24:37.000000000 -0400
554+++ linux-2.6.32.23/arch/avr32/mach-at32ap/pm.c 2010-09-04 15:54:51.000000000 -0400 554+++ linux-2.6.32.24/arch/avr32/mach-at32ap/pm.c 2010-09-04 15:54:51.000000000 -0400
555@@ -176,7 +176,7 @@ out: 555@@ -176,7 +176,7 @@ out:
556 return 0; 556 return 0;
557 } 557 }
@@ -561,9 +561,9 @@ diff -urNp linux-2.6.32.23/arch/avr32/mach-at32ap/pm.c linux-2.6.32.23/arch/avr3
561 .valid = avr32_pm_valid_state, 561 .valid = avr32_pm_valid_state,
562 .enter = avr32_pm_enter, 562 .enter = avr32_pm_enter,
563 }; 563 };
564diff -urNp linux-2.6.32.23/arch/avr32/mm/fault.c linux-2.6.32.23/arch/avr32/mm/fault.c 564diff -urNp linux-2.6.32.24/arch/avr32/mm/fault.c linux-2.6.32.24/arch/avr32/mm/fault.c
565--- linux-2.6.32.23/arch/avr32/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 565--- linux-2.6.32.24/arch/avr32/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
566+++ linux-2.6.32.23/arch/avr32/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 566+++ linux-2.6.32.24/arch/avr32/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
567@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru 567@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
568 568
569 int exception_trace = 1; 569 int exception_trace = 1;
@@ -605,9 +605,9 @@ diff -urNp linux-2.6.32.23/arch/avr32/mm/fault.c linux-2.6.32.23/arch/avr32/mm/f
605 if (exception_trace && printk_ratelimit()) 605 if (exception_trace && printk_ratelimit())
606 printk("%s%s[%d]: segfault at %08lx pc %08lx " 606 printk("%s%s[%d]: segfault at %08lx pc %08lx "
607 "sp %08lx ecr %lu\n", 607 "sp %08lx ecr %lu\n",
608diff -urNp linux-2.6.32.23/arch/blackfin/kernel/kgdb.c linux-2.6.32.23/arch/blackfin/kernel/kgdb.c 608diff -urNp linux-2.6.32.24/arch/blackfin/kernel/kgdb.c linux-2.6.32.24/arch/blackfin/kernel/kgdb.c
609--- linux-2.6.32.23/arch/blackfin/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400 609--- linux-2.6.32.24/arch/blackfin/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
610+++ linux-2.6.32.23/arch/blackfin/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400 610+++ linux-2.6.32.24/arch/blackfin/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
611@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto 611@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
612 return -1; /* this means that we do not want to exit from the handler */ 612 return -1; /* this means that we do not want to exit from the handler */
613 } 613 }
@@ -617,9 +617,9 @@ diff -urNp linux-2.6.32.23/arch/blackfin/kernel/kgdb.c linux-2.6.32.23/arch/blac
617 .gdb_bpt_instr = {0xa1}, 617 .gdb_bpt_instr = {0xa1},
618 #ifdef CONFIG_SMP 618 #ifdef CONFIG_SMP
619 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, 619 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
620diff -urNp linux-2.6.32.23/arch/blackfin/mach-common/pm.c linux-2.6.32.23/arch/blackfin/mach-common/pm.c 620diff -urNp linux-2.6.32.24/arch/blackfin/mach-common/pm.c linux-2.6.32.24/arch/blackfin/mach-common/pm.c
621--- linux-2.6.32.23/arch/blackfin/mach-common/pm.c 2010-08-13 16:24:37.000000000 -0400 621--- linux-2.6.32.24/arch/blackfin/mach-common/pm.c 2010-08-13 16:24:37.000000000 -0400
622+++ linux-2.6.32.23/arch/blackfin/mach-common/pm.c 2010-09-04 15:54:51.000000000 -0400 622+++ linux-2.6.32.24/arch/blackfin/mach-common/pm.c 2010-09-04 15:54:51.000000000 -0400
623@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t 623@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
624 return 0; 624 return 0;
625 } 625 }
@@ -629,9 +629,9 @@ diff -urNp linux-2.6.32.23/arch/blackfin/mach-common/pm.c linux-2.6.32.23/arch/b
629 .enter = bfin_pm_enter, 629 .enter = bfin_pm_enter,
630 .valid = bfin_pm_valid, 630 .valid = bfin_pm_valid,
631 }; 631 };
632diff -urNp linux-2.6.32.23/arch/frv/include/asm/kmap_types.h linux-2.6.32.23/arch/frv/include/asm/kmap_types.h 632diff -urNp linux-2.6.32.24/arch/frv/include/asm/kmap_types.h linux-2.6.32.24/arch/frv/include/asm/kmap_types.h
633--- linux-2.6.32.23/arch/frv/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400 633--- linux-2.6.32.24/arch/frv/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
634+++ linux-2.6.32.23/arch/frv/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400 634+++ linux-2.6.32.24/arch/frv/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
635@@ -23,6 +23,7 @@ enum km_type { 635@@ -23,6 +23,7 @@ enum km_type {
636 KM_IRQ1, 636 KM_IRQ1,
637 KM_SOFTIRQ0, 637 KM_SOFTIRQ0,
@@ -640,9 +640,9 @@ diff -urNp linux-2.6.32.23/arch/frv/include/asm/kmap_types.h linux-2.6.32.23/arc
640 KM_TYPE_NR 640 KM_TYPE_NR
641 }; 641 };
642 642
643diff -urNp linux-2.6.32.23/arch/frv/mm/elf-fdpic.c linux-2.6.32.23/arch/frv/mm/elf-fdpic.c 643diff -urNp linux-2.6.32.24/arch/frv/mm/elf-fdpic.c linux-2.6.32.24/arch/frv/mm/elf-fdpic.c
644--- linux-2.6.32.23/arch/frv/mm/elf-fdpic.c 2010-08-13 16:24:37.000000000 -0400 644--- linux-2.6.32.24/arch/frv/mm/elf-fdpic.c 2010-08-13 16:24:37.000000000 -0400
645+++ linux-2.6.32.23/arch/frv/mm/elf-fdpic.c 2010-09-17 18:34:04.000000000 -0400 645+++ linux-2.6.32.24/arch/frv/mm/elf-fdpic.c 2010-09-17 18:34:04.000000000 -0400
646@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str 646@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
647 if (addr) { 647 if (addr) {
648 addr = PAGE_ALIGN(addr); 648 addr = PAGE_ALIGN(addr);
@@ -671,9 +671,9 @@ diff -urNp linux-2.6.32.23/arch/frv/mm/elf-fdpic.c linux-2.6.32.23/arch/frv/mm/e
671 goto success; 671 goto success;
672 addr = vma->vm_end; 672 addr = vma->vm_end;
673 } 673 }
674diff -urNp linux-2.6.32.23/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.23/arch/ia64/hp/common/hwsw_iommu.c 674diff -urNp linux-2.6.32.24/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.24/arch/ia64/hp/common/hwsw_iommu.c
675--- linux-2.6.32.23/arch/ia64/hp/common/hwsw_iommu.c 2010-08-13 16:24:37.000000000 -0400 675--- linux-2.6.32.24/arch/ia64/hp/common/hwsw_iommu.c 2010-08-13 16:24:37.000000000 -0400
676+++ linux-2.6.32.23/arch/ia64/hp/common/hwsw_iommu.c 2010-09-04 15:54:51.000000000 -0400 676+++ linux-2.6.32.24/arch/ia64/hp/common/hwsw_iommu.c 2010-09-04 15:54:51.000000000 -0400
677@@ -17,7 +17,7 @@ 677@@ -17,7 +17,7 @@
678 #include <linux/swiotlb.h> 678 #include <linux/swiotlb.h>
679 #include <asm/machvec.h> 679 #include <asm/machvec.h>
@@ -692,9 +692,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.23/arch
692 { 692 {
693 if (use_swiotlb(dev)) 693 if (use_swiotlb(dev))
694 return &swiotlb_dma_ops; 694 return &swiotlb_dma_ops;
695diff -urNp linux-2.6.32.23/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.23/arch/ia64/hp/common/sba_iommu.c 695diff -urNp linux-2.6.32.24/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.24/arch/ia64/hp/common/sba_iommu.c
696--- linux-2.6.32.23/arch/ia64/hp/common/sba_iommu.c 2010-08-13 16:24:37.000000000 -0400 696--- linux-2.6.32.24/arch/ia64/hp/common/sba_iommu.c 2010-08-13 16:24:37.000000000 -0400
697+++ linux-2.6.32.23/arch/ia64/hp/common/sba_iommu.c 2010-09-04 15:54:51.000000000 -0400 697+++ linux-2.6.32.24/arch/ia64/hp/common/sba_iommu.c 2010-09-04 15:54:51.000000000 -0400
698@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d 698@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
699 }, 699 },
700 }; 700 };
@@ -713,9 +713,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.23/arch/
713 .alloc_coherent = sba_alloc_coherent, 713 .alloc_coherent = sba_alloc_coherent,
714 .free_coherent = sba_free_coherent, 714 .free_coherent = sba_free_coherent,
715 .map_page = sba_map_page, 715 .map_page = sba_map_page,
716diff -urNp linux-2.6.32.23/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.23/arch/ia64/ia32/binfmt_elf32.c 716diff -urNp linux-2.6.32.24/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.24/arch/ia64/ia32/binfmt_elf32.c
717--- linux-2.6.32.23/arch/ia64/ia32/binfmt_elf32.c 2010-08-13 16:24:37.000000000 -0400 717--- linux-2.6.32.24/arch/ia64/ia32/binfmt_elf32.c 2010-08-13 16:24:37.000000000 -0400
718+++ linux-2.6.32.23/arch/ia64/ia32/binfmt_elf32.c 2010-09-04 15:54:51.000000000 -0400 718+++ linux-2.6.32.24/arch/ia64/ia32/binfmt_elf32.c 2010-09-04 15:54:51.000000000 -0400
719@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ 719@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
720 720
721 #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) 721 #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack))
@@ -730,9 +730,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.23/arch/ia
730 /* Ugly but avoids duplication */ 730 /* Ugly but avoids duplication */
731 #include "../../../fs/binfmt_elf.c" 731 #include "../../../fs/binfmt_elf.c"
732 732
733diff -urNp linux-2.6.32.23/arch/ia64/ia32/ia32priv.h linux-2.6.32.23/arch/ia64/ia32/ia32priv.h 733diff -urNp linux-2.6.32.24/arch/ia64/ia32/ia32priv.h linux-2.6.32.24/arch/ia64/ia32/ia32priv.h
734--- linux-2.6.32.23/arch/ia64/ia32/ia32priv.h 2010-08-13 16:24:37.000000000 -0400 734--- linux-2.6.32.24/arch/ia64/ia32/ia32priv.h 2010-08-13 16:24:37.000000000 -0400
735+++ linux-2.6.32.23/arch/ia64/ia32/ia32priv.h 2010-09-04 15:54:51.000000000 -0400 735+++ linux-2.6.32.24/arch/ia64/ia32/ia32priv.h 2010-09-04 15:54:51.000000000 -0400
736@@ -296,7 +296,14 @@ typedef struct compat_siginfo { 736@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
737 #define ELF_DATA ELFDATA2LSB 737 #define ELF_DATA ELFDATA2LSB
738 #define ELF_ARCH EM_386 738 #define ELF_ARCH EM_386
@@ -749,9 +749,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/ia32/ia32priv.h linux-2.6.32.23/arch/ia64/i
749 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET 749 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET
750 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE 750 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
751 751
752diff -urNp linux-2.6.32.23/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.23/arch/ia64/include/asm/dma-mapping.h 752diff -urNp linux-2.6.32.24/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.24/arch/ia64/include/asm/dma-mapping.h
753--- linux-2.6.32.23/arch/ia64/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400 753--- linux-2.6.32.24/arch/ia64/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
754+++ linux-2.6.32.23/arch/ia64/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400 754+++ linux-2.6.32.24/arch/ia64/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400
755@@ -12,7 +12,7 @@ 755@@ -12,7 +12,7 @@
756 756
757 #define ARCH_HAS_DMA_GET_REQUIRED_MASK 757 #define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -795,9 +795,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.23/a
795 return ops->dma_supported(dev, mask); 795 return ops->dma_supported(dev, mask);
796 } 796 }
797 797
798diff -urNp linux-2.6.32.23/arch/ia64/include/asm/elf.h linux-2.6.32.23/arch/ia64/include/asm/elf.h 798diff -urNp linux-2.6.32.24/arch/ia64/include/asm/elf.h linux-2.6.32.24/arch/ia64/include/asm/elf.h
799--- linux-2.6.32.23/arch/ia64/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 799--- linux-2.6.32.24/arch/ia64/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
800+++ linux-2.6.32.23/arch/ia64/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 800+++ linux-2.6.32.24/arch/ia64/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
801@@ -43,6 +43,13 @@ 801@@ -43,6 +43,13 @@
802 */ 802 */
803 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) 803 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -812,9 +812,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/include/asm/elf.h linux-2.6.32.23/arch/ia64
812 #define PT_IA_64_UNWIND 0x70000001 812 #define PT_IA_64_UNWIND 0x70000001
813 813
814 /* IA-64 relocations: */ 814 /* IA-64 relocations: */
815diff -urNp linux-2.6.32.23/arch/ia64/include/asm/machvec.h linux-2.6.32.23/arch/ia64/include/asm/machvec.h 815diff -urNp linux-2.6.32.24/arch/ia64/include/asm/machvec.h linux-2.6.32.24/arch/ia64/include/asm/machvec.h
816--- linux-2.6.32.23/arch/ia64/include/asm/machvec.h 2010-08-13 16:24:37.000000000 -0400 816--- linux-2.6.32.24/arch/ia64/include/asm/machvec.h 2010-08-13 16:24:37.000000000 -0400
817+++ linux-2.6.32.23/arch/ia64/include/asm/machvec.h 2010-09-04 15:54:51.000000000 -0400 817+++ linux-2.6.32.24/arch/ia64/include/asm/machvec.h 2010-09-04 15:54:51.000000000 -0400
818@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event 818@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
819 /* DMA-mapping interface: */ 819 /* DMA-mapping interface: */
820 typedef void ia64_mv_dma_init (void); 820 typedef void ia64_mv_dma_init (void);
@@ -833,9 +833,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/include/asm/machvec.h linux-2.6.32.23/arch/
833 833
834 /* 834 /*
835 * Define default versions so we can extend machvec for new platforms without having 835 * Define default versions so we can extend machvec for new platforms without having
836diff -urNp linux-2.6.32.23/arch/ia64/include/asm/pgtable.h linux-2.6.32.23/arch/ia64/include/asm/pgtable.h 836diff -urNp linux-2.6.32.24/arch/ia64/include/asm/pgtable.h linux-2.6.32.24/arch/ia64/include/asm/pgtable.h
837--- linux-2.6.32.23/arch/ia64/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400 837--- linux-2.6.32.24/arch/ia64/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
838+++ linux-2.6.32.23/arch/ia64/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400 838+++ linux-2.6.32.24/arch/ia64/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400
839@@ -12,7 +12,7 @@ 839@@ -12,7 +12,7 @@
840 * David Mosberger-Tang <davidm@hpl.hp.com> 840 * David Mosberger-Tang <davidm@hpl.hp.com>
841 */ 841 */
@@ -863,9 +863,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/include/asm/pgtable.h linux-2.6.32.23/arch/
863 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) 863 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
864 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) 864 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
865 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) 865 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
866diff -urNp linux-2.6.32.23/arch/ia64/include/asm/uaccess.h linux-2.6.32.23/arch/ia64/include/asm/uaccess.h 866diff -urNp linux-2.6.32.24/arch/ia64/include/asm/uaccess.h linux-2.6.32.24/arch/ia64/include/asm/uaccess.h
867--- linux-2.6.32.23/arch/ia64/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400 867--- linux-2.6.32.24/arch/ia64/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
868+++ linux-2.6.32.23/arch/ia64/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400 868+++ linux-2.6.32.24/arch/ia64/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
869@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ 869@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
870 const void *__cu_from = (from); \ 870 const void *__cu_from = (from); \
871 long __cu_len = (n); \ 871 long __cu_len = (n); \
@@ -884,9 +884,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/include/asm/uaccess.h linux-2.6.32.23/arch/
884 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ 884 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
885 __cu_len; \ 885 __cu_len; \
886 }) 886 })
887diff -urNp linux-2.6.32.23/arch/ia64/kernel/dma-mapping.c linux-2.6.32.23/arch/ia64/kernel/dma-mapping.c 887diff -urNp linux-2.6.32.24/arch/ia64/kernel/dma-mapping.c linux-2.6.32.24/arch/ia64/kernel/dma-mapping.c
888--- linux-2.6.32.23/arch/ia64/kernel/dma-mapping.c 2010-08-13 16:24:37.000000000 -0400 888--- linux-2.6.32.24/arch/ia64/kernel/dma-mapping.c 2010-08-13 16:24:37.000000000 -0400
889+++ linux-2.6.32.23/arch/ia64/kernel/dma-mapping.c 2010-09-04 15:54:51.000000000 -0400 889+++ linux-2.6.32.24/arch/ia64/kernel/dma-mapping.c 2010-09-04 15:54:51.000000000 -0400
890@@ -3,7 +3,7 @@ 890@@ -3,7 +3,7 @@
891 /* Set this to 1 if there is a HW IOMMU in the system */ 891 /* Set this to 1 if there is a HW IOMMU in the system */
892 int iommu_detected __read_mostly; 892 int iommu_detected __read_mostly;
@@ -905,9 +905,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/kernel/dma-mapping.c linux-2.6.32.23/arch/i
905 { 905 {
906 return dma_ops; 906 return dma_ops;
907 } 907 }
908diff -urNp linux-2.6.32.23/arch/ia64/kernel/module.c linux-2.6.32.23/arch/ia64/kernel/module.c 908diff -urNp linux-2.6.32.24/arch/ia64/kernel/module.c linux-2.6.32.24/arch/ia64/kernel/module.c
909--- linux-2.6.32.23/arch/ia64/kernel/module.c 2010-08-13 16:24:37.000000000 -0400 909--- linux-2.6.32.24/arch/ia64/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
910+++ linux-2.6.32.23/arch/ia64/kernel/module.c 2010-09-04 15:54:51.000000000 -0400 910+++ linux-2.6.32.24/arch/ia64/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
911@@ -315,8 +315,7 @@ module_alloc (unsigned long size) 911@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
912 void 912 void
913 module_free (struct module *mod, void *module_region) 913 module_free (struct module *mod, void *module_region)
@@ -996,9 +996,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/kernel/module.c linux-2.6.32.23/arch/ia64/k
996 mod->arch.gp = gp; 996 mod->arch.gp = gp;
997 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); 997 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
998 } 998 }
999diff -urNp linux-2.6.32.23/arch/ia64/kernel/pci-dma.c linux-2.6.32.23/arch/ia64/kernel/pci-dma.c 999diff -urNp linux-2.6.32.24/arch/ia64/kernel/pci-dma.c linux-2.6.32.24/arch/ia64/kernel/pci-dma.c
1000--- linux-2.6.32.23/arch/ia64/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400 1000--- linux-2.6.32.24/arch/ia64/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
1001+++ linux-2.6.32.23/arch/ia64/kernel/pci-dma.c 2010-09-04 15:54:51.000000000 -0400 1001+++ linux-2.6.32.24/arch/ia64/kernel/pci-dma.c 2010-09-04 15:54:51.000000000 -0400
1002@@ -43,7 +43,7 @@ struct device fallback_dev = { 1002@@ -43,7 +43,7 @@ struct device fallback_dev = {
1003 .dma_mask = &fallback_dev.coherent_dma_mask, 1003 .dma_mask = &fallback_dev.coherent_dma_mask,
1004 }; 1004 };
@@ -1050,9 +1050,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/kernel/pci-dma.c linux-2.6.32.23/arch/ia64/
1050 1050
1051 /* 1051 /*
1052 * The order of these functions is important for 1052 * The order of these functions is important for
1053diff -urNp linux-2.6.32.23/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.23/arch/ia64/kernel/pci-swiotlb.c 1053diff -urNp linux-2.6.32.24/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.24/arch/ia64/kernel/pci-swiotlb.c
1054--- linux-2.6.32.23/arch/ia64/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400 1054--- linux-2.6.32.24/arch/ia64/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
1055+++ linux-2.6.32.23/arch/ia64/kernel/pci-swiotlb.c 2010-09-04 15:54:51.000000000 -0400 1055+++ linux-2.6.32.24/arch/ia64/kernel/pci-swiotlb.c 2010-09-04 15:54:51.000000000 -0400
1056@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent 1056@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
1057 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); 1057 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
1058 } 1058 }
@@ -1062,9 +1062,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.23/arch/i
1062 .alloc_coherent = ia64_swiotlb_alloc_coherent, 1062 .alloc_coherent = ia64_swiotlb_alloc_coherent,
1063 .free_coherent = swiotlb_free_coherent, 1063 .free_coherent = swiotlb_free_coherent,
1064 .map_page = swiotlb_map_page, 1064 .map_page = swiotlb_map_page,
1065diff -urNp linux-2.6.32.23/arch/ia64/kernel/sys_ia64.c linux-2.6.32.23/arch/ia64/kernel/sys_ia64.c 1065diff -urNp linux-2.6.32.24/arch/ia64/kernel/sys_ia64.c linux-2.6.32.24/arch/ia64/kernel/sys_ia64.c
1066--- linux-2.6.32.23/arch/ia64/kernel/sys_ia64.c 2010-08-13 16:24:37.000000000 -0400 1066--- linux-2.6.32.24/arch/ia64/kernel/sys_ia64.c 2010-08-13 16:24:37.000000000 -0400
1067+++ linux-2.6.32.23/arch/ia64/kernel/sys_ia64.c 2010-09-17 18:34:04.000000000 -0400 1067+++ linux-2.6.32.24/arch/ia64/kernel/sys_ia64.c 2010-09-17 18:34:04.000000000 -0400
1068@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil 1068@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
1069 if (REGION_NUMBER(addr) == RGN_HPAGE) 1069 if (REGION_NUMBER(addr) == RGN_HPAGE)
1070 addr = 0; 1070 addr = 0;
@@ -1097,9 +1097,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/kernel/sys_ia64.c linux-2.6.32.23/arch/ia64
1097 /* Remember the address where we stopped this search: */ 1097 /* Remember the address where we stopped this search: */
1098 mm->free_area_cache = addr + len; 1098 mm->free_area_cache = addr + len;
1099 return addr; 1099 return addr;
1100diff -urNp linux-2.6.32.23/arch/ia64/kernel/topology.c linux-2.6.32.23/arch/ia64/kernel/topology.c 1100diff -urNp linux-2.6.32.24/arch/ia64/kernel/topology.c linux-2.6.32.24/arch/ia64/kernel/topology.c
1101--- linux-2.6.32.23/arch/ia64/kernel/topology.c 2010-08-13 16:24:37.000000000 -0400 1101--- linux-2.6.32.24/arch/ia64/kernel/topology.c 2010-08-13 16:24:37.000000000 -0400
1102+++ linux-2.6.32.23/arch/ia64/kernel/topology.c 2010-09-04 15:54:51.000000000 -0400 1102+++ linux-2.6.32.24/arch/ia64/kernel/topology.c 2010-09-04 15:54:51.000000000 -0400
1103@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject 1103@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
1104 return ret; 1104 return ret;
1105 } 1105 }
@@ -1109,9 +1109,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/kernel/topology.c linux-2.6.32.23/arch/ia64
1109 .show = cache_show 1109 .show = cache_show
1110 }; 1110 };
1111 1111
1112diff -urNp linux-2.6.32.23/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.23/arch/ia64/kernel/vmlinux.lds.S 1112diff -urNp linux-2.6.32.24/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.24/arch/ia64/kernel/vmlinux.lds.S
1113--- linux-2.6.32.23/arch/ia64/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400 1113--- linux-2.6.32.24/arch/ia64/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
1114+++ linux-2.6.32.23/arch/ia64/kernel/vmlinux.lds.S 2010-09-04 15:54:51.000000000 -0400 1114+++ linux-2.6.32.24/arch/ia64/kernel/vmlinux.lds.S 2010-09-04 15:54:51.000000000 -0400
1115@@ -190,7 +190,7 @@ SECTIONS 1115@@ -190,7 +190,7 @@ SECTIONS
1116 /* Per-cpu data: */ 1116 /* Per-cpu data: */
1117 . = ALIGN(PERCPU_PAGE_SIZE); 1117 . = ALIGN(PERCPU_PAGE_SIZE);
@@ -1121,9 +1121,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.23/arch/i
1121 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits 1121 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
1122 * into percpu page size 1122 * into percpu page size
1123 */ 1123 */
1124diff -urNp linux-2.6.32.23/arch/ia64/mm/fault.c linux-2.6.32.23/arch/ia64/mm/fault.c 1124diff -urNp linux-2.6.32.24/arch/ia64/mm/fault.c linux-2.6.32.24/arch/ia64/mm/fault.c
1125--- linux-2.6.32.23/arch/ia64/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 1125--- linux-2.6.32.24/arch/ia64/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
1126+++ linux-2.6.32.23/arch/ia64/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 1126+++ linux-2.6.32.24/arch/ia64/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
1127@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 1127@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
1128 return pte_present(pte); 1128 return pte_present(pte);
1129 } 1129 }
@@ -1173,9 +1173,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/mm/fault.c linux-2.6.32.23/arch/ia64/mm/fau
1173 survive: 1173 survive:
1174 /* 1174 /*
1175 * If for any reason at all we couldn't handle the fault, make 1175 * If for any reason at all we couldn't handle the fault, make
1176diff -urNp linux-2.6.32.23/arch/ia64/mm/hugetlbpage.c linux-2.6.32.23/arch/ia64/mm/hugetlbpage.c 1176diff -urNp linux-2.6.32.24/arch/ia64/mm/hugetlbpage.c linux-2.6.32.24/arch/ia64/mm/hugetlbpage.c
1177--- linux-2.6.32.23/arch/ia64/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400 1177--- linux-2.6.32.24/arch/ia64/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
1178+++ linux-2.6.32.23/arch/ia64/mm/hugetlbpage.c 2010-09-17 18:34:04.000000000 -0400 1178+++ linux-2.6.32.24/arch/ia64/mm/hugetlbpage.c 2010-09-17 18:34:04.000000000 -0400
1179@@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area( 1179@@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area(
1180 /* At this point: (!vmm || addr < vmm->vm_end). */ 1180 /* At this point: (!vmm || addr < vmm->vm_end). */
1181 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT) 1181 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
@@ -1185,9 +1185,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/mm/hugetlbpage.c linux-2.6.32.23/arch/ia64/
1185 return addr; 1185 return addr;
1186 addr = ALIGN(vmm->vm_end, HPAGE_SIZE); 1186 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
1187 } 1187 }
1188diff -urNp linux-2.6.32.23/arch/ia64/mm/init.c linux-2.6.32.23/arch/ia64/mm/init.c 1188diff -urNp linux-2.6.32.24/arch/ia64/mm/init.c linux-2.6.32.24/arch/ia64/mm/init.c
1189--- linux-2.6.32.23/arch/ia64/mm/init.c 2010-08-13 16:24:37.000000000 -0400 1189--- linux-2.6.32.24/arch/ia64/mm/init.c 2010-08-13 16:24:37.000000000 -0400
1190+++ linux-2.6.32.23/arch/ia64/mm/init.c 2010-09-04 15:54:51.000000000 -0400 1190+++ linux-2.6.32.24/arch/ia64/mm/init.c 2010-09-04 15:54:51.000000000 -0400
1191@@ -122,6 +122,19 @@ ia64_init_addr_space (void) 1191@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
1192 vma->vm_start = current->thread.rbs_bot & PAGE_MASK; 1192 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
1193 vma->vm_end = vma->vm_start + PAGE_SIZE; 1193 vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1208,9 +1208,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/mm/init.c linux-2.6.32.23/arch/ia64/mm/init
1208 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 1208 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
1209 down_write(&current->mm->mmap_sem); 1209 down_write(&current->mm->mmap_sem);
1210 if (insert_vm_struct(current->mm, vma)) { 1210 if (insert_vm_struct(current->mm, vma)) {
1211diff -urNp linux-2.6.32.23/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.23/arch/ia64/sn/pci/pci_dma.c 1211diff -urNp linux-2.6.32.24/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.24/arch/ia64/sn/pci/pci_dma.c
1212--- linux-2.6.32.23/arch/ia64/sn/pci/pci_dma.c 2010-08-13 16:24:37.000000000 -0400 1212--- linux-2.6.32.24/arch/ia64/sn/pci/pci_dma.c 2010-08-13 16:24:37.000000000 -0400
1213+++ linux-2.6.32.23/arch/ia64/sn/pci/pci_dma.c 2010-09-04 15:54:51.000000000 -0400 1213+++ linux-2.6.32.24/arch/ia64/sn/pci/pci_dma.c 2010-09-04 15:54:51.000000000 -0400
1214@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * 1214@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
1215 return ret; 1215 return ret;
1216 } 1216 }
@@ -1220,9 +1220,9 @@ diff -urNp linux-2.6.32.23/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.23/arch/ia64/
1220 .alloc_coherent = sn_dma_alloc_coherent, 1220 .alloc_coherent = sn_dma_alloc_coherent,
1221 .free_coherent = sn_dma_free_coherent, 1221 .free_coherent = sn_dma_free_coherent,
1222 .map_page = sn_dma_map_page, 1222 .map_page = sn_dma_map_page,
1223diff -urNp linux-2.6.32.23/arch/m32r/lib/usercopy.c linux-2.6.32.23/arch/m32r/lib/usercopy.c 1223diff -urNp linux-2.6.32.24/arch/m32r/lib/usercopy.c linux-2.6.32.24/arch/m32r/lib/usercopy.c
1224--- linux-2.6.32.23/arch/m32r/lib/usercopy.c 2010-08-13 16:24:37.000000000 -0400 1224--- linux-2.6.32.24/arch/m32r/lib/usercopy.c 2010-08-13 16:24:37.000000000 -0400
1225+++ linux-2.6.32.23/arch/m32r/lib/usercopy.c 2010-09-04 15:54:51.000000000 -0400 1225+++ linux-2.6.32.24/arch/m32r/lib/usercopy.c 2010-09-04 15:54:51.000000000 -0400
1226@@ -14,6 +14,9 @@ 1226@@ -14,6 +14,9 @@
1227 unsigned long 1227 unsigned long
1228 __generic_copy_to_user(void __user *to, const void *from, unsigned long n) 1228 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1243,9 +1243,9 @@ diff -urNp linux-2.6.32.23/arch/m32r/lib/usercopy.c linux-2.6.32.23/arch/m32r/li
1243 prefetchw(to); 1243 prefetchw(to);
1244 if (access_ok(VERIFY_READ, from, n)) 1244 if (access_ok(VERIFY_READ, from, n))
1245 __copy_user_zeroing(to,from,n); 1245 __copy_user_zeroing(to,from,n);
1246diff -urNp linux-2.6.32.23/arch/mips/alchemy/devboards/pm.c linux-2.6.32.23/arch/mips/alchemy/devboards/pm.c 1246diff -urNp linux-2.6.32.24/arch/mips/alchemy/devboards/pm.c linux-2.6.32.24/arch/mips/alchemy/devboards/pm.c
1247--- linux-2.6.32.23/arch/mips/alchemy/devboards/pm.c 2010-08-13 16:24:37.000000000 -0400 1247--- linux-2.6.32.24/arch/mips/alchemy/devboards/pm.c 2010-08-13 16:24:37.000000000 -0400
1248+++ linux-2.6.32.23/arch/mips/alchemy/devboards/pm.c 2010-09-04 15:54:51.000000000 -0400 1248+++ linux-2.6.32.24/arch/mips/alchemy/devboards/pm.c 2010-09-04 15:54:51.000000000 -0400
1249@@ -78,7 +78,7 @@ static void db1x_pm_end(void) 1249@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
1250 1250
1251 } 1251 }
@@ -1255,9 +1255,9 @@ diff -urNp linux-2.6.32.23/arch/mips/alchemy/devboards/pm.c linux-2.6.32.23/arch
1255 .valid = suspend_valid_only_mem, 1255 .valid = suspend_valid_only_mem,
1256 .begin = db1x_pm_begin, 1256 .begin = db1x_pm_begin,
1257 .enter = db1x_pm_enter, 1257 .enter = db1x_pm_enter,
1258diff -urNp linux-2.6.32.23/arch/mips/include/asm/elf.h linux-2.6.32.23/arch/mips/include/asm/elf.h 1258diff -urNp linux-2.6.32.24/arch/mips/include/asm/elf.h linux-2.6.32.24/arch/mips/include/asm/elf.h
1259--- linux-2.6.32.23/arch/mips/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 1259--- linux-2.6.32.24/arch/mips/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
1260+++ linux-2.6.32.23/arch/mips/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 1260+++ linux-2.6.32.24/arch/mips/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
1261@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str 1261@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
1262 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) 1262 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1263 #endif 1263 #endif
@@ -1270,9 +1270,9 @@ diff -urNp linux-2.6.32.23/arch/mips/include/asm/elf.h linux-2.6.32.23/arch/mips
1270+#endif 1270+#endif
1271+ 1271+
1272 #endif /* _ASM_ELF_H */ 1272 #endif /* _ASM_ELF_H */
1273diff -urNp linux-2.6.32.23/arch/mips/include/asm/page.h linux-2.6.32.23/arch/mips/include/asm/page.h 1273diff -urNp linux-2.6.32.24/arch/mips/include/asm/page.h linux-2.6.32.24/arch/mips/include/asm/page.h
1274--- linux-2.6.32.23/arch/mips/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400 1274--- linux-2.6.32.24/arch/mips/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
1275+++ linux-2.6.32.23/arch/mips/include/asm/page.h 2010-09-04 15:54:51.000000000 -0400 1275+++ linux-2.6.32.24/arch/mips/include/asm/page.h 2010-09-04 15:54:51.000000000 -0400
1276@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa 1276@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
1277 #ifdef CONFIG_CPU_MIPS32 1277 #ifdef CONFIG_CPU_MIPS32
1278 typedef struct { unsigned long pte_low, pte_high; } pte_t; 1278 typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1282,9 +1282,9 @@ diff -urNp linux-2.6.32.23/arch/mips/include/asm/page.h linux-2.6.32.23/arch/mip
1282 #else 1282 #else
1283 typedef struct { unsigned long long pte; } pte_t; 1283 typedef struct { unsigned long long pte; } pte_t;
1284 #define pte_val(x) ((x).pte) 1284 #define pte_val(x) ((x).pte)
1285diff -urNp linux-2.6.32.23/arch/mips/include/asm/system.h linux-2.6.32.23/arch/mips/include/asm/system.h 1285diff -urNp linux-2.6.32.24/arch/mips/include/asm/system.h linux-2.6.32.24/arch/mips/include/asm/system.h
1286--- linux-2.6.32.23/arch/mips/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400 1286--- linux-2.6.32.24/arch/mips/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
1287+++ linux-2.6.32.23/arch/mips/include/asm/system.h 2010-09-04 15:54:51.000000000 -0400 1287+++ linux-2.6.32.24/arch/mips/include/asm/system.h 2010-09-04 15:54:51.000000000 -0400
1288@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); 1288@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
1289 */ 1289 */
1290 #define __ARCH_WANT_UNLOCKED_CTXSW 1290 #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1293,9 +1293,9 @@ diff -urNp linux-2.6.32.23/arch/mips/include/asm/system.h linux-2.6.32.23/arch/m
1293+#define arch_align_stack(x) ((x) & ALMASK) 1293+#define arch_align_stack(x) ((x) & ALMASK)
1294 1294
1295 #endif /* _ASM_SYSTEM_H */ 1295 #endif /* _ASM_SYSTEM_H */
1296diff -urNp linux-2.6.32.23/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.23/arch/mips/kernel/binfmt_elfn32.c 1296diff -urNp linux-2.6.32.24/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.24/arch/mips/kernel/binfmt_elfn32.c
1297--- linux-2.6.32.23/arch/mips/kernel/binfmt_elfn32.c 2010-08-13 16:24:37.000000000 -0400 1297--- linux-2.6.32.24/arch/mips/kernel/binfmt_elfn32.c 2010-08-13 16:24:37.000000000 -0400
1298+++ linux-2.6.32.23/arch/mips/kernel/binfmt_elfn32.c 2010-09-04 15:54:51.000000000 -0400 1298+++ linux-2.6.32.24/arch/mips/kernel/binfmt_elfn32.c 2010-09-04 15:54:51.000000000 -0400
1299@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N 1299@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
1300 #undef ELF_ET_DYN_BASE 1300 #undef ELF_ET_DYN_BASE
1301 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) 1301 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1310,9 +1310,9 @@ diff -urNp linux-2.6.32.23/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.23/arch
1310 #include <asm/processor.h> 1310 #include <asm/processor.h>
1311 #include <linux/module.h> 1311 #include <linux/module.h>
1312 #include <linux/elfcore.h> 1312 #include <linux/elfcore.h>
1313diff -urNp linux-2.6.32.23/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.23/arch/mips/kernel/binfmt_elfo32.c 1313diff -urNp linux-2.6.32.24/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.24/arch/mips/kernel/binfmt_elfo32.c
1314--- linux-2.6.32.23/arch/mips/kernel/binfmt_elfo32.c 2010-08-13 16:24:37.000000000 -0400 1314--- linux-2.6.32.24/arch/mips/kernel/binfmt_elfo32.c 2010-08-13 16:24:37.000000000 -0400
1315+++ linux-2.6.32.23/arch/mips/kernel/binfmt_elfo32.c 2010-09-04 15:54:51.000000000 -0400 1315+++ linux-2.6.32.24/arch/mips/kernel/binfmt_elfo32.c 2010-09-04 15:54:51.000000000 -0400
1316@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N 1316@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
1317 #undef ELF_ET_DYN_BASE 1317 #undef ELF_ET_DYN_BASE
1318 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) 1318 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1327,9 +1327,9 @@ diff -urNp linux-2.6.32.23/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.23/arch
1327 #include <asm/processor.h> 1327 #include <asm/processor.h>
1328 1328
1329 /* 1329 /*
1330diff -urNp linux-2.6.32.23/arch/mips/kernel/kgdb.c linux-2.6.32.23/arch/mips/kernel/kgdb.c 1330diff -urNp linux-2.6.32.24/arch/mips/kernel/kgdb.c linux-2.6.32.24/arch/mips/kernel/kgdb.c
1331--- linux-2.6.32.23/arch/mips/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400 1331--- linux-2.6.32.24/arch/mips/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
1332+++ linux-2.6.32.23/arch/mips/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400 1332+++ linux-2.6.32.24/arch/mips/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
1333@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto 1333@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
1334 return -1; 1334 return -1;
1335 } 1335 }
@@ -1338,9 +1338,9 @@ diff -urNp linux-2.6.32.23/arch/mips/kernel/kgdb.c linux-2.6.32.23/arch/mips/ker
1338 struct kgdb_arch arch_kgdb_ops; 1338 struct kgdb_arch arch_kgdb_ops;
1339 1339
1340 /* 1340 /*
1341diff -urNp linux-2.6.32.23/arch/mips/kernel/process.c linux-2.6.32.23/arch/mips/kernel/process.c 1341diff -urNp linux-2.6.32.24/arch/mips/kernel/process.c linux-2.6.32.24/arch/mips/kernel/process.c
1342--- linux-2.6.32.23/arch/mips/kernel/process.c 2010-08-13 16:24:37.000000000 -0400 1342--- linux-2.6.32.24/arch/mips/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
1343+++ linux-2.6.32.23/arch/mips/kernel/process.c 2010-09-04 15:54:51.000000000 -0400 1343+++ linux-2.6.32.24/arch/mips/kernel/process.c 2010-09-04 15:54:51.000000000 -0400
1344@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru 1344@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
1345 out: 1345 out:
1346 return pc; 1346 return pc;
@@ -1357,9 +1357,9 @@ diff -urNp linux-2.6.32.23/arch/mips/kernel/process.c linux-2.6.32.23/arch/mips/
1357- 1357-
1358- return sp & ALMASK; 1358- return sp & ALMASK;
1359-} 1359-}
1360diff -urNp linux-2.6.32.23/arch/mips/kernel/syscall.c linux-2.6.32.23/arch/mips/kernel/syscall.c 1360diff -urNp linux-2.6.32.24/arch/mips/kernel/syscall.c linux-2.6.32.24/arch/mips/kernel/syscall.c
1361--- linux-2.6.32.23/arch/mips/kernel/syscall.c 2010-08-13 16:24:37.000000000 -0400 1361--- linux-2.6.32.24/arch/mips/kernel/syscall.c 2010-08-13 16:24:37.000000000 -0400
1362+++ linux-2.6.32.23/arch/mips/kernel/syscall.c 2010-09-17 18:34:04.000000000 -0400 1362+++ linux-2.6.32.24/arch/mips/kernel/syscall.c 2010-09-17 18:34:04.000000000 -0400
1363@@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str 1363@@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str
1364 do_color_align = 0; 1364 do_color_align = 0;
1365 if (filp || (flags & MAP_SHARED)) 1365 if (filp || (flags & MAP_SHARED))
@@ -1394,9 +1394,9 @@ diff -urNp linux-2.6.32.23/arch/mips/kernel/syscall.c linux-2.6.32.23/arch/mips/
1394 return addr; 1394 return addr;
1395 addr = vmm->vm_end; 1395 addr = vmm->vm_end;
1396 if (do_color_align) 1396 if (do_color_align)
1397diff -urNp linux-2.6.32.23/arch/mips/mm/fault.c linux-2.6.32.23/arch/mips/mm/fault.c 1397diff -urNp linux-2.6.32.24/arch/mips/mm/fault.c linux-2.6.32.24/arch/mips/mm/fault.c
1398--- linux-2.6.32.23/arch/mips/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 1398--- linux-2.6.32.24/arch/mips/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
1399+++ linux-2.6.32.23/arch/mips/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 1399+++ linux-2.6.32.24/arch/mips/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
1400@@ -26,6 +26,23 @@ 1400@@ -26,6 +26,23 @@
1401 #include <asm/ptrace.h> 1401 #include <asm/ptrace.h>
1402 #include <asm/highmem.h> /* For VMALLOC_END */ 1402 #include <asm/highmem.h> /* For VMALLOC_END */
@@ -1421,9 +1421,9 @@ diff -urNp linux-2.6.32.23/arch/mips/mm/fault.c linux-2.6.32.23/arch/mips/mm/fau
1421 /* 1421 /*
1422 * This routine handles page faults. It determines the address, 1422 * This routine handles page faults. It determines the address,
1423 * and the problem, and then passes it off to one of the appropriate 1423 * and the problem, and then passes it off to one of the appropriate
1424diff -urNp linux-2.6.32.23/arch/parisc/include/asm/elf.h linux-2.6.32.23/arch/parisc/include/asm/elf.h 1424diff -urNp linux-2.6.32.24/arch/parisc/include/asm/elf.h linux-2.6.32.24/arch/parisc/include/asm/elf.h
1425--- linux-2.6.32.23/arch/parisc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 1425--- linux-2.6.32.24/arch/parisc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
1426+++ linux-2.6.32.23/arch/parisc/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 1426+++ linux-2.6.32.24/arch/parisc/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
1427@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. 1427@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
1428 1428
1429 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) 1429 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1438,9 +1438,9 @@ diff -urNp linux-2.6.32.23/arch/parisc/include/asm/elf.h linux-2.6.32.23/arch/pa
1438 /* This yields a mask that user programs can use to figure out what 1438 /* This yields a mask that user programs can use to figure out what
1439 instruction set this CPU supports. This could be done in user space, 1439 instruction set this CPU supports. This could be done in user space,
1440 but it's not easy, and we've already done it here. */ 1440 but it's not easy, and we've already done it here. */
1441diff -urNp linux-2.6.32.23/arch/parisc/include/asm/pgtable.h linux-2.6.32.23/arch/parisc/include/asm/pgtable.h 1441diff -urNp linux-2.6.32.24/arch/parisc/include/asm/pgtable.h linux-2.6.32.24/arch/parisc/include/asm/pgtable.h
1442--- linux-2.6.32.23/arch/parisc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400 1442--- linux-2.6.32.24/arch/parisc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
1443+++ linux-2.6.32.23/arch/parisc/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400 1443+++ linux-2.6.32.24/arch/parisc/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400
1444@@ -207,6 +207,17 @@ 1444@@ -207,6 +207,17 @@
1445 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) 1445 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
1446 #define PAGE_COPY PAGE_EXECREAD 1446 #define PAGE_COPY PAGE_EXECREAD
@@ -1459,9 +1459,9 @@ diff -urNp linux-2.6.32.23/arch/parisc/include/asm/pgtable.h linux-2.6.32.23/arc
1459 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) 1459 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
1460 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) 1460 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
1461 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) 1461 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
1462diff -urNp linux-2.6.32.23/arch/parisc/kernel/module.c linux-2.6.32.23/arch/parisc/kernel/module.c 1462diff -urNp linux-2.6.32.24/arch/parisc/kernel/module.c linux-2.6.32.24/arch/parisc/kernel/module.c
1463--- linux-2.6.32.23/arch/parisc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400 1463--- linux-2.6.32.24/arch/parisc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
1464+++ linux-2.6.32.23/arch/parisc/kernel/module.c 2010-09-04 15:54:51.000000000 -0400 1464+++ linux-2.6.32.24/arch/parisc/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
1465@@ -95,16 +95,38 @@ 1465@@ -95,16 +95,38 @@
1466 1466
1467 /* three functions to determine where in the module core 1467 /* three functions to determine where in the module core
@@ -1562,9 +1562,9 @@ diff -urNp linux-2.6.32.23/arch/parisc/kernel/module.c linux-2.6.32.23/arch/pari
1562 1562
1563 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", 1563 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
1564 me->arch.unwind_section, table, end, gp); 1564 me->arch.unwind_section, table, end, gp);
1565diff -urNp linux-2.6.32.23/arch/parisc/kernel/sys_parisc.c linux-2.6.32.23/arch/parisc/kernel/sys_parisc.c 1565diff -urNp linux-2.6.32.24/arch/parisc/kernel/sys_parisc.c linux-2.6.32.24/arch/parisc/kernel/sys_parisc.c
1566--- linux-2.6.32.23/arch/parisc/kernel/sys_parisc.c 2010-08-13 16:24:37.000000000 -0400 1566--- linux-2.6.32.24/arch/parisc/kernel/sys_parisc.c 2010-08-13 16:24:37.000000000 -0400
1567+++ linux-2.6.32.23/arch/parisc/kernel/sys_parisc.c 2010-09-17 18:34:04.000000000 -0400 1567+++ linux-2.6.32.24/arch/parisc/kernel/sys_parisc.c 2010-09-17 18:34:04.000000000 -0400
1568@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u 1568@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
1569 /* At this point: (!vma || addr < vma->vm_end). */ 1569 /* At this point: (!vma || addr < vma->vm_end). */
1570 if (TASK_SIZE - len < addr) 1570 if (TASK_SIZE - len < addr)
@@ -1592,9 +1592,9 @@ diff -urNp linux-2.6.32.23/arch/parisc/kernel/sys_parisc.c linux-2.6.32.23/arch/
1592 1592
1593 if (filp) { 1593 if (filp) {
1594 addr = get_shared_area(filp->f_mapping, addr, len, pgoff); 1594 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
1595diff -urNp linux-2.6.32.23/arch/parisc/kernel/traps.c linux-2.6.32.23/arch/parisc/kernel/traps.c 1595diff -urNp linux-2.6.32.24/arch/parisc/kernel/traps.c linux-2.6.32.24/arch/parisc/kernel/traps.c
1596--- linux-2.6.32.23/arch/parisc/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400 1596--- linux-2.6.32.24/arch/parisc/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
1597+++ linux-2.6.32.23/arch/parisc/kernel/traps.c 2010-09-04 15:54:51.000000000 -0400 1597+++ linux-2.6.32.24/arch/parisc/kernel/traps.c 2010-09-04 15:54:51.000000000 -0400
1598@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod 1598@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
1599 1599
1600 down_read(&current->mm->mmap_sem); 1600 down_read(&current->mm->mmap_sem);
@@ -1606,9 +1606,9 @@ diff -urNp linux-2.6.32.23/arch/parisc/kernel/traps.c linux-2.6.32.23/arch/paris
1606 fault_address = regs->iaoq[0]; 1606 fault_address = regs->iaoq[0];
1607 fault_space = regs->iasq[0]; 1607 fault_space = regs->iasq[0];
1608 1608
1609diff -urNp linux-2.6.32.23/arch/parisc/mm/fault.c linux-2.6.32.23/arch/parisc/mm/fault.c 1609diff -urNp linux-2.6.32.24/arch/parisc/mm/fault.c linux-2.6.32.24/arch/parisc/mm/fault.c
1610--- linux-2.6.32.23/arch/parisc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 1610--- linux-2.6.32.24/arch/parisc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
1611+++ linux-2.6.32.23/arch/parisc/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 1611+++ linux-2.6.32.24/arch/parisc/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
1612@@ -15,6 +15,7 @@ 1612@@ -15,6 +15,7 @@
1613 #include <linux/sched.h> 1613 #include <linux/sched.h>
1614 #include <linux/interrupt.h> 1614 #include <linux/interrupt.h>
@@ -1778,9 +1778,9 @@ diff -urNp linux-2.6.32.23/arch/parisc/mm/fault.c linux-2.6.32.23/arch/parisc/mm
1778 1778
1779 /* 1779 /*
1780 * If for any reason at all we couldn't handle the fault, make 1780 * If for any reason at all we couldn't handle the fault, make
1781diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/device.h linux-2.6.32.23/arch/powerpc/include/asm/device.h 1781diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/device.h linux-2.6.32.24/arch/powerpc/include/asm/device.h
1782--- linux-2.6.32.23/arch/powerpc/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400 1782--- linux-2.6.32.24/arch/powerpc/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
1783+++ linux-2.6.32.23/arch/powerpc/include/asm/device.h 2010-09-04 15:54:51.000000000 -0400 1783+++ linux-2.6.32.24/arch/powerpc/include/asm/device.h 2010-09-04 15:54:51.000000000 -0400
1784@@ -14,7 +14,7 @@ struct dev_archdata { 1784@@ -14,7 +14,7 @@ struct dev_archdata {
1785 struct device_node *of_node; 1785 struct device_node *of_node;
1786 1786
@@ -1790,9 +1790,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/device.h linux-2.6.32.23/arc
1790 1790
1791 /* 1791 /*
1792 * When an iommu is in use, dma_data is used as a ptr to the base of the 1792 * When an iommu is in use, dma_data is used as a ptr to the base of the
1793diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.23/arch/powerpc/include/asm/dma-mapping.h 1793diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.24/arch/powerpc/include/asm/dma-mapping.h
1794--- linux-2.6.32.23/arch/powerpc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400 1794--- linux-2.6.32.24/arch/powerpc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
1795+++ linux-2.6.32.23/arch/powerpc/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400 1795+++ linux-2.6.32.24/arch/powerpc/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400
1796@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma 1796@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
1797 #ifdef CONFIG_PPC64 1797 #ifdef CONFIG_PPC64
1798 extern struct dma_map_ops dma_iommu_ops; 1798 extern struct dma_map_ops dma_iommu_ops;
@@ -1859,9 +1859,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.2
1859 1859
1860 if (dma_ops->mapping_error) 1860 if (dma_ops->mapping_error)
1861 return dma_ops->mapping_error(dev, dma_addr); 1861 return dma_ops->mapping_error(dev, dma_addr);
1862diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/elf.h linux-2.6.32.23/arch/powerpc/include/asm/elf.h 1862diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/elf.h linux-2.6.32.24/arch/powerpc/include/asm/elf.h
1863--- linux-2.6.32.23/arch/powerpc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 1863--- linux-2.6.32.24/arch/powerpc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
1864+++ linux-2.6.32.23/arch/powerpc/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 1864+++ linux-2.6.32.24/arch/powerpc/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
1865@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E 1865@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
1866 the loader. We need to make sure that it is out of the way of the program 1866 the loader. We need to make sure that it is out of the way of the program
1867 that it will "exec", and that there is sufficient room for the brk. */ 1867 that it will "exec", and that there is sufficient room for the brk. */
@@ -1894,9 +1894,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/elf.h linux-2.6.32.23/arch/p
1894 #endif /* __KERNEL__ */ 1894 #endif /* __KERNEL__ */
1895 1895
1896 /* 1896 /*
1897diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/iommu.h linux-2.6.32.23/arch/powerpc/include/asm/iommu.h 1897diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/iommu.h linux-2.6.32.24/arch/powerpc/include/asm/iommu.h
1898--- linux-2.6.32.23/arch/powerpc/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400 1898--- linux-2.6.32.24/arch/powerpc/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
1899+++ linux-2.6.32.23/arch/powerpc/include/asm/iommu.h 2010-09-04 15:54:51.000000000 -0400 1899+++ linux-2.6.32.24/arch/powerpc/include/asm/iommu.h 2010-09-04 15:54:51.000000000 -0400
1900@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi 1900@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
1901 extern void iommu_init_early_dart(void); 1901 extern void iommu_init_early_dart(void);
1902 extern void iommu_init_early_pasemi(void); 1902 extern void iommu_init_early_pasemi(void);
@@ -1907,9 +1907,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/iommu.h linux-2.6.32.23/arch
1907 #ifdef CONFIG_PCI 1907 #ifdef CONFIG_PCI
1908 extern void pci_iommu_init(void); 1908 extern void pci_iommu_init(void);
1909 extern void pci_direct_iommu_init(void); 1909 extern void pci_direct_iommu_init(void);
1910diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.23/arch/powerpc/include/asm/kmap_types.h 1910diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.24/arch/powerpc/include/asm/kmap_types.h
1911--- linux-2.6.32.23/arch/powerpc/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400 1911--- linux-2.6.32.24/arch/powerpc/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
1912+++ linux-2.6.32.23/arch/powerpc/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400 1912+++ linux-2.6.32.24/arch/powerpc/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
1913@@ -26,6 +26,7 @@ enum km_type { 1913@@ -26,6 +26,7 @@ enum km_type {
1914 KM_SOFTIRQ1, 1914 KM_SOFTIRQ1,
1915 KM_PPC_SYNC_PAGE, 1915 KM_PPC_SYNC_PAGE,
@@ -1918,9 +1918,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.23
1918 KM_TYPE_NR 1918 KM_TYPE_NR
1919 }; 1919 };
1920 1920
1921diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/page_64.h linux-2.6.32.23/arch/powerpc/include/asm/page_64.h 1921diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/page_64.h linux-2.6.32.24/arch/powerpc/include/asm/page_64.h
1922--- linux-2.6.32.23/arch/powerpc/include/asm/page_64.h 2010-08-13 16:24:37.000000000 -0400 1922--- linux-2.6.32.24/arch/powerpc/include/asm/page_64.h 2010-08-13 16:24:37.000000000 -0400
1923+++ linux-2.6.32.23/arch/powerpc/include/asm/page_64.h 2010-09-04 15:54:51.000000000 -0400 1923+++ linux-2.6.32.24/arch/powerpc/include/asm/page_64.h 2010-09-04 15:54:51.000000000 -0400
1924@@ -180,15 +180,18 @@ do { \ 1924@@ -180,15 +180,18 @@ do { \
1925 * stack by default, so in the absense of a PT_GNU_STACK program header 1925 * stack by default, so in the absense of a PT_GNU_STACK program header
1926 * we turn execute permission off. 1926 * we turn execute permission off.
@@ -1942,9 +1942,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/page_64.h linux-2.6.32.23/ar
1942 1942
1943 #include <asm-generic/getorder.h> 1943 #include <asm-generic/getorder.h>
1944 1944
1945diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/page.h linux-2.6.32.23/arch/powerpc/include/asm/page.h 1945diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/page.h linux-2.6.32.24/arch/powerpc/include/asm/page.h
1946--- linux-2.6.32.23/arch/powerpc/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400 1946--- linux-2.6.32.24/arch/powerpc/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
1947+++ linux-2.6.32.23/arch/powerpc/include/asm/page.h 2010-09-04 15:54:51.000000000 -0400 1947+++ linux-2.6.32.24/arch/powerpc/include/asm/page.h 2010-09-04 15:54:51.000000000 -0400
1948@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; 1948@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
1949 * and needs to be executable. This means the whole heap ends 1949 * and needs to be executable. This means the whole heap ends
1950 * up being executable. 1950 * up being executable.
@@ -1967,9 +1967,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/page.h linux-2.6.32.23/arch/
1967 #ifndef __ASSEMBLY__ 1967 #ifndef __ASSEMBLY__
1968 1968
1969 #undef STRICT_MM_TYPECHECKS 1969 #undef STRICT_MM_TYPECHECKS
1970diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/pci.h linux-2.6.32.23/arch/powerpc/include/asm/pci.h 1970diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/pci.h linux-2.6.32.24/arch/powerpc/include/asm/pci.h
1971--- linux-2.6.32.23/arch/powerpc/include/asm/pci.h 2010-08-13 16:24:37.000000000 -0400 1971--- linux-2.6.32.24/arch/powerpc/include/asm/pci.h 2010-08-13 16:24:37.000000000 -0400
1972+++ linux-2.6.32.23/arch/powerpc/include/asm/pci.h 2010-09-04 15:54:51.000000000 -0400 1972+++ linux-2.6.32.24/arch/powerpc/include/asm/pci.h 2010-09-04 15:54:51.000000000 -0400
1973@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq 1973@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
1974 } 1974 }
1975 1975
@@ -1981,9 +1981,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/pci.h linux-2.6.32.23/arch/p
1981 #else /* CONFIG_PCI */ 1981 #else /* CONFIG_PCI */
1982 #define set_pci_dma_ops(d) 1982 #define set_pci_dma_ops(d)
1983 #define get_pci_dma_ops() NULL 1983 #define get_pci_dma_ops() NULL
1984diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.23/arch/powerpc/include/asm/pte-hash32.h 1984diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.24/arch/powerpc/include/asm/pte-hash32.h
1985--- linux-2.6.32.23/arch/powerpc/include/asm/pte-hash32.h 2010-08-13 16:24:37.000000000 -0400 1985--- linux-2.6.32.24/arch/powerpc/include/asm/pte-hash32.h 2010-08-13 16:24:37.000000000 -0400
1986+++ linux-2.6.32.23/arch/powerpc/include/asm/pte-hash32.h 2010-09-04 15:54:51.000000000 -0400 1986+++ linux-2.6.32.24/arch/powerpc/include/asm/pte-hash32.h 2010-09-04 15:54:51.000000000 -0400
1987@@ -21,6 +21,7 @@ 1987@@ -21,6 +21,7 @@
1988 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ 1988 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
1989 #define _PAGE_USER 0x004 /* usermode access allowed */ 1989 #define _PAGE_USER 0x004 /* usermode access allowed */
@@ -1992,9 +1992,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.23
1992 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ 1992 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
1993 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ 1993 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
1994 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ 1994 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
1995diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/reg.h linux-2.6.32.23/arch/powerpc/include/asm/reg.h 1995diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/reg.h linux-2.6.32.24/arch/powerpc/include/asm/reg.h
1996--- linux-2.6.32.23/arch/powerpc/include/asm/reg.h 2010-08-13 16:24:37.000000000 -0400 1996--- linux-2.6.32.24/arch/powerpc/include/asm/reg.h 2010-08-13 16:24:37.000000000 -0400
1997+++ linux-2.6.32.23/arch/powerpc/include/asm/reg.h 2010-09-04 15:54:51.000000000 -0400 1997+++ linux-2.6.32.24/arch/powerpc/include/asm/reg.h 2010-09-04 15:54:51.000000000 -0400
1998@@ -191,6 +191,7 @@ 1998@@ -191,6 +191,7 @@
1999 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ 1999 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
2000 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ 2000 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -2003,9 +2003,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/reg.h linux-2.6.32.23/arch/p
2003 #define DSISR_PROTFAULT 0x08000000 /* protection fault */ 2003 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
2004 #define DSISR_ISSTORE 0x02000000 /* access was a store */ 2004 #define DSISR_ISSTORE 0x02000000 /* access was a store */
2005 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ 2005 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
2006diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.23/arch/powerpc/include/asm/swiotlb.h 2006diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.24/arch/powerpc/include/asm/swiotlb.h
2007--- linux-2.6.32.23/arch/powerpc/include/asm/swiotlb.h 2010-08-13 16:24:37.000000000 -0400 2007--- linux-2.6.32.24/arch/powerpc/include/asm/swiotlb.h 2010-08-13 16:24:37.000000000 -0400
2008+++ linux-2.6.32.23/arch/powerpc/include/asm/swiotlb.h 2010-09-04 15:54:51.000000000 -0400 2008+++ linux-2.6.32.24/arch/powerpc/include/asm/swiotlb.h 2010-09-04 15:54:51.000000000 -0400
2009@@ -13,7 +13,7 @@ 2009@@ -13,7 +13,7 @@
2010 2010
2011 #include <linux/swiotlb.h> 2011 #include <linux/swiotlb.h>
@@ -2015,9 +2015,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.23/ar
2015 2015
2016 static inline void dma_mark_clean(void *addr, size_t size) {} 2016 static inline void dma_mark_clean(void *addr, size_t size) {}
2017 2017
2018diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/uaccess.h linux-2.6.32.23/arch/powerpc/include/asm/uaccess.h 2018diff -urNp linux-2.6.32.24/arch/powerpc/include/asm/uaccess.h linux-2.6.32.24/arch/powerpc/include/asm/uaccess.h
2019--- linux-2.6.32.23/arch/powerpc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400 2019--- linux-2.6.32.24/arch/powerpc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
2020+++ linux-2.6.32.23/arch/powerpc/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400 2020+++ linux-2.6.32.24/arch/powerpc/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
2021@@ -13,6 +13,8 @@ 2021@@ -13,6 +13,8 @@
2022 #define VERIFY_READ 0 2022 #define VERIFY_READ 0
2023 #define VERIFY_WRITE 1 2023 #define VERIFY_WRITE 1
@@ -2195,9 +2195,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/include/asm/uaccess.h linux-2.6.32.23/ar
2195 extern unsigned long __clear_user(void __user *addr, unsigned long size); 2195 extern unsigned long __clear_user(void __user *addr, unsigned long size);
2196 2196
2197 static inline unsigned long clear_user(void __user *addr, unsigned long size) 2197 static inline unsigned long clear_user(void __user *addr, unsigned long size)
2198diff -urNp linux-2.6.32.23/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.23/arch/powerpc/kernel/cacheinfo.c 2198diff -urNp linux-2.6.32.24/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.24/arch/powerpc/kernel/cacheinfo.c
2199--- linux-2.6.32.23/arch/powerpc/kernel/cacheinfo.c 2010-08-13 16:24:37.000000000 -0400 2199--- linux-2.6.32.24/arch/powerpc/kernel/cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
2200+++ linux-2.6.32.23/arch/powerpc/kernel/cacheinfo.c 2010-09-04 15:54:51.000000000 -0400 2200+++ linux-2.6.32.24/arch/powerpc/kernel/cacheinfo.c 2010-09-04 15:54:51.000000000 -0400
2201@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde 2201@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
2202 &cache_assoc_attr, 2202 &cache_assoc_attr,
2203 }; 2203 };
@@ -2207,9 +2207,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.23/arch/
2207 .show = cache_index_show, 2207 .show = cache_index_show,
2208 }; 2208 };
2209 2209
2210diff -urNp linux-2.6.32.23/arch/powerpc/kernel/dma.c linux-2.6.32.23/arch/powerpc/kernel/dma.c 2210diff -urNp linux-2.6.32.24/arch/powerpc/kernel/dma.c linux-2.6.32.24/arch/powerpc/kernel/dma.c
2211--- linux-2.6.32.23/arch/powerpc/kernel/dma.c 2010-08-13 16:24:37.000000000 -0400 2211--- linux-2.6.32.24/arch/powerpc/kernel/dma.c 2010-08-13 16:24:37.000000000 -0400
2212+++ linux-2.6.32.23/arch/powerpc/kernel/dma.c 2010-09-04 15:54:51.000000000 -0400 2212+++ linux-2.6.32.24/arch/powerpc/kernel/dma.c 2010-09-04 15:54:51.000000000 -0400
2213@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl 2213@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
2214 } 2214 }
2215 #endif 2215 #endif
@@ -2219,9 +2219,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/dma.c linux-2.6.32.23/arch/powerp
2219 .alloc_coherent = dma_direct_alloc_coherent, 2219 .alloc_coherent = dma_direct_alloc_coherent,
2220 .free_coherent = dma_direct_free_coherent, 2220 .free_coherent = dma_direct_free_coherent,
2221 .map_sg = dma_direct_map_sg, 2221 .map_sg = dma_direct_map_sg,
2222diff -urNp linux-2.6.32.23/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.23/arch/powerpc/kernel/dma-iommu.c 2222diff -urNp linux-2.6.32.24/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.24/arch/powerpc/kernel/dma-iommu.c
2223--- linux-2.6.32.23/arch/powerpc/kernel/dma-iommu.c 2010-08-13 16:24:37.000000000 -0400 2223--- linux-2.6.32.24/arch/powerpc/kernel/dma-iommu.c 2010-08-13 16:24:37.000000000 -0400
2224+++ linux-2.6.32.23/arch/powerpc/kernel/dma-iommu.c 2010-09-04 15:54:51.000000000 -0400 2224+++ linux-2.6.32.24/arch/powerpc/kernel/dma-iommu.c 2010-09-04 15:54:51.000000000 -0400
2225@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de 2225@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
2226 } 2226 }
2227 2227
@@ -2231,9 +2231,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.23/arch/
2231 { 2231 {
2232 struct iommu_table *tbl = get_iommu_table_base(dev); 2232 struct iommu_table *tbl = get_iommu_table_base(dev);
2233 2233
2234diff -urNp linux-2.6.32.23/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.23/arch/powerpc/kernel/dma-swiotlb.c 2234diff -urNp linux-2.6.32.24/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.24/arch/powerpc/kernel/dma-swiotlb.c
2235--- linux-2.6.32.23/arch/powerpc/kernel/dma-swiotlb.c 2010-08-13 16:24:37.000000000 -0400 2235--- linux-2.6.32.24/arch/powerpc/kernel/dma-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
2236+++ linux-2.6.32.23/arch/powerpc/kernel/dma-swiotlb.c 2010-09-04 15:54:51.000000000 -0400 2236+++ linux-2.6.32.24/arch/powerpc/kernel/dma-swiotlb.c 2010-09-04 15:54:51.000000000 -0400
2237@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; 2237@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
2238 * map_page, and unmap_page on highmem, use normal dma_ops 2238 * map_page, and unmap_page on highmem, use normal dma_ops
2239 * for everything else. 2239 * for everything else.
@@ -2243,9 +2243,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.23/arc
2243 .alloc_coherent = dma_direct_alloc_coherent, 2243 .alloc_coherent = dma_direct_alloc_coherent,
2244 .free_coherent = dma_direct_free_coherent, 2244 .free_coherent = dma_direct_free_coherent,
2245 .map_sg = swiotlb_map_sg_attrs, 2245 .map_sg = swiotlb_map_sg_attrs,
2246diff -urNp linux-2.6.32.23/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.23/arch/powerpc/kernel/exceptions-64e.S 2246diff -urNp linux-2.6.32.24/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.24/arch/powerpc/kernel/exceptions-64e.S
2247--- linux-2.6.32.23/arch/powerpc/kernel/exceptions-64e.S 2010-08-13 16:24:37.000000000 -0400 2247--- linux-2.6.32.24/arch/powerpc/kernel/exceptions-64e.S 2010-08-13 16:24:37.000000000 -0400
2248+++ linux-2.6.32.23/arch/powerpc/kernel/exceptions-64e.S 2010-09-04 15:54:51.000000000 -0400 2248+++ linux-2.6.32.24/arch/powerpc/kernel/exceptions-64e.S 2010-09-04 15:54:51.000000000 -0400
2249@@ -455,6 +455,7 @@ storage_fault_common: 2249@@ -455,6 +455,7 @@ storage_fault_common:
2250 std r14,_DAR(r1) 2250 std r14,_DAR(r1)
2251 std r15,_DSISR(r1) 2251 std r15,_DSISR(r1)
@@ -2264,9 +2264,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.23/
2264 addi r3,r1,STACK_FRAME_OVERHEAD 2264 addi r3,r1,STACK_FRAME_OVERHEAD
2265 ld r4,_DAR(r1) 2265 ld r4,_DAR(r1)
2266 bl .bad_page_fault 2266 bl .bad_page_fault
2267diff -urNp linux-2.6.32.23/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.23/arch/powerpc/kernel/exceptions-64s.S 2267diff -urNp linux-2.6.32.24/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.24/arch/powerpc/kernel/exceptions-64s.S
2268--- linux-2.6.32.23/arch/powerpc/kernel/exceptions-64s.S 2010-08-13 16:24:37.000000000 -0400 2268--- linux-2.6.32.24/arch/powerpc/kernel/exceptions-64s.S 2010-08-13 16:24:37.000000000 -0400
2269+++ linux-2.6.32.23/arch/powerpc/kernel/exceptions-64s.S 2010-09-04 15:54:51.000000000 -0400 2269+++ linux-2.6.32.24/arch/powerpc/kernel/exceptions-64s.S 2010-09-04 15:54:51.000000000 -0400
2270@@ -818,10 +818,10 @@ handle_page_fault: 2270@@ -818,10 +818,10 @@ handle_page_fault:
2271 11: ld r4,_DAR(r1) 2271 11: ld r4,_DAR(r1)
2272 ld r5,_DSISR(r1) 2272 ld r5,_DSISR(r1)
@@ -2279,9 +2279,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.23/
2279 mr r5,r3 2279 mr r5,r3
2280 addi r3,r1,STACK_FRAME_OVERHEAD 2280 addi r3,r1,STACK_FRAME_OVERHEAD
2281 lwz r4,_DAR(r1) 2281 lwz r4,_DAR(r1)
2282diff -urNp linux-2.6.32.23/arch/powerpc/kernel/ibmebus.c linux-2.6.32.23/arch/powerpc/kernel/ibmebus.c 2282diff -urNp linux-2.6.32.24/arch/powerpc/kernel/ibmebus.c linux-2.6.32.24/arch/powerpc/kernel/ibmebus.c
2283--- linux-2.6.32.23/arch/powerpc/kernel/ibmebus.c 2010-08-13 16:24:37.000000000 -0400 2283--- linux-2.6.32.24/arch/powerpc/kernel/ibmebus.c 2010-08-13 16:24:37.000000000 -0400
2284+++ linux-2.6.32.23/arch/powerpc/kernel/ibmebus.c 2010-09-04 15:54:51.000000000 -0400 2284+++ linux-2.6.32.24/arch/powerpc/kernel/ibmebus.c 2010-09-04 15:54:51.000000000 -0400
2285@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct 2285@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
2286 return 1; 2286 return 1;
2287 } 2287 }
@@ -2291,9 +2291,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/ibmebus.c linux-2.6.32.23/arch/po
2291 .alloc_coherent = ibmebus_alloc_coherent, 2291 .alloc_coherent = ibmebus_alloc_coherent,
2292 .free_coherent = ibmebus_free_coherent, 2292 .free_coherent = ibmebus_free_coherent,
2293 .map_sg = ibmebus_map_sg, 2293 .map_sg = ibmebus_map_sg,
2294diff -urNp linux-2.6.32.23/arch/powerpc/kernel/kgdb.c linux-2.6.32.23/arch/powerpc/kernel/kgdb.c 2294diff -urNp linux-2.6.32.24/arch/powerpc/kernel/kgdb.c linux-2.6.32.24/arch/powerpc/kernel/kgdb.c
2295--- linux-2.6.32.23/arch/powerpc/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400 2295--- linux-2.6.32.24/arch/powerpc/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
2296+++ linux-2.6.32.23/arch/powerpc/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400 2296+++ linux-2.6.32.24/arch/powerpc/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
2297@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct 2297@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
2298 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) 2298 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
2299 return 0; 2299 return 0;
@@ -2312,9 +2312,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/kgdb.c linux-2.6.32.23/arch/power
2312 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, 2312 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
2313 }; 2313 };
2314 2314
2315diff -urNp linux-2.6.32.23/arch/powerpc/kernel/module_32.c linux-2.6.32.23/arch/powerpc/kernel/module_32.c 2315diff -urNp linux-2.6.32.24/arch/powerpc/kernel/module_32.c linux-2.6.32.24/arch/powerpc/kernel/module_32.c
2316--- linux-2.6.32.23/arch/powerpc/kernel/module_32.c 2010-08-13 16:24:37.000000000 -0400 2316--- linux-2.6.32.24/arch/powerpc/kernel/module_32.c 2010-08-13 16:24:37.000000000 -0400
2317+++ linux-2.6.32.23/arch/powerpc/kernel/module_32.c 2010-09-04 15:54:51.000000000 -0400 2317+++ linux-2.6.32.24/arch/powerpc/kernel/module_32.c 2010-09-04 15:54:51.000000000 -0400
2318@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr 2318@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
2319 me->arch.core_plt_section = i; 2319 me->arch.core_plt_section = i;
2320 } 2320 }
@@ -2344,9 +2344,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/module_32.c linux-2.6.32.23/arch/
2344 2344
2345 /* Find this entry, or if that fails, the next avail. entry */ 2345 /* Find this entry, or if that fails, the next avail. entry */
2346 while (entry->jump[0]) { 2346 while (entry->jump[0]) {
2347diff -urNp linux-2.6.32.23/arch/powerpc/kernel/module.c linux-2.6.32.23/arch/powerpc/kernel/module.c 2347diff -urNp linux-2.6.32.24/arch/powerpc/kernel/module.c linux-2.6.32.24/arch/powerpc/kernel/module.c
2348--- linux-2.6.32.23/arch/powerpc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400 2348--- linux-2.6.32.24/arch/powerpc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
2349+++ linux-2.6.32.23/arch/powerpc/kernel/module.c 2010-09-04 15:54:51.000000000 -0400 2349+++ linux-2.6.32.24/arch/powerpc/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
2350@@ -31,11 +31,24 @@ 2350@@ -31,11 +31,24 @@
2351 2351
2352 LIST_HEAD(module_bug_list); 2352 LIST_HEAD(module_bug_list);
@@ -2386,9 +2386,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/module.c linux-2.6.32.23/arch/pow
2386 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, 2386 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
2387 const Elf_Shdr *sechdrs, 2387 const Elf_Shdr *sechdrs,
2388 const char *name) 2388 const char *name)
2389diff -urNp linux-2.6.32.23/arch/powerpc/kernel/pci-common.c linux-2.6.32.23/arch/powerpc/kernel/pci-common.c 2389diff -urNp linux-2.6.32.24/arch/powerpc/kernel/pci-common.c linux-2.6.32.24/arch/powerpc/kernel/pci-common.c
2390--- linux-2.6.32.23/arch/powerpc/kernel/pci-common.c 2010-08-13 16:24:37.000000000 -0400 2390--- linux-2.6.32.24/arch/powerpc/kernel/pci-common.c 2010-08-13 16:24:37.000000000 -0400
2391+++ linux-2.6.32.23/arch/powerpc/kernel/pci-common.c 2010-09-04 15:54:51.000000000 -0400 2391+++ linux-2.6.32.24/arch/powerpc/kernel/pci-common.c 2010-09-04 15:54:51.000000000 -0400
2392@@ -50,14 +50,14 @@ resource_size_t isa_mem_base; 2392@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
2393 unsigned int ppc_pci_flags = 0; 2393 unsigned int ppc_pci_flags = 0;
2394 2394
@@ -2407,9 +2407,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/pci-common.c linux-2.6.32.23/arch
2407 { 2407 {
2408 return pci_dma_ops; 2408 return pci_dma_ops;
2409 } 2409 }
2410diff -urNp linux-2.6.32.23/arch/powerpc/kernel/process.c linux-2.6.32.23/arch/powerpc/kernel/process.c 2410diff -urNp linux-2.6.32.24/arch/powerpc/kernel/process.c linux-2.6.32.24/arch/powerpc/kernel/process.c
2411--- linux-2.6.32.23/arch/powerpc/kernel/process.c 2010-08-13 16:24:37.000000000 -0400 2411--- linux-2.6.32.24/arch/powerpc/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
2412+++ linux-2.6.32.23/arch/powerpc/kernel/process.c 2010-09-04 15:54:51.000000000 -0400 2412+++ linux-2.6.32.24/arch/powerpc/kernel/process.c 2010-09-04 15:54:51.000000000 -0400
2413@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned 2413@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned
2414 sp -= get_random_int() & ~PAGE_MASK; 2414 sp -= get_random_int() & ~PAGE_MASK;
2415 return sp & ~0xf; 2415 return sp & ~0xf;
@@ -2462,9 +2462,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/process.c linux-2.6.32.23/arch/po
2462- 2462-
2463- return ret; 2463- return ret;
2464-} 2464-}
2465diff -urNp linux-2.6.32.23/arch/powerpc/kernel/signal_32.c linux-2.6.32.23/arch/powerpc/kernel/signal_32.c 2465diff -urNp linux-2.6.32.24/arch/powerpc/kernel/signal_32.c linux-2.6.32.24/arch/powerpc/kernel/signal_32.c
2466--- linux-2.6.32.23/arch/powerpc/kernel/signal_32.c 2010-08-13 16:24:37.000000000 -0400 2466--- linux-2.6.32.24/arch/powerpc/kernel/signal_32.c 2010-08-13 16:24:37.000000000 -0400
2467+++ linux-2.6.32.23/arch/powerpc/kernel/signal_32.c 2010-09-04 15:54:51.000000000 -0400 2467+++ linux-2.6.32.24/arch/powerpc/kernel/signal_32.c 2010-09-04 15:54:51.000000000 -0400
2468@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig 2468@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
2469 /* Save user registers on the stack */ 2469 /* Save user registers on the stack */
2470 frame = &rt_sf->uc.uc_mcontext; 2470 frame = &rt_sf->uc.uc_mcontext;
@@ -2474,9 +2474,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/signal_32.c linux-2.6.32.23/arch/
2474 if (save_user_regs(regs, frame, 0, 1)) 2474 if (save_user_regs(regs, frame, 0, 1))
2475 goto badframe; 2475 goto badframe;
2476 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; 2476 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
2477diff -urNp linux-2.6.32.23/arch/powerpc/kernel/signal_64.c linux-2.6.32.23/arch/powerpc/kernel/signal_64.c 2477diff -urNp linux-2.6.32.24/arch/powerpc/kernel/signal_64.c linux-2.6.32.24/arch/powerpc/kernel/signal_64.c
2478--- linux-2.6.32.23/arch/powerpc/kernel/signal_64.c 2010-08-13 16:24:37.000000000 -0400 2478--- linux-2.6.32.24/arch/powerpc/kernel/signal_64.c 2010-08-13 16:24:37.000000000 -0400
2479+++ linux-2.6.32.23/arch/powerpc/kernel/signal_64.c 2010-09-04 15:54:51.000000000 -0400 2479+++ linux-2.6.32.24/arch/powerpc/kernel/signal_64.c 2010-09-04 15:54:51.000000000 -0400
2480@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct 2480@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
2481 current->thread.fpscr.val = 0; 2481 current->thread.fpscr.val = 0;
2482 2482
@@ -2486,9 +2486,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/signal_64.c linux-2.6.32.23/arch/
2486 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; 2486 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
2487 } else { 2487 } else {
2488 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); 2488 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
2489diff -urNp linux-2.6.32.23/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.23/arch/powerpc/kernel/sys_ppc32.c 2489diff -urNp linux-2.6.32.24/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.24/arch/powerpc/kernel/sys_ppc32.c
2490--- linux-2.6.32.23/arch/powerpc/kernel/sys_ppc32.c 2010-08-13 16:24:37.000000000 -0400 2490--- linux-2.6.32.24/arch/powerpc/kernel/sys_ppc32.c 2010-08-13 16:24:37.000000000 -0400
2491+++ linux-2.6.32.23/arch/powerpc/kernel/sys_ppc32.c 2010-09-04 15:54:51.000000000 -0400 2491+++ linux-2.6.32.24/arch/powerpc/kernel/sys_ppc32.c 2010-09-04 15:54:51.000000000 -0400
2492@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct 2492@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
2493 if (oldlenp) { 2493 if (oldlenp) {
2494 if (!error) { 2494 if (!error) {
@@ -2502,9 +2502,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.23/arch/
2502 } 2502 }
2503 return error; 2503 return error;
2504 } 2504 }
2505diff -urNp linux-2.6.32.23/arch/powerpc/kernel/vdso.c linux-2.6.32.23/arch/powerpc/kernel/vdso.c 2505diff -urNp linux-2.6.32.24/arch/powerpc/kernel/vdso.c linux-2.6.32.24/arch/powerpc/kernel/vdso.c
2506--- linux-2.6.32.23/arch/powerpc/kernel/vdso.c 2010-08-13 16:24:37.000000000 -0400 2506--- linux-2.6.32.24/arch/powerpc/kernel/vdso.c 2010-08-13 16:24:37.000000000 -0400
2507+++ linux-2.6.32.23/arch/powerpc/kernel/vdso.c 2010-09-04 15:54:51.000000000 -0400 2507+++ linux-2.6.32.24/arch/powerpc/kernel/vdso.c 2010-09-04 15:54:51.000000000 -0400
2508@@ -36,6 +36,7 @@ 2508@@ -36,6 +36,7 @@
2509 #include <asm/firmware.h> 2509 #include <asm/firmware.h>
2510 #include <asm/vdso.h> 2510 #include <asm/vdso.h>
@@ -2531,9 +2531,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/vdso.c linux-2.6.32.23/arch/power
2531 if (IS_ERR_VALUE(vdso_base)) { 2531 if (IS_ERR_VALUE(vdso_base)) {
2532 rc = vdso_base; 2532 rc = vdso_base;
2533 goto fail_mmapsem; 2533 goto fail_mmapsem;
2534diff -urNp linux-2.6.32.23/arch/powerpc/kernel/vio.c linux-2.6.32.23/arch/powerpc/kernel/vio.c 2534diff -urNp linux-2.6.32.24/arch/powerpc/kernel/vio.c linux-2.6.32.24/arch/powerpc/kernel/vio.c
2535--- linux-2.6.32.23/arch/powerpc/kernel/vio.c 2010-08-13 16:24:37.000000000 -0400 2535--- linux-2.6.32.24/arch/powerpc/kernel/vio.c 2010-08-13 16:24:37.000000000 -0400
2536+++ linux-2.6.32.23/arch/powerpc/kernel/vio.c 2010-09-04 15:54:51.000000000 -0400 2536+++ linux-2.6.32.24/arch/powerpc/kernel/vio.c 2010-09-04 15:54:51.000000000 -0400
2537@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc 2537@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
2538 vio_cmo_dealloc(viodev, alloc_size); 2538 vio_cmo_dealloc(viodev, alloc_size);
2539 } 2539 }
@@ -2556,9 +2556,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/kernel/vio.c linux-2.6.32.23/arch/powerp
2556 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; 2556 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
2557 } 2557 }
2558 2558
2559diff -urNp linux-2.6.32.23/arch/powerpc/lib/usercopy_64.c linux-2.6.32.23/arch/powerpc/lib/usercopy_64.c 2559diff -urNp linux-2.6.32.24/arch/powerpc/lib/usercopy_64.c linux-2.6.32.24/arch/powerpc/lib/usercopy_64.c
2560--- linux-2.6.32.23/arch/powerpc/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400 2560--- linux-2.6.32.24/arch/powerpc/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
2561+++ linux-2.6.32.23/arch/powerpc/lib/usercopy_64.c 2010-09-04 15:54:51.000000000 -0400 2561+++ linux-2.6.32.24/arch/powerpc/lib/usercopy_64.c 2010-09-04 15:54:51.000000000 -0400
2562@@ -9,22 +9,6 @@ 2562@@ -9,22 +9,6 @@
2563 #include <linux/module.h> 2563 #include <linux/module.h>
2564 #include <asm/uaccess.h> 2564 #include <asm/uaccess.h>
@@ -2590,9 +2590,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/lib/usercopy_64.c linux-2.6.32.23/arch/p
2590-EXPORT_SYMBOL(copy_to_user); 2590-EXPORT_SYMBOL(copy_to_user);
2591 EXPORT_SYMBOL(copy_in_user); 2591 EXPORT_SYMBOL(copy_in_user);
2592 2592
2593diff -urNp linux-2.6.32.23/arch/powerpc/mm/fault.c linux-2.6.32.23/arch/powerpc/mm/fault.c 2593diff -urNp linux-2.6.32.24/arch/powerpc/mm/fault.c linux-2.6.32.24/arch/powerpc/mm/fault.c
2594--- linux-2.6.32.23/arch/powerpc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 2594--- linux-2.6.32.24/arch/powerpc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
2595+++ linux-2.6.32.23/arch/powerpc/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 2595+++ linux-2.6.32.24/arch/powerpc/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
2596@@ -30,6 +30,10 @@ 2596@@ -30,6 +30,10 @@
2597 #include <linux/kprobes.h> 2597 #include <linux/kprobes.h>
2598 #include <linux/kdebug.h> 2598 #include <linux/kdebug.h>
@@ -2697,9 +2697,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/mm/fault.c linux-2.6.32.23/arch/powerpc/
2697 _exception(SIGSEGV, regs, code, address); 2697 _exception(SIGSEGV, regs, code, address);
2698 return 0; 2698 return 0;
2699 } 2699 }
2700diff -urNp linux-2.6.32.23/arch/powerpc/mm/mmap_64.c linux-2.6.32.23/arch/powerpc/mm/mmap_64.c 2700diff -urNp linux-2.6.32.24/arch/powerpc/mm/mmap_64.c linux-2.6.32.24/arch/powerpc/mm/mmap_64.c
2701--- linux-2.6.32.23/arch/powerpc/mm/mmap_64.c 2010-08-13 16:24:37.000000000 -0400 2701--- linux-2.6.32.24/arch/powerpc/mm/mmap_64.c 2010-08-13 16:24:37.000000000 -0400
2702+++ linux-2.6.32.23/arch/powerpc/mm/mmap_64.c 2010-09-04 15:54:51.000000000 -0400 2702+++ linux-2.6.32.24/arch/powerpc/mm/mmap_64.c 2010-09-04 15:54:51.000000000 -0400
2703@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str 2703@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
2704 */ 2704 */
2705 if (mmap_is_legacy()) { 2705 if (mmap_is_legacy()) {
@@ -2723,9 +2723,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/mm/mmap_64.c linux-2.6.32.23/arch/powerp
2723 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 2723 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
2724 mm->unmap_area = arch_unmap_area_topdown; 2724 mm->unmap_area = arch_unmap_area_topdown;
2725 } 2725 }
2726diff -urNp linux-2.6.32.23/arch/powerpc/mm/slice.c linux-2.6.32.23/arch/powerpc/mm/slice.c 2726diff -urNp linux-2.6.32.24/arch/powerpc/mm/slice.c linux-2.6.32.24/arch/powerpc/mm/slice.c
2727--- linux-2.6.32.23/arch/powerpc/mm/slice.c 2010-08-13 16:24:37.000000000 -0400 2727--- linux-2.6.32.24/arch/powerpc/mm/slice.c 2010-08-13 16:24:37.000000000 -0400
2728+++ linux-2.6.32.23/arch/powerpc/mm/slice.c 2010-09-17 18:34:04.000000000 -0400 2728+++ linux-2.6.32.24/arch/powerpc/mm/slice.c 2010-09-17 18:34:04.000000000 -0400
2729@@ -98,10 +98,9 @@ static int slice_area_is_free(struct mm_ 2729@@ -98,10 +98,9 @@ static int slice_area_is_free(struct mm_
2730 if ((mm->task_size - len) < addr) 2730 if ((mm->task_size - len) < addr)
2731 return 0; 2731 return 0;
@@ -2768,9 +2768,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/mm/slice.c linux-2.6.32.23/arch/powerpc/
2768 /* If hint, make sure it matches our alignment restrictions */ 2768 /* If hint, make sure it matches our alignment restrictions */
2769 if (!fixed && addr) { 2769 if (!fixed && addr) {
2770 addr = _ALIGN_UP(addr, 1ul << pshift); 2770 addr = _ALIGN_UP(addr, 1ul << pshift);
2771diff -urNp linux-2.6.32.23/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.23/arch/powerpc/platforms/52xx/lite5200_pm.c 2771diff -urNp linux-2.6.32.24/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.24/arch/powerpc/platforms/52xx/lite5200_pm.c
2772--- linux-2.6.32.23/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-13 16:24:37.000000000 -0400 2772--- linux-2.6.32.24/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-13 16:24:37.000000000 -0400
2773+++ linux-2.6.32.23/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-09-04 15:54:51.000000000 -0400 2773+++ linux-2.6.32.24/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-09-04 15:54:51.000000000 -0400
2774@@ -235,7 +235,7 @@ static void lite5200_pm_end(void) 2774@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
2775 lite5200_pm_target_state = PM_SUSPEND_ON; 2775 lite5200_pm_target_state = PM_SUSPEND_ON;
2776 } 2776 }
@@ -2780,9 +2780,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
2780 .valid = lite5200_pm_valid, 2780 .valid = lite5200_pm_valid,
2781 .begin = lite5200_pm_begin, 2781 .begin = lite5200_pm_begin,
2782 .prepare = lite5200_pm_prepare, 2782 .prepare = lite5200_pm_prepare,
2783diff -urNp linux-2.6.32.23/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.23/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2783diff -urNp linux-2.6.32.24/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.24/arch/powerpc/platforms/52xx/mpc52xx_pm.c
2784--- linux-2.6.32.23/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-13 16:24:37.000000000 -0400 2784--- linux-2.6.32.24/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-13 16:24:37.000000000 -0400
2785+++ linux-2.6.32.23/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-09-04 15:54:51.000000000 -0400 2785+++ linux-2.6.32.24/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-09-04 15:54:51.000000000 -0400
2786@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) 2786@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
2787 iounmap(mbar); 2787 iounmap(mbar);
2788 } 2788 }
@@ -2792,9 +2792,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32
2792 .valid = mpc52xx_pm_valid, 2792 .valid = mpc52xx_pm_valid,
2793 .prepare = mpc52xx_pm_prepare, 2793 .prepare = mpc52xx_pm_prepare,
2794 .enter = mpc52xx_pm_enter, 2794 .enter = mpc52xx_pm_enter,
2795diff -urNp linux-2.6.32.23/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.23/arch/powerpc/platforms/83xx/suspend.c 2795diff -urNp linux-2.6.32.24/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.24/arch/powerpc/platforms/83xx/suspend.c
2796--- linux-2.6.32.23/arch/powerpc/platforms/83xx/suspend.c 2010-08-13 16:24:37.000000000 -0400 2796--- linux-2.6.32.24/arch/powerpc/platforms/83xx/suspend.c 2010-08-13 16:24:37.000000000 -0400
2797+++ linux-2.6.32.23/arch/powerpc/platforms/83xx/suspend.c 2010-09-04 15:54:51.000000000 -0400 2797+++ linux-2.6.32.24/arch/powerpc/platforms/83xx/suspend.c 2010-09-04 15:54:51.000000000 -0400
2798@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) 2798@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
2799 return ret; 2799 return ret;
2800 } 2800 }
@@ -2804,9 +2804,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.23
2804 .valid = mpc83xx_suspend_valid, 2804 .valid = mpc83xx_suspend_valid,
2805 .begin = mpc83xx_suspend_begin, 2805 .begin = mpc83xx_suspend_begin,
2806 .enter = mpc83xx_suspend_enter, 2806 .enter = mpc83xx_suspend_enter,
2807diff -urNp linux-2.6.32.23/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.23/arch/powerpc/platforms/cell/iommu.c 2807diff -urNp linux-2.6.32.24/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.24/arch/powerpc/platforms/cell/iommu.c
2808--- linux-2.6.32.23/arch/powerpc/platforms/cell/iommu.c 2010-08-13 16:24:37.000000000 -0400 2808--- linux-2.6.32.24/arch/powerpc/platforms/cell/iommu.c 2010-08-13 16:24:37.000000000 -0400
2809+++ linux-2.6.32.23/arch/powerpc/platforms/cell/iommu.c 2010-09-04 15:54:51.000000000 -0400 2809+++ linux-2.6.32.24/arch/powerpc/platforms/cell/iommu.c 2010-09-04 15:54:51.000000000 -0400
2810@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc 2810@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
2811 2811
2812 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); 2812 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -2816,9 +2816,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.23/a
2816 .alloc_coherent = dma_fixed_alloc_coherent, 2816 .alloc_coherent = dma_fixed_alloc_coherent,
2817 .free_coherent = dma_fixed_free_coherent, 2817 .free_coherent = dma_fixed_free_coherent,
2818 .map_sg = dma_fixed_map_sg, 2818 .map_sg = dma_fixed_map_sg,
2819diff -urNp linux-2.6.32.23/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.23/arch/powerpc/platforms/ps3/system-bus.c 2819diff -urNp linux-2.6.32.24/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.24/arch/powerpc/platforms/ps3/system-bus.c
2820--- linux-2.6.32.23/arch/powerpc/platforms/ps3/system-bus.c 2010-08-13 16:24:37.000000000 -0400 2820--- linux-2.6.32.24/arch/powerpc/platforms/ps3/system-bus.c 2010-08-13 16:24:37.000000000 -0400
2821+++ linux-2.6.32.23/arch/powerpc/platforms/ps3/system-bus.c 2010-09-04 15:54:51.000000000 -0400 2821+++ linux-2.6.32.24/arch/powerpc/platforms/ps3/system-bus.c 2010-09-04 15:54:51.000000000 -0400
2822@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi 2822@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
2823 return mask >= DMA_BIT_MASK(32); 2823 return mask >= DMA_BIT_MASK(32);
2824 } 2824 }
@@ -2837,9 +2837,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
2837 .alloc_coherent = ps3_alloc_coherent, 2837 .alloc_coherent = ps3_alloc_coherent,
2838 .free_coherent = ps3_free_coherent, 2838 .free_coherent = ps3_free_coherent,
2839 .map_sg = ps3_ioc0_map_sg, 2839 .map_sg = ps3_ioc0_map_sg,
2840diff -urNp linux-2.6.32.23/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.23/arch/powerpc/platforms/pseries/Kconfig 2840diff -urNp linux-2.6.32.24/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.24/arch/powerpc/platforms/pseries/Kconfig
2841--- linux-2.6.32.23/arch/powerpc/platforms/pseries/Kconfig 2010-08-13 16:24:37.000000000 -0400 2841--- linux-2.6.32.24/arch/powerpc/platforms/pseries/Kconfig 2010-08-13 16:24:37.000000000 -0400
2842+++ linux-2.6.32.23/arch/powerpc/platforms/pseries/Kconfig 2010-09-04 15:54:51.000000000 -0400 2842+++ linux-2.6.32.24/arch/powerpc/platforms/pseries/Kconfig 2010-09-04 15:54:51.000000000 -0400
2843@@ -2,6 +2,8 @@ config PPC_PSERIES 2843@@ -2,6 +2,8 @@ config PPC_PSERIES
2844 depends on PPC64 && PPC_BOOK3S 2844 depends on PPC64 && PPC_BOOK3S
2845 bool "IBM pSeries & new (POWER5-based) iSeries" 2845 bool "IBM pSeries & new (POWER5-based) iSeries"
@@ -2849,9 +2849,9 @@ diff -urNp linux-2.6.32.23/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.2
2849 select PPC_I8259 2849 select PPC_I8259
2850 select PPC_RTAS 2850 select PPC_RTAS
2851 select RTAS_ERROR_LOGGING 2851 select RTAS_ERROR_LOGGING
2852diff -urNp linux-2.6.32.23/arch/s390/include/asm/elf.h linux-2.6.32.23/arch/s390/include/asm/elf.h 2852diff -urNp linux-2.6.32.24/arch/s390/include/asm/elf.h linux-2.6.32.24/arch/s390/include/asm/elf.h
2853--- linux-2.6.32.23/arch/s390/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 2853--- linux-2.6.32.24/arch/s390/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
2854+++ linux-2.6.32.23/arch/s390/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 2854+++ linux-2.6.32.24/arch/s390/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
2855@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; 2855@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
2856 that it will "exec", and that there is sufficient room for the brk. */ 2856 that it will "exec", and that there is sufficient room for the brk. */
2857 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) 2857 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
@@ -2866,9 +2866,9 @@ diff -urNp linux-2.6.32.23/arch/s390/include/asm/elf.h linux-2.6.32.23/arch/s390
2866 /* This yields a mask that user programs can use to figure out what 2866 /* This yields a mask that user programs can use to figure out what
2867 instruction set this CPU supports. */ 2867 instruction set this CPU supports. */
2868 2868
2869diff -urNp linux-2.6.32.23/arch/s390/include/asm/setup.h linux-2.6.32.23/arch/s390/include/asm/setup.h 2869diff -urNp linux-2.6.32.24/arch/s390/include/asm/setup.h linux-2.6.32.24/arch/s390/include/asm/setup.h
2870--- linux-2.6.32.23/arch/s390/include/asm/setup.h 2010-08-13 16:24:37.000000000 -0400 2870--- linux-2.6.32.24/arch/s390/include/asm/setup.h 2010-08-13 16:24:37.000000000 -0400
2871+++ linux-2.6.32.23/arch/s390/include/asm/setup.h 2010-09-04 15:54:51.000000000 -0400 2871+++ linux-2.6.32.24/arch/s390/include/asm/setup.h 2010-09-04 15:54:51.000000000 -0400
2872@@ -50,13 +50,13 @@ extern unsigned long memory_end; 2872@@ -50,13 +50,13 @@ extern unsigned long memory_end;
2873 void detect_memory_layout(struct mem_chunk chunk[]); 2873 void detect_memory_layout(struct mem_chunk chunk[]);
2874 2874
@@ -2885,9 +2885,9 @@ diff -urNp linux-2.6.32.23/arch/s390/include/asm/setup.h linux-2.6.32.23/arch/s3
2885 #else 2885 #else
2886 #define s390_noexec (0) 2886 #define s390_noexec (0)
2887 #endif 2887 #endif
2888diff -urNp linux-2.6.32.23/arch/s390/include/asm/uaccess.h linux-2.6.32.23/arch/s390/include/asm/uaccess.h 2888diff -urNp linux-2.6.32.24/arch/s390/include/asm/uaccess.h linux-2.6.32.24/arch/s390/include/asm/uaccess.h
2889--- linux-2.6.32.23/arch/s390/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400 2889--- linux-2.6.32.24/arch/s390/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
2890+++ linux-2.6.32.23/arch/s390/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400 2890+++ linux-2.6.32.24/arch/s390/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
2891@@ -232,6 +232,10 @@ static inline unsigned long __must_check 2891@@ -232,6 +232,10 @@ static inline unsigned long __must_check
2892 copy_to_user(void __user *to, const void *from, unsigned long n) 2892 copy_to_user(void __user *to, const void *from, unsigned long n)
2893 { 2893 {
@@ -2920,9 +2920,9 @@ diff -urNp linux-2.6.32.23/arch/s390/include/asm/uaccess.h linux-2.6.32.23/arch/
2920 if (access_ok(VERIFY_READ, from, n)) 2920 if (access_ok(VERIFY_READ, from, n))
2921 n = __copy_from_user(to, from, n); 2921 n = __copy_from_user(to, from, n);
2922 else 2922 else
2923diff -urNp linux-2.6.32.23/arch/s390/Kconfig linux-2.6.32.23/arch/s390/Kconfig 2923diff -urNp linux-2.6.32.24/arch/s390/Kconfig linux-2.6.32.24/arch/s390/Kconfig
2924--- linux-2.6.32.23/arch/s390/Kconfig 2010-08-13 16:24:37.000000000 -0400 2924--- linux-2.6.32.24/arch/s390/Kconfig 2010-08-13 16:24:37.000000000 -0400
2925+++ linux-2.6.32.23/arch/s390/Kconfig 2010-09-04 15:54:51.000000000 -0400 2925+++ linux-2.6.32.24/arch/s390/Kconfig 2010-09-04 15:54:51.000000000 -0400
2926@@ -194,28 +194,26 @@ config AUDIT_ARCH 2926@@ -194,28 +194,26 @@ config AUDIT_ARCH
2927 2927
2928 config S390_SWITCH_AMODE 2928 config S390_SWITCH_AMODE
@@ -2960,9 +2960,9 @@ diff -urNp linux-2.6.32.23/arch/s390/Kconfig linux-2.6.32.23/arch/s390/Kconfig
2960 2960
2961 comment "Code generation options" 2961 comment "Code generation options"
2962 2962
2963diff -urNp linux-2.6.32.23/arch/s390/kernel/module.c linux-2.6.32.23/arch/s390/kernel/module.c 2963diff -urNp linux-2.6.32.24/arch/s390/kernel/module.c linux-2.6.32.24/arch/s390/kernel/module.c
2964--- linux-2.6.32.23/arch/s390/kernel/module.c 2010-08-13 16:24:37.000000000 -0400 2964--- linux-2.6.32.24/arch/s390/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
2965+++ linux-2.6.32.23/arch/s390/kernel/module.c 2010-09-04 15:54:51.000000000 -0400 2965+++ linux-2.6.32.24/arch/s390/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
2966@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, 2966@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
2967 2967
2968 /* Increase core size by size of got & plt and set start 2968 /* Increase core size by size of got & plt and set start
@@ -3034,9 +3034,9 @@ diff -urNp linux-2.6.32.23/arch/s390/kernel/module.c linux-2.6.32.23/arch/s390/k
3034 rela->r_addend - loc; 3034 rela->r_addend - loc;
3035 if (r_type == R_390_GOTPC) 3035 if (r_type == R_390_GOTPC)
3036 *(unsigned int *) loc = val; 3036 *(unsigned int *) loc = val;
3037diff -urNp linux-2.6.32.23/arch/s390/kernel/setup.c linux-2.6.32.23/arch/s390/kernel/setup.c 3037diff -urNp linux-2.6.32.24/arch/s390/kernel/setup.c linux-2.6.32.24/arch/s390/kernel/setup.c
3038--- linux-2.6.32.23/arch/s390/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400 3038--- linux-2.6.32.24/arch/s390/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
3039+++ linux-2.6.32.23/arch/s390/kernel/setup.c 2010-09-04 15:54:51.000000000 -0400 3039+++ linux-2.6.32.24/arch/s390/kernel/setup.c 2010-09-04 15:54:51.000000000 -0400
3040@@ -306,9 +306,6 @@ static int __init early_parse_mem(char * 3040@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
3041 early_param("mem", early_parse_mem); 3041 early_param("mem", early_parse_mem);
3042 3042
@@ -3090,9 +3090,9 @@ diff -urNp linux-2.6.32.23/arch/s390/kernel/setup.c linux-2.6.32.23/arch/s390/ke
3090 static void setup_addressing_mode(void) 3090 static void setup_addressing_mode(void)
3091 { 3091 {
3092 if (s390_noexec) { 3092 if (s390_noexec) {
3093diff -urNp linux-2.6.32.23/arch/s390/mm/mmap.c linux-2.6.32.23/arch/s390/mm/mmap.c 3093diff -urNp linux-2.6.32.24/arch/s390/mm/mmap.c linux-2.6.32.24/arch/s390/mm/mmap.c
3094--- linux-2.6.32.23/arch/s390/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400 3094--- linux-2.6.32.24/arch/s390/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
3095+++ linux-2.6.32.23/arch/s390/mm/mmap.c 2010-09-04 15:54:51.000000000 -0400 3095+++ linux-2.6.32.24/arch/s390/mm/mmap.c 2010-09-04 15:54:51.000000000 -0400
3096@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str 3096@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
3097 */ 3097 */
3098 if (mmap_is_legacy()) { 3098 if (mmap_is_legacy()) {
@@ -3139,9 +3139,9 @@ diff -urNp linux-2.6.32.23/arch/s390/mm/mmap.c linux-2.6.32.23/arch/s390/mm/mmap
3139 mm->get_unmapped_area = s390_get_unmapped_area_topdown; 3139 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
3140 mm->unmap_area = arch_unmap_area_topdown; 3140 mm->unmap_area = arch_unmap_area_topdown;
3141 } 3141 }
3142diff -urNp linux-2.6.32.23/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.23/arch/sh/boards/mach-hp6xx/pm.c 3142diff -urNp linux-2.6.32.24/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.24/arch/sh/boards/mach-hp6xx/pm.c
3143--- linux-2.6.32.23/arch/sh/boards/mach-hp6xx/pm.c 2010-08-13 16:24:37.000000000 -0400 3143--- linux-2.6.32.24/arch/sh/boards/mach-hp6xx/pm.c 2010-08-13 16:24:37.000000000 -0400
3144+++ linux-2.6.32.23/arch/sh/boards/mach-hp6xx/pm.c 2010-09-04 15:54:51.000000000 -0400 3144+++ linux-2.6.32.24/arch/sh/boards/mach-hp6xx/pm.c 2010-09-04 15:54:51.000000000 -0400
3145@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ 3145@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
3146 return 0; 3146 return 0;
3147 } 3147 }
@@ -3151,9 +3151,9 @@ diff -urNp linux-2.6.32.23/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.23/arch/s
3151 .enter = hp6x0_pm_enter, 3151 .enter = hp6x0_pm_enter,
3152 .valid = suspend_valid_only_mem, 3152 .valid = suspend_valid_only_mem,
3153 }; 3153 };
3154diff -urNp linux-2.6.32.23/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.23/arch/sh/kernel/cpu/sh4/sq.c 3154diff -urNp linux-2.6.32.24/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.24/arch/sh/kernel/cpu/sh4/sq.c
3155--- linux-2.6.32.23/arch/sh/kernel/cpu/sh4/sq.c 2010-08-13 16:24:37.000000000 -0400 3155--- linux-2.6.32.24/arch/sh/kernel/cpu/sh4/sq.c 2010-08-13 16:24:37.000000000 -0400
3156+++ linux-2.6.32.23/arch/sh/kernel/cpu/sh4/sq.c 2010-09-04 15:54:51.000000000 -0400 3156+++ linux-2.6.32.24/arch/sh/kernel/cpu/sh4/sq.c 2010-09-04 15:54:51.000000000 -0400
3157@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ 3157@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
3158 NULL, 3158 NULL,
3159 }; 3159 };
@@ -3163,9 +3163,9 @@ diff -urNp linux-2.6.32.23/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.23/arch/sh/k
3163 .show = sq_sysfs_show, 3163 .show = sq_sysfs_show,
3164 .store = sq_sysfs_store, 3164 .store = sq_sysfs_store,
3165 }; 3165 };
3166diff -urNp linux-2.6.32.23/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.23/arch/sh/kernel/cpu/shmobile/pm.c 3166diff -urNp linux-2.6.32.24/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.24/arch/sh/kernel/cpu/shmobile/pm.c
3167--- linux-2.6.32.23/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-13 16:24:37.000000000 -0400 3167--- linux-2.6.32.24/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-13 16:24:37.000000000 -0400
3168+++ linux-2.6.32.23/arch/sh/kernel/cpu/shmobile/pm.c 2010-09-04 15:54:51.000000000 -0400 3168+++ linux-2.6.32.24/arch/sh/kernel/cpu/shmobile/pm.c 2010-09-04 15:54:51.000000000 -0400
3169@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s 3169@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
3170 return 0; 3170 return 0;
3171 } 3171 }
@@ -3175,9 +3175,9 @@ diff -urNp linux-2.6.32.23/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.23/arch
3175 .enter = sh_pm_enter, 3175 .enter = sh_pm_enter,
3176 .valid = suspend_valid_only_mem, 3176 .valid = suspend_valid_only_mem,
3177 }; 3177 };
3178diff -urNp linux-2.6.32.23/arch/sh/kernel/kgdb.c linux-2.6.32.23/arch/sh/kernel/kgdb.c 3178diff -urNp linux-2.6.32.24/arch/sh/kernel/kgdb.c linux-2.6.32.24/arch/sh/kernel/kgdb.c
3179--- linux-2.6.32.23/arch/sh/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400 3179--- linux-2.6.32.24/arch/sh/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
3180+++ linux-2.6.32.23/arch/sh/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400 3180+++ linux-2.6.32.24/arch/sh/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
3181@@ -271,7 +271,7 @@ void kgdb_arch_exit(void) 3181@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
3182 { 3182 {
3183 } 3183 }
@@ -3187,9 +3187,9 @@ diff -urNp linux-2.6.32.23/arch/sh/kernel/kgdb.c linux-2.6.32.23/arch/sh/kernel/
3187 /* Breakpoint instruction: trapa #0x3c */ 3187 /* Breakpoint instruction: trapa #0x3c */
3188 #ifdef CONFIG_CPU_LITTLE_ENDIAN 3188 #ifdef CONFIG_CPU_LITTLE_ENDIAN
3189 .gdb_bpt_instr = { 0x3c, 0xc3 }, 3189 .gdb_bpt_instr = { 0x3c, 0xc3 },
3190diff -urNp linux-2.6.32.23/arch/sh/mm/mmap.c linux-2.6.32.23/arch/sh/mm/mmap.c 3190diff -urNp linux-2.6.32.24/arch/sh/mm/mmap.c linux-2.6.32.24/arch/sh/mm/mmap.c
3191--- linux-2.6.32.23/arch/sh/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400 3191--- linux-2.6.32.24/arch/sh/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
3192+++ linux-2.6.32.23/arch/sh/mm/mmap.c 2010-09-17 18:34:04.000000000 -0400 3192+++ linux-2.6.32.24/arch/sh/mm/mmap.c 2010-09-17 18:34:04.000000000 -0400
3193@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str 3193@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
3194 addr = PAGE_ALIGN(addr); 3194 addr = PAGE_ALIGN(addr);
3195 3195
@@ -3237,9 +3237,9 @@ diff -urNp linux-2.6.32.23/arch/sh/mm/mmap.c linux-2.6.32.23/arch/sh/mm/mmap.c
3237 /* remember the address as a hint for next time */ 3237 /* remember the address as a hint for next time */
3238 return (mm->free_area_cache = addr); 3238 return (mm->free_area_cache = addr);
3239 } 3239 }
3240diff -urNp linux-2.6.32.23/arch/sparc/include/asm/atomic_64.h linux-2.6.32.23/arch/sparc/include/asm/atomic_64.h 3240diff -urNp linux-2.6.32.24/arch/sparc/include/asm/atomic_64.h linux-2.6.32.24/arch/sparc/include/asm/atomic_64.h
3241--- linux-2.6.32.23/arch/sparc/include/asm/atomic_64.h 2010-08-29 21:08:20.000000000 -0400 3241--- linux-2.6.32.24/arch/sparc/include/asm/atomic_64.h 2010-08-29 21:08:20.000000000 -0400
3242+++ linux-2.6.32.23/arch/sparc/include/asm/atomic_64.h 2010-09-15 02:34:10.000000000 -0400 3242+++ linux-2.6.32.24/arch/sparc/include/asm/atomic_64.h 2010-09-15 02:34:10.000000000 -0400
3243@@ -14,18 +14,40 @@ 3243@@ -14,18 +14,40 @@
3244 #define ATOMIC64_INIT(i) { (i) } 3244 #define ATOMIC64_INIT(i) { (i) }
3245 3245
@@ -3390,9 +3390,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/include/asm/atomic_64.h linux-2.6.32.23/ar
3390 } 3390 }
3391 3391
3392 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) 3392 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3393diff -urNp linux-2.6.32.23/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.23/arch/sparc/include/asm/dma-mapping.h 3393diff -urNp linux-2.6.32.24/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.24/arch/sparc/include/asm/dma-mapping.h
3394--- linux-2.6.32.23/arch/sparc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400 3394--- linux-2.6.32.24/arch/sparc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
3395+++ linux-2.6.32.23/arch/sparc/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400 3395+++ linux-2.6.32.24/arch/sparc/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400
3396@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d 3396@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
3397 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) 3397 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
3398 #define dma_is_consistent(d, h) (1) 3398 #define dma_is_consistent(d, h) (1)
@@ -3424,9 +3424,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.23/
3424 3424
3425 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); 3425 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
3426 ops->free_coherent(dev, size, cpu_addr, dma_handle); 3426 ops->free_coherent(dev, size, cpu_addr, dma_handle);
3427diff -urNp linux-2.6.32.23/arch/sparc/include/asm/elf_32.h linux-2.6.32.23/arch/sparc/include/asm/elf_32.h 3427diff -urNp linux-2.6.32.24/arch/sparc/include/asm/elf_32.h linux-2.6.32.24/arch/sparc/include/asm/elf_32.h
3428--- linux-2.6.32.23/arch/sparc/include/asm/elf_32.h 2010-08-13 16:24:37.000000000 -0400 3428--- linux-2.6.32.24/arch/sparc/include/asm/elf_32.h 2010-08-13 16:24:37.000000000 -0400
3429+++ linux-2.6.32.23/arch/sparc/include/asm/elf_32.h 2010-09-04 15:54:51.000000000 -0400 3429+++ linux-2.6.32.24/arch/sparc/include/asm/elf_32.h 2010-09-04 15:54:51.000000000 -0400
3430@@ -116,6 +116,13 @@ typedef struct { 3430@@ -116,6 +116,13 @@ typedef struct {
3431 3431
3432 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) 3432 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -3441,9 +3441,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/include/asm/elf_32.h linux-2.6.32.23/arch/
3441 /* This yields a mask that user programs can use to figure out what 3441 /* This yields a mask that user programs can use to figure out what
3442 instruction set this cpu supports. This can NOT be done in userspace 3442 instruction set this cpu supports. This can NOT be done in userspace
3443 on Sparc. */ 3443 on Sparc. */
3444diff -urNp linux-2.6.32.23/arch/sparc/include/asm/elf_64.h linux-2.6.32.23/arch/sparc/include/asm/elf_64.h 3444diff -urNp linux-2.6.32.24/arch/sparc/include/asm/elf_64.h linux-2.6.32.24/arch/sparc/include/asm/elf_64.h
3445--- linux-2.6.32.23/arch/sparc/include/asm/elf_64.h 2010-08-13 16:24:37.000000000 -0400 3445--- linux-2.6.32.24/arch/sparc/include/asm/elf_64.h 2010-08-13 16:24:37.000000000 -0400
3446+++ linux-2.6.32.23/arch/sparc/include/asm/elf_64.h 2010-09-04 15:54:51.000000000 -0400 3446+++ linux-2.6.32.24/arch/sparc/include/asm/elf_64.h 2010-09-04 15:54:51.000000000 -0400
3447@@ -163,6 +163,12 @@ typedef struct { 3447@@ -163,6 +163,12 @@ typedef struct {
3448 #define ELF_ET_DYN_BASE 0x0000010000000000UL 3448 #define ELF_ET_DYN_BASE 0x0000010000000000UL
3449 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL 3449 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -3457,9 +3457,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/include/asm/elf_64.h linux-2.6.32.23/arch/
3457 3457
3458 /* This yields a mask that user programs can use to figure out what 3458 /* This yields a mask that user programs can use to figure out what
3459 instruction set this cpu supports. */ 3459 instruction set this cpu supports. */
3460diff -urNp linux-2.6.32.23/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.23/arch/sparc/include/asm/pgtable_32.h 3460diff -urNp linux-2.6.32.24/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.24/arch/sparc/include/asm/pgtable_32.h
3461--- linux-2.6.32.23/arch/sparc/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400 3461--- linux-2.6.32.24/arch/sparc/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
3462+++ linux-2.6.32.23/arch/sparc/include/asm/pgtable_32.h 2010-09-04 15:54:51.000000000 -0400 3462+++ linux-2.6.32.24/arch/sparc/include/asm/pgtable_32.h 2010-09-04 15:54:51.000000000 -0400
3463@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) 3463@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
3464 BTFIXUPDEF_INT(page_none) 3464 BTFIXUPDEF_INT(page_none)
3465 BTFIXUPDEF_INT(page_copy) 3465 BTFIXUPDEF_INT(page_copy)
@@ -3491,9 +3491,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.23/a
3491 extern unsigned long page_kernel; 3491 extern unsigned long page_kernel;
3492 3492
3493 #ifdef MODULE 3493 #ifdef MODULE
3494diff -urNp linux-2.6.32.23/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.23/arch/sparc/include/asm/pgtsrmmu.h 3494diff -urNp linux-2.6.32.24/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.24/arch/sparc/include/asm/pgtsrmmu.h
3495--- linux-2.6.32.23/arch/sparc/include/asm/pgtsrmmu.h 2010-08-13 16:24:37.000000000 -0400 3495--- linux-2.6.32.24/arch/sparc/include/asm/pgtsrmmu.h 2010-08-13 16:24:37.000000000 -0400
3496+++ linux-2.6.32.23/arch/sparc/include/asm/pgtsrmmu.h 2010-09-04 15:54:51.000000000 -0400 3496+++ linux-2.6.32.24/arch/sparc/include/asm/pgtsrmmu.h 2010-09-04 15:54:51.000000000 -0400
3497@@ -115,6 +115,13 @@ 3497@@ -115,6 +115,13 @@
3498 SRMMU_EXEC | SRMMU_REF) 3498 SRMMU_EXEC | SRMMU_REF)
3499 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ 3499 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3508,9 +3508,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.23/arc
3508 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ 3508 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
3509 SRMMU_DIRTY | SRMMU_REF) 3509 SRMMU_DIRTY | SRMMU_REF)
3510 3510
3511diff -urNp linux-2.6.32.23/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.23/arch/sparc/include/asm/spinlock_64.h 3511diff -urNp linux-2.6.32.24/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.24/arch/sparc/include/asm/spinlock_64.h
3512--- linux-2.6.32.23/arch/sparc/include/asm/spinlock_64.h 2010-08-13 16:24:37.000000000 -0400 3512--- linux-2.6.32.24/arch/sparc/include/asm/spinlock_64.h 2010-08-13 16:24:37.000000000 -0400
3513+++ linux-2.6.32.23/arch/sparc/include/asm/spinlock_64.h 2010-09-04 15:54:51.000000000 -0400 3513+++ linux-2.6.32.24/arch/sparc/include/asm/spinlock_64.h 2010-09-04 15:54:51.000000000 -0400
3514@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw 3514@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
3515 __asm__ __volatile__ ( 3515 __asm__ __volatile__ (
3516 "1: ldsw [%2], %0\n" 3516 "1: ldsw [%2], %0\n"
@@ -3562,9 +3562,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.23/
3562 " cas [%2], %0, %1\n" 3562 " cas [%2], %0, %1\n"
3563 " cmp %0, %1\n" 3563 " cmp %0, %1\n"
3564 " bne,pn %%xcc, 1b\n" 3564 " bne,pn %%xcc, 1b\n"
3565diff -urNp linux-2.6.32.23/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.23/arch/sparc/include/asm/uaccess_32.h 3565diff -urNp linux-2.6.32.24/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.24/arch/sparc/include/asm/uaccess_32.h
3566--- linux-2.6.32.23/arch/sparc/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400 3566--- linux-2.6.32.24/arch/sparc/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
3567+++ linux-2.6.32.23/arch/sparc/include/asm/uaccess_32.h 2010-09-04 15:54:51.000000000 -0400 3567+++ linux-2.6.32.24/arch/sparc/include/asm/uaccess_32.h 2010-09-04 15:54:51.000000000 -0400
3568@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ 3568@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
3569 3569
3570 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) 3570 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3616,9 +3616,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.23/a
3616 return __copy_user((__force void __user *) to, from, n); 3616 return __copy_user((__force void __user *) to, from, n);
3617 } 3617 }
3618 3618
3619diff -urNp linux-2.6.32.23/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.23/arch/sparc/include/asm/uaccess_64.h 3619diff -urNp linux-2.6.32.24/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.24/arch/sparc/include/asm/uaccess_64.h
3620--- linux-2.6.32.23/arch/sparc/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400 3620--- linux-2.6.32.24/arch/sparc/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
3621+++ linux-2.6.32.23/arch/sparc/include/asm/uaccess_64.h 2010-09-04 15:54:51.000000000 -0400 3621+++ linux-2.6.32.24/arch/sparc/include/asm/uaccess_64.h 2010-09-04 15:54:51.000000000 -0400
3622@@ -9,6 +9,7 @@ 3622@@ -9,6 +9,7 @@
3623 #include <linux/compiler.h> 3623 #include <linux/compiler.h>
3624 #include <linux/string.h> 3624 #include <linux/string.h>
@@ -3661,9 +3661,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.23/a
3661 if (unlikely(ret)) 3661 if (unlikely(ret))
3662 ret = copy_to_user_fixup(to, from, size); 3662 ret = copy_to_user_fixup(to, from, size);
3663 return ret; 3663 return ret;
3664diff -urNp linux-2.6.32.23/arch/sparc/include/asm/uaccess.h linux-2.6.32.23/arch/sparc/include/asm/uaccess.h 3664diff -urNp linux-2.6.32.24/arch/sparc/include/asm/uaccess.h linux-2.6.32.24/arch/sparc/include/asm/uaccess.h
3665--- linux-2.6.32.23/arch/sparc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400 3665--- linux-2.6.32.24/arch/sparc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
3666+++ linux-2.6.32.23/arch/sparc/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400 3666+++ linux-2.6.32.24/arch/sparc/include/asm/uaccess.h 2010-09-04 15:54:51.000000000 -0400
3667@@ -1,5 +1,13 @@ 3667@@ -1,5 +1,13 @@
3668 #ifndef ___ASM_SPARC_UACCESS_H 3668 #ifndef ___ASM_SPARC_UACCESS_H
3669 #define ___ASM_SPARC_UACCESS_H 3669 #define ___ASM_SPARC_UACCESS_H
@@ -3678,9 +3678,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/include/asm/uaccess.h linux-2.6.32.23/arch
3678 #if defined(__sparc__) && defined(__arch64__) 3678 #if defined(__sparc__) && defined(__arch64__)
3679 #include <asm/uaccess_64.h> 3679 #include <asm/uaccess_64.h>
3680 #else 3680 #else
3681diff -urNp linux-2.6.32.23/arch/sparc/kernel/iommu.c linux-2.6.32.23/arch/sparc/kernel/iommu.c 3681diff -urNp linux-2.6.32.24/arch/sparc/kernel/iommu.c linux-2.6.32.24/arch/sparc/kernel/iommu.c
3682--- linux-2.6.32.23/arch/sparc/kernel/iommu.c 2010-08-13 16:24:37.000000000 -0400 3682--- linux-2.6.32.24/arch/sparc/kernel/iommu.c 2010-08-13 16:24:37.000000000 -0400
3683+++ linux-2.6.32.23/arch/sparc/kernel/iommu.c 2010-09-04 15:54:51.000000000 -0400 3683+++ linux-2.6.32.24/arch/sparc/kernel/iommu.c 2010-09-04 15:54:51.000000000 -0400
3684@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc 3684@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
3685 spin_unlock_irqrestore(&iommu->lock, flags); 3685 spin_unlock_irqrestore(&iommu->lock, flags);
3686 } 3686 }
@@ -3699,9 +3699,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/kernel/iommu.c linux-2.6.32.23/arch/sparc/
3699 EXPORT_SYMBOL(dma_ops); 3699 EXPORT_SYMBOL(dma_ops);
3700 3700
3701 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); 3701 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
3702diff -urNp linux-2.6.32.23/arch/sparc/kernel/ioport.c linux-2.6.32.23/arch/sparc/kernel/ioport.c 3702diff -urNp linux-2.6.32.24/arch/sparc/kernel/ioport.c linux-2.6.32.24/arch/sparc/kernel/ioport.c
3703--- linux-2.6.32.23/arch/sparc/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400 3703--- linux-2.6.32.24/arch/sparc/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
3704+++ linux-2.6.32.23/arch/sparc/kernel/ioport.c 2010-09-04 15:54:51.000000000 -0400 3704+++ linux-2.6.32.24/arch/sparc/kernel/ioport.c 2010-09-04 15:54:51.000000000 -0400
3705@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru 3705@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
3706 BUG(); 3706 BUG();
3707 } 3707 }
@@ -3729,9 +3729,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/kernel/ioport.c linux-2.6.32.23/arch/sparc
3729 .alloc_coherent = pci32_alloc_coherent, 3729 .alloc_coherent = pci32_alloc_coherent,
3730 .free_coherent = pci32_free_coherent, 3730 .free_coherent = pci32_free_coherent,
3731 .map_page = pci32_map_page, 3731 .map_page = pci32_map_page,
3732diff -urNp linux-2.6.32.23/arch/sparc/kernel/kgdb_32.c linux-2.6.32.23/arch/sparc/kernel/kgdb_32.c 3732diff -urNp linux-2.6.32.24/arch/sparc/kernel/kgdb_32.c linux-2.6.32.24/arch/sparc/kernel/kgdb_32.c
3733--- linux-2.6.32.23/arch/sparc/kernel/kgdb_32.c 2010-08-13 16:24:37.000000000 -0400 3733--- linux-2.6.32.24/arch/sparc/kernel/kgdb_32.c 2010-08-13 16:24:37.000000000 -0400
3734+++ linux-2.6.32.23/arch/sparc/kernel/kgdb_32.c 2010-09-04 15:54:51.000000000 -0400 3734+++ linux-2.6.32.24/arch/sparc/kernel/kgdb_32.c 2010-09-04 15:54:51.000000000 -0400
3735@@ -158,7 +158,7 @@ void kgdb_arch_exit(void) 3735@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
3736 { 3736 {
3737 } 3737 }
@@ -3741,9 +3741,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/kernel/kgdb_32.c linux-2.6.32.23/arch/spar
3741 /* Breakpoint instruction: ta 0x7d */ 3741 /* Breakpoint instruction: ta 0x7d */
3742 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, 3742 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
3743 }; 3743 };
3744diff -urNp linux-2.6.32.23/arch/sparc/kernel/kgdb_64.c linux-2.6.32.23/arch/sparc/kernel/kgdb_64.c 3744diff -urNp linux-2.6.32.24/arch/sparc/kernel/kgdb_64.c linux-2.6.32.24/arch/sparc/kernel/kgdb_64.c
3745--- linux-2.6.32.23/arch/sparc/kernel/kgdb_64.c 2010-08-13 16:24:37.000000000 -0400 3745--- linux-2.6.32.24/arch/sparc/kernel/kgdb_64.c 2010-08-13 16:24:37.000000000 -0400
3746+++ linux-2.6.32.23/arch/sparc/kernel/kgdb_64.c 2010-09-04 15:54:51.000000000 -0400 3746+++ linux-2.6.32.24/arch/sparc/kernel/kgdb_64.c 2010-09-04 15:54:51.000000000 -0400
3747@@ -180,7 +180,7 @@ void kgdb_arch_exit(void) 3747@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
3748 { 3748 {
3749 } 3749 }
@@ -3753,9 +3753,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/kernel/kgdb_64.c linux-2.6.32.23/arch/spar
3753 /* Breakpoint instruction: ta 0x72 */ 3753 /* Breakpoint instruction: ta 0x72 */
3754 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, 3754 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
3755 }; 3755 };
3756diff -urNp linux-2.6.32.23/arch/sparc/kernel/Makefile linux-2.6.32.23/arch/sparc/kernel/Makefile 3756diff -urNp linux-2.6.32.24/arch/sparc/kernel/Makefile linux-2.6.32.24/arch/sparc/kernel/Makefile
3757--- linux-2.6.32.23/arch/sparc/kernel/Makefile 2010-08-13 16:24:37.000000000 -0400 3757--- linux-2.6.32.24/arch/sparc/kernel/Makefile 2010-08-13 16:24:37.000000000 -0400
3758+++ linux-2.6.32.23/arch/sparc/kernel/Makefile 2010-09-04 15:54:51.000000000 -0400 3758+++ linux-2.6.32.24/arch/sparc/kernel/Makefile 2010-09-04 15:54:51.000000000 -0400
3759@@ -3,7 +3,7 @@ 3759@@ -3,7 +3,7 @@
3760 # 3760 #
3761 3761
@@ -3765,9 +3765,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/kernel/Makefile linux-2.6.32.23/arch/sparc
3765 3765
3766 extra-y := head_$(BITS).o 3766 extra-y := head_$(BITS).o
3767 extra-y += init_task.o 3767 extra-y += init_task.o
3768diff -urNp linux-2.6.32.23/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.23/arch/sparc/kernel/pci_sun4v.c 3768diff -urNp linux-2.6.32.24/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.24/arch/sparc/kernel/pci_sun4v.c
3769--- linux-2.6.32.23/arch/sparc/kernel/pci_sun4v.c 2010-08-13 16:24:37.000000000 -0400 3769--- linux-2.6.32.24/arch/sparc/kernel/pci_sun4v.c 2010-08-13 16:24:37.000000000 -0400
3770+++ linux-2.6.32.23/arch/sparc/kernel/pci_sun4v.c 2010-09-04 15:54:51.000000000 -0400 3770+++ linux-2.6.32.24/arch/sparc/kernel/pci_sun4v.c 2010-09-04 15:54:51.000000000 -0400
3771@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic 3771@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
3772 spin_unlock_irqrestore(&iommu->lock, flags); 3772 spin_unlock_irqrestore(&iommu->lock, flags);
3773 } 3773 }
@@ -3777,9 +3777,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.23/arch/sp
3777 .alloc_coherent = dma_4v_alloc_coherent, 3777 .alloc_coherent = dma_4v_alloc_coherent,
3778 .free_coherent = dma_4v_free_coherent, 3778 .free_coherent = dma_4v_free_coherent,
3779 .map_page = dma_4v_map_page, 3779 .map_page = dma_4v_map_page,
3780diff -urNp linux-2.6.32.23/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.23/arch/sparc/kernel/sys_sparc_32.c 3780diff -urNp linux-2.6.32.24/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.24/arch/sparc/kernel/sys_sparc_32.c
3781--- linux-2.6.32.23/arch/sparc/kernel/sys_sparc_32.c 2010-08-13 16:24:37.000000000 -0400 3781--- linux-2.6.32.24/arch/sparc/kernel/sys_sparc_32.c 2010-08-13 16:24:37.000000000 -0400
3782+++ linux-2.6.32.23/arch/sparc/kernel/sys_sparc_32.c 2010-09-17 18:34:04.000000000 -0400 3782+++ linux-2.6.32.24/arch/sparc/kernel/sys_sparc_32.c 2010-09-17 18:34:04.000000000 -0400
3783@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str 3783@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
3784 if (ARCH_SUN4C && len > 0x20000000) 3784 if (ARCH_SUN4C && len > 0x20000000)
3785 return -ENOMEM; 3785 return -ENOMEM;
@@ -3798,9 +3798,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.23/arch
3798 return addr; 3798 return addr;
3799 addr = vmm->vm_end; 3799 addr = vmm->vm_end;
3800 if (flags & MAP_SHARED) 3800 if (flags & MAP_SHARED)
3801diff -urNp linux-2.6.32.23/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.23/arch/sparc/kernel/sys_sparc_64.c 3801diff -urNp linux-2.6.32.24/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.24/arch/sparc/kernel/sys_sparc_64.c
3802--- linux-2.6.32.23/arch/sparc/kernel/sys_sparc_64.c 2010-08-13 16:24:37.000000000 -0400 3802--- linux-2.6.32.24/arch/sparc/kernel/sys_sparc_64.c 2010-08-13 16:24:37.000000000 -0400
3803+++ linux-2.6.32.23/arch/sparc/kernel/sys_sparc_64.c 2010-09-17 18:34:04.000000000 -0400 3803+++ linux-2.6.32.24/arch/sparc/kernel/sys_sparc_64.c 2010-09-17 18:34:04.000000000 -0400
3804@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str 3804@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
3805 /* We do not accept a shared mapping if it would violate 3805 /* We do not accept a shared mapping if it would violate
3806 * cache aliasing constraints. 3806 * cache aliasing constraints.
@@ -3921,9 +3921,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.23/arch
3921 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 3921 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
3922 mm->unmap_area = arch_unmap_area_topdown; 3922 mm->unmap_area = arch_unmap_area_topdown;
3923 } 3923 }
3924diff -urNp linux-2.6.32.23/arch/sparc/kernel/traps_64.c linux-2.6.32.23/arch/sparc/kernel/traps_64.c 3924diff -urNp linux-2.6.32.24/arch/sparc/kernel/traps_64.c linux-2.6.32.24/arch/sparc/kernel/traps_64.c
3925--- linux-2.6.32.23/arch/sparc/kernel/traps_64.c 2010-08-13 16:24:37.000000000 -0400 3925--- linux-2.6.32.24/arch/sparc/kernel/traps_64.c 2010-08-13 16:24:37.000000000 -0400
3926+++ linux-2.6.32.23/arch/sparc/kernel/traps_64.c 2010-09-04 15:54:51.000000000 -0400 3926+++ linux-2.6.32.24/arch/sparc/kernel/traps_64.c 2010-09-04 15:54:51.000000000 -0400
3927@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long 3927@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long
3928 3928
3929 lvl -= 0x100; 3929 lvl -= 0x100;
@@ -3955,9 +3955,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/kernel/traps_64.c linux-2.6.32.23/arch/spa
3955 dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); 3955 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
3956 3956
3957 sprintf (buffer, "Bad trap %lx at tl>0", lvl); 3957 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
3958diff -urNp linux-2.6.32.23/arch/sparc/lib/atomic_64.S linux-2.6.32.23/arch/sparc/lib/atomic_64.S 3958diff -urNp linux-2.6.32.24/arch/sparc/lib/atomic_64.S linux-2.6.32.24/arch/sparc/lib/atomic_64.S
3959--- linux-2.6.32.23/arch/sparc/lib/atomic_64.S 2010-08-13 16:24:37.000000000 -0400 3959--- linux-2.6.32.24/arch/sparc/lib/atomic_64.S 2010-08-13 16:24:37.000000000 -0400
3960+++ linux-2.6.32.23/arch/sparc/lib/atomic_64.S 2010-09-04 15:54:51.000000000 -0400 3960+++ linux-2.6.32.24/arch/sparc/lib/atomic_64.S 2010-09-04 15:54:51.000000000 -0400
3961@@ -18,7 +18,12 @@ 3961@@ -18,7 +18,12 @@
3962 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ 3962 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
3963 BACKOFF_SETUP(%o2) 3963 BACKOFF_SETUP(%o2)
@@ -4192,9 +4192,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/lib/atomic_64.S linux-2.6.32.23/arch/sparc
4192 casx [%o1], %g1, %g7 4192 casx [%o1], %g1, %g7
4193 cmp %g1, %g7 4193 cmp %g1, %g7
4194 bne,pn %xcc, 2f 4194 bne,pn %xcc, 2f
4195diff -urNp linux-2.6.32.23/arch/sparc/lib/ksyms.c linux-2.6.32.23/arch/sparc/lib/ksyms.c 4195diff -urNp linux-2.6.32.24/arch/sparc/lib/ksyms.c linux-2.6.32.24/arch/sparc/lib/ksyms.c
4196--- linux-2.6.32.23/arch/sparc/lib/ksyms.c 2010-08-13 16:24:37.000000000 -0400 4196--- linux-2.6.32.24/arch/sparc/lib/ksyms.c 2010-08-13 16:24:37.000000000 -0400
4197+++ linux-2.6.32.23/arch/sparc/lib/ksyms.c 2010-09-17 17:45:39.000000000 -0400 4197+++ linux-2.6.32.24/arch/sparc/lib/ksyms.c 2010-09-17 17:45:39.000000000 -0400
4198@@ -144,12 +144,17 @@ EXPORT_SYMBOL(__downgrade_write); 4198@@ -144,12 +144,17 @@ EXPORT_SYMBOL(__downgrade_write);
4199 4199
4200 /* Atomic counter implementation. */ 4200 /* Atomic counter implementation. */
@@ -4213,9 +4213,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/lib/ksyms.c linux-2.6.32.23/arch/sparc/lib
4213 EXPORT_SYMBOL(atomic64_sub_ret); 4213 EXPORT_SYMBOL(atomic64_sub_ret);
4214 4214
4215 /* Atomic bit operations. */ 4215 /* Atomic bit operations. */
4216diff -urNp linux-2.6.32.23/arch/sparc/lib/rwsem_64.S linux-2.6.32.23/arch/sparc/lib/rwsem_64.S 4216diff -urNp linux-2.6.32.24/arch/sparc/lib/rwsem_64.S linux-2.6.32.24/arch/sparc/lib/rwsem_64.S
4217--- linux-2.6.32.23/arch/sparc/lib/rwsem_64.S 2010-08-13 16:24:37.000000000 -0400 4217--- linux-2.6.32.24/arch/sparc/lib/rwsem_64.S 2010-08-13 16:24:37.000000000 -0400
4218+++ linux-2.6.32.23/arch/sparc/lib/rwsem_64.S 2010-09-04 15:54:51.000000000 -0400 4218+++ linux-2.6.32.24/arch/sparc/lib/rwsem_64.S 2010-09-04 15:54:51.000000000 -0400
4219@@ -11,7 +11,12 @@ 4219@@ -11,7 +11,12 @@
4220 .globl __down_read 4220 .globl __down_read
4221 __down_read: 4221 __down_read:
@@ -4314,9 +4314,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/lib/rwsem_64.S linux-2.6.32.23/arch/sparc/
4314 cas [%o0], %g3, %g7 4314 cas [%o0], %g3, %g7
4315 cmp %g3, %g7 4315 cmp %g3, %g7
4316 bne,pn %icc, 1b 4316 bne,pn %icc, 1b
4317diff -urNp linux-2.6.32.23/arch/sparc/Makefile linux-2.6.32.23/arch/sparc/Makefile 4317diff -urNp linux-2.6.32.24/arch/sparc/Makefile linux-2.6.32.24/arch/sparc/Makefile
4318--- linux-2.6.32.23/arch/sparc/Makefile 2010-08-13 16:24:37.000000000 -0400 4318--- linux-2.6.32.24/arch/sparc/Makefile 2010-08-13 16:24:37.000000000 -0400
4319+++ linux-2.6.32.23/arch/sparc/Makefile 2010-09-04 15:54:51.000000000 -0400 4319+++ linux-2.6.32.24/arch/sparc/Makefile 2010-09-04 15:54:51.000000000 -0400
4320@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc 4320@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
4321 # Export what is needed by arch/sparc/boot/Makefile 4321 # Export what is needed by arch/sparc/boot/Makefile
4322 export VMLINUX_INIT VMLINUX_MAIN 4322 export VMLINUX_INIT VMLINUX_MAIN
@@ -4326,9 +4326,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/Makefile linux-2.6.32.23/arch/sparc/Makefi
4326 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) 4326 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
4327 VMLINUX_MAIN += $(drivers-y) $(net-y) 4327 VMLINUX_MAIN += $(drivers-y) $(net-y)
4328 4328
4329diff -urNp linux-2.6.32.23/arch/sparc/mm/fault_32.c linux-2.6.32.23/arch/sparc/mm/fault_32.c 4329diff -urNp linux-2.6.32.24/arch/sparc/mm/fault_32.c linux-2.6.32.24/arch/sparc/mm/fault_32.c
4330--- linux-2.6.32.23/arch/sparc/mm/fault_32.c 2010-08-13 16:24:37.000000000 -0400 4330--- linux-2.6.32.24/arch/sparc/mm/fault_32.c 2010-08-13 16:24:37.000000000 -0400
4331+++ linux-2.6.32.23/arch/sparc/mm/fault_32.c 2010-09-04 15:54:51.000000000 -0400 4331+++ linux-2.6.32.24/arch/sparc/mm/fault_32.c 2010-09-04 15:54:51.000000000 -0400
4332@@ -21,6 +21,9 @@ 4332@@ -21,6 +21,9 @@
4333 #include <linux/interrupt.h> 4333 #include <linux/interrupt.h>
4334 #include <linux/module.h> 4334 #include <linux/module.h>
@@ -4632,9 +4632,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/mm/fault_32.c linux-2.6.32.23/arch/sparc/m
4632 /* Allow reads even for write-only mappings */ 4632 /* Allow reads even for write-only mappings */
4633 if(!(vma->vm_flags & (VM_READ | VM_EXEC))) 4633 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
4634 goto bad_area; 4634 goto bad_area;
4635diff -urNp linux-2.6.32.23/arch/sparc/mm/fault_64.c linux-2.6.32.23/arch/sparc/mm/fault_64.c 4635diff -urNp linux-2.6.32.24/arch/sparc/mm/fault_64.c linux-2.6.32.24/arch/sparc/mm/fault_64.c
4636--- linux-2.6.32.23/arch/sparc/mm/fault_64.c 2010-08-13 16:24:37.000000000 -0400 4636--- linux-2.6.32.24/arch/sparc/mm/fault_64.c 2010-08-13 16:24:37.000000000 -0400
4637+++ linux-2.6.32.23/arch/sparc/mm/fault_64.c 2010-09-04 15:54:51.000000000 -0400 4637+++ linux-2.6.32.24/arch/sparc/mm/fault_64.c 2010-09-04 15:54:51.000000000 -0400
4638@@ -20,6 +20,9 @@ 4638@@ -20,6 +20,9 @@
4639 #include <linux/kprobes.h> 4639 #include <linux/kprobes.h>
4640 #include <linux/kdebug.h> 4640 #include <linux/kdebug.h>
@@ -5132,9 +5132,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/mm/fault_64.c linux-2.6.32.23/arch/sparc/m
5132 /* Pure DTLB misses do not tell us whether the fault causing 5132 /* Pure DTLB misses do not tell us whether the fault causing
5133 * load/store/atomic was a write or not, it only says that there 5133 * load/store/atomic was a write or not, it only says that there
5134 * was no match. So in such a case we (carefully) read the 5134 * was no match. So in such a case we (carefully) read the
5135diff -urNp linux-2.6.32.23/arch/sparc/mm/hugetlbpage.c linux-2.6.32.23/arch/sparc/mm/hugetlbpage.c 5135diff -urNp linux-2.6.32.24/arch/sparc/mm/hugetlbpage.c linux-2.6.32.24/arch/sparc/mm/hugetlbpage.c
5136--- linux-2.6.32.23/arch/sparc/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400 5136--- linux-2.6.32.24/arch/sparc/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
5137+++ linux-2.6.32.23/arch/sparc/mm/hugetlbpage.c 2010-09-17 18:34:04.000000000 -0400 5137+++ linux-2.6.32.24/arch/sparc/mm/hugetlbpage.c 2010-09-17 18:34:04.000000000 -0400
5138@@ -69,7 +69,7 @@ full_search: 5138@@ -69,7 +69,7 @@ full_search:
5139 } 5139 }
5140 return -ENOMEM; 5140 return -ENOMEM;
@@ -5172,9 +5172,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/mm/hugetlbpage.c linux-2.6.32.23/arch/spar
5172 return addr; 5172 return addr;
5173 } 5173 }
5174 if (mm->get_unmapped_area == arch_get_unmapped_area) 5174 if (mm->get_unmapped_area == arch_get_unmapped_area)
5175diff -urNp linux-2.6.32.23/arch/sparc/mm/init_32.c linux-2.6.32.23/arch/sparc/mm/init_32.c 5175diff -urNp linux-2.6.32.24/arch/sparc/mm/init_32.c linux-2.6.32.24/arch/sparc/mm/init_32.c
5176--- linux-2.6.32.23/arch/sparc/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400 5176--- linux-2.6.32.24/arch/sparc/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
5177+++ linux-2.6.32.23/arch/sparc/mm/init_32.c 2010-09-04 15:54:51.000000000 -0400 5177+++ linux-2.6.32.24/arch/sparc/mm/init_32.c 2010-09-04 15:54:51.000000000 -0400
5178@@ -317,6 +317,9 @@ extern void device_scan(void); 5178@@ -317,6 +317,9 @@ extern void device_scan(void);
5179 pgprot_t PAGE_SHARED __read_mostly; 5179 pgprot_t PAGE_SHARED __read_mostly;
5180 EXPORT_SYMBOL(PAGE_SHARED); 5180 EXPORT_SYMBOL(PAGE_SHARED);
@@ -5209,9 +5209,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/mm/init_32.c linux-2.6.32.23/arch/sparc/mm
5209 protection_map[12] = PAGE_READONLY; 5209 protection_map[12] = PAGE_READONLY;
5210 protection_map[13] = PAGE_READONLY; 5210 protection_map[13] = PAGE_READONLY;
5211 protection_map[14] = PAGE_SHARED; 5211 protection_map[14] = PAGE_SHARED;
5212diff -urNp linux-2.6.32.23/arch/sparc/mm/Makefile linux-2.6.32.23/arch/sparc/mm/Makefile 5212diff -urNp linux-2.6.32.24/arch/sparc/mm/Makefile linux-2.6.32.24/arch/sparc/mm/Makefile
5213--- linux-2.6.32.23/arch/sparc/mm/Makefile 2010-08-13 16:24:37.000000000 -0400 5213--- linux-2.6.32.24/arch/sparc/mm/Makefile 2010-08-13 16:24:37.000000000 -0400
5214+++ linux-2.6.32.23/arch/sparc/mm/Makefile 2010-09-04 15:54:51.000000000 -0400 5214+++ linux-2.6.32.24/arch/sparc/mm/Makefile 2010-09-04 15:54:51.000000000 -0400
5215@@ -2,7 +2,7 @@ 5215@@ -2,7 +2,7 @@
5216 # 5216 #
5217 5217
@@ -5221,9 +5221,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/mm/Makefile linux-2.6.32.23/arch/sparc/mm/
5221 5221
5222 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o 5222 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
5223 obj-y += fault_$(BITS).o 5223 obj-y += fault_$(BITS).o
5224diff -urNp linux-2.6.32.23/arch/sparc/mm/srmmu.c linux-2.6.32.23/arch/sparc/mm/srmmu.c 5224diff -urNp linux-2.6.32.24/arch/sparc/mm/srmmu.c linux-2.6.32.24/arch/sparc/mm/srmmu.c
5225--- linux-2.6.32.23/arch/sparc/mm/srmmu.c 2010-08-13 16:24:37.000000000 -0400 5225--- linux-2.6.32.24/arch/sparc/mm/srmmu.c 2010-08-13 16:24:37.000000000 -0400
5226+++ linux-2.6.32.23/arch/sparc/mm/srmmu.c 2010-09-04 15:54:51.000000000 -0400 5226+++ linux-2.6.32.24/arch/sparc/mm/srmmu.c 2010-09-04 15:54:51.000000000 -0400
5227@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) 5227@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
5228 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); 5228 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
5229 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); 5229 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -5238,9 +5238,9 @@ diff -urNp linux-2.6.32.23/arch/sparc/mm/srmmu.c linux-2.6.32.23/arch/sparc/mm/s
5238 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); 5238 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
5239 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); 5239 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
5240 5240
5241diff -urNp linux-2.6.32.23/arch/um/include/asm/kmap_types.h linux-2.6.32.23/arch/um/include/asm/kmap_types.h 5241diff -urNp linux-2.6.32.24/arch/um/include/asm/kmap_types.h linux-2.6.32.24/arch/um/include/asm/kmap_types.h
5242--- linux-2.6.32.23/arch/um/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400 5242--- linux-2.6.32.24/arch/um/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
5243+++ linux-2.6.32.23/arch/um/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400 5243+++ linux-2.6.32.24/arch/um/include/asm/kmap_types.h 2010-09-04 15:54:51.000000000 -0400
5244@@ -23,6 +23,7 @@ enum km_type { 5244@@ -23,6 +23,7 @@ enum km_type {
5245 KM_IRQ1, 5245 KM_IRQ1,
5246 KM_SOFTIRQ0, 5246 KM_SOFTIRQ0,
@@ -5249,9 +5249,9 @@ diff -urNp linux-2.6.32.23/arch/um/include/asm/kmap_types.h linux-2.6.32.23/arch
5249 KM_TYPE_NR 5249 KM_TYPE_NR
5250 }; 5250 };
5251 5251
5252diff -urNp linux-2.6.32.23/arch/um/include/asm/page.h linux-2.6.32.23/arch/um/include/asm/page.h 5252diff -urNp linux-2.6.32.24/arch/um/include/asm/page.h linux-2.6.32.24/arch/um/include/asm/page.h
5253--- linux-2.6.32.23/arch/um/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400 5253--- linux-2.6.32.24/arch/um/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
5254+++ linux-2.6.32.23/arch/um/include/asm/page.h 2010-09-04 15:54:51.000000000 -0400 5254+++ linux-2.6.32.24/arch/um/include/asm/page.h 2010-09-04 15:54:51.000000000 -0400
5255@@ -14,6 +14,9 @@ 5255@@ -14,6 +14,9 @@
5256 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) 5256 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
5257 #define PAGE_MASK (~(PAGE_SIZE-1)) 5257 #define PAGE_MASK (~(PAGE_SIZE-1))
@@ -5262,9 +5262,9 @@ diff -urNp linux-2.6.32.23/arch/um/include/asm/page.h linux-2.6.32.23/arch/um/in
5262 #ifndef __ASSEMBLY__ 5262 #ifndef __ASSEMBLY__
5263 5263
5264 struct page; 5264 struct page;
5265diff -urNp linux-2.6.32.23/arch/um/sys-i386/syscalls.c linux-2.6.32.23/arch/um/sys-i386/syscalls.c 5265diff -urNp linux-2.6.32.24/arch/um/sys-i386/syscalls.c linux-2.6.32.24/arch/um/sys-i386/syscalls.c
5266--- linux-2.6.32.23/arch/um/sys-i386/syscalls.c 2010-08-13 16:24:37.000000000 -0400 5266--- linux-2.6.32.24/arch/um/sys-i386/syscalls.c 2010-08-13 16:24:37.000000000 -0400
5267+++ linux-2.6.32.23/arch/um/sys-i386/syscalls.c 2010-09-04 15:54:51.000000000 -0400 5267+++ linux-2.6.32.24/arch/um/sys-i386/syscalls.c 2010-09-04 15:54:51.000000000 -0400
5268@@ -11,6 +11,21 @@ 5268@@ -11,6 +11,21 @@
5269 #include "asm/uaccess.h" 5269 #include "asm/uaccess.h"
5270 #include "asm/unistd.h" 5270 #include "asm/unistd.h"
@@ -5287,9 +5287,9 @@ diff -urNp linux-2.6.32.23/arch/um/sys-i386/syscalls.c linux-2.6.32.23/arch/um/s
5287 /* 5287 /*
5288 * Perform the select(nd, in, out, ex, tv) and mmap() system 5288 * Perform the select(nd, in, out, ex, tv) and mmap() system
5289 * calls. Linux/i386 didn't use to be able to handle more than 5289 * calls. Linux/i386 didn't use to be able to handle more than
5290diff -urNp linux-2.6.32.23/arch/x86/boot/bitops.h linux-2.6.32.23/arch/x86/boot/bitops.h 5290diff -urNp linux-2.6.32.24/arch/x86/boot/bitops.h linux-2.6.32.24/arch/x86/boot/bitops.h
5291--- linux-2.6.32.23/arch/x86/boot/bitops.h 2010-08-13 16:24:37.000000000 -0400 5291--- linux-2.6.32.24/arch/x86/boot/bitops.h 2010-08-13 16:24:37.000000000 -0400
5292+++ linux-2.6.32.23/arch/x86/boot/bitops.h 2010-09-04 15:54:51.000000000 -0400 5292+++ linux-2.6.32.24/arch/x86/boot/bitops.h 2010-09-04 15:54:51.000000000 -0400
5293@@ -26,7 +26,7 @@ static inline int variable_test_bit(int 5293@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
5294 u8 v; 5294 u8 v;
5295 const u32 *p = (const u32 *)addr; 5295 const u32 *p = (const u32 *)addr;
@@ -5308,9 +5308,9 @@ diff -urNp linux-2.6.32.23/arch/x86/boot/bitops.h linux-2.6.32.23/arch/x86/boot/
5308 } 5308 }
5309 5309
5310 #endif /* BOOT_BITOPS_H */ 5310 #endif /* BOOT_BITOPS_H */
5311diff -urNp linux-2.6.32.23/arch/x86/boot/boot.h linux-2.6.32.23/arch/x86/boot/boot.h 5311diff -urNp linux-2.6.32.24/arch/x86/boot/boot.h linux-2.6.32.24/arch/x86/boot/boot.h
5312--- linux-2.6.32.23/arch/x86/boot/boot.h 2010-08-13 16:24:37.000000000 -0400 5312--- linux-2.6.32.24/arch/x86/boot/boot.h 2010-08-13 16:24:37.000000000 -0400
5313+++ linux-2.6.32.23/arch/x86/boot/boot.h 2010-09-04 15:54:51.000000000 -0400 5313+++ linux-2.6.32.24/arch/x86/boot/boot.h 2010-09-04 15:54:51.000000000 -0400
5314@@ -82,7 +82,7 @@ static inline void io_delay(void) 5314@@ -82,7 +82,7 @@ static inline void io_delay(void)
5315 static inline u16 ds(void) 5315 static inline u16 ds(void)
5316 { 5316 {
@@ -5329,9 +5329,9 @@ diff -urNp linux-2.6.32.23/arch/x86/boot/boot.h linux-2.6.32.23/arch/x86/boot/bo
5329 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); 5329 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
5330 return diff; 5330 return diff;
5331 } 5331 }
5332diff -urNp linux-2.6.32.23/arch/x86/boot/compressed/head_32.S linux-2.6.32.23/arch/x86/boot/compressed/head_32.S 5332diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/head_32.S linux-2.6.32.24/arch/x86/boot/compressed/head_32.S
5333--- linux-2.6.32.23/arch/x86/boot/compressed/head_32.S 2010-08-13 16:24:37.000000000 -0400 5333--- linux-2.6.32.24/arch/x86/boot/compressed/head_32.S 2010-08-13 16:24:37.000000000 -0400
5334+++ linux-2.6.32.23/arch/x86/boot/compressed/head_32.S 2010-09-04 15:54:51.000000000 -0400 5334+++ linux-2.6.32.24/arch/x86/boot/compressed/head_32.S 2010-09-04 15:54:51.000000000 -0400
5335@@ -76,7 +76,7 @@ ENTRY(startup_32) 5335@@ -76,7 +76,7 @@ ENTRY(startup_32)
5336 notl %eax 5336 notl %eax
5337 andl %eax, %ebx 5337 andl %eax, %ebx
@@ -5360,9 +5360,9 @@ diff -urNp linux-2.6.32.23/arch/x86/boot/compressed/head_32.S linux-2.6.32.23/ar
5360 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) 5360 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
5361 jmp 1b 5361 jmp 1b
5362 2: 5362 2:
5363diff -urNp linux-2.6.32.23/arch/x86/boot/compressed/head_64.S linux-2.6.32.23/arch/x86/boot/compressed/head_64.S 5363diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/head_64.S linux-2.6.32.24/arch/x86/boot/compressed/head_64.S
5364--- linux-2.6.32.23/arch/x86/boot/compressed/head_64.S 2010-08-13 16:24:37.000000000 -0400 5364--- linux-2.6.32.24/arch/x86/boot/compressed/head_64.S 2010-08-13 16:24:37.000000000 -0400
5365+++ linux-2.6.32.23/arch/x86/boot/compressed/head_64.S 2010-09-04 15:54:51.000000000 -0400 5365+++ linux-2.6.32.24/arch/x86/boot/compressed/head_64.S 2010-09-04 15:54:51.000000000 -0400
5366@@ -91,7 +91,7 @@ ENTRY(startup_32) 5366@@ -91,7 +91,7 @@ ENTRY(startup_32)
5367 notl %eax 5367 notl %eax
5368 andl %eax, %ebx 5368 andl %eax, %ebx
@@ -5381,9 +5381,9 @@ diff -urNp linux-2.6.32.23/arch/x86/boot/compressed/head_64.S linux-2.6.32.23/ar
5381 #endif 5381 #endif
5382 5382
5383 /* Target address to relocate to for decompression */ 5383 /* Target address to relocate to for decompression */
5384diff -urNp linux-2.6.32.23/arch/x86/boot/compressed/misc.c linux-2.6.32.23/arch/x86/boot/compressed/misc.c 5384diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/misc.c linux-2.6.32.24/arch/x86/boot/compressed/misc.c
5385--- linux-2.6.32.23/arch/x86/boot/compressed/misc.c 2010-08-13 16:24:37.000000000 -0400 5385--- linux-2.6.32.24/arch/x86/boot/compressed/misc.c 2010-08-13 16:24:37.000000000 -0400
5386+++ linux-2.6.32.23/arch/x86/boot/compressed/misc.c 2010-09-04 15:54:51.000000000 -0400 5386+++ linux-2.6.32.24/arch/x86/boot/compressed/misc.c 2010-09-04 15:54:51.000000000 -0400
5387@@ -288,7 +288,7 @@ static void parse_elf(void *output) 5387@@ -288,7 +288,7 @@ static void parse_elf(void *output)
5388 case PT_LOAD: 5388 case PT_LOAD:
5389 #ifdef CONFIG_RELOCATABLE 5389 #ifdef CONFIG_RELOCATABLE
@@ -5402,9 +5402,9 @@ diff -urNp linux-2.6.32.23/arch/x86/boot/compressed/misc.c linux-2.6.32.23/arch/
5402 error("Wrong destination address"); 5402 error("Wrong destination address");
5403 #endif 5403 #endif
5404 5404
5405diff -urNp linux-2.6.32.23/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.23/arch/x86/boot/compressed/mkpiggy.c 5405diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.24/arch/x86/boot/compressed/mkpiggy.c
5406--- linux-2.6.32.23/arch/x86/boot/compressed/mkpiggy.c 2010-08-13 16:24:37.000000000 -0400 5406--- linux-2.6.32.24/arch/x86/boot/compressed/mkpiggy.c 2010-08-13 16:24:37.000000000 -0400
5407+++ linux-2.6.32.23/arch/x86/boot/compressed/mkpiggy.c 2010-09-04 15:54:51.000000000 -0400 5407+++ linux-2.6.32.24/arch/x86/boot/compressed/mkpiggy.c 2010-09-04 15:54:51.000000000 -0400
5408@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) 5408@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
5409 5409
5410 offs = (olen > ilen) ? olen - ilen : 0; 5410 offs = (olen > ilen) ? olen - ilen : 0;
@@ -5414,9 +5414,9 @@ diff -urNp linux-2.6.32.23/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.23/ar
5414 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ 5414 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
5415 5415
5416 printf(".section \".rodata.compressed\",\"a\",@progbits\n"); 5416 printf(".section \".rodata.compressed\",\"a\",@progbits\n");
5417diff -urNp linux-2.6.32.23/arch/x86/boot/compressed/relocs.c linux-2.6.32.23/arch/x86/boot/compressed/relocs.c 5417diff -urNp linux-2.6.32.24/arch/x86/boot/compressed/relocs.c linux-2.6.32.24/arch/x86/boot/compressed/relocs.c
5418--- linux-2.6.32.23/arch/x86/boot/compressed/relocs.c 2010-08-13 16:24:37.000000000 -0400 5418--- linux-2.6.32.24/arch/x86/boot/compressed/relocs.c 2010-08-13 16:24:37.000000000 -0400
5419+++ linux-2.6.32.23/arch/x86/boot/compressed/relocs.c 2010-09-04 15:54:51.000000000 -0400 5419+++ linux-2.6.32.24/arch/x86/boot/compressed/relocs.c 2010-09-04 15:54:51.000000000 -0400
5420@@ -10,8 +10,11 @@ 5420@@ -10,8 +10,11 @@
5421 #define USE_BSD 5421 #define USE_BSD
5422 #include <endian.h> 5422 #include <endian.h>
@@ -5617,9 +5617,9 @@ diff -urNp linux-2.6.32.23/arch/x86/boot/compressed/relocs.c linux-2.6.32.23/arc
5617 read_shdrs(fp); 5617 read_shdrs(fp);
5618 read_strtabs(fp); 5618 read_strtabs(fp);
5619 read_symtabs(fp); 5619 read_symtabs(fp);
5620diff -urNp linux-2.6.32.23/arch/x86/boot/cpucheck.c linux-2.6.32.23/arch/x86/boot/cpucheck.c 5620diff -urNp linux-2.6.32.24/arch/x86/boot/cpucheck.c linux-2.6.32.24/arch/x86/boot/cpucheck.c
5621--- linux-2.6.32.23/arch/x86/boot/cpucheck.c 2010-08-13 16:24:37.000000000 -0400 5621--- linux-2.6.32.24/arch/x86/boot/cpucheck.c 2010-08-13 16:24:37.000000000 -0400
5622+++ linux-2.6.32.23/arch/x86/boot/cpucheck.c 2010-09-04 15:54:51.000000000 -0400 5622+++ linux-2.6.32.24/arch/x86/boot/cpucheck.c 2010-09-04 15:54:51.000000000 -0400
5623@@ -74,7 +74,7 @@ static int has_fpu(void) 5623@@ -74,7 +74,7 @@ static int has_fpu(void)
5624 u16 fcw = -1, fsw = -1; 5624 u16 fcw = -1, fsw = -1;
5625 u32 cr0; 5625 u32 cr0;
@@ -5715,9 +5715,9 @@ diff -urNp linux-2.6.32.23/arch/x86/boot/cpucheck.c linux-2.6.32.23/arch/x86/boo
5715 5715
5716 err = check_flags(); 5716 err = check_flags();
5717 } 5717 }
5718diff -urNp linux-2.6.32.23/arch/x86/boot/header.S linux-2.6.32.23/arch/x86/boot/header.S 5718diff -urNp linux-2.6.32.24/arch/x86/boot/header.S linux-2.6.32.24/arch/x86/boot/header.S
5719--- linux-2.6.32.23/arch/x86/boot/header.S 2010-08-13 16:24:37.000000000 -0400 5719--- linux-2.6.32.24/arch/x86/boot/header.S 2010-08-13 16:24:37.000000000 -0400
5720+++ linux-2.6.32.23/arch/x86/boot/header.S 2010-09-04 15:54:51.000000000 -0400 5720+++ linux-2.6.32.24/arch/x86/boot/header.S 2010-09-04 15:54:51.000000000 -0400
5721@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical 5721@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
5722 # single linked list of 5722 # single linked list of
5723 # struct setup_data 5723 # struct setup_data
@@ -5727,9 +5727,9 @@ diff -urNp linux-2.6.32.23/arch/x86/boot/header.S linux-2.6.32.23/arch/x86/boot/
5727 5727
5728 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) 5728 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
5729 #define VO_INIT_SIZE (VO__end - VO__text) 5729 #define VO_INIT_SIZE (VO__end - VO__text)
5730diff -urNp linux-2.6.32.23/arch/x86/boot/memory.c linux-2.6.32.23/arch/x86/boot/memory.c 5730diff -urNp linux-2.6.32.24/arch/x86/boot/memory.c linux-2.6.32.24/arch/x86/boot/memory.c
5731--- linux-2.6.32.23/arch/x86/boot/memory.c 2010-08-13 16:24:37.000000000 -0400 5731--- linux-2.6.32.24/arch/x86/boot/memory.c 2010-08-13 16:24:37.000000000 -0400
5732+++ linux-2.6.32.23/arch/x86/boot/memory.c 2010-09-04 15:54:51.000000000 -0400 5732+++ linux-2.6.32.24/arch/x86/boot/memory.c 2010-09-04 15:54:51.000000000 -0400
5733@@ -19,7 +19,7 @@ 5733@@ -19,7 +19,7 @@
5734 5734
5735 static int detect_memory_e820(void) 5735 static int detect_memory_e820(void)
@@ -5739,9 +5739,9 @@ diff -urNp linux-2.6.32.23/arch/x86/boot/memory.c linux-2.6.32.23/arch/x86/boot/
5739 struct biosregs ireg, oreg; 5739 struct biosregs ireg, oreg;
5740 struct e820entry *desc = boot_params.e820_map; 5740 struct e820entry *desc = boot_params.e820_map;
5741 static struct e820entry buf; /* static so it is zeroed */ 5741 static struct e820entry buf; /* static so it is zeroed */
5742diff -urNp linux-2.6.32.23/arch/x86/boot/video.c linux-2.6.32.23/arch/x86/boot/video.c 5742diff -urNp linux-2.6.32.24/arch/x86/boot/video.c linux-2.6.32.24/arch/x86/boot/video.c
5743--- linux-2.6.32.23/arch/x86/boot/video.c 2010-08-13 16:24:37.000000000 -0400 5743--- linux-2.6.32.24/arch/x86/boot/video.c 2010-08-13 16:24:37.000000000 -0400
5744+++ linux-2.6.32.23/arch/x86/boot/video.c 2010-09-04 15:54:51.000000000 -0400 5744+++ linux-2.6.32.24/arch/x86/boot/video.c 2010-09-04 15:54:51.000000000 -0400
5745@@ -90,7 +90,7 @@ static void store_mode_params(void) 5745@@ -90,7 +90,7 @@ static void store_mode_params(void)
5746 static unsigned int get_entry(void) 5746 static unsigned int get_entry(void)
5747 { 5747 {
@@ -5751,9 +5751,9 @@ diff -urNp linux-2.6.32.23/arch/x86/boot/video.c linux-2.6.32.23/arch/x86/boot/v
5751 int key; 5751 int key;
5752 unsigned int v; 5752 unsigned int v;
5753 5753
5754diff -urNp linux-2.6.32.23/arch/x86/boot/video-vesa.c linux-2.6.32.23/arch/x86/boot/video-vesa.c 5754diff -urNp linux-2.6.32.24/arch/x86/boot/video-vesa.c linux-2.6.32.24/arch/x86/boot/video-vesa.c
5755--- linux-2.6.32.23/arch/x86/boot/video-vesa.c 2010-08-13 16:24:37.000000000 -0400 5755--- linux-2.6.32.24/arch/x86/boot/video-vesa.c 2010-08-13 16:24:37.000000000 -0400
5756+++ linux-2.6.32.23/arch/x86/boot/video-vesa.c 2010-09-04 15:54:51.000000000 -0400 5756+++ linux-2.6.32.24/arch/x86/boot/video-vesa.c 2010-09-04 15:54:51.000000000 -0400
5757@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) 5757@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
5758 5758
5759 boot_params.screen_info.vesapm_seg = oreg.es; 5759 boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5762,9 +5762,9 @@ diff -urNp linux-2.6.32.23/arch/x86/boot/video-vesa.c linux-2.6.32.23/arch/x86/b
5762 } 5762 }
5763 5763
5764 /* 5764 /*
5765diff -urNp linux-2.6.32.23/arch/x86/ia32/ia32_aout.c linux-2.6.32.23/arch/x86/ia32/ia32_aout.c 5765diff -urNp linux-2.6.32.24/arch/x86/ia32/ia32_aout.c linux-2.6.32.24/arch/x86/ia32/ia32_aout.c
5766--- linux-2.6.32.23/arch/x86/ia32/ia32_aout.c 2010-08-13 16:24:37.000000000 -0400 5766--- linux-2.6.32.24/arch/x86/ia32/ia32_aout.c 2010-08-13 16:24:37.000000000 -0400
5767+++ linux-2.6.32.23/arch/x86/ia32/ia32_aout.c 2010-09-23 20:28:50.000000000 -0400 5767+++ linux-2.6.32.24/arch/x86/ia32/ia32_aout.c 2010-09-23 20:28:50.000000000 -0400
5768@@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st 5768@@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st
5769 unsigned long dump_start, dump_size; 5769 unsigned long dump_start, dump_size;
5770 struct user32 dump; 5770 struct user32 dump;
@@ -5787,9 +5787,9 @@ diff -urNp linux-2.6.32.23/arch/x86/ia32/ia32_aout.c linux-2.6.32.23/arch/x86/ia
5787 end_coredump: 5787 end_coredump:
5788 set_fs(fs); 5788 set_fs(fs);
5789 return has_dumped; 5789 return has_dumped;
5790diff -urNp linux-2.6.32.23/arch/x86/ia32/ia32entry.S linux-2.6.32.23/arch/x86/ia32/ia32entry.S 5790diff -urNp linux-2.6.32.24/arch/x86/ia32/ia32entry.S linux-2.6.32.24/arch/x86/ia32/ia32entry.S
5791--- linux-2.6.32.23/arch/x86/ia32/ia32entry.S 2010-09-20 17:26:42.000000000 -0400 5791--- linux-2.6.32.24/arch/x86/ia32/ia32entry.S 2010-09-20 17:26:42.000000000 -0400
5792+++ linux-2.6.32.23/arch/x86/ia32/ia32entry.S 2010-09-15 02:02:53.000000000 -0400 5792+++ linux-2.6.32.24/arch/x86/ia32/ia32entry.S 2010-09-15 02:02:53.000000000 -0400
5793@@ -13,6 +13,7 @@ 5793@@ -13,6 +13,7 @@
5794 #include <asm/thread_info.h> 5794 #include <asm/thread_info.h>
5795 #include <asm/segment.h> 5795 #include <asm/segment.h>
@@ -5884,9 +5884,9 @@ diff -urNp linux-2.6.32.23/arch/x86/ia32/ia32entry.S linux-2.6.32.23/arch/x86/ia
5884 /* 5884 /*
5885 * No need to follow this irqs on/off section: the syscall 5885 * No need to follow this irqs on/off section: the syscall
5886 * disabled irqs and here we enable it straight after entry: 5886 * disabled irqs and here we enable it straight after entry:
5887diff -urNp linux-2.6.32.23/arch/x86/ia32/ia32_signal.c linux-2.6.32.23/arch/x86/ia32/ia32_signal.c 5887diff -urNp linux-2.6.32.24/arch/x86/ia32/ia32_signal.c linux-2.6.32.24/arch/x86/ia32/ia32_signal.c
5888--- linux-2.6.32.23/arch/x86/ia32/ia32_signal.c 2010-08-13 16:24:37.000000000 -0400 5888--- linux-2.6.32.24/arch/x86/ia32/ia32_signal.c 2010-08-13 16:24:37.000000000 -0400
5889+++ linux-2.6.32.23/arch/x86/ia32/ia32_signal.c 2010-09-04 15:54:51.000000000 -0400 5889+++ linux-2.6.32.24/arch/x86/ia32/ia32_signal.c 2010-09-04 15:54:51.000000000 -0400
5890@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 5890@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
5891 sp -= frame_size; 5891 sp -= frame_size;
5892 /* Align the stack pointer according to the i386 ABI, 5892 /* Align the stack pointer according to the i386 ABI,
@@ -5905,9 +5905,9 @@ diff -urNp linux-2.6.32.23/arch/x86/ia32/ia32_signal.c linux-2.6.32.23/arch/x86/
5905 }; 5905 };
5906 5906
5907 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); 5907 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
5908diff -urNp linux-2.6.32.23/arch/x86/include/asm/alternative.h linux-2.6.32.23/arch/x86/include/asm/alternative.h 5908diff -urNp linux-2.6.32.24/arch/x86/include/asm/alternative.h linux-2.6.32.24/arch/x86/include/asm/alternative.h
5909--- linux-2.6.32.23/arch/x86/include/asm/alternative.h 2010-08-13 16:24:37.000000000 -0400 5909--- linux-2.6.32.24/arch/x86/include/asm/alternative.h 2010-08-13 16:24:37.000000000 -0400
5910+++ linux-2.6.32.23/arch/x86/include/asm/alternative.h 2010-09-04 15:54:51.000000000 -0400 5910+++ linux-2.6.32.24/arch/x86/include/asm/alternative.h 2010-09-04 15:54:51.000000000 -0400
5911@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit 5911@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
5912 " .byte 662b-661b\n" /* sourcelen */ \ 5912 " .byte 662b-661b\n" /* sourcelen */ \
5913 " .byte 664f-663f\n" /* replacementlen */ \ 5913 " .byte 664f-663f\n" /* replacementlen */ \
@@ -5917,9 +5917,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/alternative.h linux-2.6.32.23/ar
5917 "663:\n\t" newinstr "\n664:\n" /* replacement */ \ 5917 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
5918 ".previous" 5918 ".previous"
5919 5919
5920diff -urNp linux-2.6.32.23/arch/x86/include/asm/apm.h linux-2.6.32.23/arch/x86/include/asm/apm.h 5920diff -urNp linux-2.6.32.24/arch/x86/include/asm/apm.h linux-2.6.32.24/arch/x86/include/asm/apm.h
5921--- linux-2.6.32.23/arch/x86/include/asm/apm.h 2010-08-13 16:24:37.000000000 -0400 5921--- linux-2.6.32.24/arch/x86/include/asm/apm.h 2010-08-13 16:24:37.000000000 -0400
5922+++ linux-2.6.32.23/arch/x86/include/asm/apm.h 2010-09-04 15:54:51.000000000 -0400 5922+++ linux-2.6.32.24/arch/x86/include/asm/apm.h 2010-09-04 15:54:51.000000000 -0400
5923@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 5923@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
5924 __asm__ __volatile__(APM_DO_ZERO_SEGS 5924 __asm__ __volatile__(APM_DO_ZERO_SEGS
5925 "pushl %%edi\n\t" 5925 "pushl %%edi\n\t"
@@ -5938,9 +5938,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/apm.h linux-2.6.32.23/arch/x86/i
5938 "setc %%bl\n\t" 5938 "setc %%bl\n\t"
5939 "popl %%ebp\n\t" 5939 "popl %%ebp\n\t"
5940 "popl %%edi\n\t" 5940 "popl %%edi\n\t"
5941diff -urNp linux-2.6.32.23/arch/x86/include/asm/atomic_32.h linux-2.6.32.23/arch/x86/include/asm/atomic_32.h 5941diff -urNp linux-2.6.32.24/arch/x86/include/asm/atomic_32.h linux-2.6.32.24/arch/x86/include/asm/atomic_32.h
5942--- linux-2.6.32.23/arch/x86/include/asm/atomic_32.h 2010-08-13 16:24:37.000000000 -0400 5942--- linux-2.6.32.24/arch/x86/include/asm/atomic_32.h 2010-08-13 16:24:37.000000000 -0400
5943+++ linux-2.6.32.23/arch/x86/include/asm/atomic_32.h 2010-09-26 22:16:58.000000000 -0400 5943+++ linux-2.6.32.24/arch/x86/include/asm/atomic_32.h 2010-09-26 22:16:58.000000000 -0400
5944@@ -25,6 +25,17 @@ static inline int atomic_read(const atom 5944@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
5945 } 5945 }
5946 5946
@@ -6288,9 +6288,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/atomic_32.h linux-2.6.32.23/arch
6288 #define ATOMIC64_INIT(val) { (val) } 6288 #define ATOMIC64_INIT(val) { (val) }
6289 6289
6290 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); 6290 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
6291diff -urNp linux-2.6.32.23/arch/x86/include/asm/atomic_64.h linux-2.6.32.23/arch/x86/include/asm/atomic_64.h 6291diff -urNp linux-2.6.32.24/arch/x86/include/asm/atomic_64.h linux-2.6.32.24/arch/x86/include/asm/atomic_64.h
6292--- linux-2.6.32.23/arch/x86/include/asm/atomic_64.h 2010-08-13 16:24:37.000000000 -0400 6292--- linux-2.6.32.24/arch/x86/include/asm/atomic_64.h 2010-08-13 16:24:37.000000000 -0400
6293+++ linux-2.6.32.23/arch/x86/include/asm/atomic_64.h 2010-09-26 22:30:45.000000000 -0400 6293+++ linux-2.6.32.24/arch/x86/include/asm/atomic_64.h 2010-09-26 22:30:45.000000000 -0400
6294@@ -24,6 +24,17 @@ static inline int atomic_read(const atom 6294@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
6295 } 6295 }
6296 6296
@@ -6894,9 +6894,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/atomic_64.h linux-2.6.32.23/arch
6894 } 6894 }
6895 6895
6896 /** 6896 /**
6897diff -urNp linux-2.6.32.23/arch/x86/include/asm/boot.h linux-2.6.32.23/arch/x86/include/asm/boot.h 6897diff -urNp linux-2.6.32.24/arch/x86/include/asm/boot.h linux-2.6.32.24/arch/x86/include/asm/boot.h
6898--- linux-2.6.32.23/arch/x86/include/asm/boot.h 2010-08-13 16:24:37.000000000 -0400 6898--- linux-2.6.32.24/arch/x86/include/asm/boot.h 2010-08-13 16:24:37.000000000 -0400
6899+++ linux-2.6.32.23/arch/x86/include/asm/boot.h 2010-09-04 15:54:51.000000000 -0400 6899+++ linux-2.6.32.24/arch/x86/include/asm/boot.h 2010-09-04 15:54:51.000000000 -0400
6900@@ -11,10 +11,15 @@ 6900@@ -11,10 +11,15 @@
6901 #include <asm/pgtable_types.h> 6901 #include <asm/pgtable_types.h>
6902 6902
@@ -6914,9 +6914,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/boot.h linux-2.6.32.23/arch/x86/
6914 /* Minimum kernel alignment, as a power of two */ 6914 /* Minimum kernel alignment, as a power of two */
6915 #ifdef CONFIG_X86_64 6915 #ifdef CONFIG_X86_64
6916 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT 6916 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
6917diff -urNp linux-2.6.32.23/arch/x86/include/asm/cacheflush.h linux-2.6.32.23/arch/x86/include/asm/cacheflush.h 6917diff -urNp linux-2.6.32.24/arch/x86/include/asm/cacheflush.h linux-2.6.32.24/arch/x86/include/asm/cacheflush.h
6918--- linux-2.6.32.23/arch/x86/include/asm/cacheflush.h 2010-08-13 16:24:37.000000000 -0400 6918--- linux-2.6.32.24/arch/x86/include/asm/cacheflush.h 2010-08-13 16:24:37.000000000 -0400
6919+++ linux-2.6.32.23/arch/x86/include/asm/cacheflush.h 2010-09-04 15:54:51.000000000 -0400 6919+++ linux-2.6.32.24/arch/x86/include/asm/cacheflush.h 2010-09-04 15:54:51.000000000 -0400
6920@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) 6920@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
6921 static inline unsigned long get_page_memtype(struct page *pg) 6921 static inline unsigned long get_page_memtype(struct page *pg)
6922 { 6922 {
@@ -6935,9 +6935,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/cacheflush.h linux-2.6.32.23/arc
6935 ClearPageUncached(pg); 6935 ClearPageUncached(pg);
6936 ClearPageWC(pg); 6936 ClearPageWC(pg);
6937 break; 6937 break;
6938diff -urNp linux-2.6.32.23/arch/x86/include/asm/cache.h linux-2.6.32.23/arch/x86/include/asm/cache.h 6938diff -urNp linux-2.6.32.24/arch/x86/include/asm/cache.h linux-2.6.32.24/arch/x86/include/asm/cache.h
6939--- linux-2.6.32.23/arch/x86/include/asm/cache.h 2010-08-13 16:24:37.000000000 -0400 6939--- linux-2.6.32.24/arch/x86/include/asm/cache.h 2010-08-13 16:24:37.000000000 -0400
6940+++ linux-2.6.32.23/arch/x86/include/asm/cache.h 2010-09-04 15:54:51.000000000 -0400 6940+++ linux-2.6.32.24/arch/x86/include/asm/cache.h 2010-09-04 15:54:51.000000000 -0400
6941@@ -8,6 +8,7 @@ 6941@@ -8,6 +8,7 @@
6942 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) 6942 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6943 6943
@@ -6946,9 +6946,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/cache.h linux-2.6.32.23/arch/x86
6946 6946
6947 #ifdef CONFIG_X86_VSMP 6947 #ifdef CONFIG_X86_VSMP
6948 /* vSMP Internode cacheline shift */ 6948 /* vSMP Internode cacheline shift */
6949diff -urNp linux-2.6.32.23/arch/x86/include/asm/checksum_32.h linux-2.6.32.23/arch/x86/include/asm/checksum_32.h 6949diff -urNp linux-2.6.32.24/arch/x86/include/asm/checksum_32.h linux-2.6.32.24/arch/x86/include/asm/checksum_32.h
6950--- linux-2.6.32.23/arch/x86/include/asm/checksum_32.h 2010-08-13 16:24:37.000000000 -0400 6950--- linux-2.6.32.24/arch/x86/include/asm/checksum_32.h 2010-08-13 16:24:37.000000000 -0400
6951+++ linux-2.6.32.23/arch/x86/include/asm/checksum_32.h 2010-09-04 15:54:51.000000000 -0400 6951+++ linux-2.6.32.24/arch/x86/include/asm/checksum_32.h 2010-09-04 15:54:51.000000000 -0400
6952@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene 6952@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
6953 int len, __wsum sum, 6953 int len, __wsum sum,
6954 int *src_err_ptr, int *dst_err_ptr); 6954 int *src_err_ptr, int *dst_err_ptr);
@@ -6982,9 +6982,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/checksum_32.h linux-2.6.32.23/ar
6982 len, sum, NULL, err_ptr); 6982 len, sum, NULL, err_ptr);
6983 6983
6984 if (len) 6984 if (len)
6985diff -urNp linux-2.6.32.23/arch/x86/include/asm/desc.h linux-2.6.32.23/arch/x86/include/asm/desc.h 6985diff -urNp linux-2.6.32.24/arch/x86/include/asm/desc.h linux-2.6.32.24/arch/x86/include/asm/desc.h
6986--- linux-2.6.32.23/arch/x86/include/asm/desc.h 2010-08-13 16:24:37.000000000 -0400 6986--- linux-2.6.32.24/arch/x86/include/asm/desc.h 2010-08-13 16:24:37.000000000 -0400
6987+++ linux-2.6.32.23/arch/x86/include/asm/desc.h 2010-09-04 15:54:51.000000000 -0400 6987+++ linux-2.6.32.24/arch/x86/include/asm/desc.h 2010-09-04 15:54:51.000000000 -0400
6988@@ -4,6 +4,7 @@ 6988@@ -4,6 +4,7 @@
6989 #include <asm/desc_defs.h> 6989 #include <asm/desc_defs.h>
6990 #include <asm/ldt.h> 6990 #include <asm/ldt.h>
@@ -7154,9 +7154,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/desc.h linux-2.6.32.23/arch/x86/
7154+#endif 7154+#endif
7155+ 7155+
7156 #endif /* _ASM_X86_DESC_H */ 7156 #endif /* _ASM_X86_DESC_H */
7157diff -urNp linux-2.6.32.23/arch/x86/include/asm/device.h linux-2.6.32.23/arch/x86/include/asm/device.h 7157diff -urNp linux-2.6.32.24/arch/x86/include/asm/device.h linux-2.6.32.24/arch/x86/include/asm/device.h
7158--- linux-2.6.32.23/arch/x86/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400 7158--- linux-2.6.32.24/arch/x86/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
7159+++ linux-2.6.32.23/arch/x86/include/asm/device.h 2010-09-04 15:54:51.000000000 -0400 7159+++ linux-2.6.32.24/arch/x86/include/asm/device.h 2010-09-04 15:54:51.000000000 -0400
7160@@ -6,7 +6,7 @@ struct dev_archdata { 7160@@ -6,7 +6,7 @@ struct dev_archdata {
7161 void *acpi_handle; 7161 void *acpi_handle;
7162 #endif 7162 #endif
@@ -7166,9 +7166,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/device.h linux-2.6.32.23/arch/x8
7166 #endif 7166 #endif
7167 #ifdef CONFIG_DMAR 7167 #ifdef CONFIG_DMAR
7168 void *iommu; /* hook for IOMMU specific extension */ 7168 void *iommu; /* hook for IOMMU specific extension */
7169diff -urNp linux-2.6.32.23/arch/x86/include/asm/dma-mapping.h linux-2.6.32.23/arch/x86/include/asm/dma-mapping.h 7169diff -urNp linux-2.6.32.24/arch/x86/include/asm/dma-mapping.h linux-2.6.32.24/arch/x86/include/asm/dma-mapping.h
7170--- linux-2.6.32.23/arch/x86/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400 7170--- linux-2.6.32.24/arch/x86/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
7171+++ linux-2.6.32.23/arch/x86/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400 7171+++ linux-2.6.32.24/arch/x86/include/asm/dma-mapping.h 2010-09-04 15:54:51.000000000 -0400
7172@@ -25,9 +25,9 @@ extern int iommu_merge; 7172@@ -25,9 +25,9 @@ extern int iommu_merge;
7173 extern struct device x86_dma_fallback_dev; 7173 extern struct device x86_dma_fallback_dev;
7174 extern int panic_on_overflow; 7174 extern int panic_on_overflow;
@@ -7208,9 +7208,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/dma-mapping.h linux-2.6.32.23/ar
7208 7208
7209 WARN_ON(irqs_disabled()); /* for portability */ 7209 WARN_ON(irqs_disabled()); /* for portability */
7210 7210
7211diff -urNp linux-2.6.32.23/arch/x86/include/asm/e820.h linux-2.6.32.23/arch/x86/include/asm/e820.h 7211diff -urNp linux-2.6.32.24/arch/x86/include/asm/e820.h linux-2.6.32.24/arch/x86/include/asm/e820.h
7212--- linux-2.6.32.23/arch/x86/include/asm/e820.h 2010-08-13 16:24:37.000000000 -0400 7212--- linux-2.6.32.24/arch/x86/include/asm/e820.h 2010-08-13 16:24:37.000000000 -0400
7213+++ linux-2.6.32.23/arch/x86/include/asm/e820.h 2010-09-04 15:54:51.000000000 -0400 7213+++ linux-2.6.32.24/arch/x86/include/asm/e820.h 2010-09-04 15:54:51.000000000 -0400
7214@@ -133,7 +133,7 @@ extern char *default_machine_specific_me 7214@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
7215 #define ISA_END_ADDRESS 0x100000 7215 #define ISA_END_ADDRESS 0x100000
7216 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) 7216 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
@@ -7220,9 +7220,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/e820.h linux-2.6.32.23/arch/x86/
7220 #define BIOS_END 0x00100000 7220 #define BIOS_END 0x00100000
7221 7221
7222 #ifdef __KERNEL__ 7222 #ifdef __KERNEL__
7223diff -urNp linux-2.6.32.23/arch/x86/include/asm/elf.h linux-2.6.32.23/arch/x86/include/asm/elf.h 7223diff -urNp linux-2.6.32.24/arch/x86/include/asm/elf.h linux-2.6.32.24/arch/x86/include/asm/elf.h
7224--- linux-2.6.32.23/arch/x86/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400 7224--- linux-2.6.32.24/arch/x86/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
7225+++ linux-2.6.32.23/arch/x86/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400 7225+++ linux-2.6.32.24/arch/x86/include/asm/elf.h 2010-09-04 15:54:51.000000000 -0400
7226@@ -257,7 +257,25 @@ extern int force_personality32; 7226@@ -257,7 +257,25 @@ extern int force_personality32;
7227 the loader. We need to make sure that it is out of the way of the program 7227 the loader. We need to make sure that it is out of the way of the program
7228 that it will "exec", and that there is sufficient room for the brk. */ 7228 that it will "exec", and that there is sufficient room for the brk. */
@@ -7276,9 +7276,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/elf.h linux-2.6.32.23/arch/x86/i
7276-#define arch_randomize_brk arch_randomize_brk 7276-#define arch_randomize_brk arch_randomize_brk
7277- 7277-
7278 #endif /* _ASM_X86_ELF_H */ 7278 #endif /* _ASM_X86_ELF_H */
7279diff -urNp linux-2.6.32.23/arch/x86/include/asm/futex.h linux-2.6.32.23/arch/x86/include/asm/futex.h 7279diff -urNp linux-2.6.32.24/arch/x86/include/asm/futex.h linux-2.6.32.24/arch/x86/include/asm/futex.h
7280--- linux-2.6.32.23/arch/x86/include/asm/futex.h 2010-08-13 16:24:37.000000000 -0400 7280--- linux-2.6.32.24/arch/x86/include/asm/futex.h 2010-08-13 16:24:37.000000000 -0400
7281+++ linux-2.6.32.23/arch/x86/include/asm/futex.h 2010-09-04 15:54:51.000000000 -0400 7281+++ linux-2.6.32.24/arch/x86/include/asm/futex.h 2010-09-04 15:54:51.000000000 -0400
7282@@ -11,17 +11,54 @@ 7282@@ -11,17 +11,54 @@
7283 #include <asm/processor.h> 7283 #include <asm/processor.h>
7284 #include <asm/system.h> 7284 #include <asm/system.h>
@@ -7415,9 +7415,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/futex.h linux-2.6.32.23/arch/x86
7415 : "memory" 7415 : "memory"
7416 ); 7416 );
7417 7417
7418diff -urNp linux-2.6.32.23/arch/x86/include/asm/i387.h linux-2.6.32.23/arch/x86/include/asm/i387.h 7418diff -urNp linux-2.6.32.24/arch/x86/include/asm/i387.h linux-2.6.32.24/arch/x86/include/asm/i387.h
7419--- linux-2.6.32.23/arch/x86/include/asm/i387.h 2010-08-13 16:24:37.000000000 -0400 7419--- linux-2.6.32.24/arch/x86/include/asm/i387.h 2010-08-13 16:24:37.000000000 -0400
7420+++ linux-2.6.32.23/arch/x86/include/asm/i387.h 2010-09-04 15:54:51.000000000 -0400 7420+++ linux-2.6.32.24/arch/x86/include/asm/i387.h 2010-09-04 15:54:51.000000000 -0400
7421@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc 7421@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
7422 { 7422 {
7423 int err; 7423 int err;
@@ -7458,9 +7458,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/i387.h linux-2.6.32.23/arch/x86/
7458 7458
7459 /* 7459 /*
7460 * These must be called with preempt disabled 7460 * These must be called with preempt disabled
7461diff -urNp linux-2.6.32.23/arch/x86/include/asm/io_64.h linux-2.6.32.23/arch/x86/include/asm/io_64.h 7461diff -urNp linux-2.6.32.24/arch/x86/include/asm/io_64.h linux-2.6.32.24/arch/x86/include/asm/io_64.h
7462--- linux-2.6.32.23/arch/x86/include/asm/io_64.h 2010-08-13 16:24:37.000000000 -0400 7462--- linux-2.6.32.24/arch/x86/include/asm/io_64.h 2010-08-13 16:24:37.000000000 -0400
7463+++ linux-2.6.32.23/arch/x86/include/asm/io_64.h 2010-09-04 15:54:51.000000000 -0400 7463+++ linux-2.6.32.24/arch/x86/include/asm/io_64.h 2010-09-04 15:54:51.000000000 -0400
7464@@ -140,6 +140,17 @@ __OUTS(l) 7464@@ -140,6 +140,17 @@ __OUTS(l)
7465 7465
7466 #include <linux/vmalloc.h> 7466 #include <linux/vmalloc.h>
@@ -7479,9 +7479,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/io_64.h linux-2.6.32.23/arch/x86
7479 #include <asm-generic/iomap.h> 7479 #include <asm-generic/iomap.h>
7480 7480
7481 void __memcpy_fromio(void *, unsigned long, unsigned); 7481 void __memcpy_fromio(void *, unsigned long, unsigned);
7482diff -urNp linux-2.6.32.23/arch/x86/include/asm/iommu.h linux-2.6.32.23/arch/x86/include/asm/iommu.h 7482diff -urNp linux-2.6.32.24/arch/x86/include/asm/iommu.h linux-2.6.32.24/arch/x86/include/asm/iommu.h
7483--- linux-2.6.32.23/arch/x86/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400 7483--- linux-2.6.32.24/arch/x86/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
7484+++ linux-2.6.32.23/arch/x86/include/asm/iommu.h 2010-09-04 15:54:51.000000000 -0400 7484+++ linux-2.6.32.24/arch/x86/include/asm/iommu.h 2010-09-04 15:54:51.000000000 -0400
7485@@ -3,7 +3,7 @@ 7485@@ -3,7 +3,7 @@
7486 7486
7487 extern void pci_iommu_shutdown(void); 7487 extern void pci_iommu_shutdown(void);
@@ -7491,9 +7491,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/iommu.h linux-2.6.32.23/arch/x86
7491 extern int force_iommu, no_iommu; 7491 extern int force_iommu, no_iommu;
7492 extern int iommu_detected; 7492 extern int iommu_detected;
7493 extern int iommu_pass_through; 7493 extern int iommu_pass_through;
7494diff -urNp linux-2.6.32.23/arch/x86/include/asm/irqflags.h linux-2.6.32.23/arch/x86/include/asm/irqflags.h 7494diff -urNp linux-2.6.32.24/arch/x86/include/asm/irqflags.h linux-2.6.32.24/arch/x86/include/asm/irqflags.h
7495--- linux-2.6.32.23/arch/x86/include/asm/irqflags.h 2010-08-13 16:24:37.000000000 -0400 7495--- linux-2.6.32.24/arch/x86/include/asm/irqflags.h 2010-08-13 16:24:37.000000000 -0400
7496+++ linux-2.6.32.23/arch/x86/include/asm/irqflags.h 2010-09-04 15:54:51.000000000 -0400 7496+++ linux-2.6.32.24/arch/x86/include/asm/irqflags.h 2010-09-04 15:54:51.000000000 -0400
7497@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ 7497@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
7498 sti; \ 7498 sti; \
7499 sysexit 7499 sysexit
@@ -7506,9 +7506,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/irqflags.h linux-2.6.32.23/arch/
7506 #else 7506 #else
7507 #define INTERRUPT_RETURN iret 7507 #define INTERRUPT_RETURN iret
7508 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit 7508 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
7509diff -urNp linux-2.6.32.23/arch/x86/include/asm/kvm_host.h linux-2.6.32.23/arch/x86/include/asm/kvm_host.h 7509diff -urNp linux-2.6.32.24/arch/x86/include/asm/kvm_host.h linux-2.6.32.24/arch/x86/include/asm/kvm_host.h
7510--- linux-2.6.32.23/arch/x86/include/asm/kvm_host.h 2010-08-13 16:24:37.000000000 -0400 7510--- linux-2.6.32.24/arch/x86/include/asm/kvm_host.h 2010-08-13 16:24:37.000000000 -0400
7511+++ linux-2.6.32.23/arch/x86/include/asm/kvm_host.h 2010-09-04 15:54:51.000000000 -0400 7511+++ linux-2.6.32.24/arch/x86/include/asm/kvm_host.h 2010-09-04 15:54:51.000000000 -0400
7512@@ -533,7 +533,7 @@ struct kvm_x86_ops { 7512@@ -533,7 +533,7 @@ struct kvm_x86_ops {
7513 const struct trace_print_flags *exit_reasons_str; 7513 const struct trace_print_flags *exit_reasons_str;
7514 }; 7514 };
@@ -7518,9 +7518,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/kvm_host.h linux-2.6.32.23/arch/
7518 7518
7519 int kvm_mmu_module_init(void); 7519 int kvm_mmu_module_init(void);
7520 void kvm_mmu_module_exit(void); 7520 void kvm_mmu_module_exit(void);
7521diff -urNp linux-2.6.32.23/arch/x86/include/asm/local.h linux-2.6.32.23/arch/x86/include/asm/local.h 7521diff -urNp linux-2.6.32.24/arch/x86/include/asm/local.h linux-2.6.32.24/arch/x86/include/asm/local.h
7522--- linux-2.6.32.23/arch/x86/include/asm/local.h 2010-08-13 16:24:37.000000000 -0400 7522--- linux-2.6.32.24/arch/x86/include/asm/local.h 2010-08-13 16:24:37.000000000 -0400
7523+++ linux-2.6.32.23/arch/x86/include/asm/local.h 2010-09-04 15:54:51.000000000 -0400 7523+++ linux-2.6.32.24/arch/x86/include/asm/local.h 2010-09-04 15:54:51.000000000 -0400
7524@@ -18,26 +18,90 @@ typedef struct { 7524@@ -18,26 +18,90 @@ typedef struct {
7525 7525
7526 static inline void local_inc(local_t *l) 7526 static inline void local_inc(local_t *l)
@@ -7745,9 +7745,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/local.h linux-2.6.32.23/arch/x86
7745 : "+r" (i), "+m" (l->a.counter) 7745 : "+r" (i), "+m" (l->a.counter)
7746 : : "memory"); 7746 : : "memory");
7747 return i + __i; 7747 return i + __i;
7748diff -urNp linux-2.6.32.23/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.23/arch/x86/include/asm/mc146818rtc.h 7748diff -urNp linux-2.6.32.24/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.24/arch/x86/include/asm/mc146818rtc.h
7749--- linux-2.6.32.23/arch/x86/include/asm/mc146818rtc.h 2010-08-13 16:24:37.000000000 -0400 7749--- linux-2.6.32.24/arch/x86/include/asm/mc146818rtc.h 2010-08-13 16:24:37.000000000 -0400
7750+++ linux-2.6.32.23/arch/x86/include/asm/mc146818rtc.h 2010-09-04 15:54:51.000000000 -0400 7750+++ linux-2.6.32.24/arch/x86/include/asm/mc146818rtc.h 2010-09-04 15:54:51.000000000 -0400
7751@@ -81,8 +81,8 @@ static inline unsigned char current_lock 7751@@ -81,8 +81,8 @@ static inline unsigned char current_lock
7752 #else 7752 #else
7753 #define lock_cmos_prefix(reg) do {} while (0) 7753 #define lock_cmos_prefix(reg) do {} while (0)
@@ -7759,9 +7759,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.23/ar
7759 #define do_i_have_lock_cmos() 0 7759 #define do_i_have_lock_cmos() 0
7760 #define current_lock_cmos_reg() 0 7760 #define current_lock_cmos_reg() 0
7761 #endif 7761 #endif
7762diff -urNp linux-2.6.32.23/arch/x86/include/asm/microcode.h linux-2.6.32.23/arch/x86/include/asm/microcode.h 7762diff -urNp linux-2.6.32.24/arch/x86/include/asm/microcode.h linux-2.6.32.24/arch/x86/include/asm/microcode.h
7763--- linux-2.6.32.23/arch/x86/include/asm/microcode.h 2010-08-13 16:24:37.000000000 -0400 7763--- linux-2.6.32.24/arch/x86/include/asm/microcode.h 2010-08-13 16:24:37.000000000 -0400
7764+++ linux-2.6.32.23/arch/x86/include/asm/microcode.h 2010-09-04 15:54:51.000000000 -0400 7764+++ linux-2.6.32.24/arch/x86/include/asm/microcode.h 2010-09-04 15:54:51.000000000 -0400
7765@@ -12,13 +12,13 @@ struct device; 7765@@ -12,13 +12,13 @@ struct device;
7766 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; 7766 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
7767 7767
@@ -7802,9 +7802,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/microcode.h linux-2.6.32.23/arch
7802 { 7802 {
7803 return NULL; 7803 return NULL;
7804 } 7804 }
7805diff -urNp linux-2.6.32.23/arch/x86/include/asm/mman.h linux-2.6.32.23/arch/x86/include/asm/mman.h 7805diff -urNp linux-2.6.32.24/arch/x86/include/asm/mman.h linux-2.6.32.24/arch/x86/include/asm/mman.h
7806--- linux-2.6.32.23/arch/x86/include/asm/mman.h 2010-08-13 16:24:37.000000000 -0400 7806--- linux-2.6.32.24/arch/x86/include/asm/mman.h 2010-08-13 16:24:37.000000000 -0400
7807+++ linux-2.6.32.23/arch/x86/include/asm/mman.h 2010-09-04 15:54:51.000000000 -0400 7807+++ linux-2.6.32.24/arch/x86/include/asm/mman.h 2010-09-04 15:54:51.000000000 -0400
7808@@ -5,4 +5,14 @@ 7808@@ -5,4 +5,14 @@
7809 7809
7810 #include <asm-generic/mman.h> 7810 #include <asm-generic/mman.h>
@@ -7820,9 +7820,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/mman.h linux-2.6.32.23/arch/x86/
7820+#endif 7820+#endif
7821+ 7821+
7822 #endif /* _ASM_X86_MMAN_H */ 7822 #endif /* _ASM_X86_MMAN_H */
7823diff -urNp linux-2.6.32.23/arch/x86/include/asm/mmu_context.h linux-2.6.32.23/arch/x86/include/asm/mmu_context.h 7823diff -urNp linux-2.6.32.24/arch/x86/include/asm/mmu_context.h linux-2.6.32.24/arch/x86/include/asm/mmu_context.h
7824--- linux-2.6.32.23/arch/x86/include/asm/mmu_context.h 2010-08-13 16:24:37.000000000 -0400 7824--- linux-2.6.32.24/arch/x86/include/asm/mmu_context.h 2010-08-13 16:24:37.000000000 -0400
7825+++ linux-2.6.32.23/arch/x86/include/asm/mmu_context.h 2010-09-04 15:54:51.000000000 -0400 7825+++ linux-2.6.32.24/arch/x86/include/asm/mmu_context.h 2010-09-04 15:54:51.000000000 -0400
7826@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m 7826@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
7827 7827
7828 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) 7828 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -7947,9 +7947,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/mmu_context.h linux-2.6.32.23/ar
7947 } 7947 }
7948 7948
7949 #define activate_mm(prev, next) \ 7949 #define activate_mm(prev, next) \
7950diff -urNp linux-2.6.32.23/arch/x86/include/asm/mmu.h linux-2.6.32.23/arch/x86/include/asm/mmu.h 7950diff -urNp linux-2.6.32.24/arch/x86/include/asm/mmu.h linux-2.6.32.24/arch/x86/include/asm/mmu.h
7951--- linux-2.6.32.23/arch/x86/include/asm/mmu.h 2010-08-13 16:24:37.000000000 -0400 7951--- linux-2.6.32.24/arch/x86/include/asm/mmu.h 2010-08-13 16:24:37.000000000 -0400
7952+++ linux-2.6.32.23/arch/x86/include/asm/mmu.h 2010-09-04 15:54:51.000000000 -0400 7952+++ linux-2.6.32.24/arch/x86/include/asm/mmu.h 2010-09-04 15:54:51.000000000 -0400
7953@@ -9,10 +9,23 @@ 7953@@ -9,10 +9,23 @@
7954 * we put the segment information here. 7954 * we put the segment information here.
7955 */ 7955 */
@@ -7976,9 +7976,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/mmu.h linux-2.6.32.23/arch/x86/i
7976 } mm_context_t; 7976 } mm_context_t;
7977 7977
7978 #ifdef CONFIG_SMP 7978 #ifdef CONFIG_SMP
7979diff -urNp linux-2.6.32.23/arch/x86/include/asm/module.h linux-2.6.32.23/arch/x86/include/asm/module.h 7979diff -urNp linux-2.6.32.24/arch/x86/include/asm/module.h linux-2.6.32.24/arch/x86/include/asm/module.h
7980--- linux-2.6.32.23/arch/x86/include/asm/module.h 2010-08-13 16:24:37.000000000 -0400 7980--- linux-2.6.32.24/arch/x86/include/asm/module.h 2010-08-13 16:24:37.000000000 -0400
7981+++ linux-2.6.32.23/arch/x86/include/asm/module.h 2010-09-04 15:54:51.000000000 -0400 7981+++ linux-2.6.32.24/arch/x86/include/asm/module.h 2010-09-04 15:54:51.000000000 -0400
7982@@ -59,13 +59,31 @@ 7982@@ -59,13 +59,31 @@
7983 #error unknown processor family 7983 #error unknown processor family
7984 #endif 7984 #endif
@@ -8012,9 +8012,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/module.h linux-2.6.32.23/arch/x8
8012 #endif 8012 #endif
8013 8013
8014 #endif /* _ASM_X86_MODULE_H */ 8014 #endif /* _ASM_X86_MODULE_H */
8015diff -urNp linux-2.6.32.23/arch/x86/include/asm/page_32_types.h linux-2.6.32.23/arch/x86/include/asm/page_32_types.h 8015diff -urNp linux-2.6.32.24/arch/x86/include/asm/page_32_types.h linux-2.6.32.24/arch/x86/include/asm/page_32_types.h
8016--- linux-2.6.32.23/arch/x86/include/asm/page_32_types.h 2010-08-13 16:24:37.000000000 -0400 8016--- linux-2.6.32.24/arch/x86/include/asm/page_32_types.h 2010-08-13 16:24:37.000000000 -0400
8017+++ linux-2.6.32.23/arch/x86/include/asm/page_32_types.h 2010-09-04 15:54:51.000000000 -0400 8017+++ linux-2.6.32.24/arch/x86/include/asm/page_32_types.h 2010-09-04 15:54:51.000000000 -0400
8018@@ -15,6 +15,10 @@ 8018@@ -15,6 +15,10 @@
8019 */ 8019 */
8020 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) 8020 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
@@ -8026,9 +8026,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/page_32_types.h linux-2.6.32.23/
8026 #ifdef CONFIG_4KSTACKS 8026 #ifdef CONFIG_4KSTACKS
8027 #define THREAD_ORDER 0 8027 #define THREAD_ORDER 0
8028 #else 8028 #else
8029diff -urNp linux-2.6.32.23/arch/x86/include/asm/paravirt.h linux-2.6.32.23/arch/x86/include/asm/paravirt.h 8029diff -urNp linux-2.6.32.24/arch/x86/include/asm/paravirt.h linux-2.6.32.24/arch/x86/include/asm/paravirt.h
8030--- linux-2.6.32.23/arch/x86/include/asm/paravirt.h 2010-08-13 16:24:37.000000000 -0400 8030--- linux-2.6.32.24/arch/x86/include/asm/paravirt.h 2010-08-13 16:24:37.000000000 -0400
8031+++ linux-2.6.32.23/arch/x86/include/asm/paravirt.h 2010-09-04 15:54:51.000000000 -0400 8031+++ linux-2.6.32.24/arch/x86/include/asm/paravirt.h 2010-09-04 15:54:51.000000000 -0400
8032@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned 8032@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
8033 pv_mmu_ops.set_fixmap(idx, phys, flags); 8033 pv_mmu_ops.set_fixmap(idx, phys, flags);
8034 } 8034 }
@@ -8082,9 +8082,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/paravirt.h linux-2.6.32.23/arch/
8082 #endif /* CONFIG_X86_32 */ 8082 #endif /* CONFIG_X86_32 */
8083 8083
8084 #endif /* __ASSEMBLY__ */ 8084 #endif /* __ASSEMBLY__ */
8085diff -urNp linux-2.6.32.23/arch/x86/include/asm/paravirt_types.h linux-2.6.32.23/arch/x86/include/asm/paravirt_types.h 8085diff -urNp linux-2.6.32.24/arch/x86/include/asm/paravirt_types.h linux-2.6.32.24/arch/x86/include/asm/paravirt_types.h
8086--- linux-2.6.32.23/arch/x86/include/asm/paravirt_types.h 2010-08-13 16:24:37.000000000 -0400 8086--- linux-2.6.32.24/arch/x86/include/asm/paravirt_types.h 2010-08-13 16:24:37.000000000 -0400
8087+++ linux-2.6.32.23/arch/x86/include/asm/paravirt_types.h 2010-09-04 15:54:51.000000000 -0400 8087+++ linux-2.6.32.24/arch/x86/include/asm/paravirt_types.h 2010-09-04 15:54:51.000000000 -0400
8088@@ -316,6 +316,12 @@ struct pv_mmu_ops { 8088@@ -316,6 +316,12 @@ struct pv_mmu_ops {
8089 an mfn. We can tell which is which from the index. */ 8089 an mfn. We can tell which is which from the index. */
8090 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, 8090 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
@@ -8098,9 +8098,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/paravirt_types.h linux-2.6.32.23
8098 }; 8098 };
8099 8099
8100 struct raw_spinlock; 8100 struct raw_spinlock;
8101diff -urNp linux-2.6.32.23/arch/x86/include/asm/pci_x86.h linux-2.6.32.23/arch/x86/include/asm/pci_x86.h 8101diff -urNp linux-2.6.32.24/arch/x86/include/asm/pci_x86.h linux-2.6.32.24/arch/x86/include/asm/pci_x86.h
8102--- linux-2.6.32.23/arch/x86/include/asm/pci_x86.h 2010-08-13 16:24:37.000000000 -0400 8102--- linux-2.6.32.24/arch/x86/include/asm/pci_x86.h 2010-08-13 16:24:37.000000000 -0400
8103+++ linux-2.6.32.23/arch/x86/include/asm/pci_x86.h 2010-09-04 15:54:51.000000000 -0400 8103+++ linux-2.6.32.24/arch/x86/include/asm/pci_x86.h 2010-09-04 15:54:51.000000000 -0400
8104@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct 8104@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
8105 extern void (*pcibios_disable_irq)(struct pci_dev *dev); 8105 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
8106 8106
@@ -8123,9 +8123,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/pci_x86.h linux-2.6.32.23/arch/x
8123 extern bool port_cf9_safe; 8123 extern bool port_cf9_safe;
8124 8124
8125 /* arch_initcall level */ 8125 /* arch_initcall level */
8126diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgalloc.h linux-2.6.32.23/arch/x86/include/asm/pgalloc.h 8126diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgalloc.h linux-2.6.32.24/arch/x86/include/asm/pgalloc.h
8127--- linux-2.6.32.23/arch/x86/include/asm/pgalloc.h 2010-08-13 16:24:37.000000000 -0400 8127--- linux-2.6.32.24/arch/x86/include/asm/pgalloc.h 2010-08-13 16:24:37.000000000 -0400
8128+++ linux-2.6.32.23/arch/x86/include/asm/pgalloc.h 2010-09-04 15:54:51.000000000 -0400 8128+++ linux-2.6.32.24/arch/x86/include/asm/pgalloc.h 2010-09-04 15:54:51.000000000 -0400
8129@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s 8129@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
8130 pmd_t *pmd, pte_t *pte) 8130 pmd_t *pmd, pte_t *pte)
8131 { 8131 {
@@ -8140,9 +8140,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgalloc.h linux-2.6.32.23/arch/x
8140 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); 8140 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
8141 } 8141 }
8142 8142
8143diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.23/arch/x86/include/asm/pgtable-2level.h 8143diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.24/arch/x86/include/asm/pgtable-2level.h
8144--- linux-2.6.32.23/arch/x86/include/asm/pgtable-2level.h 2010-08-13 16:24:37.000000000 -0400 8144--- linux-2.6.32.24/arch/x86/include/asm/pgtable-2level.h 2010-08-13 16:24:37.000000000 -0400
8145+++ linux-2.6.32.23/arch/x86/include/asm/pgtable-2level.h 2010-09-04 15:54:51.000000000 -0400 8145+++ linux-2.6.32.24/arch/x86/include/asm/pgtable-2level.h 2010-09-04 15:54:51.000000000 -0400
8146@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 8146@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
8147 8147
8148 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 8148 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8153,9 +8153,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.23
8153 } 8153 }
8154 8154
8155 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) 8155 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
8156diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable_32.h linux-2.6.32.23/arch/x86/include/asm/pgtable_32.h 8156diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_32.h linux-2.6.32.24/arch/x86/include/asm/pgtable_32.h
8157--- linux-2.6.32.23/arch/x86/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400 8157--- linux-2.6.32.24/arch/x86/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
8158+++ linux-2.6.32.23/arch/x86/include/asm/pgtable_32.h 2010-09-04 15:54:51.000000000 -0400 8158+++ linux-2.6.32.24/arch/x86/include/asm/pgtable_32.h 2010-09-04 15:54:51.000000000 -0400
8159@@ -26,8 +26,6 @@ 8159@@ -26,8 +26,6 @@
8160 struct mm_struct; 8160 struct mm_struct;
8161 struct vm_area_struct; 8161 struct vm_area_struct;
@@ -8197,9 +8197,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable_32.h linux-2.6.32.23/arc
8197 /* 8197 /*
8198 * kern_addr_valid() is (1) for FLATMEM and (0) for 8198 * kern_addr_valid() is (1) for FLATMEM and (0) for
8199 * SPARSEMEM and DISCONTIGMEM 8199 * SPARSEMEM and DISCONTIGMEM
8200diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.23/arch/x86/include/asm/pgtable_32_types.h 8200diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.24/arch/x86/include/asm/pgtable_32_types.h
8201--- linux-2.6.32.23/arch/x86/include/asm/pgtable_32_types.h 2010-08-13 16:24:37.000000000 -0400 8201--- linux-2.6.32.24/arch/x86/include/asm/pgtable_32_types.h 2010-08-13 16:24:37.000000000 -0400
8202+++ linux-2.6.32.23/arch/x86/include/asm/pgtable_32_types.h 2010-09-04 15:54:51.000000000 -0400 8202+++ linux-2.6.32.24/arch/x86/include/asm/pgtable_32_types.h 2010-09-04 15:54:51.000000000 -0400
8203@@ -8,7 +8,7 @@ 8203@@ -8,7 +8,7 @@
8204 */ 8204 */
8205 #ifdef CONFIG_X86_PAE 8205 #ifdef CONFIG_X86_PAE
@@ -8229,9 +8229,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.
8229 #define MODULES_VADDR VMALLOC_START 8229 #define MODULES_VADDR VMALLOC_START
8230 #define MODULES_END VMALLOC_END 8230 #define MODULES_END VMALLOC_END
8231 #define MODULES_LEN (MODULES_VADDR - MODULES_END) 8231 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
8232diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.23/arch/x86/include/asm/pgtable-3level.h 8232diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.24/arch/x86/include/asm/pgtable-3level.h
8233--- linux-2.6.32.23/arch/x86/include/asm/pgtable-3level.h 2010-08-13 16:24:37.000000000 -0400 8233--- linux-2.6.32.24/arch/x86/include/asm/pgtable-3level.h 2010-08-13 16:24:37.000000000 -0400
8234+++ linux-2.6.32.23/arch/x86/include/asm/pgtable-3level.h 2010-09-04 15:54:51.000000000 -0400 8234+++ linux-2.6.32.24/arch/x86/include/asm/pgtable-3level.h 2010-09-04 15:54:51.000000000 -0400
8235@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic 8235@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
8236 8236
8237 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 8237 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8249,9 +8249,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.23
8249 } 8249 }
8250 8250
8251 /* 8251 /*
8252diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable_64.h linux-2.6.32.23/arch/x86/include/asm/pgtable_64.h 8252diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_64.h linux-2.6.32.24/arch/x86/include/asm/pgtable_64.h
8253--- linux-2.6.32.23/arch/x86/include/asm/pgtable_64.h 2010-08-13 16:24:37.000000000 -0400 8253--- linux-2.6.32.24/arch/x86/include/asm/pgtable_64.h 2010-08-13 16:24:37.000000000 -0400
8254+++ linux-2.6.32.23/arch/x86/include/asm/pgtable_64.h 2010-09-04 15:54:51.000000000 -0400 8254+++ linux-2.6.32.24/arch/x86/include/asm/pgtable_64.h 2010-09-04 15:54:51.000000000 -0400
8255@@ -16,10 +16,13 @@ 8255@@ -16,10 +16,13 @@
8256 8256
8257 extern pud_t level3_kernel_pgt[512]; 8257 extern pud_t level3_kernel_pgt[512];
@@ -8288,9 +8288,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable_64.h linux-2.6.32.23/arc
8288 } 8288 }
8289 8289
8290 static inline void native_pgd_clear(pgd_t *pgd) 8290 static inline void native_pgd_clear(pgd_t *pgd)
8291diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.23/arch/x86/include/asm/pgtable_64_types.h 8291diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.24/arch/x86/include/asm/pgtable_64_types.h
8292--- linux-2.6.32.23/arch/x86/include/asm/pgtable_64_types.h 2010-08-13 16:24:37.000000000 -0400 8292--- linux-2.6.32.24/arch/x86/include/asm/pgtable_64_types.h 2010-08-13 16:24:37.000000000 -0400
8293+++ linux-2.6.32.23/arch/x86/include/asm/pgtable_64_types.h 2010-09-04 15:54:51.000000000 -0400 8293+++ linux-2.6.32.24/arch/x86/include/asm/pgtable_64_types.h 2010-09-04 15:54:51.000000000 -0400
8294@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t; 8294@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
8295 #define MODULES_VADDR _AC(0xffffffffa0000000, UL) 8295 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
8296 #define MODULES_END _AC(0xffffffffff000000, UL) 8296 #define MODULES_END _AC(0xffffffffff000000, UL)
@@ -8302,9 +8302,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.
8302+#define ktva_ktla(addr) (addr) 8302+#define ktva_ktla(addr) (addr)
8303 8303
8304 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ 8304 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
8305diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable.h linux-2.6.32.23/arch/x86/include/asm/pgtable.h 8305diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable.h linux-2.6.32.24/arch/x86/include/asm/pgtable.h
8306--- linux-2.6.32.23/arch/x86/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400 8306--- linux-2.6.32.24/arch/x86/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
8307+++ linux-2.6.32.23/arch/x86/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400 8307+++ linux-2.6.32.24/arch/x86/include/asm/pgtable.h 2010-09-04 15:54:51.000000000 -0400
8308@@ -74,12 +74,51 @@ extern struct list_head pgd_list; 8308@@ -74,12 +74,51 @@ extern struct list_head pgd_list;
8309 8309
8310 #define arch_end_context_switch(prev) do {} while(0) 8310 #define arch_end_context_switch(prev) do {} while(0)
@@ -8474,9 +8474,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable.h linux-2.6.32.23/arch/x
8474 8474
8475 #include <asm-generic/pgtable.h> 8475 #include <asm-generic/pgtable.h>
8476 #endif /* __ASSEMBLY__ */ 8476 #endif /* __ASSEMBLY__ */
8477diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable_types.h linux-2.6.32.23/arch/x86/include/asm/pgtable_types.h 8477diff -urNp linux-2.6.32.24/arch/x86/include/asm/pgtable_types.h linux-2.6.32.24/arch/x86/include/asm/pgtable_types.h
8478--- linux-2.6.32.23/arch/x86/include/asm/pgtable_types.h 2010-08-13 16:24:37.000000000 -0400 8478--- linux-2.6.32.24/arch/x86/include/asm/pgtable_types.h 2010-08-13 16:24:37.000000000 -0400
8479+++ linux-2.6.32.23/arch/x86/include/asm/pgtable_types.h 2010-09-04 15:54:51.000000000 -0400 8479+++ linux-2.6.32.24/arch/x86/include/asm/pgtable_types.h 2010-09-04 15:54:51.000000000 -0400
8480@@ -16,12 +16,11 @@ 8480@@ -16,12 +16,11 @@
8481 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ 8481 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
8482 #define _PAGE_BIT_PAT 7 /* on 4KB pages */ 8482 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -8597,9 +8597,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/pgtable_types.h linux-2.6.32.23/
8597 8597
8598 #define pgprot_writecombine pgprot_writecombine 8598 #define pgprot_writecombine pgprot_writecombine
8599 extern pgprot_t pgprot_writecombine(pgprot_t prot); 8599 extern pgprot_t pgprot_writecombine(pgprot_t prot);
8600diff -urNp linux-2.6.32.23/arch/x86/include/asm/processor.h linux-2.6.32.23/arch/x86/include/asm/processor.h 8600diff -urNp linux-2.6.32.24/arch/x86/include/asm/processor.h linux-2.6.32.24/arch/x86/include/asm/processor.h
8601--- linux-2.6.32.23/arch/x86/include/asm/processor.h 2010-08-13 16:24:37.000000000 -0400 8601--- linux-2.6.32.24/arch/x86/include/asm/processor.h 2010-08-13 16:24:37.000000000 -0400
8602+++ linux-2.6.32.23/arch/x86/include/asm/processor.h 2010-09-04 15:54:51.000000000 -0400 8602+++ linux-2.6.32.24/arch/x86/include/asm/processor.h 2010-09-04 15:54:51.000000000 -0400
8603@@ -272,7 +272,7 @@ struct tss_struct { 8603@@ -272,7 +272,7 @@ struct tss_struct {
8604 8604
8605 } ____cacheline_aligned; 8605 } ____cacheline_aligned;
@@ -8684,9 +8684,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/processor.h linux-2.6.32.23/arch
8684 #define KSTK_EIP(task) (task_pt_regs(task)->ip) 8684 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
8685 8685
8686 /* Get/set a process' ability to use the timestamp counter instruction */ 8686 /* Get/set a process' ability to use the timestamp counter instruction */
8687diff -urNp linux-2.6.32.23/arch/x86/include/asm/ptrace.h linux-2.6.32.23/arch/x86/include/asm/ptrace.h 8687diff -urNp linux-2.6.32.24/arch/x86/include/asm/ptrace.h linux-2.6.32.24/arch/x86/include/asm/ptrace.h
8688--- linux-2.6.32.23/arch/x86/include/asm/ptrace.h 2010-08-13 16:24:37.000000000 -0400 8688--- linux-2.6.32.24/arch/x86/include/asm/ptrace.h 2010-08-13 16:24:37.000000000 -0400
8689+++ linux-2.6.32.23/arch/x86/include/asm/ptrace.h 2010-09-04 15:54:51.000000000 -0400 8689+++ linux-2.6.32.24/arch/x86/include/asm/ptrace.h 2010-09-04 15:54:51.000000000 -0400
8690@@ -151,28 +151,29 @@ static inline unsigned long regs_return_ 8690@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
8691 } 8691 }
8692 8692
@@ -8723,9 +8723,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/ptrace.h linux-2.6.32.23/arch/x8
8723 #endif 8723 #endif
8724 } 8724 }
8725 8725
8726diff -urNp linux-2.6.32.23/arch/x86/include/asm/reboot.h linux-2.6.32.23/arch/x86/include/asm/reboot.h 8726diff -urNp linux-2.6.32.24/arch/x86/include/asm/reboot.h linux-2.6.32.24/arch/x86/include/asm/reboot.h
8727--- linux-2.6.32.23/arch/x86/include/asm/reboot.h 2010-08-13 16:24:37.000000000 -0400 8727--- linux-2.6.32.24/arch/x86/include/asm/reboot.h 2010-08-13 16:24:37.000000000 -0400
8728+++ linux-2.6.32.23/arch/x86/include/asm/reboot.h 2010-09-04 15:54:51.000000000 -0400 8728+++ linux-2.6.32.24/arch/x86/include/asm/reboot.h 2010-09-04 15:54:51.000000000 -0400
8729@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; 8729@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
8730 8730
8731 void native_machine_crash_shutdown(struct pt_regs *regs); 8731 void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -8735,9 +8735,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/reboot.h linux-2.6.32.23/arch/x8
8735 8735
8736 typedef void (*nmi_shootdown_cb)(int, struct die_args*); 8736 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
8737 void nmi_shootdown_cpus(nmi_shootdown_cb callback); 8737 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
8738diff -urNp linux-2.6.32.23/arch/x86/include/asm/rwsem.h linux-2.6.32.23/arch/x86/include/asm/rwsem.h 8738diff -urNp linux-2.6.32.24/arch/x86/include/asm/rwsem.h linux-2.6.32.24/arch/x86/include/asm/rwsem.h
8739--- linux-2.6.32.23/arch/x86/include/asm/rwsem.h 2010-08-13 16:24:37.000000000 -0400 8739--- linux-2.6.32.24/arch/x86/include/asm/rwsem.h 2010-08-13 16:24:37.000000000 -0400
8740+++ linux-2.6.32.23/arch/x86/include/asm/rwsem.h 2010-09-04 15:54:51.000000000 -0400 8740+++ linux-2.6.32.24/arch/x86/include/asm/rwsem.h 2010-09-04 15:54:51.000000000 -0400
8741@@ -118,10 +118,26 @@ static inline void __down_read(struct rw 8741@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
8742 { 8742 {
8743 asm volatile("# beginning down_read\n\t" 8743 asm volatile("# beginning down_read\n\t"
@@ -8973,9 +8973,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/rwsem.h linux-2.6.32.23/arch/x86
8973 : "+r" (tmp), "+m" (sem->count) 8973 : "+r" (tmp), "+m" (sem->count)
8974 : : "memory"); 8974 : : "memory");
8975 8975
8976diff -urNp linux-2.6.32.23/arch/x86/include/asm/segment.h linux-2.6.32.23/arch/x86/include/asm/segment.h 8976diff -urNp linux-2.6.32.24/arch/x86/include/asm/segment.h linux-2.6.32.24/arch/x86/include/asm/segment.h
8977--- linux-2.6.32.23/arch/x86/include/asm/segment.h 2010-08-13 16:24:37.000000000 -0400 8977--- linux-2.6.32.24/arch/x86/include/asm/segment.h 2010-08-13 16:24:37.000000000 -0400
8978+++ linux-2.6.32.23/arch/x86/include/asm/segment.h 2010-09-04 15:54:51.000000000 -0400 8978+++ linux-2.6.32.24/arch/x86/include/asm/segment.h 2010-09-04 15:54:51.000000000 -0400
8979@@ -62,8 +62,8 @@ 8979@@ -62,8 +62,8 @@
8980 * 26 - ESPFIX small SS 8980 * 26 - ESPFIX small SS
8981 * 27 - per-cpu [ offset to per-cpu data area ] 8981 * 27 - per-cpu [ offset to per-cpu data area ]
@@ -9044,9 +9044,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/segment.h linux-2.6.32.23/arch/x
9044 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) 9044 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
9045 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) 9045 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
9046 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) 9046 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
9047diff -urNp linux-2.6.32.23/arch/x86/include/asm/spinlock.h linux-2.6.32.23/arch/x86/include/asm/spinlock.h 9047diff -urNp linux-2.6.32.24/arch/x86/include/asm/spinlock.h linux-2.6.32.24/arch/x86/include/asm/spinlock.h
9048--- linux-2.6.32.23/arch/x86/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400 9048--- linux-2.6.32.24/arch/x86/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
9049+++ linux-2.6.32.23/arch/x86/include/asm/spinlock.h 2010-09-04 15:54:51.000000000 -0400 9049+++ linux-2.6.32.24/arch/x86/include/asm/spinlock.h 2010-09-04 15:54:51.000000000 -0400
9050@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r 9050@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r
9051 static inline void __raw_read_lock(raw_rwlock_t *rw) 9051 static inline void __raw_read_lock(raw_rwlock_t *rw)
9052 { 9052 {
@@ -9150,9 +9150,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/spinlock.h linux-2.6.32.23/arch/
9150 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); 9150 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
9151 } 9151 }
9152 9152
9153diff -urNp linux-2.6.32.23/arch/x86/include/asm/system.h linux-2.6.32.23/arch/x86/include/asm/system.h 9153diff -urNp linux-2.6.32.24/arch/x86/include/asm/system.h linux-2.6.32.24/arch/x86/include/asm/system.h
9154--- linux-2.6.32.23/arch/x86/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400 9154--- linux-2.6.32.24/arch/x86/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
9155+++ linux-2.6.32.23/arch/x86/include/asm/system.h 2010-09-04 15:54:51.000000000 -0400 9155+++ linux-2.6.32.24/arch/x86/include/asm/system.h 2010-09-04 15:54:51.000000000 -0400
9156@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un 9156@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
9157 { 9157 {
9158 unsigned long __limit; 9158 unsigned long __limit;
@@ -9171,9 +9171,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/system.h linux-2.6.32.23/arch/x8
9171 extern void free_init_pages(char *what, unsigned long begin, unsigned long end); 9171 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
9172 9172
9173 void default_idle(void); 9173 void default_idle(void);
9174diff -urNp linux-2.6.32.23/arch/x86/include/asm/uaccess_32.h linux-2.6.32.23/arch/x86/include/asm/uaccess_32.h 9174diff -urNp linux-2.6.32.24/arch/x86/include/asm/uaccess_32.h linux-2.6.32.24/arch/x86/include/asm/uaccess_32.h
9175--- linux-2.6.32.23/arch/x86/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400 9175--- linux-2.6.32.24/arch/x86/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
9176+++ linux-2.6.32.23/arch/x86/include/asm/uaccess_32.h 2010-09-04 15:54:51.000000000 -0400 9176+++ linux-2.6.32.24/arch/x86/include/asm/uaccess_32.h 2010-09-04 15:54:51.000000000 -0400
9177@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u 9177@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
9178 static __always_inline unsigned long __must_check 9178 static __always_inline unsigned long __must_check
9179 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) 9179 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -9303,9 +9303,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/uaccess_32.h linux-2.6.32.23/arc
9303 long __must_check strncpy_from_user(char *dst, const char __user *src, 9303 long __must_check strncpy_from_user(char *dst, const char __user *src,
9304 long count); 9304 long count);
9305 long __must_check __strncpy_from_user(char *dst, 9305 long __must_check __strncpy_from_user(char *dst,
9306diff -urNp linux-2.6.32.23/arch/x86/include/asm/uaccess_64.h linux-2.6.32.23/arch/x86/include/asm/uaccess_64.h 9306diff -urNp linux-2.6.32.24/arch/x86/include/asm/uaccess_64.h linux-2.6.32.24/arch/x86/include/asm/uaccess_64.h
9307--- linux-2.6.32.23/arch/x86/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400 9307--- linux-2.6.32.24/arch/x86/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
9308+++ linux-2.6.32.23/arch/x86/include/asm/uaccess_64.h 2010-09-04 15:54:51.000000000 -0400 9308+++ linux-2.6.32.24/arch/x86/include/asm/uaccess_64.h 2010-09-04 15:54:51.000000000 -0400
9309@@ -9,6 +9,9 @@ 9309@@ -9,6 +9,9 @@
9310 #include <linux/prefetch.h> 9310 #include <linux/prefetch.h>
9311 #include <linux/lockdep.h> 9311 #include <linux/lockdep.h>
@@ -9497,9 +9497,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/uaccess_64.h linux-2.6.32.23/arc
9497 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); 9497 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
9498 9498
9499 #endif /* _ASM_X86_UACCESS_64_H */ 9499 #endif /* _ASM_X86_UACCESS_64_H */
9500diff -urNp linux-2.6.32.23/arch/x86/include/asm/uaccess.h linux-2.6.32.23/arch/x86/include/asm/uaccess.h 9500diff -urNp linux-2.6.32.24/arch/x86/include/asm/uaccess.h linux-2.6.32.24/arch/x86/include/asm/uaccess.h
9501--- linux-2.6.32.23/arch/x86/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400 9501--- linux-2.6.32.24/arch/x86/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
9502+++ linux-2.6.32.23/arch/x86/include/asm/uaccess.h 2010-09-16 23:14:31.000000000 -0400 9502+++ linux-2.6.32.24/arch/x86/include/asm/uaccess.h 2010-09-16 23:14:31.000000000 -0400
9503@@ -8,12 +8,15 @@ 9503@@ -8,12 +8,15 @@
9504 #include <linux/thread_info.h> 9504 #include <linux/thread_info.h>
9505 #include <linux/prefetch.h> 9505 #include <linux/prefetch.h>
@@ -9724,9 +9724,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/uaccess.h linux-2.6.32.23/arch/x
9724 #ifdef CONFIG_X86_32 9724 #ifdef CONFIG_X86_32
9725 # include "uaccess_32.h" 9725 # include "uaccess_32.h"
9726 #else 9726 #else
9727diff -urNp linux-2.6.32.23/arch/x86/include/asm/vgtod.h linux-2.6.32.23/arch/x86/include/asm/vgtod.h 9727diff -urNp linux-2.6.32.24/arch/x86/include/asm/vgtod.h linux-2.6.32.24/arch/x86/include/asm/vgtod.h
9728--- linux-2.6.32.23/arch/x86/include/asm/vgtod.h 2010-08-13 16:24:37.000000000 -0400 9728--- linux-2.6.32.24/arch/x86/include/asm/vgtod.h 2010-08-13 16:24:37.000000000 -0400
9729+++ linux-2.6.32.23/arch/x86/include/asm/vgtod.h 2010-09-04 15:54:51.000000000 -0400 9729+++ linux-2.6.32.24/arch/x86/include/asm/vgtod.h 2010-09-04 15:54:51.000000000 -0400
9730@@ -14,6 +14,7 @@ struct vsyscall_gtod_data { 9730@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
9731 int sysctl_enabled; 9731 int sysctl_enabled;
9732 struct timezone sys_tz; 9732 struct timezone sys_tz;
@@ -9735,9 +9735,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/vgtod.h linux-2.6.32.23/arch/x86
9735 cycle_t (*vread)(void); 9735 cycle_t (*vread)(void);
9736 cycle_t cycle_last; 9736 cycle_t cycle_last;
9737 cycle_t mask; 9737 cycle_t mask;
9738diff -urNp linux-2.6.32.23/arch/x86/include/asm/vmi.h linux-2.6.32.23/arch/x86/include/asm/vmi.h 9738diff -urNp linux-2.6.32.24/arch/x86/include/asm/vmi.h linux-2.6.32.24/arch/x86/include/asm/vmi.h
9739--- linux-2.6.32.23/arch/x86/include/asm/vmi.h 2010-08-13 16:24:37.000000000 -0400 9739--- linux-2.6.32.24/arch/x86/include/asm/vmi.h 2010-08-13 16:24:37.000000000 -0400
9740+++ linux-2.6.32.23/arch/x86/include/asm/vmi.h 2010-09-04 15:54:51.000000000 -0400 9740+++ linux-2.6.32.24/arch/x86/include/asm/vmi.h 2010-09-04 15:54:51.000000000 -0400
9741@@ -191,6 +191,7 @@ struct vrom_header { 9741@@ -191,6 +191,7 @@ struct vrom_header {
9742 u8 reserved[96]; /* Reserved for headers */ 9742 u8 reserved[96]; /* Reserved for headers */
9743 char vmi_init[8]; /* VMI_Init jump point */ 9743 char vmi_init[8]; /* VMI_Init jump point */
@@ -9746,9 +9746,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/vmi.h linux-2.6.32.23/arch/x86/i
9746 } __attribute__((packed)); 9746 } __attribute__((packed));
9747 9747
9748 struct pnp_header { 9748 struct pnp_header {
9749diff -urNp linux-2.6.32.23/arch/x86/include/asm/vsyscall.h linux-2.6.32.23/arch/x86/include/asm/vsyscall.h 9749diff -urNp linux-2.6.32.24/arch/x86/include/asm/vsyscall.h linux-2.6.32.24/arch/x86/include/asm/vsyscall.h
9750--- linux-2.6.32.23/arch/x86/include/asm/vsyscall.h 2010-08-13 16:24:37.000000000 -0400 9750--- linux-2.6.32.24/arch/x86/include/asm/vsyscall.h 2010-08-13 16:24:37.000000000 -0400
9751+++ linux-2.6.32.23/arch/x86/include/asm/vsyscall.h 2010-09-04 15:54:51.000000000 -0400 9751+++ linux-2.6.32.24/arch/x86/include/asm/vsyscall.h 2010-09-04 15:54:51.000000000 -0400
9752@@ -15,9 +15,10 @@ enum vsyscall_num { 9752@@ -15,9 +15,10 @@ enum vsyscall_num {
9753 9753
9754 #ifdef __KERNEL__ 9754 #ifdef __KERNEL__
@@ -9779,9 +9779,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/vsyscall.h linux-2.6.32.23/arch/
9779 #endif /* __KERNEL__ */ 9779 #endif /* __KERNEL__ */
9780 9780
9781 #endif /* _ASM_X86_VSYSCALL_H */ 9781 #endif /* _ASM_X86_VSYSCALL_H */
9782diff -urNp linux-2.6.32.23/arch/x86/include/asm/xsave.h linux-2.6.32.23/arch/x86/include/asm/xsave.h 9782diff -urNp linux-2.6.32.24/arch/x86/include/asm/xsave.h linux-2.6.32.24/arch/x86/include/asm/xsave.h
9783--- linux-2.6.32.23/arch/x86/include/asm/xsave.h 2010-08-13 16:24:37.000000000 -0400 9783--- linux-2.6.32.24/arch/x86/include/asm/xsave.h 2010-08-13 16:24:37.000000000 -0400
9784+++ linux-2.6.32.23/arch/x86/include/asm/xsave.h 2010-09-04 15:54:51.000000000 -0400 9784+++ linux-2.6.32.24/arch/x86/include/asm/xsave.h 2010-09-04 15:54:51.000000000 -0400
9785@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct 9785@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
9786 static inline int xsave_user(struct xsave_struct __user *buf) 9786 static inline int xsave_user(struct xsave_struct __user *buf)
9787 { 9787 {
@@ -9807,9 +9807,9 @@ diff -urNp linux-2.6.32.23/arch/x86/include/asm/xsave.h linux-2.6.32.23/arch/x86
9807 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" 9807 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
9808 "2:\n" 9808 "2:\n"
9809 ".section .fixup,\"ax\"\n" 9809 ".section .fixup,\"ax\"\n"
9810diff -urNp linux-2.6.32.23/arch/x86/Kconfig linux-2.6.32.23/arch/x86/Kconfig 9810diff -urNp linux-2.6.32.24/arch/x86/Kconfig linux-2.6.32.24/arch/x86/Kconfig
9811--- linux-2.6.32.23/arch/x86/Kconfig 2010-08-29 21:08:20.000000000 -0400 9811--- linux-2.6.32.24/arch/x86/Kconfig 2010-08-29 21:08:20.000000000 -0400
9812+++ linux-2.6.32.23/arch/x86/Kconfig 2010-09-04 15:54:51.000000000 -0400 9812+++ linux-2.6.32.24/arch/x86/Kconfig 2010-09-04 15:54:51.000000000 -0400
9813@@ -997,7 +997,7 @@ choice 9813@@ -997,7 +997,7 @@ choice
9814 9814
9815 config NOHIGHMEM 9815 config NOHIGHMEM
@@ -9874,9 +9874,9 @@ diff -urNp linux-2.6.32.23/arch/x86/Kconfig linux-2.6.32.23/arch/x86/Kconfig
9874 ---help--- 9874 ---help---
9875 Map the 32-bit VDSO to the predictable old-style address too. 9875 Map the 32-bit VDSO to the predictable old-style address too.
9876 ---help--- 9876 ---help---
9877diff -urNp linux-2.6.32.23/arch/x86/Kconfig.cpu linux-2.6.32.23/arch/x86/Kconfig.cpu 9877diff -urNp linux-2.6.32.24/arch/x86/Kconfig.cpu linux-2.6.32.24/arch/x86/Kconfig.cpu
9878--- linux-2.6.32.23/arch/x86/Kconfig.cpu 2010-08-13 16:24:37.000000000 -0400 9878--- linux-2.6.32.24/arch/x86/Kconfig.cpu 2010-08-13 16:24:37.000000000 -0400
9879+++ linux-2.6.32.23/arch/x86/Kconfig.cpu 2010-09-04 15:54:51.000000000 -0400 9879+++ linux-2.6.32.24/arch/x86/Kconfig.cpu 2010-09-04 15:54:51.000000000 -0400
9880@@ -340,7 +340,7 @@ config X86_PPRO_FENCE 9880@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
9881 9881
9882 config X86_F00F_BUG 9882 config X86_F00F_BUG
@@ -9904,9 +9904,9 @@ diff -urNp linux-2.6.32.23/arch/x86/Kconfig.cpu linux-2.6.32.23/arch/x86/Kconfig
9904 9904
9905 config X86_MINIMUM_CPU_FAMILY 9905 config X86_MINIMUM_CPU_FAMILY
9906 int 9906 int
9907diff -urNp linux-2.6.32.23/arch/x86/Kconfig.debug linux-2.6.32.23/arch/x86/Kconfig.debug 9907diff -urNp linux-2.6.32.24/arch/x86/Kconfig.debug linux-2.6.32.24/arch/x86/Kconfig.debug
9908--- linux-2.6.32.23/arch/x86/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400 9908--- linux-2.6.32.24/arch/x86/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
9909+++ linux-2.6.32.23/arch/x86/Kconfig.debug 2010-09-04 15:54:51.000000000 -0400 9909+++ linux-2.6.32.24/arch/x86/Kconfig.debug 2010-09-04 15:54:51.000000000 -0400
9910@@ -99,7 +99,7 @@ config X86_PTDUMP 9910@@ -99,7 +99,7 @@ config X86_PTDUMP
9911 config DEBUG_RODATA 9911 config DEBUG_RODATA
9912 bool "Write protect kernel read-only data structures" 9912 bool "Write protect kernel read-only data structures"
@@ -9916,9 +9916,9 @@ diff -urNp linux-2.6.32.23/arch/x86/Kconfig.debug linux-2.6.32.23/arch/x86/Kconf
9916 ---help--- 9916 ---help---
9917 Mark the kernel read-only data as write-protected in the pagetables, 9917 Mark the kernel read-only data as write-protected in the pagetables,
9918 in order to catch accidental (and incorrect) writes to such const 9918 in order to catch accidental (and incorrect) writes to such const
9919diff -urNp linux-2.6.32.23/arch/x86/kernel/acpi/boot.c linux-2.6.32.23/arch/x86/kernel/acpi/boot.c 9919diff -urNp linux-2.6.32.24/arch/x86/kernel/acpi/boot.c linux-2.6.32.24/arch/x86/kernel/acpi/boot.c
9920--- linux-2.6.32.23/arch/x86/kernel/acpi/boot.c 2010-08-13 16:24:37.000000000 -0400 9920--- linux-2.6.32.24/arch/x86/kernel/acpi/boot.c 2010-08-13 16:24:37.000000000 -0400
9921+++ linux-2.6.32.23/arch/x86/kernel/acpi/boot.c 2010-09-04 15:54:51.000000000 -0400 9921+++ linux-2.6.32.24/arch/x86/kernel/acpi/boot.c 2010-09-04 15:54:51.000000000 -0400
9922@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a 9922@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a
9923 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), 9923 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
9924 }, 9924 },
@@ -9928,9 +9928,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/acpi/boot.c linux-2.6.32.23/arch/x86/
9928 }; 9928 };
9929 9929
9930 /* 9930 /*
9931diff -urNp linux-2.6.32.23/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.23/arch/x86/kernel/acpi/realmode/wakeup.S 9931diff -urNp linux-2.6.32.24/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.24/arch/x86/kernel/acpi/realmode/wakeup.S
9932--- linux-2.6.32.23/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-13 16:24:37.000000000 -0400 9932--- linux-2.6.32.24/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-13 16:24:37.000000000 -0400
9933+++ linux-2.6.32.23/arch/x86/kernel/acpi/realmode/wakeup.S 2010-09-04 15:54:51.000000000 -0400 9933+++ linux-2.6.32.24/arch/x86/kernel/acpi/realmode/wakeup.S 2010-09-04 15:54:51.000000000 -0400
9934@@ -104,7 +104,7 @@ _start: 9934@@ -104,7 +104,7 @@ _start:
9935 movl %eax, %ecx 9935 movl %eax, %ecx
9936 orl %edx, %ecx 9936 orl %edx, %ecx
@@ -9940,9 +9940,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.2
9940 wrmsr 9940 wrmsr
9941 1: 9941 1:
9942 9942
9943diff -urNp linux-2.6.32.23/arch/x86/kernel/acpi/sleep.c linux-2.6.32.23/arch/x86/kernel/acpi/sleep.c 9943diff -urNp linux-2.6.32.24/arch/x86/kernel/acpi/sleep.c linux-2.6.32.24/arch/x86/kernel/acpi/sleep.c
9944--- linux-2.6.32.23/arch/x86/kernel/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400 9944--- linux-2.6.32.24/arch/x86/kernel/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
9945+++ linux-2.6.32.23/arch/x86/kernel/acpi/sleep.c 2010-09-04 15:54:51.000000000 -0400 9945+++ linux-2.6.32.24/arch/x86/kernel/acpi/sleep.c 2010-09-04 15:54:51.000000000 -0400
9946@@ -11,11 +11,12 @@ 9946@@ -11,11 +11,12 @@
9947 #include <linux/cpumask.h> 9947 #include <linux/cpumask.h>
9948 #include <asm/segment.h> 9948 #include <asm/segment.h>
@@ -9987,9 +9987,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/acpi/sleep.c linux-2.6.32.23/arch/x86
9987 } 9987 }
9988 9988
9989 9989
9990diff -urNp linux-2.6.32.23/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.23/arch/x86/kernel/acpi/wakeup_32.S 9990diff -urNp linux-2.6.32.24/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.24/arch/x86/kernel/acpi/wakeup_32.S
9991--- linux-2.6.32.23/arch/x86/kernel/acpi/wakeup_32.S 2010-08-13 16:24:37.000000000 -0400 9991--- linux-2.6.32.24/arch/x86/kernel/acpi/wakeup_32.S 2010-08-13 16:24:37.000000000 -0400
9992+++ linux-2.6.32.23/arch/x86/kernel/acpi/wakeup_32.S 2010-09-04 15:54:51.000000000 -0400 9992+++ linux-2.6.32.24/arch/x86/kernel/acpi/wakeup_32.S 2010-09-04 15:54:51.000000000 -0400
9993@@ -30,13 +30,11 @@ wakeup_pmode_return: 9993@@ -30,13 +30,11 @@ wakeup_pmode_return:
9994 # and restore the stack ... but you need gdt for this to work 9994 # and restore the stack ... but you need gdt for this to work
9995 movl saved_context_esp, %esp 9995 movl saved_context_esp, %esp
@@ -10006,9 +10006,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.23/arch
10006 10006
10007 bogus_magic: 10007 bogus_magic:
10008 jmp bogus_magic 10008 jmp bogus_magic
10009diff -urNp linux-2.6.32.23/arch/x86/kernel/alternative.c linux-2.6.32.23/arch/x86/kernel/alternative.c 10009diff -urNp linux-2.6.32.24/arch/x86/kernel/alternative.c linux-2.6.32.24/arch/x86/kernel/alternative.c
10010--- linux-2.6.32.23/arch/x86/kernel/alternative.c 2010-08-13 16:24:37.000000000 -0400 10010--- linux-2.6.32.24/arch/x86/kernel/alternative.c 2010-08-13 16:24:37.000000000 -0400
10011+++ linux-2.6.32.23/arch/x86/kernel/alternative.c 2010-09-04 15:54:51.000000000 -0400 10011+++ linux-2.6.32.24/arch/x86/kernel/alternative.c 2010-09-04 15:54:51.000000000 -0400
10012@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str 10012@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
10013 10013
10014 BUG_ON(p->len > MAX_PATCH_LEN); 10014 BUG_ON(p->len > MAX_PATCH_LEN);
@@ -10091,9 +10091,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/alternative.c linux-2.6.32.23/arch/x8
10091+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); 10091+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]);
10092 return addr; 10092 return addr;
10093 } 10093 }
10094diff -urNp linux-2.6.32.23/arch/x86/kernel/amd_iommu.c linux-2.6.32.23/arch/x86/kernel/amd_iommu.c 10094diff -urNp linux-2.6.32.24/arch/x86/kernel/amd_iommu.c linux-2.6.32.24/arch/x86/kernel/amd_iommu.c
10095--- linux-2.6.32.23/arch/x86/kernel/amd_iommu.c 2010-08-13 16:24:37.000000000 -0400 10095--- linux-2.6.32.24/arch/x86/kernel/amd_iommu.c 2010-08-13 16:24:37.000000000 -0400
10096+++ linux-2.6.32.23/arch/x86/kernel/amd_iommu.c 2010-09-04 15:54:51.000000000 -0400 10096+++ linux-2.6.32.24/arch/x86/kernel/amd_iommu.c 2010-09-04 15:54:51.000000000 -0400
10097@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( 10097@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains(
10098 } 10098 }
10099 } 10099 }
@@ -10103,9 +10103,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/amd_iommu.c linux-2.6.32.23/arch/x86/
10103 .alloc_coherent = alloc_coherent, 10103 .alloc_coherent = alloc_coherent,
10104 .free_coherent = free_coherent, 10104 .free_coherent = free_coherent,
10105 .map_page = map_page, 10105 .map_page = map_page,
10106diff -urNp linux-2.6.32.23/arch/x86/kernel/apic/io_apic.c linux-2.6.32.23/arch/x86/kernel/apic/io_apic.c 10106diff -urNp linux-2.6.32.24/arch/x86/kernel/apic/io_apic.c linux-2.6.32.24/arch/x86/kernel/apic/io_apic.c
10107--- linux-2.6.32.23/arch/x86/kernel/apic/io_apic.c 2010-09-20 17:26:42.000000000 -0400 10107--- linux-2.6.32.24/arch/x86/kernel/apic/io_apic.c 2010-09-20 17:26:42.000000000 -0400
10108+++ linux-2.6.32.23/arch/x86/kernel/apic/io_apic.c 2010-09-20 17:27:14.000000000 -0400 10108+++ linux-2.6.32.24/arch/x86/kernel/apic/io_apic.c 2010-09-20 17:27:14.000000000 -0400
10109@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi 10109@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi
10110 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, 10110 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
10111 GFP_ATOMIC); 10111 GFP_ATOMIC);
@@ -10142,9 +10142,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/apic/io_apic.c linux-2.6.32.23/arch/x
10142 { 10142 {
10143 spin_unlock(&vector_lock); 10143 spin_unlock(&vector_lock);
10144 } 10144 }
10145diff -urNp linux-2.6.32.23/arch/x86/kernel/apm_32.c linux-2.6.32.23/arch/x86/kernel/apm_32.c 10145diff -urNp linux-2.6.32.24/arch/x86/kernel/apm_32.c linux-2.6.32.24/arch/x86/kernel/apm_32.c
10146--- linux-2.6.32.23/arch/x86/kernel/apm_32.c 2010-08-13 16:24:37.000000000 -0400 10146--- linux-2.6.32.24/arch/x86/kernel/apm_32.c 2010-08-13 16:24:37.000000000 -0400
10147+++ linux-2.6.32.23/arch/x86/kernel/apm_32.c 2010-09-04 15:54:51.000000000 -0400 10147+++ linux-2.6.32.24/arch/x86/kernel/apm_32.c 2010-09-04 15:54:51.000000000 -0400
10148@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); 10148@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
10149 * This is for buggy BIOS's that refer to (real mode) segment 0x40 10149 * This is for buggy BIOS's that refer to (real mode) segment 0x40
10150 * even though they are called in protected mode. 10150 * even though they are called in protected mode.
@@ -10246,9 +10246,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/apm_32.c linux-2.6.32.23/arch/x86/ker
10246 10246
10247 proc_create("apm", 0, NULL, &apm_file_ops); 10247 proc_create("apm", 0, NULL, &apm_file_ops);
10248 10248
10249diff -urNp linux-2.6.32.23/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.23/arch/x86/kernel/asm-offsets_32.c 10249diff -urNp linux-2.6.32.24/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.24/arch/x86/kernel/asm-offsets_32.c
10250--- linux-2.6.32.23/arch/x86/kernel/asm-offsets_32.c 2010-08-13 16:24:37.000000000 -0400 10250--- linux-2.6.32.24/arch/x86/kernel/asm-offsets_32.c 2010-08-13 16:24:37.000000000 -0400
10251+++ linux-2.6.32.23/arch/x86/kernel/asm-offsets_32.c 2010-09-04 15:54:51.000000000 -0400 10251+++ linux-2.6.32.24/arch/x86/kernel/asm-offsets_32.c 2010-09-04 15:54:51.000000000 -0400
10252@@ -115,6 +115,11 @@ void foo(void) 10252@@ -115,6 +115,11 @@ void foo(void)
10253 OFFSET(PV_CPU_iret, pv_cpu_ops, iret); 10253 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
10254 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 10254 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
@@ -10261,9 +10261,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.23/arch
10261 #endif 10261 #endif
10262 10262
10263 #ifdef CONFIG_XEN 10263 #ifdef CONFIG_XEN
10264diff -urNp linux-2.6.32.23/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.23/arch/x86/kernel/asm-offsets_64.c 10264diff -urNp linux-2.6.32.24/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.24/arch/x86/kernel/asm-offsets_64.c
10265--- linux-2.6.32.23/arch/x86/kernel/asm-offsets_64.c 2010-08-13 16:24:37.000000000 -0400 10265--- linux-2.6.32.24/arch/x86/kernel/asm-offsets_64.c 2010-08-13 16:24:37.000000000 -0400
10266+++ linux-2.6.32.23/arch/x86/kernel/asm-offsets_64.c 2010-09-04 15:54:51.000000000 -0400 10266+++ linux-2.6.32.24/arch/x86/kernel/asm-offsets_64.c 2010-09-04 15:54:51.000000000 -0400
10267@@ -63,6 +63,18 @@ int main(void) 10267@@ -63,6 +63,18 @@ int main(void)
10268 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 10268 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
10269 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); 10269 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
@@ -10291,9 +10291,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.23/arch
10291 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); 10291 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
10292 BLANK(); 10292 BLANK();
10293 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); 10293 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
10294diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/common.c linux-2.6.32.23/arch/x86/kernel/cpu/common.c 10294diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/common.c linux-2.6.32.24/arch/x86/kernel/cpu/common.c
10295--- linux-2.6.32.23/arch/x86/kernel/cpu/common.c 2010-08-13 16:24:37.000000000 -0400 10295--- linux-2.6.32.24/arch/x86/kernel/cpu/common.c 2010-08-13 16:24:37.000000000 -0400
10296+++ linux-2.6.32.23/arch/x86/kernel/cpu/common.c 2010-09-04 15:54:51.000000000 -0400 10296+++ linux-2.6.32.24/arch/x86/kernel/cpu/common.c 2010-09-04 15:54:51.000000000 -0400
10297@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon 10297@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
10298 10298
10299 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; 10299 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -10402,9 +10402,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/common.c linux-2.6.32.23/arch/x86
10402 struct thread_struct *thread = &curr->thread; 10402 struct thread_struct *thread = &curr->thread;
10403 10403
10404 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { 10404 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
10405diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.23/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 10405diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
10406--- linux-2.6.32.23/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-13 16:24:37.000000000 -0400 10406--- linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-13 16:24:37.000000000 -0400
10407+++ linux-2.6.32.23/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-09-04 15:54:51.000000000 -0400 10407+++ linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-09-04 15:54:51.000000000 -0400
10408@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any 10408@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
10409 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), 10409 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
10410 }, 10410 },
@@ -10414,9 +10414,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.
10414 }; 10414 };
10415 10415
10416 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) 10416 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
10417diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.23/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 10417diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
10418--- linux-2.6.32.23/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-13 16:24:37.000000000 -0400 10418--- linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-13 16:24:37.000000000 -0400
10419+++ linux-2.6.32.23/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-09-04 15:54:51.000000000 -0400 10419+++ linux-2.6.32.24/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-09-04 15:54:51.000000000 -0400
10420@@ -225,7 +225,7 @@ static struct cpu_model models[] = 10420@@ -225,7 +225,7 @@ static struct cpu_model models[] =
10421 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, 10421 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
10422 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, 10422 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
@@ -10426,9 +10426,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu
10426 }; 10426 };
10427 #undef _BANIAS 10427 #undef _BANIAS
10428 #undef BANIAS 10428 #undef BANIAS
10429diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/intel.c linux-2.6.32.23/arch/x86/kernel/cpu/intel.c 10429diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/intel.c linux-2.6.32.24/arch/x86/kernel/cpu/intel.c
10430--- linux-2.6.32.23/arch/x86/kernel/cpu/intel.c 2010-08-13 16:24:37.000000000 -0400 10430--- linux-2.6.32.24/arch/x86/kernel/cpu/intel.c 2010-08-13 16:24:37.000000000 -0400
10431+++ linux-2.6.32.23/arch/x86/kernel/cpu/intel.c 2010-09-04 15:54:51.000000000 -0400 10431+++ linux-2.6.32.24/arch/x86/kernel/cpu/intel.c 2010-09-04 15:54:51.000000000 -0400
10432@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug 10432@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug
10433 * Update the IDT descriptor and reload the IDT so that 10433 * Update the IDT descriptor and reload the IDT so that
10434 * it uses the read-only mapped virtual address. 10434 * it uses the read-only mapped virtual address.
@@ -10438,9 +10438,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/intel.c linux-2.6.32.23/arch/x86/
10438 load_idt(&idt_descr); 10438 load_idt(&idt_descr);
10439 } 10439 }
10440 #endif 10440 #endif
10441diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.23/arch/x86/kernel/cpu/intel_cacheinfo.c 10441diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.24/arch/x86/kernel/cpu/intel_cacheinfo.c
10442--- linux-2.6.32.23/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-13 16:24:37.000000000 -0400 10442--- linux-2.6.32.24/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
10443+++ linux-2.6.32.23/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-09-04 15:54:51.000000000 -0400 10443+++ linux-2.6.32.24/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-09-04 15:54:51.000000000 -0400
10444@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob 10444@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob
10445 return ret; 10445 return ret;
10446 } 10446 }
@@ -10450,9 +10450,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.23
10450 .show = show, 10450 .show = show,
10451 .store = store, 10451 .store = store,
10452 }; 10452 };
10453diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/Makefile linux-2.6.32.23/arch/x86/kernel/cpu/Makefile 10453diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/Makefile linux-2.6.32.24/arch/x86/kernel/cpu/Makefile
10454--- linux-2.6.32.23/arch/x86/kernel/cpu/Makefile 2010-08-13 16:24:37.000000000 -0400 10454--- linux-2.6.32.24/arch/x86/kernel/cpu/Makefile 2010-08-13 16:24:37.000000000 -0400
10455+++ linux-2.6.32.23/arch/x86/kernel/cpu/Makefile 2010-09-04 15:54:51.000000000 -0400 10455+++ linux-2.6.32.24/arch/x86/kernel/cpu/Makefile 2010-09-04 15:54:51.000000000 -0400
10456@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER 10456@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
10457 CFLAGS_REMOVE_common.o = -pg 10457 CFLAGS_REMOVE_common.o = -pg
10458 endif 10458 endif
@@ -10464,9 +10464,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/Makefile linux-2.6.32.23/arch/x86
10464 obj-y := intel_cacheinfo.o addon_cpuid_features.o 10464 obj-y := intel_cacheinfo.o addon_cpuid_features.o
10465 obj-y += proc.o capflags.o powerflags.o common.o 10465 obj-y += proc.o capflags.o powerflags.o common.o
10466 obj-y += vmware.o hypervisor.o sched.o 10466 obj-y += vmware.o hypervisor.o sched.o
10467diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.23/arch/x86/kernel/cpu/mcheck/mce_amd.c 10467diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce_amd.c
10468--- linux-2.6.32.23/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-08-13 16:24:37.000000000 -0400 10468--- linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-08-13 16:24:37.000000000 -0400
10469+++ linux-2.6.32.23/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-09-04 15:54:51.000000000 -0400 10469+++ linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-09-04 15:54:51.000000000 -0400
10470@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob 10470@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob
10471 return ret; 10471 return ret;
10472 } 10472 }
@@ -10476,9 +10476,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.23/
10476 .show = show, 10476 .show = show,
10477 .store = store, 10477 .store = store,
10478 }; 10478 };
10479diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.23/arch/x86/kernel/cpu/mcheck/mce.c 10479diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce.c
10480--- linux-2.6.32.23/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-13 16:24:37.000000000 -0400 10480--- linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-13 16:24:37.000000000 -0400
10481+++ linux-2.6.32.23/arch/x86/kernel/cpu/mcheck/mce.c 2010-09-04 15:54:51.000000000 -0400 10481+++ linux-2.6.32.24/arch/x86/kernel/cpu/mcheck/mce.c 2010-09-04 15:54:51.000000000 -0400
10482@@ -187,7 +187,7 @@ static void print_mce(struct mce *m) 10482@@ -187,7 +187,7 @@ static void print_mce(struct mce *m)
10483 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", 10483 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
10484 m->cs, m->ip); 10484 m->cs, m->ip);
@@ -10531,9 +10531,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.23/arch
10531 }; 10531 };
10532 10532
10533 /* 10533 /*
10534diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/amd.c 10534diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/amd.c
10535--- linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-13 16:24:37.000000000 -0400 10535--- linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-13 16:24:37.000000000 -0400
10536+++ linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/amd.c 2010-09-04 15:54:51.000000000 -0400 10536+++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/amd.c 2010-09-04 15:54:51.000000000 -0400
10537@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base 10537@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
10538 return 0; 10538 return 0;
10539 } 10539 }
@@ -10543,9 +10543,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.23/arch/x
10543 .vendor = X86_VENDOR_AMD, 10543 .vendor = X86_VENDOR_AMD,
10544 .set = amd_set_mtrr, 10544 .set = amd_set_mtrr,
10545 .get = amd_get_mtrr, 10545 .get = amd_get_mtrr,
10546diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/centaur.c 10546diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/centaur.c
10547--- linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-13 16:24:37.000000000 -0400 10547--- linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-13 16:24:37.000000000 -0400
10548+++ linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/centaur.c 2010-09-04 15:54:51.000000000 -0400 10548+++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/centaur.c 2010-09-04 15:54:51.000000000 -0400
10549@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long 10549@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
10550 return 0; 10550 return 0;
10551 } 10551 }
@@ -10555,9 +10555,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.23/ar
10555 .vendor = X86_VENDOR_CENTAUR, 10555 .vendor = X86_VENDOR_CENTAUR,
10556 .set = centaur_set_mcr, 10556 .set = centaur_set_mcr,
10557 .get = centaur_get_mcr, 10557 .get = centaur_get_mcr,
10558diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/cyrix.c 10558diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/cyrix.c
10559--- linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-13 16:24:37.000000000 -0400 10559--- linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-13 16:24:37.000000000 -0400
10560+++ linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-09-04 15:54:51.000000000 -0400 10560+++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-09-04 15:54:51.000000000 -0400
10561@@ -265,7 +265,7 @@ static void cyrix_set_all(void) 10561@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
10562 post_set(); 10562 post_set();
10563 } 10563 }
@@ -10567,9 +10567,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.23/arch
10567 .vendor = X86_VENDOR_CYRIX, 10567 .vendor = X86_VENDOR_CYRIX,
10568 .set_all = cyrix_set_all, 10568 .set_all = cyrix_set_all,
10569 .set = cyrix_set_arr, 10569 .set = cyrix_set_arr,
10570diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/generic.c 10570diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/generic.c
10571--- linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-13 16:24:37.000000000 -0400 10571--- linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-13 16:24:37.000000000 -0400
10572+++ linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/generic.c 2010-09-04 15:54:51.000000000 -0400 10572+++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/generic.c 2010-09-04 15:54:51.000000000 -0400
10573@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra 10573@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
10574 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ 10574 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
10575 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ 10575 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
@@ -10588,9 +10588,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.23/ar
10588 .use_intel_if = 1, 10588 .use_intel_if = 1,
10589 .set_all = generic_set_all, 10589 .set_all = generic_set_all,
10590 .get = generic_get_mtrr, 10590 .get = generic_get_mtrr,
10591diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/main.c 10591diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/main.c
10592--- linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/main.c 2010-08-13 16:24:37.000000000 -0400 10592--- linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/main.c 2010-08-13 16:24:37.000000000 -0400
10593+++ linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/main.c 2010-09-04 15:54:51.000000000 -0400 10593+++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/main.c 2010-09-04 15:54:51.000000000 -0400
10594@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); 10594@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
10595 u64 size_or_mask, size_and_mask; 10595 u64 size_or_mask, size_and_mask;
10596 static bool mtrr_aps_delayed_init; 10596 static bool mtrr_aps_delayed_init;
@@ -10609,9 +10609,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.23/arch/
10609 { 10609 {
10610 if (ops->vendor && ops->vendor < X86_VENDOR_NUM) 10610 if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
10611 mtrr_ops[ops->vendor] = ops; 10611 mtrr_ops[ops->vendor] = ops;
10612diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/mtrr.h 10612diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/mtrr.h
10613--- linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-13 16:24:37.000000000 -0400 10613--- linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-13 16:24:37.000000000 -0400
10614+++ linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-09-04 15:54:51.000000000 -0400 10614+++ linux-2.6.32.24/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-09-04 15:54:51.000000000 -0400
10615@@ -12,19 +12,19 @@ 10615@@ -12,19 +12,19 @@
10616 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; 10616 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
10617 10617
@@ -10662,9 +10662,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.23/arch/
10662 10662
10663 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) 10663 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
10664 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) 10664 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
10665diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.23/arch/x86/kernel/cpu/perfctr-watchdog.c 10665diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.24/arch/x86/kernel/cpu/perfctr-watchdog.c
10666--- linux-2.6.32.23/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-13 16:24:37.000000000 -0400 10666--- linux-2.6.32.24/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-13 16:24:37.000000000 -0400
10667+++ linux-2.6.32.23/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-09-04 15:54:51.000000000 -0400 10667+++ linux-2.6.32.24/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-09-04 15:54:51.000000000 -0400
10668@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { 10668@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
10669 10669
10670 /* Interface defining a CPU specific perfctr watchdog */ 10670 /* Interface defining a CPU specific perfctr watchdog */
@@ -10698,9 +10698,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.2
10698 static struct wd_ops intel_arch_wd_ops __read_mostly = { 10698 static struct wd_ops intel_arch_wd_ops __read_mostly = {
10699 .reserve = single_msr_reserve, 10699 .reserve = single_msr_reserve,
10700 .unreserve = single_msr_unreserve, 10700 .unreserve = single_msr_unreserve,
10701diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.23/arch/x86/kernel/cpu/perf_event.c 10701diff -urNp linux-2.6.32.24/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.24/arch/x86/kernel/cpu/perf_event.c
10702--- linux-2.6.32.23/arch/x86/kernel/cpu/perf_event.c 2010-08-13 16:24:37.000000000 -0400 10702--- linux-2.6.32.24/arch/x86/kernel/cpu/perf_event.c 2010-08-13 16:24:37.000000000 -0400
10703+++ linux-2.6.32.23/arch/x86/kernel/cpu/perf_event.c 2010-09-04 15:54:51.000000000 -0400 10703+++ linux-2.6.32.24/arch/x86/kernel/cpu/perf_event.c 2010-09-04 15:54:51.000000000 -0400
10704@@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs 10704@@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs
10705 break; 10705 break;
10706 10706
@@ -10710,9 +10710,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.23/arch
10710 } 10710 }
10711 } 10711 }
10712 10712
10713diff -urNp linux-2.6.32.23/arch/x86/kernel/crash.c linux-2.6.32.23/arch/x86/kernel/crash.c 10713diff -urNp linux-2.6.32.24/arch/x86/kernel/crash.c linux-2.6.32.24/arch/x86/kernel/crash.c
10714--- linux-2.6.32.23/arch/x86/kernel/crash.c 2010-08-13 16:24:37.000000000 -0400 10714--- linux-2.6.32.24/arch/x86/kernel/crash.c 2010-08-13 16:24:37.000000000 -0400
10715+++ linux-2.6.32.23/arch/x86/kernel/crash.c 2010-09-04 15:54:51.000000000 -0400 10715+++ linux-2.6.32.24/arch/x86/kernel/crash.c 2010-09-04 15:54:51.000000000 -0400
10716@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, 10716@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,
10717 regs = args->regs; 10717 regs = args->regs;
10718 10718
@@ -10722,9 +10722,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/crash.c linux-2.6.32.23/arch/x86/kern
10722 crash_fixup_ss_esp(&fixed_regs, regs); 10722 crash_fixup_ss_esp(&fixed_regs, regs);
10723 regs = &fixed_regs; 10723 regs = &fixed_regs;
10724 } 10724 }
10725diff -urNp linux-2.6.32.23/arch/x86/kernel/doublefault_32.c linux-2.6.32.23/arch/x86/kernel/doublefault_32.c 10725diff -urNp linux-2.6.32.24/arch/x86/kernel/doublefault_32.c linux-2.6.32.24/arch/x86/kernel/doublefault_32.c
10726--- linux-2.6.32.23/arch/x86/kernel/doublefault_32.c 2010-08-13 16:24:37.000000000 -0400 10726--- linux-2.6.32.24/arch/x86/kernel/doublefault_32.c 2010-08-13 16:24:37.000000000 -0400
10727+++ linux-2.6.32.23/arch/x86/kernel/doublefault_32.c 2010-09-04 15:54:51.000000000 -0400 10727+++ linux-2.6.32.24/arch/x86/kernel/doublefault_32.c 2010-09-04 15:54:51.000000000 -0400
10728@@ -11,7 +11,7 @@ 10728@@ -11,7 +11,7 @@
10729 10729
10730 #define DOUBLEFAULT_STACKSIZE (1024) 10730 #define DOUBLEFAULT_STACKSIZE (1024)
@@ -10756,9 +10756,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/doublefault_32.c linux-2.6.32.23/arch
10756 .fs = __KERNEL_PERCPU, 10756 .fs = __KERNEL_PERCPU,
10757 10757
10758 .__cr3 = __pa_nodebug(swapper_pg_dir), 10758 .__cr3 = __pa_nodebug(swapper_pg_dir),
10759diff -urNp linux-2.6.32.23/arch/x86/kernel/dumpstack_32.c linux-2.6.32.23/arch/x86/kernel/dumpstack_32.c 10759diff -urNp linux-2.6.32.24/arch/x86/kernel/dumpstack_32.c linux-2.6.32.24/arch/x86/kernel/dumpstack_32.c
10760--- linux-2.6.32.23/arch/x86/kernel/dumpstack_32.c 2010-08-13 16:24:37.000000000 -0400 10760--- linux-2.6.32.24/arch/x86/kernel/dumpstack_32.c 2010-08-13 16:24:37.000000000 -0400
10761+++ linux-2.6.32.23/arch/x86/kernel/dumpstack_32.c 2010-09-04 15:54:51.000000000 -0400 10761+++ linux-2.6.32.24/arch/x86/kernel/dumpstack_32.c 2010-09-04 15:54:51.000000000 -0400
10762@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs 10762@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
10763 * When in-kernel, we also print out the stack and code at the 10763 * When in-kernel, we also print out the stack and code at the
10764 * time of the fault.. 10764 * time of the fault..
@@ -10803,9 +10803,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/dumpstack_32.c linux-2.6.32.23/arch/x
10803 if (ip < PAGE_OFFSET) 10803 if (ip < PAGE_OFFSET)
10804 return 0; 10804 return 0;
10805 if (probe_kernel_address((unsigned short *)ip, ud2)) 10805 if (probe_kernel_address((unsigned short *)ip, ud2))
10806diff -urNp linux-2.6.32.23/arch/x86/kernel/dumpstack.c linux-2.6.32.23/arch/x86/kernel/dumpstack.c 10806diff -urNp linux-2.6.32.24/arch/x86/kernel/dumpstack.c linux-2.6.32.24/arch/x86/kernel/dumpstack.c
10807--- linux-2.6.32.23/arch/x86/kernel/dumpstack.c 2010-08-13 16:24:37.000000000 -0400 10807--- linux-2.6.32.24/arch/x86/kernel/dumpstack.c 2010-08-13 16:24:37.000000000 -0400
10808+++ linux-2.6.32.23/arch/x86/kernel/dumpstack.c 2010-09-04 15:54:51.000000000 -0400 10808+++ linux-2.6.32.24/arch/x86/kernel/dumpstack.c 2010-09-04 15:54:51.000000000 -0400
10809@@ -180,7 +180,7 @@ void dump_stack(void) 10809@@ -180,7 +180,7 @@ void dump_stack(void)
10810 #endif 10810 #endif
10811 10811
@@ -10833,9 +10833,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/dumpstack.c linux-2.6.32.23/arch/x86/
10833 report_bug(regs->ip, regs); 10833 report_bug(regs->ip, regs);
10834 10834
10835 if (__die(str, regs, err)) 10835 if (__die(str, regs, err))
10836diff -urNp linux-2.6.32.23/arch/x86/kernel/e820.c linux-2.6.32.23/arch/x86/kernel/e820.c 10836diff -urNp linux-2.6.32.24/arch/x86/kernel/e820.c linux-2.6.32.24/arch/x86/kernel/e820.c
10837--- linux-2.6.32.23/arch/x86/kernel/e820.c 2010-08-13 16:24:37.000000000 -0400 10837--- linux-2.6.32.24/arch/x86/kernel/e820.c 2010-08-13 16:24:37.000000000 -0400
10838+++ linux-2.6.32.23/arch/x86/kernel/e820.c 2010-09-04 15:54:51.000000000 -0400 10838+++ linux-2.6.32.24/arch/x86/kernel/e820.c 2010-09-04 15:54:51.000000000 -0400
10839@@ -733,7 +733,7 @@ struct early_res { 10839@@ -733,7 +733,7 @@ struct early_res {
10840 }; 10840 };
10841 static struct early_res early_res[MAX_EARLY_RES] __initdata = { 10841 static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -10845,9 +10845,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/e820.c linux-2.6.32.23/arch/x86/kerne
10845 }; 10845 };
10846 10846
10847 static int __init find_overlapped_early(u64 start, u64 end) 10847 static int __init find_overlapped_early(u64 start, u64 end)
10848diff -urNp linux-2.6.32.23/arch/x86/kernel/efi_32.c linux-2.6.32.23/arch/x86/kernel/efi_32.c 10848diff -urNp linux-2.6.32.24/arch/x86/kernel/efi_32.c linux-2.6.32.24/arch/x86/kernel/efi_32.c
10849--- linux-2.6.32.23/arch/x86/kernel/efi_32.c 2010-08-13 16:24:37.000000000 -0400 10849--- linux-2.6.32.24/arch/x86/kernel/efi_32.c 2010-08-13 16:24:37.000000000 -0400
10850+++ linux-2.6.32.23/arch/x86/kernel/efi_32.c 2010-09-04 15:54:51.000000000 -0400 10850+++ linux-2.6.32.24/arch/x86/kernel/efi_32.c 2010-09-04 15:54:51.000000000 -0400
10851@@ -38,70 +38,38 @@ 10851@@ -38,70 +38,38 @@
10852 */ 10852 */
10853 10853
@@ -10928,9 +10928,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/efi_32.c linux-2.6.32.23/arch/x86/ker
10928 10928
10929 /* 10929 /*
10930 * After the lock is released, the original page table is restored. 10930 * After the lock is released, the original page table is restored.
10931diff -urNp linux-2.6.32.23/arch/x86/kernel/efi_stub_32.S linux-2.6.32.23/arch/x86/kernel/efi_stub_32.S 10931diff -urNp linux-2.6.32.24/arch/x86/kernel/efi_stub_32.S linux-2.6.32.24/arch/x86/kernel/efi_stub_32.S
10932--- linux-2.6.32.23/arch/x86/kernel/efi_stub_32.S 2010-08-13 16:24:37.000000000 -0400 10932--- linux-2.6.32.24/arch/x86/kernel/efi_stub_32.S 2010-08-13 16:24:37.000000000 -0400
10933+++ linux-2.6.32.23/arch/x86/kernel/efi_stub_32.S 2010-09-04 15:54:51.000000000 -0400 10933+++ linux-2.6.32.24/arch/x86/kernel/efi_stub_32.S 2010-09-04 15:54:51.000000000 -0400
10934@@ -6,6 +6,7 @@ 10934@@ -6,6 +6,7 @@
10935 */ 10935 */
10936 10936
@@ -11029,9 +11029,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/efi_stub_32.S linux-2.6.32.23/arch/x8
11029 saved_return_addr: 11029 saved_return_addr:
11030 .long 0 11030 .long 0
11031 efi_rt_function_ptr: 11031 efi_rt_function_ptr:
11032diff -urNp linux-2.6.32.23/arch/x86/kernel/entry_32.S linux-2.6.32.23/arch/x86/kernel/entry_32.S 11032diff -urNp linux-2.6.32.24/arch/x86/kernel/entry_32.S linux-2.6.32.24/arch/x86/kernel/entry_32.S
11033--- linux-2.6.32.23/arch/x86/kernel/entry_32.S 2010-08-13 16:24:37.000000000 -0400 11033--- linux-2.6.32.24/arch/x86/kernel/entry_32.S 2010-08-13 16:24:37.000000000 -0400
11034+++ linux-2.6.32.23/arch/x86/kernel/entry_32.S 2010-09-04 15:54:51.000000000 -0400 11034+++ linux-2.6.32.24/arch/x86/kernel/entry_32.S 2010-09-04 15:54:51.000000000 -0400
11035@@ -191,7 +191,67 @@ 11035@@ -191,7 +191,67 @@
11036 11036
11037 #endif /* CONFIG_X86_32_LAZY_GS */ 11037 #endif /* CONFIG_X86_32_LAZY_GS */
@@ -11342,9 +11342,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/entry_32.S linux-2.6.32.23/arch/x86/k
11342 RESTORE_REGS 11342 RESTORE_REGS
11343 lss 12+4(%esp), %esp # back to espfix stack 11343 lss 12+4(%esp), %esp # back to espfix stack
11344 CFI_ADJUST_CFA_OFFSET -24 11344 CFI_ADJUST_CFA_OFFSET -24
11345diff -urNp linux-2.6.32.23/arch/x86/kernel/entry_64.S linux-2.6.32.23/arch/x86/kernel/entry_64.S 11345diff -urNp linux-2.6.32.24/arch/x86/kernel/entry_64.S linux-2.6.32.24/arch/x86/kernel/entry_64.S
11346--- linux-2.6.32.23/arch/x86/kernel/entry_64.S 2010-08-13 16:24:37.000000000 -0400 11346--- linux-2.6.32.24/arch/x86/kernel/entry_64.S 2010-08-13 16:24:37.000000000 -0400
11347+++ linux-2.6.32.23/arch/x86/kernel/entry_64.S 2010-09-04 15:54:51.000000000 -0400 11347+++ linux-2.6.32.24/arch/x86/kernel/entry_64.S 2010-09-04 15:54:51.000000000 -0400
11348@@ -53,6 +53,7 @@ 11348@@ -53,6 +53,7 @@
11349 #include <asm/paravirt.h> 11349 #include <asm/paravirt.h>
11350 #include <asm/ftrace.h> 11350 #include <asm/ftrace.h>
@@ -11802,9 +11802,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/entry_64.S linux-2.6.32.23/arch/x86/k
11802 RESTORE_ALL 8 11802 RESTORE_ALL 8
11803 jmp irq_return 11803 jmp irq_return
11804 nmi_userspace: 11804 nmi_userspace:
11805diff -urNp linux-2.6.32.23/arch/x86/kernel/ftrace.c linux-2.6.32.23/arch/x86/kernel/ftrace.c 11805diff -urNp linux-2.6.32.24/arch/x86/kernel/ftrace.c linux-2.6.32.24/arch/x86/kernel/ftrace.c
11806--- linux-2.6.32.23/arch/x86/kernel/ftrace.c 2010-08-13 16:24:37.000000000 -0400 11806--- linux-2.6.32.24/arch/x86/kernel/ftrace.c 2010-08-13 16:24:37.000000000 -0400
11807+++ linux-2.6.32.23/arch/x86/kernel/ftrace.c 2010-09-04 15:54:51.000000000 -0400 11807+++ linux-2.6.32.24/arch/x86/kernel/ftrace.c 2010-09-04 15:54:51.000000000 -0400
11808@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) 11808@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
11809 { 11809 {
11810 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { 11810 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -11870,9 +11870,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/ftrace.c linux-2.6.32.23/arch/x86/ker
11870 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) 11870 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
11871 return -EFAULT; 11871 return -EFAULT;
11872 11872
11873diff -urNp linux-2.6.32.23/arch/x86/kernel/head32.c linux-2.6.32.23/arch/x86/kernel/head32.c 11873diff -urNp linux-2.6.32.24/arch/x86/kernel/head32.c linux-2.6.32.24/arch/x86/kernel/head32.c
11874--- linux-2.6.32.23/arch/x86/kernel/head32.c 2010-08-13 16:24:37.000000000 -0400 11874--- linux-2.6.32.24/arch/x86/kernel/head32.c 2010-08-13 16:24:37.000000000 -0400
11875+++ linux-2.6.32.23/arch/x86/kernel/head32.c 2010-09-04 15:54:51.000000000 -0400 11875+++ linux-2.6.32.24/arch/x86/kernel/head32.c 2010-09-04 15:54:51.000000000 -0400
11876@@ -16,6 +16,7 @@ 11876@@ -16,6 +16,7 @@
11877 #include <asm/apic.h> 11877 #include <asm/apic.h>
11878 #include <asm/io_apic.h> 11878 #include <asm/io_apic.h>
@@ -11890,9 +11890,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/head32.c linux-2.6.32.23/arch/x86/ker
11890 11890
11891 #ifdef CONFIG_BLK_DEV_INITRD 11891 #ifdef CONFIG_BLK_DEV_INITRD
11892 /* Reserve INITRD */ 11892 /* Reserve INITRD */
11893diff -urNp linux-2.6.32.23/arch/x86/kernel/head_32.S linux-2.6.32.23/arch/x86/kernel/head_32.S 11893diff -urNp linux-2.6.32.24/arch/x86/kernel/head_32.S linux-2.6.32.24/arch/x86/kernel/head_32.S
11894--- linux-2.6.32.23/arch/x86/kernel/head_32.S 2010-08-13 16:24:37.000000000 -0400 11894--- linux-2.6.32.24/arch/x86/kernel/head_32.S 2010-08-13 16:24:37.000000000 -0400
11895+++ linux-2.6.32.23/arch/x86/kernel/head_32.S 2010-09-04 15:54:51.000000000 -0400 11895+++ linux-2.6.32.24/arch/x86/kernel/head_32.S 2010-09-04 15:54:51.000000000 -0400
11896@@ -19,10 +19,17 @@ 11896@@ -19,10 +19,17 @@
11897 #include <asm/setup.h> 11897 #include <asm/setup.h>
11898 #include <asm/processor-flags.h> 11898 #include <asm/processor-flags.h>
@@ -12339,9 +12339,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/head_32.S linux-2.6.32.23/arch/x86/ke
12339+ /* Be sure this is zeroed to avoid false validations in Xen */ 12339+ /* Be sure this is zeroed to avoid false validations in Xen */
12340+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0 12340+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
12341+ .endr 12341+ .endr
12342diff -urNp linux-2.6.32.23/arch/x86/kernel/head_64.S linux-2.6.32.23/arch/x86/kernel/head_64.S 12342diff -urNp linux-2.6.32.24/arch/x86/kernel/head_64.S linux-2.6.32.24/arch/x86/kernel/head_64.S
12343--- linux-2.6.32.23/arch/x86/kernel/head_64.S 2010-08-13 16:24:37.000000000 -0400 12343--- linux-2.6.32.24/arch/x86/kernel/head_64.S 2010-08-13 16:24:37.000000000 -0400
12344+++ linux-2.6.32.23/arch/x86/kernel/head_64.S 2010-09-04 15:54:51.000000000 -0400 12344+++ linux-2.6.32.24/arch/x86/kernel/head_64.S 2010-09-04 15:54:51.000000000 -0400
12345@@ -19,6 +19,7 @@ 12345@@ -19,6 +19,7 @@
12346 #include <asm/cache.h> 12346 #include <asm/cache.h>
12347 #include <asm/processor-flags.h> 12347 #include <asm/processor-flags.h>
@@ -12612,9 +12612,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/head_64.S linux-2.6.32.23/arch/x86/ke
12612 12612
12613 __PAGE_ALIGNED_BSS 12613 __PAGE_ALIGNED_BSS
12614 .align PAGE_SIZE 12614 .align PAGE_SIZE
12615diff -urNp linux-2.6.32.23/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.23/arch/x86/kernel/i386_ksyms_32.c 12615diff -urNp linux-2.6.32.24/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.24/arch/x86/kernel/i386_ksyms_32.c
12616--- linux-2.6.32.23/arch/x86/kernel/i386_ksyms_32.c 2010-08-13 16:24:37.000000000 -0400 12616--- linux-2.6.32.24/arch/x86/kernel/i386_ksyms_32.c 2010-08-13 16:24:37.000000000 -0400
12617+++ linux-2.6.32.23/arch/x86/kernel/i386_ksyms_32.c 2010-09-04 15:54:51.000000000 -0400 12617+++ linux-2.6.32.24/arch/x86/kernel/i386_ksyms_32.c 2010-09-04 15:54:51.000000000 -0400
12618@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); 12618@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
12619 EXPORT_SYMBOL(cmpxchg8b_emu); 12619 EXPORT_SYMBOL(cmpxchg8b_emu);
12620 #endif 12620 #endif
@@ -12636,9 +12636,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.23/arch/
12636+#ifdef CONFIG_PAX_KERNEXEC 12636+#ifdef CONFIG_PAX_KERNEXEC
12637+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); 12637+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
12638+#endif 12638+#endif
12639diff -urNp linux-2.6.32.23/arch/x86/kernel/init_task.c linux-2.6.32.23/arch/x86/kernel/init_task.c 12639diff -urNp linux-2.6.32.24/arch/x86/kernel/init_task.c linux-2.6.32.24/arch/x86/kernel/init_task.c
12640--- linux-2.6.32.23/arch/x86/kernel/init_task.c 2010-08-13 16:24:37.000000000 -0400 12640--- linux-2.6.32.24/arch/x86/kernel/init_task.c 2010-08-13 16:24:37.000000000 -0400
12641+++ linux-2.6.32.23/arch/x86/kernel/init_task.c 2010-09-04 15:54:51.000000000 -0400 12641+++ linux-2.6.32.24/arch/x86/kernel/init_task.c 2010-09-04 15:54:51.000000000 -0400
12642@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); 12642@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
12643 * section. Since TSS's are completely CPU-local, we want them 12643 * section. Since TSS's are completely CPU-local, we want them
12644 * on exact cacheline boundaries, to eliminate cacheline ping-pong. 12644 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -12647,9 +12647,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/init_task.c linux-2.6.32.23/arch/x86/
12647- 12647-
12648+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; 12648+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
12649+EXPORT_SYMBOL(init_tss); 12649+EXPORT_SYMBOL(init_tss);
12650diff -urNp linux-2.6.32.23/arch/x86/kernel/ioport.c linux-2.6.32.23/arch/x86/kernel/ioport.c 12650diff -urNp linux-2.6.32.24/arch/x86/kernel/ioport.c linux-2.6.32.24/arch/x86/kernel/ioport.c
12651--- linux-2.6.32.23/arch/x86/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400 12651--- linux-2.6.32.24/arch/x86/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
12652+++ linux-2.6.32.23/arch/x86/kernel/ioport.c 2010-09-04 15:54:51.000000000 -0400 12652+++ linux-2.6.32.24/arch/x86/kernel/ioport.c 2010-09-04 15:54:51.000000000 -0400
12653@@ -6,6 +6,7 @@ 12653@@ -6,6 +6,7 @@
12654 #include <linux/sched.h> 12654 #include <linux/sched.h>
12655 #include <linux/kernel.h> 12655 #include <linux/kernel.h>
@@ -12693,9 +12693,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/ioport.c linux-2.6.32.23/arch/x86/ker
12693 if (!capable(CAP_SYS_RAWIO)) 12693 if (!capable(CAP_SYS_RAWIO))
12694 return -EPERM; 12694 return -EPERM;
12695 } 12695 }
12696diff -urNp linux-2.6.32.23/arch/x86/kernel/irq_32.c linux-2.6.32.23/arch/x86/kernel/irq_32.c 12696diff -urNp linux-2.6.32.24/arch/x86/kernel/irq_32.c linux-2.6.32.24/arch/x86/kernel/irq_32.c
12697--- linux-2.6.32.23/arch/x86/kernel/irq_32.c 2010-08-13 16:24:37.000000000 -0400 12697--- linux-2.6.32.24/arch/x86/kernel/irq_32.c 2010-08-13 16:24:37.000000000 -0400
12698+++ linux-2.6.32.23/arch/x86/kernel/irq_32.c 2010-09-04 15:54:51.000000000 -0400 12698+++ linux-2.6.32.24/arch/x86/kernel/irq_32.c 2010-09-04 15:54:51.000000000 -0400
12699@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc 12699@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
12700 return 0; 12700 return 0;
12701 12701
@@ -12714,9 +12714,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/irq_32.c linux-2.6.32.23/arch/x86/ker
12714 12714
12715 call_on_stack(__do_softirq, isp); 12715 call_on_stack(__do_softirq, isp);
12716 /* 12716 /*
12717diff -urNp linux-2.6.32.23/arch/x86/kernel/kgdb.c linux-2.6.32.23/arch/x86/kernel/kgdb.c 12717diff -urNp linux-2.6.32.24/arch/x86/kernel/kgdb.c linux-2.6.32.24/arch/x86/kernel/kgdb.c
12718--- linux-2.6.32.23/arch/x86/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400 12718--- linux-2.6.32.24/arch/x86/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
12719+++ linux-2.6.32.23/arch/x86/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400 12719+++ linux-2.6.32.24/arch/x86/kernel/kgdb.c 2010-09-04 15:54:51.000000000 -0400
12720@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception 12720@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
12721 return instruction_pointer(regs); 12721 return instruction_pointer(regs);
12722 } 12722 }
@@ -12726,9 +12726,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/kgdb.c linux-2.6.32.23/arch/x86/kerne
12726 /* Breakpoint instruction: */ 12726 /* Breakpoint instruction: */
12727 .gdb_bpt_instr = { 0xcc }, 12727 .gdb_bpt_instr = { 0xcc },
12728 .flags = KGDB_HW_BREAKPOINT, 12728 .flags = KGDB_HW_BREAKPOINT,
12729diff -urNp linux-2.6.32.23/arch/x86/kernel/kprobes.c linux-2.6.32.23/arch/x86/kernel/kprobes.c 12729diff -urNp linux-2.6.32.24/arch/x86/kernel/kprobes.c linux-2.6.32.24/arch/x86/kernel/kprobes.c
12730--- linux-2.6.32.23/arch/x86/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400 12730--- linux-2.6.32.24/arch/x86/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
12731+++ linux-2.6.32.23/arch/x86/kernel/kprobes.c 2010-09-04 15:54:51.000000000 -0400 12731+++ linux-2.6.32.24/arch/x86/kernel/kprobes.c 2010-09-04 15:54:51.000000000 -0400
12732@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f 12732@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
12733 char op; 12733 char op;
12734 s32 raddr; 12734 s32 raddr;
@@ -12821,9 +12821,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/kprobes.c linux-2.6.32.23/arch/x86/ke
12821 return ret; 12821 return ret;
12822 12822
12823 switch (val) { 12823 switch (val) {
12824diff -urNp linux-2.6.32.23/arch/x86/kernel/ldt.c linux-2.6.32.23/arch/x86/kernel/ldt.c 12824diff -urNp linux-2.6.32.24/arch/x86/kernel/ldt.c linux-2.6.32.24/arch/x86/kernel/ldt.c
12825--- linux-2.6.32.23/arch/x86/kernel/ldt.c 2010-08-13 16:24:37.000000000 -0400 12825--- linux-2.6.32.24/arch/x86/kernel/ldt.c 2010-08-13 16:24:37.000000000 -0400
12826+++ linux-2.6.32.23/arch/x86/kernel/ldt.c 2010-09-04 15:54:51.000000000 -0400 12826+++ linux-2.6.32.24/arch/x86/kernel/ldt.c 2010-09-04 15:54:51.000000000 -0400
12827@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i 12827@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
12828 if (reload) { 12828 if (reload) {
12829 #ifdef CONFIG_SMP 12829 #ifdef CONFIG_SMP
@@ -12888,9 +12888,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/ldt.c linux-2.6.32.23/arch/x86/kernel
12888 fill_ldt(&ldt, &ldt_info); 12888 fill_ldt(&ldt, &ldt_info);
12889 if (oldmode) 12889 if (oldmode)
12890 ldt.avl = 0; 12890 ldt.avl = 0;
12891diff -urNp linux-2.6.32.23/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.23/arch/x86/kernel/machine_kexec_32.c 12891diff -urNp linux-2.6.32.24/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.24/arch/x86/kernel/machine_kexec_32.c
12892--- linux-2.6.32.23/arch/x86/kernel/machine_kexec_32.c 2010-08-13 16:24:37.000000000 -0400 12892--- linux-2.6.32.24/arch/x86/kernel/machine_kexec_32.c 2010-08-13 16:24:37.000000000 -0400
12893+++ linux-2.6.32.23/arch/x86/kernel/machine_kexec_32.c 2010-09-04 15:54:51.000000000 -0400 12893+++ linux-2.6.32.24/arch/x86/kernel/machine_kexec_32.c 2010-09-04 15:54:51.000000000 -0400
12894@@ -26,7 +26,7 @@ 12894@@ -26,7 +26,7 @@
12895 #include <asm/system.h> 12895 #include <asm/system.h>
12896 #include <asm/cacheflush.h> 12896 #include <asm/cacheflush.h>
@@ -12918,9 +12918,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.23/ar
12918 12918
12919 relocate_kernel_ptr = control_page; 12919 relocate_kernel_ptr = control_page;
12920 page_list[PA_CONTROL_PAGE] = __pa(control_page); 12920 page_list[PA_CONTROL_PAGE] = __pa(control_page);
12921diff -urNp linux-2.6.32.23/arch/x86/kernel/microcode_amd.c linux-2.6.32.23/arch/x86/kernel/microcode_amd.c 12921diff -urNp linux-2.6.32.24/arch/x86/kernel/microcode_amd.c linux-2.6.32.24/arch/x86/kernel/microcode_amd.c
12922--- linux-2.6.32.23/arch/x86/kernel/microcode_amd.c 2010-08-13 16:24:37.000000000 -0400 12922--- linux-2.6.32.24/arch/x86/kernel/microcode_amd.c 2010-08-13 16:24:37.000000000 -0400
12923+++ linux-2.6.32.23/arch/x86/kernel/microcode_amd.c 2010-09-04 15:54:51.000000000 -0400 12923+++ linux-2.6.32.24/arch/x86/kernel/microcode_amd.c 2010-09-04 15:54:51.000000000 -0400
12924@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c 12924@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
12925 uci->mc = NULL; 12925 uci->mc = NULL;
12926 } 12926 }
@@ -12939,9 +12939,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/microcode_amd.c linux-2.6.32.23/arch/
12939 { 12939 {
12940 return &microcode_amd_ops; 12940 return &microcode_amd_ops;
12941 } 12941 }
12942diff -urNp linux-2.6.32.23/arch/x86/kernel/microcode_core.c linux-2.6.32.23/arch/x86/kernel/microcode_core.c 12942diff -urNp linux-2.6.32.24/arch/x86/kernel/microcode_core.c linux-2.6.32.24/arch/x86/kernel/microcode_core.c
12943--- linux-2.6.32.23/arch/x86/kernel/microcode_core.c 2010-08-13 16:24:37.000000000 -0400 12943--- linux-2.6.32.24/arch/x86/kernel/microcode_core.c 2010-08-13 16:24:37.000000000 -0400
12944+++ linux-2.6.32.23/arch/x86/kernel/microcode_core.c 2010-09-04 15:54:51.000000000 -0400 12944+++ linux-2.6.32.24/arch/x86/kernel/microcode_core.c 2010-09-04 15:54:51.000000000 -0400
12945@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); 12945@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
12946 12946
12947 #define MICROCODE_VERSION "2.00" 12947 #define MICROCODE_VERSION "2.00"
@@ -12951,9 +12951,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/microcode_core.c linux-2.6.32.23/arch
12951 12951
12952 /* 12952 /*
12953 * Synchronization. 12953 * Synchronization.
12954diff -urNp linux-2.6.32.23/arch/x86/kernel/microcode_intel.c linux-2.6.32.23/arch/x86/kernel/microcode_intel.c 12954diff -urNp linux-2.6.32.24/arch/x86/kernel/microcode_intel.c linux-2.6.32.24/arch/x86/kernel/microcode_intel.c
12955--- linux-2.6.32.23/arch/x86/kernel/microcode_intel.c 2010-08-13 16:24:37.000000000 -0400 12955--- linux-2.6.32.24/arch/x86/kernel/microcode_intel.c 2010-08-13 16:24:37.000000000 -0400
12956+++ linux-2.6.32.23/arch/x86/kernel/microcode_intel.c 2010-09-04 15:54:51.000000000 -0400 12956+++ linux-2.6.32.24/arch/x86/kernel/microcode_intel.c 2010-09-04 15:54:51.000000000 -0400
12957@@ -443,13 +443,13 @@ static enum ucode_state request_microcod 12957@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
12958 12958
12959 static int get_ucode_user(void *to, const void *from, size_t n) 12959 static int get_ucode_user(void *to, const void *from, size_t n)
@@ -12988,9 +12988,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/microcode_intel.c linux-2.6.32.23/arc
12988 { 12988 {
12989 return &microcode_intel_ops; 12989 return &microcode_intel_ops;
12990 } 12990 }
12991diff -urNp linux-2.6.32.23/arch/x86/kernel/module.c linux-2.6.32.23/arch/x86/kernel/module.c 12991diff -urNp linux-2.6.32.24/arch/x86/kernel/module.c linux-2.6.32.24/arch/x86/kernel/module.c
12992--- linux-2.6.32.23/arch/x86/kernel/module.c 2010-08-13 16:24:37.000000000 -0400 12992--- linux-2.6.32.24/arch/x86/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
12993+++ linux-2.6.32.23/arch/x86/kernel/module.c 2010-09-04 15:54:51.000000000 -0400 12993+++ linux-2.6.32.24/arch/x86/kernel/module.c 2010-09-04 15:54:51.000000000 -0400
12994@@ -34,7 +34,7 @@ 12994@@ -34,7 +34,7 @@
12995 #define DEBUGP(fmt...) 12995 #define DEBUGP(fmt...)
12996 #endif 12996 #endif
@@ -13131,9 +13131,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/module.c linux-2.6.32.23/arch/x86/ker
13131 #if 0 13131 #if 0
13132 if ((s64)val != *(s32 *)loc) 13132 if ((s64)val != *(s32 *)loc)
13133 goto overflow; 13133 goto overflow;
13134diff -urNp linux-2.6.32.23/arch/x86/kernel/paravirt.c linux-2.6.32.23/arch/x86/kernel/paravirt.c 13134diff -urNp linux-2.6.32.24/arch/x86/kernel/paravirt.c linux-2.6.32.24/arch/x86/kernel/paravirt.c
13135--- linux-2.6.32.23/arch/x86/kernel/paravirt.c 2010-08-13 16:24:37.000000000 -0400 13135--- linux-2.6.32.24/arch/x86/kernel/paravirt.c 2010-08-13 16:24:37.000000000 -0400
13136+++ linux-2.6.32.23/arch/x86/kernel/paravirt.c 2010-09-04 15:54:51.000000000 -0400 13136+++ linux-2.6.32.24/arch/x86/kernel/paravirt.c 2010-09-04 15:54:51.000000000 -0400
13137@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu 13137@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
13138 * corresponding structure. */ 13138 * corresponding structure. */
13139 static void *get_call_destination(u8 type) 13139 static void *get_call_destination(u8 type)
@@ -13237,9 +13237,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/paravirt.c linux-2.6.32.23/arch/x86/k
13237 }; 13237 };
13238 13238
13239 EXPORT_SYMBOL_GPL(pv_time_ops); 13239 EXPORT_SYMBOL_GPL(pv_time_ops);
13240diff -urNp linux-2.6.32.23/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.23/arch/x86/kernel/paravirt-spinlocks.c 13240diff -urNp linux-2.6.32.24/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.24/arch/x86/kernel/paravirt-spinlocks.c
13241--- linux-2.6.32.23/arch/x86/kernel/paravirt-spinlocks.c 2010-08-13 16:24:37.000000000 -0400 13241--- linux-2.6.32.24/arch/x86/kernel/paravirt-spinlocks.c 2010-08-13 16:24:37.000000000 -0400
13242+++ linux-2.6.32.23/arch/x86/kernel/paravirt-spinlocks.c 2010-09-04 15:54:51.000000000 -0400 13242+++ linux-2.6.32.24/arch/x86/kernel/paravirt-spinlocks.c 2010-09-04 15:54:51.000000000 -0400
13243@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * 13243@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
13244 __raw_spin_lock(lock); 13244 __raw_spin_lock(lock);
13245 } 13245 }
@@ -13249,9 +13249,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.23/
13249 #ifdef CONFIG_SMP 13249 #ifdef CONFIG_SMP
13250 .spin_is_locked = __ticket_spin_is_locked, 13250 .spin_is_locked = __ticket_spin_is_locked,
13251 .spin_is_contended = __ticket_spin_is_contended, 13251 .spin_is_contended = __ticket_spin_is_contended,
13252diff -urNp linux-2.6.32.23/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.23/arch/x86/kernel/pci-calgary_64.c 13252diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.24/arch/x86/kernel/pci-calgary_64.c
13253--- linux-2.6.32.23/arch/x86/kernel/pci-calgary_64.c 2010-08-13 16:24:37.000000000 -0400 13253--- linux-2.6.32.24/arch/x86/kernel/pci-calgary_64.c 2010-08-13 16:24:37.000000000 -0400
13254+++ linux-2.6.32.23/arch/x86/kernel/pci-calgary_64.c 2010-09-04 15:54:51.000000000 -0400 13254+++ linux-2.6.32.24/arch/x86/kernel/pci-calgary_64.c 2010-09-04 15:54:51.000000000 -0400
13255@@ -477,7 +477,7 @@ static void calgary_free_coherent(struct 13255@@ -477,7 +477,7 @@ static void calgary_free_coherent(struct
13256 free_pages((unsigned long)vaddr, get_order(size)); 13256 free_pages((unsigned long)vaddr, get_order(size));
13257 } 13257 }
@@ -13261,9 +13261,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.23/arch
13261 .alloc_coherent = calgary_alloc_coherent, 13261 .alloc_coherent = calgary_alloc_coherent,
13262 .free_coherent = calgary_free_coherent, 13262 .free_coherent = calgary_free_coherent,
13263 .map_sg = calgary_map_sg, 13263 .map_sg = calgary_map_sg,
13264diff -urNp linux-2.6.32.23/arch/x86/kernel/pci-dma.c linux-2.6.32.23/arch/x86/kernel/pci-dma.c 13264diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-dma.c linux-2.6.32.24/arch/x86/kernel/pci-dma.c
13265--- linux-2.6.32.23/arch/x86/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400 13265--- linux-2.6.32.24/arch/x86/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
13266+++ linux-2.6.32.23/arch/x86/kernel/pci-dma.c 2010-09-04 15:54:51.000000000 -0400 13266+++ linux-2.6.32.24/arch/x86/kernel/pci-dma.c 2010-09-04 15:54:51.000000000 -0400
13267@@ -14,7 +14,7 @@ 13267@@ -14,7 +14,7 @@
13268 13268
13269 static int forbid_dac __read_mostly; 13269 static int forbid_dac __read_mostly;
@@ -13282,9 +13282,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/pci-dma.c linux-2.6.32.23/arch/x86/ke
13282 13282
13283 #ifdef CONFIG_PCI 13283 #ifdef CONFIG_PCI
13284 if (mask > 0xffffffff && forbid_dac > 0) { 13284 if (mask > 0xffffffff && forbid_dac > 0) {
13285diff -urNp linux-2.6.32.23/arch/x86/kernel/pci-gart_64.c linux-2.6.32.23/arch/x86/kernel/pci-gart_64.c 13285diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-gart_64.c linux-2.6.32.24/arch/x86/kernel/pci-gart_64.c
13286--- linux-2.6.32.23/arch/x86/kernel/pci-gart_64.c 2010-08-13 16:24:37.000000000 -0400 13286--- linux-2.6.32.24/arch/x86/kernel/pci-gart_64.c 2010-08-13 16:24:37.000000000 -0400
13287+++ linux-2.6.32.23/arch/x86/kernel/pci-gart_64.c 2010-09-04 15:54:51.000000000 -0400 13287+++ linux-2.6.32.24/arch/x86/kernel/pci-gart_64.c 2010-09-04 15:54:51.000000000 -0400
13288@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag 13288@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
13289 return -1; 13289 return -1;
13290 } 13290 }
@@ -13294,9 +13294,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/pci-gart_64.c linux-2.6.32.23/arch/x8
13294 .map_sg = gart_map_sg, 13294 .map_sg = gart_map_sg,
13295 .unmap_sg = gart_unmap_sg, 13295 .unmap_sg = gart_unmap_sg,
13296 .map_page = gart_map_page, 13296 .map_page = gart_map_page,
13297diff -urNp linux-2.6.32.23/arch/x86/kernel/pci-nommu.c linux-2.6.32.23/arch/x86/kernel/pci-nommu.c 13297diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-nommu.c linux-2.6.32.24/arch/x86/kernel/pci-nommu.c
13298--- linux-2.6.32.23/arch/x86/kernel/pci-nommu.c 2010-08-13 16:24:37.000000000 -0400 13298--- linux-2.6.32.24/arch/x86/kernel/pci-nommu.c 2010-08-13 16:24:37.000000000 -0400
13299+++ linux-2.6.32.23/arch/x86/kernel/pci-nommu.c 2010-09-04 15:54:51.000000000 -0400 13299+++ linux-2.6.32.24/arch/x86/kernel/pci-nommu.c 2010-09-04 15:54:51.000000000 -0400
13300@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str 13300@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
13301 flush_write_buffers(); 13301 flush_write_buffers();
13302 } 13302 }
@@ -13306,9 +13306,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/pci-nommu.c linux-2.6.32.23/arch/x86/
13306 .alloc_coherent = dma_generic_alloc_coherent, 13306 .alloc_coherent = dma_generic_alloc_coherent,
13307 .free_coherent = nommu_free_coherent, 13307 .free_coherent = nommu_free_coherent,
13308 .map_sg = nommu_map_sg, 13308 .map_sg = nommu_map_sg,
13309diff -urNp linux-2.6.32.23/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.23/arch/x86/kernel/pci-swiotlb.c 13309diff -urNp linux-2.6.32.24/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.24/arch/x86/kernel/pci-swiotlb.c
13310--- linux-2.6.32.23/arch/x86/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400 13310--- linux-2.6.32.24/arch/x86/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
13311+++ linux-2.6.32.23/arch/x86/kernel/pci-swiotlb.c 2010-09-04 15:54:51.000000000 -0400 13311+++ linux-2.6.32.24/arch/x86/kernel/pci-swiotlb.c 2010-09-04 15:54:51.000000000 -0400
13312@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( 13312@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
13313 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); 13313 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
13314 } 13314 }
@@ -13318,9 +13318,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.23/arch/x8
13318 .mapping_error = swiotlb_dma_mapping_error, 13318 .mapping_error = swiotlb_dma_mapping_error,
13319 .alloc_coherent = x86_swiotlb_alloc_coherent, 13319 .alloc_coherent = x86_swiotlb_alloc_coherent,
13320 .free_coherent = swiotlb_free_coherent, 13320 .free_coherent = swiotlb_free_coherent,
13321diff -urNp linux-2.6.32.23/arch/x86/kernel/process_32.c linux-2.6.32.23/arch/x86/kernel/process_32.c 13321diff -urNp linux-2.6.32.24/arch/x86/kernel/process_32.c linux-2.6.32.24/arch/x86/kernel/process_32.c
13322--- linux-2.6.32.23/arch/x86/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400 13322--- linux-2.6.32.24/arch/x86/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
13323+++ linux-2.6.32.23/arch/x86/kernel/process_32.c 2010-09-04 15:54:51.000000000 -0400 13323+++ linux-2.6.32.24/arch/x86/kernel/process_32.c 2010-09-04 15:54:51.000000000 -0400
13324@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as 13324@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
13325 unsigned long thread_saved_pc(struct task_struct *tsk) 13325 unsigned long thread_saved_pc(struct task_struct *tsk)
13326 { 13326 {
@@ -13415,9 +13415,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/process_32.c linux-2.6.32.23/arch/x86
13415+ load_sp0(init_tss + smp_processor_id(), thread); 13415+ load_sp0(init_tss + smp_processor_id(), thread);
13416+} 13416+}
13417+#endif 13417+#endif
13418diff -urNp linux-2.6.32.23/arch/x86/kernel/process_64.c linux-2.6.32.23/arch/x86/kernel/process_64.c 13418diff -urNp linux-2.6.32.24/arch/x86/kernel/process_64.c linux-2.6.32.24/arch/x86/kernel/process_64.c
13419--- linux-2.6.32.23/arch/x86/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400 13419--- linux-2.6.32.24/arch/x86/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
13420+++ linux-2.6.32.23/arch/x86/kernel/process_64.c 2010-09-04 15:54:51.000000000 -0400 13420+++ linux-2.6.32.24/arch/x86/kernel/process_64.c 2010-09-04 15:54:51.000000000 -0400
13421@@ -91,7 +91,7 @@ static void __exit_idle(void) 13421@@ -91,7 +91,7 @@ static void __exit_idle(void)
13422 void exit_idle(void) 13422 void exit_idle(void)
13423 { 13423 {
@@ -13460,9 +13460,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/process_64.c linux-2.6.32.23/arch/x86
13460 return 0; 13460 return 0;
13461 ip = *(u64 *)(fp+8); 13461 ip = *(u64 *)(fp+8);
13462 if (!in_sched_functions(ip)) 13462 if (!in_sched_functions(ip))
13463diff -urNp linux-2.6.32.23/arch/x86/kernel/process.c linux-2.6.32.23/arch/x86/kernel/process.c 13463diff -urNp linux-2.6.32.24/arch/x86/kernel/process.c linux-2.6.32.24/arch/x86/kernel/process.c
13464--- linux-2.6.32.23/arch/x86/kernel/process.c 2010-08-13 16:24:37.000000000 -0400 13464--- linux-2.6.32.24/arch/x86/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
13465+++ linux-2.6.32.23/arch/x86/kernel/process.c 2010-09-04 15:54:51.000000000 -0400 13465+++ linux-2.6.32.24/arch/x86/kernel/process.c 2010-09-04 15:54:51.000000000 -0400
13466@@ -73,7 +73,7 @@ void exit_thread(void) 13466@@ -73,7 +73,7 @@ void exit_thread(void)
13467 unsigned long *bp = t->io_bitmap_ptr; 13467 unsigned long *bp = t->io_bitmap_ptr;
13468 13468
@@ -13500,9 +13500,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/process.c linux-2.6.32.23/arch/x86/ke
13500- return randomize_range(mm->brk, range_end, 0) ? : mm->brk; 13500- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
13501-} 13501-}
13502- 13502-
13503diff -urNp linux-2.6.32.23/arch/x86/kernel/ptrace.c linux-2.6.32.23/arch/x86/kernel/ptrace.c 13503diff -urNp linux-2.6.32.24/arch/x86/kernel/ptrace.c linux-2.6.32.24/arch/x86/kernel/ptrace.c
13504--- linux-2.6.32.23/arch/x86/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400 13504--- linux-2.6.32.24/arch/x86/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
13505+++ linux-2.6.32.23/arch/x86/kernel/ptrace.c 2010-09-04 15:54:51.000000000 -0400 13505+++ linux-2.6.32.24/arch/x86/kernel/ptrace.c 2010-09-04 15:54:51.000000000 -0400
13506@@ -925,7 +925,7 @@ static const struct user_regset_view use 13506@@ -925,7 +925,7 @@ static const struct user_regset_view use
13507 long arch_ptrace(struct task_struct *child, long request, long addr, long data) 13507 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
13508 { 13508 {
@@ -13571,9 +13571,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/ptrace.c linux-2.6.32.23/arch/x86/ker
13571 13571
13572 /* Send us the fake SIGTRAP */ 13572 /* Send us the fake SIGTRAP */
13573 force_sig_info(SIGTRAP, &info, tsk); 13573 force_sig_info(SIGTRAP, &info, tsk);
13574diff -urNp linux-2.6.32.23/arch/x86/kernel/reboot.c linux-2.6.32.23/arch/x86/kernel/reboot.c 13574diff -urNp linux-2.6.32.24/arch/x86/kernel/reboot.c linux-2.6.32.24/arch/x86/kernel/reboot.c
13575--- linux-2.6.32.23/arch/x86/kernel/reboot.c 2010-08-13 16:24:37.000000000 -0400 13575--- linux-2.6.32.24/arch/x86/kernel/reboot.c 2010-08-13 16:24:37.000000000 -0400
13576+++ linux-2.6.32.23/arch/x86/kernel/reboot.c 2010-09-04 15:54:51.000000000 -0400 13576+++ linux-2.6.32.24/arch/x86/kernel/reboot.c 2010-09-04 15:54:51.000000000 -0400
13577@@ -33,7 +33,7 @@ void (*pm_power_off)(void); 13577@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
13578 EXPORT_SYMBOL(pm_power_off); 13578 EXPORT_SYMBOL(pm_power_off);
13579 13579
@@ -13650,9 +13650,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/reboot.c linux-2.6.32.23/arch/x86/ker
13650 13650
13651 /* Set up the IDT for real mode. */ 13651 /* Set up the IDT for real mode. */
13652 load_idt(&real_mode_idt); 13652 load_idt(&real_mode_idt);
13653diff -urNp linux-2.6.32.23/arch/x86/kernel/setup.c linux-2.6.32.23/arch/x86/kernel/setup.c 13653diff -urNp linux-2.6.32.24/arch/x86/kernel/setup.c linux-2.6.32.24/arch/x86/kernel/setup.c
13654--- linux-2.6.32.23/arch/x86/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400 13654--- linux-2.6.32.24/arch/x86/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
13655+++ linux-2.6.32.23/arch/x86/kernel/setup.c 2010-09-04 15:54:51.000000000 -0400 13655+++ linux-2.6.32.24/arch/x86/kernel/setup.c 2010-09-04 15:54:51.000000000 -0400
13656@@ -782,14 +782,14 @@ void __init setup_arch(char **cmdline_p) 13656@@ -782,14 +782,14 @@ void __init setup_arch(char **cmdline_p)
13657 13657
13658 if (!boot_params.hdr.root_flags) 13658 if (!boot_params.hdr.root_flags)
@@ -13673,9 +13673,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/setup.c linux-2.6.32.23/arch/x86/kern
13673 data_resource.end = virt_to_phys(_edata)-1; 13673 data_resource.end = virt_to_phys(_edata)-1;
13674 bss_resource.start = virt_to_phys(&__bss_start); 13674 bss_resource.start = virt_to_phys(&__bss_start);
13675 bss_resource.end = virt_to_phys(&__bss_stop)-1; 13675 bss_resource.end = virt_to_phys(&__bss_stop)-1;
13676diff -urNp linux-2.6.32.23/arch/x86/kernel/setup_percpu.c linux-2.6.32.23/arch/x86/kernel/setup_percpu.c 13676diff -urNp linux-2.6.32.24/arch/x86/kernel/setup_percpu.c linux-2.6.32.24/arch/x86/kernel/setup_percpu.c
13677--- linux-2.6.32.23/arch/x86/kernel/setup_percpu.c 2010-08-13 16:24:37.000000000 -0400 13677--- linux-2.6.32.24/arch/x86/kernel/setup_percpu.c 2010-08-13 16:24:37.000000000 -0400
13678+++ linux-2.6.32.23/arch/x86/kernel/setup_percpu.c 2010-09-04 15:54:51.000000000 -0400 13678+++ linux-2.6.32.24/arch/x86/kernel/setup_percpu.c 2010-09-04 15:54:51.000000000 -0400
13679@@ -25,19 +25,17 @@ 13679@@ -25,19 +25,17 @@
13680 # define DBG(x...) 13680 # define DBG(x...)
13681 #endif 13681 #endif
@@ -13738,9 +13738,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/setup_percpu.c linux-2.6.32.23/arch/x
13738 /* 13738 /*
13739 * Up to this point, the boot CPU has been using .data.init 13739 * Up to this point, the boot CPU has been using .data.init
13740 * area. Reload any changed state for the boot CPU. 13740 * area. Reload any changed state for the boot CPU.
13741diff -urNp linux-2.6.32.23/arch/x86/kernel/signal.c linux-2.6.32.23/arch/x86/kernel/signal.c 13741diff -urNp linux-2.6.32.24/arch/x86/kernel/signal.c linux-2.6.32.24/arch/x86/kernel/signal.c
13742--- linux-2.6.32.23/arch/x86/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400 13742--- linux-2.6.32.24/arch/x86/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
13743+++ linux-2.6.32.23/arch/x86/kernel/signal.c 2010-09-04 15:54:51.000000000 -0400 13743+++ linux-2.6.32.24/arch/x86/kernel/signal.c 2010-09-04 15:54:51.000000000 -0400
13744@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi 13744@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
13745 * Align the stack pointer according to the i386 ABI, 13745 * Align the stack pointer according to the i386 ABI,
13746 * i.e. so that on function entry ((sp + 4) & 15) == 0. 13746 * i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -13812,9 +13812,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/signal.c linux-2.6.32.23/arch/x86/ker
13812 return; 13812 return;
13813 13813
13814 if (current_thread_info()->status & TS_RESTORE_SIGMASK) 13814 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
13815diff -urNp linux-2.6.32.23/arch/x86/kernel/smpboot.c linux-2.6.32.23/arch/x86/kernel/smpboot.c 13815diff -urNp linux-2.6.32.24/arch/x86/kernel/smpboot.c linux-2.6.32.24/arch/x86/kernel/smpboot.c
13816--- linux-2.6.32.23/arch/x86/kernel/smpboot.c 2010-08-29 21:08:20.000000000 -0400 13816--- linux-2.6.32.24/arch/x86/kernel/smpboot.c 2010-08-29 21:08:20.000000000 -0400
13817+++ linux-2.6.32.23/arch/x86/kernel/smpboot.c 2010-09-17 17:44:35.000000000 -0400 13817+++ linux-2.6.32.24/arch/x86/kernel/smpboot.c 2010-09-17 17:44:35.000000000 -0400
13818@@ -95,14 +95,14 @@ static DEFINE_PER_CPU(struct task_struct 13818@@ -95,14 +95,14 @@ static DEFINE_PER_CPU(struct task_struct
13819 */ 13819 */
13820 static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex); 13820 static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex);
@@ -13859,9 +13859,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/smpboot.c linux-2.6.32.23/arch/x86/ke
13859 #ifdef CONFIG_X86_32 13859 #ifdef CONFIG_X86_32
13860 /* init low mem mapping */ 13860 /* init low mem mapping */
13861 clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, 13861 clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
13862diff -urNp linux-2.6.32.23/arch/x86/kernel/step.c linux-2.6.32.23/arch/x86/kernel/step.c 13862diff -urNp linux-2.6.32.24/arch/x86/kernel/step.c linux-2.6.32.24/arch/x86/kernel/step.c
13863--- linux-2.6.32.23/arch/x86/kernel/step.c 2010-08-13 16:24:37.000000000 -0400 13863--- linux-2.6.32.24/arch/x86/kernel/step.c 2010-08-13 16:24:37.000000000 -0400
13864+++ linux-2.6.32.23/arch/x86/kernel/step.c 2010-09-04 15:54:51.000000000 -0400 13864+++ linux-2.6.32.24/arch/x86/kernel/step.c 2010-09-04 15:54:51.000000000 -0400
13865@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc 13865@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
13866 struct desc_struct *desc; 13866 struct desc_struct *desc;
13867 unsigned long base; 13867 unsigned long base;
@@ -13894,17 +13894,17 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/step.c linux-2.6.32.23/arch/x86/kerne
13894 /* 32-bit mode: register increment */ 13894 /* 32-bit mode: register increment */
13895 return 0; 13895 return 0;
13896 /* 64-bit mode: REX prefix */ 13896 /* 64-bit mode: REX prefix */
13897diff -urNp linux-2.6.32.23/arch/x86/kernel/syscall_table_32.S linux-2.6.32.23/arch/x86/kernel/syscall_table_32.S 13897diff -urNp linux-2.6.32.24/arch/x86/kernel/syscall_table_32.S linux-2.6.32.24/arch/x86/kernel/syscall_table_32.S
13898--- linux-2.6.32.23/arch/x86/kernel/syscall_table_32.S 2010-08-13 16:24:37.000000000 -0400 13898--- linux-2.6.32.24/arch/x86/kernel/syscall_table_32.S 2010-08-13 16:24:37.000000000 -0400
13899+++ linux-2.6.32.23/arch/x86/kernel/syscall_table_32.S 2010-09-04 15:54:51.000000000 -0400 13899+++ linux-2.6.32.24/arch/x86/kernel/syscall_table_32.S 2010-09-04 15:54:51.000000000 -0400
13900@@ -1,3 +1,4 @@ 13900@@ -1,3 +1,4 @@
13901+.section .rodata,"a",@progbits 13901+.section .rodata,"a",@progbits
13902 ENTRY(sys_call_table) 13902 ENTRY(sys_call_table)
13903 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ 13903 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
13904 .long sys_exit 13904 .long sys_exit
13905diff -urNp linux-2.6.32.23/arch/x86/kernel/sys_i386_32.c linux-2.6.32.23/arch/x86/kernel/sys_i386_32.c 13905diff -urNp linux-2.6.32.24/arch/x86/kernel/sys_i386_32.c linux-2.6.32.24/arch/x86/kernel/sys_i386_32.c
13906--- linux-2.6.32.23/arch/x86/kernel/sys_i386_32.c 2010-08-13 16:24:37.000000000 -0400 13906--- linux-2.6.32.24/arch/x86/kernel/sys_i386_32.c 2010-08-13 16:24:37.000000000 -0400
13907+++ linux-2.6.32.23/arch/x86/kernel/sys_i386_32.c 2010-09-26 22:08:46.000000000 -0400 13907+++ linux-2.6.32.24/arch/x86/kernel/sys_i386_32.c 2010-09-26 22:08:46.000000000 -0400
13908@@ -24,6 +24,21 @@ 13908@@ -24,6 +24,21 @@
13909 13909
13910 #include <asm/syscalls.h> 13910 #include <asm/syscalls.h>
@@ -14158,9 +14158,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/sys_i386_32.c linux-2.6.32.23/arch/x8
14158 } 14158 }
14159 case 1: /* iBCS2 emulator entry point */ 14159 case 1: /* iBCS2 emulator entry point */
14160 if (!segment_eq(get_fs(), get_ds())) 14160 if (!segment_eq(get_fs(), get_ds()))
14161diff -urNp linux-2.6.32.23/arch/x86/kernel/sys_x86_64.c linux-2.6.32.23/arch/x86/kernel/sys_x86_64.c 14161diff -urNp linux-2.6.32.24/arch/x86/kernel/sys_x86_64.c linux-2.6.32.24/arch/x86/kernel/sys_x86_64.c
14162--- linux-2.6.32.23/arch/x86/kernel/sys_x86_64.c 2010-08-13 16:24:37.000000000 -0400 14162--- linux-2.6.32.24/arch/x86/kernel/sys_x86_64.c 2010-08-13 16:24:37.000000000 -0400
14163+++ linux-2.6.32.23/arch/x86/kernel/sys_x86_64.c 2010-09-17 18:34:04.000000000 -0400 14163+++ linux-2.6.32.24/arch/x86/kernel/sys_x86_64.c 2010-09-17 18:34:04.000000000 -0400
14164@@ -32,8 +32,8 @@ out: 14164@@ -32,8 +32,8 @@ out:
14165 return error; 14165 return error;
14166 } 14166 }
@@ -14282,9 +14282,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/sys_x86_64.c linux-2.6.32.23/arch/x86
14282 mm->cached_hole_size = ~0UL; 14282 mm->cached_hole_size = ~0UL;
14283 14283
14284 return addr; 14284 return addr;
14285diff -urNp linux-2.6.32.23/arch/x86/kernel/time.c linux-2.6.32.23/arch/x86/kernel/time.c 14285diff -urNp linux-2.6.32.24/arch/x86/kernel/time.c linux-2.6.32.24/arch/x86/kernel/time.c
14286--- linux-2.6.32.23/arch/x86/kernel/time.c 2010-08-13 16:24:37.000000000 -0400 14286--- linux-2.6.32.24/arch/x86/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
14287+++ linux-2.6.32.23/arch/x86/kernel/time.c 2010-09-04 15:54:51.000000000 -0400 14287+++ linux-2.6.32.24/arch/x86/kernel/time.c 2010-09-04 15:54:51.000000000 -0400
14288@@ -26,17 +26,13 @@ 14288@@ -26,17 +26,13 @@
14289 int timer_ack; 14289 int timer_ack;
14290 #endif 14290 #endif
@@ -14323,9 +14323,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/time.c linux-2.6.32.23/arch/x86/kerne
14323 } 14323 }
14324 return pc; 14324 return pc;
14325 } 14325 }
14326diff -urNp linux-2.6.32.23/arch/x86/kernel/tls.c linux-2.6.32.23/arch/x86/kernel/tls.c 14326diff -urNp linux-2.6.32.24/arch/x86/kernel/tls.c linux-2.6.32.24/arch/x86/kernel/tls.c
14327--- linux-2.6.32.23/arch/x86/kernel/tls.c 2010-08-13 16:24:37.000000000 -0400 14327--- linux-2.6.32.24/arch/x86/kernel/tls.c 2010-08-13 16:24:37.000000000 -0400
14328+++ linux-2.6.32.23/arch/x86/kernel/tls.c 2010-09-04 15:54:51.000000000 -0400 14328+++ linux-2.6.32.24/arch/x86/kernel/tls.c 2010-09-04 15:54:51.000000000 -0400
14329@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc 14329@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
14330 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) 14330 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
14331 return -EINVAL; 14331 return -EINVAL;
@@ -14338,9 +14338,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/tls.c linux-2.6.32.23/arch/x86/kernel
14338 set_tls_desc(p, idx, &info, 1); 14338 set_tls_desc(p, idx, &info, 1);
14339 14339
14340 return 0; 14340 return 0;
14341diff -urNp linux-2.6.32.23/arch/x86/kernel/trampoline_32.S linux-2.6.32.23/arch/x86/kernel/trampoline_32.S 14341diff -urNp linux-2.6.32.24/arch/x86/kernel/trampoline_32.S linux-2.6.32.24/arch/x86/kernel/trampoline_32.S
14342--- linux-2.6.32.23/arch/x86/kernel/trampoline_32.S 2010-08-13 16:24:37.000000000 -0400 14342--- linux-2.6.32.24/arch/x86/kernel/trampoline_32.S 2010-08-13 16:24:37.000000000 -0400
14343+++ linux-2.6.32.23/arch/x86/kernel/trampoline_32.S 2010-09-04 15:54:51.000000000 -0400 14343+++ linux-2.6.32.24/arch/x86/kernel/trampoline_32.S 2010-09-04 15:54:51.000000000 -0400
14344@@ -32,6 +32,12 @@ 14344@@ -32,6 +32,12 @@
14345 #include <asm/segment.h> 14345 #include <asm/segment.h>
14346 #include <asm/page_types.h> 14346 #include <asm/page_types.h>
@@ -14363,9 +14363,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/trampoline_32.S linux-2.6.32.23/arch/
14363 14363
14364 # These need to be in the same 64K segment as the above; 14364 # These need to be in the same 64K segment as the above;
14365 # hence we don't use the boot_gdt_descr defined in head.S 14365 # hence we don't use the boot_gdt_descr defined in head.S
14366diff -urNp linux-2.6.32.23/arch/x86/kernel/traps.c linux-2.6.32.23/arch/x86/kernel/traps.c 14366diff -urNp linux-2.6.32.24/arch/x86/kernel/traps.c linux-2.6.32.24/arch/x86/kernel/traps.c
14367--- linux-2.6.32.23/arch/x86/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400 14367--- linux-2.6.32.24/arch/x86/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
14368+++ linux-2.6.32.23/arch/x86/kernel/traps.c 2010-09-04 15:54:51.000000000 -0400 14368+++ linux-2.6.32.24/arch/x86/kernel/traps.c 2010-09-04 15:54:51.000000000 -0400
14369@@ -69,12 +69,6 @@ asmlinkage int system_call(void); 14369@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
14370 14370
14371 /* Do we ignore FPU interrupts ? */ 14371 /* Do we ignore FPU interrupts ? */
@@ -14515,9 +14515,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/traps.c linux-2.6.32.23/arch/x86/kern
14515 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); 14515 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
14516 return; 14516 return;
14517 } 14517 }
14518diff -urNp linux-2.6.32.23/arch/x86/kernel/tsc.c linux-2.6.32.23/arch/x86/kernel/tsc.c 14518diff -urNp linux-2.6.32.24/arch/x86/kernel/tsc.c linux-2.6.32.24/arch/x86/kernel/tsc.c
14519--- linux-2.6.32.23/arch/x86/kernel/tsc.c 2010-09-20 17:26:42.000000000 -0400 14519--- linux-2.6.32.24/arch/x86/kernel/tsc.c 2010-09-20 17:26:42.000000000 -0400
14520+++ linux-2.6.32.23/arch/x86/kernel/tsc.c 2010-09-20 17:27:14.000000000 -0400 14520+++ linux-2.6.32.24/arch/x86/kernel/tsc.c 2010-09-20 17:27:14.000000000 -0400
14521@@ -833,7 +833,7 @@ static struct dmi_system_id __initdata b 14521@@ -833,7 +833,7 @@ static struct dmi_system_id __initdata b
14522 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), 14522 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
14523 }, 14523 },
@@ -14527,9 +14527,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/tsc.c linux-2.6.32.23/arch/x86/kernel
14527 }; 14527 };
14528 14528
14529 static void __init check_system_tsc_reliable(void) 14529 static void __init check_system_tsc_reliable(void)
14530diff -urNp linux-2.6.32.23/arch/x86/kernel/vm86_32.c linux-2.6.32.23/arch/x86/kernel/vm86_32.c 14530diff -urNp linux-2.6.32.24/arch/x86/kernel/vm86_32.c linux-2.6.32.24/arch/x86/kernel/vm86_32.c
14531--- linux-2.6.32.23/arch/x86/kernel/vm86_32.c 2010-08-13 16:24:37.000000000 -0400 14531--- linux-2.6.32.24/arch/x86/kernel/vm86_32.c 2010-08-13 16:24:37.000000000 -0400
14532+++ linux-2.6.32.23/arch/x86/kernel/vm86_32.c 2010-09-04 15:54:51.000000000 -0400 14532+++ linux-2.6.32.24/arch/x86/kernel/vm86_32.c 2010-09-04 15:54:51.000000000 -0400
14533@@ -41,6 +41,7 @@ 14533@@ -41,6 +41,7 @@
14534 #include <linux/ptrace.h> 14534 #include <linux/ptrace.h>
14535 #include <linux/audit.h> 14535 #include <linux/audit.h>
@@ -14594,9 +14594,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/vm86_32.c linux-2.6.32.23/arch/x86/ke
14594 if (get_user(segoffs, intr_ptr)) 14594 if (get_user(segoffs, intr_ptr))
14595 goto cannot_handle; 14595 goto cannot_handle;
14596 if ((segoffs >> 16) == BIOSSEG) 14596 if ((segoffs >> 16) == BIOSSEG)
14597diff -urNp linux-2.6.32.23/arch/x86/kernel/vmi_32.c linux-2.6.32.23/arch/x86/kernel/vmi_32.c 14597diff -urNp linux-2.6.32.24/arch/x86/kernel/vmi_32.c linux-2.6.32.24/arch/x86/kernel/vmi_32.c
14598--- linux-2.6.32.23/arch/x86/kernel/vmi_32.c 2010-08-13 16:24:37.000000000 -0400 14598--- linux-2.6.32.24/arch/x86/kernel/vmi_32.c 2010-08-13 16:24:37.000000000 -0400
14599+++ linux-2.6.32.23/arch/x86/kernel/vmi_32.c 2010-09-04 15:54:51.000000000 -0400 14599+++ linux-2.6.32.24/arch/x86/kernel/vmi_32.c 2010-09-04 15:54:51.000000000 -0400
14600@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) 14600@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
14601 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); 14601 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
14602 14602
@@ -14756,9 +14756,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/vmi_32.c linux-2.6.32.23/arch/x86/ker
14756 return; 14756 return;
14757 14757
14758 local_irq_save(flags); 14758 local_irq_save(flags);
14759diff -urNp linux-2.6.32.23/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.23/arch/x86/kernel/vmlinux.lds.S 14759diff -urNp linux-2.6.32.24/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.24/arch/x86/kernel/vmlinux.lds.S
14760--- linux-2.6.32.23/arch/x86/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400 14760--- linux-2.6.32.24/arch/x86/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
14761+++ linux-2.6.32.23/arch/x86/kernel/vmlinux.lds.S 2010-09-17 17:29:28.000000000 -0400 14761+++ linux-2.6.32.24/arch/x86/kernel/vmlinux.lds.S 2010-09-17 17:29:28.000000000 -0400
14762@@ -26,6 +26,13 @@ 14762@@ -26,6 +26,13 @@
14763 #include <asm/page_types.h> 14763 #include <asm/page_types.h>
14764 #include <asm/cache.h> 14764 #include <asm/cache.h>
@@ -15042,9 +15042,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.23/arch/x8
15042 "kernel image bigger than KERNEL_IMAGE_SIZE"); 15042 "kernel image bigger than KERNEL_IMAGE_SIZE");
15043 15043
15044 #ifdef CONFIG_SMP 15044 #ifdef CONFIG_SMP
15045diff -urNp linux-2.6.32.23/arch/x86/kernel/vsyscall_64.c linux-2.6.32.23/arch/x86/kernel/vsyscall_64.c 15045diff -urNp linux-2.6.32.24/arch/x86/kernel/vsyscall_64.c linux-2.6.32.24/arch/x86/kernel/vsyscall_64.c
15046--- linux-2.6.32.23/arch/x86/kernel/vsyscall_64.c 2010-08-13 16:24:37.000000000 -0400 15046--- linux-2.6.32.24/arch/x86/kernel/vsyscall_64.c 2010-08-13 16:24:37.000000000 -0400
15047+++ linux-2.6.32.23/arch/x86/kernel/vsyscall_64.c 2010-09-04 15:54:51.000000000 -0400 15047+++ linux-2.6.32.24/arch/x86/kernel/vsyscall_64.c 2010-09-04 15:54:51.000000000 -0400
15048@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa 15048@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
15049 15049
15050 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); 15050 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -15078,9 +15078,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/vsyscall_64.c linux-2.6.32.23/arch/x8
15078 }; 15078 };
15079 #endif 15079 #endif
15080 15080
15081diff -urNp linux-2.6.32.23/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.23/arch/x86/kernel/x8664_ksyms_64.c 15081diff -urNp linux-2.6.32.24/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.24/arch/x86/kernel/x8664_ksyms_64.c
15082--- linux-2.6.32.23/arch/x86/kernel/x8664_ksyms_64.c 2010-08-13 16:24:37.000000000 -0400 15082--- linux-2.6.32.24/arch/x86/kernel/x8664_ksyms_64.c 2010-08-13 16:24:37.000000000 -0400
15083+++ linux-2.6.32.23/arch/x86/kernel/x8664_ksyms_64.c 2010-09-04 15:54:51.000000000 -0400 15083+++ linux-2.6.32.24/arch/x86/kernel/x8664_ksyms_64.c 2010-09-04 15:54:51.000000000 -0400
15084@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); 15084@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
15085 15085
15086 EXPORT_SYMBOL(copy_user_generic); 15086 EXPORT_SYMBOL(copy_user_generic);
@@ -15090,9 +15090,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.23/arch
15090 EXPORT_SYMBOL(__copy_from_user_inatomic); 15090 EXPORT_SYMBOL(__copy_from_user_inatomic);
15091 15091
15092 EXPORT_SYMBOL(copy_page); 15092 EXPORT_SYMBOL(copy_page);
15093diff -urNp linux-2.6.32.23/arch/x86/kernel/xsave.c linux-2.6.32.23/arch/x86/kernel/xsave.c 15093diff -urNp linux-2.6.32.24/arch/x86/kernel/xsave.c linux-2.6.32.24/arch/x86/kernel/xsave.c
15094--- linux-2.6.32.23/arch/x86/kernel/xsave.c 2010-08-13 16:24:37.000000000 -0400 15094--- linux-2.6.32.24/arch/x86/kernel/xsave.c 2010-08-13 16:24:37.000000000 -0400
15095+++ linux-2.6.32.23/arch/x86/kernel/xsave.c 2010-09-04 15:54:51.000000000 -0400 15095+++ linux-2.6.32.24/arch/x86/kernel/xsave.c 2010-09-04 15:54:51.000000000 -0400
15096@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ 15096@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
15097 fx_sw_user->xstate_size > fx_sw_user->extended_size) 15097 fx_sw_user->xstate_size > fx_sw_user->extended_size)
15098 return -1; 15098 return -1;
@@ -15120,9 +15120,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kernel/xsave.c linux-2.6.32.23/arch/x86/kern
15120 buf); 15120 buf);
15121 if (unlikely(err)) { 15121 if (unlikely(err)) {
15122 /* 15122 /*
15123diff -urNp linux-2.6.32.23/arch/x86/kvm/emulate.c linux-2.6.32.23/arch/x86/kvm/emulate.c 15123diff -urNp linux-2.6.32.24/arch/x86/kvm/emulate.c linux-2.6.32.24/arch/x86/kvm/emulate.c
15124--- linux-2.6.32.23/arch/x86/kvm/emulate.c 2010-08-13 16:24:37.000000000 -0400 15124--- linux-2.6.32.24/arch/x86/kvm/emulate.c 2010-08-13 16:24:37.000000000 -0400
15125+++ linux-2.6.32.23/arch/x86/kvm/emulate.c 2010-09-04 15:54:51.000000000 -0400 15125+++ linux-2.6.32.24/arch/x86/kvm/emulate.c 2010-09-04 15:54:51.000000000 -0400
15126@@ -81,8 +81,8 @@ 15126@@ -81,8 +81,8 @@
15127 #define Src2CL (1<<29) 15127 #define Src2CL (1<<29)
15128 #define Src2ImmByte (2<<29) 15128 #define Src2ImmByte (2<<29)
@@ -15159,9 +15159,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kvm/emulate.c linux-2.6.32.23/arch/x86/kvm/e
15159 switch ((_dst).bytes) { \ 15159 switch ((_dst).bytes) { \
15160 case 1: \ 15160 case 1: \
15161 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ 15161 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
15162diff -urNp linux-2.6.32.23/arch/x86/kvm/lapic.c linux-2.6.32.23/arch/x86/kvm/lapic.c 15162diff -urNp linux-2.6.32.24/arch/x86/kvm/lapic.c linux-2.6.32.24/arch/x86/kvm/lapic.c
15163--- linux-2.6.32.23/arch/x86/kvm/lapic.c 2010-08-13 16:24:37.000000000 -0400 15163--- linux-2.6.32.24/arch/x86/kvm/lapic.c 2010-08-13 16:24:37.000000000 -0400
15164+++ linux-2.6.32.23/arch/x86/kvm/lapic.c 2010-09-04 15:54:51.000000000 -0400 15164+++ linux-2.6.32.24/arch/x86/kvm/lapic.c 2010-09-04 15:54:51.000000000 -0400
15165@@ -52,7 +52,7 @@ 15165@@ -52,7 +52,7 @@
15166 #define APIC_BUS_CYCLE_NS 1 15166 #define APIC_BUS_CYCLE_NS 1
15167 15167
@@ -15171,9 +15171,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kvm/lapic.c linux-2.6.32.23/arch/x86/kvm/lap
15171 15171
15172 #define APIC_LVT_NUM 6 15172 #define APIC_LVT_NUM 6
15173 /* 14 is the version for Xeon and Pentium 8.4.8*/ 15173 /* 14 is the version for Xeon and Pentium 8.4.8*/
15174diff -urNp linux-2.6.32.23/arch/x86/kvm/svm.c linux-2.6.32.23/arch/x86/kvm/svm.c 15174diff -urNp linux-2.6.32.24/arch/x86/kvm/svm.c linux-2.6.32.24/arch/x86/kvm/svm.c
15175--- linux-2.6.32.23/arch/x86/kvm/svm.c 2010-08-13 16:24:37.000000000 -0400 15175--- linux-2.6.32.24/arch/x86/kvm/svm.c 2010-08-13 16:24:37.000000000 -0400
15176+++ linux-2.6.32.23/arch/x86/kvm/svm.c 2010-09-04 15:54:51.000000000 -0400 15176+++ linux-2.6.32.24/arch/x86/kvm/svm.c 2010-09-04 15:54:51.000000000 -0400
15177@@ -2482,9 +2482,12 @@ static int handle_exit(struct kvm_run *k 15177@@ -2482,9 +2482,12 @@ static int handle_exit(struct kvm_run *k
15178 static void reload_tss(struct kvm_vcpu *vcpu) 15178 static void reload_tss(struct kvm_vcpu *vcpu)
15179 { 15179 {
@@ -15197,9 +15197,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kvm/svm.c linux-2.6.32.23/arch/x86/kvm/svm.c
15197 .cpu_has_kvm_support = has_svm, 15197 .cpu_has_kvm_support = has_svm,
15198 .disabled_by_bios = is_disabled, 15198 .disabled_by_bios = is_disabled,
15199 .hardware_setup = svm_hardware_setup, 15199 .hardware_setup = svm_hardware_setup,
15200diff -urNp linux-2.6.32.23/arch/x86/kvm/vmx.c linux-2.6.32.23/arch/x86/kvm/vmx.c 15200diff -urNp linux-2.6.32.24/arch/x86/kvm/vmx.c linux-2.6.32.24/arch/x86/kvm/vmx.c
15201--- linux-2.6.32.23/arch/x86/kvm/vmx.c 2010-08-13 16:24:37.000000000 -0400 15201--- linux-2.6.32.24/arch/x86/kvm/vmx.c 2010-08-13 16:24:37.000000000 -0400
15202+++ linux-2.6.32.23/arch/x86/kvm/vmx.c 2010-09-04 15:54:51.000000000 -0400 15202+++ linux-2.6.32.24/arch/x86/kvm/vmx.c 2010-09-28 18:19:37.000000000 -0400
15203@@ -569,7 +569,11 @@ static void reload_tss(void) 15203@@ -569,7 +569,11 @@ static void reload_tss(void)
15204 15204
15205 kvm_get_gdt(&gdt); 15205 kvm_get_gdt(&gdt);
@@ -15268,7 +15268,7 @@ diff -urNp linux-2.6.32.23/arch/x86/kvm/vmx.c linux-2.6.32.23/arch/x86/kvm/vmx.c
15268 fixup_rmode_irq(vmx); 15268 fixup_rmode_irq(vmx);
15269 15269
15270- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS)); 15270- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
15271+ asm("mov %0, %%ds; mov %0, %%es" : : "r"(__KERNEL_DS)); 15271+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
15272 vmx->launched = 1; 15272 vmx->launched = 1;
15273 15273
15274 vmx_complete_interrupts(vmx); 15274 vmx_complete_interrupts(vmx);
@@ -15281,9 +15281,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kvm/vmx.c linux-2.6.32.23/arch/x86/kvm/vmx.c
15281 .cpu_has_kvm_support = cpu_has_kvm_support, 15281 .cpu_has_kvm_support = cpu_has_kvm_support,
15282 .disabled_by_bios = vmx_disabled_by_bios, 15282 .disabled_by_bios = vmx_disabled_by_bios,
15283 .hardware_setup = hardware_setup, 15283 .hardware_setup = hardware_setup,
15284diff -urNp linux-2.6.32.23/arch/x86/kvm/x86.c linux-2.6.32.23/arch/x86/kvm/x86.c 15284diff -urNp linux-2.6.32.24/arch/x86/kvm/x86.c linux-2.6.32.24/arch/x86/kvm/x86.c
15285--- linux-2.6.32.23/arch/x86/kvm/x86.c 2010-08-13 16:24:37.000000000 -0400 15285--- linux-2.6.32.24/arch/x86/kvm/x86.c 2010-08-13 16:24:37.000000000 -0400
15286+++ linux-2.6.32.23/arch/x86/kvm/x86.c 2010-09-04 15:54:51.000000000 -0400 15286+++ linux-2.6.32.24/arch/x86/kvm/x86.c 2010-09-04 15:54:51.000000000 -0400
15287@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct 15287@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct
15288 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, 15288 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
15289 struct kvm_cpuid_entry2 __user *entries); 15289 struct kvm_cpuid_entry2 __user *entries);
@@ -15385,9 +15385,9 @@ diff -urNp linux-2.6.32.23/arch/x86/kvm/x86.c linux-2.6.32.23/arch/x86/kvm/x86.c
15385 15385
15386 if (kvm_x86_ops) { 15386 if (kvm_x86_ops) {
15387 printk(KERN_ERR "kvm: already loaded the other module\n"); 15387 printk(KERN_ERR "kvm: already loaded the other module\n");
15388diff -urNp linux-2.6.32.23/arch/x86/lib/checksum_32.S linux-2.6.32.23/arch/x86/lib/checksum_32.S 15388diff -urNp linux-2.6.32.24/arch/x86/lib/checksum_32.S linux-2.6.32.24/arch/x86/lib/checksum_32.S
15389--- linux-2.6.32.23/arch/x86/lib/checksum_32.S 2010-08-13 16:24:37.000000000 -0400 15389--- linux-2.6.32.24/arch/x86/lib/checksum_32.S 2010-08-13 16:24:37.000000000 -0400
15390+++ linux-2.6.32.23/arch/x86/lib/checksum_32.S 2010-09-04 15:54:51.000000000 -0400 15390+++ linux-2.6.32.24/arch/x86/lib/checksum_32.S 2010-09-04 15:54:51.000000000 -0400
15391@@ -28,7 +28,8 @@ 15391@@ -28,7 +28,8 @@
15392 #include <linux/linkage.h> 15392 #include <linux/linkage.h>
15393 #include <asm/dwarf2.h> 15393 #include <asm/dwarf2.h>
@@ -15633,9 +15633,9 @@ diff -urNp linux-2.6.32.23/arch/x86/lib/checksum_32.S linux-2.6.32.23/arch/x86/l
15633 15633
15634 #undef ROUND 15634 #undef ROUND
15635 #undef ROUND1 15635 #undef ROUND1
15636diff -urNp linux-2.6.32.23/arch/x86/lib/clear_page_64.S linux-2.6.32.23/arch/x86/lib/clear_page_64.S 15636diff -urNp linux-2.6.32.24/arch/x86/lib/clear_page_64.S linux-2.6.32.24/arch/x86/lib/clear_page_64.S
15637--- linux-2.6.32.23/arch/x86/lib/clear_page_64.S 2010-08-13 16:24:37.000000000 -0400 15637--- linux-2.6.32.24/arch/x86/lib/clear_page_64.S 2010-08-13 16:24:37.000000000 -0400
15638+++ linux-2.6.32.23/arch/x86/lib/clear_page_64.S 2010-09-04 15:54:51.000000000 -0400 15638+++ linux-2.6.32.24/arch/x86/lib/clear_page_64.S 2010-09-04 15:54:51.000000000 -0400
15639@@ -43,7 +43,7 @@ ENDPROC(clear_page) 15639@@ -43,7 +43,7 @@ ENDPROC(clear_page)
15640 15640
15641 #include <asm/cpufeature.h> 15641 #include <asm/cpufeature.h>
@@ -15645,9 +15645,9 @@ diff -urNp linux-2.6.32.23/arch/x86/lib/clear_page_64.S linux-2.6.32.23/arch/x86
15645 1: .byte 0xeb /* jmp <disp8> */ 15645 1: .byte 0xeb /* jmp <disp8> */
15646 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 15646 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
15647 2: 15647 2:
15648diff -urNp linux-2.6.32.23/arch/x86/lib/copy_page_64.S linux-2.6.32.23/arch/x86/lib/copy_page_64.S 15648diff -urNp linux-2.6.32.24/arch/x86/lib/copy_page_64.S linux-2.6.32.24/arch/x86/lib/copy_page_64.S
15649--- linux-2.6.32.23/arch/x86/lib/copy_page_64.S 2010-08-13 16:24:37.000000000 -0400 15649--- linux-2.6.32.24/arch/x86/lib/copy_page_64.S 2010-08-13 16:24:37.000000000 -0400
15650+++ linux-2.6.32.23/arch/x86/lib/copy_page_64.S 2010-09-04 15:54:51.000000000 -0400 15650+++ linux-2.6.32.24/arch/x86/lib/copy_page_64.S 2010-09-04 15:54:51.000000000 -0400
15651@@ -104,7 +104,7 @@ ENDPROC(copy_page) 15651@@ -104,7 +104,7 @@ ENDPROC(copy_page)
15652 15652
15653 #include <asm/cpufeature.h> 15653 #include <asm/cpufeature.h>
@@ -15657,9 +15657,9 @@ diff -urNp linux-2.6.32.23/arch/x86/lib/copy_page_64.S linux-2.6.32.23/arch/x86/
15657 1: .byte 0xeb /* jmp <disp8> */ 15657 1: .byte 0xeb /* jmp <disp8> */
15658 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 15658 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
15659 2: 15659 2:
15660diff -urNp linux-2.6.32.23/arch/x86/lib/copy_user_64.S linux-2.6.32.23/arch/x86/lib/copy_user_64.S 15660diff -urNp linux-2.6.32.24/arch/x86/lib/copy_user_64.S linux-2.6.32.24/arch/x86/lib/copy_user_64.S
15661--- linux-2.6.32.23/arch/x86/lib/copy_user_64.S 2010-08-13 16:24:37.000000000 -0400 15661--- linux-2.6.32.24/arch/x86/lib/copy_user_64.S 2010-08-13 16:24:37.000000000 -0400
15662+++ linux-2.6.32.23/arch/x86/lib/copy_user_64.S 2010-09-04 15:54:51.000000000 -0400 15662+++ linux-2.6.32.24/arch/x86/lib/copy_user_64.S 2010-09-04 15:54:51.000000000 -0400
15663@@ -15,13 +15,14 @@ 15663@@ -15,13 +15,14 @@
15664 #include <asm/asm-offsets.h> 15664 #include <asm/asm-offsets.h>
15665 #include <asm/thread_info.h> 15665 #include <asm/thread_info.h>
@@ -15734,9 +15734,9 @@ diff -urNp linux-2.6.32.23/arch/x86/lib/copy_user_64.S linux-2.6.32.23/arch/x86/
15734 movl %edx,%ecx 15734 movl %edx,%ecx
15735 xorl %eax,%eax 15735 xorl %eax,%eax
15736 rep 15736 rep
15737diff -urNp linux-2.6.32.23/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.23/arch/x86/lib/copy_user_nocache_64.S 15737diff -urNp linux-2.6.32.24/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.24/arch/x86/lib/copy_user_nocache_64.S
15738--- linux-2.6.32.23/arch/x86/lib/copy_user_nocache_64.S 2010-08-13 16:24:37.000000000 -0400 15738--- linux-2.6.32.24/arch/x86/lib/copy_user_nocache_64.S 2010-08-13 16:24:37.000000000 -0400
15739+++ linux-2.6.32.23/arch/x86/lib/copy_user_nocache_64.S 2010-09-04 15:54:51.000000000 -0400 15739+++ linux-2.6.32.24/arch/x86/lib/copy_user_nocache_64.S 2010-09-04 15:54:51.000000000 -0400
15740@@ -14,6 +14,7 @@ 15740@@ -14,6 +14,7 @@
15741 #include <asm/current.h> 15741 #include <asm/current.h>
15742 #include <asm/asm-offsets.h> 15742 #include <asm/asm-offsets.h>
@@ -15761,9 +15761,9 @@ diff -urNp linux-2.6.32.23/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.23/a
15761 cmpl $8,%edx 15761 cmpl $8,%edx
15762 jb 20f /* less then 8 bytes, go to byte copy loop */ 15762 jb 20f /* less then 8 bytes, go to byte copy loop */
15763 ALIGN_DESTINATION 15763 ALIGN_DESTINATION
15764diff -urNp linux-2.6.32.23/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.23/arch/x86/lib/csum-wrappers_64.c 15764diff -urNp linux-2.6.32.24/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.24/arch/x86/lib/csum-wrappers_64.c
15765--- linux-2.6.32.23/arch/x86/lib/csum-wrappers_64.c 2010-08-13 16:24:37.000000000 -0400 15765--- linux-2.6.32.24/arch/x86/lib/csum-wrappers_64.c 2010-08-13 16:24:37.000000000 -0400
15766+++ linux-2.6.32.23/arch/x86/lib/csum-wrappers_64.c 2010-09-04 15:54:51.000000000 -0400 15766+++ linux-2.6.32.24/arch/x86/lib/csum-wrappers_64.c 2010-09-04 15:54:51.000000000 -0400
15767@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ 15767@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
15768 len -= 2; 15768 len -= 2;
15769 } 15769 }
@@ -15782,9 +15782,9 @@ diff -urNp linux-2.6.32.23/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.23/arch/
15782 return csum_partial_copy_generic(src, (void __force *)dst, 15782 return csum_partial_copy_generic(src, (void __force *)dst,
15783 len, isum, NULL, errp); 15783 len, isum, NULL, errp);
15784 } 15784 }
15785diff -urNp linux-2.6.32.23/arch/x86/lib/getuser.S linux-2.6.32.23/arch/x86/lib/getuser.S 15785diff -urNp linux-2.6.32.24/arch/x86/lib/getuser.S linux-2.6.32.24/arch/x86/lib/getuser.S
15786--- linux-2.6.32.23/arch/x86/lib/getuser.S 2010-08-13 16:24:37.000000000 -0400 15786--- linux-2.6.32.24/arch/x86/lib/getuser.S 2010-08-13 16:24:37.000000000 -0400
15787+++ linux-2.6.32.23/arch/x86/lib/getuser.S 2010-09-04 15:54:51.000000000 -0400 15787+++ linux-2.6.32.24/arch/x86/lib/getuser.S 2010-09-04 15:54:51.000000000 -0400
15788@@ -33,14 +33,38 @@ 15788@@ -33,14 +33,38 @@
15789 #include <asm/asm-offsets.h> 15789 #include <asm/asm-offsets.h>
15790 #include <asm/thread_info.h> 15790 #include <asm/thread_info.h>
@@ -15921,9 +15921,9 @@ diff -urNp linux-2.6.32.23/arch/x86/lib/getuser.S linux-2.6.32.23/arch/x86/lib/g
15921 xor %edx,%edx 15921 xor %edx,%edx
15922 mov $(-EFAULT),%_ASM_AX 15922 mov $(-EFAULT),%_ASM_AX
15923 ret 15923 ret
15924diff -urNp linux-2.6.32.23/arch/x86/lib/memcpy_64.S linux-2.6.32.23/arch/x86/lib/memcpy_64.S 15924diff -urNp linux-2.6.32.24/arch/x86/lib/memcpy_64.S linux-2.6.32.24/arch/x86/lib/memcpy_64.S
15925--- linux-2.6.32.23/arch/x86/lib/memcpy_64.S 2010-08-13 16:24:37.000000000 -0400 15925--- linux-2.6.32.24/arch/x86/lib/memcpy_64.S 2010-08-13 16:24:37.000000000 -0400
15926+++ linux-2.6.32.23/arch/x86/lib/memcpy_64.S 2010-09-04 15:54:51.000000000 -0400 15926+++ linux-2.6.32.24/arch/x86/lib/memcpy_64.S 2010-09-04 15:54:51.000000000 -0400
15927@@ -128,7 +128,7 @@ ENDPROC(__memcpy) 15927@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
15928 * It is also a lot simpler. Use this when possible: 15928 * It is also a lot simpler. Use this when possible:
15929 */ 15929 */
@@ -15933,9 +15933,9 @@ diff -urNp linux-2.6.32.23/arch/x86/lib/memcpy_64.S linux-2.6.32.23/arch/x86/lib
15933 1: .byte 0xeb /* jmp <disp8> */ 15933 1: .byte 0xeb /* jmp <disp8> */
15934 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 15934 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
15935 2: 15935 2:
15936diff -urNp linux-2.6.32.23/arch/x86/lib/memset_64.S linux-2.6.32.23/arch/x86/lib/memset_64.S 15936diff -urNp linux-2.6.32.24/arch/x86/lib/memset_64.S linux-2.6.32.24/arch/x86/lib/memset_64.S
15937--- linux-2.6.32.23/arch/x86/lib/memset_64.S 2010-08-13 16:24:37.000000000 -0400 15937--- linux-2.6.32.24/arch/x86/lib/memset_64.S 2010-08-13 16:24:37.000000000 -0400
15938+++ linux-2.6.32.23/arch/x86/lib/memset_64.S 2010-09-04 15:54:51.000000000 -0400 15938+++ linux-2.6.32.24/arch/x86/lib/memset_64.S 2010-09-04 15:54:51.000000000 -0400
15939@@ -118,7 +118,7 @@ ENDPROC(__memset) 15939@@ -118,7 +118,7 @@ ENDPROC(__memset)
15940 15940
15941 #include <asm/cpufeature.h> 15941 #include <asm/cpufeature.h>
@@ -15945,9 +15945,9 @@ diff -urNp linux-2.6.32.23/arch/x86/lib/memset_64.S linux-2.6.32.23/arch/x86/lib
15945 1: .byte 0xeb /* jmp <disp8> */ 15945 1: .byte 0xeb /* jmp <disp8> */
15946 .byte (memset_c - memset) - (2f - 1b) /* offset */ 15946 .byte (memset_c - memset) - (2f - 1b) /* offset */
15947 2: 15947 2:
15948diff -urNp linux-2.6.32.23/arch/x86/lib/mmx_32.c linux-2.6.32.23/arch/x86/lib/mmx_32.c 15948diff -urNp linux-2.6.32.24/arch/x86/lib/mmx_32.c linux-2.6.32.24/arch/x86/lib/mmx_32.c
15949--- linux-2.6.32.23/arch/x86/lib/mmx_32.c 2010-08-13 16:24:37.000000000 -0400 15949--- linux-2.6.32.24/arch/x86/lib/mmx_32.c 2010-08-13 16:24:37.000000000 -0400
15950+++ linux-2.6.32.23/arch/x86/lib/mmx_32.c 2010-09-04 15:54:51.000000000 -0400 15950+++ linux-2.6.32.24/arch/x86/lib/mmx_32.c 2010-09-04 15:54:51.000000000 -0400
15951@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * 15951@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
15952 { 15952 {
15953 void *p; 15953 void *p;
@@ -16263,9 +16263,9 @@ diff -urNp linux-2.6.32.23/arch/x86/lib/mmx_32.c linux-2.6.32.23/arch/x86/lib/mm
16263 16263
16264 from += 64; 16264 from += 64;
16265 to += 64; 16265 to += 64;
16266diff -urNp linux-2.6.32.23/arch/x86/lib/putuser.S linux-2.6.32.23/arch/x86/lib/putuser.S 16266diff -urNp linux-2.6.32.24/arch/x86/lib/putuser.S linux-2.6.32.24/arch/x86/lib/putuser.S
16267--- linux-2.6.32.23/arch/x86/lib/putuser.S 2010-08-13 16:24:37.000000000 -0400 16267--- linux-2.6.32.24/arch/x86/lib/putuser.S 2010-08-13 16:24:37.000000000 -0400
16268+++ linux-2.6.32.23/arch/x86/lib/putuser.S 2010-09-04 15:54:51.000000000 -0400 16268+++ linux-2.6.32.24/arch/x86/lib/putuser.S 2010-09-04 15:54:51.000000000 -0400
16269@@ -15,7 +15,8 @@ 16269@@ -15,7 +15,8 @@
16270 #include <asm/thread_info.h> 16270 #include <asm/thread_info.h>
16271 #include <asm/errno.h> 16271 #include <asm/errno.h>
@@ -16446,9 +16446,9 @@ diff -urNp linux-2.6.32.23/arch/x86/lib/putuser.S linux-2.6.32.23/arch/x86/lib/p
16446 movl $-EFAULT,%eax 16446 movl $-EFAULT,%eax
16447 EXIT 16447 EXIT
16448 END(bad_put_user) 16448 END(bad_put_user)
16449diff -urNp linux-2.6.32.23/arch/x86/lib/usercopy_32.c linux-2.6.32.23/arch/x86/lib/usercopy_32.c 16449diff -urNp linux-2.6.32.24/arch/x86/lib/usercopy_32.c linux-2.6.32.24/arch/x86/lib/usercopy_32.c
16450--- linux-2.6.32.23/arch/x86/lib/usercopy_32.c 2010-08-13 16:24:37.000000000 -0400 16450--- linux-2.6.32.24/arch/x86/lib/usercopy_32.c 2010-08-13 16:24:37.000000000 -0400
16451+++ linux-2.6.32.23/arch/x86/lib/usercopy_32.c 2010-09-04 15:54:51.000000000 -0400 16451+++ linux-2.6.32.24/arch/x86/lib/usercopy_32.c 2010-09-04 15:54:51.000000000 -0400
16452@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned 16452@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
16453 * Copy a null terminated string from userspace. 16453 * Copy a null terminated string from userspace.
16454 */ 16454 */
@@ -17417,9 +17417,9 @@ diff -urNp linux-2.6.32.23/arch/x86/lib/usercopy_32.c linux-2.6.32.23/arch/x86/l
17417+#endif 17417+#endif
17418+ 17418+
17419+EXPORT_SYMBOL(set_fs); 17419+EXPORT_SYMBOL(set_fs);
17420diff -urNp linux-2.6.32.23/arch/x86/lib/usercopy_64.c linux-2.6.32.23/arch/x86/lib/usercopy_64.c 17420diff -urNp linux-2.6.32.24/arch/x86/lib/usercopy_64.c linux-2.6.32.24/arch/x86/lib/usercopy_64.c
17421--- linux-2.6.32.23/arch/x86/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400 17421--- linux-2.6.32.24/arch/x86/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
17422+++ linux-2.6.32.23/arch/x86/lib/usercopy_64.c 2010-09-04 15:54:51.000000000 -0400 17422+++ linux-2.6.32.24/arch/x86/lib/usercopy_64.c 2010-09-04 15:54:51.000000000 -0400
17423@@ -42,6 +42,8 @@ long 17423@@ -42,6 +42,8 @@ long
17424 __strncpy_from_user(char *dst, const char __user *src, long count) 17424 __strncpy_from_user(char *dst, const char __user *src, long count)
17425 { 17425 {
@@ -17456,9 +17456,9 @@ diff -urNp linux-2.6.32.23/arch/x86/lib/usercopy_64.c linux-2.6.32.23/arch/x86/l
17456 } 17456 }
17457 EXPORT_SYMBOL(copy_in_user); 17457 EXPORT_SYMBOL(copy_in_user);
17458 17458
17459diff -urNp linux-2.6.32.23/arch/x86/Makefile linux-2.6.32.23/arch/x86/Makefile 17459diff -urNp linux-2.6.32.24/arch/x86/Makefile linux-2.6.32.24/arch/x86/Makefile
17460--- linux-2.6.32.23/arch/x86/Makefile 2010-08-13 16:24:37.000000000 -0400 17460--- linux-2.6.32.24/arch/x86/Makefile 2010-08-13 16:24:37.000000000 -0400
17461+++ linux-2.6.32.23/arch/x86/Makefile 2010-09-04 15:54:51.000000000 -0400 17461+++ linux-2.6.32.24/arch/x86/Makefile 2010-09-04 15:54:51.000000000 -0400
17462@@ -189,3 +189,12 @@ define archhelp 17462@@ -189,3 +189,12 @@ define archhelp
17463 echo ' FDARGS="..." arguments for the booted kernel' 17463 echo ' FDARGS="..." arguments for the booted kernel'
17464 echo ' FDINITRD=file initrd for the booted kernel' 17464 echo ' FDINITRD=file initrd for the booted kernel'
@@ -17472,9 +17472,9 @@ diff -urNp linux-2.6.32.23/arch/x86/Makefile linux-2.6.32.23/arch/x86/Makefile
17472+ 17472+
17473+archprepare: 17473+archprepare:
17474+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) 17474+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
17475diff -urNp linux-2.6.32.23/arch/x86/mm/extable.c linux-2.6.32.23/arch/x86/mm/extable.c 17475diff -urNp linux-2.6.32.24/arch/x86/mm/extable.c linux-2.6.32.24/arch/x86/mm/extable.c
17476--- linux-2.6.32.23/arch/x86/mm/extable.c 2010-08-13 16:24:37.000000000 -0400 17476--- linux-2.6.32.24/arch/x86/mm/extable.c 2010-08-13 16:24:37.000000000 -0400
17477+++ linux-2.6.32.23/arch/x86/mm/extable.c 2010-09-04 15:54:51.000000000 -0400 17477+++ linux-2.6.32.24/arch/x86/mm/extable.c 2010-09-04 15:54:51.000000000 -0400
17478@@ -1,14 +1,71 @@ 17478@@ -1,14 +1,71 @@
17479 #include <linux/module.h> 17479 #include <linux/module.h>
17480 #include <linux/spinlock.h> 17480 #include <linux/spinlock.h>
@@ -17548,9 +17548,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/extable.c linux-2.6.32.23/arch/x86/mm/ext
17548 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; 17548 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
17549 extern u32 pnp_bios_is_utter_crap; 17549 extern u32 pnp_bios_is_utter_crap;
17550 pnp_bios_is_utter_crap = 1; 17550 pnp_bios_is_utter_crap = 1;
17551diff -urNp linux-2.6.32.23/arch/x86/mm/fault.c linux-2.6.32.23/arch/x86/mm/fault.c 17551diff -urNp linux-2.6.32.24/arch/x86/mm/fault.c linux-2.6.32.24/arch/x86/mm/fault.c
17552--- linux-2.6.32.23/arch/x86/mm/fault.c 2010-08-13 16:24:37.000000000 -0400 17552--- linux-2.6.32.24/arch/x86/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
17553+++ linux-2.6.32.23/arch/x86/mm/fault.c 2010-09-04 15:54:51.000000000 -0400 17553+++ linux-2.6.32.24/arch/x86/mm/fault.c 2010-09-04 15:54:51.000000000 -0400
17554@@ -11,10 +11,19 @@ 17554@@ -11,10 +11,19 @@
17555 #include <linux/kprobes.h> /* __kprobes, ... */ 17555 #include <linux/kprobes.h> /* __kprobes, ... */
17556 #include <linux/mmiotrace.h> /* kmmio_handler, ... */ 17556 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
@@ -18218,9 +18218,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/fault.c linux-2.6.32.23/arch/x86/mm/fault
18218+ 18218+
18219+ return ret ? -EFAULT : 0; 18219+ return ret ? -EFAULT : 0;
18220+} 18220+}
18221diff -urNp linux-2.6.32.23/arch/x86/mm/gup.c linux-2.6.32.23/arch/x86/mm/gup.c 18221diff -urNp linux-2.6.32.24/arch/x86/mm/gup.c linux-2.6.32.24/arch/x86/mm/gup.c
18222--- linux-2.6.32.23/arch/x86/mm/gup.c 2010-08-13 16:24:37.000000000 -0400 18222--- linux-2.6.32.24/arch/x86/mm/gup.c 2010-08-13 16:24:37.000000000 -0400
18223+++ linux-2.6.32.23/arch/x86/mm/gup.c 2010-09-04 15:54:51.000000000 -0400 18223+++ linux-2.6.32.24/arch/x86/mm/gup.c 2010-09-04 15:54:51.000000000 -0400
18224@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long 18224@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
18225 addr = start; 18225 addr = start;
18226 len = (unsigned long) nr_pages << PAGE_SHIFT; 18226 len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -18230,9 +18230,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/gup.c linux-2.6.32.23/arch/x86/mm/gup.c
18230 (void __user *)start, len))) 18230 (void __user *)start, len)))
18231 return 0; 18231 return 0;
18232 18232
18233diff -urNp linux-2.6.32.23/arch/x86/mm/highmem_32.c linux-2.6.32.23/arch/x86/mm/highmem_32.c 18233diff -urNp linux-2.6.32.24/arch/x86/mm/highmem_32.c linux-2.6.32.24/arch/x86/mm/highmem_32.c
18234--- linux-2.6.32.23/arch/x86/mm/highmem_32.c 2010-08-13 16:24:37.000000000 -0400 18234--- linux-2.6.32.24/arch/x86/mm/highmem_32.c 2010-08-13 16:24:37.000000000 -0400
18235+++ linux-2.6.32.23/arch/x86/mm/highmem_32.c 2010-09-04 15:54:51.000000000 -0400 18235+++ linux-2.6.32.24/arch/x86/mm/highmem_32.c 2010-09-04 15:54:51.000000000 -0400
18236@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page 18236@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
18237 idx = type + KM_TYPE_NR*smp_processor_id(); 18237 idx = type + KM_TYPE_NR*smp_processor_id();
18238 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); 18238 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -18244,9 +18244,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/highmem_32.c linux-2.6.32.23/arch/x86/mm/
18244 18244
18245 return (void *)vaddr; 18245 return (void *)vaddr;
18246 } 18246 }
18247diff -urNp linux-2.6.32.23/arch/x86/mm/hugetlbpage.c linux-2.6.32.23/arch/x86/mm/hugetlbpage.c 18247diff -urNp linux-2.6.32.24/arch/x86/mm/hugetlbpage.c linux-2.6.32.24/arch/x86/mm/hugetlbpage.c
18248--- linux-2.6.32.23/arch/x86/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400 18248--- linux-2.6.32.24/arch/x86/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
18249+++ linux-2.6.32.23/arch/x86/mm/hugetlbpage.c 2010-09-26 22:08:46.000000000 -0400 18249+++ linux-2.6.32.24/arch/x86/mm/hugetlbpage.c 2010-09-26 22:08:46.000000000 -0400
18250@@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe 18250@@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe
18251 struct hstate *h = hstate_file(file); 18251 struct hstate *h = hstate_file(file);
18252 struct mm_struct *mm = current->mm; 18252 struct mm_struct *mm = current->mm;
@@ -18450,9 +18450,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/hugetlbpage.c linux-2.6.32.23/arch/x86/mm
18450 return addr; 18450 return addr;
18451 } 18451 }
18452 if (mm->get_unmapped_area == arch_get_unmapped_area) 18452 if (mm->get_unmapped_area == arch_get_unmapped_area)
18453diff -urNp linux-2.6.32.23/arch/x86/mm/init_32.c linux-2.6.32.23/arch/x86/mm/init_32.c 18453diff -urNp linux-2.6.32.24/arch/x86/mm/init_32.c linux-2.6.32.24/arch/x86/mm/init_32.c
18454--- linux-2.6.32.23/arch/x86/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400 18454--- linux-2.6.32.24/arch/x86/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
18455+++ linux-2.6.32.23/arch/x86/mm/init_32.c 2010-09-04 15:54:51.000000000 -0400 18455+++ linux-2.6.32.24/arch/x86/mm/init_32.c 2010-09-04 15:54:51.000000000 -0400
18456@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) 18456@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
18457 } 18457 }
18458 18458
@@ -18756,9 +18756,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/init_32.c linux-2.6.32.23/arch/x86/mm/ini
18756 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); 18756 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
18757 printk(KERN_INFO "Write protecting the kernel text: %luk\n", 18757 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
18758 size >> 10); 18758 size >> 10);
18759diff -urNp linux-2.6.32.23/arch/x86/mm/init_64.c linux-2.6.32.23/arch/x86/mm/init_64.c 18759diff -urNp linux-2.6.32.24/arch/x86/mm/init_64.c linux-2.6.32.24/arch/x86/mm/init_64.c
18760--- linux-2.6.32.23/arch/x86/mm/init_64.c 2010-08-13 16:24:37.000000000 -0400 18760--- linux-2.6.32.24/arch/x86/mm/init_64.c 2010-08-13 16:24:37.000000000 -0400
18761+++ linux-2.6.32.23/arch/x86/mm/init_64.c 2010-09-04 15:54:51.000000000 -0400 18761+++ linux-2.6.32.24/arch/x86/mm/init_64.c 2010-09-04 15:54:51.000000000 -0400
18762@@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 18762@@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
18763 pmd = fill_pmd(pud, vaddr); 18763 pmd = fill_pmd(pud, vaddr);
18764 pte = fill_pte(pmd, vaddr); 18764 pte = fill_pte(pmd, vaddr);
@@ -18819,9 +18819,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/init_64.c linux-2.6.32.23/arch/x86/mm/ini
18819 return "[vdso]"; 18819 return "[vdso]";
18820 if (vma == &gate_vma) 18820 if (vma == &gate_vma)
18821 return "[vsyscall]"; 18821 return "[vsyscall]";
18822diff -urNp linux-2.6.32.23/arch/x86/mm/init.c linux-2.6.32.23/arch/x86/mm/init.c 18822diff -urNp linux-2.6.32.24/arch/x86/mm/init.c linux-2.6.32.24/arch/x86/mm/init.c
18823--- linux-2.6.32.23/arch/x86/mm/init.c 2010-08-13 16:24:37.000000000 -0400 18823--- linux-2.6.32.24/arch/x86/mm/init.c 2010-08-13 16:24:37.000000000 -0400
18824+++ linux-2.6.32.23/arch/x86/mm/init.c 2010-09-16 22:50:17.000000000 -0400 18824+++ linux-2.6.32.24/arch/x86/mm/init.c 2010-09-16 22:50:17.000000000 -0400
18825@@ -69,11 +69,7 @@ static void __init find_early_table_spac 18825@@ -69,11 +69,7 @@ static void __init find_early_table_spac
18826 * cause a hotspot and fill up ZONE_DMA. The page tables 18826 * cause a hotspot and fill up ZONE_DMA. The page tables
18827 * need roughly 0.5KB per GB. 18827 * need roughly 0.5KB per GB.
@@ -18948,9 +18948,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/init.c linux-2.6.32.23/arch/x86/mm/init.c
18948 free_init_pages("unused kernel memory", 18948 free_init_pages("unused kernel memory",
18949 (unsigned long)(&__init_begin), 18949 (unsigned long)(&__init_begin),
18950 (unsigned long)(&__init_end)); 18950 (unsigned long)(&__init_end));
18951diff -urNp linux-2.6.32.23/arch/x86/mm/iomap_32.c linux-2.6.32.23/arch/x86/mm/iomap_32.c 18951diff -urNp linux-2.6.32.24/arch/x86/mm/iomap_32.c linux-2.6.32.24/arch/x86/mm/iomap_32.c
18952--- linux-2.6.32.23/arch/x86/mm/iomap_32.c 2010-08-13 16:24:37.000000000 -0400 18952--- linux-2.6.32.24/arch/x86/mm/iomap_32.c 2010-08-13 16:24:37.000000000 -0400
18953+++ linux-2.6.32.23/arch/x86/mm/iomap_32.c 2010-09-04 15:54:51.000000000 -0400 18953+++ linux-2.6.32.24/arch/x86/mm/iomap_32.c 2010-09-04 15:54:51.000000000 -0400
18954@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long 18954@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
18955 debug_kmap_atomic(type); 18955 debug_kmap_atomic(type);
18956 idx = type + KM_TYPE_NR * smp_processor_id(); 18956 idx = type + KM_TYPE_NR * smp_processor_id();
@@ -18963,9 +18963,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/iomap_32.c linux-2.6.32.23/arch/x86/mm/io
18963 arch_flush_lazy_mmu_mode(); 18963 arch_flush_lazy_mmu_mode();
18964 18964
18965 return (void *)vaddr; 18965 return (void *)vaddr;
18966diff -urNp linux-2.6.32.23/arch/x86/mm/ioremap.c linux-2.6.32.23/arch/x86/mm/ioremap.c 18966diff -urNp linux-2.6.32.24/arch/x86/mm/ioremap.c linux-2.6.32.24/arch/x86/mm/ioremap.c
18967--- linux-2.6.32.23/arch/x86/mm/ioremap.c 2010-08-13 16:24:37.000000000 -0400 18967--- linux-2.6.32.24/arch/x86/mm/ioremap.c 2010-08-13 16:24:37.000000000 -0400
18968+++ linux-2.6.32.23/arch/x86/mm/ioremap.c 2010-09-04 15:54:51.000000000 -0400 18968+++ linux-2.6.32.24/arch/x86/mm/ioremap.c 2010-09-04 15:54:51.000000000 -0400
18969@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) 18969@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
18970 * Second special case: Some BIOSen report the PC BIOS 18970 * Second special case: Some BIOSen report the PC BIOS
18971 * area (640->1Mb) as ram even though it is not. 18971 * area (640->1Mb) as ram even though it is not.
@@ -19012,9 +19012,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/ioremap.c linux-2.6.32.23/arch/x86/mm/ior
19012 19012
19013 /* 19013 /*
19014 * The boot-ioremap range spans multiple pmds, for which 19014 * The boot-ioremap range spans multiple pmds, for which
19015diff -urNp linux-2.6.32.23/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.23/arch/x86/mm/kmemcheck/kmemcheck.c 19015diff -urNp linux-2.6.32.24/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.24/arch/x86/mm/kmemcheck/kmemcheck.c
19016--- linux-2.6.32.23/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-13 16:24:37.000000000 -0400 19016--- linux-2.6.32.24/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-13 16:24:37.000000000 -0400
19017+++ linux-2.6.32.23/arch/x86/mm/kmemcheck/kmemcheck.c 2010-09-04 15:54:51.000000000 -0400 19017+++ linux-2.6.32.24/arch/x86/mm/kmemcheck/kmemcheck.c 2010-09-04 15:54:51.000000000 -0400
19018@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg 19018@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
19019 * memory (e.g. tracked pages)? For now, we need this to avoid 19019 * memory (e.g. tracked pages)? For now, we need this to avoid
19020 * invoking kmemcheck for PnP BIOS calls. 19020 * invoking kmemcheck for PnP BIOS calls.
@@ -19027,9 +19027,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.23/arc
19027 return false; 19027 return false;
19028 19028
19029 pte = kmemcheck_pte_lookup(address); 19029 pte = kmemcheck_pte_lookup(address);
19030diff -urNp linux-2.6.32.23/arch/x86/mm/mmap.c linux-2.6.32.23/arch/x86/mm/mmap.c 19030diff -urNp linux-2.6.32.24/arch/x86/mm/mmap.c linux-2.6.32.24/arch/x86/mm/mmap.c
19031--- linux-2.6.32.23/arch/x86/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400 19031--- linux-2.6.32.24/arch/x86/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
19032+++ linux-2.6.32.23/arch/x86/mm/mmap.c 2010-09-04 15:54:51.000000000 -0400 19032+++ linux-2.6.32.24/arch/x86/mm/mmap.c 2010-09-04 15:54:51.000000000 -0400
19033@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size 19033@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
19034 * Leave an at least ~128 MB hole with possible stack randomization. 19034 * Leave an at least ~128 MB hole with possible stack randomization.
19035 */ 19035 */
@@ -19111,9 +19111,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/mmap.c linux-2.6.32.23/arch/x86/mm/mmap.c
19111 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 19111 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
19112 mm->unmap_area = arch_unmap_area_topdown; 19112 mm->unmap_area = arch_unmap_area_topdown;
19113 } 19113 }
19114diff -urNp linux-2.6.32.23/arch/x86/mm/numa_32.c linux-2.6.32.23/arch/x86/mm/numa_32.c 19114diff -urNp linux-2.6.32.24/arch/x86/mm/numa_32.c linux-2.6.32.24/arch/x86/mm/numa_32.c
19115--- linux-2.6.32.23/arch/x86/mm/numa_32.c 2010-08-13 16:24:37.000000000 -0400 19115--- linux-2.6.32.24/arch/x86/mm/numa_32.c 2010-08-13 16:24:37.000000000 -0400
19116+++ linux-2.6.32.23/arch/x86/mm/numa_32.c 2010-09-04 15:54:51.000000000 -0400 19116+++ linux-2.6.32.24/arch/x86/mm/numa_32.c 2010-09-04 15:54:51.000000000 -0400
19117@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int 19117@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
19118 } 19118 }
19119 #endif 19119 #endif
@@ -19122,9 +19122,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/numa_32.c linux-2.6.32.23/arch/x86/mm/num
19122 extern unsigned long highend_pfn, highstart_pfn; 19122 extern unsigned long highend_pfn, highstart_pfn;
19123 19123
19124 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) 19124 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
19125diff -urNp linux-2.6.32.23/arch/x86/mm/pageattr.c linux-2.6.32.23/arch/x86/mm/pageattr.c 19125diff -urNp linux-2.6.32.24/arch/x86/mm/pageattr.c linux-2.6.32.24/arch/x86/mm/pageattr.c
19126--- linux-2.6.32.23/arch/x86/mm/pageattr.c 2010-08-13 16:24:37.000000000 -0400 19126--- linux-2.6.32.24/arch/x86/mm/pageattr.c 2010-08-13 16:24:37.000000000 -0400
19127+++ linux-2.6.32.23/arch/x86/mm/pageattr.c 2010-09-04 15:54:51.000000000 -0400 19127+++ linux-2.6.32.24/arch/x86/mm/pageattr.c 2010-09-04 15:54:51.000000000 -0400
19128@@ -261,16 +261,17 @@ static inline pgprot_t static_protection 19128@@ -261,16 +261,17 @@ static inline pgprot_t static_protection
19129 * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support. 19129 * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
19130 */ 19130 */
@@ -19201,9 +19201,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/pageattr.c linux-2.6.32.23/arch/x86/mm/pa
19201 } 19201 }
19202 19202
19203 static int 19203 static int
19204diff -urNp linux-2.6.32.23/arch/x86/mm/pageattr-test.c linux-2.6.32.23/arch/x86/mm/pageattr-test.c 19204diff -urNp linux-2.6.32.24/arch/x86/mm/pageattr-test.c linux-2.6.32.24/arch/x86/mm/pageattr-test.c
19205--- linux-2.6.32.23/arch/x86/mm/pageattr-test.c 2010-08-13 16:24:37.000000000 -0400 19205--- linux-2.6.32.24/arch/x86/mm/pageattr-test.c 2010-08-13 16:24:37.000000000 -0400
19206+++ linux-2.6.32.23/arch/x86/mm/pageattr-test.c 2010-09-04 15:54:51.000000000 -0400 19206+++ linux-2.6.32.24/arch/x86/mm/pageattr-test.c 2010-09-04 15:54:51.000000000 -0400
19207@@ -36,7 +36,7 @@ enum { 19207@@ -36,7 +36,7 @@ enum {
19208 19208
19209 static int pte_testbit(pte_t pte) 19209 static int pte_testbit(pte_t pte)
@@ -19213,9 +19213,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/pageattr-test.c linux-2.6.32.23/arch/x86/
19213 } 19213 }
19214 19214
19215 struct split_state { 19215 struct split_state {
19216diff -urNp linux-2.6.32.23/arch/x86/mm/pat.c linux-2.6.32.23/arch/x86/mm/pat.c 19216diff -urNp linux-2.6.32.24/arch/x86/mm/pat.c linux-2.6.32.24/arch/x86/mm/pat.c
19217--- linux-2.6.32.23/arch/x86/mm/pat.c 2010-08-13 16:24:37.000000000 -0400 19217--- linux-2.6.32.24/arch/x86/mm/pat.c 2010-08-13 16:24:37.000000000 -0400
19218+++ linux-2.6.32.23/arch/x86/mm/pat.c 2010-09-04 15:54:51.000000000 -0400 19218+++ linux-2.6.32.24/arch/x86/mm/pat.c 2010-09-04 15:54:51.000000000 -0400
19219@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct 19219@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
19220 19220
19221 conflict: 19221 conflict:
@@ -19263,9 +19263,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/pat.c linux-2.6.32.23/arch/x86/mm/pat.c
19263 cattr_name(want_flags), 19263 cattr_name(want_flags),
19264 (unsigned long long)paddr, 19264 (unsigned long long)paddr,
19265 (unsigned long long)(paddr + size), 19265 (unsigned long long)(paddr + size),
19266diff -urNp linux-2.6.32.23/arch/x86/mm/pgtable_32.c linux-2.6.32.23/arch/x86/mm/pgtable_32.c 19266diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable_32.c linux-2.6.32.24/arch/x86/mm/pgtable_32.c
19267--- linux-2.6.32.23/arch/x86/mm/pgtable_32.c 2010-08-13 16:24:37.000000000 -0400 19267--- linux-2.6.32.24/arch/x86/mm/pgtable_32.c 2010-08-13 16:24:37.000000000 -0400
19268+++ linux-2.6.32.23/arch/x86/mm/pgtable_32.c 2010-09-04 15:54:51.000000000 -0400 19268+++ linux-2.6.32.24/arch/x86/mm/pgtable_32.c 2010-09-04 15:54:51.000000000 -0400
19269@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 19269@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
19270 return; 19270 return;
19271 } 19271 }
@@ -19280,9 +19280,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/pgtable_32.c linux-2.6.32.23/arch/x86/mm/
19280 19280
19281 /* 19281 /*
19282 * It's enough to flush this one mapping. 19282 * It's enough to flush this one mapping.
19283diff -urNp linux-2.6.32.23/arch/x86/mm/pgtable.c linux-2.6.32.23/arch/x86/mm/pgtable.c 19283diff -urNp linux-2.6.32.24/arch/x86/mm/pgtable.c linux-2.6.32.24/arch/x86/mm/pgtable.c
19284--- linux-2.6.32.23/arch/x86/mm/pgtable.c 2010-08-13 16:24:37.000000000 -0400 19284--- linux-2.6.32.24/arch/x86/mm/pgtable.c 2010-08-13 16:24:37.000000000 -0400
19285+++ linux-2.6.32.23/arch/x86/mm/pgtable.c 2010-09-04 15:54:51.000000000 -0400 19285+++ linux-2.6.32.24/arch/x86/mm/pgtable.c 2010-09-04 15:54:51.000000000 -0400
19286@@ -83,8 +83,59 @@ static inline void pgd_list_del(pgd_t *p 19286@@ -83,8 +83,59 @@ static inline void pgd_list_del(pgd_t *p
19287 list_del(&page->lru); 19287 list_del(&page->lru);
19288 } 19288 }
@@ -19536,9 +19536,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/pgtable.c linux-2.6.32.23/arch/x86/mm/pgt
19536 pgd_dtor(pgd); 19536 pgd_dtor(pgd);
19537 paravirt_pgd_free(mm, pgd); 19537 paravirt_pgd_free(mm, pgd);
19538 free_page((unsigned long)pgd); 19538 free_page((unsigned long)pgd);
19539diff -urNp linux-2.6.32.23/arch/x86/mm/setup_nx.c linux-2.6.32.23/arch/x86/mm/setup_nx.c 19539diff -urNp linux-2.6.32.24/arch/x86/mm/setup_nx.c linux-2.6.32.24/arch/x86/mm/setup_nx.c
19540--- linux-2.6.32.23/arch/x86/mm/setup_nx.c 2010-08-13 16:24:37.000000000 -0400 19540--- linux-2.6.32.24/arch/x86/mm/setup_nx.c 2010-08-13 16:24:37.000000000 -0400
19541+++ linux-2.6.32.23/arch/x86/mm/setup_nx.c 2010-09-04 15:54:51.000000000 -0400 19541+++ linux-2.6.32.24/arch/x86/mm/setup_nx.c 2010-09-04 15:54:51.000000000 -0400
19542@@ -4,11 +4,10 @@ 19542@@ -4,11 +4,10 @@
19543 19543
19544 #include <asm/pgtable.h> 19544 #include <asm/pgtable.h>
@@ -19604,9 +19604,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/setup_nx.c linux-2.6.32.23/arch/x86/mm/se
19604 __supported_pte_mask &= ~_PAGE_NX; 19604 __supported_pte_mask &= ~_PAGE_NX;
19605 } 19605 }
19606 #endif 19606 #endif
19607diff -urNp linux-2.6.32.23/arch/x86/mm/tlb.c linux-2.6.32.23/arch/x86/mm/tlb.c 19607diff -urNp linux-2.6.32.24/arch/x86/mm/tlb.c linux-2.6.32.24/arch/x86/mm/tlb.c
19608--- linux-2.6.32.23/arch/x86/mm/tlb.c 2010-08-13 16:24:37.000000000 -0400 19608--- linux-2.6.32.24/arch/x86/mm/tlb.c 2010-08-13 16:24:37.000000000 -0400
19609+++ linux-2.6.32.23/arch/x86/mm/tlb.c 2010-09-04 15:54:51.000000000 -0400 19609+++ linux-2.6.32.24/arch/x86/mm/tlb.c 2010-09-04 15:54:51.000000000 -0400
19610@@ -12,7 +12,7 @@ 19610@@ -12,7 +12,7 @@
19611 #include <asm/uv/uv.h> 19611 #include <asm/uv/uv.h>
19612 19612
@@ -19628,9 +19628,9 @@ diff -urNp linux-2.6.32.23/arch/x86/mm/tlb.c linux-2.6.32.23/arch/x86/mm/tlb.c
19628 } 19628 }
19629 EXPORT_SYMBOL_GPL(leave_mm); 19629 EXPORT_SYMBOL_GPL(leave_mm);
19630 19630
19631diff -urNp linux-2.6.32.23/arch/x86/oprofile/backtrace.c linux-2.6.32.23/arch/x86/oprofile/backtrace.c 19631diff -urNp linux-2.6.32.24/arch/x86/oprofile/backtrace.c linux-2.6.32.24/arch/x86/oprofile/backtrace.c
19632--- linux-2.6.32.23/arch/x86/oprofile/backtrace.c 2010-08-13 16:24:37.000000000 -0400 19632--- linux-2.6.32.24/arch/x86/oprofile/backtrace.c 2010-08-13 16:24:37.000000000 -0400
19633+++ linux-2.6.32.23/arch/x86/oprofile/backtrace.c 2010-09-04 15:54:51.000000000 -0400 19633+++ linux-2.6.32.24/arch/x86/oprofile/backtrace.c 2010-09-04 15:54:51.000000000 -0400
19634@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back 19634@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
19635 struct frame_head bufhead[2]; 19635 struct frame_head bufhead[2];
19636 19636
@@ -19649,9 +19649,9 @@ diff -urNp linux-2.6.32.23/arch/x86/oprofile/backtrace.c linux-2.6.32.23/arch/x8
19649 unsigned long stack = kernel_stack_pointer(regs); 19649 unsigned long stack = kernel_stack_pointer(regs);
19650 if (depth) 19650 if (depth)
19651 dump_trace(NULL, regs, (unsigned long *)stack, 0, 19651 dump_trace(NULL, regs, (unsigned long *)stack, 0,
19652diff -urNp linux-2.6.32.23/arch/x86/oprofile/op_model_p4.c linux-2.6.32.23/arch/x86/oprofile/op_model_p4.c 19652diff -urNp linux-2.6.32.24/arch/x86/oprofile/op_model_p4.c linux-2.6.32.24/arch/x86/oprofile/op_model_p4.c
19653--- linux-2.6.32.23/arch/x86/oprofile/op_model_p4.c 2010-08-13 16:24:37.000000000 -0400 19653--- linux-2.6.32.24/arch/x86/oprofile/op_model_p4.c 2010-08-13 16:24:37.000000000 -0400
19654+++ linux-2.6.32.23/arch/x86/oprofile/op_model_p4.c 2010-09-04 15:54:51.000000000 -0400 19654+++ linux-2.6.32.24/arch/x86/oprofile/op_model_p4.c 2010-09-04 15:54:51.000000000 -0400
19655@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo 19655@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
19656 #endif 19656 #endif
19657 } 19657 }
@@ -19661,9 +19661,9 @@ diff -urNp linux-2.6.32.23/arch/x86/oprofile/op_model_p4.c linux-2.6.32.23/arch/
19661 { 19661 {
19662 #ifdef CONFIG_SMP 19662 #ifdef CONFIG_SMP
19663 return smp_num_siblings == 2 ? 2 : 1; 19663 return smp_num_siblings == 2 ? 2 : 1;
19664diff -urNp linux-2.6.32.23/arch/x86/pci/common.c linux-2.6.32.23/arch/x86/pci/common.c 19664diff -urNp linux-2.6.32.24/arch/x86/pci/common.c linux-2.6.32.24/arch/x86/pci/common.c
19665--- linux-2.6.32.23/arch/x86/pci/common.c 2010-08-13 16:24:37.000000000 -0400 19665--- linux-2.6.32.24/arch/x86/pci/common.c 2010-08-13 16:24:37.000000000 -0400
19666+++ linux-2.6.32.23/arch/x86/pci/common.c 2010-09-04 15:54:51.000000000 -0400 19666+++ linux-2.6.32.24/arch/x86/pci/common.c 2010-09-04 15:54:51.000000000 -0400
19667@@ -31,8 +31,8 @@ int noioapicreroute = 1; 19667@@ -31,8 +31,8 @@ int noioapicreroute = 1;
19668 int pcibios_last_bus = -1; 19668 int pcibios_last_bus = -1;
19669 unsigned long pirq_table_addr; 19669 unsigned long pirq_table_addr;
@@ -19684,9 +19684,9 @@ diff -urNp linux-2.6.32.23/arch/x86/pci/common.c linux-2.6.32.23/arch/x86/pci/co
19684 }; 19684 };
19685 19685
19686 void __init dmi_check_pciprobe(void) 19686 void __init dmi_check_pciprobe(void)
19687diff -urNp linux-2.6.32.23/arch/x86/pci/direct.c linux-2.6.32.23/arch/x86/pci/direct.c 19687diff -urNp linux-2.6.32.24/arch/x86/pci/direct.c linux-2.6.32.24/arch/x86/pci/direct.c
19688--- linux-2.6.32.23/arch/x86/pci/direct.c 2010-08-13 16:24:37.000000000 -0400 19688--- linux-2.6.32.24/arch/x86/pci/direct.c 2010-08-13 16:24:37.000000000 -0400
19689+++ linux-2.6.32.23/arch/x86/pci/direct.c 2010-09-04 15:54:51.000000000 -0400 19689+++ linux-2.6.32.24/arch/x86/pci/direct.c 2010-09-04 15:54:51.000000000 -0400
19690@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 19690@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
19691 19691
19692 #undef PCI_CONF1_ADDRESS 19692 #undef PCI_CONF1_ADDRESS
@@ -19714,9 +19714,9 @@ diff -urNp linux-2.6.32.23/arch/x86/pci/direct.c linux-2.6.32.23/arch/x86/pci/di
19714 { 19714 {
19715 u32 x = 0; 19715 u32 x = 0;
19716 int year, devfn; 19716 int year, devfn;
19717diff -urNp linux-2.6.32.23/arch/x86/pci/fixup.c linux-2.6.32.23/arch/x86/pci/fixup.c 19717diff -urNp linux-2.6.32.24/arch/x86/pci/fixup.c linux-2.6.32.24/arch/x86/pci/fixup.c
19718--- linux-2.6.32.23/arch/x86/pci/fixup.c 2010-08-13 16:24:37.000000000 -0400 19718--- linux-2.6.32.24/arch/x86/pci/fixup.c 2010-08-13 16:24:37.000000000 -0400
19719+++ linux-2.6.32.23/arch/x86/pci/fixup.c 2010-09-04 15:54:51.000000000 -0400 19719+++ linux-2.6.32.24/arch/x86/pci/fixup.c 2010-09-04 15:54:51.000000000 -0400
19720@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi 19720@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
19721 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), 19721 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
19722 }, 19722 },
@@ -19735,9 +19735,9 @@ diff -urNp linux-2.6.32.23/arch/x86/pci/fixup.c linux-2.6.32.23/arch/x86/pci/fix
19735 }; 19735 };
19736 19736
19737 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) 19737 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
19738diff -urNp linux-2.6.32.23/arch/x86/pci/irq.c linux-2.6.32.23/arch/x86/pci/irq.c 19738diff -urNp linux-2.6.32.24/arch/x86/pci/irq.c linux-2.6.32.24/arch/x86/pci/irq.c
19739--- linux-2.6.32.23/arch/x86/pci/irq.c 2010-08-13 16:24:37.000000000 -0400 19739--- linux-2.6.32.24/arch/x86/pci/irq.c 2010-08-13 16:24:37.000000000 -0400
19740+++ linux-2.6.32.23/arch/x86/pci/irq.c 2010-09-04 15:54:51.000000000 -0400 19740+++ linux-2.6.32.24/arch/x86/pci/irq.c 2010-09-04 15:54:51.000000000 -0400
19741@@ -543,7 +543,7 @@ static __init int intel_router_probe(str 19741@@ -543,7 +543,7 @@ static __init int intel_router_probe(str
19742 static struct pci_device_id __initdata pirq_440gx[] = { 19742 static struct pci_device_id __initdata pirq_440gx[] = {
19743 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, 19743 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
@@ -19756,9 +19756,9 @@ diff -urNp linux-2.6.32.23/arch/x86/pci/irq.c linux-2.6.32.23/arch/x86/pci/irq.c
19756 }; 19756 };
19757 19757
19758 int __init pcibios_irq_init(void) 19758 int __init pcibios_irq_init(void)
19759diff -urNp linux-2.6.32.23/arch/x86/pci/mmconfig_32.c linux-2.6.32.23/arch/x86/pci/mmconfig_32.c 19759diff -urNp linux-2.6.32.24/arch/x86/pci/mmconfig_32.c linux-2.6.32.24/arch/x86/pci/mmconfig_32.c
19760--- linux-2.6.32.23/arch/x86/pci/mmconfig_32.c 2010-08-13 16:24:37.000000000 -0400 19760--- linux-2.6.32.24/arch/x86/pci/mmconfig_32.c 2010-08-13 16:24:37.000000000 -0400
19761+++ linux-2.6.32.23/arch/x86/pci/mmconfig_32.c 2010-09-04 15:54:51.000000000 -0400 19761+++ linux-2.6.32.24/arch/x86/pci/mmconfig_32.c 2010-09-04 15:54:51.000000000 -0400
19762@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int 19762@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
19763 return 0; 19763 return 0;
19764 } 19764 }
@@ -19768,9 +19768,9 @@ diff -urNp linux-2.6.32.23/arch/x86/pci/mmconfig_32.c linux-2.6.32.23/arch/x86/p
19768 .read = pci_mmcfg_read, 19768 .read = pci_mmcfg_read,
19769 .write = pci_mmcfg_write, 19769 .write = pci_mmcfg_write,
19770 }; 19770 };
19771diff -urNp linux-2.6.32.23/arch/x86/pci/mmconfig_64.c linux-2.6.32.23/arch/x86/pci/mmconfig_64.c 19771diff -urNp linux-2.6.32.24/arch/x86/pci/mmconfig_64.c linux-2.6.32.24/arch/x86/pci/mmconfig_64.c
19772--- linux-2.6.32.23/arch/x86/pci/mmconfig_64.c 2010-08-13 16:24:37.000000000 -0400 19772--- linux-2.6.32.24/arch/x86/pci/mmconfig_64.c 2010-08-13 16:24:37.000000000 -0400
19773+++ linux-2.6.32.23/arch/x86/pci/mmconfig_64.c 2010-09-04 15:54:51.000000000 -0400 19773+++ linux-2.6.32.24/arch/x86/pci/mmconfig_64.c 2010-09-04 15:54:51.000000000 -0400
19774@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int 19774@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
19775 return 0; 19775 return 0;
19776 } 19776 }
@@ -19780,9 +19780,9 @@ diff -urNp linux-2.6.32.23/arch/x86/pci/mmconfig_64.c linux-2.6.32.23/arch/x86/p
19780 .read = pci_mmcfg_read, 19780 .read = pci_mmcfg_read,
19781 .write = pci_mmcfg_write, 19781 .write = pci_mmcfg_write,
19782 }; 19782 };
19783diff -urNp linux-2.6.32.23/arch/x86/pci/numaq_32.c linux-2.6.32.23/arch/x86/pci/numaq_32.c 19783diff -urNp linux-2.6.32.24/arch/x86/pci/numaq_32.c linux-2.6.32.24/arch/x86/pci/numaq_32.c
19784--- linux-2.6.32.23/arch/x86/pci/numaq_32.c 2010-08-13 16:24:37.000000000 -0400 19784--- linux-2.6.32.24/arch/x86/pci/numaq_32.c 2010-08-13 16:24:37.000000000 -0400
19785+++ linux-2.6.32.23/arch/x86/pci/numaq_32.c 2010-09-04 15:54:51.000000000 -0400 19785+++ linux-2.6.32.24/arch/x86/pci/numaq_32.c 2010-09-04 15:54:51.000000000 -0400
19786@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i 19786@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
19787 19787
19788 #undef PCI_CONF1_MQ_ADDRESS 19788 #undef PCI_CONF1_MQ_ADDRESS
@@ -19792,9 +19792,9 @@ diff -urNp linux-2.6.32.23/arch/x86/pci/numaq_32.c linux-2.6.32.23/arch/x86/pci/
19792 .read = pci_conf1_mq_read, 19792 .read = pci_conf1_mq_read,
19793 .write = pci_conf1_mq_write 19793 .write = pci_conf1_mq_write
19794 }; 19794 };
19795diff -urNp linux-2.6.32.23/arch/x86/pci/olpc.c linux-2.6.32.23/arch/x86/pci/olpc.c 19795diff -urNp linux-2.6.32.24/arch/x86/pci/olpc.c linux-2.6.32.24/arch/x86/pci/olpc.c
19796--- linux-2.6.32.23/arch/x86/pci/olpc.c 2010-08-13 16:24:37.000000000 -0400 19796--- linux-2.6.32.24/arch/x86/pci/olpc.c 2010-08-13 16:24:37.000000000 -0400
19797+++ linux-2.6.32.23/arch/x86/pci/olpc.c 2010-09-04 15:54:51.000000000 -0400 19797+++ linux-2.6.32.24/arch/x86/pci/olpc.c 2010-09-04 15:54:51.000000000 -0400
19798@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s 19798@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
19799 return 0; 19799 return 0;
19800 } 19800 }
@@ -19804,9 +19804,9 @@ diff -urNp linux-2.6.32.23/arch/x86/pci/olpc.c linux-2.6.32.23/arch/x86/pci/olpc
19804 .read = pci_olpc_read, 19804 .read = pci_olpc_read,
19805 .write = pci_olpc_write, 19805 .write = pci_olpc_write,
19806 }; 19806 };
19807diff -urNp linux-2.6.32.23/arch/x86/pci/pcbios.c linux-2.6.32.23/arch/x86/pci/pcbios.c 19807diff -urNp linux-2.6.32.24/arch/x86/pci/pcbios.c linux-2.6.32.24/arch/x86/pci/pcbios.c
19808--- linux-2.6.32.23/arch/x86/pci/pcbios.c 2010-08-13 16:24:37.000000000 -0400 19808--- linux-2.6.32.24/arch/x86/pci/pcbios.c 2010-08-13 16:24:37.000000000 -0400
19809+++ linux-2.6.32.23/arch/x86/pci/pcbios.c 2010-09-04 15:54:51.000000000 -0400 19809+++ linux-2.6.32.24/arch/x86/pci/pcbios.c 2010-09-04 15:54:51.000000000 -0400
19810@@ -56,50 +56,93 @@ union bios32 { 19810@@ -56,50 +56,93 @@ union bios32 {
19811 static struct { 19811 static struct {
19812 unsigned long address; 19812 unsigned long address;
@@ -20129,9 +20129,9 @@ diff -urNp linux-2.6.32.23/arch/x86/pci/pcbios.c linux-2.6.32.23/arch/x86/pci/pc
20129 return !(ret & 0xff00); 20129 return !(ret & 0xff00);
20130 } 20130 }
20131 EXPORT_SYMBOL(pcibios_set_irq_routing); 20131 EXPORT_SYMBOL(pcibios_set_irq_routing);
20132diff -urNp linux-2.6.32.23/arch/x86/power/cpu.c linux-2.6.32.23/arch/x86/power/cpu.c 20132diff -urNp linux-2.6.32.24/arch/x86/power/cpu.c linux-2.6.32.24/arch/x86/power/cpu.c
20133--- linux-2.6.32.23/arch/x86/power/cpu.c 2010-09-20 17:26:42.000000000 -0400 20133--- linux-2.6.32.24/arch/x86/power/cpu.c 2010-09-20 17:26:42.000000000 -0400
20134+++ linux-2.6.32.23/arch/x86/power/cpu.c 2010-09-20 17:27:14.000000000 -0400 20134+++ linux-2.6.32.24/arch/x86/power/cpu.c 2010-09-20 17:27:14.000000000 -0400
20135@@ -129,7 +129,7 @@ static void do_fpu_end(void) 20135@@ -129,7 +129,7 @@ static void do_fpu_end(void)
20136 static void fix_processor_context(void) 20136 static void fix_processor_context(void)
20137 { 20137 {
@@ -20151,9 +20151,9 @@ diff -urNp linux-2.6.32.23/arch/x86/power/cpu.c linux-2.6.32.23/arch/x86/power/c
20151 20151
20152 syscall_init(); /* This sets MSR_*STAR and related */ 20152 syscall_init(); /* This sets MSR_*STAR and related */
20153 #endif 20153 #endif
20154diff -urNp linux-2.6.32.23/arch/x86/vdso/Makefile linux-2.6.32.23/arch/x86/vdso/Makefile 20154diff -urNp linux-2.6.32.24/arch/x86/vdso/Makefile linux-2.6.32.24/arch/x86/vdso/Makefile
20155--- linux-2.6.32.23/arch/x86/vdso/Makefile 2010-08-13 16:24:37.000000000 -0400 20155--- linux-2.6.32.24/arch/x86/vdso/Makefile 2010-08-13 16:24:37.000000000 -0400
20156+++ linux-2.6.32.23/arch/x86/vdso/Makefile 2010-09-04 15:54:51.000000000 -0400 20156+++ linux-2.6.32.24/arch/x86/vdso/Makefile 2010-09-04 15:54:51.000000000 -0400
20157@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ 20157@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
20158 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ 20158 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
20159 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) 20159 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -20163,9 +20163,9 @@ diff -urNp linux-2.6.32.23/arch/x86/vdso/Makefile linux-2.6.32.23/arch/x86/vdso/
20163 GCOV_PROFILE := n 20163 GCOV_PROFILE := n
20164 20164
20165 # 20165 #
20166diff -urNp linux-2.6.32.23/arch/x86/vdso/vclock_gettime.c linux-2.6.32.23/arch/x86/vdso/vclock_gettime.c 20166diff -urNp linux-2.6.32.24/arch/x86/vdso/vclock_gettime.c linux-2.6.32.24/arch/x86/vdso/vclock_gettime.c
20167--- linux-2.6.32.23/arch/x86/vdso/vclock_gettime.c 2010-08-13 16:24:37.000000000 -0400 20167--- linux-2.6.32.24/arch/x86/vdso/vclock_gettime.c 2010-08-13 16:24:37.000000000 -0400
20168+++ linux-2.6.32.23/arch/x86/vdso/vclock_gettime.c 2010-09-04 15:54:51.000000000 -0400 20168+++ linux-2.6.32.24/arch/x86/vdso/vclock_gettime.c 2010-09-04 15:54:51.000000000 -0400
20169@@ -22,24 +22,48 @@ 20169@@ -22,24 +22,48 @@
20170 #include <asm/hpet.h> 20170 #include <asm/hpet.h>
20171 #include <asm/unistd.h> 20171 #include <asm/unistd.h>
@@ -20264,9 +20264,9 @@ diff -urNp linux-2.6.32.23/arch/x86/vdso/vclock_gettime.c linux-2.6.32.23/arch/x
20264 } 20264 }
20265 int gettimeofday(struct timeval *, struct timezone *) 20265 int gettimeofday(struct timeval *, struct timezone *)
20266 __attribute__((weak, alias("__vdso_gettimeofday"))); 20266 __attribute__((weak, alias("__vdso_gettimeofday")));
20267diff -urNp linux-2.6.32.23/arch/x86/vdso/vdso32-setup.c linux-2.6.32.23/arch/x86/vdso/vdso32-setup.c 20267diff -urNp linux-2.6.32.24/arch/x86/vdso/vdso32-setup.c linux-2.6.32.24/arch/x86/vdso/vdso32-setup.c
20268--- linux-2.6.32.23/arch/x86/vdso/vdso32-setup.c 2010-08-13 16:24:37.000000000 -0400 20268--- linux-2.6.32.24/arch/x86/vdso/vdso32-setup.c 2010-08-13 16:24:37.000000000 -0400
20269+++ linux-2.6.32.23/arch/x86/vdso/vdso32-setup.c 2010-09-04 15:54:51.000000000 -0400 20269+++ linux-2.6.32.24/arch/x86/vdso/vdso32-setup.c 2010-09-04 15:54:51.000000000 -0400
20270@@ -25,6 +25,7 @@ 20270@@ -25,6 +25,7 @@
20271 #include <asm/tlbflush.h> 20271 #include <asm/tlbflush.h>
20272 #include <asm/vdso.h> 20272 #include <asm/vdso.h>
@@ -20367,9 +20367,9 @@ diff -urNp linux-2.6.32.23/arch/x86/vdso/vdso32-setup.c linux-2.6.32.23/arch/x86
20367 return &gate_vma; 20367 return &gate_vma;
20368 return NULL; 20368 return NULL;
20369 } 20369 }
20370diff -urNp linux-2.6.32.23/arch/x86/vdso/vdso.lds.S linux-2.6.32.23/arch/x86/vdso/vdso.lds.S 20370diff -urNp linux-2.6.32.24/arch/x86/vdso/vdso.lds.S linux-2.6.32.24/arch/x86/vdso/vdso.lds.S
20371--- linux-2.6.32.23/arch/x86/vdso/vdso.lds.S 2010-08-13 16:24:37.000000000 -0400 20371--- linux-2.6.32.24/arch/x86/vdso/vdso.lds.S 2010-08-13 16:24:37.000000000 -0400
20372+++ linux-2.6.32.23/arch/x86/vdso/vdso.lds.S 2010-09-04 15:54:51.000000000 -0400 20372+++ linux-2.6.32.24/arch/x86/vdso/vdso.lds.S 2010-09-04 15:54:51.000000000 -0400
20373@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; 20373@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
20374 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; 20374 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
20375 #include "vextern.h" 20375 #include "vextern.h"
@@ -20380,9 +20380,9 @@ diff -urNp linux-2.6.32.23/arch/x86/vdso/vdso.lds.S linux-2.6.32.23/arch/x86/vds
20380+VEXTERN(fallback_time) 20380+VEXTERN(fallback_time)
20381+VEXTERN(getcpu) 20381+VEXTERN(getcpu)
20382+#undef VEXTERN 20382+#undef VEXTERN
20383diff -urNp linux-2.6.32.23/arch/x86/vdso/vextern.h linux-2.6.32.23/arch/x86/vdso/vextern.h 20383diff -urNp linux-2.6.32.24/arch/x86/vdso/vextern.h linux-2.6.32.24/arch/x86/vdso/vextern.h
20384--- linux-2.6.32.23/arch/x86/vdso/vextern.h 2010-08-13 16:24:37.000000000 -0400 20384--- linux-2.6.32.24/arch/x86/vdso/vextern.h 2010-08-13 16:24:37.000000000 -0400
20385+++ linux-2.6.32.23/arch/x86/vdso/vextern.h 2010-09-04 15:54:51.000000000 -0400 20385+++ linux-2.6.32.24/arch/x86/vdso/vextern.h 2010-09-04 15:54:51.000000000 -0400
20386@@ -11,6 +11,5 @@ 20386@@ -11,6 +11,5 @@
20387 put into vextern.h and be referenced as a pointer with vdso prefix. 20387 put into vextern.h and be referenced as a pointer with vdso prefix.
20388 The main kernel later fills in the values. */ 20388 The main kernel later fills in the values. */
@@ -20390,9 +20390,9 @@ diff -urNp linux-2.6.32.23/arch/x86/vdso/vextern.h linux-2.6.32.23/arch/x86/vdso
20390-VEXTERN(jiffies) 20390-VEXTERN(jiffies)
20391 VEXTERN(vgetcpu_mode) 20391 VEXTERN(vgetcpu_mode)
20392 VEXTERN(vsyscall_gtod_data) 20392 VEXTERN(vsyscall_gtod_data)
20393diff -urNp linux-2.6.32.23/arch/x86/vdso/vma.c linux-2.6.32.23/arch/x86/vdso/vma.c 20393diff -urNp linux-2.6.32.24/arch/x86/vdso/vma.c linux-2.6.32.24/arch/x86/vdso/vma.c
20394--- linux-2.6.32.23/arch/x86/vdso/vma.c 2010-08-13 16:24:37.000000000 -0400 20394--- linux-2.6.32.24/arch/x86/vdso/vma.c 2010-08-13 16:24:37.000000000 -0400
20395+++ linux-2.6.32.23/arch/x86/vdso/vma.c 2010-09-04 15:54:51.000000000 -0400 20395+++ linux-2.6.32.24/arch/x86/vdso/vma.c 2010-09-04 15:54:51.000000000 -0400
20396@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) 20396@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
20397 if (!vbase) 20397 if (!vbase)
20398 goto oom; 20398 goto oom;
@@ -20439,9 +20439,9 @@ diff -urNp linux-2.6.32.23/arch/x86/vdso/vma.c linux-2.6.32.23/arch/x86/vdso/vma
20439- return 0; 20439- return 0;
20440-} 20440-}
20441-__setup("vdso=", vdso_setup); 20441-__setup("vdso=", vdso_setup);
20442diff -urNp linux-2.6.32.23/arch/x86/xen/enlighten.c linux-2.6.32.23/arch/x86/xen/enlighten.c 20442diff -urNp linux-2.6.32.24/arch/x86/xen/enlighten.c linux-2.6.32.24/arch/x86/xen/enlighten.c
20443--- linux-2.6.32.23/arch/x86/xen/enlighten.c 2010-08-13 16:24:37.000000000 -0400 20443--- linux-2.6.32.24/arch/x86/xen/enlighten.c 2010-08-13 16:24:37.000000000 -0400
20444+++ linux-2.6.32.23/arch/x86/xen/enlighten.c 2010-09-17 17:30:16.000000000 -0400 20444+++ linux-2.6.32.24/arch/x86/xen/enlighten.c 2010-09-17 17:30:16.000000000 -0400
20445@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); 20445@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
20446 20446
20447 struct shared_info xen_dummy_shared_info; 20447 struct shared_info xen_dummy_shared_info;
@@ -20497,9 +20497,9 @@ diff -urNp linux-2.6.32.23/arch/x86/xen/enlighten.c linux-2.6.32.23/arch/x86/xen
20497 xen_smp_init(); 20497 xen_smp_init();
20498 20498
20499 pgd = (pgd_t *)xen_start_info->pt_base; 20499 pgd = (pgd_t *)xen_start_info->pt_base;
20500diff -urNp linux-2.6.32.23/arch/x86/xen/mmu.c linux-2.6.32.23/arch/x86/xen/mmu.c 20500diff -urNp linux-2.6.32.24/arch/x86/xen/mmu.c linux-2.6.32.24/arch/x86/xen/mmu.c
20501--- linux-2.6.32.23/arch/x86/xen/mmu.c 2010-08-13 16:24:37.000000000 -0400 20501--- linux-2.6.32.24/arch/x86/xen/mmu.c 2010-08-13 16:24:37.000000000 -0400
20502+++ linux-2.6.32.23/arch/x86/xen/mmu.c 2010-09-04 15:54:51.000000000 -0400 20502+++ linux-2.6.32.24/arch/x86/xen/mmu.c 2010-09-04 15:54:51.000000000 -0400
20503@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable 20503@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
20504 convert_pfn_mfn(init_level4_pgt); 20504 convert_pfn_mfn(init_level4_pgt);
20505 convert_pfn_mfn(level3_ident_pgt); 20505 convert_pfn_mfn(level3_ident_pgt);
@@ -20520,9 +20520,9 @@ diff -urNp linux-2.6.32.23/arch/x86/xen/mmu.c linux-2.6.32.23/arch/x86/xen/mmu.c
20520 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); 20520 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
20521 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); 20521 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
20522 20522
20523diff -urNp linux-2.6.32.23/arch/x86/xen/smp.c linux-2.6.32.23/arch/x86/xen/smp.c 20523diff -urNp linux-2.6.32.24/arch/x86/xen/smp.c linux-2.6.32.24/arch/x86/xen/smp.c
20524--- linux-2.6.32.23/arch/x86/xen/smp.c 2010-08-13 16:24:37.000000000 -0400 20524--- linux-2.6.32.24/arch/x86/xen/smp.c 2010-08-13 16:24:37.000000000 -0400
20525+++ linux-2.6.32.23/arch/x86/xen/smp.c 2010-09-04 15:54:51.000000000 -0400 20525+++ linux-2.6.32.24/arch/x86/xen/smp.c 2010-09-04 15:54:51.000000000 -0400
20526@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ 20526@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
20527 { 20527 {
20528 BUG_ON(smp_processor_id() != 0); 20528 BUG_ON(smp_processor_id() != 0);
@@ -20546,9 +20546,9 @@ diff -urNp linux-2.6.32.23/arch/x86/xen/smp.c linux-2.6.32.23/arch/x86/xen/smp.c
20546 ctxt->user_regs.ss = __KERNEL_DS; 20546 ctxt->user_regs.ss = __KERNEL_DS;
20547 #ifdef CONFIG_X86_32 20547 #ifdef CONFIG_X86_32
20548 ctxt->user_regs.fs = __KERNEL_PERCPU; 20548 ctxt->user_regs.fs = __KERNEL_PERCPU;
20549diff -urNp linux-2.6.32.23/arch/x86/xen/xen-head.S linux-2.6.32.23/arch/x86/xen/xen-head.S 20549diff -urNp linux-2.6.32.24/arch/x86/xen/xen-head.S linux-2.6.32.24/arch/x86/xen/xen-head.S
20550--- linux-2.6.32.23/arch/x86/xen/xen-head.S 2010-08-13 16:24:37.000000000 -0400 20550--- linux-2.6.32.24/arch/x86/xen/xen-head.S 2010-08-13 16:24:37.000000000 -0400
20551+++ linux-2.6.32.23/arch/x86/xen/xen-head.S 2010-09-04 15:54:51.000000000 -0400 20551+++ linux-2.6.32.24/arch/x86/xen/xen-head.S 2010-09-04 15:54:51.000000000 -0400
20552@@ -19,6 +19,17 @@ ENTRY(startup_xen) 20552@@ -19,6 +19,17 @@ ENTRY(startup_xen)
20553 #ifdef CONFIG_X86_32 20553 #ifdef CONFIG_X86_32
20554 mov %esi,xen_start_info 20554 mov %esi,xen_start_info
@@ -20567,9 +20567,9 @@ diff -urNp linux-2.6.32.23/arch/x86/xen/xen-head.S linux-2.6.32.23/arch/x86/xen/
20567 #else 20567 #else
20568 mov %rsi,xen_start_info 20568 mov %rsi,xen_start_info
20569 mov $init_thread_union+THREAD_SIZE,%rsp 20569 mov $init_thread_union+THREAD_SIZE,%rsp
20570diff -urNp linux-2.6.32.23/arch/x86/xen/xen-ops.h linux-2.6.32.23/arch/x86/xen/xen-ops.h 20570diff -urNp linux-2.6.32.24/arch/x86/xen/xen-ops.h linux-2.6.32.24/arch/x86/xen/xen-ops.h
20571--- linux-2.6.32.23/arch/x86/xen/xen-ops.h 2010-08-13 16:24:37.000000000 -0400 20571--- linux-2.6.32.24/arch/x86/xen/xen-ops.h 2010-08-13 16:24:37.000000000 -0400
20572+++ linux-2.6.32.23/arch/x86/xen/xen-ops.h 2010-09-04 15:54:51.000000000 -0400 20572+++ linux-2.6.32.24/arch/x86/xen/xen-ops.h 2010-09-04 15:54:51.000000000 -0400
20573@@ -10,8 +10,6 @@ 20573@@ -10,8 +10,6 @@
20574 extern const char xen_hypervisor_callback[]; 20574 extern const char xen_hypervisor_callback[];
20575 extern const char xen_failsafe_callback[]; 20575 extern const char xen_failsafe_callback[];
@@ -20579,9 +20579,9 @@ diff -urNp linux-2.6.32.23/arch/x86/xen/xen-ops.h linux-2.6.32.23/arch/x86/xen/x
20579 struct trap_info; 20579 struct trap_info;
20580 void xen_copy_trap_info(struct trap_info *traps); 20580 void xen_copy_trap_info(struct trap_info *traps);
20581 20581
20582diff -urNp linux-2.6.32.23/block/blk-integrity.c linux-2.6.32.23/block/blk-integrity.c 20582diff -urNp linux-2.6.32.24/block/blk-integrity.c linux-2.6.32.24/block/blk-integrity.c
20583--- linux-2.6.32.23/block/blk-integrity.c 2010-08-13 16:24:37.000000000 -0400 20583--- linux-2.6.32.24/block/blk-integrity.c 2010-08-13 16:24:37.000000000 -0400
20584+++ linux-2.6.32.23/block/blk-integrity.c 2010-09-04 15:54:51.000000000 -0400 20584+++ linux-2.6.32.24/block/blk-integrity.c 2010-09-04 15:54:51.000000000 -0400
20585@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs 20585@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
20586 NULL, 20586 NULL,
20587 }; 20587 };
@@ -20591,9 +20591,9 @@ diff -urNp linux-2.6.32.23/block/blk-integrity.c linux-2.6.32.23/block/blk-integ
20591 .show = &integrity_attr_show, 20591 .show = &integrity_attr_show,
20592 .store = &integrity_attr_store, 20592 .store = &integrity_attr_store,
20593 }; 20593 };
20594diff -urNp linux-2.6.32.23/block/blk-iopoll.c linux-2.6.32.23/block/blk-iopoll.c 20594diff -urNp linux-2.6.32.24/block/blk-iopoll.c linux-2.6.32.24/block/blk-iopoll.c
20595--- linux-2.6.32.23/block/blk-iopoll.c 2010-08-13 16:24:37.000000000 -0400 20595--- linux-2.6.32.24/block/blk-iopoll.c 2010-08-13 16:24:37.000000000 -0400
20596+++ linux-2.6.32.23/block/blk-iopoll.c 2010-09-04 15:54:51.000000000 -0400 20596+++ linux-2.6.32.24/block/blk-iopoll.c 2010-09-04 15:54:51.000000000 -0400
20597@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo 20597@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
20598 } 20598 }
20599 EXPORT_SYMBOL(blk_iopoll_complete); 20599 EXPORT_SYMBOL(blk_iopoll_complete);
@@ -20603,9 +20603,9 @@ diff -urNp linux-2.6.32.23/block/blk-iopoll.c linux-2.6.32.23/block/blk-iopoll.c
20603 { 20603 {
20604 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); 20604 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
20605 int rearm = 0, budget = blk_iopoll_budget; 20605 int rearm = 0, budget = blk_iopoll_budget;
20606diff -urNp linux-2.6.32.23/block/blk-map.c linux-2.6.32.23/block/blk-map.c 20606diff -urNp linux-2.6.32.24/block/blk-map.c linux-2.6.32.24/block/blk-map.c
20607--- linux-2.6.32.23/block/blk-map.c 2010-08-13 16:24:37.000000000 -0400 20607--- linux-2.6.32.24/block/blk-map.c 2010-08-13 16:24:37.000000000 -0400
20608+++ linux-2.6.32.23/block/blk-map.c 2010-09-04 15:54:51.000000000 -0400 20608+++ linux-2.6.32.24/block/blk-map.c 2010-09-04 15:54:51.000000000 -0400
20609@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ 20609@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
20610 * direct dma. else, set up kernel bounce buffers 20610 * direct dma. else, set up kernel bounce buffers
20611 */ 20611 */
@@ -20624,9 +20624,9 @@ diff -urNp linux-2.6.32.23/block/blk-map.c linux-2.6.32.23/block/blk-map.c
20624 if (do_copy) 20624 if (do_copy)
20625 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); 20625 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
20626 else 20626 else
20627diff -urNp linux-2.6.32.23/block/blk-softirq.c linux-2.6.32.23/block/blk-softirq.c 20627diff -urNp linux-2.6.32.24/block/blk-softirq.c linux-2.6.32.24/block/blk-softirq.c
20628--- linux-2.6.32.23/block/blk-softirq.c 2010-08-13 16:24:37.000000000 -0400 20628--- linux-2.6.32.24/block/blk-softirq.c 2010-08-13 16:24:37.000000000 -0400
20629+++ linux-2.6.32.23/block/blk-softirq.c 2010-09-04 15:54:51.000000000 -0400 20629+++ linux-2.6.32.24/block/blk-softirq.c 2010-09-04 15:54:51.000000000 -0400
20630@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 20630@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
20631 * Softirq action handler - move entries to local list and loop over them 20631 * Softirq action handler - move entries to local list and loop over them
20632 * while passing them to the queue registered handler. 20632 * while passing them to the queue registered handler.
@@ -20636,9 +20636,9 @@ diff -urNp linux-2.6.32.23/block/blk-softirq.c linux-2.6.32.23/block/blk-softirq
20636 { 20636 {
20637 struct list_head *cpu_list, local_list; 20637 struct list_head *cpu_list, local_list;
20638 20638
20639diff -urNp linux-2.6.32.23/block/blk-sysfs.c linux-2.6.32.23/block/blk-sysfs.c 20639diff -urNp linux-2.6.32.24/block/blk-sysfs.c linux-2.6.32.24/block/blk-sysfs.c
20640--- linux-2.6.32.23/block/blk-sysfs.c 2010-08-13 16:24:37.000000000 -0400 20640--- linux-2.6.32.24/block/blk-sysfs.c 2010-08-13 16:24:37.000000000 -0400
20641+++ linux-2.6.32.23/block/blk-sysfs.c 2010-09-04 15:54:51.000000000 -0400 20641+++ linux-2.6.32.24/block/blk-sysfs.c 2010-09-04 15:54:51.000000000 -0400
20642@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob 20642@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
20643 kmem_cache_free(blk_requestq_cachep, q); 20643 kmem_cache_free(blk_requestq_cachep, q);
20644 } 20644 }
@@ -20648,9 +20648,9 @@ diff -urNp linux-2.6.32.23/block/blk-sysfs.c linux-2.6.32.23/block/blk-sysfs.c
20648 .show = queue_attr_show, 20648 .show = queue_attr_show,
20649 .store = queue_attr_store, 20649 .store = queue_attr_store,
20650 }; 20650 };
20651diff -urNp linux-2.6.32.23/block/elevator.c linux-2.6.32.23/block/elevator.c 20651diff -urNp linux-2.6.32.24/block/elevator.c linux-2.6.32.24/block/elevator.c
20652--- linux-2.6.32.23/block/elevator.c 2010-08-13 16:24:37.000000000 -0400 20652--- linux-2.6.32.24/block/elevator.c 2010-08-13 16:24:37.000000000 -0400
20653+++ linux-2.6.32.23/block/elevator.c 2010-09-04 15:54:51.000000000 -0400 20653+++ linux-2.6.32.24/block/elevator.c 2010-09-04 15:54:51.000000000 -0400
20654@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str 20654@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
20655 return error; 20655 return error;
20656 } 20656 }
@@ -20660,9 +20660,9 @@ diff -urNp linux-2.6.32.23/block/elevator.c linux-2.6.32.23/block/elevator.c
20660 .show = elv_attr_show, 20660 .show = elv_attr_show,
20661 .store = elv_attr_store, 20661 .store = elv_attr_store,
20662 }; 20662 };
20663diff -urNp linux-2.6.32.23/crypto/lrw.c linux-2.6.32.23/crypto/lrw.c 20663diff -urNp linux-2.6.32.24/crypto/lrw.c linux-2.6.32.24/crypto/lrw.c
20664--- linux-2.6.32.23/crypto/lrw.c 2010-08-13 16:24:37.000000000 -0400 20664--- linux-2.6.32.24/crypto/lrw.c 2010-08-13 16:24:37.000000000 -0400
20665+++ linux-2.6.32.23/crypto/lrw.c 2010-09-04 15:54:51.000000000 -0400 20665+++ linux-2.6.32.24/crypto/lrw.c 2010-09-04 15:54:51.000000000 -0400
20666@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par 20666@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
20667 struct priv *ctx = crypto_tfm_ctx(parent); 20667 struct priv *ctx = crypto_tfm_ctx(parent);
20668 struct crypto_cipher *child = ctx->child; 20668 struct crypto_cipher *child = ctx->child;
@@ -20672,9 +20672,9 @@ diff -urNp linux-2.6.32.23/crypto/lrw.c linux-2.6.32.23/crypto/lrw.c
20672 int bsize = crypto_cipher_blocksize(child); 20672 int bsize = crypto_cipher_blocksize(child);
20673 20673
20674 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); 20674 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
20675diff -urNp linux-2.6.32.23/Documentation/dontdiff linux-2.6.32.23/Documentation/dontdiff 20675diff -urNp linux-2.6.32.24/Documentation/dontdiff linux-2.6.32.24/Documentation/dontdiff
20676--- linux-2.6.32.23/Documentation/dontdiff 2010-08-13 16:24:37.000000000 -0400 20676--- linux-2.6.32.24/Documentation/dontdiff 2010-08-13 16:24:37.000000000 -0400
20677+++ linux-2.6.32.23/Documentation/dontdiff 2010-09-04 15:54:51.000000000 -0400 20677+++ linux-2.6.32.24/Documentation/dontdiff 2010-09-04 15:54:51.000000000 -0400
20678@@ -3,6 +3,7 @@ 20678@@ -3,6 +3,7 @@
20679 *.bin 20679 *.bin
20680 *.cpio 20680 *.cpio
@@ -20792,9 +20792,9 @@ diff -urNp linux-2.6.32.23/Documentation/dontdiff linux-2.6.32.23/Documentation/
20792 zImage* 20792 zImage*
20793 zconf.hash.c 20793 zconf.hash.c
20794+zoffset.h 20794+zoffset.h
20795diff -urNp linux-2.6.32.23/Documentation/kernel-parameters.txt linux-2.6.32.23/Documentation/kernel-parameters.txt 20795diff -urNp linux-2.6.32.24/Documentation/kernel-parameters.txt linux-2.6.32.24/Documentation/kernel-parameters.txt
20796--- linux-2.6.32.23/Documentation/kernel-parameters.txt 2010-08-13 16:24:37.000000000 -0400 20796--- linux-2.6.32.24/Documentation/kernel-parameters.txt 2010-08-13 16:24:37.000000000 -0400
20797+++ linux-2.6.32.23/Documentation/kernel-parameters.txt 2010-09-04 15:54:51.000000000 -0400 20797+++ linux-2.6.32.24/Documentation/kernel-parameters.txt 2010-09-04 15:54:51.000000000 -0400
20798@@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters. 20798@@ -1836,6 +1836,12 @@ and is between 256 and 4096 characters.
20799 the specified number of seconds. This is to be used if 20799 the specified number of seconds. This is to be used if
20800 your oopses keep scrolling off the screen. 20800 your oopses keep scrolling off the screen.
@@ -20808,9 +20808,9 @@ diff -urNp linux-2.6.32.23/Documentation/kernel-parameters.txt linux-2.6.32.23/D
20808 pcbit= [HW,ISDN] 20808 pcbit= [HW,ISDN]
20809 20809
20810 pcd. [PARIDE] 20810 pcd. [PARIDE]
20811diff -urNp linux-2.6.32.23/drivers/acpi/acpi_pad.c linux-2.6.32.23/drivers/acpi/acpi_pad.c 20811diff -urNp linux-2.6.32.24/drivers/acpi/acpi_pad.c linux-2.6.32.24/drivers/acpi/acpi_pad.c
20812--- linux-2.6.32.23/drivers/acpi/acpi_pad.c 2010-08-13 16:24:37.000000000 -0400 20812--- linux-2.6.32.24/drivers/acpi/acpi_pad.c 2010-08-13 16:24:37.000000000 -0400
20813+++ linux-2.6.32.23/drivers/acpi/acpi_pad.c 2010-09-04 15:54:51.000000000 -0400 20813+++ linux-2.6.32.24/drivers/acpi/acpi_pad.c 2010-09-04 15:54:51.000000000 -0400
20814@@ -30,7 +30,7 @@ 20814@@ -30,7 +30,7 @@
20815 #include <acpi/acpi_bus.h> 20815 #include <acpi/acpi_bus.h>
20816 #include <acpi/acpi_drivers.h> 20816 #include <acpi/acpi_drivers.h>
@@ -20820,9 +20820,9 @@ diff -urNp linux-2.6.32.23/drivers/acpi/acpi_pad.c linux-2.6.32.23/drivers/acpi/
20820 #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" 20820 #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
20821 #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 20821 #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
20822 static DEFINE_MUTEX(isolated_cpus_lock); 20822 static DEFINE_MUTEX(isolated_cpus_lock);
20823diff -urNp linux-2.6.32.23/drivers/acpi/battery.c linux-2.6.32.23/drivers/acpi/battery.c 20823diff -urNp linux-2.6.32.24/drivers/acpi/battery.c linux-2.6.32.24/drivers/acpi/battery.c
20824--- linux-2.6.32.23/drivers/acpi/battery.c 2010-08-13 16:24:37.000000000 -0400 20824--- linux-2.6.32.24/drivers/acpi/battery.c 2010-08-13 16:24:37.000000000 -0400
20825+++ linux-2.6.32.23/drivers/acpi/battery.c 2010-09-04 15:54:51.000000000 -0400 20825+++ linux-2.6.32.24/drivers/acpi/battery.c 2010-09-04 15:54:51.000000000 -0400
20826@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); 20826@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
20827 } 20827 }
20828 20828
@@ -20832,9 +20832,9 @@ diff -urNp linux-2.6.32.23/drivers/acpi/battery.c linux-2.6.32.23/drivers/acpi/b
20832 mode_t mode; 20832 mode_t mode;
20833 const char *name; 20833 const char *name;
20834 } acpi_battery_file[] = { 20834 } acpi_battery_file[] = {
20835diff -urNp linux-2.6.32.23/drivers/acpi/blacklist.c linux-2.6.32.23/drivers/acpi/blacklist.c 20835diff -urNp linux-2.6.32.24/drivers/acpi/blacklist.c linux-2.6.32.24/drivers/acpi/blacklist.c
20836--- linux-2.6.32.23/drivers/acpi/blacklist.c 2010-09-26 17:26:05.000000000 -0400 20836--- linux-2.6.32.24/drivers/acpi/blacklist.c 2010-09-26 17:26:05.000000000 -0400
20837+++ linux-2.6.32.23/drivers/acpi/blacklist.c 2010-09-26 17:26:38.000000000 -0400 20837+++ linux-2.6.32.24/drivers/acpi/blacklist.c 2010-09-26 17:26:38.000000000 -0400
20838@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b 20838@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
20839 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, 20839 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
20840 "Incorrect _ADR", 1}, 20840 "Incorrect _ADR", 1},
@@ -20844,9 +20844,9 @@ diff -urNp linux-2.6.32.23/drivers/acpi/blacklist.c linux-2.6.32.23/drivers/acpi
20844 }; 20844 };
20845 20845
20846 #if CONFIG_ACPI_BLACKLIST_YEAR 20846 #if CONFIG_ACPI_BLACKLIST_YEAR
20847diff -urNp linux-2.6.32.23/drivers/acpi/dock.c linux-2.6.32.23/drivers/acpi/dock.c 20847diff -urNp linux-2.6.32.24/drivers/acpi/dock.c linux-2.6.32.24/drivers/acpi/dock.c
20848--- linux-2.6.32.23/drivers/acpi/dock.c 2010-08-13 16:24:37.000000000 -0400 20848--- linux-2.6.32.24/drivers/acpi/dock.c 2010-08-13 16:24:37.000000000 -0400
20849+++ linux-2.6.32.23/drivers/acpi/dock.c 2010-09-04 15:54:51.000000000 -0400 20849+++ linux-2.6.32.24/drivers/acpi/dock.c 2010-09-04 15:54:51.000000000 -0400
20850@@ -77,7 +77,7 @@ struct dock_dependent_device { 20850@@ -77,7 +77,7 @@ struct dock_dependent_device {
20851 struct list_head list; 20851 struct list_head list;
20852 struct list_head hotplug_list; 20852 struct list_head hotplug_list;
@@ -20865,9 +20865,9 @@ diff -urNp linux-2.6.32.23/drivers/acpi/dock.c linux-2.6.32.23/drivers/acpi/dock
20865 void *context) 20865 void *context)
20866 { 20866 {
20867 struct dock_dependent_device *dd; 20867 struct dock_dependent_device *dd;
20868diff -urNp linux-2.6.32.23/drivers/acpi/osl.c linux-2.6.32.23/drivers/acpi/osl.c 20868diff -urNp linux-2.6.32.24/drivers/acpi/osl.c linux-2.6.32.24/drivers/acpi/osl.c
20869--- linux-2.6.32.23/drivers/acpi/osl.c 2010-08-13 16:24:37.000000000 -0400 20869--- linux-2.6.32.24/drivers/acpi/osl.c 2010-08-13 16:24:37.000000000 -0400
20870+++ linux-2.6.32.23/drivers/acpi/osl.c 2010-09-04 15:54:51.000000000 -0400 20870+++ linux-2.6.32.24/drivers/acpi/osl.c 2010-09-04 15:54:51.000000000 -0400
20871@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres 20871@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
20872 void __iomem *virt_addr; 20872 void __iomem *virt_addr;
20873 20873
@@ -20886,9 +20886,9 @@ diff -urNp linux-2.6.32.23/drivers/acpi/osl.c linux-2.6.32.23/drivers/acpi/osl.c
20886 20886
20887 switch (width) { 20887 switch (width) {
20888 case 8: 20888 case 8:
20889diff -urNp linux-2.6.32.23/drivers/acpi/power_meter.c linux-2.6.32.23/drivers/acpi/power_meter.c 20889diff -urNp linux-2.6.32.24/drivers/acpi/power_meter.c linux-2.6.32.24/drivers/acpi/power_meter.c
20890--- linux-2.6.32.23/drivers/acpi/power_meter.c 2010-08-13 16:24:37.000000000 -0400 20890--- linux-2.6.32.24/drivers/acpi/power_meter.c 2010-08-13 16:24:37.000000000 -0400
20891+++ linux-2.6.32.23/drivers/acpi/power_meter.c 2010-09-04 15:54:51.000000000 -0400 20891+++ linux-2.6.32.24/drivers/acpi/power_meter.c 2010-09-04 15:54:51.000000000 -0400
20892@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d 20892@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
20893 return res; 20893 return res;
20894 20894
@@ -20898,9 +20898,9 @@ diff -urNp linux-2.6.32.23/drivers/acpi/power_meter.c linux-2.6.32.23/drivers/ac
20898 20898
20899 mutex_lock(&resource->lock); 20899 mutex_lock(&resource->lock);
20900 resource->trip[attr->index - 7] = temp; 20900 resource->trip[attr->index - 7] = temp;
20901diff -urNp linux-2.6.32.23/drivers/acpi/proc.c linux-2.6.32.23/drivers/acpi/proc.c 20901diff -urNp linux-2.6.32.24/drivers/acpi/proc.c linux-2.6.32.24/drivers/acpi/proc.c
20902--- linux-2.6.32.23/drivers/acpi/proc.c 2010-08-13 16:24:37.000000000 -0400 20902--- linux-2.6.32.24/drivers/acpi/proc.c 2010-08-13 16:24:37.000000000 -0400
20903+++ linux-2.6.32.23/drivers/acpi/proc.c 2010-09-04 15:54:51.000000000 -0400 20903+++ linux-2.6.32.24/drivers/acpi/proc.c 2010-09-04 15:54:51.000000000 -0400
20904@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f 20904@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
20905 size_t count, loff_t * ppos) 20905 size_t count, loff_t * ppos)
20906 { 20906 {
@@ -20936,9 +20936,9 @@ diff -urNp linux-2.6.32.23/drivers/acpi/proc.c linux-2.6.32.23/drivers/acpi/proc
20936 dev->wakeup.state.enabled = 20936 dev->wakeup.state.enabled =
20937 dev->wakeup.state.enabled ? 0 : 1; 20937 dev->wakeup.state.enabled ? 0 : 1;
20938 found_dev = dev; 20938 found_dev = dev;
20939diff -urNp linux-2.6.32.23/drivers/acpi/processor_core.c linux-2.6.32.23/drivers/acpi/processor_core.c 20939diff -urNp linux-2.6.32.24/drivers/acpi/processor_core.c linux-2.6.32.24/drivers/acpi/processor_core.c
20940--- linux-2.6.32.23/drivers/acpi/processor_core.c 2010-08-13 16:24:37.000000000 -0400 20940--- linux-2.6.32.24/drivers/acpi/processor_core.c 2010-08-13 16:24:37.000000000 -0400
20941+++ linux-2.6.32.23/drivers/acpi/processor_core.c 2010-09-04 15:54:51.000000000 -0400 20941+++ linux-2.6.32.24/drivers/acpi/processor_core.c 2010-09-04 15:54:51.000000000 -0400
20942@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( 20942@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add(
20943 return 0; 20943 return 0;
20944 } 20944 }
@@ -20948,9 +20948,9 @@ diff -urNp linux-2.6.32.23/drivers/acpi/processor_core.c linux-2.6.32.23/drivers
20948 20948
20949 /* 20949 /*
20950 * Buggy BIOS check 20950 * Buggy BIOS check
20951diff -urNp linux-2.6.32.23/drivers/acpi/processor_idle.c linux-2.6.32.23/drivers/acpi/processor_idle.c 20951diff -urNp linux-2.6.32.24/drivers/acpi/processor_idle.c linux-2.6.32.24/drivers/acpi/processor_idle.c
20952--- linux-2.6.32.23/drivers/acpi/processor_idle.c 2010-08-13 16:24:37.000000000 -0400 20952--- linux-2.6.32.24/drivers/acpi/processor_idle.c 2010-08-13 16:24:37.000000000 -0400
20953+++ linux-2.6.32.23/drivers/acpi/processor_idle.c 2010-09-04 15:54:51.000000000 -0400 20953+++ linux-2.6.32.24/drivers/acpi/processor_idle.c 2010-09-04 15:54:51.000000000 -0400
20954@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat 20954@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
20955 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), 20955 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
20956 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, 20956 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
@@ -20960,9 +20960,9 @@ diff -urNp linux-2.6.32.23/drivers/acpi/processor_idle.c linux-2.6.32.23/drivers
20960 }; 20960 };
20961 20961
20962 20962
20963diff -urNp linux-2.6.32.23/drivers/acpi/sbshc.c linux-2.6.32.23/drivers/acpi/sbshc.c 20963diff -urNp linux-2.6.32.24/drivers/acpi/sbshc.c linux-2.6.32.24/drivers/acpi/sbshc.c
20964--- linux-2.6.32.23/drivers/acpi/sbshc.c 2010-08-13 16:24:37.000000000 -0400 20964--- linux-2.6.32.24/drivers/acpi/sbshc.c 2010-08-13 16:24:37.000000000 -0400
20965+++ linux-2.6.32.23/drivers/acpi/sbshc.c 2010-09-04 15:54:51.000000000 -0400 20965+++ linux-2.6.32.24/drivers/acpi/sbshc.c 2010-09-04 15:54:51.000000000 -0400
20966@@ -17,7 +17,7 @@ 20966@@ -17,7 +17,7 @@
20967 20967
20968 #define PREFIX "ACPI: " 20968 #define PREFIX "ACPI: "
@@ -20972,9 +20972,9 @@ diff -urNp linux-2.6.32.23/drivers/acpi/sbshc.c linux-2.6.32.23/drivers/acpi/sbs
20972 #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC" 20972 #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC"
20973 20973
20974 struct acpi_smb_hc { 20974 struct acpi_smb_hc {
20975diff -urNp linux-2.6.32.23/drivers/acpi/sleep.c linux-2.6.32.23/drivers/acpi/sleep.c 20975diff -urNp linux-2.6.32.24/drivers/acpi/sleep.c linux-2.6.32.24/drivers/acpi/sleep.c
20976--- linux-2.6.32.23/drivers/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400 20976--- linux-2.6.32.24/drivers/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
20977+++ linux-2.6.32.23/drivers/acpi/sleep.c 2010-09-04 15:54:51.000000000 -0400 20977+++ linux-2.6.32.24/drivers/acpi/sleep.c 2010-09-04 15:54:51.000000000 -0400
20978@@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp 20978@@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp
20979 } 20979 }
20980 } 20980 }
@@ -21011,9 +21011,9 @@ diff -urNp linux-2.6.32.23/drivers/acpi/sleep.c linux-2.6.32.23/drivers/acpi/sle
21011 .begin = acpi_hibernation_begin_old, 21011 .begin = acpi_hibernation_begin_old,
21012 .end = acpi_pm_end, 21012 .end = acpi_pm_end,
21013 .pre_snapshot = acpi_hibernation_pre_snapshot_old, 21013 .pre_snapshot = acpi_hibernation_pre_snapshot_old,
21014diff -urNp linux-2.6.32.23/drivers/acpi/video.c linux-2.6.32.23/drivers/acpi/video.c 21014diff -urNp linux-2.6.32.24/drivers/acpi/video.c linux-2.6.32.24/drivers/acpi/video.c
21015--- linux-2.6.32.23/drivers/acpi/video.c 2010-08-13 16:24:37.000000000 -0400 21015--- linux-2.6.32.24/drivers/acpi/video.c 2010-08-13 16:24:37.000000000 -0400
21016+++ linux-2.6.32.23/drivers/acpi/video.c 2010-09-04 15:54:51.000000000 -0400 21016+++ linux-2.6.32.24/drivers/acpi/video.c 2010-09-04 15:54:51.000000000 -0400
21017@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str 21017@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
21018 vd->brightness->levels[request_level]); 21018 vd->brightness->levels[request_level]);
21019 } 21019 }
@@ -21023,9 +21023,9 @@ diff -urNp linux-2.6.32.23/drivers/acpi/video.c linux-2.6.32.23/drivers/acpi/vid
21023 .get_brightness = acpi_video_get_brightness, 21023 .get_brightness = acpi_video_get_brightness,
21024 .update_status = acpi_video_set_brightness, 21024 .update_status = acpi_video_set_brightness,
21025 }; 21025 };
21026diff -urNp linux-2.6.32.23/drivers/ata/ahci.c linux-2.6.32.23/drivers/ata/ahci.c 21026diff -urNp linux-2.6.32.24/drivers/ata/ahci.c linux-2.6.32.24/drivers/ata/ahci.c
21027--- linux-2.6.32.23/drivers/ata/ahci.c 2010-08-13 16:24:37.000000000 -0400 21027--- linux-2.6.32.24/drivers/ata/ahci.c 2010-08-13 16:24:37.000000000 -0400
21028+++ linux-2.6.32.23/drivers/ata/ahci.c 2010-09-04 15:54:51.000000000 -0400 21028+++ linux-2.6.32.24/drivers/ata/ahci.c 2010-09-04 15:54:51.000000000 -0400
21029@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh 21029@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
21030 .sdev_attrs = ahci_sdev_attrs, 21030 .sdev_attrs = ahci_sdev_attrs,
21031 }; 21031 };
@@ -21065,9 +21065,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/ahci.c linux-2.6.32.23/drivers/ata/ahci.c
21065 }; 21065 };
21066 21066
21067 21067
21068diff -urNp linux-2.6.32.23/drivers/ata/ata_generic.c linux-2.6.32.23/drivers/ata/ata_generic.c 21068diff -urNp linux-2.6.32.24/drivers/ata/ata_generic.c linux-2.6.32.24/drivers/ata/ata_generic.c
21069--- linux-2.6.32.23/drivers/ata/ata_generic.c 2010-08-13 16:24:37.000000000 -0400 21069--- linux-2.6.32.24/drivers/ata/ata_generic.c 2010-08-13 16:24:37.000000000 -0400
21070+++ linux-2.6.32.23/drivers/ata/ata_generic.c 2010-09-04 15:54:51.000000000 -0400 21070+++ linux-2.6.32.24/drivers/ata/ata_generic.c 2010-09-04 15:54:51.000000000 -0400
21071@@ -95,7 +95,7 @@ static struct scsi_host_template generic 21071@@ -95,7 +95,7 @@ static struct scsi_host_template generic
21072 ATA_BMDMA_SHT(DRV_NAME), 21072 ATA_BMDMA_SHT(DRV_NAME),
21073 }; 21073 };
@@ -21077,9 +21077,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/ata_generic.c linux-2.6.32.23/drivers/ata
21077 .inherits = &ata_bmdma_port_ops, 21077 .inherits = &ata_bmdma_port_ops,
21078 .cable_detect = ata_cable_unknown, 21078 .cable_detect = ata_cable_unknown,
21079 .set_mode = generic_set_mode, 21079 .set_mode = generic_set_mode,
21080diff -urNp linux-2.6.32.23/drivers/ata/ata_piix.c linux-2.6.32.23/drivers/ata/ata_piix.c 21080diff -urNp linux-2.6.32.24/drivers/ata/ata_piix.c linux-2.6.32.24/drivers/ata/ata_piix.c
21081--- linux-2.6.32.23/drivers/ata/ata_piix.c 2010-08-13 16:24:37.000000000 -0400 21081--- linux-2.6.32.24/drivers/ata/ata_piix.c 2010-08-13 16:24:37.000000000 -0400
21082+++ linux-2.6.32.23/drivers/ata/ata_piix.c 2010-09-04 15:54:51.000000000 -0400 21082+++ linux-2.6.32.24/drivers/ata/ata_piix.c 2010-09-04 15:54:51.000000000 -0400
21083@@ -300,7 +300,7 @@ static const struct pci_device_id piix_p 21083@@ -300,7 +300,7 @@ static const struct pci_device_id piix_p
21084 { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, 21084 { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
21085 /* SATA Controller IDE (CPT) */ 21085 /* SATA Controller IDE (CPT) */
@@ -21143,9 +21143,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/ata_piix.c linux-2.6.32.23/drivers/ata/at
21143 }; 21143 };
21144 static const char *oemstrs[] = { 21144 static const char *oemstrs[] = {
21145 "Tecra M3,", 21145 "Tecra M3,",
21146diff -urNp linux-2.6.32.23/drivers/ata/libata-acpi.c linux-2.6.32.23/drivers/ata/libata-acpi.c 21146diff -urNp linux-2.6.32.24/drivers/ata/libata-acpi.c linux-2.6.32.24/drivers/ata/libata-acpi.c
21147--- linux-2.6.32.23/drivers/ata/libata-acpi.c 2010-08-13 16:24:37.000000000 -0400 21147--- linux-2.6.32.24/drivers/ata/libata-acpi.c 2010-08-13 16:24:37.000000000 -0400
21148+++ linux-2.6.32.23/drivers/ata/libata-acpi.c 2010-09-04 15:54:51.000000000 -0400 21148+++ linux-2.6.32.24/drivers/ata/libata-acpi.c 2010-09-04 15:54:51.000000000 -0400
21149@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han 21149@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
21150 ata_acpi_uevent(dev->link->ap, dev, event); 21150 ata_acpi_uevent(dev->link->ap, dev, event);
21151 } 21151 }
@@ -21161,9 +21161,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/libata-acpi.c linux-2.6.32.23/drivers/ata
21161 .handler = ata_acpi_ap_notify_dock, 21161 .handler = ata_acpi_ap_notify_dock,
21162 .uevent = ata_acpi_ap_uevent, 21162 .uevent = ata_acpi_ap_uevent,
21163 }; 21163 };
21164diff -urNp linux-2.6.32.23/drivers/ata/libata-core.c linux-2.6.32.23/drivers/ata/libata-core.c 21164diff -urNp linux-2.6.32.24/drivers/ata/libata-core.c linux-2.6.32.24/drivers/ata/libata-core.c
21165--- linux-2.6.32.23/drivers/ata/libata-core.c 2010-09-20 17:26:42.000000000 -0400 21165--- linux-2.6.32.24/drivers/ata/libata-core.c 2010-09-20 17:26:42.000000000 -0400
21166+++ linux-2.6.32.23/drivers/ata/libata-core.c 2010-09-20 17:27:14.000000000 -0400 21166+++ linux-2.6.32.24/drivers/ata/libata-core.c 2010-09-20 17:27:14.000000000 -0400
21167@@ -900,7 +900,7 @@ static const struct ata_xfer_ent { 21167@@ -900,7 +900,7 @@ static const struct ata_xfer_ent {
21168 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, 21168 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
21169 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, 21169 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
@@ -21237,9 +21237,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/libata-core.c linux-2.6.32.23/drivers/ata
21237 .qc_prep = ata_noop_qc_prep, 21237 .qc_prep = ata_noop_qc_prep,
21238 .qc_issue = ata_dummy_qc_issue, 21238 .qc_issue = ata_dummy_qc_issue,
21239 .error_handler = ata_dummy_error_handler, 21239 .error_handler = ata_dummy_error_handler,
21240diff -urNp linux-2.6.32.23/drivers/ata/libata-eh.c linux-2.6.32.23/drivers/ata/libata-eh.c 21240diff -urNp linux-2.6.32.24/drivers/ata/libata-eh.c linux-2.6.32.24/drivers/ata/libata-eh.c
21241--- linux-2.6.32.23/drivers/ata/libata-eh.c 2010-09-20 17:26:42.000000000 -0400 21241--- linux-2.6.32.24/drivers/ata/libata-eh.c 2010-09-20 17:26:42.000000000 -0400
21242+++ linux-2.6.32.23/drivers/ata/libata-eh.c 2010-09-20 17:27:14.000000000 -0400 21242+++ linux-2.6.32.24/drivers/ata/libata-eh.c 2010-09-20 17:27:14.000000000 -0400
21243@@ -3590,7 +3590,7 @@ void ata_do_eh(struct ata_port *ap, ata_ 21243@@ -3590,7 +3590,7 @@ void ata_do_eh(struct ata_port *ap, ata_
21244 */ 21244 */
21245 void ata_std_error_handler(struct ata_port *ap) 21245 void ata_std_error_handler(struct ata_port *ap)
@@ -21249,9 +21249,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/libata-eh.c linux-2.6.32.23/drivers/ata/l
21249 ata_reset_fn_t hardreset = ops->hardreset; 21249 ata_reset_fn_t hardreset = ops->hardreset;
21250 21250
21251 /* ignore built-in hardreset if SCR access is not available */ 21251 /* ignore built-in hardreset if SCR access is not available */
21252diff -urNp linux-2.6.32.23/drivers/ata/libata-pmp.c linux-2.6.32.23/drivers/ata/libata-pmp.c 21252diff -urNp linux-2.6.32.24/drivers/ata/libata-pmp.c linux-2.6.32.24/drivers/ata/libata-pmp.c
21253--- linux-2.6.32.23/drivers/ata/libata-pmp.c 2010-08-13 16:24:37.000000000 -0400 21253--- linux-2.6.32.24/drivers/ata/libata-pmp.c 2010-08-13 16:24:37.000000000 -0400
21254+++ linux-2.6.32.23/drivers/ata/libata-pmp.c 2010-09-04 15:54:51.000000000 -0400 21254+++ linux-2.6.32.24/drivers/ata/libata-pmp.c 2010-09-04 15:54:51.000000000 -0400
21255@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str 21255@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
21256 */ 21256 */
21257 static int sata_pmp_eh_recover(struct ata_port *ap) 21257 static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -21261,9 +21261,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/libata-pmp.c linux-2.6.32.23/drivers/ata/
21261 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; 21261 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
21262 struct ata_link *pmp_link = &ap->link; 21262 struct ata_link *pmp_link = &ap->link;
21263 struct ata_device *pmp_dev = pmp_link->device; 21263 struct ata_device *pmp_dev = pmp_link->device;
21264diff -urNp linux-2.6.32.23/drivers/ata/pata_acpi.c linux-2.6.32.23/drivers/ata/pata_acpi.c 21264diff -urNp linux-2.6.32.24/drivers/ata/pata_acpi.c linux-2.6.32.24/drivers/ata/pata_acpi.c
21265--- linux-2.6.32.23/drivers/ata/pata_acpi.c 2010-08-13 16:24:37.000000000 -0400 21265--- linux-2.6.32.24/drivers/ata/pata_acpi.c 2010-08-13 16:24:37.000000000 -0400
21266+++ linux-2.6.32.23/drivers/ata/pata_acpi.c 2010-09-04 15:54:51.000000000 -0400 21266+++ linux-2.6.32.24/drivers/ata/pata_acpi.c 2010-09-04 15:54:51.000000000 -0400
21267@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s 21267@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
21268 ATA_BMDMA_SHT(DRV_NAME), 21268 ATA_BMDMA_SHT(DRV_NAME),
21269 }; 21269 };
@@ -21273,9 +21273,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_acpi.c linux-2.6.32.23/drivers/ata/p
21273 .inherits = &ata_bmdma_port_ops, 21273 .inherits = &ata_bmdma_port_ops,
21274 .qc_issue = pacpi_qc_issue, 21274 .qc_issue = pacpi_qc_issue,
21275 .cable_detect = pacpi_cable_detect, 21275 .cable_detect = pacpi_cable_detect,
21276diff -urNp linux-2.6.32.23/drivers/ata/pata_ali.c linux-2.6.32.23/drivers/ata/pata_ali.c 21276diff -urNp linux-2.6.32.24/drivers/ata/pata_ali.c linux-2.6.32.24/drivers/ata/pata_ali.c
21277--- linux-2.6.32.23/drivers/ata/pata_ali.c 2010-08-13 16:24:37.000000000 -0400 21277--- linux-2.6.32.24/drivers/ata/pata_ali.c 2010-08-13 16:24:37.000000000 -0400
21278+++ linux-2.6.32.23/drivers/ata/pata_ali.c 2010-09-04 15:54:51.000000000 -0400 21278+++ linux-2.6.32.24/drivers/ata/pata_ali.c 2010-09-04 15:54:51.000000000 -0400
21279@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht 21279@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
21280 * Port operations for PIO only ALi 21280 * Port operations for PIO only ALi
21281 */ 21281 */
@@ -21321,9 +21321,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_ali.c linux-2.6.32.23/drivers/ata/pa
21321 .inherits = &ali_dma_base_ops, 21321 .inherits = &ali_dma_base_ops,
21322 .check_atapi_dma = ali_check_atapi_dma, 21322 .check_atapi_dma = ali_check_atapi_dma,
21323 .dev_config = ali_warn_atapi_dma, 21323 .dev_config = ali_warn_atapi_dma,
21324diff -urNp linux-2.6.32.23/drivers/ata/pata_amd.c linux-2.6.32.23/drivers/ata/pata_amd.c 21324diff -urNp linux-2.6.32.24/drivers/ata/pata_amd.c linux-2.6.32.24/drivers/ata/pata_amd.c
21325--- linux-2.6.32.23/drivers/ata/pata_amd.c 2010-08-13 16:24:37.000000000 -0400 21325--- linux-2.6.32.24/drivers/ata/pata_amd.c 2010-08-13 16:24:37.000000000 -0400
21326+++ linux-2.6.32.23/drivers/ata/pata_amd.c 2010-09-04 15:54:51.000000000 -0400 21326+++ linux-2.6.32.24/drivers/ata/pata_amd.c 2010-09-04 15:54:51.000000000 -0400
21327@@ -397,28 +397,28 @@ static const struct ata_port_operations 21327@@ -397,28 +397,28 @@ static const struct ata_port_operations
21328 .prereset = amd_pre_reset, 21328 .prereset = amd_pre_reset,
21329 }; 21329 };
@@ -21373,9 +21373,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_amd.c linux-2.6.32.23/drivers/ata/pa
21373 .inherits = &nv_base_port_ops, 21373 .inherits = &nv_base_port_ops,
21374 .set_piomode = nv133_set_piomode, 21374 .set_piomode = nv133_set_piomode,
21375 .set_dmamode = nv133_set_dmamode, 21375 .set_dmamode = nv133_set_dmamode,
21376diff -urNp linux-2.6.32.23/drivers/ata/pata_artop.c linux-2.6.32.23/drivers/ata/pata_artop.c 21376diff -urNp linux-2.6.32.24/drivers/ata/pata_artop.c linux-2.6.32.24/drivers/ata/pata_artop.c
21377--- linux-2.6.32.23/drivers/ata/pata_artop.c 2010-08-13 16:24:37.000000000 -0400 21377--- linux-2.6.32.24/drivers/ata/pata_artop.c 2010-08-13 16:24:37.000000000 -0400
21378+++ linux-2.6.32.23/drivers/ata/pata_artop.c 2010-09-04 15:54:51.000000000 -0400 21378+++ linux-2.6.32.24/drivers/ata/pata_artop.c 2010-09-04 15:54:51.000000000 -0400
21379@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s 21379@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
21380 ATA_BMDMA_SHT(DRV_NAME), 21380 ATA_BMDMA_SHT(DRV_NAME),
21381 }; 21381 };
@@ -21394,9 +21394,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_artop.c linux-2.6.32.23/drivers/ata/
21394 .inherits = &ata_bmdma_port_ops, 21394 .inherits = &ata_bmdma_port_ops,
21395 .cable_detect = artop6260_cable_detect, 21395 .cable_detect = artop6260_cable_detect,
21396 .set_piomode = artop6260_set_piomode, 21396 .set_piomode = artop6260_set_piomode,
21397diff -urNp linux-2.6.32.23/drivers/ata/pata_at32.c linux-2.6.32.23/drivers/ata/pata_at32.c 21397diff -urNp linux-2.6.32.24/drivers/ata/pata_at32.c linux-2.6.32.24/drivers/ata/pata_at32.c
21398--- linux-2.6.32.23/drivers/ata/pata_at32.c 2010-08-13 16:24:37.000000000 -0400 21398--- linux-2.6.32.24/drivers/ata/pata_at32.c 2010-08-13 16:24:37.000000000 -0400
21399+++ linux-2.6.32.23/drivers/ata/pata_at32.c 2010-09-04 15:54:51.000000000 -0400 21399+++ linux-2.6.32.24/drivers/ata/pata_at32.c 2010-09-04 15:54:51.000000000 -0400
21400@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh 21400@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
21401 ATA_PIO_SHT(DRV_NAME), 21401 ATA_PIO_SHT(DRV_NAME),
21402 }; 21402 };
@@ -21406,9 +21406,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_at32.c linux-2.6.32.23/drivers/ata/p
21406 .inherits = &ata_sff_port_ops, 21406 .inherits = &ata_sff_port_ops,
21407 .cable_detect = ata_cable_40wire, 21407 .cable_detect = ata_cable_40wire,
21408 .set_piomode = pata_at32_set_piomode, 21408 .set_piomode = pata_at32_set_piomode,
21409diff -urNp linux-2.6.32.23/drivers/ata/pata_at91.c linux-2.6.32.23/drivers/ata/pata_at91.c 21409diff -urNp linux-2.6.32.24/drivers/ata/pata_at91.c linux-2.6.32.24/drivers/ata/pata_at91.c
21410--- linux-2.6.32.23/drivers/ata/pata_at91.c 2010-08-13 16:24:37.000000000 -0400 21410--- linux-2.6.32.24/drivers/ata/pata_at91.c 2010-08-13 16:24:37.000000000 -0400
21411+++ linux-2.6.32.23/drivers/ata/pata_at91.c 2010-09-04 15:54:51.000000000 -0400 21411+++ linux-2.6.32.24/drivers/ata/pata_at91.c 2010-09-04 15:54:51.000000000 -0400
21412@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at 21412@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
21413 ATA_PIO_SHT(DRV_NAME), 21413 ATA_PIO_SHT(DRV_NAME),
21414 }; 21414 };
@@ -21418,9 +21418,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_at91.c linux-2.6.32.23/drivers/ata/p
21418 .inherits = &ata_sff_port_ops, 21418 .inherits = &ata_sff_port_ops,
21419 21419
21420 .sff_data_xfer = pata_at91_data_xfer_noirq, 21420 .sff_data_xfer = pata_at91_data_xfer_noirq,
21421diff -urNp linux-2.6.32.23/drivers/ata/pata_atiixp.c linux-2.6.32.23/drivers/ata/pata_atiixp.c 21421diff -urNp linux-2.6.32.24/drivers/ata/pata_atiixp.c linux-2.6.32.24/drivers/ata/pata_atiixp.c
21422--- linux-2.6.32.23/drivers/ata/pata_atiixp.c 2010-08-13 16:24:37.000000000 -0400 21422--- linux-2.6.32.24/drivers/ata/pata_atiixp.c 2010-08-13 16:24:37.000000000 -0400
21423+++ linux-2.6.32.23/drivers/ata/pata_atiixp.c 2010-09-04 15:54:51.000000000 -0400 21423+++ linux-2.6.32.24/drivers/ata/pata_atiixp.c 2010-09-04 15:54:51.000000000 -0400
21424@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ 21424@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
21425 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 21425 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
21426 }; 21426 };
@@ -21430,9 +21430,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_atiixp.c linux-2.6.32.23/drivers/ata
21430 .inherits = &ata_bmdma_port_ops, 21430 .inherits = &ata_bmdma_port_ops,
21431 21431
21432 .qc_prep = ata_sff_dumb_qc_prep, 21432 .qc_prep = ata_sff_dumb_qc_prep,
21433diff -urNp linux-2.6.32.23/drivers/ata/pata_atp867x.c linux-2.6.32.23/drivers/ata/pata_atp867x.c 21433diff -urNp linux-2.6.32.24/drivers/ata/pata_atp867x.c linux-2.6.32.24/drivers/ata/pata_atp867x.c
21434--- linux-2.6.32.23/drivers/ata/pata_atp867x.c 2010-08-13 16:24:37.000000000 -0400 21434--- linux-2.6.32.24/drivers/ata/pata_atp867x.c 2010-08-13 16:24:37.000000000 -0400
21435+++ linux-2.6.32.23/drivers/ata/pata_atp867x.c 2010-09-04 15:54:51.000000000 -0400 21435+++ linux-2.6.32.24/drivers/ata/pata_atp867x.c 2010-09-04 15:54:51.000000000 -0400
21436@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x 21436@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
21437 ATA_BMDMA_SHT(DRV_NAME), 21437 ATA_BMDMA_SHT(DRV_NAME),
21438 }; 21438 };
@@ -21442,9 +21442,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_atp867x.c linux-2.6.32.23/drivers/at
21442 .inherits = &ata_bmdma_port_ops, 21442 .inherits = &ata_bmdma_port_ops,
21443 .cable_detect = atp867x_cable_detect, 21443 .cable_detect = atp867x_cable_detect,
21444 .set_piomode = atp867x_set_piomode, 21444 .set_piomode = atp867x_set_piomode,
21445diff -urNp linux-2.6.32.23/drivers/ata/pata_bf54x.c linux-2.6.32.23/drivers/ata/pata_bf54x.c 21445diff -urNp linux-2.6.32.24/drivers/ata/pata_bf54x.c linux-2.6.32.24/drivers/ata/pata_bf54x.c
21446--- linux-2.6.32.23/drivers/ata/pata_bf54x.c 2010-08-13 16:24:37.000000000 -0400 21446--- linux-2.6.32.24/drivers/ata/pata_bf54x.c 2010-08-13 16:24:37.000000000 -0400
21447+++ linux-2.6.32.23/drivers/ata/pata_bf54x.c 2010-09-04 15:54:51.000000000 -0400 21447+++ linux-2.6.32.24/drivers/ata/pata_bf54x.c 2010-09-04 15:54:51.000000000 -0400
21448@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh 21448@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
21449 .dma_boundary = ATA_DMA_BOUNDARY, 21449 .dma_boundary = ATA_DMA_BOUNDARY,
21450 }; 21450 };
@@ -21454,9 +21454,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_bf54x.c linux-2.6.32.23/drivers/ata/
21454 .inherits = &ata_sff_port_ops, 21454 .inherits = &ata_sff_port_ops,
21455 21455
21456 .set_piomode = bfin_set_piomode, 21456 .set_piomode = bfin_set_piomode,
21457diff -urNp linux-2.6.32.23/drivers/ata/pata_cmd640.c linux-2.6.32.23/drivers/ata/pata_cmd640.c 21457diff -urNp linux-2.6.32.24/drivers/ata/pata_cmd640.c linux-2.6.32.24/drivers/ata/pata_cmd640.c
21458--- linux-2.6.32.23/drivers/ata/pata_cmd640.c 2010-08-13 16:24:37.000000000 -0400 21458--- linux-2.6.32.24/drivers/ata/pata_cmd640.c 2010-08-13 16:24:37.000000000 -0400
21459+++ linux-2.6.32.23/drivers/ata/pata_cmd640.c 2010-09-04 15:54:51.000000000 -0400 21459+++ linux-2.6.32.24/drivers/ata/pata_cmd640.c 2010-09-04 15:54:51.000000000 -0400
21460@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ 21460@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
21461 ATA_BMDMA_SHT(DRV_NAME), 21461 ATA_BMDMA_SHT(DRV_NAME),
21462 }; 21462 };
@@ -21466,9 +21466,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_cmd640.c linux-2.6.32.23/drivers/ata
21466 .inherits = &ata_bmdma_port_ops, 21466 .inherits = &ata_bmdma_port_ops,
21467 /* In theory xfer_noirq is not needed once we kill the prefetcher */ 21467 /* In theory xfer_noirq is not needed once we kill the prefetcher */
21468 .sff_data_xfer = ata_sff_data_xfer_noirq, 21468 .sff_data_xfer = ata_sff_data_xfer_noirq,
21469diff -urNp linux-2.6.32.23/drivers/ata/pata_cmd64x.c linux-2.6.32.23/drivers/ata/pata_cmd64x.c 21469diff -urNp linux-2.6.32.24/drivers/ata/pata_cmd64x.c linux-2.6.32.24/drivers/ata/pata_cmd64x.c
21470--- linux-2.6.32.23/drivers/ata/pata_cmd64x.c 2010-08-13 16:24:37.000000000 -0400 21470--- linux-2.6.32.24/drivers/ata/pata_cmd64x.c 2010-08-13 16:24:37.000000000 -0400
21471+++ linux-2.6.32.23/drivers/ata/pata_cmd64x.c 2010-09-04 15:54:51.000000000 -0400 21471+++ linux-2.6.32.24/drivers/ata/pata_cmd64x.c 2010-09-04 15:54:51.000000000 -0400
21472@@ -275,18 +275,18 @@ static const struct ata_port_operations 21472@@ -275,18 +275,18 @@ static const struct ata_port_operations
21473 .set_dmamode = cmd64x_set_dmamode, 21473 .set_dmamode = cmd64x_set_dmamode,
21474 }; 21474 };
@@ -21491,9 +21491,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_cmd64x.c linux-2.6.32.23/drivers/ata
21491 .inherits = &cmd64x_base_ops, 21491 .inherits = &cmd64x_base_ops,
21492 .bmdma_stop = cmd648_bmdma_stop, 21492 .bmdma_stop = cmd648_bmdma_stop,
21493 .cable_detect = cmd648_cable_detect, 21493 .cable_detect = cmd648_cable_detect,
21494diff -urNp linux-2.6.32.23/drivers/ata/pata_cs5520.c linux-2.6.32.23/drivers/ata/pata_cs5520.c 21494diff -urNp linux-2.6.32.24/drivers/ata/pata_cs5520.c linux-2.6.32.24/drivers/ata/pata_cs5520.c
21495--- linux-2.6.32.23/drivers/ata/pata_cs5520.c 2010-08-13 16:24:37.000000000 -0400 21495--- linux-2.6.32.24/drivers/ata/pata_cs5520.c 2010-08-13 16:24:37.000000000 -0400
21496+++ linux-2.6.32.23/drivers/ata/pata_cs5520.c 2010-09-04 15:54:51.000000000 -0400 21496+++ linux-2.6.32.24/drivers/ata/pata_cs5520.c 2010-09-04 15:54:51.000000000 -0400
21497@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ 21497@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
21498 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 21498 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
21499 }; 21499 };
@@ -21503,9 +21503,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_cs5520.c linux-2.6.32.23/drivers/ata
21503 .inherits = &ata_bmdma_port_ops, 21503 .inherits = &ata_bmdma_port_ops,
21504 .qc_prep = ata_sff_dumb_qc_prep, 21504 .qc_prep = ata_sff_dumb_qc_prep,
21505 .cable_detect = ata_cable_40wire, 21505 .cable_detect = ata_cable_40wire,
21506diff -urNp linux-2.6.32.23/drivers/ata/pata_cs5530.c linux-2.6.32.23/drivers/ata/pata_cs5530.c 21506diff -urNp linux-2.6.32.24/drivers/ata/pata_cs5530.c linux-2.6.32.24/drivers/ata/pata_cs5530.c
21507--- linux-2.6.32.23/drivers/ata/pata_cs5530.c 2010-08-13 16:24:37.000000000 -0400 21507--- linux-2.6.32.24/drivers/ata/pata_cs5530.c 2010-08-13 16:24:37.000000000 -0400
21508+++ linux-2.6.32.23/drivers/ata/pata_cs5530.c 2010-09-04 15:54:51.000000000 -0400 21508+++ linux-2.6.32.24/drivers/ata/pata_cs5530.c 2010-09-04 15:54:51.000000000 -0400
21509@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ 21509@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
21510 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 21510 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
21511 }; 21511 };
@@ -21515,9 +21515,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_cs5530.c linux-2.6.32.23/drivers/ata
21515 .inherits = &ata_bmdma_port_ops, 21515 .inherits = &ata_bmdma_port_ops,
21516 21516
21517 .qc_prep = ata_sff_dumb_qc_prep, 21517 .qc_prep = ata_sff_dumb_qc_prep,
21518diff -urNp linux-2.6.32.23/drivers/ata/pata_cs5535.c linux-2.6.32.23/drivers/ata/pata_cs5535.c 21518diff -urNp linux-2.6.32.24/drivers/ata/pata_cs5535.c linux-2.6.32.24/drivers/ata/pata_cs5535.c
21519--- linux-2.6.32.23/drivers/ata/pata_cs5535.c 2010-08-13 16:24:37.000000000 -0400 21519--- linux-2.6.32.24/drivers/ata/pata_cs5535.c 2010-08-13 16:24:37.000000000 -0400
21520+++ linux-2.6.32.23/drivers/ata/pata_cs5535.c 2010-09-04 15:54:51.000000000 -0400 21520+++ linux-2.6.32.24/drivers/ata/pata_cs5535.c 2010-09-04 15:54:51.000000000 -0400
21521@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ 21521@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
21522 ATA_BMDMA_SHT(DRV_NAME), 21522 ATA_BMDMA_SHT(DRV_NAME),
21523 }; 21523 };
@@ -21527,9 +21527,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_cs5535.c linux-2.6.32.23/drivers/ata
21527 .inherits = &ata_bmdma_port_ops, 21527 .inherits = &ata_bmdma_port_ops,
21528 .cable_detect = cs5535_cable_detect, 21528 .cable_detect = cs5535_cable_detect,
21529 .set_piomode = cs5535_set_piomode, 21529 .set_piomode = cs5535_set_piomode,
21530diff -urNp linux-2.6.32.23/drivers/ata/pata_cs5536.c linux-2.6.32.23/drivers/ata/pata_cs5536.c 21530diff -urNp linux-2.6.32.24/drivers/ata/pata_cs5536.c linux-2.6.32.24/drivers/ata/pata_cs5536.c
21531--- linux-2.6.32.23/drivers/ata/pata_cs5536.c 2010-08-13 16:24:37.000000000 -0400 21531--- linux-2.6.32.24/drivers/ata/pata_cs5536.c 2010-08-13 16:24:37.000000000 -0400
21532+++ linux-2.6.32.23/drivers/ata/pata_cs5536.c 2010-09-04 15:54:51.000000000 -0400 21532+++ linux-2.6.32.24/drivers/ata/pata_cs5536.c 2010-09-04 15:54:51.000000000 -0400
21533@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ 21533@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
21534 ATA_BMDMA_SHT(DRV_NAME), 21534 ATA_BMDMA_SHT(DRV_NAME),
21535 }; 21535 };
@@ -21539,9 +21539,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_cs5536.c linux-2.6.32.23/drivers/ata
21539 .inherits = &ata_bmdma_port_ops, 21539 .inherits = &ata_bmdma_port_ops,
21540 .cable_detect = cs5536_cable_detect, 21540 .cable_detect = cs5536_cable_detect,
21541 .set_piomode = cs5536_set_piomode, 21541 .set_piomode = cs5536_set_piomode,
21542diff -urNp linux-2.6.32.23/drivers/ata/pata_cypress.c linux-2.6.32.23/drivers/ata/pata_cypress.c 21542diff -urNp linux-2.6.32.24/drivers/ata/pata_cypress.c linux-2.6.32.24/drivers/ata/pata_cypress.c
21543--- linux-2.6.32.23/drivers/ata/pata_cypress.c 2010-08-13 16:24:37.000000000 -0400 21543--- linux-2.6.32.24/drivers/ata/pata_cypress.c 2010-08-13 16:24:37.000000000 -0400
21544+++ linux-2.6.32.23/drivers/ata/pata_cypress.c 2010-09-04 15:54:51.000000000 -0400 21544+++ linux-2.6.32.24/drivers/ata/pata_cypress.c 2010-09-04 15:54:51.000000000 -0400
21545@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 21545@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
21546 ATA_BMDMA_SHT(DRV_NAME), 21546 ATA_BMDMA_SHT(DRV_NAME),
21547 }; 21547 };
@@ -21551,9 +21551,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_cypress.c linux-2.6.32.23/drivers/at
21551 .inherits = &ata_bmdma_port_ops, 21551 .inherits = &ata_bmdma_port_ops,
21552 .cable_detect = ata_cable_40wire, 21552 .cable_detect = ata_cable_40wire,
21553 .set_piomode = cy82c693_set_piomode, 21553 .set_piomode = cy82c693_set_piomode,
21554diff -urNp linux-2.6.32.23/drivers/ata/pata_efar.c linux-2.6.32.23/drivers/ata/pata_efar.c 21554diff -urNp linux-2.6.32.24/drivers/ata/pata_efar.c linux-2.6.32.24/drivers/ata/pata_efar.c
21555--- linux-2.6.32.23/drivers/ata/pata_efar.c 2010-08-13 16:24:37.000000000 -0400 21555--- linux-2.6.32.24/drivers/ata/pata_efar.c 2010-08-13 16:24:37.000000000 -0400
21556+++ linux-2.6.32.23/drivers/ata/pata_efar.c 2010-09-04 15:54:51.000000000 -0400 21556+++ linux-2.6.32.24/drivers/ata/pata_efar.c 2010-09-04 15:54:51.000000000 -0400
21557@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh 21557@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
21558 ATA_BMDMA_SHT(DRV_NAME), 21558 ATA_BMDMA_SHT(DRV_NAME),
21559 }; 21559 };
@@ -21563,9 +21563,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_efar.c linux-2.6.32.23/drivers/ata/p
21563 .inherits = &ata_bmdma_port_ops, 21563 .inherits = &ata_bmdma_port_ops,
21564 .cable_detect = efar_cable_detect, 21564 .cable_detect = efar_cable_detect,
21565 .set_piomode = efar_set_piomode, 21565 .set_piomode = efar_set_piomode,
21566diff -urNp linux-2.6.32.23/drivers/ata/pata_hpt366.c linux-2.6.32.23/drivers/ata/pata_hpt366.c 21566diff -urNp linux-2.6.32.24/drivers/ata/pata_hpt366.c linux-2.6.32.24/drivers/ata/pata_hpt366.c
21567--- linux-2.6.32.23/drivers/ata/pata_hpt366.c 2010-08-13 16:24:37.000000000 -0400 21567--- linux-2.6.32.24/drivers/ata/pata_hpt366.c 2010-08-13 16:24:37.000000000 -0400
21568+++ linux-2.6.32.23/drivers/ata/pata_hpt366.c 2010-09-04 15:54:51.000000000 -0400 21568+++ linux-2.6.32.24/drivers/ata/pata_hpt366.c 2010-09-04 15:54:51.000000000 -0400
21569@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ 21569@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
21570 * Configuration for HPT366/68 21570 * Configuration for HPT366/68
21571 */ 21571 */
@@ -21575,9 +21575,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_hpt366.c linux-2.6.32.23/drivers/ata
21575 .inherits = &ata_bmdma_port_ops, 21575 .inherits = &ata_bmdma_port_ops,
21576 .cable_detect = hpt36x_cable_detect, 21576 .cable_detect = hpt36x_cable_detect,
21577 .mode_filter = hpt366_filter, 21577 .mode_filter = hpt366_filter,
21578diff -urNp linux-2.6.32.23/drivers/ata/pata_hpt37x.c linux-2.6.32.23/drivers/ata/pata_hpt37x.c 21578diff -urNp linux-2.6.32.24/drivers/ata/pata_hpt37x.c linux-2.6.32.24/drivers/ata/pata_hpt37x.c
21579--- linux-2.6.32.23/drivers/ata/pata_hpt37x.c 2010-08-13 16:24:37.000000000 -0400 21579--- linux-2.6.32.24/drivers/ata/pata_hpt37x.c 2010-08-13 16:24:37.000000000 -0400
21580+++ linux-2.6.32.23/drivers/ata/pata_hpt37x.c 2010-09-04 15:54:51.000000000 -0400 21580+++ linux-2.6.32.24/drivers/ata/pata_hpt37x.c 2010-09-04 15:54:51.000000000 -0400
21581@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ 21581@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
21582 * Configuration for HPT370 21582 * Configuration for HPT370
21583 */ 21583 */
@@ -21614,9 +21614,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_hpt37x.c linux-2.6.32.23/drivers/ata
21614 .inherits = &hpt372_port_ops, 21614 .inherits = &hpt372_port_ops,
21615 .prereset = hpt374_fn1_pre_reset, 21615 .prereset = hpt374_fn1_pre_reset,
21616 }; 21616 };
21617diff -urNp linux-2.6.32.23/drivers/ata/pata_hpt3x2n.c linux-2.6.32.23/drivers/ata/pata_hpt3x2n.c 21617diff -urNp linux-2.6.32.24/drivers/ata/pata_hpt3x2n.c linux-2.6.32.24/drivers/ata/pata_hpt3x2n.c
21618--- linux-2.6.32.23/drivers/ata/pata_hpt3x2n.c 2010-08-13 16:24:37.000000000 -0400 21618--- linux-2.6.32.24/drivers/ata/pata_hpt3x2n.c 2010-08-13 16:24:37.000000000 -0400
21619+++ linux-2.6.32.23/drivers/ata/pata_hpt3x2n.c 2010-09-04 15:54:51.000000000 -0400 21619+++ linux-2.6.32.24/drivers/ata/pata_hpt3x2n.c 2010-09-04 15:54:51.000000000 -0400
21620@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n 21620@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
21621 * Configuration for HPT3x2n. 21621 * Configuration for HPT3x2n.
21622 */ 21622 */
@@ -21626,9 +21626,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_hpt3x2n.c linux-2.6.32.23/drivers/at
21626 .inherits = &ata_bmdma_port_ops, 21626 .inherits = &ata_bmdma_port_ops,
21627 21627
21628 .bmdma_stop = hpt3x2n_bmdma_stop, 21628 .bmdma_stop = hpt3x2n_bmdma_stop,
21629diff -urNp linux-2.6.32.23/drivers/ata/pata_hpt3x3.c linux-2.6.32.23/drivers/ata/pata_hpt3x3.c 21629diff -urNp linux-2.6.32.24/drivers/ata/pata_hpt3x3.c linux-2.6.32.24/drivers/ata/pata_hpt3x3.c
21630--- linux-2.6.32.23/drivers/ata/pata_hpt3x3.c 2010-08-13 16:24:37.000000000 -0400 21630--- linux-2.6.32.24/drivers/ata/pata_hpt3x3.c 2010-08-13 16:24:37.000000000 -0400
21631+++ linux-2.6.32.23/drivers/ata/pata_hpt3x3.c 2010-09-04 15:54:51.000000000 -0400 21631+++ linux-2.6.32.24/drivers/ata/pata_hpt3x3.c 2010-09-04 15:54:51.000000000 -0400
21632@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ 21632@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
21633 ATA_BMDMA_SHT(DRV_NAME), 21633 ATA_BMDMA_SHT(DRV_NAME),
21634 }; 21634 };
@@ -21638,9 +21638,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_hpt3x3.c linux-2.6.32.23/drivers/ata
21638 .inherits = &ata_bmdma_port_ops, 21638 .inherits = &ata_bmdma_port_ops,
21639 .cable_detect = ata_cable_40wire, 21639 .cable_detect = ata_cable_40wire,
21640 .set_piomode = hpt3x3_set_piomode, 21640 .set_piomode = hpt3x3_set_piomode,
21641diff -urNp linux-2.6.32.23/drivers/ata/pata_icside.c linux-2.6.32.23/drivers/ata/pata_icside.c 21641diff -urNp linux-2.6.32.24/drivers/ata/pata_icside.c linux-2.6.32.24/drivers/ata/pata_icside.c
21642--- linux-2.6.32.23/drivers/ata/pata_icside.c 2010-08-13 16:24:37.000000000 -0400 21642--- linux-2.6.32.24/drivers/ata/pata_icside.c 2010-08-13 16:24:37.000000000 -0400
21643+++ linux-2.6.32.23/drivers/ata/pata_icside.c 2010-09-04 15:54:51.000000000 -0400 21643+++ linux-2.6.32.24/drivers/ata/pata_icside.c 2010-09-04 15:54:51.000000000 -0400
21644@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct 21644@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
21645 } 21645 }
21646 } 21646 }
@@ -21650,9 +21650,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_icside.c linux-2.6.32.23/drivers/ata
21650 .inherits = &ata_sff_port_ops, 21650 .inherits = &ata_sff_port_ops,
21651 /* no need to build any PRD tables for DMA */ 21651 /* no need to build any PRD tables for DMA */
21652 .qc_prep = ata_noop_qc_prep, 21652 .qc_prep = ata_noop_qc_prep,
21653diff -urNp linux-2.6.32.23/drivers/ata/pata_isapnp.c linux-2.6.32.23/drivers/ata/pata_isapnp.c 21653diff -urNp linux-2.6.32.24/drivers/ata/pata_isapnp.c linux-2.6.32.24/drivers/ata/pata_isapnp.c
21654--- linux-2.6.32.23/drivers/ata/pata_isapnp.c 2010-08-13 16:24:37.000000000 -0400 21654--- linux-2.6.32.24/drivers/ata/pata_isapnp.c 2010-08-13 16:24:37.000000000 -0400
21655+++ linux-2.6.32.23/drivers/ata/pata_isapnp.c 2010-09-04 15:54:51.000000000 -0400 21655+++ linux-2.6.32.24/drivers/ata/pata_isapnp.c 2010-09-04 15:54:51.000000000 -0400
21656@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ 21656@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
21657 ATA_PIO_SHT(DRV_NAME), 21657 ATA_PIO_SHT(DRV_NAME),
21658 }; 21658 };
@@ -21668,9 +21668,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_isapnp.c linux-2.6.32.23/drivers/ata
21668 .inherits = &ata_sff_port_ops, 21668 .inherits = &ata_sff_port_ops,
21669 .cable_detect = ata_cable_40wire, 21669 .cable_detect = ata_cable_40wire,
21670 /* No altstatus so we don't want to use the lost interrupt poll */ 21670 /* No altstatus so we don't want to use the lost interrupt poll */
21671diff -urNp linux-2.6.32.23/drivers/ata/pata_it8213.c linux-2.6.32.23/drivers/ata/pata_it8213.c 21671diff -urNp linux-2.6.32.24/drivers/ata/pata_it8213.c linux-2.6.32.24/drivers/ata/pata_it8213.c
21672--- linux-2.6.32.23/drivers/ata/pata_it8213.c 2010-08-13 16:24:37.000000000 -0400 21672--- linux-2.6.32.24/drivers/ata/pata_it8213.c 2010-08-13 16:24:37.000000000 -0400
21673+++ linux-2.6.32.23/drivers/ata/pata_it8213.c 2010-09-04 15:54:51.000000000 -0400 21673+++ linux-2.6.32.24/drivers/ata/pata_it8213.c 2010-09-04 15:54:51.000000000 -0400
21674@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ 21674@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
21675 }; 21675 };
21676 21676
@@ -21680,9 +21680,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_it8213.c linux-2.6.32.23/drivers/ata
21680 .inherits = &ata_bmdma_port_ops, 21680 .inherits = &ata_bmdma_port_ops,
21681 .cable_detect = it8213_cable_detect, 21681 .cable_detect = it8213_cable_detect,
21682 .set_piomode = it8213_set_piomode, 21682 .set_piomode = it8213_set_piomode,
21683diff -urNp linux-2.6.32.23/drivers/ata/pata_it821x.c linux-2.6.32.23/drivers/ata/pata_it821x.c 21683diff -urNp linux-2.6.32.24/drivers/ata/pata_it821x.c linux-2.6.32.24/drivers/ata/pata_it821x.c
21684--- linux-2.6.32.23/drivers/ata/pata_it821x.c 2010-08-13 16:24:37.000000000 -0400 21684--- linux-2.6.32.24/drivers/ata/pata_it821x.c 2010-08-13 16:24:37.000000000 -0400
21685+++ linux-2.6.32.23/drivers/ata/pata_it821x.c 2010-09-04 15:54:51.000000000 -0400 21685+++ linux-2.6.32.24/drivers/ata/pata_it821x.c 2010-09-04 15:54:51.000000000 -0400
21686@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ 21686@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
21687 ATA_BMDMA_SHT(DRV_NAME), 21687 ATA_BMDMA_SHT(DRV_NAME),
21688 }; 21688 };
@@ -21710,9 +21710,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_it821x.c linux-2.6.32.23/drivers/ata
21710 .inherits = &ata_bmdma_port_ops, 21710 .inherits = &ata_bmdma_port_ops,
21711 21711
21712 .check_atapi_dma= it821x_check_atapi_dma, 21712 .check_atapi_dma= it821x_check_atapi_dma,
21713diff -urNp linux-2.6.32.23/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.23/drivers/ata/pata_ixp4xx_cf.c 21713diff -urNp linux-2.6.32.24/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.24/drivers/ata/pata_ixp4xx_cf.c
21714--- linux-2.6.32.23/drivers/ata/pata_ixp4xx_cf.c 2010-08-13 16:24:37.000000000 -0400 21714--- linux-2.6.32.24/drivers/ata/pata_ixp4xx_cf.c 2010-08-13 16:24:37.000000000 -0400
21715+++ linux-2.6.32.23/drivers/ata/pata_ixp4xx_cf.c 2010-09-04 15:54:51.000000000 -0400 21715+++ linux-2.6.32.24/drivers/ata/pata_ixp4xx_cf.c 2010-09-04 15:54:51.000000000 -0400
21716@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ 21716@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
21717 ATA_PIO_SHT(DRV_NAME), 21717 ATA_PIO_SHT(DRV_NAME),
21718 }; 21718 };
@@ -21722,9 +21722,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.23/drivers/
21722 .inherits = &ata_sff_port_ops, 21722 .inherits = &ata_sff_port_ops,
21723 .sff_data_xfer = ixp4xx_mmio_data_xfer, 21723 .sff_data_xfer = ixp4xx_mmio_data_xfer,
21724 .cable_detect = ata_cable_40wire, 21724 .cable_detect = ata_cable_40wire,
21725diff -urNp linux-2.6.32.23/drivers/ata/pata_jmicron.c linux-2.6.32.23/drivers/ata/pata_jmicron.c 21725diff -urNp linux-2.6.32.24/drivers/ata/pata_jmicron.c linux-2.6.32.24/drivers/ata/pata_jmicron.c
21726--- linux-2.6.32.23/drivers/ata/pata_jmicron.c 2010-08-13 16:24:37.000000000 -0400 21726--- linux-2.6.32.24/drivers/ata/pata_jmicron.c 2010-08-13 16:24:37.000000000 -0400
21727+++ linux-2.6.32.23/drivers/ata/pata_jmicron.c 2010-09-04 15:54:51.000000000 -0400 21727+++ linux-2.6.32.24/drivers/ata/pata_jmicron.c 2010-09-04 15:54:51.000000000 -0400
21728@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron 21728@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
21729 ATA_BMDMA_SHT(DRV_NAME), 21729 ATA_BMDMA_SHT(DRV_NAME),
21730 }; 21730 };
@@ -21734,9 +21734,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_jmicron.c linux-2.6.32.23/drivers/at
21734 .inherits = &ata_bmdma_port_ops, 21734 .inherits = &ata_bmdma_port_ops,
21735 .prereset = jmicron_pre_reset, 21735 .prereset = jmicron_pre_reset,
21736 }; 21736 };
21737diff -urNp linux-2.6.32.23/drivers/ata/pata_legacy.c linux-2.6.32.23/drivers/ata/pata_legacy.c 21737diff -urNp linux-2.6.32.24/drivers/ata/pata_legacy.c linux-2.6.32.24/drivers/ata/pata_legacy.c
21738--- linux-2.6.32.23/drivers/ata/pata_legacy.c 2010-08-13 16:24:37.000000000 -0400 21738--- linux-2.6.32.24/drivers/ata/pata_legacy.c 2010-08-13 16:24:37.000000000 -0400
21739+++ linux-2.6.32.23/drivers/ata/pata_legacy.c 2010-09-04 15:54:51.000000000 -0400 21739+++ linux-2.6.32.24/drivers/ata/pata_legacy.c 2010-09-04 15:54:51.000000000 -0400
21740@@ -106,7 +106,7 @@ struct legacy_probe { 21740@@ -106,7 +106,7 @@ struct legacy_probe {
21741 21741
21742 struct legacy_controller { 21742 struct legacy_controller {
@@ -21848,9 +21848,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_legacy.c linux-2.6.32.23/drivers/ata
21848 struct legacy_data *ld = &legacy_data[probe->slot]; 21848 struct legacy_data *ld = &legacy_data[probe->slot];
21849 struct ata_host *host = NULL; 21849 struct ata_host *host = NULL;
21850 struct ata_port *ap; 21850 struct ata_port *ap;
21851diff -urNp linux-2.6.32.23/drivers/ata/pata_marvell.c linux-2.6.32.23/drivers/ata/pata_marvell.c 21851diff -urNp linux-2.6.32.24/drivers/ata/pata_marvell.c linux-2.6.32.24/drivers/ata/pata_marvell.c
21852--- linux-2.6.32.23/drivers/ata/pata_marvell.c 2010-08-13 16:24:37.000000000 -0400 21852--- linux-2.6.32.24/drivers/ata/pata_marvell.c 2010-08-13 16:24:37.000000000 -0400
21853+++ linux-2.6.32.23/drivers/ata/pata_marvell.c 2010-09-04 15:54:51.000000000 -0400 21853+++ linux-2.6.32.24/drivers/ata/pata_marvell.c 2010-09-04 15:54:51.000000000 -0400
21854@@ -100,7 +100,7 @@ static struct scsi_host_template marvell 21854@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
21855 ATA_BMDMA_SHT(DRV_NAME), 21855 ATA_BMDMA_SHT(DRV_NAME),
21856 }; 21856 };
@@ -21860,9 +21860,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_marvell.c linux-2.6.32.23/drivers/at
21860 .inherits = &ata_bmdma_port_ops, 21860 .inherits = &ata_bmdma_port_ops,
21861 .cable_detect = marvell_cable_detect, 21861 .cable_detect = marvell_cable_detect,
21862 .prereset = marvell_pre_reset, 21862 .prereset = marvell_pre_reset,
21863diff -urNp linux-2.6.32.23/drivers/ata/pata_mpc52xx.c linux-2.6.32.23/drivers/ata/pata_mpc52xx.c 21863diff -urNp linux-2.6.32.24/drivers/ata/pata_mpc52xx.c linux-2.6.32.24/drivers/ata/pata_mpc52xx.c
21864--- linux-2.6.32.23/drivers/ata/pata_mpc52xx.c 2010-08-13 16:24:37.000000000 -0400 21864--- linux-2.6.32.24/drivers/ata/pata_mpc52xx.c 2010-08-13 16:24:37.000000000 -0400
21865+++ linux-2.6.32.23/drivers/ata/pata_mpc52xx.c 2010-09-04 15:54:51.000000000 -0400 21865+++ linux-2.6.32.24/drivers/ata/pata_mpc52xx.c 2010-09-04 15:54:51.000000000 -0400
21866@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx 21866@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
21867 ATA_PIO_SHT(DRV_NAME), 21867 ATA_PIO_SHT(DRV_NAME),
21868 }; 21868 };
@@ -21872,9 +21872,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_mpc52xx.c linux-2.6.32.23/drivers/at
21872 .inherits = &ata_sff_port_ops, 21872 .inherits = &ata_sff_port_ops,
21873 .sff_dev_select = mpc52xx_ata_dev_select, 21873 .sff_dev_select = mpc52xx_ata_dev_select,
21874 .set_piomode = mpc52xx_ata_set_piomode, 21874 .set_piomode = mpc52xx_ata_set_piomode,
21875diff -urNp linux-2.6.32.23/drivers/ata/pata_mpiix.c linux-2.6.32.23/drivers/ata/pata_mpiix.c 21875diff -urNp linux-2.6.32.24/drivers/ata/pata_mpiix.c linux-2.6.32.24/drivers/ata/pata_mpiix.c
21876--- linux-2.6.32.23/drivers/ata/pata_mpiix.c 2010-08-13 16:24:37.000000000 -0400 21876--- linux-2.6.32.24/drivers/ata/pata_mpiix.c 2010-08-13 16:24:37.000000000 -0400
21877+++ linux-2.6.32.23/drivers/ata/pata_mpiix.c 2010-09-04 15:54:51.000000000 -0400 21877+++ linux-2.6.32.24/drivers/ata/pata_mpiix.c 2010-09-04 15:54:51.000000000 -0400
21878@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s 21878@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
21879 ATA_PIO_SHT(DRV_NAME), 21879 ATA_PIO_SHT(DRV_NAME),
21880 }; 21880 };
@@ -21884,9 +21884,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_mpiix.c linux-2.6.32.23/drivers/ata/
21884 .inherits = &ata_sff_port_ops, 21884 .inherits = &ata_sff_port_ops,
21885 .qc_issue = mpiix_qc_issue, 21885 .qc_issue = mpiix_qc_issue,
21886 .cable_detect = ata_cable_40wire, 21886 .cable_detect = ata_cable_40wire,
21887diff -urNp linux-2.6.32.23/drivers/ata/pata_netcell.c linux-2.6.32.23/drivers/ata/pata_netcell.c 21887diff -urNp linux-2.6.32.24/drivers/ata/pata_netcell.c linux-2.6.32.24/drivers/ata/pata_netcell.c
21888--- linux-2.6.32.23/drivers/ata/pata_netcell.c 2010-08-13 16:24:37.000000000 -0400 21888--- linux-2.6.32.24/drivers/ata/pata_netcell.c 2010-08-13 16:24:37.000000000 -0400
21889+++ linux-2.6.32.23/drivers/ata/pata_netcell.c 2010-09-04 15:54:51.000000000 -0400 21889+++ linux-2.6.32.24/drivers/ata/pata_netcell.c 2010-09-04 15:54:51.000000000 -0400
21890@@ -34,7 +34,7 @@ static struct scsi_host_template netcell 21890@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
21891 ATA_BMDMA_SHT(DRV_NAME), 21891 ATA_BMDMA_SHT(DRV_NAME),
21892 }; 21892 };
@@ -21896,9 +21896,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_netcell.c linux-2.6.32.23/drivers/at
21896 .inherits = &ata_bmdma_port_ops, 21896 .inherits = &ata_bmdma_port_ops,
21897 .cable_detect = ata_cable_80wire, 21897 .cable_detect = ata_cable_80wire,
21898 .read_id = netcell_read_id, 21898 .read_id = netcell_read_id,
21899diff -urNp linux-2.6.32.23/drivers/ata/pata_ninja32.c linux-2.6.32.23/drivers/ata/pata_ninja32.c 21899diff -urNp linux-2.6.32.24/drivers/ata/pata_ninja32.c linux-2.6.32.24/drivers/ata/pata_ninja32.c
21900--- linux-2.6.32.23/drivers/ata/pata_ninja32.c 2010-08-13 16:24:37.000000000 -0400 21900--- linux-2.6.32.24/drivers/ata/pata_ninja32.c 2010-08-13 16:24:37.000000000 -0400
21901+++ linux-2.6.32.23/drivers/ata/pata_ninja32.c 2010-09-04 15:54:51.000000000 -0400 21901+++ linux-2.6.32.24/drivers/ata/pata_ninja32.c 2010-09-04 15:54:51.000000000 -0400
21902@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 21902@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
21903 ATA_BMDMA_SHT(DRV_NAME), 21903 ATA_BMDMA_SHT(DRV_NAME),
21904 }; 21904 };
@@ -21908,9 +21908,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_ninja32.c linux-2.6.32.23/drivers/at
21908 .inherits = &ata_bmdma_port_ops, 21908 .inherits = &ata_bmdma_port_ops,
21909 .sff_dev_select = ninja32_dev_select, 21909 .sff_dev_select = ninja32_dev_select,
21910 .cable_detect = ata_cable_40wire, 21910 .cable_detect = ata_cable_40wire,
21911diff -urNp linux-2.6.32.23/drivers/ata/pata_ns87410.c linux-2.6.32.23/drivers/ata/pata_ns87410.c 21911diff -urNp linux-2.6.32.24/drivers/ata/pata_ns87410.c linux-2.6.32.24/drivers/ata/pata_ns87410.c
21912--- linux-2.6.32.23/drivers/ata/pata_ns87410.c 2010-08-13 16:24:37.000000000 -0400 21912--- linux-2.6.32.24/drivers/ata/pata_ns87410.c 2010-08-13 16:24:37.000000000 -0400
21913+++ linux-2.6.32.23/drivers/ata/pata_ns87410.c 2010-09-04 15:54:51.000000000 -0400 21913+++ linux-2.6.32.24/drivers/ata/pata_ns87410.c 2010-09-04 15:54:51.000000000 -0400
21914@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 21914@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
21915 ATA_PIO_SHT(DRV_NAME), 21915 ATA_PIO_SHT(DRV_NAME),
21916 }; 21916 };
@@ -21920,9 +21920,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_ns87410.c linux-2.6.32.23/drivers/at
21920 .inherits = &ata_sff_port_ops, 21920 .inherits = &ata_sff_port_ops,
21921 .qc_issue = ns87410_qc_issue, 21921 .qc_issue = ns87410_qc_issue,
21922 .cable_detect = ata_cable_40wire, 21922 .cable_detect = ata_cable_40wire,
21923diff -urNp linux-2.6.32.23/drivers/ata/pata_ns87415.c linux-2.6.32.23/drivers/ata/pata_ns87415.c 21923diff -urNp linux-2.6.32.24/drivers/ata/pata_ns87415.c linux-2.6.32.24/drivers/ata/pata_ns87415.c
21924--- linux-2.6.32.23/drivers/ata/pata_ns87415.c 2010-08-13 16:24:37.000000000 -0400 21924--- linux-2.6.32.24/drivers/ata/pata_ns87415.c 2010-08-13 16:24:37.000000000 -0400
21925+++ linux-2.6.32.23/drivers/ata/pata_ns87415.c 2010-09-04 15:54:51.000000000 -0400 21925+++ linux-2.6.32.24/drivers/ata/pata_ns87415.c 2010-09-04 15:54:51.000000000 -0400
21926@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at 21926@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
21927 } 21927 }
21928 #endif /* 87560 SuperIO Support */ 21928 #endif /* 87560 SuperIO Support */
@@ -21941,9 +21941,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_ns87415.c linux-2.6.32.23/drivers/at
21941 .inherits = &ns87415_pata_ops, 21941 .inherits = &ns87415_pata_ops,
21942 .sff_tf_read = ns87560_tf_read, 21942 .sff_tf_read = ns87560_tf_read,
21943 .sff_check_status = ns87560_check_status, 21943 .sff_check_status = ns87560_check_status,
21944diff -urNp linux-2.6.32.23/drivers/ata/pata_octeon_cf.c linux-2.6.32.23/drivers/ata/pata_octeon_cf.c 21944diff -urNp linux-2.6.32.24/drivers/ata/pata_octeon_cf.c linux-2.6.32.24/drivers/ata/pata_octeon_cf.c
21945--- linux-2.6.32.23/drivers/ata/pata_octeon_cf.c 2010-08-13 16:24:37.000000000 -0400 21945--- linux-2.6.32.24/drivers/ata/pata_octeon_cf.c 2010-08-13 16:24:37.000000000 -0400
21946+++ linux-2.6.32.23/drivers/ata/pata_octeon_cf.c 2010-09-04 15:54:51.000000000 -0400 21946+++ linux-2.6.32.24/drivers/ata/pata_octeon_cf.c 2010-09-04 15:54:51.000000000 -0400
21947@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s 21947@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
21948 return 0; 21948 return 0;
21949 } 21949 }
@@ -21952,9 +21952,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_octeon_cf.c linux-2.6.32.23/drivers/
21952 static struct ata_port_operations octeon_cf_ops = { 21952 static struct ata_port_operations octeon_cf_ops = {
21953 .inherits = &ata_sff_port_ops, 21953 .inherits = &ata_sff_port_ops,
21954 .check_atapi_dma = octeon_cf_check_atapi_dma, 21954 .check_atapi_dma = octeon_cf_check_atapi_dma,
21955diff -urNp linux-2.6.32.23/drivers/ata/pata_oldpiix.c linux-2.6.32.23/drivers/ata/pata_oldpiix.c 21955diff -urNp linux-2.6.32.24/drivers/ata/pata_oldpiix.c linux-2.6.32.24/drivers/ata/pata_oldpiix.c
21956--- linux-2.6.32.23/drivers/ata/pata_oldpiix.c 2010-08-13 16:24:37.000000000 -0400 21956--- linux-2.6.32.24/drivers/ata/pata_oldpiix.c 2010-08-13 16:24:37.000000000 -0400
21957+++ linux-2.6.32.23/drivers/ata/pata_oldpiix.c 2010-09-04 15:54:51.000000000 -0400 21957+++ linux-2.6.32.24/drivers/ata/pata_oldpiix.c 2010-09-04 15:54:51.000000000 -0400
21958@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix 21958@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
21959 ATA_BMDMA_SHT(DRV_NAME), 21959 ATA_BMDMA_SHT(DRV_NAME),
21960 }; 21960 };
@@ -21964,9 +21964,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_oldpiix.c linux-2.6.32.23/drivers/at
21964 .inherits = &ata_bmdma_port_ops, 21964 .inherits = &ata_bmdma_port_ops,
21965 .qc_issue = oldpiix_qc_issue, 21965 .qc_issue = oldpiix_qc_issue,
21966 .cable_detect = ata_cable_40wire, 21966 .cable_detect = ata_cable_40wire,
21967diff -urNp linux-2.6.32.23/drivers/ata/pata_opti.c linux-2.6.32.23/drivers/ata/pata_opti.c 21967diff -urNp linux-2.6.32.24/drivers/ata/pata_opti.c linux-2.6.32.24/drivers/ata/pata_opti.c
21968--- linux-2.6.32.23/drivers/ata/pata_opti.c 2010-08-13 16:24:37.000000000 -0400 21968--- linux-2.6.32.24/drivers/ata/pata_opti.c 2010-08-13 16:24:37.000000000 -0400
21969+++ linux-2.6.32.23/drivers/ata/pata_opti.c 2010-09-04 15:54:51.000000000 -0400 21969+++ linux-2.6.32.24/drivers/ata/pata_opti.c 2010-09-04 15:54:51.000000000 -0400
21970@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh 21970@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
21971 ATA_PIO_SHT(DRV_NAME), 21971 ATA_PIO_SHT(DRV_NAME),
21972 }; 21972 };
@@ -21976,9 +21976,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_opti.c linux-2.6.32.23/drivers/ata/p
21976 .inherits = &ata_sff_port_ops, 21976 .inherits = &ata_sff_port_ops,
21977 .cable_detect = ata_cable_40wire, 21977 .cable_detect = ata_cable_40wire,
21978 .set_piomode = opti_set_piomode, 21978 .set_piomode = opti_set_piomode,
21979diff -urNp linux-2.6.32.23/drivers/ata/pata_optidma.c linux-2.6.32.23/drivers/ata/pata_optidma.c 21979diff -urNp linux-2.6.32.24/drivers/ata/pata_optidma.c linux-2.6.32.24/drivers/ata/pata_optidma.c
21980--- linux-2.6.32.23/drivers/ata/pata_optidma.c 2010-08-13 16:24:37.000000000 -0400 21980--- linux-2.6.32.24/drivers/ata/pata_optidma.c 2010-08-13 16:24:37.000000000 -0400
21981+++ linux-2.6.32.23/drivers/ata/pata_optidma.c 2010-09-04 15:54:51.000000000 -0400 21981+++ linux-2.6.32.24/drivers/ata/pata_optidma.c 2010-09-04 15:54:51.000000000 -0400
21982@@ -337,7 +337,7 @@ static struct scsi_host_template optidma 21982@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
21983 ATA_BMDMA_SHT(DRV_NAME), 21983 ATA_BMDMA_SHT(DRV_NAME),
21984 }; 21984 };
@@ -21997,9 +21997,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_optidma.c linux-2.6.32.23/drivers/at
21997 .inherits = &optidma_port_ops, 21997 .inherits = &optidma_port_ops,
21998 .set_piomode = optiplus_set_pio_mode, 21998 .set_piomode = optiplus_set_pio_mode,
21999 .set_dmamode = optiplus_set_dma_mode, 21999 .set_dmamode = optiplus_set_dma_mode,
22000diff -urNp linux-2.6.32.23/drivers/ata/pata_palmld.c linux-2.6.32.23/drivers/ata/pata_palmld.c 22000diff -urNp linux-2.6.32.24/drivers/ata/pata_palmld.c linux-2.6.32.24/drivers/ata/pata_palmld.c
22001--- linux-2.6.32.23/drivers/ata/pata_palmld.c 2010-08-13 16:24:37.000000000 -0400 22001--- linux-2.6.32.24/drivers/ata/pata_palmld.c 2010-08-13 16:24:37.000000000 -0400
22002+++ linux-2.6.32.23/drivers/ata/pata_palmld.c 2010-09-04 15:54:52.000000000 -0400 22002+++ linux-2.6.32.24/drivers/ata/pata_palmld.c 2010-09-04 15:54:52.000000000 -0400
22003@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ 22003@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
22004 ATA_PIO_SHT(DRV_NAME), 22004 ATA_PIO_SHT(DRV_NAME),
22005 }; 22005 };
@@ -22009,9 +22009,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_palmld.c linux-2.6.32.23/drivers/ata
22009 .inherits = &ata_sff_port_ops, 22009 .inherits = &ata_sff_port_ops,
22010 .sff_data_xfer = ata_sff_data_xfer_noirq, 22010 .sff_data_xfer = ata_sff_data_xfer_noirq,
22011 .cable_detect = ata_cable_40wire, 22011 .cable_detect = ata_cable_40wire,
22012diff -urNp linux-2.6.32.23/drivers/ata/pata_pcmcia.c linux-2.6.32.23/drivers/ata/pata_pcmcia.c 22012diff -urNp linux-2.6.32.24/drivers/ata/pata_pcmcia.c linux-2.6.32.24/drivers/ata/pata_pcmcia.c
22013--- linux-2.6.32.23/drivers/ata/pata_pcmcia.c 2010-08-13 16:24:37.000000000 -0400 22013--- linux-2.6.32.24/drivers/ata/pata_pcmcia.c 2010-08-13 16:24:37.000000000 -0400
22014+++ linux-2.6.32.23/drivers/ata/pata_pcmcia.c 2010-09-04 15:54:52.000000000 -0400 22014+++ linux-2.6.32.24/drivers/ata/pata_pcmcia.c 2010-09-04 15:54:52.000000000 -0400
22015@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ 22015@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
22016 ATA_PIO_SHT(DRV_NAME), 22016 ATA_PIO_SHT(DRV_NAME),
22017 }; 22017 };
@@ -22038,9 +22038,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_pcmcia.c linux-2.6.32.23/drivers/ata
22038 22038
22039 info = kzalloc(sizeof(*info), GFP_KERNEL); 22039 info = kzalloc(sizeof(*info), GFP_KERNEL);
22040 if (info == NULL) 22040 if (info == NULL)
22041diff -urNp linux-2.6.32.23/drivers/ata/pata_pdc2027x.c linux-2.6.32.23/drivers/ata/pata_pdc2027x.c 22041diff -urNp linux-2.6.32.24/drivers/ata/pata_pdc2027x.c linux-2.6.32.24/drivers/ata/pata_pdc2027x.c
22042--- linux-2.6.32.23/drivers/ata/pata_pdc2027x.c 2010-08-13 16:24:37.000000000 -0400 22042--- linux-2.6.32.24/drivers/ata/pata_pdc2027x.c 2010-08-13 16:24:37.000000000 -0400
22043+++ linux-2.6.32.23/drivers/ata/pata_pdc2027x.c 2010-09-04 15:54:52.000000000 -0400 22043+++ linux-2.6.32.24/drivers/ata/pata_pdc2027x.c 2010-09-04 15:54:52.000000000 -0400
22044@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 22044@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
22045 ATA_BMDMA_SHT(DRV_NAME), 22045 ATA_BMDMA_SHT(DRV_NAME),
22046 }; 22046 };
@@ -22058,10 +22058,10 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_pdc2027x.c linux-2.6.32.23/drivers/a
22058 .inherits = &pdc2027x_pata100_ops, 22058 .inherits = &pdc2027x_pata100_ops,
22059 .mode_filter = pdc2027x_mode_filter, 22059 .mode_filter = pdc2027x_mode_filter,
22060 .set_piomode = pdc2027x_set_piomode, 22060 .set_piomode = pdc2027x_set_piomode,
22061diff -urNp linux-2.6.32.23/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.23/drivers/ata/pata_pdc202xx_old.c 22061diff -urNp linux-2.6.32.24/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.24/drivers/ata/pata_pdc202xx_old.c
22062--- linux-2.6.32.23/drivers/ata/pata_pdc202xx_old.c 2010-09-26 17:26:05.000000000 -0400 22062--- linux-2.6.32.24/drivers/ata/pata_pdc202xx_old.c 2010-09-26 17:26:05.000000000 -0400
22063+++ linux-2.6.32.23/drivers/ata/pata_pdc202xx_old.c 2010-09-26 17:29:23.000000000 -0400 22063+++ linux-2.6.32.24/drivers/ata/pata_pdc202xx_old.c 2010-09-28 18:21:13.000000000 -0400
22064@@ -274,17 +274,17 @@ static struct scsi_host_template pdc202x 22064@@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x
22065 ATA_BMDMA_SHT(DRV_NAME), 22065 ATA_BMDMA_SHT(DRV_NAME),
22066 }; 22066 };
22067 22067
@@ -22070,11 +22070,8 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.23/drive
22070 .inherits = &ata_bmdma_port_ops, 22070 .inherits = &ata_bmdma_port_ops,
22071 22071
22072 .cable_detect = ata_cable_40wire, 22072 .cable_detect = ata_cable_40wire,
22073 .set_piomode = pdc202xx_set_piomode, 22073@@ -284,7 +284,7 @@ static struct ata_port_operations pdc202
22074 .set_dmamode = pdc202xx_set_dmamode, 22074 .sff_exec_command = pdc202xx_exec_command,
22075
22076- .sff_exec_command = pdc202xx_exec_command,
22077+ .sff_exec_command = pdc202xx_exec_command,
22078 }; 22075 };
22079 22076
22080-static struct ata_port_operations pdc2026x_port_ops = { 22077-static struct ata_port_operations pdc2026x_port_ops = {
@@ -22082,9 +22079,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.23/drive
22082 .inherits = &pdc2024x_port_ops, 22079 .inherits = &pdc2024x_port_ops,
22083 22080
22084 .check_atapi_dma = pdc2026x_check_atapi_dma, 22081 .check_atapi_dma = pdc2026x_check_atapi_dma,
22085diff -urNp linux-2.6.32.23/drivers/ata/pata_platform.c linux-2.6.32.23/drivers/ata/pata_platform.c 22082diff -urNp linux-2.6.32.24/drivers/ata/pata_platform.c linux-2.6.32.24/drivers/ata/pata_platform.c
22086--- linux-2.6.32.23/drivers/ata/pata_platform.c 2010-08-13 16:24:37.000000000 -0400 22083--- linux-2.6.32.24/drivers/ata/pata_platform.c 2010-08-13 16:24:37.000000000 -0400
22087+++ linux-2.6.32.23/drivers/ata/pata_platform.c 2010-09-04 15:54:52.000000000 -0400 22084+++ linux-2.6.32.24/drivers/ata/pata_platform.c 2010-09-04 15:54:52.000000000 -0400
22088@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl 22085@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
22089 ATA_PIO_SHT(DRV_NAME), 22086 ATA_PIO_SHT(DRV_NAME),
22090 }; 22087 };
@@ -22094,9 +22091,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_platform.c linux-2.6.32.23/drivers/a
22094 .inherits = &ata_sff_port_ops, 22091 .inherits = &ata_sff_port_ops,
22095 .sff_data_xfer = ata_sff_data_xfer_noirq, 22092 .sff_data_xfer = ata_sff_data_xfer_noirq,
22096 .cable_detect = ata_cable_unknown, 22093 .cable_detect = ata_cable_unknown,
22097diff -urNp linux-2.6.32.23/drivers/ata/pata_qdi.c linux-2.6.32.23/drivers/ata/pata_qdi.c 22094diff -urNp linux-2.6.32.24/drivers/ata/pata_qdi.c linux-2.6.32.24/drivers/ata/pata_qdi.c
22098--- linux-2.6.32.23/drivers/ata/pata_qdi.c 2010-08-13 16:24:37.000000000 -0400 22095--- linux-2.6.32.24/drivers/ata/pata_qdi.c 2010-08-13 16:24:37.000000000 -0400
22099+++ linux-2.6.32.23/drivers/ata/pata_qdi.c 2010-09-04 15:54:52.000000000 -0400 22096+++ linux-2.6.32.24/drivers/ata/pata_qdi.c 2010-09-04 15:54:52.000000000 -0400
22100@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht 22097@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
22101 ATA_PIO_SHT(DRV_NAME), 22098 ATA_PIO_SHT(DRV_NAME),
22102 }; 22099 };
@@ -22115,9 +22112,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_qdi.c linux-2.6.32.23/drivers/ata/pa
22115 .inherits = &qdi6500_port_ops, 22112 .inherits = &qdi6500_port_ops,
22116 .set_piomode = qdi6580_set_piomode, 22113 .set_piomode = qdi6580_set_piomode,
22117 }; 22114 };
22118diff -urNp linux-2.6.32.23/drivers/ata/pata_radisys.c linux-2.6.32.23/drivers/ata/pata_radisys.c 22115diff -urNp linux-2.6.32.24/drivers/ata/pata_radisys.c linux-2.6.32.24/drivers/ata/pata_radisys.c
22119--- linux-2.6.32.23/drivers/ata/pata_radisys.c 2010-08-13 16:24:37.000000000 -0400 22116--- linux-2.6.32.24/drivers/ata/pata_radisys.c 2010-08-13 16:24:37.000000000 -0400
22120+++ linux-2.6.32.23/drivers/ata/pata_radisys.c 2010-09-04 15:54:52.000000000 -0400 22117+++ linux-2.6.32.24/drivers/ata/pata_radisys.c 2010-09-04 15:54:52.000000000 -0400
22121@@ -187,7 +187,7 @@ static struct scsi_host_template radisys 22118@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
22122 ATA_BMDMA_SHT(DRV_NAME), 22119 ATA_BMDMA_SHT(DRV_NAME),
22123 }; 22120 };
@@ -22127,9 +22124,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_radisys.c linux-2.6.32.23/drivers/at
22127 .inherits = &ata_bmdma_port_ops, 22124 .inherits = &ata_bmdma_port_ops,
22128 .qc_issue = radisys_qc_issue, 22125 .qc_issue = radisys_qc_issue,
22129 .cable_detect = ata_cable_unknown, 22126 .cable_detect = ata_cable_unknown,
22130diff -urNp linux-2.6.32.23/drivers/ata/pata_rb532_cf.c linux-2.6.32.23/drivers/ata/pata_rb532_cf.c 22127diff -urNp linux-2.6.32.24/drivers/ata/pata_rb532_cf.c linux-2.6.32.24/drivers/ata/pata_rb532_cf.c
22131--- linux-2.6.32.23/drivers/ata/pata_rb532_cf.c 2010-08-13 16:24:37.000000000 -0400 22128--- linux-2.6.32.24/drivers/ata/pata_rb532_cf.c 2010-08-13 16:24:37.000000000 -0400
22132+++ linux-2.6.32.23/drivers/ata/pata_rb532_cf.c 2010-09-04 15:54:52.000000000 -0400 22129+++ linux-2.6.32.24/drivers/ata/pata_rb532_cf.c 2010-09-04 15:54:52.000000000 -0400
22133@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle 22130@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
22134 return IRQ_HANDLED; 22131 return IRQ_HANDLED;
22135 } 22132 }
@@ -22139,9 +22136,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_rb532_cf.c linux-2.6.32.23/drivers/a
22139 .inherits = &ata_sff_port_ops, 22136 .inherits = &ata_sff_port_ops,
22140 .sff_data_xfer = ata_sff_data_xfer32, 22137 .sff_data_xfer = ata_sff_data_xfer32,
22141 }; 22138 };
22142diff -urNp linux-2.6.32.23/drivers/ata/pata_rdc.c linux-2.6.32.23/drivers/ata/pata_rdc.c 22139diff -urNp linux-2.6.32.24/drivers/ata/pata_rdc.c linux-2.6.32.24/drivers/ata/pata_rdc.c
22143--- linux-2.6.32.23/drivers/ata/pata_rdc.c 2010-08-13 16:24:37.000000000 -0400 22140--- linux-2.6.32.24/drivers/ata/pata_rdc.c 2010-08-13 16:24:37.000000000 -0400
22144+++ linux-2.6.32.23/drivers/ata/pata_rdc.c 2010-09-04 15:54:52.000000000 -0400 22141+++ linux-2.6.32.24/drivers/ata/pata_rdc.c 2010-09-04 15:54:52.000000000 -0400
22145@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p 22142@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
22146 pci_write_config_byte(dev, 0x48, udma_enable); 22143 pci_write_config_byte(dev, 0x48, udma_enable);
22147 } 22144 }
@@ -22151,9 +22148,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_rdc.c linux-2.6.32.23/drivers/ata/pa
22151 .inherits = &ata_bmdma32_port_ops, 22148 .inherits = &ata_bmdma32_port_ops,
22152 .cable_detect = rdc_pata_cable_detect, 22149 .cable_detect = rdc_pata_cable_detect,
22153 .set_piomode = rdc_set_piomode, 22150 .set_piomode = rdc_set_piomode,
22154diff -urNp linux-2.6.32.23/drivers/ata/pata_rz1000.c linux-2.6.32.23/drivers/ata/pata_rz1000.c 22151diff -urNp linux-2.6.32.24/drivers/ata/pata_rz1000.c linux-2.6.32.24/drivers/ata/pata_rz1000.c
22155--- linux-2.6.32.23/drivers/ata/pata_rz1000.c 2010-08-13 16:24:37.000000000 -0400 22152--- linux-2.6.32.24/drivers/ata/pata_rz1000.c 2010-08-13 16:24:37.000000000 -0400
22156+++ linux-2.6.32.23/drivers/ata/pata_rz1000.c 2010-09-04 15:54:52.000000000 -0400 22153+++ linux-2.6.32.24/drivers/ata/pata_rz1000.c 2010-09-04 15:54:52.000000000 -0400
22157@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ 22154@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
22158 ATA_PIO_SHT(DRV_NAME), 22155 ATA_PIO_SHT(DRV_NAME),
22159 }; 22156 };
@@ -22163,9 +22160,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_rz1000.c linux-2.6.32.23/drivers/ata
22163 .inherits = &ata_sff_port_ops, 22160 .inherits = &ata_sff_port_ops,
22164 .cable_detect = ata_cable_40wire, 22161 .cable_detect = ata_cable_40wire,
22165 .set_mode = rz1000_set_mode, 22162 .set_mode = rz1000_set_mode,
22166diff -urNp linux-2.6.32.23/drivers/ata/pata_sc1200.c linux-2.6.32.23/drivers/ata/pata_sc1200.c 22163diff -urNp linux-2.6.32.24/drivers/ata/pata_sc1200.c linux-2.6.32.24/drivers/ata/pata_sc1200.c
22167--- linux-2.6.32.23/drivers/ata/pata_sc1200.c 2010-08-13 16:24:37.000000000 -0400 22164--- linux-2.6.32.24/drivers/ata/pata_sc1200.c 2010-08-13 16:24:37.000000000 -0400
22168+++ linux-2.6.32.23/drivers/ata/pata_sc1200.c 2010-09-04 15:54:52.000000000 -0400 22165+++ linux-2.6.32.24/drivers/ata/pata_sc1200.c 2010-09-04 15:54:52.000000000 -0400
22169@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ 22166@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
22170 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 22167 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
22171 }; 22168 };
@@ -22175,9 +22172,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_sc1200.c linux-2.6.32.23/drivers/ata
22175 .inherits = &ata_bmdma_port_ops, 22172 .inherits = &ata_bmdma_port_ops,
22176 .qc_prep = ata_sff_dumb_qc_prep, 22173 .qc_prep = ata_sff_dumb_qc_prep,
22177 .qc_issue = sc1200_qc_issue, 22174 .qc_issue = sc1200_qc_issue,
22178diff -urNp linux-2.6.32.23/drivers/ata/pata_scc.c linux-2.6.32.23/drivers/ata/pata_scc.c 22175diff -urNp linux-2.6.32.24/drivers/ata/pata_scc.c linux-2.6.32.24/drivers/ata/pata_scc.c
22179--- linux-2.6.32.23/drivers/ata/pata_scc.c 2010-08-13 16:24:37.000000000 -0400 22176--- linux-2.6.32.24/drivers/ata/pata_scc.c 2010-08-13 16:24:37.000000000 -0400
22180+++ linux-2.6.32.23/drivers/ata/pata_scc.c 2010-09-04 15:54:52.000000000 -0400 22177+++ linux-2.6.32.24/drivers/ata/pata_scc.c 2010-09-04 15:54:52.000000000 -0400
22181@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht 22178@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
22182 ATA_BMDMA_SHT(DRV_NAME), 22179 ATA_BMDMA_SHT(DRV_NAME),
22183 }; 22180 };
@@ -22187,9 +22184,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_scc.c linux-2.6.32.23/drivers/ata/pa
22187 .inherits = &ata_bmdma_port_ops, 22184 .inherits = &ata_bmdma_port_ops,
22188 22185
22189 .set_piomode = scc_set_piomode, 22186 .set_piomode = scc_set_piomode,
22190diff -urNp linux-2.6.32.23/drivers/ata/pata_sch.c linux-2.6.32.23/drivers/ata/pata_sch.c 22187diff -urNp linux-2.6.32.24/drivers/ata/pata_sch.c linux-2.6.32.24/drivers/ata/pata_sch.c
22191--- linux-2.6.32.23/drivers/ata/pata_sch.c 2010-08-13 16:24:37.000000000 -0400 22188--- linux-2.6.32.24/drivers/ata/pata_sch.c 2010-08-13 16:24:37.000000000 -0400
22192+++ linux-2.6.32.23/drivers/ata/pata_sch.c 2010-09-04 15:54:52.000000000 -0400 22189+++ linux-2.6.32.24/drivers/ata/pata_sch.c 2010-09-04 15:54:52.000000000 -0400
22193@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht 22190@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
22194 ATA_BMDMA_SHT(DRV_NAME), 22191 ATA_BMDMA_SHT(DRV_NAME),
22195 }; 22192 };
@@ -22199,9 +22196,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_sch.c linux-2.6.32.23/drivers/ata/pa
22199 .inherits = &ata_bmdma_port_ops, 22196 .inherits = &ata_bmdma_port_ops,
22200 .cable_detect = ata_cable_unknown, 22197 .cable_detect = ata_cable_unknown,
22201 .set_piomode = sch_set_piomode, 22198 .set_piomode = sch_set_piomode,
22202diff -urNp linux-2.6.32.23/drivers/ata/pata_serverworks.c linux-2.6.32.23/drivers/ata/pata_serverworks.c 22199diff -urNp linux-2.6.32.24/drivers/ata/pata_serverworks.c linux-2.6.32.24/drivers/ata/pata_serverworks.c
22203--- linux-2.6.32.23/drivers/ata/pata_serverworks.c 2010-08-13 16:24:37.000000000 -0400 22200--- linux-2.6.32.24/drivers/ata/pata_serverworks.c 2010-08-13 16:24:37.000000000 -0400
22204+++ linux-2.6.32.23/drivers/ata/pata_serverworks.c 2010-09-04 15:54:52.000000000 -0400 22201+++ linux-2.6.32.24/drivers/ata/pata_serverworks.c 2010-09-04 15:54:52.000000000 -0400
22205@@ -299,7 +299,7 @@ static struct scsi_host_template serverw 22202@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
22206 ATA_BMDMA_SHT(DRV_NAME), 22203 ATA_BMDMA_SHT(DRV_NAME),
22207 }; 22204 };
@@ -22220,9 +22217,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_serverworks.c linux-2.6.32.23/driver
22220 .inherits = &serverworks_osb4_port_ops, 22217 .inherits = &serverworks_osb4_port_ops,
22221 .mode_filter = serverworks_csb_filter, 22218 .mode_filter = serverworks_csb_filter,
22222 }; 22219 };
22223diff -urNp linux-2.6.32.23/drivers/ata/pata_sil680.c linux-2.6.32.23/drivers/ata/pata_sil680.c 22220diff -urNp linux-2.6.32.24/drivers/ata/pata_sil680.c linux-2.6.32.24/drivers/ata/pata_sil680.c
22224--- linux-2.6.32.23/drivers/ata/pata_sil680.c 2010-08-13 16:24:37.000000000 -0400 22221--- linux-2.6.32.24/drivers/ata/pata_sil680.c 2010-08-13 16:24:37.000000000 -0400
22225+++ linux-2.6.32.23/drivers/ata/pata_sil680.c 2010-09-04 15:54:52.000000000 -0400 22222+++ linux-2.6.32.24/drivers/ata/pata_sil680.c 2010-09-04 15:54:52.000000000 -0400
22226@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ 22223@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
22227 ATA_BMDMA_SHT(DRV_NAME), 22224 ATA_BMDMA_SHT(DRV_NAME),
22228 }; 22225 };
@@ -22232,9 +22229,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_sil680.c linux-2.6.32.23/drivers/ata
22232 .inherits = &ata_bmdma32_port_ops, 22229 .inherits = &ata_bmdma32_port_ops,
22233 .cable_detect = sil680_cable_detect, 22230 .cable_detect = sil680_cable_detect,
22234 .set_piomode = sil680_set_piomode, 22231 .set_piomode = sil680_set_piomode,
22235diff -urNp linux-2.6.32.23/drivers/ata/pata_sis.c linux-2.6.32.23/drivers/ata/pata_sis.c 22232diff -urNp linux-2.6.32.24/drivers/ata/pata_sis.c linux-2.6.32.24/drivers/ata/pata_sis.c
22236--- linux-2.6.32.23/drivers/ata/pata_sis.c 2010-08-13 16:24:37.000000000 -0400 22233--- linux-2.6.32.24/drivers/ata/pata_sis.c 2010-08-13 16:24:37.000000000 -0400
22237+++ linux-2.6.32.23/drivers/ata/pata_sis.c 2010-09-04 15:54:52.000000000 -0400 22234+++ linux-2.6.32.24/drivers/ata/pata_sis.c 2010-09-04 15:54:52.000000000 -0400
22238@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht 22235@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
22239 ATA_BMDMA_SHT(DRV_NAME), 22236 ATA_BMDMA_SHT(DRV_NAME),
22240 }; 22237 };
@@ -22290,9 +22287,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_sis.c linux-2.6.32.23/drivers/ata/pa
22290 .inherits = &sis_base_ops, 22287 .inherits = &sis_base_ops,
22291 .set_piomode = sis_old_set_piomode, 22288 .set_piomode = sis_old_set_piomode,
22292 .set_dmamode = sis_old_set_dmamode, 22289 .set_dmamode = sis_old_set_dmamode,
22293diff -urNp linux-2.6.32.23/drivers/ata/pata_sl82c105.c linux-2.6.32.23/drivers/ata/pata_sl82c105.c 22290diff -urNp linux-2.6.32.24/drivers/ata/pata_sl82c105.c linux-2.6.32.24/drivers/ata/pata_sl82c105.c
22294--- linux-2.6.32.23/drivers/ata/pata_sl82c105.c 2010-08-13 16:24:37.000000000 -0400 22291--- linux-2.6.32.24/drivers/ata/pata_sl82c105.c 2010-08-13 16:24:37.000000000 -0400
22295+++ linux-2.6.32.23/drivers/ata/pata_sl82c105.c 2010-09-04 15:54:52.000000000 -0400 22292+++ linux-2.6.32.24/drivers/ata/pata_sl82c105.c 2010-09-04 15:54:52.000000000 -0400
22296@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 22293@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
22297 ATA_BMDMA_SHT(DRV_NAME), 22294 ATA_BMDMA_SHT(DRV_NAME),
22298 }; 22295 };
@@ -22302,9 +22299,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_sl82c105.c linux-2.6.32.23/drivers/a
22302 .inherits = &ata_bmdma_port_ops, 22299 .inherits = &ata_bmdma_port_ops,
22303 .qc_defer = sl82c105_qc_defer, 22300 .qc_defer = sl82c105_qc_defer,
22304 .bmdma_start = sl82c105_bmdma_start, 22301 .bmdma_start = sl82c105_bmdma_start,
22305diff -urNp linux-2.6.32.23/drivers/ata/pata_triflex.c linux-2.6.32.23/drivers/ata/pata_triflex.c 22302diff -urNp linux-2.6.32.24/drivers/ata/pata_triflex.c linux-2.6.32.24/drivers/ata/pata_triflex.c
22306--- linux-2.6.32.23/drivers/ata/pata_triflex.c 2010-08-13 16:24:37.000000000 -0400 22303--- linux-2.6.32.24/drivers/ata/pata_triflex.c 2010-08-13 16:24:37.000000000 -0400
22307+++ linux-2.6.32.23/drivers/ata/pata_triflex.c 2010-09-04 15:54:52.000000000 -0400 22304+++ linux-2.6.32.24/drivers/ata/pata_triflex.c 2010-09-04 15:54:52.000000000 -0400
22308@@ -178,7 +178,7 @@ static struct scsi_host_template triflex 22305@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
22309 ATA_BMDMA_SHT(DRV_NAME), 22306 ATA_BMDMA_SHT(DRV_NAME),
22310 }; 22307 };
@@ -22314,9 +22311,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_triflex.c linux-2.6.32.23/drivers/at
22314 .inherits = &ata_bmdma_port_ops, 22311 .inherits = &ata_bmdma_port_ops,
22315 .bmdma_start = triflex_bmdma_start, 22312 .bmdma_start = triflex_bmdma_start,
22316 .bmdma_stop = triflex_bmdma_stop, 22313 .bmdma_stop = triflex_bmdma_stop,
22317diff -urNp linux-2.6.32.23/drivers/ata/pata_via.c linux-2.6.32.23/drivers/ata/pata_via.c 22314diff -urNp linux-2.6.32.24/drivers/ata/pata_via.c linux-2.6.32.24/drivers/ata/pata_via.c
22318--- linux-2.6.32.23/drivers/ata/pata_via.c 2010-08-13 16:24:37.000000000 -0400 22315--- linux-2.6.32.24/drivers/ata/pata_via.c 2010-08-13 16:24:37.000000000 -0400
22319+++ linux-2.6.32.23/drivers/ata/pata_via.c 2010-09-04 15:54:52.000000000 -0400 22316+++ linux-2.6.32.24/drivers/ata/pata_via.c 2010-09-04 15:54:52.000000000 -0400
22320@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht 22317@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
22321 ATA_BMDMA_SHT(DRV_NAME), 22318 ATA_BMDMA_SHT(DRV_NAME),
22322 }; 22319 };
@@ -22335,9 +22332,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_via.c linux-2.6.32.23/drivers/ata/pa
22335 .inherits = &via_port_ops, 22332 .inherits = &via_port_ops,
22336 .sff_data_xfer = ata_sff_data_xfer_noirq, 22333 .sff_data_xfer = ata_sff_data_xfer_noirq,
22337 }; 22334 };
22338diff -urNp linux-2.6.32.23/drivers/ata/pata_winbond.c linux-2.6.32.23/drivers/ata/pata_winbond.c 22335diff -urNp linux-2.6.32.24/drivers/ata/pata_winbond.c linux-2.6.32.24/drivers/ata/pata_winbond.c
22339--- linux-2.6.32.23/drivers/ata/pata_winbond.c 2010-08-13 16:24:37.000000000 -0400 22336--- linux-2.6.32.24/drivers/ata/pata_winbond.c 2010-08-13 16:24:37.000000000 -0400
22340+++ linux-2.6.32.23/drivers/ata/pata_winbond.c 2010-09-04 15:54:52.000000000 -0400 22337+++ linux-2.6.32.24/drivers/ata/pata_winbond.c 2010-09-04 15:54:52.000000000 -0400
22341@@ -125,7 +125,7 @@ static struct scsi_host_template winbond 22338@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
22342 ATA_PIO_SHT(DRV_NAME), 22339 ATA_PIO_SHT(DRV_NAME),
22343 }; 22340 };
@@ -22347,9 +22344,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pata_winbond.c linux-2.6.32.23/drivers/at
22347 .inherits = &ata_sff_port_ops, 22344 .inherits = &ata_sff_port_ops,
22348 .sff_data_xfer = winbond_data_xfer, 22345 .sff_data_xfer = winbond_data_xfer,
22349 .cable_detect = ata_cable_40wire, 22346 .cable_detect = ata_cable_40wire,
22350diff -urNp linux-2.6.32.23/drivers/ata/pdc_adma.c linux-2.6.32.23/drivers/ata/pdc_adma.c 22347diff -urNp linux-2.6.32.24/drivers/ata/pdc_adma.c linux-2.6.32.24/drivers/ata/pdc_adma.c
22351--- linux-2.6.32.23/drivers/ata/pdc_adma.c 2010-08-13 16:24:37.000000000 -0400 22348--- linux-2.6.32.24/drivers/ata/pdc_adma.c 2010-08-13 16:24:37.000000000 -0400
22352+++ linux-2.6.32.23/drivers/ata/pdc_adma.c 2010-09-04 15:54:52.000000000 -0400 22349+++ linux-2.6.32.24/drivers/ata/pdc_adma.c 2010-09-04 15:54:52.000000000 -0400
22353@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at 22350@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
22354 .dma_boundary = ADMA_DMA_BOUNDARY, 22351 .dma_boundary = ADMA_DMA_BOUNDARY,
22355 }; 22352 };
@@ -22359,9 +22356,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/pdc_adma.c linux-2.6.32.23/drivers/ata/pd
22359 .inherits = &ata_sff_port_ops, 22356 .inherits = &ata_sff_port_ops,
22360 22357
22361 .lost_interrupt = ATA_OP_NULL, 22358 .lost_interrupt = ATA_OP_NULL,
22362diff -urNp linux-2.6.32.23/drivers/ata/sata_fsl.c linux-2.6.32.23/drivers/ata/sata_fsl.c 22359diff -urNp linux-2.6.32.24/drivers/ata/sata_fsl.c linux-2.6.32.24/drivers/ata/sata_fsl.c
22363--- linux-2.6.32.23/drivers/ata/sata_fsl.c 2010-08-13 16:24:37.000000000 -0400 22360--- linux-2.6.32.24/drivers/ata/sata_fsl.c 2010-08-13 16:24:37.000000000 -0400
22364+++ linux-2.6.32.23/drivers/ata/sata_fsl.c 2010-09-04 15:54:52.000000000 -0400 22361+++ linux-2.6.32.24/drivers/ata/sata_fsl.c 2010-09-04 15:54:52.000000000 -0400
22365@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs 22362@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
22366 .dma_boundary = ATA_DMA_BOUNDARY, 22363 .dma_boundary = ATA_DMA_BOUNDARY,
22367 }; 22364 };
@@ -22371,9 +22368,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/sata_fsl.c linux-2.6.32.23/drivers/ata/sa
22371 .inherits = &sata_pmp_port_ops, 22368 .inherits = &sata_pmp_port_ops,
22372 22369
22373 .qc_defer = ata_std_qc_defer, 22370 .qc_defer = ata_std_qc_defer,
22374diff -urNp linux-2.6.32.23/drivers/ata/sata_inic162x.c linux-2.6.32.23/drivers/ata/sata_inic162x.c 22371diff -urNp linux-2.6.32.24/drivers/ata/sata_inic162x.c linux-2.6.32.24/drivers/ata/sata_inic162x.c
22375--- linux-2.6.32.23/drivers/ata/sata_inic162x.c 2010-08-13 16:24:37.000000000 -0400 22372--- linux-2.6.32.24/drivers/ata/sata_inic162x.c 2010-08-13 16:24:37.000000000 -0400
22376+++ linux-2.6.32.23/drivers/ata/sata_inic162x.c 2010-09-04 15:54:52.000000000 -0400 22373+++ linux-2.6.32.24/drivers/ata/sata_inic162x.c 2010-09-04 15:54:52.000000000 -0400
22377@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po 22374@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
22378 return 0; 22375 return 0;
22379 } 22376 }
@@ -22383,9 +22380,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/sata_inic162x.c linux-2.6.32.23/drivers/a
22383 .inherits = &sata_port_ops, 22380 .inherits = &sata_port_ops,
22384 22381
22385 .check_atapi_dma = inic_check_atapi_dma, 22382 .check_atapi_dma = inic_check_atapi_dma,
22386diff -urNp linux-2.6.32.23/drivers/ata/sata_mv.c linux-2.6.32.23/drivers/ata/sata_mv.c 22383diff -urNp linux-2.6.32.24/drivers/ata/sata_mv.c linux-2.6.32.24/drivers/ata/sata_mv.c
22387--- linux-2.6.32.23/drivers/ata/sata_mv.c 2010-09-20 17:26:42.000000000 -0400 22384--- linux-2.6.32.24/drivers/ata/sata_mv.c 2010-09-20 17:26:42.000000000 -0400
22388+++ linux-2.6.32.23/drivers/ata/sata_mv.c 2010-09-20 17:27:14.000000000 -0400 22385+++ linux-2.6.32.24/drivers/ata/sata_mv.c 2010-09-20 17:27:14.000000000 -0400
22389@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht 22386@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
22390 .dma_boundary = MV_DMA_BOUNDARY, 22387 .dma_boundary = MV_DMA_BOUNDARY,
22391 }; 22388 };
@@ -22413,9 +22410,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/sata_mv.c linux-2.6.32.23/drivers/ata/sat
22413 .inherits = &mv6_ops, 22410 .inherits = &mv6_ops,
22414 .dev_config = ATA_OP_NULL, 22411 .dev_config = ATA_OP_NULL,
22415 .qc_prep = mv_qc_prep_iie, 22412 .qc_prep = mv_qc_prep_iie,
22416diff -urNp linux-2.6.32.23/drivers/ata/sata_nv.c linux-2.6.32.23/drivers/ata/sata_nv.c 22413diff -urNp linux-2.6.32.24/drivers/ata/sata_nv.c linux-2.6.32.24/drivers/ata/sata_nv.c
22417--- linux-2.6.32.23/drivers/ata/sata_nv.c 2010-08-13 16:24:37.000000000 -0400 22414--- linux-2.6.32.24/drivers/ata/sata_nv.c 2010-08-13 16:24:37.000000000 -0400
22418+++ linux-2.6.32.23/drivers/ata/sata_nv.c 2010-09-04 15:54:52.000000000 -0400 22415+++ linux-2.6.32.24/drivers/ata/sata_nv.c 2010-09-04 15:54:52.000000000 -0400
22419@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc 22416@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
22420 * cases. Define nv_hardreset() which only kicks in for post-boot 22417 * cases. Define nv_hardreset() which only kicks in for post-boot
22421 * probing and use it for all variants. 22418 * probing and use it for all variants.
@@ -22458,9 +22455,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/sata_nv.c linux-2.6.32.23/drivers/ata/sat
22458 .inherits = &nv_generic_ops, 22455 .inherits = &nv_generic_ops,
22459 22456
22460 .qc_defer = ata_std_qc_defer, 22457 .qc_defer = ata_std_qc_defer,
22461diff -urNp linux-2.6.32.23/drivers/ata/sata_promise.c linux-2.6.32.23/drivers/ata/sata_promise.c 22458diff -urNp linux-2.6.32.24/drivers/ata/sata_promise.c linux-2.6.32.24/drivers/ata/sata_promise.c
22462--- linux-2.6.32.23/drivers/ata/sata_promise.c 2010-08-13 16:24:37.000000000 -0400 22459--- linux-2.6.32.24/drivers/ata/sata_promise.c 2010-08-13 16:24:37.000000000 -0400
22463+++ linux-2.6.32.23/drivers/ata/sata_promise.c 2010-09-04 15:54:52.000000000 -0400 22460+++ linux-2.6.32.24/drivers/ata/sata_promise.c 2010-09-04 15:54:52.000000000 -0400
22464@@ -195,7 +195,7 @@ static const struct ata_port_operations 22461@@ -195,7 +195,7 @@ static const struct ata_port_operations
22465 .error_handler = pdc_error_handler, 22462 .error_handler = pdc_error_handler,
22466 }; 22463 };
@@ -22487,9 +22484,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/sata_promise.c linux-2.6.32.23/drivers/at
22487 .inherits = &pdc_common_ops, 22484 .inherits = &pdc_common_ops,
22488 .cable_detect = pdc_pata_cable_detect, 22485 .cable_detect = pdc_pata_cable_detect,
22489 .freeze = pdc_freeze, 22486 .freeze = pdc_freeze,
22490diff -urNp linux-2.6.32.23/drivers/ata/sata_qstor.c linux-2.6.32.23/drivers/ata/sata_qstor.c 22487diff -urNp linux-2.6.32.24/drivers/ata/sata_qstor.c linux-2.6.32.24/drivers/ata/sata_qstor.c
22491--- linux-2.6.32.23/drivers/ata/sata_qstor.c 2010-08-13 16:24:37.000000000 -0400 22488--- linux-2.6.32.24/drivers/ata/sata_qstor.c 2010-08-13 16:24:37.000000000 -0400
22492+++ linux-2.6.32.23/drivers/ata/sata_qstor.c 2010-09-04 15:54:52.000000000 -0400 22489+++ linux-2.6.32.24/drivers/ata/sata_qstor.c 2010-09-04 15:54:52.000000000 -0400
22493@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ 22490@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
22494 .dma_boundary = QS_DMA_BOUNDARY, 22491 .dma_boundary = QS_DMA_BOUNDARY,
22495 }; 22492 };
@@ -22499,9 +22496,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/sata_qstor.c linux-2.6.32.23/drivers/ata/
22499 .inherits = &ata_sff_port_ops, 22496 .inherits = &ata_sff_port_ops,
22500 22497
22501 .check_atapi_dma = qs_check_atapi_dma, 22498 .check_atapi_dma = qs_check_atapi_dma,
22502diff -urNp linux-2.6.32.23/drivers/ata/sata_sil24.c linux-2.6.32.23/drivers/ata/sata_sil24.c 22499diff -urNp linux-2.6.32.24/drivers/ata/sata_sil24.c linux-2.6.32.24/drivers/ata/sata_sil24.c
22503--- linux-2.6.32.23/drivers/ata/sata_sil24.c 2010-08-13 16:24:37.000000000 -0400 22500--- linux-2.6.32.24/drivers/ata/sata_sil24.c 2010-08-13 16:24:37.000000000 -0400
22504+++ linux-2.6.32.23/drivers/ata/sata_sil24.c 2010-09-04 15:54:52.000000000 -0400 22501+++ linux-2.6.32.24/drivers/ata/sata_sil24.c 2010-09-04 15:54:52.000000000 -0400
22505@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s 22502@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
22506 .dma_boundary = ATA_DMA_BOUNDARY, 22503 .dma_boundary = ATA_DMA_BOUNDARY,
22507 }; 22504 };
@@ -22511,9 +22508,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/sata_sil24.c linux-2.6.32.23/drivers/ata/
22511 .inherits = &sata_pmp_port_ops, 22508 .inherits = &sata_pmp_port_ops,
22512 22509
22513 .qc_defer = sil24_qc_defer, 22510 .qc_defer = sil24_qc_defer,
22514diff -urNp linux-2.6.32.23/drivers/ata/sata_sil.c linux-2.6.32.23/drivers/ata/sata_sil.c 22511diff -urNp linux-2.6.32.24/drivers/ata/sata_sil.c linux-2.6.32.24/drivers/ata/sata_sil.c
22515--- linux-2.6.32.23/drivers/ata/sata_sil.c 2010-08-13 16:24:37.000000000 -0400 22512--- linux-2.6.32.24/drivers/ata/sata_sil.c 2010-08-13 16:24:37.000000000 -0400
22516+++ linux-2.6.32.23/drivers/ata/sata_sil.c 2010-09-04 15:54:52.000000000 -0400 22513+++ linux-2.6.32.24/drivers/ata/sata_sil.c 2010-09-04 15:54:52.000000000 -0400
22517@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht 22514@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
22518 .sg_tablesize = ATA_MAX_PRD 22515 .sg_tablesize = ATA_MAX_PRD
22519 }; 22516 };
@@ -22523,9 +22520,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/sata_sil.c linux-2.6.32.23/drivers/ata/sa
22523 .inherits = &ata_bmdma32_port_ops, 22520 .inherits = &ata_bmdma32_port_ops,
22524 .dev_config = sil_dev_config, 22521 .dev_config = sil_dev_config,
22525 .set_mode = sil_set_mode, 22522 .set_mode = sil_set_mode,
22526diff -urNp linux-2.6.32.23/drivers/ata/sata_sis.c linux-2.6.32.23/drivers/ata/sata_sis.c 22523diff -urNp linux-2.6.32.24/drivers/ata/sata_sis.c linux-2.6.32.24/drivers/ata/sata_sis.c
22527--- linux-2.6.32.23/drivers/ata/sata_sis.c 2010-08-13 16:24:37.000000000 -0400 22524--- linux-2.6.32.24/drivers/ata/sata_sis.c 2010-08-13 16:24:37.000000000 -0400
22528+++ linux-2.6.32.23/drivers/ata/sata_sis.c 2010-09-04 15:54:52.000000000 -0400 22525+++ linux-2.6.32.24/drivers/ata/sata_sis.c 2010-09-04 15:54:52.000000000 -0400
22529@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht 22526@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
22530 ATA_BMDMA_SHT(DRV_NAME), 22527 ATA_BMDMA_SHT(DRV_NAME),
22531 }; 22528 };
@@ -22535,9 +22532,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/sata_sis.c linux-2.6.32.23/drivers/ata/sa
22535 .inherits = &ata_bmdma_port_ops, 22532 .inherits = &ata_bmdma_port_ops,
22536 .scr_read = sis_scr_read, 22533 .scr_read = sis_scr_read,
22537 .scr_write = sis_scr_write, 22534 .scr_write = sis_scr_write,
22538diff -urNp linux-2.6.32.23/drivers/ata/sata_svw.c linux-2.6.32.23/drivers/ata/sata_svw.c 22535diff -urNp linux-2.6.32.24/drivers/ata/sata_svw.c linux-2.6.32.24/drivers/ata/sata_svw.c
22539--- linux-2.6.32.23/drivers/ata/sata_svw.c 2010-08-13 16:24:37.000000000 -0400 22536--- linux-2.6.32.24/drivers/ata/sata_svw.c 2010-08-13 16:24:37.000000000 -0400
22540+++ linux-2.6.32.23/drivers/ata/sata_svw.c 2010-09-04 15:54:52.000000000 -0400 22537+++ linux-2.6.32.24/drivers/ata/sata_svw.c 2010-09-04 15:54:52.000000000 -0400
22541@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata 22538@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
22542 }; 22539 };
22543 22540
@@ -22547,9 +22544,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/sata_svw.c linux-2.6.32.23/drivers/ata/sa
22547 .inherits = &ata_bmdma_port_ops, 22544 .inherits = &ata_bmdma_port_ops,
22548 .sff_tf_load = k2_sata_tf_load, 22545 .sff_tf_load = k2_sata_tf_load,
22549 .sff_tf_read = k2_sata_tf_read, 22546 .sff_tf_read = k2_sata_tf_read,
22550diff -urNp linux-2.6.32.23/drivers/ata/sata_sx4.c linux-2.6.32.23/drivers/ata/sata_sx4.c 22547diff -urNp linux-2.6.32.24/drivers/ata/sata_sx4.c linux-2.6.32.24/drivers/ata/sata_sx4.c
22551--- linux-2.6.32.23/drivers/ata/sata_sx4.c 2010-08-13 16:24:37.000000000 -0400 22548--- linux-2.6.32.24/drivers/ata/sata_sx4.c 2010-08-13 16:24:37.000000000 -0400
22552+++ linux-2.6.32.23/drivers/ata/sata_sx4.c 2010-09-04 15:54:52.000000000 -0400 22549+++ linux-2.6.32.24/drivers/ata/sata_sx4.c 2010-09-04 15:54:52.000000000 -0400
22553@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat 22550@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
22554 }; 22551 };
22555 22552
@@ -22559,9 +22556,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/sata_sx4.c linux-2.6.32.23/drivers/ata/sa
22559 .inherits = &ata_sff_port_ops, 22556 .inherits = &ata_sff_port_ops,
22560 22557
22561 .check_atapi_dma = pdc_check_atapi_dma, 22558 .check_atapi_dma = pdc_check_atapi_dma,
22562diff -urNp linux-2.6.32.23/drivers/ata/sata_uli.c linux-2.6.32.23/drivers/ata/sata_uli.c 22559diff -urNp linux-2.6.32.24/drivers/ata/sata_uli.c linux-2.6.32.24/drivers/ata/sata_uli.c
22563--- linux-2.6.32.23/drivers/ata/sata_uli.c 2010-08-13 16:24:37.000000000 -0400 22560--- linux-2.6.32.24/drivers/ata/sata_uli.c 2010-08-13 16:24:37.000000000 -0400
22564+++ linux-2.6.32.23/drivers/ata/sata_uli.c 2010-09-04 15:54:52.000000000 -0400 22561+++ linux-2.6.32.24/drivers/ata/sata_uli.c 2010-09-04 15:54:52.000000000 -0400
22565@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht 22562@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
22566 ATA_BMDMA_SHT(DRV_NAME), 22563 ATA_BMDMA_SHT(DRV_NAME),
22567 }; 22564 };
@@ -22571,9 +22568,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/sata_uli.c linux-2.6.32.23/drivers/ata/sa
22571 .inherits = &ata_bmdma_port_ops, 22568 .inherits = &ata_bmdma_port_ops,
22572 .scr_read = uli_scr_read, 22569 .scr_read = uli_scr_read,
22573 .scr_write = uli_scr_write, 22570 .scr_write = uli_scr_write,
22574diff -urNp linux-2.6.32.23/drivers/ata/sata_via.c linux-2.6.32.23/drivers/ata/sata_via.c 22571diff -urNp linux-2.6.32.24/drivers/ata/sata_via.c linux-2.6.32.24/drivers/ata/sata_via.c
22575--- linux-2.6.32.23/drivers/ata/sata_via.c 2010-08-13 16:24:37.000000000 -0400 22572--- linux-2.6.32.24/drivers/ata/sata_via.c 2010-08-13 16:24:37.000000000 -0400
22576+++ linux-2.6.32.23/drivers/ata/sata_via.c 2010-09-04 15:54:52.000000000 -0400 22573+++ linux-2.6.32.24/drivers/ata/sata_via.c 2010-09-04 15:54:52.000000000 -0400
22577@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh 22574@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
22578 ATA_BMDMA_SHT(DRV_NAME), 22575 ATA_BMDMA_SHT(DRV_NAME),
22579 }; 22576 };
@@ -22611,9 +22608,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/sata_via.c linux-2.6.32.23/drivers/ata/sa
22611 .inherits = &svia_base_ops, 22608 .inherits = &svia_base_ops,
22612 .hardreset = sata_std_hardreset, 22609 .hardreset = sata_std_hardreset,
22613 .scr_read = vt8251_scr_read, 22610 .scr_read = vt8251_scr_read,
22614diff -urNp linux-2.6.32.23/drivers/ata/sata_vsc.c linux-2.6.32.23/drivers/ata/sata_vsc.c 22611diff -urNp linux-2.6.32.24/drivers/ata/sata_vsc.c linux-2.6.32.24/drivers/ata/sata_vsc.c
22615--- linux-2.6.32.23/drivers/ata/sata_vsc.c 2010-08-13 16:24:37.000000000 -0400 22612--- linux-2.6.32.24/drivers/ata/sata_vsc.c 2010-08-13 16:24:37.000000000 -0400
22616+++ linux-2.6.32.23/drivers/ata/sata_vsc.c 2010-09-04 15:54:52.000000000 -0400 22613+++ linux-2.6.32.24/drivers/ata/sata_vsc.c 2010-09-04 15:54:52.000000000 -0400
22617@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat 22614@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
22618 }; 22615 };
22619 22616
@@ -22623,9 +22620,9 @@ diff -urNp linux-2.6.32.23/drivers/ata/sata_vsc.c linux-2.6.32.23/drivers/ata/sa
22623 .inherits = &ata_bmdma_port_ops, 22620 .inherits = &ata_bmdma_port_ops,
22624 /* The IRQ handling is not quite standard SFF behaviour so we 22621 /* The IRQ handling is not quite standard SFF behaviour so we
22625 cannot use the default lost interrupt handler */ 22622 cannot use the default lost interrupt handler */
22626diff -urNp linux-2.6.32.23/drivers/atm/adummy.c linux-2.6.32.23/drivers/atm/adummy.c 22623diff -urNp linux-2.6.32.24/drivers/atm/adummy.c linux-2.6.32.24/drivers/atm/adummy.c
22627--- linux-2.6.32.23/drivers/atm/adummy.c 2010-08-13 16:24:37.000000000 -0400 22624--- linux-2.6.32.24/drivers/atm/adummy.c 2010-08-13 16:24:37.000000000 -0400
22628+++ linux-2.6.32.23/drivers/atm/adummy.c 2010-09-04 15:54:52.000000000 -0400 22625+++ linux-2.6.32.24/drivers/atm/adummy.c 2010-09-04 15:54:52.000000000 -0400
22629@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct 22626@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
22630 vcc->pop(vcc, skb); 22627 vcc->pop(vcc, skb);
22631 else 22628 else
@@ -22635,9 +22632,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/adummy.c linux-2.6.32.23/drivers/atm/adum
22635 22632
22636 return 0; 22633 return 0;
22637 } 22634 }
22638diff -urNp linux-2.6.32.23/drivers/atm/ambassador.c linux-2.6.32.23/drivers/atm/ambassador.c 22635diff -urNp linux-2.6.32.24/drivers/atm/ambassador.c linux-2.6.32.24/drivers/atm/ambassador.c
22639--- linux-2.6.32.23/drivers/atm/ambassador.c 2010-08-13 16:24:37.000000000 -0400 22636--- linux-2.6.32.24/drivers/atm/ambassador.c 2010-08-13 16:24:37.000000000 -0400
22640+++ linux-2.6.32.23/drivers/atm/ambassador.c 2010-09-04 15:54:52.000000000 -0400 22637+++ linux-2.6.32.24/drivers/atm/ambassador.c 2010-09-04 15:54:52.000000000 -0400
22641@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, 22638@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
22642 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); 22639 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
22643 22640
@@ -22674,9 +22671,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/ambassador.c linux-2.6.32.23/drivers/atm/
22674 return -ENOMEM; // ? 22671 return -ENOMEM; // ?
22675 } 22672 }
22676 22673
22677diff -urNp linux-2.6.32.23/drivers/atm/atmtcp.c linux-2.6.32.23/drivers/atm/atmtcp.c 22674diff -urNp linux-2.6.32.24/drivers/atm/atmtcp.c linux-2.6.32.24/drivers/atm/atmtcp.c
22678--- linux-2.6.32.23/drivers/atm/atmtcp.c 2010-08-13 16:24:37.000000000 -0400 22675--- linux-2.6.32.24/drivers/atm/atmtcp.c 2010-08-13 16:24:37.000000000 -0400
22679+++ linux-2.6.32.23/drivers/atm/atmtcp.c 2010-09-04 15:54:52.000000000 -0400 22676+++ linux-2.6.32.24/drivers/atm/atmtcp.c 2010-09-04 15:54:52.000000000 -0400
22680@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc 22677@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc
22681 if (vcc->pop) vcc->pop(vcc,skb); 22678 if (vcc->pop) vcc->pop(vcc,skb);
22682 else dev_kfree_skb(skb); 22679 else dev_kfree_skb(skb);
@@ -22726,9 +22723,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/atmtcp.c linux-2.6.32.23/drivers/atm/atmt
22726 done: 22723 done:
22727 if (vcc->pop) vcc->pop(vcc,skb); 22724 if (vcc->pop) vcc->pop(vcc,skb);
22728 else dev_kfree_skb(skb); 22725 else dev_kfree_skb(skb);
22729diff -urNp linux-2.6.32.23/drivers/atm/eni.c linux-2.6.32.23/drivers/atm/eni.c 22726diff -urNp linux-2.6.32.24/drivers/atm/eni.c linux-2.6.32.24/drivers/atm/eni.c
22730--- linux-2.6.32.23/drivers/atm/eni.c 2010-08-13 16:24:37.000000000 -0400 22727--- linux-2.6.32.24/drivers/atm/eni.c 2010-08-13 16:24:37.000000000 -0400
22731+++ linux-2.6.32.23/drivers/atm/eni.c 2010-09-04 15:54:52.000000000 -0400 22728+++ linux-2.6.32.24/drivers/atm/eni.c 2010-09-04 15:54:52.000000000 -0400
22732@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) 22729@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
22733 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", 22730 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
22734 vcc->dev->number); 22731 vcc->dev->number);
@@ -22774,9 +22771,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/eni.c linux-2.6.32.23/drivers/atm/eni.c
22774 wake_up(&eni_dev->tx_wait); 22771 wake_up(&eni_dev->tx_wait);
22775 dma_complete++; 22772 dma_complete++;
22776 } 22773 }
22777diff -urNp linux-2.6.32.23/drivers/atm/firestream.c linux-2.6.32.23/drivers/atm/firestream.c 22774diff -urNp linux-2.6.32.24/drivers/atm/firestream.c linux-2.6.32.24/drivers/atm/firestream.c
22778--- linux-2.6.32.23/drivers/atm/firestream.c 2010-08-13 16:24:37.000000000 -0400 22775--- linux-2.6.32.24/drivers/atm/firestream.c 2010-08-13 16:24:37.000000000 -0400
22779+++ linux-2.6.32.23/drivers/atm/firestream.c 2010-09-04 15:54:52.000000000 -0400 22776+++ linux-2.6.32.24/drivers/atm/firestream.c 2010-09-04 15:54:52.000000000 -0400
22780@@ -748,7 +748,7 @@ static void process_txdone_queue (struct 22777@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
22781 } 22778 }
22782 } 22779 }
@@ -22810,9 +22807,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/firestream.c linux-2.6.32.23/drivers/atm/
22810 break; 22807 break;
22811 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ 22808 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
22812 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 22809 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
22813diff -urNp linux-2.6.32.23/drivers/atm/fore200e.c linux-2.6.32.23/drivers/atm/fore200e.c 22810diff -urNp linux-2.6.32.24/drivers/atm/fore200e.c linux-2.6.32.24/drivers/atm/fore200e.c
22814--- linux-2.6.32.23/drivers/atm/fore200e.c 2010-08-13 16:24:37.000000000 -0400 22811--- linux-2.6.32.24/drivers/atm/fore200e.c 2010-08-13 16:24:37.000000000 -0400
22815+++ linux-2.6.32.23/drivers/atm/fore200e.c 2010-09-04 15:54:52.000000000 -0400 22812+++ linux-2.6.32.24/drivers/atm/fore200e.c 2010-09-04 15:54:52.000000000 -0400
22816@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 22813@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
22817 #endif 22814 #endif
22818 /* check error condition */ 22815 /* check error condition */
@@ -22869,9 +22866,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/fore200e.c linux-2.6.32.23/drivers/atm/fo
22869 22866
22870 fore200e->tx_sat++; 22867 fore200e->tx_sat++;
22871 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", 22868 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
22872diff -urNp linux-2.6.32.23/drivers/atm/he.c linux-2.6.32.23/drivers/atm/he.c 22869diff -urNp linux-2.6.32.24/drivers/atm/he.c linux-2.6.32.24/drivers/atm/he.c
22873--- linux-2.6.32.23/drivers/atm/he.c 2010-08-13 16:24:37.000000000 -0400 22870--- linux-2.6.32.24/drivers/atm/he.c 2010-08-13 16:24:37.000000000 -0400
22874+++ linux-2.6.32.23/drivers/atm/he.c 2010-09-04 15:54:52.000000000 -0400 22871+++ linux-2.6.32.24/drivers/atm/he.c 2010-09-04 15:54:52.000000000 -0400
22875@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i 22872@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
22876 22873
22877 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { 22874 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -22953,9 +22950,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/he.c linux-2.6.32.23/drivers/atm/he.c
22953 22950
22954 return 0; 22951 return 0;
22955 } 22952 }
22956diff -urNp linux-2.6.32.23/drivers/atm/horizon.c linux-2.6.32.23/drivers/atm/horizon.c 22953diff -urNp linux-2.6.32.24/drivers/atm/horizon.c linux-2.6.32.24/drivers/atm/horizon.c
22957--- linux-2.6.32.23/drivers/atm/horizon.c 2010-08-13 16:24:37.000000000 -0400 22954--- linux-2.6.32.24/drivers/atm/horizon.c 2010-08-13 16:24:37.000000000 -0400
22958+++ linux-2.6.32.23/drivers/atm/horizon.c 2010-09-04 15:54:52.000000000 -0400 22955+++ linux-2.6.32.24/drivers/atm/horizon.c 2010-09-04 15:54:52.000000000 -0400
22959@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, 22956@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
22960 { 22957 {
22961 struct atm_vcc * vcc = ATM_SKB(skb)->vcc; 22958 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -22974,9 +22971,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/horizon.c linux-2.6.32.23/drivers/atm/hor
22974 22971
22975 // free the skb 22972 // free the skb
22976 hrz_kfree_skb (skb); 22973 hrz_kfree_skb (skb);
22977diff -urNp linux-2.6.32.23/drivers/atm/idt77252.c linux-2.6.32.23/drivers/atm/idt77252.c 22974diff -urNp linux-2.6.32.24/drivers/atm/idt77252.c linux-2.6.32.24/drivers/atm/idt77252.c
22978--- linux-2.6.32.23/drivers/atm/idt77252.c 2010-08-13 16:24:37.000000000 -0400 22975--- linux-2.6.32.24/drivers/atm/idt77252.c 2010-08-13 16:24:37.000000000 -0400
22979+++ linux-2.6.32.23/drivers/atm/idt77252.c 2010-09-04 15:54:52.000000000 -0400 22976+++ linux-2.6.32.24/drivers/atm/idt77252.c 2010-09-04 15:54:52.000000000 -0400
22980@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str 22977@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
22981 else 22978 else
22982 dev_kfree_skb(skb); 22979 dev_kfree_skb(skb);
@@ -23131,9 +23128,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/idt77252.c linux-2.6.32.23/drivers/atm/id
23131 return -ENOMEM; 23128 return -ENOMEM;
23132 } 23129 }
23133 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); 23130 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
23134diff -urNp linux-2.6.32.23/drivers/atm/iphase.c linux-2.6.32.23/drivers/atm/iphase.c 23131diff -urNp linux-2.6.32.24/drivers/atm/iphase.c linux-2.6.32.24/drivers/atm/iphase.c
23135--- linux-2.6.32.23/drivers/atm/iphase.c 2010-08-13 16:24:37.000000000 -0400 23132--- linux-2.6.32.24/drivers/atm/iphase.c 2010-08-13 16:24:37.000000000 -0400
23136+++ linux-2.6.32.23/drivers/atm/iphase.c 2010-09-04 15:54:52.000000000 -0400 23133+++ linux-2.6.32.24/drivers/atm/iphase.c 2010-09-04 15:54:52.000000000 -0400
23137@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) 23134@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
23138 status = (u_short) (buf_desc_ptr->desc_mode); 23135 status = (u_short) (buf_desc_ptr->desc_mode);
23139 if (status & (RX_CER | RX_PTE | RX_OFL)) 23136 if (status & (RX_CER | RX_PTE | RX_OFL))
@@ -23230,9 +23227,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/iphase.c linux-2.6.32.23/drivers/atm/ipha
23230 if (iavcc->vc_desc_cnt > 10) { 23227 if (iavcc->vc_desc_cnt > 10) {
23231 vcc->tx_quota = vcc->tx_quota * 3 / 4; 23228 vcc->tx_quota = vcc->tx_quota * 3 / 4;
23232 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); 23229 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
23233diff -urNp linux-2.6.32.23/drivers/atm/lanai.c linux-2.6.32.23/drivers/atm/lanai.c 23230diff -urNp linux-2.6.32.24/drivers/atm/lanai.c linux-2.6.32.24/drivers/atm/lanai.c
23234--- linux-2.6.32.23/drivers/atm/lanai.c 2010-08-13 16:24:37.000000000 -0400 23231--- linux-2.6.32.24/drivers/atm/lanai.c 2010-08-13 16:24:37.000000000 -0400
23235+++ linux-2.6.32.23/drivers/atm/lanai.c 2010-09-04 15:54:52.000000000 -0400 23232+++ linux-2.6.32.24/drivers/atm/lanai.c 2010-09-04 15:54:52.000000000 -0400
23236@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l 23233@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
23237 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); 23234 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
23238 lanai_endtx(lanai, lvcc); 23235 lanai_endtx(lanai, lvcc);
@@ -23287,9 +23284,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/lanai.c linux-2.6.32.23/drivers/atm/lanai
23287 lvcc->stats.x.aal5.service_rxcrc++; 23284 lvcc->stats.x.aal5.service_rxcrc++;
23288 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; 23285 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
23289 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); 23286 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
23290diff -urNp linux-2.6.32.23/drivers/atm/nicstar.c linux-2.6.32.23/drivers/atm/nicstar.c 23287diff -urNp linux-2.6.32.24/drivers/atm/nicstar.c linux-2.6.32.24/drivers/atm/nicstar.c
23291--- linux-2.6.32.23/drivers/atm/nicstar.c 2010-08-13 16:24:37.000000000 -0400 23288--- linux-2.6.32.24/drivers/atm/nicstar.c 2010-08-13 16:24:37.000000000 -0400
23292+++ linux-2.6.32.23/drivers/atm/nicstar.c 2010-09-04 15:54:52.000000000 -0400 23289+++ linux-2.6.32.24/drivers/atm/nicstar.c 2010-09-04 15:54:52.000000000 -0400
23293@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, 23290@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
23294 if ((vc = (vc_map *) vcc->dev_data) == NULL) 23291 if ((vc = (vc_map *) vcc->dev_data) == NULL)
23295 { 23292 {
@@ -23492,9 +23489,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/nicstar.c linux-2.6.32.23/drivers/atm/nic
23492 } 23489 }
23493 } 23490 }
23494 23491
23495diff -urNp linux-2.6.32.23/drivers/atm/solos-pci.c linux-2.6.32.23/drivers/atm/solos-pci.c 23492diff -urNp linux-2.6.32.24/drivers/atm/solos-pci.c linux-2.6.32.24/drivers/atm/solos-pci.c
23496--- linux-2.6.32.23/drivers/atm/solos-pci.c 2010-08-13 16:24:37.000000000 -0400 23493--- linux-2.6.32.24/drivers/atm/solos-pci.c 2010-08-13 16:24:37.000000000 -0400
23497+++ linux-2.6.32.23/drivers/atm/solos-pci.c 2010-09-04 15:54:52.000000000 -0400 23494+++ linux-2.6.32.24/drivers/atm/solos-pci.c 2010-09-04 15:54:52.000000000 -0400
23498@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) 23495@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
23499 } 23496 }
23500 atm_charge(vcc, skb->truesize); 23497 atm_charge(vcc, skb->truesize);
@@ -23513,9 +23510,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/solos-pci.c linux-2.6.32.23/drivers/atm/s
23513 solos_pop(vcc, oldskb); 23510 solos_pop(vcc, oldskb);
23514 } else 23511 } else
23515 dev_kfree_skb_irq(oldskb); 23512 dev_kfree_skb_irq(oldskb);
23516diff -urNp linux-2.6.32.23/drivers/atm/suni.c linux-2.6.32.23/drivers/atm/suni.c 23513diff -urNp linux-2.6.32.24/drivers/atm/suni.c linux-2.6.32.24/drivers/atm/suni.c
23517--- linux-2.6.32.23/drivers/atm/suni.c 2010-08-13 16:24:37.000000000 -0400 23514--- linux-2.6.32.24/drivers/atm/suni.c 2010-08-13 16:24:37.000000000 -0400
23518+++ linux-2.6.32.23/drivers/atm/suni.c 2010-09-04 15:54:52.000000000 -0400 23515+++ linux-2.6.32.24/drivers/atm/suni.c 2010-09-04 15:54:52.000000000 -0400
23519@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); 23516@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
23520 23517
23521 23518
@@ -23527,9 +23524,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/suni.c linux-2.6.32.23/drivers/atm/suni.c
23527 23524
23528 23525
23529 static void suni_hz(unsigned long from_timer) 23526 static void suni_hz(unsigned long from_timer)
23530diff -urNp linux-2.6.32.23/drivers/atm/uPD98402.c linux-2.6.32.23/drivers/atm/uPD98402.c 23527diff -urNp linux-2.6.32.24/drivers/atm/uPD98402.c linux-2.6.32.24/drivers/atm/uPD98402.c
23531--- linux-2.6.32.23/drivers/atm/uPD98402.c 2010-08-13 16:24:37.000000000 -0400 23528--- linux-2.6.32.24/drivers/atm/uPD98402.c 2010-08-13 16:24:37.000000000 -0400
23532+++ linux-2.6.32.23/drivers/atm/uPD98402.c 2010-09-04 15:54:52.000000000 -0400 23529+++ linux-2.6.32.24/drivers/atm/uPD98402.c 2010-09-04 15:54:52.000000000 -0400
23533@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d 23530@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
23534 struct sonet_stats tmp; 23531 struct sonet_stats tmp;
23535 int error = 0; 23532 int error = 0;
@@ -23574,9 +23571,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/uPD98402.c linux-2.6.32.23/drivers/atm/uP
23574 return 0; 23571 return 0;
23575 } 23572 }
23576 23573
23577diff -urNp linux-2.6.32.23/drivers/atm/zatm.c linux-2.6.32.23/drivers/atm/zatm.c 23574diff -urNp linux-2.6.32.24/drivers/atm/zatm.c linux-2.6.32.24/drivers/atm/zatm.c
23578--- linux-2.6.32.23/drivers/atm/zatm.c 2010-08-13 16:24:37.000000000 -0400 23575--- linux-2.6.32.24/drivers/atm/zatm.c 2010-08-13 16:24:37.000000000 -0400
23579+++ linux-2.6.32.23/drivers/atm/zatm.c 2010-09-04 15:54:52.000000000 -0400 23576+++ linux-2.6.32.24/drivers/atm/zatm.c 2010-09-04 15:54:52.000000000 -0400
23580@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy 23577@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
23581 } 23578 }
23582 if (!size) { 23579 if (!size) {
@@ -23604,9 +23601,9 @@ diff -urNp linux-2.6.32.23/drivers/atm/zatm.c linux-2.6.32.23/drivers/atm/zatm.c
23604 wake_up(&zatm_vcc->tx_wait); 23601 wake_up(&zatm_vcc->tx_wait);
23605 } 23602 }
23606 23603
23607diff -urNp linux-2.6.32.23/drivers/base/bus.c linux-2.6.32.23/drivers/base/bus.c 23604diff -urNp linux-2.6.32.24/drivers/base/bus.c linux-2.6.32.24/drivers/base/bus.c
23608--- linux-2.6.32.23/drivers/base/bus.c 2010-08-13 16:24:37.000000000 -0400 23605--- linux-2.6.32.24/drivers/base/bus.c 2010-08-13 16:24:37.000000000 -0400
23609+++ linux-2.6.32.23/drivers/base/bus.c 2010-09-04 15:54:52.000000000 -0400 23606+++ linux-2.6.32.24/drivers/base/bus.c 2010-09-04 15:54:52.000000000 -0400
23610@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob 23607@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
23611 return ret; 23608 return ret;
23612 } 23609 }
@@ -23634,9 +23631,9 @@ diff -urNp linux-2.6.32.23/drivers/base/bus.c linux-2.6.32.23/drivers/base/bus.c
23634 .filter = bus_uevent_filter, 23631 .filter = bus_uevent_filter,
23635 }; 23632 };
23636 23633
23637diff -urNp linux-2.6.32.23/drivers/base/class.c linux-2.6.32.23/drivers/base/class.c 23634diff -urNp linux-2.6.32.24/drivers/base/class.c linux-2.6.32.24/drivers/base/class.c
23638--- linux-2.6.32.23/drivers/base/class.c 2010-08-13 16:24:37.000000000 -0400 23635--- linux-2.6.32.24/drivers/base/class.c 2010-08-13 16:24:37.000000000 -0400
23639+++ linux-2.6.32.23/drivers/base/class.c 2010-09-04 15:54:52.000000000 -0400 23636+++ linux-2.6.32.24/drivers/base/class.c 2010-09-04 15:54:52.000000000 -0400
23640@@ -63,7 +63,7 @@ static void class_release(struct kobject 23637@@ -63,7 +63,7 @@ static void class_release(struct kobject
23641 kfree(cp); 23638 kfree(cp);
23642 } 23639 }
@@ -23646,9 +23643,9 @@ diff -urNp linux-2.6.32.23/drivers/base/class.c linux-2.6.32.23/drivers/base/cla
23646 .show = class_attr_show, 23643 .show = class_attr_show,
23647 .store = class_attr_store, 23644 .store = class_attr_store,
23648 }; 23645 };
23649diff -urNp linux-2.6.32.23/drivers/base/core.c linux-2.6.32.23/drivers/base/core.c 23646diff -urNp linux-2.6.32.24/drivers/base/core.c linux-2.6.32.24/drivers/base/core.c
23650--- linux-2.6.32.23/drivers/base/core.c 2010-08-13 16:24:37.000000000 -0400 23647--- linux-2.6.32.24/drivers/base/core.c 2010-08-13 16:24:37.000000000 -0400
23651+++ linux-2.6.32.23/drivers/base/core.c 2010-09-04 15:54:52.000000000 -0400 23648+++ linux-2.6.32.24/drivers/base/core.c 2010-09-04 15:54:52.000000000 -0400
23652@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob 23649@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
23653 return ret; 23650 return ret;
23654 } 23651 }
@@ -23667,9 +23664,9 @@ diff -urNp linux-2.6.32.23/drivers/base/core.c linux-2.6.32.23/drivers/base/core
23667 .filter = dev_uevent_filter, 23664 .filter = dev_uevent_filter,
23668 .name = dev_uevent_name, 23665 .name = dev_uevent_name,
23669 .uevent = dev_uevent, 23666 .uevent = dev_uevent,
23670diff -urNp linux-2.6.32.23/drivers/base/memory.c linux-2.6.32.23/drivers/base/memory.c 23667diff -urNp linux-2.6.32.24/drivers/base/memory.c linux-2.6.32.24/drivers/base/memory.c
23671--- linux-2.6.32.23/drivers/base/memory.c 2010-08-13 16:24:37.000000000 -0400 23668--- linux-2.6.32.24/drivers/base/memory.c 2010-08-13 16:24:37.000000000 -0400
23672+++ linux-2.6.32.23/drivers/base/memory.c 2010-09-04 15:54:52.000000000 -0400 23669+++ linux-2.6.32.24/drivers/base/memory.c 2010-09-04 15:54:52.000000000 -0400
23673@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks 23670@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
23674 return retval; 23671 return retval;
23675 } 23672 }
@@ -23679,9 +23676,9 @@ diff -urNp linux-2.6.32.23/drivers/base/memory.c linux-2.6.32.23/drivers/base/me
23679 .name = memory_uevent_name, 23676 .name = memory_uevent_name,
23680 .uevent = memory_uevent, 23677 .uevent = memory_uevent,
23681 }; 23678 };
23682diff -urNp linux-2.6.32.23/drivers/base/sys.c linux-2.6.32.23/drivers/base/sys.c 23679diff -urNp linux-2.6.32.24/drivers/base/sys.c linux-2.6.32.24/drivers/base/sys.c
23683--- linux-2.6.32.23/drivers/base/sys.c 2010-08-13 16:24:37.000000000 -0400 23680--- linux-2.6.32.24/drivers/base/sys.c 2010-08-13 16:24:37.000000000 -0400
23684+++ linux-2.6.32.23/drivers/base/sys.c 2010-09-04 15:54:52.000000000 -0400 23681+++ linux-2.6.32.24/drivers/base/sys.c 2010-09-04 15:54:52.000000000 -0400
23685@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc 23682@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
23686 return -EIO; 23683 return -EIO;
23687 } 23684 }
@@ -23700,9 +23697,9 @@ diff -urNp linux-2.6.32.23/drivers/base/sys.c linux-2.6.32.23/drivers/base/sys.c
23700 .show = sysdev_class_show, 23697 .show = sysdev_class_show,
23701 .store = sysdev_class_store, 23698 .store = sysdev_class_store,
23702 }; 23699 };
23703diff -urNp linux-2.6.32.23/drivers/block/pktcdvd.c linux-2.6.32.23/drivers/block/pktcdvd.c 23700diff -urNp linux-2.6.32.24/drivers/block/pktcdvd.c linux-2.6.32.24/drivers/block/pktcdvd.c
23704--- linux-2.6.32.23/drivers/block/pktcdvd.c 2010-08-13 16:24:37.000000000 -0400 23701--- linux-2.6.32.24/drivers/block/pktcdvd.c 2010-08-13 16:24:37.000000000 -0400
23705+++ linux-2.6.32.23/drivers/block/pktcdvd.c 2010-09-27 18:49:22.000000000 -0400 23702+++ linux-2.6.32.24/drivers/block/pktcdvd.c 2010-09-27 18:49:22.000000000 -0400
23706@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob 23703@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
23707 return len; 23704 return len;
23708 } 23705 }
@@ -23721,9 +23718,9 @@ diff -urNp linux-2.6.32.23/drivers/block/pktcdvd.c linux-2.6.32.23/drivers/block
23721 { 23718 {
23722 if (dev_minor >= MAX_WRITERS) 23719 if (dev_minor >= MAX_WRITERS)
23723 return NULL; 23720 return NULL;
23724diff -urNp linux-2.6.32.23/drivers/char/agp/frontend.c linux-2.6.32.23/drivers/char/agp/frontend.c 23721diff -urNp linux-2.6.32.24/drivers/char/agp/frontend.c linux-2.6.32.24/drivers/char/agp/frontend.c
23725--- linux-2.6.32.23/drivers/char/agp/frontend.c 2010-08-13 16:24:37.000000000 -0400 23722--- linux-2.6.32.24/drivers/char/agp/frontend.c 2010-08-13 16:24:37.000000000 -0400
23726+++ linux-2.6.32.23/drivers/char/agp/frontend.c 2010-09-04 15:54:52.000000000 -0400 23723+++ linux-2.6.32.24/drivers/char/agp/frontend.c 2010-09-04 15:54:52.000000000 -0400
23727@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag 23724@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
23728 if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) 23725 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
23729 return -EFAULT; 23726 return -EFAULT;
@@ -23733,9 +23730,9 @@ diff -urNp linux-2.6.32.23/drivers/char/agp/frontend.c linux-2.6.32.23/drivers/c
23733 return -EFAULT; 23730 return -EFAULT;
23734 23731
23735 client = agp_find_client_by_pid(reserve.pid); 23732 client = agp_find_client_by_pid(reserve.pid);
23736diff -urNp linux-2.6.32.23/drivers/char/agp/intel-agp.c linux-2.6.32.23/drivers/char/agp/intel-agp.c 23733diff -urNp linux-2.6.32.24/drivers/char/agp/intel-agp.c linux-2.6.32.24/drivers/char/agp/intel-agp.c
23737--- linux-2.6.32.23/drivers/char/agp/intel-agp.c 2010-08-13 16:24:37.000000000 -0400 23734--- linux-2.6.32.24/drivers/char/agp/intel-agp.c 2010-08-13 16:24:37.000000000 -0400
23738+++ linux-2.6.32.23/drivers/char/agp/intel-agp.c 2010-09-04 15:54:52.000000000 -0400 23735+++ linux-2.6.32.24/drivers/char/agp/intel-agp.c 2010-09-04 15:54:52.000000000 -0400
23739@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc 23736@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc
23740 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), 23737 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
23741 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), 23738 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
@@ -23745,9 +23742,9 @@ diff -urNp linux-2.6.32.23/drivers/char/agp/intel-agp.c linux-2.6.32.23/drivers/
23745 }; 23742 };
23746 23743
23747 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); 23744 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
23748diff -urNp linux-2.6.32.23/drivers/char/hpet.c linux-2.6.32.23/drivers/char/hpet.c 23745diff -urNp linux-2.6.32.24/drivers/char/hpet.c linux-2.6.32.24/drivers/char/hpet.c
23749--- linux-2.6.32.23/drivers/char/hpet.c 2010-08-13 16:24:37.000000000 -0400 23746--- linux-2.6.32.24/drivers/char/hpet.c 2010-08-13 16:24:37.000000000 -0400
23750+++ linux-2.6.32.23/drivers/char/hpet.c 2010-09-04 15:54:52.000000000 -0400 23747+++ linux-2.6.32.24/drivers/char/hpet.c 2010-09-04 15:54:52.000000000 -0400
23751@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in 23748@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
23752 return 0; 23749 return 0;
23753 } 23750 }
@@ -23775,9 +23772,9 @@ diff -urNp linux-2.6.32.23/drivers/char/hpet.c linux-2.6.32.23/drivers/char/hpet
23775 23772
23776 static int __init hpet_init(void) 23773 static int __init hpet_init(void)
23777 { 23774 {
23778diff -urNp linux-2.6.32.23/drivers/char/hvc_beat.c linux-2.6.32.23/drivers/char/hvc_beat.c 23775diff -urNp linux-2.6.32.24/drivers/char/hvc_beat.c linux-2.6.32.24/drivers/char/hvc_beat.c
23779--- linux-2.6.32.23/drivers/char/hvc_beat.c 2010-08-13 16:24:37.000000000 -0400 23776--- linux-2.6.32.24/drivers/char/hvc_beat.c 2010-08-13 16:24:37.000000000 -0400
23780+++ linux-2.6.32.23/drivers/char/hvc_beat.c 2010-09-04 15:54:52.000000000 -0400 23777+++ linux-2.6.32.24/drivers/char/hvc_beat.c 2010-09-04 15:54:52.000000000 -0400
23781@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v 23778@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
23782 return cnt; 23779 return cnt;
23783 } 23780 }
@@ -23787,9 +23784,9 @@ diff -urNp linux-2.6.32.23/drivers/char/hvc_beat.c linux-2.6.32.23/drivers/char/
23787 .get_chars = hvc_beat_get_chars, 23784 .get_chars = hvc_beat_get_chars,
23788 .put_chars = hvc_beat_put_chars, 23785 .put_chars = hvc_beat_put_chars,
23789 }; 23786 };
23790diff -urNp linux-2.6.32.23/drivers/char/hvc_console.c linux-2.6.32.23/drivers/char/hvc_console.c 23787diff -urNp linux-2.6.32.24/drivers/char/hvc_console.c linux-2.6.32.24/drivers/char/hvc_console.c
23791--- linux-2.6.32.23/drivers/char/hvc_console.c 2010-08-13 16:24:37.000000000 -0400 23788--- linux-2.6.32.24/drivers/char/hvc_console.c 2010-08-13 16:24:37.000000000 -0400
23792+++ linux-2.6.32.23/drivers/char/hvc_console.c 2010-09-04 15:54:52.000000000 -0400 23789+++ linux-2.6.32.24/drivers/char/hvc_console.c 2010-09-04 15:54:52.000000000 -0400
23793@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind 23790@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
23794 * console interfaces but can still be used as a tty device. This has to be 23791 * console interfaces but can still be used as a tty device. This has to be
23795 * static because kmalloc will not work during early console init. 23792 * static because kmalloc will not work during early console init.
@@ -23817,9 +23814,9 @@ diff -urNp linux-2.6.32.23/drivers/char/hvc_console.c linux-2.6.32.23/drivers/ch
23817 { 23814 {
23818 struct hvc_struct *hp; 23815 struct hvc_struct *hp;
23819 int i; 23816 int i;
23820diff -urNp linux-2.6.32.23/drivers/char/hvc_console.h linux-2.6.32.23/drivers/char/hvc_console.h 23817diff -urNp linux-2.6.32.24/drivers/char/hvc_console.h linux-2.6.32.24/drivers/char/hvc_console.h
23821--- linux-2.6.32.23/drivers/char/hvc_console.h 2010-08-13 16:24:37.000000000 -0400 23818--- linux-2.6.32.24/drivers/char/hvc_console.h 2010-08-13 16:24:37.000000000 -0400
23822+++ linux-2.6.32.23/drivers/char/hvc_console.h 2010-09-04 15:54:52.000000000 -0400 23819+++ linux-2.6.32.24/drivers/char/hvc_console.h 2010-09-04 15:54:52.000000000 -0400
23823@@ -55,7 +55,7 @@ struct hvc_struct { 23820@@ -55,7 +55,7 @@ struct hvc_struct {
23824 int outbuf_size; 23821 int outbuf_size;
23825 int n_outbuf; 23822 int n_outbuf;
@@ -23843,9 +23840,9 @@ diff -urNp linux-2.6.32.23/drivers/char/hvc_console.h linux-2.6.32.23/drivers/ch
23843 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ 23840 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
23844 extern int hvc_remove(struct hvc_struct *hp); 23841 extern int hvc_remove(struct hvc_struct *hp);
23845 23842
23846diff -urNp linux-2.6.32.23/drivers/char/hvc_iseries.c linux-2.6.32.23/drivers/char/hvc_iseries.c 23843diff -urNp linux-2.6.32.24/drivers/char/hvc_iseries.c linux-2.6.32.24/drivers/char/hvc_iseries.c
23847--- linux-2.6.32.23/drivers/char/hvc_iseries.c 2010-08-13 16:24:37.000000000 -0400 23844--- linux-2.6.32.24/drivers/char/hvc_iseries.c 2010-08-13 16:24:37.000000000 -0400
23848+++ linux-2.6.32.23/drivers/char/hvc_iseries.c 2010-09-04 15:54:52.000000000 -0400 23845+++ linux-2.6.32.24/drivers/char/hvc_iseries.c 2010-09-04 15:54:52.000000000 -0400
23849@@ -197,7 +197,7 @@ done: 23846@@ -197,7 +197,7 @@ done:
23850 return sent; 23847 return sent;
23851 } 23848 }
@@ -23855,9 +23852,9 @@ diff -urNp linux-2.6.32.23/drivers/char/hvc_iseries.c linux-2.6.32.23/drivers/ch
23855 .get_chars = get_chars, 23852 .get_chars = get_chars,
23856 .put_chars = put_chars, 23853 .put_chars = put_chars,
23857 .notifier_add = notifier_add_irq, 23854 .notifier_add = notifier_add_irq,
23858diff -urNp linux-2.6.32.23/drivers/char/hvc_iucv.c linux-2.6.32.23/drivers/char/hvc_iucv.c 23855diff -urNp linux-2.6.32.24/drivers/char/hvc_iucv.c linux-2.6.32.24/drivers/char/hvc_iucv.c
23859--- linux-2.6.32.23/drivers/char/hvc_iucv.c 2010-08-13 16:24:37.000000000 -0400 23856--- linux-2.6.32.24/drivers/char/hvc_iucv.c 2010-08-13 16:24:37.000000000 -0400
23860+++ linux-2.6.32.23/drivers/char/hvc_iucv.c 2010-09-04 15:54:52.000000000 -0400 23857+++ linux-2.6.32.24/drivers/char/hvc_iucv.c 2010-09-04 15:54:52.000000000 -0400
23861@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru 23858@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
23862 23859
23863 23860
@@ -23867,9 +23864,9 @@ diff -urNp linux-2.6.32.23/drivers/char/hvc_iucv.c linux-2.6.32.23/drivers/char/
23867 .get_chars = hvc_iucv_get_chars, 23864 .get_chars = hvc_iucv_get_chars,
23868 .put_chars = hvc_iucv_put_chars, 23865 .put_chars = hvc_iucv_put_chars,
23869 .notifier_add = hvc_iucv_notifier_add, 23866 .notifier_add = hvc_iucv_notifier_add,
23870diff -urNp linux-2.6.32.23/drivers/char/hvc_rtas.c linux-2.6.32.23/drivers/char/hvc_rtas.c 23867diff -urNp linux-2.6.32.24/drivers/char/hvc_rtas.c linux-2.6.32.24/drivers/char/hvc_rtas.c
23871--- linux-2.6.32.23/drivers/char/hvc_rtas.c 2010-08-13 16:24:37.000000000 -0400 23868--- linux-2.6.32.24/drivers/char/hvc_rtas.c 2010-08-13 16:24:37.000000000 -0400
23872+++ linux-2.6.32.23/drivers/char/hvc_rtas.c 2010-09-04 15:54:52.000000000 -0400 23869+++ linux-2.6.32.24/drivers/char/hvc_rtas.c 2010-09-04 15:54:52.000000000 -0400
23873@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ 23870@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
23874 return i; 23871 return i;
23875 } 23872 }
@@ -23879,9 +23876,9 @@ diff -urNp linux-2.6.32.23/drivers/char/hvc_rtas.c linux-2.6.32.23/drivers/char/
23879 .get_chars = hvc_rtas_read_console, 23876 .get_chars = hvc_rtas_read_console,
23880 .put_chars = hvc_rtas_write_console, 23877 .put_chars = hvc_rtas_write_console,
23881 }; 23878 };
23882diff -urNp linux-2.6.32.23/drivers/char/hvcs.c linux-2.6.32.23/drivers/char/hvcs.c 23879diff -urNp linux-2.6.32.24/drivers/char/hvcs.c linux-2.6.32.24/drivers/char/hvcs.c
23883--- linux-2.6.32.23/drivers/char/hvcs.c 2010-08-13 16:24:37.000000000 -0400 23880--- linux-2.6.32.24/drivers/char/hvcs.c 2010-08-13 16:24:37.000000000 -0400
23884+++ linux-2.6.32.23/drivers/char/hvcs.c 2010-09-04 15:54:52.000000000 -0400 23881+++ linux-2.6.32.24/drivers/char/hvcs.c 2010-09-04 15:54:52.000000000 -0400
23885@@ -269,7 +269,7 @@ struct hvcs_struct { 23882@@ -269,7 +269,7 @@ struct hvcs_struct {
23886 unsigned int index; 23883 unsigned int index;
23887 23884
@@ -23976,9 +23973,9 @@ diff -urNp linux-2.6.32.23/drivers/char/hvcs.c linux-2.6.32.23/drivers/char/hvcs
23976 return 0; 23973 return 0;
23977 23974
23978 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; 23975 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
23979diff -urNp linux-2.6.32.23/drivers/char/hvc_udbg.c linux-2.6.32.23/drivers/char/hvc_udbg.c 23976diff -urNp linux-2.6.32.24/drivers/char/hvc_udbg.c linux-2.6.32.24/drivers/char/hvc_udbg.c
23980--- linux-2.6.32.23/drivers/char/hvc_udbg.c 2010-08-13 16:24:37.000000000 -0400 23977--- linux-2.6.32.24/drivers/char/hvc_udbg.c 2010-08-13 16:24:37.000000000 -0400
23981+++ linux-2.6.32.23/drivers/char/hvc_udbg.c 2010-09-04 15:54:52.000000000 -0400 23978+++ linux-2.6.32.24/drivers/char/hvc_udbg.c 2010-09-04 15:54:52.000000000 -0400
23982@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno 23979@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
23983 return i; 23980 return i;
23984 } 23981 }
@@ -23988,9 +23985,9 @@ diff -urNp linux-2.6.32.23/drivers/char/hvc_udbg.c linux-2.6.32.23/drivers/char/
23988 .get_chars = hvc_udbg_get, 23985 .get_chars = hvc_udbg_get,
23989 .put_chars = hvc_udbg_put, 23986 .put_chars = hvc_udbg_put,
23990 }; 23987 };
23991diff -urNp linux-2.6.32.23/drivers/char/hvc_vio.c linux-2.6.32.23/drivers/char/hvc_vio.c 23988diff -urNp linux-2.6.32.24/drivers/char/hvc_vio.c linux-2.6.32.24/drivers/char/hvc_vio.c
23992--- linux-2.6.32.23/drivers/char/hvc_vio.c 2010-08-13 16:24:37.000000000 -0400 23989--- linux-2.6.32.24/drivers/char/hvc_vio.c 2010-08-13 16:24:37.000000000 -0400
23993+++ linux-2.6.32.23/drivers/char/hvc_vio.c 2010-09-04 15:54:52.000000000 -0400 23990+++ linux-2.6.32.24/drivers/char/hvc_vio.c 2010-09-04 15:54:52.000000000 -0400
23994@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v 23991@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
23995 return got; 23992 return got;
23996 } 23993 }
@@ -24000,9 +23997,9 @@ diff -urNp linux-2.6.32.23/drivers/char/hvc_vio.c linux-2.6.32.23/drivers/char/h
24000 .get_chars = filtered_get_chars, 23997 .get_chars = filtered_get_chars,
24001 .put_chars = hvc_put_chars, 23998 .put_chars = hvc_put_chars,
24002 .notifier_add = notifier_add_irq, 23999 .notifier_add = notifier_add_irq,
24003diff -urNp linux-2.6.32.23/drivers/char/hvc_xen.c linux-2.6.32.23/drivers/char/hvc_xen.c 24000diff -urNp linux-2.6.32.24/drivers/char/hvc_xen.c linux-2.6.32.24/drivers/char/hvc_xen.c
24004--- linux-2.6.32.23/drivers/char/hvc_xen.c 2010-08-13 16:24:37.000000000 -0400 24001--- linux-2.6.32.24/drivers/char/hvc_xen.c 2010-08-13 16:24:37.000000000 -0400
24005+++ linux-2.6.32.23/drivers/char/hvc_xen.c 2010-09-04 15:54:52.000000000 -0400 24002+++ linux-2.6.32.24/drivers/char/hvc_xen.c 2010-09-04 15:54:52.000000000 -0400
24006@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno 24003@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
24007 return recv; 24004 return recv;
24008 } 24005 }
@@ -24012,9 +24009,9 @@ diff -urNp linux-2.6.32.23/drivers/char/hvc_xen.c linux-2.6.32.23/drivers/char/h
24012 .get_chars = read_console, 24009 .get_chars = read_console,
24013 .put_chars = write_console, 24010 .put_chars = write_console,
24014 .notifier_add = notifier_add_irq, 24011 .notifier_add = notifier_add_irq,
24015diff -urNp linux-2.6.32.23/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.23/drivers/char/ipmi/ipmi_msghandler.c 24012diff -urNp linux-2.6.32.24/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.24/drivers/char/ipmi/ipmi_msghandler.c
24016--- linux-2.6.32.23/drivers/char/ipmi/ipmi_msghandler.c 2010-08-13 16:24:37.000000000 -0400 24013--- linux-2.6.32.24/drivers/char/ipmi/ipmi_msghandler.c 2010-08-13 16:24:37.000000000 -0400
24017+++ linux-2.6.32.23/drivers/char/ipmi/ipmi_msghandler.c 2010-09-04 15:54:52.000000000 -0400 24014+++ linux-2.6.32.24/drivers/char/ipmi/ipmi_msghandler.c 2010-09-04 15:54:52.000000000 -0400
24018@@ -414,7 +414,7 @@ struct ipmi_smi { 24015@@ -414,7 +414,7 @@ struct ipmi_smi {
24019 struct proc_dir_entry *proc_dir; 24016 struct proc_dir_entry *proc_dir;
24020 char proc_dir_name[10]; 24017 char proc_dir_name[10];
@@ -24045,9 +24042,9 @@ diff -urNp linux-2.6.32.23/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.23/d
24045 24042
24046 intf->proc_dir = NULL; 24043 intf->proc_dir = NULL;
24047 24044
24048diff -urNp linux-2.6.32.23/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.23/drivers/char/ipmi/ipmi_si_intf.c 24045diff -urNp linux-2.6.32.24/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.24/drivers/char/ipmi/ipmi_si_intf.c
24049--- linux-2.6.32.23/drivers/char/ipmi/ipmi_si_intf.c 2010-08-13 16:24:37.000000000 -0400 24046--- linux-2.6.32.24/drivers/char/ipmi/ipmi_si_intf.c 2010-08-13 16:24:37.000000000 -0400
24050+++ linux-2.6.32.23/drivers/char/ipmi/ipmi_si_intf.c 2010-09-04 15:54:52.000000000 -0400 24047+++ linux-2.6.32.24/drivers/char/ipmi/ipmi_si_intf.c 2010-09-04 15:54:52.000000000 -0400
24051@@ -277,7 +277,7 @@ struct smi_info { 24048@@ -277,7 +277,7 @@ struct smi_info {
24052 unsigned char slave_addr; 24049 unsigned char slave_addr;
24053 24050
@@ -24078,9 +24075,9 @@ diff -urNp linux-2.6.32.23/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.23/driv
24078 24075
24079 new_smi->interrupt_disabled = 0; 24076 new_smi->interrupt_disabled = 0;
24080 atomic_set(&new_smi->stop_operation, 0); 24077 atomic_set(&new_smi->stop_operation, 0);
24081diff -urNp linux-2.6.32.23/drivers/char/keyboard.c linux-2.6.32.23/drivers/char/keyboard.c 24078diff -urNp linux-2.6.32.24/drivers/char/keyboard.c linux-2.6.32.24/drivers/char/keyboard.c
24082--- linux-2.6.32.23/drivers/char/keyboard.c 2010-08-13 16:24:37.000000000 -0400 24079--- linux-2.6.32.24/drivers/char/keyboard.c 2010-08-13 16:24:37.000000000 -0400
24083+++ linux-2.6.32.23/drivers/char/keyboard.c 2010-09-04 15:54:52.000000000 -0400 24080+++ linux-2.6.32.24/drivers/char/keyboard.c 2010-09-04 15:54:52.000000000 -0400
24084@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u 24081@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
24085 kbd->kbdmode == VC_MEDIUMRAW) && 24082 kbd->kbdmode == VC_MEDIUMRAW) &&
24086 value != KVAL(K_SAK)) 24083 value != KVAL(K_SAK))
@@ -24107,9 +24104,9 @@ diff -urNp linux-2.6.32.23/drivers/char/keyboard.c linux-2.6.32.23/drivers/char/
24107 }; 24104 };
24108 24105
24109 MODULE_DEVICE_TABLE(input, kbd_ids); 24106 MODULE_DEVICE_TABLE(input, kbd_ids);
24110diff -urNp linux-2.6.32.23/drivers/char/mem.c linux-2.6.32.23/drivers/char/mem.c 24107diff -urNp linux-2.6.32.24/drivers/char/mem.c linux-2.6.32.24/drivers/char/mem.c
24111--- linux-2.6.32.23/drivers/char/mem.c 2010-09-26 17:26:05.000000000 -0400 24108--- linux-2.6.32.24/drivers/char/mem.c 2010-09-26 17:26:05.000000000 -0400
24112+++ linux-2.6.32.23/drivers/char/mem.c 2010-09-26 17:26:38.000000000 -0400 24109+++ linux-2.6.32.24/drivers/char/mem.c 2010-09-26 17:26:38.000000000 -0400
24113@@ -18,6 +18,7 @@ 24110@@ -18,6 +18,7 @@
24114 #include <linux/raw.h> 24111 #include <linux/raw.h>
24115 #include <linux/tty.h> 24112 #include <linux/tty.h>
@@ -24286,9 +24283,9 @@ diff -urNp linux-2.6.32.23/drivers/char/mem.c linux-2.6.32.23/drivers/char/mem.c
24286 }; 24283 };
24287 24284
24288 static int memory_open(struct inode *inode, struct file *filp) 24285 static int memory_open(struct inode *inode, struct file *filp)
24289diff -urNp linux-2.6.32.23/drivers/char/nvram.c linux-2.6.32.23/drivers/char/nvram.c 24286diff -urNp linux-2.6.32.24/drivers/char/nvram.c linux-2.6.32.24/drivers/char/nvram.c
24290--- linux-2.6.32.23/drivers/char/nvram.c 2010-08-13 16:24:37.000000000 -0400 24287--- linux-2.6.32.24/drivers/char/nvram.c 2010-08-13 16:24:37.000000000 -0400
24291+++ linux-2.6.32.23/drivers/char/nvram.c 2010-09-04 15:54:52.000000000 -0400 24288+++ linux-2.6.32.24/drivers/char/nvram.c 2010-09-04 15:54:52.000000000 -0400
24292@@ -435,7 +435,10 @@ static const struct file_operations nvra 24289@@ -435,7 +435,10 @@ static const struct file_operations nvra
24293 static struct miscdevice nvram_dev = { 24290 static struct miscdevice nvram_dev = {
24294 NVRAM_MINOR, 24291 NVRAM_MINOR,
@@ -24301,9 +24298,9 @@ diff -urNp linux-2.6.32.23/drivers/char/nvram.c linux-2.6.32.23/drivers/char/nvr
24301 }; 24298 };
24302 24299
24303 static int __init nvram_init(void) 24300 static int __init nvram_init(void)
24304diff -urNp linux-2.6.32.23/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.23/drivers/char/pcmcia/ipwireless/tty.c 24301diff -urNp linux-2.6.32.24/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.24/drivers/char/pcmcia/ipwireless/tty.c
24305--- linux-2.6.32.23/drivers/char/pcmcia/ipwireless/tty.c 2010-08-13 16:24:37.000000000 -0400 24302--- linux-2.6.32.24/drivers/char/pcmcia/ipwireless/tty.c 2010-08-13 16:24:37.000000000 -0400
24306+++ linux-2.6.32.23/drivers/char/pcmcia/ipwireless/tty.c 2010-09-04 15:54:52.000000000 -0400 24303+++ linux-2.6.32.24/drivers/char/pcmcia/ipwireless/tty.c 2010-09-04 15:54:52.000000000 -0400
24307@@ -51,7 +51,7 @@ struct ipw_tty { 24304@@ -51,7 +51,7 @@ struct ipw_tty {
24308 int tty_type; 24305 int tty_type;
24309 struct ipw_network *network; 24306 struct ipw_network *network;
@@ -24418,9 +24415,9 @@ diff -urNp linux-2.6.32.23/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.23/
24418 do_ipw_close(ttyj); 24415 do_ipw_close(ttyj);
24419 ipwireless_disassociate_network_ttys(network, 24416 ipwireless_disassociate_network_ttys(network,
24420 ttyj->channel_idx); 24417 ttyj->channel_idx);
24421diff -urNp linux-2.6.32.23/drivers/char/pty.c linux-2.6.32.23/drivers/char/pty.c 24418diff -urNp linux-2.6.32.24/drivers/char/pty.c linux-2.6.32.24/drivers/char/pty.c
24422--- linux-2.6.32.23/drivers/char/pty.c 2010-08-13 16:24:37.000000000 -0400 24419--- linux-2.6.32.24/drivers/char/pty.c 2010-08-13 16:24:37.000000000 -0400
24423+++ linux-2.6.32.23/drivers/char/pty.c 2010-09-04 15:54:52.000000000 -0400 24420+++ linux-2.6.32.24/drivers/char/pty.c 2010-09-04 15:54:52.000000000 -0400
24424@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode 24421@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
24425 return ret; 24422 return ret;
24426 } 24423 }
@@ -24451,9 +24448,9 @@ diff -urNp linux-2.6.32.23/drivers/char/pty.c linux-2.6.32.23/drivers/char/pty.c
24451 cdev_init(&ptmx_cdev, &ptmx_fops); 24448 cdev_init(&ptmx_cdev, &ptmx_fops);
24452 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || 24449 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
24453 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) 24450 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
24454diff -urNp linux-2.6.32.23/drivers/char/random.c linux-2.6.32.23/drivers/char/random.c 24451diff -urNp linux-2.6.32.24/drivers/char/random.c linux-2.6.32.24/drivers/char/random.c
24455--- linux-2.6.32.23/drivers/char/random.c 2010-08-13 16:24:37.000000000 -0400 24452--- linux-2.6.32.24/drivers/char/random.c 2010-08-13 16:24:37.000000000 -0400
24456+++ linux-2.6.32.23/drivers/char/random.c 2010-09-04 15:54:52.000000000 -0400 24453+++ linux-2.6.32.24/drivers/char/random.c 2010-09-04 15:54:52.000000000 -0400
24457@@ -254,8 +254,13 @@ 24454@@ -254,8 +254,13 @@
24458 /* 24455 /*
24459 * Configuration information 24456 * Configuration information
@@ -24495,9 +24492,9 @@ diff -urNp linux-2.6.32.23/drivers/char/random.c linux-2.6.32.23/drivers/char/ra
24495 static int max_write_thresh = INPUT_POOL_WORDS * 32; 24492 static int max_write_thresh = INPUT_POOL_WORDS * 32;
24496 static char sysctl_bootid[16]; 24493 static char sysctl_bootid[16];
24497 24494
24498diff -urNp linux-2.6.32.23/drivers/char/sonypi.c linux-2.6.32.23/drivers/char/sonypi.c 24495diff -urNp linux-2.6.32.24/drivers/char/sonypi.c linux-2.6.32.24/drivers/char/sonypi.c
24499--- linux-2.6.32.23/drivers/char/sonypi.c 2010-08-13 16:24:37.000000000 -0400 24496--- linux-2.6.32.24/drivers/char/sonypi.c 2010-08-13 16:24:37.000000000 -0400
24500+++ linux-2.6.32.23/drivers/char/sonypi.c 2010-09-04 15:54:52.000000000 -0400 24497+++ linux-2.6.32.24/drivers/char/sonypi.c 2010-09-04 15:54:52.000000000 -0400
24501@@ -491,7 +491,7 @@ static struct sonypi_device { 24498@@ -491,7 +491,7 @@ static struct sonypi_device {
24502 spinlock_t fifo_lock; 24499 spinlock_t fifo_lock;
24503 wait_queue_head_t fifo_proc_list; 24500 wait_queue_head_t fifo_proc_list;
@@ -24528,9 +24525,9 @@ diff -urNp linux-2.6.32.23/drivers/char/sonypi.c linux-2.6.32.23/drivers/char/so
24528 mutex_unlock(&sonypi_device.lock); 24525 mutex_unlock(&sonypi_device.lock);
24529 unlock_kernel(); 24526 unlock_kernel();
24530 return 0; 24527 return 0;
24531diff -urNp linux-2.6.32.23/drivers/char/tpm/tpm_bios.c linux-2.6.32.23/drivers/char/tpm/tpm_bios.c 24528diff -urNp linux-2.6.32.24/drivers/char/tpm/tpm_bios.c linux-2.6.32.24/drivers/char/tpm/tpm_bios.c
24532--- linux-2.6.32.23/drivers/char/tpm/tpm_bios.c 2010-08-13 16:24:37.000000000 -0400 24529--- linux-2.6.32.24/drivers/char/tpm/tpm_bios.c 2010-08-13 16:24:37.000000000 -0400
24533+++ linux-2.6.32.23/drivers/char/tpm/tpm_bios.c 2010-09-04 15:54:52.000000000 -0400 24530+++ linux-2.6.32.24/drivers/char/tpm/tpm_bios.c 2010-09-04 15:54:52.000000000 -0400
24534@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start 24531@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
24535 event = addr; 24532 event = addr;
24536 24533
@@ -24571,9 +24568,9 @@ diff -urNp linux-2.6.32.23/drivers/char/tpm/tpm_bios.c linux-2.6.32.23/drivers/c
24571 24568
24572 memcpy(log->bios_event_log, virt, len); 24569 memcpy(log->bios_event_log, virt, len);
24573 24570
24574diff -urNp linux-2.6.32.23/drivers/char/tty_io.c linux-2.6.32.23/drivers/char/tty_io.c 24571diff -urNp linux-2.6.32.24/drivers/char/tty_io.c linux-2.6.32.24/drivers/char/tty_io.c
24575--- linux-2.6.32.23/drivers/char/tty_io.c 2010-08-13 16:24:37.000000000 -0400 24572--- linux-2.6.32.24/drivers/char/tty_io.c 2010-08-13 16:24:37.000000000 -0400
24576+++ linux-2.6.32.23/drivers/char/tty_io.c 2010-09-04 15:54:52.000000000 -0400 24573+++ linux-2.6.32.24/drivers/char/tty_io.c 2010-09-04 15:54:52.000000000 -0400
24577@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list 24574@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
24578 DEFINE_MUTEX(tty_mutex); 24575 DEFINE_MUTEX(tty_mutex);
24579 EXPORT_SYMBOL(tty_mutex); 24576 EXPORT_SYMBOL(tty_mutex);
@@ -24712,9 +24709,9 @@ diff -urNp linux-2.6.32.23/drivers/char/tty_io.c linux-2.6.32.23/drivers/char/tt
24712 /* 24709 /*
24713 * Initialize the console device. This is called *early*, so 24710 * Initialize the console device. This is called *early*, so
24714 * we can't necessarily depend on lots of kernel help here. 24711 * we can't necessarily depend on lots of kernel help here.
24715diff -urNp linux-2.6.32.23/drivers/char/tty_ldisc.c linux-2.6.32.23/drivers/char/tty_ldisc.c 24712diff -urNp linux-2.6.32.24/drivers/char/tty_ldisc.c linux-2.6.32.24/drivers/char/tty_ldisc.c
24716--- linux-2.6.32.23/drivers/char/tty_ldisc.c 2010-08-13 16:24:37.000000000 -0400 24713--- linux-2.6.32.24/drivers/char/tty_ldisc.c 2010-08-13 16:24:37.000000000 -0400
24717+++ linux-2.6.32.23/drivers/char/tty_ldisc.c 2010-09-04 15:54:52.000000000 -0400 24714+++ linux-2.6.32.24/drivers/char/tty_ldisc.c 2010-09-04 15:54:52.000000000 -0400
24718@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * 24715@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc *
24719 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { 24716 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
24720 struct tty_ldisc_ops *ldo = ld->ops; 24717 struct tty_ldisc_ops *ldo = ld->ops;
@@ -24760,9 +24757,9 @@ diff -urNp linux-2.6.32.23/drivers/char/tty_ldisc.c linux-2.6.32.23/drivers/char
24760 module_put(ldops->owner); 24757 module_put(ldops->owner);
24761 spin_unlock_irqrestore(&tty_ldisc_lock, flags); 24758 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
24762 } 24759 }
24763diff -urNp linux-2.6.32.23/drivers/char/virtio_console.c linux-2.6.32.23/drivers/char/virtio_console.c 24760diff -urNp linux-2.6.32.24/drivers/char/virtio_console.c linux-2.6.32.24/drivers/char/virtio_console.c
24764--- linux-2.6.32.23/drivers/char/virtio_console.c 2010-08-13 16:24:37.000000000 -0400 24761--- linux-2.6.32.24/drivers/char/virtio_console.c 2010-08-13 16:24:37.000000000 -0400
24765+++ linux-2.6.32.23/drivers/char/virtio_console.c 2010-09-04 15:54:52.000000000 -0400 24762+++ linux-2.6.32.24/drivers/char/virtio_console.c 2010-09-04 15:54:52.000000000 -0400
24766@@ -44,6 +44,7 @@ static unsigned int in_len; 24763@@ -44,6 +44,7 @@ static unsigned int in_len;
24767 static char *in, *inbuf; 24764 static char *in, *inbuf;
24768 24765
@@ -24771,9 +24768,9 @@ diff -urNp linux-2.6.32.23/drivers/char/virtio_console.c linux-2.6.32.23/drivers
24771 static struct hv_ops virtio_cons; 24768 static struct hv_ops virtio_cons;
24772 24769
24773 /* The hvc device */ 24770 /* The hvc device */
24774diff -urNp linux-2.6.32.23/drivers/char/vt_ioctl.c linux-2.6.32.23/drivers/char/vt_ioctl.c 24771diff -urNp linux-2.6.32.24/drivers/char/vt_ioctl.c linux-2.6.32.24/drivers/char/vt_ioctl.c
24775--- linux-2.6.32.23/drivers/char/vt_ioctl.c 2010-08-13 16:24:37.000000000 -0400 24772--- linux-2.6.32.24/drivers/char/vt_ioctl.c 2010-08-13 16:24:37.000000000 -0400
24776+++ linux-2.6.32.23/drivers/char/vt_ioctl.c 2010-09-04 15:54:52.000000000 -0400 24773+++ linux-2.6.32.24/drivers/char/vt_ioctl.c 2010-09-04 15:54:52.000000000 -0400
24777@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ 24774@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
24778 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) 24775 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
24779 return -EFAULT; 24776 return -EFAULT;
@@ -24817,9 +24814,9 @@ diff -urNp linux-2.6.32.23/drivers/char/vt_ioctl.c linux-2.6.32.23/drivers/char/
24817 if (!perm) { 24814 if (!perm) {
24818 ret = -EPERM; 24815 ret = -EPERM;
24819 goto reterr; 24816 goto reterr;
24820diff -urNp linux-2.6.32.23/drivers/cpufreq/cpufreq.c linux-2.6.32.23/drivers/cpufreq/cpufreq.c 24817diff -urNp linux-2.6.32.24/drivers/cpufreq/cpufreq.c linux-2.6.32.24/drivers/cpufreq/cpufreq.c
24821--- linux-2.6.32.23/drivers/cpufreq/cpufreq.c 2010-08-13 16:24:37.000000000 -0400 24818--- linux-2.6.32.24/drivers/cpufreq/cpufreq.c 2010-08-13 16:24:37.000000000 -0400
24822+++ linux-2.6.32.23/drivers/cpufreq/cpufreq.c 2010-09-04 15:54:52.000000000 -0400 24819+++ linux-2.6.32.24/drivers/cpufreq/cpufreq.c 2010-09-04 15:54:52.000000000 -0400
24823@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct 24820@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
24824 complete(&policy->kobj_unregister); 24821 complete(&policy->kobj_unregister);
24825 } 24822 }
@@ -24829,9 +24826,9 @@ diff -urNp linux-2.6.32.23/drivers/cpufreq/cpufreq.c linux-2.6.32.23/drivers/cpu
24829 .show = show, 24826 .show = show,
24830 .store = store, 24827 .store = store,
24831 }; 24828 };
24832diff -urNp linux-2.6.32.23/drivers/cpuidle/sysfs.c linux-2.6.32.23/drivers/cpuidle/sysfs.c 24829diff -urNp linux-2.6.32.24/drivers/cpuidle/sysfs.c linux-2.6.32.24/drivers/cpuidle/sysfs.c
24833--- linux-2.6.32.23/drivers/cpuidle/sysfs.c 2010-08-13 16:24:37.000000000 -0400 24830--- linux-2.6.32.24/drivers/cpuidle/sysfs.c 2010-08-13 16:24:37.000000000 -0400
24834+++ linux-2.6.32.23/drivers/cpuidle/sysfs.c 2010-09-04 15:54:52.000000000 -0400 24831+++ linux-2.6.32.24/drivers/cpuidle/sysfs.c 2010-09-04 15:54:52.000000000 -0400
24835@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj 24832@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
24836 return ret; 24833 return ret;
24837 } 24834 }
@@ -24859,9 +24856,9 @@ diff -urNp linux-2.6.32.23/drivers/cpuidle/sysfs.c linux-2.6.32.23/drivers/cpuid
24859 { 24856 {
24860 kobject_put(&device->kobjs[i]->kobj); 24857 kobject_put(&device->kobjs[i]->kobj);
24861 wait_for_completion(&device->kobjs[i]->kobj_unregister); 24858 wait_for_completion(&device->kobjs[i]->kobj_unregister);
24862diff -urNp linux-2.6.32.23/drivers/dma/ioat/dma.c linux-2.6.32.23/drivers/dma/ioat/dma.c 24859diff -urNp linux-2.6.32.24/drivers/dma/ioat/dma.c linux-2.6.32.24/drivers/dma/ioat/dma.c
24863--- linux-2.6.32.23/drivers/dma/ioat/dma.c 2010-08-13 16:24:37.000000000 -0400 24860--- linux-2.6.32.24/drivers/dma/ioat/dma.c 2010-08-13 16:24:37.000000000 -0400
24864+++ linux-2.6.32.23/drivers/dma/ioat/dma.c 2010-09-04 15:54:52.000000000 -0400 24861+++ linux-2.6.32.24/drivers/dma/ioat/dma.c 2010-09-04 15:54:52.000000000 -0400
24865@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str 24862@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
24866 return entry->show(&chan->common, page); 24863 return entry->show(&chan->common, page);
24867 } 24864 }
@@ -24871,9 +24868,9 @@ diff -urNp linux-2.6.32.23/drivers/dma/ioat/dma.c linux-2.6.32.23/drivers/dma/io
24871 .show = ioat_attr_show, 24868 .show = ioat_attr_show,
24872 }; 24869 };
24873 24870
24874diff -urNp linux-2.6.32.23/drivers/dma/ioat/dma.h linux-2.6.32.23/drivers/dma/ioat/dma.h 24871diff -urNp linux-2.6.32.24/drivers/dma/ioat/dma.h linux-2.6.32.24/drivers/dma/ioat/dma.h
24875--- linux-2.6.32.23/drivers/dma/ioat/dma.h 2010-08-13 16:24:37.000000000 -0400 24872--- linux-2.6.32.24/drivers/dma/ioat/dma.h 2010-08-13 16:24:37.000000000 -0400
24876+++ linux-2.6.32.23/drivers/dma/ioat/dma.h 2010-09-04 15:54:52.000000000 -0400 24873+++ linux-2.6.32.24/drivers/dma/ioat/dma.h 2010-09-04 15:54:52.000000000 -0400
24877@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c 24874@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
24878 unsigned long *phys_complete); 24875 unsigned long *phys_complete);
24879 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); 24876 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
@@ -24883,9 +24880,9 @@ diff -urNp linux-2.6.32.23/drivers/dma/ioat/dma.h linux-2.6.32.23/drivers/dma/io
24883 extern struct ioat_sysfs_entry ioat_version_attr; 24880 extern struct ioat_sysfs_entry ioat_version_attr;
24884 extern struct ioat_sysfs_entry ioat_cap_attr; 24881 extern struct ioat_sysfs_entry ioat_cap_attr;
24885 #endif /* IOATDMA_H */ 24882 #endif /* IOATDMA_H */
24886diff -urNp linux-2.6.32.23/drivers/edac/edac_core.h linux-2.6.32.23/drivers/edac/edac_core.h 24883diff -urNp linux-2.6.32.24/drivers/edac/edac_core.h linux-2.6.32.24/drivers/edac/edac_core.h
24887--- linux-2.6.32.23/drivers/edac/edac_core.h 2010-08-13 16:24:37.000000000 -0400 24884--- linux-2.6.32.24/drivers/edac/edac_core.h 2010-08-13 16:24:37.000000000 -0400
24888+++ linux-2.6.32.23/drivers/edac/edac_core.h 2010-09-04 15:54:52.000000000 -0400 24885+++ linux-2.6.32.24/drivers/edac/edac_core.h 2010-09-04 15:54:52.000000000 -0400
24889@@ -99,11 +99,11 @@ extern int edac_debug_level; 24886@@ -99,11 +99,11 @@ extern int edac_debug_level;
24890 24887
24891 #else /* !CONFIG_EDAC_DEBUG */ 24888 #else /* !CONFIG_EDAC_DEBUG */
@@ -24903,9 +24900,9 @@ diff -urNp linux-2.6.32.23/drivers/edac/edac_core.h linux-2.6.32.23/drivers/edac
24903 24900
24904 #endif /* !CONFIG_EDAC_DEBUG */ 24901 #endif /* !CONFIG_EDAC_DEBUG */
24905 24902
24906diff -urNp linux-2.6.32.23/drivers/edac/edac_device_sysfs.c linux-2.6.32.23/drivers/edac/edac_device_sysfs.c 24903diff -urNp linux-2.6.32.24/drivers/edac/edac_device_sysfs.c linux-2.6.32.24/drivers/edac/edac_device_sysfs.c
24907--- linux-2.6.32.23/drivers/edac/edac_device_sysfs.c 2010-08-13 16:24:37.000000000 -0400 24904--- linux-2.6.32.24/drivers/edac/edac_device_sysfs.c 2010-08-13 16:24:37.000000000 -0400
24908+++ linux-2.6.32.23/drivers/edac/edac_device_sysfs.c 2010-09-04 15:54:52.000000000 -0400 24905+++ linux-2.6.32.24/drivers/edac/edac_device_sysfs.c 2010-09-04 15:54:52.000000000 -0400
24909@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s 24906@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
24910 } 24907 }
24911 24908
@@ -24933,9 +24930,9 @@ diff -urNp linux-2.6.32.23/drivers/edac/edac_device_sysfs.c linux-2.6.32.23/driv
24933 .show = edac_dev_block_show, 24930 .show = edac_dev_block_show,
24934 .store = edac_dev_block_store 24931 .store = edac_dev_block_store
24935 }; 24932 };
24936diff -urNp linux-2.6.32.23/drivers/edac/edac_mc_sysfs.c linux-2.6.32.23/drivers/edac/edac_mc_sysfs.c 24933diff -urNp linux-2.6.32.24/drivers/edac/edac_mc_sysfs.c linux-2.6.32.24/drivers/edac/edac_mc_sysfs.c
24937--- linux-2.6.32.23/drivers/edac/edac_mc_sysfs.c 2010-08-13 16:24:37.000000000 -0400 24934--- linux-2.6.32.24/drivers/edac/edac_mc_sysfs.c 2010-08-13 16:24:37.000000000 -0400
24938+++ linux-2.6.32.23/drivers/edac/edac_mc_sysfs.c 2010-09-04 15:54:52.000000000 -0400 24935+++ linux-2.6.32.24/drivers/edac/edac_mc_sysfs.c 2010-09-04 15:54:52.000000000 -0400
24939@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob 24936@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
24940 return -EIO; 24937 return -EIO;
24941 } 24938 }
@@ -24954,9 +24951,9 @@ diff -urNp linux-2.6.32.23/drivers/edac/edac_mc_sysfs.c linux-2.6.32.23/drivers/
24954 .show = mcidev_show, 24951 .show = mcidev_show,
24955 .store = mcidev_store 24952 .store = mcidev_store
24956 }; 24953 };
24957diff -urNp linux-2.6.32.23/drivers/edac/edac_pci_sysfs.c linux-2.6.32.23/drivers/edac/edac_pci_sysfs.c 24954diff -urNp linux-2.6.32.24/drivers/edac/edac_pci_sysfs.c linux-2.6.32.24/drivers/edac/edac_pci_sysfs.c
24958--- linux-2.6.32.23/drivers/edac/edac_pci_sysfs.c 2010-08-13 16:24:37.000000000 -0400 24955--- linux-2.6.32.24/drivers/edac/edac_pci_sysfs.c 2010-08-13 16:24:37.000000000 -0400
24959+++ linux-2.6.32.23/drivers/edac/edac_pci_sysfs.c 2010-09-04 15:54:52.000000000 -0400 24956+++ linux-2.6.32.24/drivers/edac/edac_pci_sysfs.c 2010-09-04 15:54:52.000000000 -0400
24960@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s 24957@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
24961 } 24958 }
24962 24959
@@ -24975,9 +24972,9 @@ diff -urNp linux-2.6.32.23/drivers/edac/edac_pci_sysfs.c linux-2.6.32.23/drivers
24975 .show = edac_pci_dev_show, 24972 .show = edac_pci_dev_show,
24976 .store = edac_pci_dev_store 24973 .store = edac_pci_dev_store
24977 }; 24974 };
24978diff -urNp linux-2.6.32.23/drivers/firewire/core-cdev.c linux-2.6.32.23/drivers/firewire/core-cdev.c 24975diff -urNp linux-2.6.32.24/drivers/firewire/core-cdev.c linux-2.6.32.24/drivers/firewire/core-cdev.c
24979--- linux-2.6.32.23/drivers/firewire/core-cdev.c 2010-08-13 16:24:37.000000000 -0400 24976--- linux-2.6.32.24/drivers/firewire/core-cdev.c 2010-08-13 16:24:37.000000000 -0400
24980+++ linux-2.6.32.23/drivers/firewire/core-cdev.c 2010-09-04 15:54:52.000000000 -0400 24977+++ linux-2.6.32.24/drivers/firewire/core-cdev.c 2010-09-04 15:54:52.000000000 -0400
24981@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie 24978@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
24982 int ret; 24979 int ret;
24983 24980
@@ -24988,9 +24985,9 @@ diff -urNp linux-2.6.32.23/drivers/firewire/core-cdev.c linux-2.6.32.23/drivers/
24988 return -EINVAL; 24985 return -EINVAL;
24989 24986
24990 r = kmalloc(sizeof(*r), GFP_KERNEL); 24987 r = kmalloc(sizeof(*r), GFP_KERNEL);
24991diff -urNp linux-2.6.32.23/drivers/firmware/dmi_scan.c linux-2.6.32.23/drivers/firmware/dmi_scan.c 24988diff -urNp linux-2.6.32.24/drivers/firmware/dmi_scan.c linux-2.6.32.24/drivers/firmware/dmi_scan.c
24992--- linux-2.6.32.23/drivers/firmware/dmi_scan.c 2010-08-13 16:24:37.000000000 -0400 24989--- linux-2.6.32.24/drivers/firmware/dmi_scan.c 2010-08-13 16:24:37.000000000 -0400
24993+++ linux-2.6.32.23/drivers/firmware/dmi_scan.c 2010-09-04 15:54:52.000000000 -0400 24990+++ linux-2.6.32.24/drivers/firmware/dmi_scan.c 2010-09-04 15:54:52.000000000 -0400
24994@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) 24991@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
24995 } 24992 }
24996 } 24993 }
@@ -25003,9 +25000,9 @@ diff -urNp linux-2.6.32.23/drivers/firmware/dmi_scan.c linux-2.6.32.23/drivers/f
25003 p = dmi_ioremap(0xF0000, 0x10000); 25000 p = dmi_ioremap(0xF0000, 0x10000);
25004 if (p == NULL) 25001 if (p == NULL)
25005 goto error; 25002 goto error;
25006diff -urNp linux-2.6.32.23/drivers/firmware/edd.c linux-2.6.32.23/drivers/firmware/edd.c 25003diff -urNp linux-2.6.32.24/drivers/firmware/edd.c linux-2.6.32.24/drivers/firmware/edd.c
25007--- linux-2.6.32.23/drivers/firmware/edd.c 2010-08-13 16:24:37.000000000 -0400 25004--- linux-2.6.32.24/drivers/firmware/edd.c 2010-08-13 16:24:37.000000000 -0400
25008+++ linux-2.6.32.23/drivers/firmware/edd.c 2010-09-04 15:54:52.000000000 -0400 25005+++ linux-2.6.32.24/drivers/firmware/edd.c 2010-09-04 15:54:52.000000000 -0400
25009@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str 25006@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
25010 return ret; 25007 return ret;
25011 } 25008 }
@@ -25015,9 +25012,9 @@ diff -urNp linux-2.6.32.23/drivers/firmware/edd.c linux-2.6.32.23/drivers/firmwa
25015 .show = edd_attr_show, 25012 .show = edd_attr_show,
25016 }; 25013 };
25017 25014
25018diff -urNp linux-2.6.32.23/drivers/firmware/efivars.c linux-2.6.32.23/drivers/firmware/efivars.c 25015diff -urNp linux-2.6.32.24/drivers/firmware/efivars.c linux-2.6.32.24/drivers/firmware/efivars.c
25019--- linux-2.6.32.23/drivers/firmware/efivars.c 2010-08-13 16:24:37.000000000 -0400 25016--- linux-2.6.32.24/drivers/firmware/efivars.c 2010-08-13 16:24:37.000000000 -0400
25020+++ linux-2.6.32.23/drivers/firmware/efivars.c 2010-09-04 15:54:52.000000000 -0400 25017+++ linux-2.6.32.24/drivers/firmware/efivars.c 2010-09-04 15:54:52.000000000 -0400
25021@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct 25018@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
25022 return ret; 25019 return ret;
25023 } 25020 }
@@ -25027,9 +25024,9 @@ diff -urNp linux-2.6.32.23/drivers/firmware/efivars.c linux-2.6.32.23/drivers/fi
25027 .show = efivar_attr_show, 25024 .show = efivar_attr_show,
25028 .store = efivar_attr_store, 25025 .store = efivar_attr_store,
25029 }; 25026 };
25030diff -urNp linux-2.6.32.23/drivers/firmware/iscsi_ibft.c linux-2.6.32.23/drivers/firmware/iscsi_ibft.c 25027diff -urNp linux-2.6.32.24/drivers/firmware/iscsi_ibft.c linux-2.6.32.24/drivers/firmware/iscsi_ibft.c
25031--- linux-2.6.32.23/drivers/firmware/iscsi_ibft.c 2010-08-13 16:24:37.000000000 -0400 25028--- linux-2.6.32.24/drivers/firmware/iscsi_ibft.c 2010-08-13 16:24:37.000000000 -0400
25032+++ linux-2.6.32.23/drivers/firmware/iscsi_ibft.c 2010-09-04 15:54:52.000000000 -0400 25029+++ linux-2.6.32.24/drivers/firmware/iscsi_ibft.c 2010-09-04 15:54:52.000000000 -0400
25033@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc 25030@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
25034 return ret; 25031 return ret;
25035 } 25032 }
@@ -25039,9 +25036,9 @@ diff -urNp linux-2.6.32.23/drivers/firmware/iscsi_ibft.c linux-2.6.32.23/drivers
25039 .show = ibft_show_attribute, 25036 .show = ibft_show_attribute,
25040 }; 25037 };
25041 25038
25042diff -urNp linux-2.6.32.23/drivers/firmware/memmap.c linux-2.6.32.23/drivers/firmware/memmap.c 25039diff -urNp linux-2.6.32.24/drivers/firmware/memmap.c linux-2.6.32.24/drivers/firmware/memmap.c
25043--- linux-2.6.32.23/drivers/firmware/memmap.c 2010-08-13 16:24:37.000000000 -0400 25040--- linux-2.6.32.24/drivers/firmware/memmap.c 2010-08-13 16:24:37.000000000 -0400
25044+++ linux-2.6.32.23/drivers/firmware/memmap.c 2010-09-04 15:54:52.000000000 -0400 25041+++ linux-2.6.32.24/drivers/firmware/memmap.c 2010-09-04 15:54:52.000000000 -0400
25045@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { 25042@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
25046 NULL 25043 NULL
25047 }; 25044 };
@@ -25051,9 +25048,9 @@ diff -urNp linux-2.6.32.23/drivers/firmware/memmap.c linux-2.6.32.23/drivers/fir
25051 .show = memmap_attr_show, 25048 .show = memmap_attr_show,
25052 }; 25049 };
25053 25050
25054diff -urNp linux-2.6.32.23/drivers/gpu/drm/drm_drv.c linux-2.6.32.23/drivers/gpu/drm/drm_drv.c 25051diff -urNp linux-2.6.32.24/drivers/gpu/drm/drm_drv.c linux-2.6.32.24/drivers/gpu/drm/drm_drv.c
25055--- linux-2.6.32.23/drivers/gpu/drm/drm_drv.c 2010-08-29 21:08:20.000000000 -0400 25052--- linux-2.6.32.24/drivers/gpu/drm/drm_drv.c 2010-08-29 21:08:20.000000000 -0400
25056+++ linux-2.6.32.23/drivers/gpu/drm/drm_drv.c 2010-09-04 15:54:52.000000000 -0400 25053+++ linux-2.6.32.24/drivers/gpu/drm/drm_drv.c 2010-09-04 15:54:52.000000000 -0400
25057@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc 25054@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
25058 char *kdata = NULL; 25055 char *kdata = NULL;
25059 25056
@@ -25063,9 +25060,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/drm_drv.c linux-2.6.32.23/drivers/gpu
25063 ++file_priv->ioctl_count; 25060 ++file_priv->ioctl_count;
25064 25061
25065 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", 25062 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
25066diff -urNp linux-2.6.32.23/drivers/gpu/drm/drm_fops.c linux-2.6.32.23/drivers/gpu/drm/drm_fops.c 25063diff -urNp linux-2.6.32.24/drivers/gpu/drm/drm_fops.c linux-2.6.32.24/drivers/gpu/drm/drm_fops.c
25067--- linux-2.6.32.23/drivers/gpu/drm/drm_fops.c 2010-08-13 16:24:37.000000000 -0400 25064--- linux-2.6.32.24/drivers/gpu/drm/drm_fops.c 2010-08-13 16:24:37.000000000 -0400
25068+++ linux-2.6.32.23/drivers/gpu/drm/drm_fops.c 2010-09-04 15:54:52.000000000 -0400 25065+++ linux-2.6.32.24/drivers/gpu/drm/drm_fops.c 2010-09-04 15:54:52.000000000 -0400
25069@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * 25066@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
25070 } 25067 }
25071 25068
@@ -25117,9 +25114,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/drm_fops.c linux-2.6.32.23/drivers/gp
25117 if (atomic_read(&dev->ioctl_count)) { 25114 if (atomic_read(&dev->ioctl_count)) {
25118 DRM_ERROR("Device busy: %d\n", 25115 DRM_ERROR("Device busy: %d\n",
25119 atomic_read(&dev->ioctl_count)); 25116 atomic_read(&dev->ioctl_count));
25120diff -urNp linux-2.6.32.23/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.23/drivers/gpu/drm/drm_ioctl.c 25117diff -urNp linux-2.6.32.24/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.24/drivers/gpu/drm/drm_ioctl.c
25121--- linux-2.6.32.23/drivers/gpu/drm/drm_ioctl.c 2010-08-13 16:24:37.000000000 -0400 25118--- linux-2.6.32.24/drivers/gpu/drm/drm_ioctl.c 2010-08-13 16:24:37.000000000 -0400
25122+++ linux-2.6.32.23/drivers/gpu/drm/drm_ioctl.c 2010-09-04 15:54:52.000000000 -0400 25119+++ linux-2.6.32.24/drivers/gpu/drm/drm_ioctl.c 2010-09-04 15:54:52.000000000 -0400
25123@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, 25120@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
25124 stats->data[i].value = 25121 stats->data[i].value =
25125 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); 25122 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -25129,9 +25126,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.23/drivers/g
25129 stats->data[i].type = dev->types[i]; 25126 stats->data[i].type = dev->types[i];
25130 } 25127 }
25131 25128
25132diff -urNp linux-2.6.32.23/drivers/gpu/drm/drm_lock.c linux-2.6.32.23/drivers/gpu/drm/drm_lock.c 25129diff -urNp linux-2.6.32.24/drivers/gpu/drm/drm_lock.c linux-2.6.32.24/drivers/gpu/drm/drm_lock.c
25133--- linux-2.6.32.23/drivers/gpu/drm/drm_lock.c 2010-08-13 16:24:37.000000000 -0400 25130--- linux-2.6.32.24/drivers/gpu/drm/drm_lock.c 2010-08-13 16:24:37.000000000 -0400
25134+++ linux-2.6.32.23/drivers/gpu/drm/drm_lock.c 2010-09-04 15:54:52.000000000 -0400 25131+++ linux-2.6.32.24/drivers/gpu/drm/drm_lock.c 2010-09-04 15:54:52.000000000 -0400
25135@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi 25132@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
25136 if (drm_lock_take(&master->lock, lock->context)) { 25133 if (drm_lock_take(&master->lock, lock->context)) {
25137 master->lock.file_priv = file_priv; 25134 master->lock.file_priv = file_priv;
@@ -25150,9 +25147,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/drm_lock.c linux-2.6.32.23/drivers/gp
25150 25147
25151 /* kernel_context_switch isn't used by any of the x86 drm 25148 /* kernel_context_switch isn't used by any of the x86 drm
25152 * modules but is required by the Sparc driver. 25149 * modules but is required by the Sparc driver.
25153diff -urNp linux-2.6.32.23/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.23/drivers/gpu/drm/i810/i810_dma.c 25150diff -urNp linux-2.6.32.24/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.24/drivers/gpu/drm/i810/i810_dma.c
25154--- linux-2.6.32.23/drivers/gpu/drm/i810/i810_dma.c 2010-08-13 16:24:37.000000000 -0400 25151--- linux-2.6.32.24/drivers/gpu/drm/i810/i810_dma.c 2010-08-13 16:24:37.000000000 -0400
25155+++ linux-2.6.32.23/drivers/gpu/drm/i810/i810_dma.c 2010-09-04 15:54:52.000000000 -0400 25152+++ linux-2.6.32.24/drivers/gpu/drm/i810/i810_dma.c 2010-09-04 15:54:52.000000000 -0400
25156@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de 25153@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
25157 dma->buflist[vertex->idx], 25154 dma->buflist[vertex->idx],
25158 vertex->discard, vertex->used); 25155 vertex->discard, vertex->used);
@@ -25175,9 +25172,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.23/drive
25175 sarea_priv->last_enqueue = dev_priv->counter - 1; 25172 sarea_priv->last_enqueue = dev_priv->counter - 1;
25176 sarea_priv->last_dispatch = (int)hw_status[5]; 25173 sarea_priv->last_dispatch = (int)hw_status[5];
25177 25174
25178diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ch7017.c 25175diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7017.c
25179--- linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-13 16:24:37.000000000 -0400 25176--- linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-13 16:24:37.000000000 -0400
25180+++ linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ch7017.c 2010-09-04 15:54:52.000000000 -0400 25177+++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7017.c 2010-09-04 15:54:52.000000000 -0400
25181@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ 25178@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
25182 } 25179 }
25183 } 25180 }
@@ -25187,9 +25184,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.23/dri
25187 .init = ch7017_init, 25184 .init = ch7017_init,
25188 .detect = ch7017_detect, 25185 .detect = ch7017_detect,
25189 .mode_valid = ch7017_mode_valid, 25186 .mode_valid = ch7017_mode_valid,
25190diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ch7xxx.c 25187diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7xxx.c
25191--- linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-13 16:24:37.000000000 -0400 25188--- linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-13 16:24:37.000000000 -0400
25192+++ linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-09-04 15:54:52.000000000 -0400 25189+++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-09-04 15:54:52.000000000 -0400
25193@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ 25190@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
25194 } 25191 }
25195 } 25192 }
@@ -25199,9 +25196,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.23/dri
25199 .init = ch7xxx_init, 25196 .init = ch7xxx_init,
25200 .detect = ch7xxx_detect, 25197 .detect = ch7xxx_detect,
25201 .mode_valid = ch7xxx_mode_valid, 25198 .mode_valid = ch7xxx_mode_valid,
25202diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/dvo.h linux-2.6.32.23/drivers/gpu/drm/i915/dvo.h 25199diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo.h linux-2.6.32.24/drivers/gpu/drm/i915/dvo.h
25203--- linux-2.6.32.23/drivers/gpu/drm/i915/dvo.h 2010-08-13 16:24:37.000000000 -0400 25200--- linux-2.6.32.24/drivers/gpu/drm/i915/dvo.h 2010-08-13 16:24:37.000000000 -0400
25204+++ linux-2.6.32.23/drivers/gpu/drm/i915/dvo.h 2010-09-04 15:54:52.000000000 -0400 25201+++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo.h 2010-09-04 15:54:52.000000000 -0400
25205@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { 25202@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
25206 * 25203 *
25207 * \return singly-linked list of modes or NULL if no modes found. 25204 * \return singly-linked list of modes or NULL if no modes found.
@@ -25234,9 +25231,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/dvo.h linux-2.6.32.23/drivers/gp
25234+extern const struct intel_dvo_dev_ops ch7017_ops; 25231+extern const struct intel_dvo_dev_ops ch7017_ops;
25235 25232
25236 #endif /* _INTEL_DVO_H */ 25233 #endif /* _INTEL_DVO_H */
25237diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ivch.c 25234diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ivch.c
25238--- linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-13 16:24:37.000000000 -0400 25235--- linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-13 16:24:37.000000000 -0400
25239+++ linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ivch.c 2010-09-04 15:54:52.000000000 -0400 25236+++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_ivch.c 2010-09-04 15:54:52.000000000 -0400
25240@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv 25237@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
25241 } 25238 }
25242 } 25239 }
@@ -25246,9 +25243,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.23/drive
25246 .init = ivch_init, 25243 .init = ivch_init,
25247 .dpms = ivch_dpms, 25244 .dpms = ivch_dpms,
25248 .save = ivch_save, 25245 .save = ivch_save,
25249diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.23/drivers/gpu/drm/i915/dvo_sil164.c 25246diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.24/drivers/gpu/drm/i915/dvo_sil164.c
25250--- linux-2.6.32.23/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-13 16:24:37.000000000 -0400 25247--- linux-2.6.32.24/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-13 16:24:37.000000000 -0400
25251+++ linux-2.6.32.23/drivers/gpu/drm/i915/dvo_sil164.c 2010-09-04 15:54:52.000000000 -0400 25248+++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_sil164.c 2010-09-04 15:54:52.000000000 -0400
25252@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ 25249@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
25253 } 25250 }
25254 } 25251 }
@@ -25258,9 +25255,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.23/dri
25258 .init = sil164_init, 25255 .init = sil164_init,
25259 .detect = sil164_detect, 25256 .detect = sil164_detect,
25260 .mode_valid = sil164_mode_valid, 25257 .mode_valid = sil164_mode_valid,
25261diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.23/drivers/gpu/drm/i915/dvo_tfp410.c 25258diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.24/drivers/gpu/drm/i915/dvo_tfp410.c
25262--- linux-2.6.32.23/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-13 16:24:37.000000000 -0400 25259--- linux-2.6.32.24/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-13 16:24:37.000000000 -0400
25263+++ linux-2.6.32.23/drivers/gpu/drm/i915/dvo_tfp410.c 2010-09-04 15:54:52.000000000 -0400 25260+++ linux-2.6.32.24/drivers/gpu/drm/i915/dvo_tfp410.c 2010-09-04 15:54:52.000000000 -0400
25264@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ 25261@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
25265 } 25262 }
25266 } 25263 }
@@ -25270,9 +25267,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.23/dri
25270 .init = tfp410_init, 25267 .init = tfp410_init,
25271 .detect = tfp410_detect, 25268 .detect = tfp410_detect,
25272 .mode_valid = tfp410_mode_valid, 25269 .mode_valid = tfp410_mode_valid,
25273diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.23/drivers/gpu/drm/i915/i915_drv.c 25270diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.24/drivers/gpu/drm/i915/i915_drv.c
25274--- linux-2.6.32.23/drivers/gpu/drm/i915/i915_drv.c 2010-08-13 16:24:37.000000000 -0400 25271--- linux-2.6.32.24/drivers/gpu/drm/i915/i915_drv.c 2010-08-13 16:24:37.000000000 -0400
25275+++ linux-2.6.32.23/drivers/gpu/drm/i915/i915_drv.c 2010-09-04 15:54:52.000000000 -0400 25272+++ linux-2.6.32.24/drivers/gpu/drm/i915/i915_drv.c 2010-09-04 15:54:52.000000000 -0400
25276@@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev) 25273@@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev)
25277 return i915_resume(dev); 25274 return i915_resume(dev);
25278 } 25275 }
@@ -25282,34 +25279,36 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.23/drive
25282 .fault = i915_gem_fault, 25279 .fault = i915_gem_fault,
25283 .open = drm_gem_vm_open, 25280 .open = drm_gem_vm_open,
25284 .close = drm_gem_vm_close, 25281 .close = drm_gem_vm_close,
25285diff -urNp linux-2.6.32.23/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.23/drivers/gpu/drm/i915/i915_gem.c 25282diff -urNp linux-2.6.32.24/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.24/drivers/gpu/drm/i915/i915_gem.c
25286--- linux-2.6.32.23/drivers/gpu/drm/i915/i915_gem.c 2010-09-20 17:26:42.000000000 -0400 25283--- linux-2.6.32.24/drivers/gpu/drm/i915/i915_gem.c 2010-09-20 17:26:42.000000000 -0400
25287+++ linux-2.6.32.23/drivers/gpu/drm/i915/i915_gem.c 2010-09-26 16:58:07.000000000 -0400 25284+++ linux-2.6.32.24/drivers/gpu/drm/i915/i915_gem.c 2010-09-28 18:22:42.000000000 -0400
25288@@ -491,6 +491,10 @@ i915_gem_pread_ioctl(struct drm_device * 25285@@ -492,6 +492,11 @@ i915_gem_pread_ioctl(struct drm_device *
25289 drm_gem_object_unreference(obj);
25290 return -EINVAL; 25286 return -EINVAL;
25291 } 25287 }
25288
25292+ if (!access_ok(VERIFY_WRITE, (char __user *) (uintptr_t)args->data_ptr, args->size)) { 25289+ if (!access_ok(VERIFY_WRITE, (char __user *) (uintptr_t)args->data_ptr, args->size)) {
25293+ drm_gem_object_unreference(obj); 25290+ drm_gem_object_unreference(obj);
25294+ return -EFAULT; 25291+ return -EFAULT;
25295+ } 25292+ }
25296 25293+
25297 if (i915_gem_object_needs_bit17_swizzle(obj)) { 25294 if (i915_gem_object_needs_bit17_swizzle(obj)) {
25298 ret = i915_gem_shmem_pread_slow(dev, obj, args, file_priv); 25295 ret = i915_gem_shmem_pread_slow(dev, obj, args, file_priv);
25299@@ -964,6 +968,10 @@ i915_gem_pwrite_ioctl(struct drm_device 25296 } else {
25300 drm_gem_object_unreference(obj); 25297@@ -965,6 +970,11 @@ i915_gem_pwrite_ioctl(struct drm_device
25301 return -EINVAL; 25298 return -EINVAL;
25302 } 25299 }
25300
25303+ if (!access_ok(VERIFY_READ, (char __user *) (uintptr_t)args->data_ptr, args->size)) { 25301+ if (!access_ok(VERIFY_READ, (char __user *) (uintptr_t)args->data_ptr, args->size)) {
25304+ drm_gem_object_unreference(obj); 25302+ drm_gem_object_unreference(obj);
25305+ return -EFAULT; 25303+ return -EFAULT;
25306+ } 25304+ }
25307 25305+
25308 /* We can only do the GTT pwrite on untiled buffers, as otherwise 25306 /* We can only do the GTT pwrite on untiled buffers, as otherwise
25309 * it would end up going through the fenced access, and we'll get 25307 * it would end up going through the fenced access, and we'll get
25310diff -urNp linux-2.6.32.23/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.23/drivers/gpu/drm/radeon/mkregtable.c 25308 * different detiling behavior between reading and writing.
25311--- linux-2.6.32.23/drivers/gpu/drm/radeon/mkregtable.c 2010-08-13 16:24:37.000000000 -0400 25309diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.24/drivers/gpu/drm/radeon/mkregtable.c
25312+++ linux-2.6.32.23/drivers/gpu/drm/radeon/mkregtable.c 2010-09-04 15:54:52.000000000 -0400 25310--- linux-2.6.32.24/drivers/gpu/drm/radeon/mkregtable.c 2010-08-13 16:24:37.000000000 -0400
25311+++ linux-2.6.32.24/drivers/gpu/drm/radeon/mkregtable.c 2010-09-04 15:54:52.000000000 -0400
25313@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 25312@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
25314 regex_t mask_rex; 25313 regex_t mask_rex;
25315 regmatch_t match[4]; 25314 regmatch_t match[4];
@@ -25327,9 +25326,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.23/d
25327 25326
25328 if (regcomp 25327 if (regcomp
25329 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { 25328 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
25330diff -urNp linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_atombios.c 25329diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_atombios.c
25331--- linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_atombios.c 2010-08-13 16:24:37.000000000 -0400 25330--- linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_atombios.c 2010-08-13 16:24:37.000000000 -0400
25332+++ linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_atombios.c 2010-09-04 15:54:52.000000000 -0400 25331+++ linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_atombios.c 2010-09-04 15:54:52.000000000 -0400
25333@@ -513,13 +513,13 @@ static uint16_t atombios_get_connector_o 25332@@ -513,13 +513,13 @@ static uint16_t atombios_get_connector_o
25334 } 25333 }
25335 } 25334 }
@@ -25354,9 +25353,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32
25354 25353
25355 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); 25354 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
25356 25355
25357diff -urNp linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_display.c 25356diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_display.c
25358--- linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_display.c 2010-08-13 16:24:37.000000000 -0400 25357--- linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_display.c 2010-08-13 16:24:37.000000000 -0400
25359+++ linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_display.c 2010-09-04 15:54:52.000000000 -0400 25358+++ linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_display.c 2010-09-04 15:54:52.000000000 -0400
25360@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl 25359@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
25361 25360
25362 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { 25361 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
@@ -25366,9 +25365,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.
25366 } else 25365 } else
25367 error = abs(current_freq - freq); 25366 error = abs(current_freq - freq);
25368 vco_diff = abs(vco - best_vco); 25367 vco_diff = abs(vco - best_vco);
25369diff -urNp linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_state.c 25368diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_state.c
25370--- linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_state.c 2010-08-13 16:24:37.000000000 -0400 25369--- linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_state.c 2010-08-13 16:24:37.000000000 -0400
25371+++ linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_state.c 2010-09-04 15:54:52.000000000 -0400 25370+++ linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_state.c 2010-09-04 15:54:52.000000000 -0400
25372@@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm 25371@@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm
25373 { 25372 {
25374 drm_radeon_private_t *dev_priv = dev->dev_private; 25373 drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -25378,9 +25377,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.23
25378 25377
25379 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); 25378 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
25380 25379
25381diff -urNp linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_ttm.c 25380diff -urNp linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_ttm.c
25382--- linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-13 16:24:37.000000000 -0400 25381--- linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-13 16:24:37.000000000 -0400
25383+++ linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_ttm.c 2010-09-04 15:54:52.000000000 -0400 25382+++ linux-2.6.32.24/drivers/gpu/drm/radeon/radeon_ttm.c 2010-09-04 15:54:52.000000000 -0400
25384@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic 25383@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
25385 DRM_INFO("radeon: ttm finalized\n"); 25384 DRM_INFO("radeon: ttm finalized\n");
25386 } 25385 }
@@ -25432,9 +25431,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.23/d
25432 } 25431 }
25433 25432
25434 25433
25435diff -urNp linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_bo.c 25434diff -urNp linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo.c
25436--- linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-13 16:24:37.000000000 -0400 25435--- linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-13 16:24:37.000000000 -0400
25437+++ linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_bo.c 2010-09-04 15:54:52.000000000 -0400 25436+++ linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo.c 2010-09-04 15:54:52.000000000 -0400
25438@@ -39,7 +39,7 @@ 25437@@ -39,7 +39,7 @@
25439 #include <linux/module.h> 25438 #include <linux/module.h>
25440 25439
@@ -25453,9 +25452,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.23/drivers/
25453 .show = &ttm_bo_global_show 25452 .show = &ttm_bo_global_show
25454 }; 25453 };
25455 25454
25456diff -urNp linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_bo_vm.c 25455diff -urNp linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo_vm.c
25457--- linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-13 16:24:37.000000000 -0400 25456--- linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-13 16:24:37.000000000 -0400
25458+++ linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-09-04 15:54:52.000000000 -0400 25457+++ linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-09-04 15:54:52.000000000 -0400
25459@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are 25458@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
25460 { 25459 {
25461 struct ttm_buffer_object *bo = (struct ttm_buffer_object *) 25460 struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -25476,9 +25475,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.23/drive
25476 /* 25475 /*
25477 * Work around locking order reversal in fault / nopfn 25476 * Work around locking order reversal in fault / nopfn
25478 * between mmap_sem and bo_reserve: Perform a trylock operation 25477 * between mmap_sem and bo_reserve: Perform a trylock operation
25479diff -urNp linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_global.c 25478diff -urNp linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_global.c
25480--- linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_global.c 2010-08-13 16:24:37.000000000 -0400 25479--- linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_global.c 2010-08-13 16:24:37.000000000 -0400
25481+++ linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_global.c 2010-09-04 15:54:52.000000000 -0400 25480+++ linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_global.c 2010-09-04 15:54:52.000000000 -0400
25482@@ -36,7 +36,7 @@ 25481@@ -36,7 +36,7 @@
25483 struct ttm_global_item { 25482 struct ttm_global_item {
25484 struct mutex mutex; 25483 struct mutex mutex;
@@ -25536,9 +25535,9 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.23/driv
25536 ref->release(ref); 25535 ref->release(ref);
25537 item->object = NULL; 25536 item->object = NULL;
25538 } 25537 }
25539diff -urNp linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_memory.c 25538diff -urNp linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_memory.c
25540--- linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-13 16:24:37.000000000 -0400 25539--- linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-13 16:24:37.000000000 -0400
25541+++ linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_memory.c 2010-09-04 15:54:52.000000000 -0400 25540+++ linux-2.6.32.24/drivers/gpu/drm/ttm/ttm_memory.c 2010-09-04 15:54:52.000000000 -0400
25542@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at 25541@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
25543 NULL 25542 NULL
25544 }; 25543 };
@@ -25548,9 +25547,39 @@ diff -urNp linux-2.6.32.23/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.23/driv
25548 .show = &ttm_mem_zone_show, 25547 .show = &ttm_mem_zone_show,
25549 .store = &ttm_mem_zone_store 25548 .store = &ttm_mem_zone_store
25550 }; 25549 };
25551diff -urNp linux-2.6.32.23/drivers/hid/usbhid/hiddev.c linux-2.6.32.23/drivers/hid/usbhid/hiddev.c 25550diff -urNp linux-2.6.32.24/drivers/hid/hidraw.c linux-2.6.32.24/drivers/hid/hidraw.c
25552--- linux-2.6.32.23/drivers/hid/usbhid/hiddev.c 2010-08-13 16:24:37.000000000 -0400 25551--- linux-2.6.32.24/drivers/hid/hidraw.c 2010-08-13 16:24:37.000000000 -0400
25553+++ linux-2.6.32.23/drivers/hid/usbhid/hiddev.c 2010-09-04 15:54:52.000000000 -0400 25552+++ linux-2.6.32.24/drivers/hid/hidraw.c 2010-09-28 18:54:18.000000000 -0400
25553@@ -237,11 +237,16 @@ static long hidraw_ioctl(struct file *fi
25554 struct inode *inode = file->f_path.dentry->d_inode;
25555 unsigned int minor = iminor(inode);
25556 long ret = 0;
25557- /* FIXME: What stops hidraw_table going NULL */
25558- struct hidraw *dev = hidraw_table[minor];
25559+ struct hidraw *dev;
25560 void __user *user_arg = (void __user*) arg;
25561
25562 lock_kernel();
25563+ dev = hidraw_table[minor];
25564+ if (dev == NULL) {
25565+ ret = -ENODEV;
25566+ goto out;
25567+ }
25568+
25569 switch (cmd) {
25570 case HIDIOCGRDESCSIZE:
25571 if (put_user(dev->hid->rsize, (int __user *)arg))
25572@@ -314,6 +319,7 @@ static long hidraw_ioctl(struct file *fi
25573
25574 ret = -ENOTTY;
25575 }
25576+out:
25577 unlock_kernel();
25578 return ret;
25579 }
25580diff -urNp linux-2.6.32.24/drivers/hid/usbhid/hiddev.c linux-2.6.32.24/drivers/hid/usbhid/hiddev.c
25581--- linux-2.6.32.24/drivers/hid/usbhid/hiddev.c 2010-08-13 16:24:37.000000000 -0400
25582+++ linux-2.6.32.24/drivers/hid/usbhid/hiddev.c 2010-09-04 15:54:52.000000000 -0400
25554@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi 25583@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
25555 return put_user(HID_VERSION, (int __user *)arg); 25584 return put_user(HID_VERSION, (int __user *)arg);
25556 25585
@@ -25560,9 +25589,9 @@ diff -urNp linux-2.6.32.23/drivers/hid/usbhid/hiddev.c linux-2.6.32.23/drivers/h
25560 return -EINVAL; 25589 return -EINVAL;
25561 25590
25562 for (i = 0; i < hid->maxcollection; i++) 25591 for (i = 0; i < hid->maxcollection; i++)
25563diff -urNp linux-2.6.32.23/drivers/hwmon/k8temp.c linux-2.6.32.23/drivers/hwmon/k8temp.c 25592diff -urNp linux-2.6.32.24/drivers/hwmon/k8temp.c linux-2.6.32.24/drivers/hwmon/k8temp.c
25564--- linux-2.6.32.23/drivers/hwmon/k8temp.c 2010-09-20 17:26:42.000000000 -0400 25593--- linux-2.6.32.24/drivers/hwmon/k8temp.c 2010-09-20 17:26:42.000000000 -0400
25565+++ linux-2.6.32.23/drivers/hwmon/k8temp.c 2010-09-20 17:27:14.000000000 -0400 25594+++ linux-2.6.32.24/drivers/hwmon/k8temp.c 2010-09-20 17:27:14.000000000 -0400
25566@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n 25595@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
25567 25596
25568 static struct pci_device_id k8temp_ids[] = { 25597 static struct pci_device_id k8temp_ids[] = {
@@ -25572,9 +25601,9 @@ diff -urNp linux-2.6.32.23/drivers/hwmon/k8temp.c linux-2.6.32.23/drivers/hwmon/
25572 }; 25601 };
25573 25602
25574 MODULE_DEVICE_TABLE(pci, k8temp_ids); 25603 MODULE_DEVICE_TABLE(pci, k8temp_ids);
25575diff -urNp linux-2.6.32.23/drivers/hwmon/sis5595.c linux-2.6.32.23/drivers/hwmon/sis5595.c 25604diff -urNp linux-2.6.32.24/drivers/hwmon/sis5595.c linux-2.6.32.24/drivers/hwmon/sis5595.c
25576--- linux-2.6.32.23/drivers/hwmon/sis5595.c 2010-08-13 16:24:37.000000000 -0400 25605--- linux-2.6.32.24/drivers/hwmon/sis5595.c 2010-08-13 16:24:37.000000000 -0400
25577+++ linux-2.6.32.23/drivers/hwmon/sis5595.c 2010-09-04 15:54:52.000000000 -0400 25606+++ linux-2.6.32.24/drivers/hwmon/sis5595.c 2010-09-04 15:54:52.000000000 -0400
25578@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda 25607@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
25579 25608
25580 static struct pci_device_id sis5595_pci_ids[] = { 25609 static struct pci_device_id sis5595_pci_ids[] = {
@@ -25584,9 +25613,9 @@ diff -urNp linux-2.6.32.23/drivers/hwmon/sis5595.c linux-2.6.32.23/drivers/hwmon
25584 }; 25613 };
25585 25614
25586 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); 25615 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
25587diff -urNp linux-2.6.32.23/drivers/hwmon/via686a.c linux-2.6.32.23/drivers/hwmon/via686a.c 25616diff -urNp linux-2.6.32.24/drivers/hwmon/via686a.c linux-2.6.32.24/drivers/hwmon/via686a.c
25588--- linux-2.6.32.23/drivers/hwmon/via686a.c 2010-08-13 16:24:37.000000000 -0400 25617--- linux-2.6.32.24/drivers/hwmon/via686a.c 2010-08-13 16:24:37.000000000 -0400
25589+++ linux-2.6.32.23/drivers/hwmon/via686a.c 2010-09-04 15:54:52.000000000 -0400 25618+++ linux-2.6.32.24/drivers/hwmon/via686a.c 2010-09-04 15:54:52.000000000 -0400
25590@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda 25619@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
25591 25620
25592 static struct pci_device_id via686a_pci_ids[] = { 25621 static struct pci_device_id via686a_pci_ids[] = {
@@ -25596,9 +25625,9 @@ diff -urNp linux-2.6.32.23/drivers/hwmon/via686a.c linux-2.6.32.23/drivers/hwmon
25596 }; 25625 };
25597 25626
25598 MODULE_DEVICE_TABLE(pci, via686a_pci_ids); 25627 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
25599diff -urNp linux-2.6.32.23/drivers/hwmon/vt8231.c linux-2.6.32.23/drivers/hwmon/vt8231.c 25628diff -urNp linux-2.6.32.24/drivers/hwmon/vt8231.c linux-2.6.32.24/drivers/hwmon/vt8231.c
25600--- linux-2.6.32.23/drivers/hwmon/vt8231.c 2010-08-13 16:24:37.000000000 -0400 25629--- linux-2.6.32.24/drivers/hwmon/vt8231.c 2010-08-13 16:24:37.000000000 -0400
25601+++ linux-2.6.32.23/drivers/hwmon/vt8231.c 2010-09-04 15:54:52.000000000 -0400 25630+++ linux-2.6.32.24/drivers/hwmon/vt8231.c 2010-09-04 15:54:52.000000000 -0400
25602@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri 25631@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
25603 25632
25604 static struct pci_device_id vt8231_pci_ids[] = { 25633 static struct pci_device_id vt8231_pci_ids[] = {
@@ -25608,9 +25637,9 @@ diff -urNp linux-2.6.32.23/drivers/hwmon/vt8231.c linux-2.6.32.23/drivers/hwmon/
25608 }; 25637 };
25609 25638
25610 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); 25639 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
25611diff -urNp linux-2.6.32.23/drivers/hwmon/w83791d.c linux-2.6.32.23/drivers/hwmon/w83791d.c 25640diff -urNp linux-2.6.32.24/drivers/hwmon/w83791d.c linux-2.6.32.24/drivers/hwmon/w83791d.c
25612--- linux-2.6.32.23/drivers/hwmon/w83791d.c 2010-08-13 16:24:37.000000000 -0400 25641--- linux-2.6.32.24/drivers/hwmon/w83791d.c 2010-08-13 16:24:37.000000000 -0400
25613+++ linux-2.6.32.23/drivers/hwmon/w83791d.c 2010-09-04 15:54:52.000000000 -0400 25642+++ linux-2.6.32.24/drivers/hwmon/w83791d.c 2010-09-04 15:54:52.000000000 -0400
25614@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli 25643@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
25615 struct i2c_board_info *info); 25644 struct i2c_board_info *info);
25616 static int w83791d_remove(struct i2c_client *client); 25645 static int w83791d_remove(struct i2c_client *client);
@@ -25622,9 +25651,9 @@ diff -urNp linux-2.6.32.23/drivers/hwmon/w83791d.c linux-2.6.32.23/drivers/hwmon
25622 static struct w83791d_data *w83791d_update_device(struct device *dev); 25651 static struct w83791d_data *w83791d_update_device(struct device *dev);
25623 25652
25624 #ifdef DEBUG 25653 #ifdef DEBUG
25625diff -urNp linux-2.6.32.23/drivers/i2c/busses/i2c-i801.c linux-2.6.32.23/drivers/i2c/busses/i2c-i801.c 25654diff -urNp linux-2.6.32.24/drivers/i2c/busses/i2c-i801.c linux-2.6.32.24/drivers/i2c/busses/i2c-i801.c
25626--- linux-2.6.32.23/drivers/i2c/busses/i2c-i801.c 2010-08-13 16:24:37.000000000 -0400 25655--- linux-2.6.32.24/drivers/i2c/busses/i2c-i801.c 2010-08-13 16:24:37.000000000 -0400
25627+++ linux-2.6.32.23/drivers/i2c/busses/i2c-i801.c 2010-09-04 15:54:52.000000000 -0400 25656+++ linux-2.6.32.24/drivers/i2c/busses/i2c-i801.c 2010-09-04 15:54:52.000000000 -0400
25628@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] = 25657@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] =
25629 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, 25658 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
25630 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, 25659 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
@@ -25634,9 +25663,9 @@ diff -urNp linux-2.6.32.23/drivers/i2c/busses/i2c-i801.c linux-2.6.32.23/drivers
25634 }; 25663 };
25635 25664
25636 MODULE_DEVICE_TABLE (pci, i801_ids); 25665 MODULE_DEVICE_TABLE (pci, i801_ids);
25637diff -urNp linux-2.6.32.23/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.23/drivers/i2c/busses/i2c-piix4.c 25666diff -urNp linux-2.6.32.24/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.24/drivers/i2c/busses/i2c-piix4.c
25638--- linux-2.6.32.23/drivers/i2c/busses/i2c-piix4.c 2010-08-13 16:24:37.000000000 -0400 25667--- linux-2.6.32.24/drivers/i2c/busses/i2c-piix4.c 2010-08-13 16:24:37.000000000 -0400
25639+++ linux-2.6.32.23/drivers/i2c/busses/i2c-piix4.c 2010-09-04 15:54:52.000000000 -0400 25668+++ linux-2.6.32.24/drivers/i2c/busses/i2c-piix4.c 2010-09-04 15:54:52.000000000 -0400
25640@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat 25669@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
25641 .ident = "IBM", 25670 .ident = "IBM",
25642 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, 25671 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -25655,9 +25684,9 @@ diff -urNp linux-2.6.32.23/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.23/driver
25655 }; 25684 };
25656 25685
25657 MODULE_DEVICE_TABLE (pci, piix4_ids); 25686 MODULE_DEVICE_TABLE (pci, piix4_ids);
25658diff -urNp linux-2.6.32.23/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.23/drivers/i2c/busses/i2c-sis630.c 25687diff -urNp linux-2.6.32.24/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.24/drivers/i2c/busses/i2c-sis630.c
25659--- linux-2.6.32.23/drivers/i2c/busses/i2c-sis630.c 2010-08-13 16:24:37.000000000 -0400 25688--- linux-2.6.32.24/drivers/i2c/busses/i2c-sis630.c 2010-08-13 16:24:37.000000000 -0400
25660+++ linux-2.6.32.23/drivers/i2c/busses/i2c-sis630.c 2010-09-04 15:54:52.000000000 -0400 25689+++ linux-2.6.32.24/drivers/i2c/busses/i2c-sis630.c 2010-09-04 15:54:52.000000000 -0400
25661@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter 25690@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
25662 static struct pci_device_id sis630_ids[] __devinitdata = { 25691 static struct pci_device_id sis630_ids[] __devinitdata = {
25663 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 25692 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
@@ -25667,9 +25696,9 @@ diff -urNp linux-2.6.32.23/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.23/drive
25667 }; 25696 };
25668 25697
25669 MODULE_DEVICE_TABLE (pci, sis630_ids); 25698 MODULE_DEVICE_TABLE (pci, sis630_ids);
25670diff -urNp linux-2.6.32.23/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.23/drivers/i2c/busses/i2c-sis96x.c 25699diff -urNp linux-2.6.32.24/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.24/drivers/i2c/busses/i2c-sis96x.c
25671--- linux-2.6.32.23/drivers/i2c/busses/i2c-sis96x.c 2010-08-13 16:24:37.000000000 -0400 25700--- linux-2.6.32.24/drivers/i2c/busses/i2c-sis96x.c 2010-08-13 16:24:37.000000000 -0400
25672+++ linux-2.6.32.23/drivers/i2c/busses/i2c-sis96x.c 2010-09-04 15:54:52.000000000 -0400 25701+++ linux-2.6.32.24/drivers/i2c/busses/i2c-sis96x.c 2010-09-04 15:54:52.000000000 -0400
25673@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter 25702@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
25674 25703
25675 static struct pci_device_id sis96x_ids[] = { 25704 static struct pci_device_id sis96x_ids[] = {
@@ -25679,9 +25708,9 @@ diff -urNp linux-2.6.32.23/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.23/drive
25679 }; 25708 };
25680 25709
25681 MODULE_DEVICE_TABLE (pci, sis96x_ids); 25710 MODULE_DEVICE_TABLE (pci, sis96x_ids);
25682diff -urNp linux-2.6.32.23/drivers/ide/ide-cd.c linux-2.6.32.23/drivers/ide/ide-cd.c 25711diff -urNp linux-2.6.32.24/drivers/ide/ide-cd.c linux-2.6.32.24/drivers/ide/ide-cd.c
25683--- linux-2.6.32.23/drivers/ide/ide-cd.c 2010-08-13 16:24:37.000000000 -0400 25712--- linux-2.6.32.24/drivers/ide/ide-cd.c 2010-08-13 16:24:37.000000000 -0400
25684+++ linux-2.6.32.23/drivers/ide/ide-cd.c 2010-09-04 15:54:52.000000000 -0400 25713+++ linux-2.6.32.24/drivers/ide/ide-cd.c 2010-09-04 15:54:52.000000000 -0400
25685@@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_ 25714@@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_
25686 alignment = queue_dma_alignment(q) | q->dma_pad_mask; 25715 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
25687 if ((unsigned long)buf & alignment 25716 if ((unsigned long)buf & alignment
@@ -25691,9 +25720,9 @@ diff -urNp linux-2.6.32.23/drivers/ide/ide-cd.c linux-2.6.32.23/drivers/ide/ide-
25691 drive->dma = 0; 25720 drive->dma = 0;
25692 } 25721 }
25693 } 25722 }
25694diff -urNp linux-2.6.32.23/drivers/ieee1394/dv1394.c linux-2.6.32.23/drivers/ieee1394/dv1394.c 25723diff -urNp linux-2.6.32.24/drivers/ieee1394/dv1394.c linux-2.6.32.24/drivers/ieee1394/dv1394.c
25695--- linux-2.6.32.23/drivers/ieee1394/dv1394.c 2010-08-13 16:24:37.000000000 -0400 25724--- linux-2.6.32.24/drivers/ieee1394/dv1394.c 2010-08-13 16:24:37.000000000 -0400
25696+++ linux-2.6.32.23/drivers/ieee1394/dv1394.c 2010-09-04 15:54:52.000000000 -0400 25725+++ linux-2.6.32.24/drivers/ieee1394/dv1394.c 2010-09-04 15:54:52.000000000 -0400
25697@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c 25726@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
25698 based upon DIF section and sequence 25727 based upon DIF section and sequence
25699 */ 25728 */
@@ -25712,9 +25741,9 @@ diff -urNp linux-2.6.32.23/drivers/ieee1394/dv1394.c linux-2.6.32.23/drivers/iee
25712 }; 25741 };
25713 25742
25714 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); 25743 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
25715diff -urNp linux-2.6.32.23/drivers/ieee1394/eth1394.c linux-2.6.32.23/drivers/ieee1394/eth1394.c 25744diff -urNp linux-2.6.32.24/drivers/ieee1394/eth1394.c linux-2.6.32.24/drivers/ieee1394/eth1394.c
25716--- linux-2.6.32.23/drivers/ieee1394/eth1394.c 2010-08-13 16:24:37.000000000 -0400 25745--- linux-2.6.32.24/drivers/ieee1394/eth1394.c 2010-08-13 16:24:37.000000000 -0400
25717+++ linux-2.6.32.23/drivers/ieee1394/eth1394.c 2010-09-04 15:54:52.000000000 -0400 25746+++ linux-2.6.32.24/drivers/ieee1394/eth1394.c 2010-09-04 15:54:52.000000000 -0400
25718@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e 25747@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
25719 .specifier_id = ETHER1394_GASP_SPECIFIER_ID, 25748 .specifier_id = ETHER1394_GASP_SPECIFIER_ID,
25720 .version = ETHER1394_GASP_VERSION, 25749 .version = ETHER1394_GASP_VERSION,
@@ -25724,9 +25753,9 @@ diff -urNp linux-2.6.32.23/drivers/ieee1394/eth1394.c linux-2.6.32.23/drivers/ie
25724 }; 25753 };
25725 25754
25726 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); 25755 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
25727diff -urNp linux-2.6.32.23/drivers/ieee1394/hosts.c linux-2.6.32.23/drivers/ieee1394/hosts.c 25756diff -urNp linux-2.6.32.24/drivers/ieee1394/hosts.c linux-2.6.32.24/drivers/ieee1394/hosts.c
25728--- linux-2.6.32.23/drivers/ieee1394/hosts.c 2010-08-13 16:24:37.000000000 -0400 25757--- linux-2.6.32.24/drivers/ieee1394/hosts.c 2010-08-13 16:24:37.000000000 -0400
25729+++ linux-2.6.32.23/drivers/ieee1394/hosts.c 2010-09-04 15:54:52.000000000 -0400 25758+++ linux-2.6.32.24/drivers/ieee1394/hosts.c 2010-09-04 15:54:52.000000000 -0400
25730@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso 25759@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
25731 } 25760 }
25732 25761
@@ -25735,9 +25764,9 @@ diff -urNp linux-2.6.32.23/drivers/ieee1394/hosts.c linux-2.6.32.23/drivers/ieee
25735 .transmit_packet = dummy_transmit_packet, 25764 .transmit_packet = dummy_transmit_packet,
25736 .devctl = dummy_devctl, 25765 .devctl = dummy_devctl,
25737 .isoctl = dummy_isoctl 25766 .isoctl = dummy_isoctl
25738diff -urNp linux-2.6.32.23/drivers/ieee1394/ohci1394.c linux-2.6.32.23/drivers/ieee1394/ohci1394.c 25767diff -urNp linux-2.6.32.24/drivers/ieee1394/ohci1394.c linux-2.6.32.24/drivers/ieee1394/ohci1394.c
25739--- linux-2.6.32.23/drivers/ieee1394/ohci1394.c 2010-08-13 16:24:37.000000000 -0400 25768--- linux-2.6.32.24/drivers/ieee1394/ohci1394.c 2010-08-13 16:24:37.000000000 -0400
25740+++ linux-2.6.32.23/drivers/ieee1394/ohci1394.c 2010-09-04 15:54:52.000000000 -0400 25769+++ linux-2.6.32.24/drivers/ieee1394/ohci1394.c 2010-09-04 15:54:52.000000000 -0400
25741@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ 25770@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
25742 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) 25771 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
25743 25772
@@ -25759,9 +25788,9 @@ diff -urNp linux-2.6.32.23/drivers/ieee1394/ohci1394.c linux-2.6.32.23/drivers/i
25759 }; 25788 };
25760 25789
25761 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); 25790 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
25762diff -urNp linux-2.6.32.23/drivers/ieee1394/raw1394.c linux-2.6.32.23/drivers/ieee1394/raw1394.c 25791diff -urNp linux-2.6.32.24/drivers/ieee1394/raw1394.c linux-2.6.32.24/drivers/ieee1394/raw1394.c
25763--- linux-2.6.32.23/drivers/ieee1394/raw1394.c 2010-08-13 16:24:37.000000000 -0400 25792--- linux-2.6.32.24/drivers/ieee1394/raw1394.c 2010-08-13 16:24:37.000000000 -0400
25764+++ linux-2.6.32.23/drivers/ieee1394/raw1394.c 2010-09-04 15:54:52.000000000 -0400 25793+++ linux-2.6.32.24/drivers/ieee1394/raw1394.c 2010-09-04 15:54:52.000000000 -0400
25765@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r 25794@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
25766 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 25795 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
25767 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 25796 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -25771,9 +25800,9 @@ diff -urNp linux-2.6.32.23/drivers/ieee1394/raw1394.c linux-2.6.32.23/drivers/ie
25771 }; 25800 };
25772 25801
25773 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); 25802 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
25774diff -urNp linux-2.6.32.23/drivers/ieee1394/sbp2.c linux-2.6.32.23/drivers/ieee1394/sbp2.c 25803diff -urNp linux-2.6.32.24/drivers/ieee1394/sbp2.c linux-2.6.32.24/drivers/ieee1394/sbp2.c
25775--- linux-2.6.32.23/drivers/ieee1394/sbp2.c 2010-08-13 16:24:37.000000000 -0400 25804--- linux-2.6.32.24/drivers/ieee1394/sbp2.c 2010-08-13 16:24:37.000000000 -0400
25776+++ linux-2.6.32.23/drivers/ieee1394/sbp2.c 2010-09-04 15:54:52.000000000 -0400 25805+++ linux-2.6.32.24/drivers/ieee1394/sbp2.c 2010-09-04 15:54:52.000000000 -0400
25777@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s 25806@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
25778 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 25807 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
25779 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, 25808 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -25792,9 +25821,9 @@ diff -urNp linux-2.6.32.23/drivers/ieee1394/sbp2.c linux-2.6.32.23/drivers/ieee1
25792 { 25821 {
25793 int ret; 25822 int ret;
25794 25823
25795diff -urNp linux-2.6.32.23/drivers/ieee1394/video1394.c linux-2.6.32.23/drivers/ieee1394/video1394.c 25824diff -urNp linux-2.6.32.24/drivers/ieee1394/video1394.c linux-2.6.32.24/drivers/ieee1394/video1394.c
25796--- linux-2.6.32.23/drivers/ieee1394/video1394.c 2010-08-13 16:24:37.000000000 -0400 25825--- linux-2.6.32.24/drivers/ieee1394/video1394.c 2010-08-13 16:24:37.000000000 -0400
25797+++ linux-2.6.32.23/drivers/ieee1394/video1394.c 2010-09-04 15:54:52.000000000 -0400 25826+++ linux-2.6.32.24/drivers/ieee1394/video1394.c 2010-09-04 15:54:52.000000000 -0400
25798@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v 25827@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
25799 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 25828 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
25800 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff 25829 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
@@ -25804,9 +25833,9 @@ diff -urNp linux-2.6.32.23/drivers/ieee1394/video1394.c linux-2.6.32.23/drivers/
25804 }; 25833 };
25805 25834
25806 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); 25835 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
25807diff -urNp linux-2.6.32.23/drivers/infiniband/core/cm.c linux-2.6.32.23/drivers/infiniband/core/cm.c 25836diff -urNp linux-2.6.32.24/drivers/infiniband/core/cm.c linux-2.6.32.24/drivers/infiniband/core/cm.c
25808--- linux-2.6.32.23/drivers/infiniband/core/cm.c 2010-08-13 16:24:37.000000000 -0400 25837--- linux-2.6.32.24/drivers/infiniband/core/cm.c 2010-08-13 16:24:37.000000000 -0400
25809+++ linux-2.6.32.23/drivers/infiniband/core/cm.c 2010-09-04 15:54:52.000000000 -0400 25838+++ linux-2.6.32.24/drivers/infiniband/core/cm.c 2010-09-04 15:54:52.000000000 -0400
25810@@ -112,7 +112,7 @@ static char const counter_group_names[CM 25839@@ -112,7 +112,7 @@ static char const counter_group_names[CM
25811 25840
25812 struct cm_counter_group { 25841 struct cm_counter_group {
@@ -25950,9 +25979,9 @@ diff -urNp linux-2.6.32.23/drivers/infiniband/core/cm.c linux-2.6.32.23/drivers/
25950 .show = cm_show_counter 25979 .show = cm_show_counter
25951 }; 25980 };
25952 25981
25953diff -urNp linux-2.6.32.23/drivers/infiniband/core/sysfs.c linux-2.6.32.23/drivers/infiniband/core/sysfs.c 25982diff -urNp linux-2.6.32.24/drivers/infiniband/core/sysfs.c linux-2.6.32.24/drivers/infiniband/core/sysfs.c
25954--- linux-2.6.32.23/drivers/infiniband/core/sysfs.c 2010-08-13 16:24:37.000000000 -0400 25983--- linux-2.6.32.24/drivers/infiniband/core/sysfs.c 2010-08-13 16:24:37.000000000 -0400
25955+++ linux-2.6.32.23/drivers/infiniband/core/sysfs.c 2010-09-04 15:54:52.000000000 -0400 25984+++ linux-2.6.32.24/drivers/infiniband/core/sysfs.c 2010-09-04 15:54:52.000000000 -0400
25956@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob 25985@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
25957 return port_attr->show(p, port_attr, buf); 25986 return port_attr->show(p, port_attr, buf);
25958 } 25987 }
@@ -25962,9 +25991,9 @@ diff -urNp linux-2.6.32.23/drivers/infiniband/core/sysfs.c linux-2.6.32.23/drive
25962 .show = port_attr_show 25991 .show = port_attr_show
25963 }; 25992 };
25964 25993
25965diff -urNp linux-2.6.32.23/drivers/input/keyboard/atkbd.c linux-2.6.32.23/drivers/input/keyboard/atkbd.c 25994diff -urNp linux-2.6.32.24/drivers/input/keyboard/atkbd.c linux-2.6.32.24/drivers/input/keyboard/atkbd.c
25966--- linux-2.6.32.23/drivers/input/keyboard/atkbd.c 2010-08-13 16:24:37.000000000 -0400 25995--- linux-2.6.32.24/drivers/input/keyboard/atkbd.c 2010-08-13 16:24:37.000000000 -0400
25967+++ linux-2.6.32.23/drivers/input/keyboard/atkbd.c 2010-09-04 15:54:52.000000000 -0400 25996+++ linux-2.6.32.24/drivers/input/keyboard/atkbd.c 2010-09-04 15:54:52.000000000 -0400
25968@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri 25997@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
25969 .id = SERIO_ANY, 25998 .id = SERIO_ANY,
25970 .extra = SERIO_ANY, 25999 .extra = SERIO_ANY,
@@ -25974,9 +26003,9 @@ diff -urNp linux-2.6.32.23/drivers/input/keyboard/atkbd.c linux-2.6.32.23/driver
25974 }; 26003 };
25975 26004
25976 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); 26005 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
25977diff -urNp linux-2.6.32.23/drivers/input/mouse/lifebook.c linux-2.6.32.23/drivers/input/mouse/lifebook.c 26006diff -urNp linux-2.6.32.24/drivers/input/mouse/lifebook.c linux-2.6.32.24/drivers/input/mouse/lifebook.c
25978--- linux-2.6.32.23/drivers/input/mouse/lifebook.c 2010-08-13 16:24:37.000000000 -0400 26007--- linux-2.6.32.24/drivers/input/mouse/lifebook.c 2010-08-13 16:24:37.000000000 -0400
25979+++ linux-2.6.32.23/drivers/input/mouse/lifebook.c 2010-09-04 15:54:52.000000000 -0400 26008+++ linux-2.6.32.24/drivers/input/mouse/lifebook.c 2010-09-04 15:54:52.000000000 -0400
25980@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo 26009@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
25981 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), 26010 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
25982 }, 26011 },
@@ -25986,9 +26015,9 @@ diff -urNp linux-2.6.32.23/drivers/input/mouse/lifebook.c linux-2.6.32.23/driver
25986 }; 26015 };
25987 26016
25988 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) 26017 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
25989diff -urNp linux-2.6.32.23/drivers/input/mouse/psmouse-base.c linux-2.6.32.23/drivers/input/mouse/psmouse-base.c 26018diff -urNp linux-2.6.32.24/drivers/input/mouse/psmouse-base.c linux-2.6.32.24/drivers/input/mouse/psmouse-base.c
25990--- linux-2.6.32.23/drivers/input/mouse/psmouse-base.c 2010-08-13 16:24:37.000000000 -0400 26019--- linux-2.6.32.24/drivers/input/mouse/psmouse-base.c 2010-08-13 16:24:37.000000000 -0400
25991+++ linux-2.6.32.23/drivers/input/mouse/psmouse-base.c 2010-09-04 15:54:52.000000000 -0400 26020+++ linux-2.6.32.24/drivers/input/mouse/psmouse-base.c 2010-09-04 15:54:52.000000000 -0400
25992@@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se 26021@@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se
25993 .id = SERIO_ANY, 26022 .id = SERIO_ANY,
25994 .extra = SERIO_ANY, 26023 .extra = SERIO_ANY,
@@ -25998,9 +26027,9 @@ diff -urNp linux-2.6.32.23/drivers/input/mouse/psmouse-base.c linux-2.6.32.23/dr
25998 }; 26027 };
25999 26028
26000 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); 26029 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
26001diff -urNp linux-2.6.32.23/drivers/input/mouse/synaptics.c linux-2.6.32.23/drivers/input/mouse/synaptics.c 26030diff -urNp linux-2.6.32.24/drivers/input/mouse/synaptics.c linux-2.6.32.24/drivers/input/mouse/synaptics.c
26002--- linux-2.6.32.23/drivers/input/mouse/synaptics.c 2010-08-13 16:24:37.000000000 -0400 26031--- linux-2.6.32.24/drivers/input/mouse/synaptics.c 2010-08-13 16:24:37.000000000 -0400
26003+++ linux-2.6.32.23/drivers/input/mouse/synaptics.c 2010-09-04 15:54:52.000000000 -0400 26032+++ linux-2.6.32.24/drivers/input/mouse/synaptics.c 2010-09-04 15:54:52.000000000 -0400
26004@@ -437,7 +437,7 @@ static void synaptics_process_packet(str 26033@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
26005 break; 26034 break;
26006 case 2: 26035 case 2:
@@ -26029,9 +26058,9 @@ diff -urNp linux-2.6.32.23/drivers/input/mouse/synaptics.c linux-2.6.32.23/drive
26029 }; 26058 };
26030 #endif 26059 #endif
26031 26060
26032diff -urNp linux-2.6.32.23/drivers/input/mousedev.c linux-2.6.32.23/drivers/input/mousedev.c 26061diff -urNp linux-2.6.32.24/drivers/input/mousedev.c linux-2.6.32.24/drivers/input/mousedev.c
26033--- linux-2.6.32.23/drivers/input/mousedev.c 2010-08-13 16:24:37.000000000 -0400 26062--- linux-2.6.32.24/drivers/input/mousedev.c 2010-08-13 16:24:37.000000000 -0400
26034+++ linux-2.6.32.23/drivers/input/mousedev.c 2010-09-04 15:54:52.000000000 -0400 26063+++ linux-2.6.32.24/drivers/input/mousedev.c 2010-09-04 15:54:52.000000000 -0400
26035@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han 26064@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
26036 26065
26037 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX 26066 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -26041,9 +26070,9 @@ diff -urNp linux-2.6.32.23/drivers/input/mousedev.c linux-2.6.32.23/drivers/inpu
26041 }; 26070 };
26042 static int psaux_registered; 26071 static int psaux_registered;
26043 #endif 26072 #endif
26044diff -urNp linux-2.6.32.23/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.23/drivers/input/serio/i8042-x86ia64io.h 26073diff -urNp linux-2.6.32.24/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.24/drivers/input/serio/i8042-x86ia64io.h
26045--- linux-2.6.32.23/drivers/input/serio/i8042-x86ia64io.h 2010-08-13 16:24:37.000000000 -0400 26074--- linux-2.6.32.24/drivers/input/serio/i8042-x86ia64io.h 2010-08-13 16:24:37.000000000 -0400
26046+++ linux-2.6.32.23/drivers/input/serio/i8042-x86ia64io.h 2010-09-04 15:54:52.000000000 -0400 26075+++ linux-2.6.32.24/drivers/input/serio/i8042-x86ia64io.h 2010-09-04 15:54:52.000000000 -0400
26047@@ -179,7 +179,7 @@ static const struct dmi_system_id __init 26076@@ -179,7 +179,7 @@ static const struct dmi_system_id __init
26048 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), 26077 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
26049 }, 26078 },
@@ -26098,9 +26127,9 @@ diff -urNp linux-2.6.32.23/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.23
26098 }; 26127 };
26099 26128
26100 #endif /* CONFIG_X86 */ 26129 #endif /* CONFIG_X86 */
26101diff -urNp linux-2.6.32.23/drivers/input/serio/serio_raw.c linux-2.6.32.23/drivers/input/serio/serio_raw.c 26130diff -urNp linux-2.6.32.24/drivers/input/serio/serio_raw.c linux-2.6.32.24/drivers/input/serio/serio_raw.c
26102--- linux-2.6.32.23/drivers/input/serio/serio_raw.c 2010-08-13 16:24:37.000000000 -0400 26131--- linux-2.6.32.24/drivers/input/serio/serio_raw.c 2010-08-13 16:24:37.000000000 -0400
26103+++ linux-2.6.32.23/drivers/input/serio/serio_raw.c 2010-09-04 15:54:52.000000000 -0400 26132+++ linux-2.6.32.24/drivers/input/serio/serio_raw.c 2010-09-04 15:54:52.000000000 -0400
26104@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ 26133@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
26105 .id = SERIO_ANY, 26134 .id = SERIO_ANY,
26106 .extra = SERIO_ANY, 26135 .extra = SERIO_ANY,
@@ -26110,9 +26139,9 @@ diff -urNp linux-2.6.32.23/drivers/input/serio/serio_raw.c linux-2.6.32.23/drive
26110 }; 26139 };
26111 26140
26112 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); 26141 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
26113diff -urNp linux-2.6.32.23/drivers/isdn/gigaset/common.c linux-2.6.32.23/drivers/isdn/gigaset/common.c 26142diff -urNp linux-2.6.32.24/drivers/isdn/gigaset/common.c linux-2.6.32.24/drivers/isdn/gigaset/common.c
26114--- linux-2.6.32.23/drivers/isdn/gigaset/common.c 2010-08-13 16:24:37.000000000 -0400 26143--- linux-2.6.32.24/drivers/isdn/gigaset/common.c 2010-08-13 16:24:37.000000000 -0400
26115+++ linux-2.6.32.23/drivers/isdn/gigaset/common.c 2010-09-04 15:54:52.000000000 -0400 26144+++ linux-2.6.32.24/drivers/isdn/gigaset/common.c 2010-09-04 15:54:52.000000000 -0400
26116@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct 26145@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
26117 cs->commands_pending = 0; 26146 cs->commands_pending = 0;
26118 cs->cur_at_seq = 0; 26147 cs->cur_at_seq = 0;
@@ -26122,9 +26151,9 @@ diff -urNp linux-2.6.32.23/drivers/isdn/gigaset/common.c linux-2.6.32.23/drivers
26122 cs->dev = NULL; 26151 cs->dev = NULL;
26123 cs->tty = NULL; 26152 cs->tty = NULL;
26124 cs->tty_dev = NULL; 26153 cs->tty_dev = NULL;
26125diff -urNp linux-2.6.32.23/drivers/isdn/gigaset/gigaset.h linux-2.6.32.23/drivers/isdn/gigaset/gigaset.h 26154diff -urNp linux-2.6.32.24/drivers/isdn/gigaset/gigaset.h linux-2.6.32.24/drivers/isdn/gigaset/gigaset.h
26126--- linux-2.6.32.23/drivers/isdn/gigaset/gigaset.h 2010-08-13 16:24:37.000000000 -0400 26155--- linux-2.6.32.24/drivers/isdn/gigaset/gigaset.h 2010-08-13 16:24:37.000000000 -0400
26127+++ linux-2.6.32.23/drivers/isdn/gigaset/gigaset.h 2010-09-04 15:54:52.000000000 -0400 26156+++ linux-2.6.32.24/drivers/isdn/gigaset/gigaset.h 2010-09-04 15:54:52.000000000 -0400
26128@@ -446,7 +446,7 @@ struct cardstate { 26157@@ -446,7 +446,7 @@ struct cardstate {
26129 spinlock_t cmdlock; 26158 spinlock_t cmdlock;
26130 unsigned curlen, cmdbytes; 26159 unsigned curlen, cmdbytes;
@@ -26134,9 +26163,9 @@ diff -urNp linux-2.6.32.23/drivers/isdn/gigaset/gigaset.h linux-2.6.32.23/driver
26134 struct tty_struct *tty; 26163 struct tty_struct *tty;
26135 struct tasklet_struct if_wake_tasklet; 26164 struct tasklet_struct if_wake_tasklet;
26136 unsigned control_state; 26165 unsigned control_state;
26137diff -urNp linux-2.6.32.23/drivers/isdn/gigaset/interface.c linux-2.6.32.23/drivers/isdn/gigaset/interface.c 26166diff -urNp linux-2.6.32.24/drivers/isdn/gigaset/interface.c linux-2.6.32.24/drivers/isdn/gigaset/interface.c
26138--- linux-2.6.32.23/drivers/isdn/gigaset/interface.c 2010-08-13 16:24:37.000000000 -0400 26167--- linux-2.6.32.24/drivers/isdn/gigaset/interface.c 2010-08-13 16:24:37.000000000 -0400
26139+++ linux-2.6.32.23/drivers/isdn/gigaset/interface.c 2010-09-04 15:54:52.000000000 -0400 26168+++ linux-2.6.32.24/drivers/isdn/gigaset/interface.c 2010-09-04 15:54:52.000000000 -0400
26140@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt 26169@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
26141 return -ERESTARTSYS; // FIXME -EINTR? 26170 return -ERESTARTSYS; // FIXME -EINTR?
26142 tty->driver_data = cs; 26171 tty->driver_data = cs;
@@ -26224,9 +26253,9 @@ diff -urNp linux-2.6.32.23/drivers/isdn/gigaset/interface.c linux-2.6.32.23/driv
26224 dev_warn(cs->dev, "%s: device not opened\n", __func__); 26253 dev_warn(cs->dev, "%s: device not opened\n", __func__);
26225 goto out; 26254 goto out;
26226 } 26255 }
26227diff -urNp linux-2.6.32.23/drivers/isdn/hardware/avm/b1.c linux-2.6.32.23/drivers/isdn/hardware/avm/b1.c 26256diff -urNp linux-2.6.32.24/drivers/isdn/hardware/avm/b1.c linux-2.6.32.24/drivers/isdn/hardware/avm/b1.c
26228--- linux-2.6.32.23/drivers/isdn/hardware/avm/b1.c 2010-08-13 16:24:37.000000000 -0400 26257--- linux-2.6.32.24/drivers/isdn/hardware/avm/b1.c 2010-08-13 16:24:37.000000000 -0400
26229+++ linux-2.6.32.23/drivers/isdn/hardware/avm/b1.c 2010-09-04 15:54:52.000000000 -0400 26258+++ linux-2.6.32.24/drivers/isdn/hardware/avm/b1.c 2010-09-04 15:54:52.000000000 -0400
26230@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo 26259@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
26231 } 26260 }
26232 if (left) { 26261 if (left) {
@@ -26245,9 +26274,9 @@ diff -urNp linux-2.6.32.23/drivers/isdn/hardware/avm/b1.c linux-2.6.32.23/driver
26245 return -EFAULT; 26274 return -EFAULT;
26246 } else { 26275 } else {
26247 memcpy(buf, dp, left); 26276 memcpy(buf, dp, left);
26248diff -urNp linux-2.6.32.23/drivers/isdn/icn/icn.c linux-2.6.32.23/drivers/isdn/icn/icn.c 26277diff -urNp linux-2.6.32.24/drivers/isdn/icn/icn.c linux-2.6.32.24/drivers/isdn/icn/icn.c
26249--- linux-2.6.32.23/drivers/isdn/icn/icn.c 2010-08-13 16:24:37.000000000 -0400 26278--- linux-2.6.32.24/drivers/isdn/icn/icn.c 2010-08-13 16:24:37.000000000 -0400
26250+++ linux-2.6.32.23/drivers/isdn/icn/icn.c 2010-09-04 15:54:52.000000000 -0400 26279+++ linux-2.6.32.24/drivers/isdn/icn/icn.c 2010-09-04 15:54:52.000000000 -0400
26251@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len 26280@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
26252 if (count > len) 26281 if (count > len)
26253 count = len; 26282 count = len;
@@ -26257,9 +26286,9 @@ diff -urNp linux-2.6.32.23/drivers/isdn/icn/icn.c linux-2.6.32.23/drivers/isdn/i
26257 return -EFAULT; 26286 return -EFAULT;
26258 } else 26287 } else
26259 memcpy(msg, buf, count); 26288 memcpy(msg, buf, count);
26260diff -urNp linux-2.6.32.23/drivers/lguest/core.c linux-2.6.32.23/drivers/lguest/core.c 26289diff -urNp linux-2.6.32.24/drivers/lguest/core.c linux-2.6.32.24/drivers/lguest/core.c
26261--- linux-2.6.32.23/drivers/lguest/core.c 2010-08-13 16:24:37.000000000 -0400 26290--- linux-2.6.32.24/drivers/lguest/core.c 2010-08-13 16:24:37.000000000 -0400
26262+++ linux-2.6.32.23/drivers/lguest/core.c 2010-09-04 15:54:52.000000000 -0400 26291+++ linux-2.6.32.24/drivers/lguest/core.c 2010-09-04 15:54:52.000000000 -0400
26263@@ -91,9 +91,17 @@ static __init int map_switcher(void) 26292@@ -91,9 +91,17 @@ static __init int map_switcher(void)
26264 * it's worked so far. The end address needs +1 because __get_vm_area 26293 * it's worked so far. The end address needs +1 because __get_vm_area
26265 * allocates an extra guard page, so we need space for that. 26294 * allocates an extra guard page, so we need space for that.
@@ -26278,9 +26307,9 @@ diff -urNp linux-2.6.32.23/drivers/lguest/core.c linux-2.6.32.23/drivers/lguest/
26278 if (!switcher_vma) { 26307 if (!switcher_vma) {
26279 err = -ENOMEM; 26308 err = -ENOMEM;
26280 printk("lguest: could not map switcher pages high\n"); 26309 printk("lguest: could not map switcher pages high\n");
26281diff -urNp linux-2.6.32.23/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.23/drivers/macintosh/via-pmu-backlight.c 26310diff -urNp linux-2.6.32.24/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.24/drivers/macintosh/via-pmu-backlight.c
26282--- linux-2.6.32.23/drivers/macintosh/via-pmu-backlight.c 2010-08-13 16:24:37.000000000 -0400 26311--- linux-2.6.32.24/drivers/macintosh/via-pmu-backlight.c 2010-08-13 16:24:37.000000000 -0400
26283+++ linux-2.6.32.23/drivers/macintosh/via-pmu-backlight.c 2010-09-04 15:54:52.000000000 -0400 26312+++ linux-2.6.32.24/drivers/macintosh/via-pmu-backlight.c 2010-09-04 15:54:52.000000000 -0400
26284@@ -15,7 +15,7 @@ 26313@@ -15,7 +15,7 @@
26285 26314
26286 #define MAX_PMU_LEVEL 0xFF 26315 #define MAX_PMU_LEVEL 0xFF
@@ -26299,9 +26328,9 @@ diff -urNp linux-2.6.32.23/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.23
26299 .get_brightness = pmu_backlight_get_brightness, 26328 .get_brightness = pmu_backlight_get_brightness,
26300 .update_status = pmu_backlight_update_status, 26329 .update_status = pmu_backlight_update_status,
26301 26330
26302diff -urNp linux-2.6.32.23/drivers/macintosh/via-pmu.c linux-2.6.32.23/drivers/macintosh/via-pmu.c 26331diff -urNp linux-2.6.32.24/drivers/macintosh/via-pmu.c linux-2.6.32.24/drivers/macintosh/via-pmu.c
26303--- linux-2.6.32.23/drivers/macintosh/via-pmu.c 2010-08-13 16:24:37.000000000 -0400 26332--- linux-2.6.32.24/drivers/macintosh/via-pmu.c 2010-08-13 16:24:37.000000000 -0400
26304+++ linux-2.6.32.23/drivers/macintosh/via-pmu.c 2010-09-04 15:54:52.000000000 -0400 26333+++ linux-2.6.32.24/drivers/macintosh/via-pmu.c 2010-09-04 15:54:52.000000000 -0400
26305@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state 26334@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
26306 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); 26335 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
26307 } 26336 }
@@ -26311,9 +26340,9 @@ diff -urNp linux-2.6.32.23/drivers/macintosh/via-pmu.c linux-2.6.32.23/drivers/m
26311 .enter = powerbook_sleep, 26340 .enter = powerbook_sleep,
26312 .valid = pmu_sleep_valid, 26341 .valid = pmu_sleep_valid,
26313 }; 26342 };
26314diff -urNp linux-2.6.32.23/drivers/md/bitmap.c linux-2.6.32.23/drivers/md/bitmap.c 26343diff -urNp linux-2.6.32.24/drivers/md/bitmap.c linux-2.6.32.24/drivers/md/bitmap.c
26315--- linux-2.6.32.23/drivers/md/bitmap.c 2010-08-13 16:24:37.000000000 -0400 26344--- linux-2.6.32.24/drivers/md/bitmap.c 2010-08-13 16:24:37.000000000 -0400
26316+++ linux-2.6.32.23/drivers/md/bitmap.c 2010-09-04 15:54:52.000000000 -0400 26345+++ linux-2.6.32.24/drivers/md/bitmap.c 2010-09-04 15:54:52.000000000 -0400
26317@@ -58,7 +58,7 @@ 26346@@ -58,7 +58,7 @@
26318 # if DEBUG > 0 26347 # if DEBUG > 0
26319 # define PRINTK(x...) printk(KERN_DEBUG x) 26348 # define PRINTK(x...) printk(KERN_DEBUG x)
@@ -26323,9 +26352,9 @@ diff -urNp linux-2.6.32.23/drivers/md/bitmap.c linux-2.6.32.23/drivers/md/bitmap
26323 # endif 26352 # endif
26324 #endif 26353 #endif
26325 26354
26326diff -urNp linux-2.6.32.23/drivers/md/dm-sysfs.c linux-2.6.32.23/drivers/md/dm-sysfs.c 26355diff -urNp linux-2.6.32.24/drivers/md/dm-sysfs.c linux-2.6.32.24/drivers/md/dm-sysfs.c
26327--- linux-2.6.32.23/drivers/md/dm-sysfs.c 2010-08-13 16:24:37.000000000 -0400 26356--- linux-2.6.32.24/drivers/md/dm-sysfs.c 2010-08-13 16:24:37.000000000 -0400
26328+++ linux-2.6.32.23/drivers/md/dm-sysfs.c 2010-09-04 15:54:52.000000000 -0400 26357+++ linux-2.6.32.24/drivers/md/dm-sysfs.c 2010-09-04 15:54:52.000000000 -0400
26329@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { 26358@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
26330 NULL, 26359 NULL,
26331 }; 26360 };
@@ -26335,9 +26364,9 @@ diff -urNp linux-2.6.32.23/drivers/md/dm-sysfs.c linux-2.6.32.23/drivers/md/dm-s
26335 .show = dm_attr_show, 26364 .show = dm_attr_show,
26336 }; 26365 };
26337 26366
26338diff -urNp linux-2.6.32.23/drivers/md/dm-table.c linux-2.6.32.23/drivers/md/dm-table.c 26367diff -urNp linux-2.6.32.24/drivers/md/dm-table.c linux-2.6.32.24/drivers/md/dm-table.c
26339--- linux-2.6.32.23/drivers/md/dm-table.c 2010-08-13 16:24:37.000000000 -0400 26368--- linux-2.6.32.24/drivers/md/dm-table.c 2010-08-13 16:24:37.000000000 -0400
26340+++ linux-2.6.32.23/drivers/md/dm-table.c 2010-09-04 15:54:52.000000000 -0400 26369+++ linux-2.6.32.24/drivers/md/dm-table.c 2010-09-04 15:54:52.000000000 -0400
26341@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct 26370@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
26342 if (!dev_size) 26371 if (!dev_size)
26343 return 0; 26372 return 0;
@@ -26347,9 +26376,9 @@ diff -urNp linux-2.6.32.23/drivers/md/dm-table.c linux-2.6.32.23/drivers/md/dm-t
26347 DMWARN("%s: %s too small for target: " 26376 DMWARN("%s: %s too small for target: "
26348 "start=%llu, len=%llu, dev_size=%llu", 26377 "start=%llu, len=%llu, dev_size=%llu",
26349 dm_device_name(ti->table->md), bdevname(bdev, b), 26378 dm_device_name(ti->table->md), bdevname(bdev, b),
26350diff -urNp linux-2.6.32.23/drivers/md/md.c linux-2.6.32.23/drivers/md/md.c 26379diff -urNp linux-2.6.32.24/drivers/md/md.c linux-2.6.32.24/drivers/md/md.c
26351--- linux-2.6.32.23/drivers/md/md.c 2010-08-13 16:24:37.000000000 -0400 26380--- linux-2.6.32.24/drivers/md/md.c 2010-08-13 16:24:37.000000000 -0400
26352+++ linux-2.6.32.23/drivers/md/md.c 2010-09-04 15:54:52.000000000 -0400 26381+++ linux-2.6.32.24/drivers/md/md.c 2010-09-04 15:54:52.000000000 -0400
26353@@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko 26382@@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko
26354 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); 26383 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
26355 kfree(rdev); 26384 kfree(rdev);
@@ -26386,9 +26415,9 @@ diff -urNp linux-2.6.32.23/drivers/md/md.c linux-2.6.32.23/drivers/md/md.c
26386 /* sync IO will cause sync_io to increase before the disk_stats 26415 /* sync IO will cause sync_io to increase before the disk_stats
26387 * as sync_io is counted when a request starts, and 26416 * as sync_io is counted when a request starts, and
26388 * disk_stats is counted when it completes. 26417 * disk_stats is counted when it completes.
26389diff -urNp linux-2.6.32.23/drivers/md/md.h linux-2.6.32.23/drivers/md/md.h 26418diff -urNp linux-2.6.32.24/drivers/md/md.h linux-2.6.32.24/drivers/md/md.h
26390--- linux-2.6.32.23/drivers/md/md.h 2010-08-13 16:24:37.000000000 -0400 26419--- linux-2.6.32.24/drivers/md/md.h 2010-08-13 16:24:37.000000000 -0400
26391+++ linux-2.6.32.23/drivers/md/md.h 2010-09-04 15:54:52.000000000 -0400 26420+++ linux-2.6.32.24/drivers/md/md.h 2010-09-04 15:54:52.000000000 -0400
26392@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ 26421@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
26393 26422
26394 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) 26423 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
@@ -26398,9 +26427,9 @@ diff -urNp linux-2.6.32.23/drivers/md/md.h linux-2.6.32.23/drivers/md/md.h
26398 } 26427 }
26399 26428
26400 struct mdk_personality 26429 struct mdk_personality
26401diff -urNp linux-2.6.32.23/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.23/drivers/media/dvb/dvb-core/dvbdev.c 26430diff -urNp linux-2.6.32.24/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.24/drivers/media/dvb/dvb-core/dvbdev.c
26402--- linux-2.6.32.23/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-13 16:24:37.000000000 -0400 26431--- linux-2.6.32.24/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-13 16:24:37.000000000 -0400
26403+++ linux-2.6.32.23/drivers/media/dvb/dvb-core/dvbdev.c 2010-09-04 15:54:52.000000000 -0400 26432+++ linux-2.6.32.24/drivers/media/dvb/dvb-core/dvbdev.c 2010-09-04 15:54:52.000000000 -0400
26404@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt 26433@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
26405 const struct dvb_device *template, void *priv, int type) 26434 const struct dvb_device *template, void *priv, int type)
26406 { 26435 {
@@ -26409,9 +26438,9 @@ diff -urNp linux-2.6.32.23/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.23/d
26409 struct file_operations *dvbdevfops; 26438 struct file_operations *dvbdevfops;
26410 struct device *clsdev; 26439 struct device *clsdev;
26411 int minor; 26440 int minor;
26412diff -urNp linux-2.6.32.23/drivers/media/radio/radio-cadet.c linux-2.6.32.23/drivers/media/radio/radio-cadet.c 26441diff -urNp linux-2.6.32.24/drivers/media/radio/radio-cadet.c linux-2.6.32.24/drivers/media/radio/radio-cadet.c
26413--- linux-2.6.32.23/drivers/media/radio/radio-cadet.c 2010-08-13 16:24:37.000000000 -0400 26442--- linux-2.6.32.24/drivers/media/radio/radio-cadet.c 2010-08-13 16:24:37.000000000 -0400
26414+++ linux-2.6.32.23/drivers/media/radio/radio-cadet.c 2010-09-04 15:54:52.000000000 -0400 26443+++ linux-2.6.32.24/drivers/media/radio/radio-cadet.c 2010-09-04 15:54:52.000000000 -0400
26415@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f 26444@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
26416 while (i < count && dev->rdsin != dev->rdsout) 26445 while (i < count && dev->rdsin != dev->rdsout)
26417 readbuf[i++] = dev->rdsbuf[dev->rdsout++]; 26446 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
@@ -26421,9 +26450,9 @@ diff -urNp linux-2.6.32.23/drivers/media/radio/radio-cadet.c linux-2.6.32.23/dri
26421 return -EFAULT; 26450 return -EFAULT;
26422 return i; 26451 return i;
26423 } 26452 }
26424diff -urNp linux-2.6.32.23/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.23/drivers/media/video/usbvideo/konicawc.c 26453diff -urNp linux-2.6.32.24/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.24/drivers/media/video/usbvideo/konicawc.c
26425--- linux-2.6.32.23/drivers/media/video/usbvideo/konicawc.c 2010-08-13 16:24:37.000000000 -0400 26454--- linux-2.6.32.24/drivers/media/video/usbvideo/konicawc.c 2010-08-13 16:24:37.000000000 -0400
26426+++ linux-2.6.32.23/drivers/media/video/usbvideo/konicawc.c 2010-09-04 15:54:52.000000000 -0400 26455+++ linux-2.6.32.24/drivers/media/video/usbvideo/konicawc.c 2010-09-04 15:54:52.000000000 -0400
26427@@ -225,7 +225,7 @@ static void konicawc_register_input(stru 26456@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
26428 int error; 26457 int error;
26429 26458
@@ -26433,9 +26462,9 @@ diff -urNp linux-2.6.32.23/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
26433 26462
26434 cam->input = input_dev = input_allocate_device(); 26463 cam->input = input_dev = input_allocate_device();
26435 if (!input_dev) { 26464 if (!input_dev) {
26436diff -urNp linux-2.6.32.23/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.23/drivers/media/video/usbvideo/quickcam_messenger.c 26465diff -urNp linux-2.6.32.24/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.24/drivers/media/video/usbvideo/quickcam_messenger.c
26437--- linux-2.6.32.23/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-13 16:24:37.000000000 -0400 26466--- linux-2.6.32.24/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-13 16:24:37.000000000 -0400
26438+++ linux-2.6.32.23/drivers/media/video/usbvideo/quickcam_messenger.c 2010-09-04 15:54:52.000000000 -0400 26467+++ linux-2.6.32.24/drivers/media/video/usbvideo/quickcam_messenger.c 2010-09-04 15:54:52.000000000 -0400
26439@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc 26468@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
26440 int error; 26469 int error;
26441 26470
@@ -26445,9 +26474,9 @@ diff -urNp linux-2.6.32.23/drivers/media/video/usbvideo/quickcam_messenger.c lin
26445 26474
26446 cam->input = input_dev = input_allocate_device(); 26475 cam->input = input_dev = input_allocate_device();
26447 if (!input_dev) { 26476 if (!input_dev) {
26448diff -urNp linux-2.6.32.23/drivers/message/fusion/mptbase.c linux-2.6.32.23/drivers/message/fusion/mptbase.c 26477diff -urNp linux-2.6.32.24/drivers/message/fusion/mptbase.c linux-2.6.32.24/drivers/message/fusion/mptbase.c
26449--- linux-2.6.32.23/drivers/message/fusion/mptbase.c 2010-08-13 16:24:37.000000000 -0400 26478--- linux-2.6.32.24/drivers/message/fusion/mptbase.c 2010-08-13 16:24:37.000000000 -0400
26450+++ linux-2.6.32.23/drivers/message/fusion/mptbase.c 2010-09-14 21:32:19.000000000 -0400 26479+++ linux-2.6.32.24/drivers/message/fusion/mptbase.c 2010-09-14 21:32:19.000000000 -0400
26451@@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **s 26480@@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **s
26452 len += sprintf(buf+len, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth); 26481 len += sprintf(buf+len, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
26453 len += sprintf(buf+len, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize); 26482 len += sprintf(buf+len, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
@@ -26463,9 +26492,9 @@ diff -urNp linux-2.6.32.23/drivers/message/fusion/mptbase.c linux-2.6.32.23/driv
26463 /* 26492 /*
26464 * Rounding UP to nearest 4-kB boundary here... 26493 * Rounding UP to nearest 4-kB boundary here...
26465 */ 26494 */
26466diff -urNp linux-2.6.32.23/drivers/message/fusion/mptdebug.h linux-2.6.32.23/drivers/message/fusion/mptdebug.h 26495diff -urNp linux-2.6.32.24/drivers/message/fusion/mptdebug.h linux-2.6.32.24/drivers/message/fusion/mptdebug.h
26467--- linux-2.6.32.23/drivers/message/fusion/mptdebug.h 2010-08-13 16:24:37.000000000 -0400 26496--- linux-2.6.32.24/drivers/message/fusion/mptdebug.h 2010-08-13 16:24:37.000000000 -0400
26468+++ linux-2.6.32.23/drivers/message/fusion/mptdebug.h 2010-09-04 15:54:52.000000000 -0400 26497+++ linux-2.6.32.24/drivers/message/fusion/mptdebug.h 2010-09-04 15:54:52.000000000 -0400
26469@@ -71,7 +71,7 @@ 26498@@ -71,7 +71,7 @@
26470 CMD; \ 26499 CMD; \
26471 } 26500 }
@@ -26475,9 +26504,9 @@ diff -urNp linux-2.6.32.23/drivers/message/fusion/mptdebug.h linux-2.6.32.23/dri
26475 #endif 26504 #endif
26476 26505
26477 26506
26478diff -urNp linux-2.6.32.23/drivers/message/fusion/mptsas.c linux-2.6.32.23/drivers/message/fusion/mptsas.c 26507diff -urNp linux-2.6.32.24/drivers/message/fusion/mptsas.c linux-2.6.32.24/drivers/message/fusion/mptsas.c
26479--- linux-2.6.32.23/drivers/message/fusion/mptsas.c 2010-08-13 16:24:37.000000000 -0400 26508--- linux-2.6.32.24/drivers/message/fusion/mptsas.c 2010-08-13 16:24:37.000000000 -0400
26480+++ linux-2.6.32.23/drivers/message/fusion/mptsas.c 2010-09-04 15:54:52.000000000 -0400 26509+++ linux-2.6.32.24/drivers/message/fusion/mptsas.c 2010-09-04 15:54:52.000000000 -0400
26481@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin 26510@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
26482 return 0; 26511 return 0;
26483 } 26512 }
@@ -26526,9 +26555,9 @@ diff -urNp linux-2.6.32.23/drivers/message/fusion/mptsas.c linux-2.6.32.23/drive
26526 static inline struct sas_port * 26555 static inline struct sas_port *
26527 mptsas_get_port(struct mptsas_phyinfo *phy_info) 26556 mptsas_get_port(struct mptsas_phyinfo *phy_info)
26528 { 26557 {
26529diff -urNp linux-2.6.32.23/drivers/message/i2o/i2o_proc.c linux-2.6.32.23/drivers/message/i2o/i2o_proc.c 26558diff -urNp linux-2.6.32.24/drivers/message/i2o/i2o_proc.c linux-2.6.32.24/drivers/message/i2o/i2o_proc.c
26530--- linux-2.6.32.23/drivers/message/i2o/i2o_proc.c 2010-08-13 16:24:37.000000000 -0400 26559--- linux-2.6.32.24/drivers/message/i2o/i2o_proc.c 2010-08-13 16:24:37.000000000 -0400
26531+++ linux-2.6.32.23/drivers/message/i2o/i2o_proc.c 2010-09-04 15:54:52.000000000 -0400 26560+++ linux-2.6.32.24/drivers/message/i2o/i2o_proc.c 2010-09-04 15:54:52.000000000 -0400
26532@@ -259,13 +259,6 @@ static char *scsi_devices[] = { 26561@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
26533 "Array Controller Device" 26562 "Array Controller Device"
26534 }; 26563 };
@@ -26615,9 +26644,9 @@ diff -urNp linux-2.6.32.23/drivers/message/i2o/i2o_proc.c linux-2.6.32.23/driver
26615 26644
26616 return 0; 26645 return 0;
26617 } 26646 }
26618diff -urNp linux-2.6.32.23/drivers/misc/kgdbts.c linux-2.6.32.23/drivers/misc/kgdbts.c 26647diff -urNp linux-2.6.32.24/drivers/misc/kgdbts.c linux-2.6.32.24/drivers/misc/kgdbts.c
26619--- linux-2.6.32.23/drivers/misc/kgdbts.c 2010-08-13 16:24:37.000000000 -0400 26648--- linux-2.6.32.24/drivers/misc/kgdbts.c 2010-08-13 16:24:37.000000000 -0400
26620+++ linux-2.6.32.23/drivers/misc/kgdbts.c 2010-09-04 15:54:52.000000000 -0400 26649+++ linux-2.6.32.24/drivers/misc/kgdbts.c 2010-09-04 15:54:52.000000000 -0400
26621@@ -118,7 +118,7 @@ 26650@@ -118,7 +118,7 @@
26622 } while (0) 26651 } while (0)
26623 #define MAX_CONFIG_LEN 40 26652 #define MAX_CONFIG_LEN 40
@@ -26636,9 +26665,9 @@ diff -urNp linux-2.6.32.23/drivers/misc/kgdbts.c linux-2.6.32.23/drivers/misc/kg
26636 .name = "kgdbts", 26665 .name = "kgdbts",
26637 .read_char = kgdbts_get_char, 26666 .read_char = kgdbts_get_char,
26638 .write_char = kgdbts_put_char, 26667 .write_char = kgdbts_put_char,
26639diff -urNp linux-2.6.32.23/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.23/drivers/misc/sgi-gru/gruhandles.c 26668diff -urNp linux-2.6.32.24/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.24/drivers/misc/sgi-gru/gruhandles.c
26640--- linux-2.6.32.23/drivers/misc/sgi-gru/gruhandles.c 2010-08-13 16:24:37.000000000 -0400 26669--- linux-2.6.32.24/drivers/misc/sgi-gru/gruhandles.c 2010-08-13 16:24:37.000000000 -0400
26641+++ linux-2.6.32.23/drivers/misc/sgi-gru/gruhandles.c 2010-09-04 15:54:52.000000000 -0400 26670+++ linux-2.6.32.24/drivers/misc/sgi-gru/gruhandles.c 2010-09-04 15:54:52.000000000 -0400
26642@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic 26671@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
26643 26672
26644 static void update_mcs_stats(enum mcs_op op, unsigned long clks) 26673 static void update_mcs_stats(enum mcs_op op, unsigned long clks)
@@ -26650,9 +26679,9 @@ diff -urNp linux-2.6.32.23/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.23/dri
26650 if (mcs_op_statistics[op].max < clks) 26679 if (mcs_op_statistics[op].max < clks)
26651 mcs_op_statistics[op].max = clks; 26680 mcs_op_statistics[op].max = clks;
26652 } 26681 }
26653diff -urNp linux-2.6.32.23/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.23/drivers/misc/sgi-gru/gruprocfs.c 26682diff -urNp linux-2.6.32.24/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.24/drivers/misc/sgi-gru/gruprocfs.c
26654--- linux-2.6.32.23/drivers/misc/sgi-gru/gruprocfs.c 2010-08-13 16:24:37.000000000 -0400 26683--- linux-2.6.32.24/drivers/misc/sgi-gru/gruprocfs.c 2010-08-13 16:24:37.000000000 -0400
26655+++ linux-2.6.32.23/drivers/misc/sgi-gru/gruprocfs.c 2010-09-04 15:54:52.000000000 -0400 26684+++ linux-2.6.32.24/drivers/misc/sgi-gru/gruprocfs.c 2010-09-04 15:54:52.000000000 -0400
26656@@ -32,9 +32,9 @@ 26685@@ -32,9 +32,9 @@
26657 26686
26658 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) 26687 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -26676,9 +26705,9 @@ diff -urNp linux-2.6.32.23/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.23/driv
26676 max = mcs_op_statistics[op].max; 26705 max = mcs_op_statistics[op].max;
26677 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, 26706 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
26678 count ? total / count : 0, max); 26707 count ? total / count : 0, max);
26679diff -urNp linux-2.6.32.23/drivers/misc/sgi-gru/grutables.h linux-2.6.32.23/drivers/misc/sgi-gru/grutables.h 26708diff -urNp linux-2.6.32.24/drivers/misc/sgi-gru/grutables.h linux-2.6.32.24/drivers/misc/sgi-gru/grutables.h
26680--- linux-2.6.32.23/drivers/misc/sgi-gru/grutables.h 2010-08-13 16:24:37.000000000 -0400 26709--- linux-2.6.32.24/drivers/misc/sgi-gru/grutables.h 2010-08-13 16:24:37.000000000 -0400
26681+++ linux-2.6.32.23/drivers/misc/sgi-gru/grutables.h 2010-09-04 15:54:52.000000000 -0400 26710+++ linux-2.6.32.24/drivers/misc/sgi-gru/grutables.h 2010-09-04 15:54:52.000000000 -0400
26682@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; 26711@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
26683 * GRU statistics. 26712 * GRU statistics.
26684 */ 26713 */
@@ -26862,9 +26891,9 @@ diff -urNp linux-2.6.32.23/drivers/misc/sgi-gru/grutables.h linux-2.6.32.23/driv
26862 } while (0) 26891 } while (0)
26863 26892
26864 #ifdef CONFIG_SGI_GRU_DEBUG 26893 #ifdef CONFIG_SGI_GRU_DEBUG
26865diff -urNp linux-2.6.32.23/drivers/mtd/devices/doc2000.c linux-2.6.32.23/drivers/mtd/devices/doc2000.c 26894diff -urNp linux-2.6.32.24/drivers/mtd/devices/doc2000.c linux-2.6.32.24/drivers/mtd/devices/doc2000.c
26866--- linux-2.6.32.23/drivers/mtd/devices/doc2000.c 2010-08-13 16:24:37.000000000 -0400 26895--- linux-2.6.32.24/drivers/mtd/devices/doc2000.c 2010-08-13 16:24:37.000000000 -0400
26867+++ linux-2.6.32.23/drivers/mtd/devices/doc2000.c 2010-09-04 15:54:52.000000000 -0400 26896+++ linux-2.6.32.24/drivers/mtd/devices/doc2000.c 2010-09-04 15:54:52.000000000 -0400
26868@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt 26897@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
26869 26898
26870 /* The ECC will not be calculated correctly if less than 512 is written */ 26899 /* The ECC will not be calculated correctly if less than 512 is written */
@@ -26874,9 +26903,9 @@ diff -urNp linux-2.6.32.23/drivers/mtd/devices/doc2000.c linux-2.6.32.23/drivers
26874 printk(KERN_WARNING 26903 printk(KERN_WARNING
26875 "ECC needs a full sector write (adr: %lx size %lx)\n", 26904 "ECC needs a full sector write (adr: %lx size %lx)\n",
26876 (long) to, (long) len); 26905 (long) to, (long) len);
26877diff -urNp linux-2.6.32.23/drivers/mtd/devices/doc2001.c linux-2.6.32.23/drivers/mtd/devices/doc2001.c 26906diff -urNp linux-2.6.32.24/drivers/mtd/devices/doc2001.c linux-2.6.32.24/drivers/mtd/devices/doc2001.c
26878--- linux-2.6.32.23/drivers/mtd/devices/doc2001.c 2010-08-13 16:24:37.000000000 -0400 26907--- linux-2.6.32.24/drivers/mtd/devices/doc2001.c 2010-08-13 16:24:37.000000000 -0400
26879+++ linux-2.6.32.23/drivers/mtd/devices/doc2001.c 2010-09-04 15:54:52.000000000 -0400 26908+++ linux-2.6.32.24/drivers/mtd/devices/doc2001.c 2010-09-04 15:54:52.000000000 -0400
26880@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt 26909@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
26881 struct Nand *mychip = &this->chips[from >> (this->chipshift)]; 26910 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
26882 26911
@@ -26886,9 +26915,9 @@ diff -urNp linux-2.6.32.23/drivers/mtd/devices/doc2001.c linux-2.6.32.23/drivers
26886 return -EINVAL; 26915 return -EINVAL;
26887 26916
26888 /* Don't allow a single read to cross a 512-byte block boundary */ 26917 /* Don't allow a single read to cross a 512-byte block boundary */
26889diff -urNp linux-2.6.32.23/drivers/mtd/ubi/build.c linux-2.6.32.23/drivers/mtd/ubi/build.c 26918diff -urNp linux-2.6.32.24/drivers/mtd/ubi/build.c linux-2.6.32.24/drivers/mtd/ubi/build.c
26890--- linux-2.6.32.23/drivers/mtd/ubi/build.c 2010-08-13 16:24:37.000000000 -0400 26919--- linux-2.6.32.24/drivers/mtd/ubi/build.c 2010-08-13 16:24:37.000000000 -0400
26891+++ linux-2.6.32.23/drivers/mtd/ubi/build.c 2010-09-04 15:54:52.000000000 -0400 26920+++ linux-2.6.32.24/drivers/mtd/ubi/build.c 2010-09-04 15:54:52.000000000 -0400
26892@@ -1255,7 +1255,7 @@ module_exit(ubi_exit); 26921@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
26893 static int __init bytes_str_to_int(const char *str) 26922 static int __init bytes_str_to_int(const char *str)
26894 { 26923 {
@@ -26928,9 +26957,9 @@ diff -urNp linux-2.6.32.23/drivers/mtd/ubi/build.c linux-2.6.32.23/drivers/mtd/u
26928 } 26957 }
26929 26958
26930 /** 26959 /**
26931diff -urNp linux-2.6.32.23/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.23/drivers/net/cxgb3/cxgb3_main.c 26960diff -urNp linux-2.6.32.24/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.24/drivers/net/cxgb3/cxgb3_main.c
26932--- linux-2.6.32.23/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:26:05.000000000 -0400 26961--- linux-2.6.32.24/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:26:05.000000000 -0400
26933+++ linux-2.6.32.23/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:26:38.000000000 -0400 26962+++ linux-2.6.32.24/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:26:38.000000000 -0400
26934@@ -2275,7 +2275,7 @@ static int cxgb_extension_ioctl(struct n 26963@@ -2275,7 +2275,7 @@ static int cxgb_extension_ioctl(struct n
26935 case CHELSIO_GET_QSET_NUM:{ 26964 case CHELSIO_GET_QSET_NUM:{
26936 struct ch_reg edata; 26965 struct ch_reg edata;
@@ -26940,9 +26969,9 @@ diff -urNp linux-2.6.32.23/drivers/net/cxgb3/cxgb3_main.c linux-2.6.32.23/driver
26940 26969
26941 edata.cmd = CHELSIO_GET_QSET_NUM; 26970 edata.cmd = CHELSIO_GET_QSET_NUM;
26942 edata.val = pi->nqsets; 26971 edata.val = pi->nqsets;
26943diff -urNp linux-2.6.32.23/drivers/net/e1000e/82571.c linux-2.6.32.23/drivers/net/e1000e/82571.c 26972diff -urNp linux-2.6.32.24/drivers/net/e1000e/82571.c linux-2.6.32.24/drivers/net/e1000e/82571.c
26944--- linux-2.6.32.23/drivers/net/e1000e/82571.c 2010-08-13 16:24:37.000000000 -0400 26973--- linux-2.6.32.24/drivers/net/e1000e/82571.c 2010-08-13 16:24:37.000000000 -0400
26945+++ linux-2.6.32.23/drivers/net/e1000e/82571.c 2010-09-04 15:54:52.000000000 -0400 26974+++ linux-2.6.32.24/drivers/net/e1000e/82571.c 2010-09-04 15:54:52.000000000 -0400
26946@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s 26975@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
26947 { 26976 {
26948 struct e1000_hw *hw = &adapter->hw; 26977 struct e1000_hw *hw = &adapter->hw;
@@ -26996,9 +27025,9 @@ diff -urNp linux-2.6.32.23/drivers/net/e1000e/82571.c linux-2.6.32.23/drivers/ne
26996 .acquire_nvm = e1000_acquire_nvm_82571, 27025 .acquire_nvm = e1000_acquire_nvm_82571,
26997 .read_nvm = e1000e_read_nvm_eerd, 27026 .read_nvm = e1000e_read_nvm_eerd,
26998 .release_nvm = e1000_release_nvm_82571, 27027 .release_nvm = e1000_release_nvm_82571,
26999diff -urNp linux-2.6.32.23/drivers/net/e1000e/e1000.h linux-2.6.32.23/drivers/net/e1000e/e1000.h 27028diff -urNp linux-2.6.32.24/drivers/net/e1000e/e1000.h linux-2.6.32.24/drivers/net/e1000e/e1000.h
27000--- linux-2.6.32.23/drivers/net/e1000e/e1000.h 2010-08-13 16:24:37.000000000 -0400 27029--- linux-2.6.32.24/drivers/net/e1000e/e1000.h 2010-08-13 16:24:37.000000000 -0400
27001+++ linux-2.6.32.23/drivers/net/e1000e/e1000.h 2010-09-04 15:54:52.000000000 -0400 27030+++ linux-2.6.32.24/drivers/net/e1000e/e1000.h 2010-09-04 15:54:52.000000000 -0400
27002@@ -375,9 +375,9 @@ struct e1000_info { 27031@@ -375,9 +375,9 @@ struct e1000_info {
27003 u32 pba; 27032 u32 pba;
27004 u32 max_hw_frame_size; 27033 u32 max_hw_frame_size;
@@ -27012,9 +27041,9 @@ diff -urNp linux-2.6.32.23/drivers/net/e1000e/e1000.h linux-2.6.32.23/drivers/ne
27012 }; 27041 };
27013 27042
27014 /* hardware capability, feature, and workaround flags */ 27043 /* hardware capability, feature, and workaround flags */
27015diff -urNp linux-2.6.32.23/drivers/net/e1000e/es2lan.c linux-2.6.32.23/drivers/net/e1000e/es2lan.c 27044diff -urNp linux-2.6.32.24/drivers/net/e1000e/es2lan.c linux-2.6.32.24/drivers/net/e1000e/es2lan.c
27016--- linux-2.6.32.23/drivers/net/e1000e/es2lan.c 2010-08-13 16:24:37.000000000 -0400 27045--- linux-2.6.32.24/drivers/net/e1000e/es2lan.c 2010-08-13 16:24:37.000000000 -0400
27017+++ linux-2.6.32.23/drivers/net/e1000e/es2lan.c 2010-09-04 15:54:52.000000000 -0400 27046+++ linux-2.6.32.24/drivers/net/e1000e/es2lan.c 2010-09-04 15:54:52.000000000 -0400
27018@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es 27047@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
27019 { 27048 {
27020 struct e1000_hw *hw = &adapter->hw; 27049 struct e1000_hw *hw = &adapter->hw;
@@ -27050,9 +27079,9 @@ diff -urNp linux-2.6.32.23/drivers/net/e1000e/es2lan.c linux-2.6.32.23/drivers/n
27050 .acquire_nvm = e1000_acquire_nvm_80003es2lan, 27079 .acquire_nvm = e1000_acquire_nvm_80003es2lan,
27051 .read_nvm = e1000e_read_nvm_eerd, 27080 .read_nvm = e1000e_read_nvm_eerd,
27052 .release_nvm = e1000_release_nvm_80003es2lan, 27081 .release_nvm = e1000_release_nvm_80003es2lan,
27053diff -urNp linux-2.6.32.23/drivers/net/e1000e/hw.h linux-2.6.32.23/drivers/net/e1000e/hw.h 27082diff -urNp linux-2.6.32.24/drivers/net/e1000e/hw.h linux-2.6.32.24/drivers/net/e1000e/hw.h
27054--- linux-2.6.32.23/drivers/net/e1000e/hw.h 2010-08-13 16:24:37.000000000 -0400 27083--- linux-2.6.32.24/drivers/net/e1000e/hw.h 2010-08-13 16:24:37.000000000 -0400
27055+++ linux-2.6.32.23/drivers/net/e1000e/hw.h 2010-09-04 15:54:52.000000000 -0400 27084+++ linux-2.6.32.24/drivers/net/e1000e/hw.h 2010-09-04 15:54:52.000000000 -0400
27056@@ -756,34 +756,34 @@ struct e1000_mac_operations { 27085@@ -756,34 +756,34 @@ struct e1000_mac_operations {
27057 27086
27058 /* Function pointers for the PHY. */ 27087 /* Function pointers for the PHY. */
@@ -27112,9 +27141,9 @@ diff -urNp linux-2.6.32.23/drivers/net/e1000e/hw.h linux-2.6.32.23/drivers/net/e
27112 }; 27141 };
27113 27142
27114 struct e1000_mac_info { 27143 struct e1000_mac_info {
27115diff -urNp linux-2.6.32.23/drivers/net/e1000e/ich8lan.c linux-2.6.32.23/drivers/net/e1000e/ich8lan.c 27144diff -urNp linux-2.6.32.24/drivers/net/e1000e/ich8lan.c linux-2.6.32.24/drivers/net/e1000e/ich8lan.c
27116--- linux-2.6.32.23/drivers/net/e1000e/ich8lan.c 2010-08-13 16:24:37.000000000 -0400 27145--- linux-2.6.32.24/drivers/net/e1000e/ich8lan.c 2010-08-13 16:24:37.000000000 -0400
27117+++ linux-2.6.32.23/drivers/net/e1000e/ich8lan.c 2010-09-04 15:54:52.000000000 -0400 27146+++ linux-2.6.32.24/drivers/net/e1000e/ich8lan.c 2010-09-04 15:54:52.000000000 -0400
27118@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan 27147@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
27119 } 27148 }
27120 } 27149 }
@@ -27142,9 +27171,9 @@ diff -urNp linux-2.6.32.23/drivers/net/e1000e/ich8lan.c linux-2.6.32.23/drivers/
27142 .acquire_nvm = e1000_acquire_nvm_ich8lan, 27171 .acquire_nvm = e1000_acquire_nvm_ich8lan,
27143 .read_nvm = e1000_read_nvm_ich8lan, 27172 .read_nvm = e1000_read_nvm_ich8lan,
27144 .release_nvm = e1000_release_nvm_ich8lan, 27173 .release_nvm = e1000_release_nvm_ich8lan,
27145diff -urNp linux-2.6.32.23/drivers/net/eql.c linux-2.6.32.23/drivers/net/eql.c 27174diff -urNp linux-2.6.32.24/drivers/net/eql.c linux-2.6.32.24/drivers/net/eql.c
27146--- linux-2.6.32.23/drivers/net/eql.c 2010-09-26 17:26:05.000000000 -0400 27175--- linux-2.6.32.24/drivers/net/eql.c 2010-09-26 17:26:05.000000000 -0400
27147+++ linux-2.6.32.23/drivers/net/eql.c 2010-09-26 17:26:38.000000000 -0400 27176+++ linux-2.6.32.24/drivers/net/eql.c 2010-09-26 17:26:38.000000000 -0400
27148@@ -554,7 +554,7 @@ static int eql_g_master_cfg(struct net_d 27177@@ -554,7 +554,7 @@ static int eql_g_master_cfg(struct net_d
27149 equalizer_t *eql; 27178 equalizer_t *eql;
27150 master_config_t mc; 27179 master_config_t mc;
@@ -27154,9 +27183,9 @@ diff -urNp linux-2.6.32.23/drivers/net/eql.c linux-2.6.32.23/drivers/net/eql.c
27154 27183
27155 if (eql_is_master(dev)) { 27184 if (eql_is_master(dev)) {
27156 eql = netdev_priv(dev); 27185 eql = netdev_priv(dev);
27157diff -urNp linux-2.6.32.23/drivers/net/ibmveth.c linux-2.6.32.23/drivers/net/ibmveth.c 27186diff -urNp linux-2.6.32.24/drivers/net/ibmveth.c linux-2.6.32.24/drivers/net/ibmveth.c
27158--- linux-2.6.32.23/drivers/net/ibmveth.c 2010-08-13 16:24:37.000000000 -0400 27187--- linux-2.6.32.24/drivers/net/ibmveth.c 2010-08-13 16:24:37.000000000 -0400
27159+++ linux-2.6.32.23/drivers/net/ibmveth.c 2010-09-04 15:54:52.000000000 -0400 27188+++ linux-2.6.32.24/drivers/net/ibmveth.c 2010-09-04 15:54:52.000000000 -0400
27160@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr 27189@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
27161 NULL, 27190 NULL,
27162 }; 27191 };
@@ -27166,9 +27195,9 @@ diff -urNp linux-2.6.32.23/drivers/net/ibmveth.c linux-2.6.32.23/drivers/net/ibm
27166 .show = veth_pool_show, 27195 .show = veth_pool_show,
27167 .store = veth_pool_store, 27196 .store = veth_pool_store,
27168 }; 27197 };
27169diff -urNp linux-2.6.32.23/drivers/net/igb/e1000_82575.c linux-2.6.32.23/drivers/net/igb/e1000_82575.c 27198diff -urNp linux-2.6.32.24/drivers/net/igb/e1000_82575.c linux-2.6.32.24/drivers/net/igb/e1000_82575.c
27170--- linux-2.6.32.23/drivers/net/igb/e1000_82575.c 2010-08-13 16:24:37.000000000 -0400 27199--- linux-2.6.32.24/drivers/net/igb/e1000_82575.c 2010-08-13 16:24:37.000000000 -0400
27171+++ linux-2.6.32.23/drivers/net/igb/e1000_82575.c 2010-09-04 15:54:52.000000000 -0400 27200+++ linux-2.6.32.24/drivers/net/igb/e1000_82575.c 2010-09-04 15:54:52.000000000 -0400
27172@@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct 27201@@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct
27173 wr32(E1000_VT_CTL, vt_ctl); 27202 wr32(E1000_VT_CTL, vt_ctl);
27174 } 27203 }
@@ -27194,9 +27223,9 @@ diff -urNp linux-2.6.32.23/drivers/net/igb/e1000_82575.c linux-2.6.32.23/drivers
27194 .acquire = igb_acquire_nvm_82575, 27223 .acquire = igb_acquire_nvm_82575,
27195 .read = igb_read_nvm_eerd, 27224 .read = igb_read_nvm_eerd,
27196 .release = igb_release_nvm_82575, 27225 .release = igb_release_nvm_82575,
27197diff -urNp linux-2.6.32.23/drivers/net/igb/e1000_hw.h linux-2.6.32.23/drivers/net/igb/e1000_hw.h 27226diff -urNp linux-2.6.32.24/drivers/net/igb/e1000_hw.h linux-2.6.32.24/drivers/net/igb/e1000_hw.h
27198--- linux-2.6.32.23/drivers/net/igb/e1000_hw.h 2010-08-13 16:24:37.000000000 -0400 27227--- linux-2.6.32.24/drivers/net/igb/e1000_hw.h 2010-08-13 16:24:37.000000000 -0400
27199+++ linux-2.6.32.23/drivers/net/igb/e1000_hw.h 2010-09-04 15:54:52.000000000 -0400 27228+++ linux-2.6.32.24/drivers/net/igb/e1000_hw.h 2010-09-04 15:54:52.000000000 -0400
27200@@ -305,17 +305,17 @@ struct e1000_phy_operations { 27229@@ -305,17 +305,17 @@ struct e1000_phy_operations {
27201 }; 27230 };
27202 27231
@@ -27222,9 +27251,9 @@ diff -urNp linux-2.6.32.23/drivers/net/igb/e1000_hw.h linux-2.6.32.23/drivers/ne
27222 }; 27251 };
27223 27252
27224 extern const struct e1000_info e1000_82575_info; 27253 extern const struct e1000_info e1000_82575_info;
27225diff -urNp linux-2.6.32.23/drivers/net/irda/vlsi_ir.c linux-2.6.32.23/drivers/net/irda/vlsi_ir.c 27254diff -urNp linux-2.6.32.24/drivers/net/irda/vlsi_ir.c linux-2.6.32.24/drivers/net/irda/vlsi_ir.c
27226--- linux-2.6.32.23/drivers/net/irda/vlsi_ir.c 2010-08-13 16:24:37.000000000 -0400 27255--- linux-2.6.32.24/drivers/net/irda/vlsi_ir.c 2010-08-13 16:24:37.000000000 -0400
27227+++ linux-2.6.32.23/drivers/net/irda/vlsi_ir.c 2010-09-04 15:54:52.000000000 -0400 27256+++ linux-2.6.32.24/drivers/net/irda/vlsi_ir.c 2010-09-04 15:54:52.000000000 -0400
27228@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( 27257@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
27229 /* no race - tx-ring already empty */ 27258 /* no race - tx-ring already empty */
27230 vlsi_set_baud(idev, iobase); 27259 vlsi_set_baud(idev, iobase);
@@ -27241,9 +27270,9 @@ diff -urNp linux-2.6.32.23/drivers/net/irda/vlsi_ir.c linux-2.6.32.23/drivers/ne
27241 spin_unlock_irqrestore(&idev->lock, flags); 27270 spin_unlock_irqrestore(&idev->lock, flags);
27242 dev_kfree_skb_any(skb); 27271 dev_kfree_skb_any(skb);
27243 return NETDEV_TX_OK; 27272 return NETDEV_TX_OK;
27244diff -urNp linux-2.6.32.23/drivers/net/iseries_veth.c linux-2.6.32.23/drivers/net/iseries_veth.c 27273diff -urNp linux-2.6.32.24/drivers/net/iseries_veth.c linux-2.6.32.24/drivers/net/iseries_veth.c
27245--- linux-2.6.32.23/drivers/net/iseries_veth.c 2010-08-13 16:24:37.000000000 -0400 27274--- linux-2.6.32.24/drivers/net/iseries_veth.c 2010-08-13 16:24:37.000000000 -0400
27246+++ linux-2.6.32.23/drivers/net/iseries_veth.c 2010-09-04 15:54:52.000000000 -0400 27275+++ linux-2.6.32.24/drivers/net/iseries_veth.c 2010-09-04 15:54:52.000000000 -0400
27247@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul 27276@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
27248 NULL 27277 NULL
27249 }; 27278 };
@@ -27262,9 +27291,9 @@ diff -urNp linux-2.6.32.23/drivers/net/iseries_veth.c linux-2.6.32.23/drivers/ne
27262 .show = veth_port_attribute_show 27291 .show = veth_port_attribute_show
27263 }; 27292 };
27264 27293
27265diff -urNp linux-2.6.32.23/drivers/net/pcnet32.c linux-2.6.32.23/drivers/net/pcnet32.c 27294diff -urNp linux-2.6.32.24/drivers/net/pcnet32.c linux-2.6.32.24/drivers/net/pcnet32.c
27266--- linux-2.6.32.23/drivers/net/pcnet32.c 2010-08-13 16:24:37.000000000 -0400 27295--- linux-2.6.32.24/drivers/net/pcnet32.c 2010-08-13 16:24:37.000000000 -0400
27267+++ linux-2.6.32.23/drivers/net/pcnet32.c 2010-09-04 15:54:52.000000000 -0400 27296+++ linux-2.6.32.24/drivers/net/pcnet32.c 2010-09-04 15:54:52.000000000 -0400
27268@@ -79,7 +79,7 @@ static int cards_found; 27297@@ -79,7 +79,7 @@ static int cards_found;
27269 /* 27298 /*
27270 * VLB I/O addresses 27299 * VLB I/O addresses
@@ -27274,9 +27303,9 @@ diff -urNp linux-2.6.32.23/drivers/net/pcnet32.c linux-2.6.32.23/drivers/net/pcn
27274 { 0x300, 0x320, 0x340, 0x360, 0 }; 27303 { 0x300, 0x320, 0x340, 0x360, 0 };
27275 27304
27276 static int pcnet32_debug = 0; 27305 static int pcnet32_debug = 0;
27277diff -urNp linux-2.6.32.23/drivers/net/tg3.h linux-2.6.32.23/drivers/net/tg3.h 27306diff -urNp linux-2.6.32.24/drivers/net/tg3.h linux-2.6.32.24/drivers/net/tg3.h
27278--- linux-2.6.32.23/drivers/net/tg3.h 2010-08-13 16:24:37.000000000 -0400 27307--- linux-2.6.32.24/drivers/net/tg3.h 2010-08-13 16:24:37.000000000 -0400
27279+++ linux-2.6.32.23/drivers/net/tg3.h 2010-09-04 15:54:52.000000000 -0400 27308+++ linux-2.6.32.24/drivers/net/tg3.h 2010-09-04 15:54:52.000000000 -0400
27280@@ -95,6 +95,7 @@ 27309@@ -95,6 +95,7 @@
27281 #define CHIPREV_ID_5750_A0 0x4000 27310 #define CHIPREV_ID_5750_A0 0x4000
27282 #define CHIPREV_ID_5750_A1 0x4001 27311 #define CHIPREV_ID_5750_A1 0x4001
@@ -27285,9 +27314,9 @@ diff -urNp linux-2.6.32.23/drivers/net/tg3.h linux-2.6.32.23/drivers/net/tg3.h
27285 #define CHIPREV_ID_5750_C2 0x4202 27314 #define CHIPREV_ID_5750_C2 0x4202
27286 #define CHIPREV_ID_5752_A0_HW 0x5000 27315 #define CHIPREV_ID_5752_A0_HW 0x5000
27287 #define CHIPREV_ID_5752_A0 0x6000 27316 #define CHIPREV_ID_5752_A0 0x6000
27288diff -urNp linux-2.6.32.23/drivers/net/tulip/de4x5.c linux-2.6.32.23/drivers/net/tulip/de4x5.c 27317diff -urNp linux-2.6.32.24/drivers/net/tulip/de4x5.c linux-2.6.32.24/drivers/net/tulip/de4x5.c
27289--- linux-2.6.32.23/drivers/net/tulip/de4x5.c 2010-08-13 16:24:37.000000000 -0400 27318--- linux-2.6.32.24/drivers/net/tulip/de4x5.c 2010-08-13 16:24:37.000000000 -0400
27290+++ linux-2.6.32.23/drivers/net/tulip/de4x5.c 2010-09-16 14:26:16.000000000 -0400 27319+++ linux-2.6.32.24/drivers/net/tulip/de4x5.c 2010-09-16 14:26:16.000000000 -0400
27291@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru 27320@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
27292 for (i=0; i<ETH_ALEN; i++) { 27321 for (i=0; i<ETH_ALEN; i++) {
27293 tmp.addr[i] = dev->dev_addr[i]; 27322 tmp.addr[i] = dev->dev_addr[i];
@@ -27315,9 +27344,9 @@ diff -urNp linux-2.6.32.23/drivers/net/tulip/de4x5.c linux-2.6.32.23/drivers/net
27315 break; 27344 break;
27316 27345
27317 #define DE4X5_DUMP 0x0f /* Dump the DE4X5 Status */ 27346 #define DE4X5_DUMP 0x0f /* Dump the DE4X5 Status */
27318diff -urNp linux-2.6.32.23/drivers/net/usb/hso.c linux-2.6.32.23/drivers/net/usb/hso.c 27347diff -urNp linux-2.6.32.24/drivers/net/usb/hso.c linux-2.6.32.24/drivers/net/usb/hso.c
27319--- linux-2.6.32.23/drivers/net/usb/hso.c 2010-09-26 17:26:05.000000000 -0400 27348--- linux-2.6.32.24/drivers/net/usb/hso.c 2010-09-26 17:26:05.000000000 -0400
27320+++ linux-2.6.32.23/drivers/net/usb/hso.c 2010-09-26 17:26:38.000000000 -0400 27349+++ linux-2.6.32.24/drivers/net/usb/hso.c 2010-09-26 17:26:38.000000000 -0400
27321@@ -258,7 +258,7 @@ struct hso_serial { 27350@@ -258,7 +258,7 @@ struct hso_serial {
27322 27351
27323 /* from usb_serial_port */ 27352 /* from usb_serial_port */
@@ -27410,9 +27439,9 @@ diff -urNp linux-2.6.32.23/drivers/net/usb/hso.c linux-2.6.32.23/drivers/net/usb
27410 result = 27439 result =
27411 hso_start_serial_device(serial_table[i], GFP_NOIO); 27440 hso_start_serial_device(serial_table[i], GFP_NOIO);
27412 hso_kick_transmit(dev2ser(serial_table[i])); 27441 hso_kick_transmit(dev2ser(serial_table[i]));
27413diff -urNp linux-2.6.32.23/drivers/net/wireless/b43/debugfs.c linux-2.6.32.23/drivers/net/wireless/b43/debugfs.c 27442diff -urNp linux-2.6.32.24/drivers/net/wireless/b43/debugfs.c linux-2.6.32.24/drivers/net/wireless/b43/debugfs.c
27414--- linux-2.6.32.23/drivers/net/wireless/b43/debugfs.c 2010-08-13 16:24:37.000000000 -0400 27443--- linux-2.6.32.24/drivers/net/wireless/b43/debugfs.c 2010-08-13 16:24:37.000000000 -0400
27415+++ linux-2.6.32.23/drivers/net/wireless/b43/debugfs.c 2010-09-04 15:54:52.000000000 -0400 27444+++ linux-2.6.32.24/drivers/net/wireless/b43/debugfs.c 2010-09-04 15:54:52.000000000 -0400
27416@@ -43,7 +43,7 @@ static struct dentry *rootdir; 27445@@ -43,7 +43,7 @@ static struct dentry *rootdir;
27417 struct b43_debugfs_fops { 27446 struct b43_debugfs_fops {
27418 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); 27447 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -27422,9 +27451,9 @@ diff -urNp linux-2.6.32.23/drivers/net/wireless/b43/debugfs.c linux-2.6.32.23/dr
27422 /* Offset of struct b43_dfs_file in struct b43_dfsentry */ 27451 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
27423 size_t file_struct_offset; 27452 size_t file_struct_offset;
27424 }; 27453 };
27425diff -urNp linux-2.6.32.23/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.23/drivers/net/wireless/b43legacy/debugfs.c 27454diff -urNp linux-2.6.32.24/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.24/drivers/net/wireless/b43legacy/debugfs.c
27426--- linux-2.6.32.23/drivers/net/wireless/b43legacy/debugfs.c 2010-08-13 16:24:37.000000000 -0400 27455--- linux-2.6.32.24/drivers/net/wireless/b43legacy/debugfs.c 2010-08-13 16:24:37.000000000 -0400
27427+++ linux-2.6.32.23/drivers/net/wireless/b43legacy/debugfs.c 2010-09-04 15:54:52.000000000 -0400 27456+++ linux-2.6.32.24/drivers/net/wireless/b43legacy/debugfs.c 2010-09-04 15:54:52.000000000 -0400
27428@@ -44,7 +44,7 @@ static struct dentry *rootdir; 27457@@ -44,7 +44,7 @@ static struct dentry *rootdir;
27429 struct b43legacy_debugfs_fops { 27458 struct b43legacy_debugfs_fops {
27430 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); 27459 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -27434,9 +27463,9 @@ diff -urNp linux-2.6.32.23/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32
27434 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ 27463 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
27435 size_t file_struct_offset; 27464 size_t file_struct_offset;
27436 /* Take wl->irq_lock before calling read/write? */ 27465 /* Take wl->irq_lock before calling read/write? */
27437diff -urNp linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-1000.c 27466diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-1000.c
27438--- linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-13 16:24:37.000000000 -0400 27467--- linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-13 16:24:37.000000000 -0400
27439+++ linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-09-04 15:54:52.000000000 -0400 27468+++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-09-04 15:54:52.000000000 -0400
27440@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = 27469@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
27441 }, 27470 },
27442 }; 27471 };
@@ -27446,9 +27475,9 @@ diff -urNp linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
27446 .ucode = &iwl5000_ucode, 27475 .ucode = &iwl5000_ucode,
27447 .lib = &iwl1000_lib, 27476 .lib = &iwl1000_lib,
27448 .hcmd = &iwl5000_hcmd, 27477 .hcmd = &iwl5000_hcmd,
27449diff -urNp linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-3945.c 27478diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-3945.c
27450--- linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-13 16:24:37.000000000 -0400 27479--- linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-13 16:24:37.000000000 -0400
27451+++ linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-09-04 15:54:52.000000000 -0400 27480+++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-09-04 15:54:52.000000000 -0400
27452@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 27481@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
27453 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, 27482 .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
27454 }; 27483 };
@@ -27458,9 +27487,9 @@ diff -urNp linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.
27458 .ucode = &iwl3945_ucode, 27487 .ucode = &iwl3945_ucode,
27459 .lib = &iwl3945_lib, 27488 .lib = &iwl3945_lib,
27460 .hcmd = &iwl3945_hcmd, 27489 .hcmd = &iwl3945_hcmd,
27461diff -urNp linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-4965.c 27490diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-4965.c
27462--- linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-13 16:24:37.000000000 -0400 27491--- linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-13 16:24:37.000000000 -0400
27463+++ linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-09-04 15:54:52.000000000 -0400 27492+++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-09-04 15:54:52.000000000 -0400
27464@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = 27493@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib =
27465 }, 27494 },
27466 }; 27495 };
@@ -27470,9 +27499,9 @@ diff -urNp linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.
27470 .ucode = &iwl4965_ucode, 27499 .ucode = &iwl4965_ucode,
27471 .lib = &iwl4965_lib, 27500 .lib = &iwl4965_lib,
27472 .hcmd = &iwl4965_hcmd, 27501 .hcmd = &iwl4965_hcmd,
27473diff -urNp linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-5000.c 27502diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-5000.c
27474--- linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-13 16:24:37.000000000 -0400 27503--- linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-13 16:24:37.000000000 -0400
27475+++ linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-09-04 15:54:52.000000000 -0400 27504+++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-09-04 15:54:52.000000000 -0400
27476@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = 27505@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib =
27477 }, 27506 },
27478 }; 27507 };
@@ -27490,9 +27519,9 @@ diff -urNp linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.
27490 .ucode = &iwl5000_ucode, 27519 .ucode = &iwl5000_ucode,
27491 .lib = &iwl5150_lib, 27520 .lib = &iwl5150_lib,
27492 .hcmd = &iwl5000_hcmd, 27521 .hcmd = &iwl5000_hcmd,
27493diff -urNp linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-6000.c 27522diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-6000.c
27494--- linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-13 16:24:37.000000000 -0400 27523--- linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-13 16:24:37.000000000 -0400
27495+++ linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-09-04 15:54:52.000000000 -0400 27524+++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-09-04 15:54:52.000000000 -0400
27496@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 27525@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
27497 .calc_rssi = iwl5000_calc_rssi, 27526 .calc_rssi = iwl5000_calc_rssi,
27498 }; 27527 };
@@ -27502,9 +27531,9 @@ diff -urNp linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
27502 .ucode = &iwl5000_ucode, 27531 .ucode = &iwl5000_ucode,
27503 .lib = &iwl6000_lib, 27532 .lib = &iwl6000_lib,
27504 .hcmd = &iwl5000_hcmd, 27533 .hcmd = &iwl5000_hcmd,
27505diff -urNp linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-debug.h 27534diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-debug.h
27506--- linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-13 16:24:37.000000000 -0400 27535--- linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-13 16:24:37.000000000 -0400
27507+++ linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-09-04 15:54:52.000000000 -0400 27536+++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-09-04 15:54:52.000000000 -0400
27508@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri 27537@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
27509 #endif 27538 #endif
27510 27539
@@ -27516,9 +27545,9 @@ diff -urNp linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32
27516 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, 27545 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
27517 void *p, u32 len) 27546 void *p, u32 len)
27518 {} 27547 {}
27519diff -urNp linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-dev.h 27548diff -urNp linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-dev.h
27520--- linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-13 16:24:37.000000000 -0400 27549--- linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-13 16:24:37.000000000 -0400
27521+++ linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-09-04 15:54:52.000000000 -0400 27550+++ linux-2.6.32.24/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-09-04 15:54:52.000000000 -0400
27522@@ -68,7 +68,7 @@ struct iwl_tx_queue; 27551@@ -68,7 +68,7 @@ struct iwl_tx_queue;
27523 27552
27524 /* shared structures from iwl-5000.c */ 27553 /* shared structures from iwl-5000.c */
@@ -27528,9 +27557,9 @@ diff -urNp linux-2.6.32.23/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.2
27528 extern struct iwl_ucode_ops iwl5000_ucode; 27557 extern struct iwl_ucode_ops iwl5000_ucode;
27529 extern struct iwl_lib_ops iwl5000_lib; 27558 extern struct iwl_lib_ops iwl5000_lib;
27530 extern struct iwl_hcmd_ops iwl5000_hcmd; 27559 extern struct iwl_hcmd_ops iwl5000_hcmd;
27531diff -urNp linux-2.6.32.23/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.23/drivers/net/wireless/libertas/debugfs.c 27560diff -urNp linux-2.6.32.24/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.24/drivers/net/wireless/libertas/debugfs.c
27532--- linux-2.6.32.23/drivers/net/wireless/libertas/debugfs.c 2010-08-13 16:24:37.000000000 -0400 27561--- linux-2.6.32.24/drivers/net/wireless/libertas/debugfs.c 2010-08-13 16:24:37.000000000 -0400
27533+++ linux-2.6.32.23/drivers/net/wireless/libertas/debugfs.c 2010-09-04 15:54:52.000000000 -0400 27562+++ linux-2.6.32.24/drivers/net/wireless/libertas/debugfs.c 2010-09-04 15:54:52.000000000 -0400
27534@@ -708,7 +708,7 @@ out_unlock: 27563@@ -708,7 +708,7 @@ out_unlock:
27535 struct lbs_debugfs_files { 27564 struct lbs_debugfs_files {
27536 const char *name; 27565 const char *name;
@@ -27540,9 +27569,9 @@ diff -urNp linux-2.6.32.23/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
27540 }; 27569 };
27541 27570
27542 static const struct lbs_debugfs_files debugfs_files[] = { 27571 static const struct lbs_debugfs_files debugfs_files[] = {
27543diff -urNp linux-2.6.32.23/drivers/net/wireless/rndis_wlan.c linux-2.6.32.23/drivers/net/wireless/rndis_wlan.c 27572diff -urNp linux-2.6.32.24/drivers/net/wireless/rndis_wlan.c linux-2.6.32.24/drivers/net/wireless/rndis_wlan.c
27544--- linux-2.6.32.23/drivers/net/wireless/rndis_wlan.c 2010-08-13 16:24:37.000000000 -0400 27573--- linux-2.6.32.24/drivers/net/wireless/rndis_wlan.c 2010-08-13 16:24:37.000000000 -0400
27545+++ linux-2.6.32.23/drivers/net/wireless/rndis_wlan.c 2010-09-04 15:54:52.000000000 -0400 27574+++ linux-2.6.32.24/drivers/net/wireless/rndis_wlan.c 2010-09-04 15:54:52.000000000 -0400
27546@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn 27575@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
27547 27576
27548 devdbg(usbdev, "set_rts_threshold %i", rts_threshold); 27577 devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
@@ -27552,9 +27581,9 @@ diff -urNp linux-2.6.32.23/drivers/net/wireless/rndis_wlan.c linux-2.6.32.23/dri
27552 rts_threshold = 2347; 27581 rts_threshold = 2347;
27553 27582
27554 tmp = cpu_to_le32(rts_threshold); 27583 tmp = cpu_to_le32(rts_threshold);
27555diff -urNp linux-2.6.32.23/drivers/oprofile/buffer_sync.c linux-2.6.32.23/drivers/oprofile/buffer_sync.c 27584diff -urNp linux-2.6.32.24/drivers/oprofile/buffer_sync.c linux-2.6.32.24/drivers/oprofile/buffer_sync.c
27556--- linux-2.6.32.23/drivers/oprofile/buffer_sync.c 2010-09-20 17:26:42.000000000 -0400 27585--- linux-2.6.32.24/drivers/oprofile/buffer_sync.c 2010-09-20 17:26:42.000000000 -0400
27557+++ linux-2.6.32.23/drivers/oprofile/buffer_sync.c 2010-09-20 17:27:14.000000000 -0400 27586+++ linux-2.6.32.24/drivers/oprofile/buffer_sync.c 2010-09-20 17:27:14.000000000 -0400
27558@@ -341,7 +341,7 @@ static void add_data(struct op_entry *en 27587@@ -341,7 +341,7 @@ static void add_data(struct op_entry *en
27559 if (cookie == NO_COOKIE) 27588 if (cookie == NO_COOKIE)
27560 offset = pc; 27589 offset = pc;
@@ -27590,9 +27619,9 @@ diff -urNp linux-2.6.32.23/drivers/oprofile/buffer_sync.c linux-2.6.32.23/driver
27590 } 27619 }
27591 } 27620 }
27592 release_mm(mm); 27621 release_mm(mm);
27593diff -urNp linux-2.6.32.23/drivers/oprofile/event_buffer.c linux-2.6.32.23/drivers/oprofile/event_buffer.c 27622diff -urNp linux-2.6.32.24/drivers/oprofile/event_buffer.c linux-2.6.32.24/drivers/oprofile/event_buffer.c
27594--- linux-2.6.32.23/drivers/oprofile/event_buffer.c 2010-08-13 16:24:37.000000000 -0400 27623--- linux-2.6.32.24/drivers/oprofile/event_buffer.c 2010-08-13 16:24:37.000000000 -0400
27595+++ linux-2.6.32.23/drivers/oprofile/event_buffer.c 2010-09-04 15:54:52.000000000 -0400 27624+++ linux-2.6.32.24/drivers/oprofile/event_buffer.c 2010-09-04 15:54:52.000000000 -0400
27596@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value 27625@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
27597 } 27626 }
27598 27627
@@ -27602,9 +27631,9 @@ diff -urNp linux-2.6.32.23/drivers/oprofile/event_buffer.c linux-2.6.32.23/drive
27602 return; 27631 return;
27603 } 27632 }
27604 27633
27605diff -urNp linux-2.6.32.23/drivers/oprofile/oprof.c linux-2.6.32.23/drivers/oprofile/oprof.c 27634diff -urNp linux-2.6.32.24/drivers/oprofile/oprof.c linux-2.6.32.24/drivers/oprofile/oprof.c
27606--- linux-2.6.32.23/drivers/oprofile/oprof.c 2010-08-13 16:24:37.000000000 -0400 27635--- linux-2.6.32.24/drivers/oprofile/oprof.c 2010-08-13 16:24:37.000000000 -0400
27607+++ linux-2.6.32.23/drivers/oprofile/oprof.c 2010-09-04 15:54:52.000000000 -0400 27636+++ linux-2.6.32.24/drivers/oprofile/oprof.c 2010-09-04 15:54:52.000000000 -0400
27608@@ -110,7 +110,7 @@ static void switch_worker(struct work_st 27637@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
27609 if (oprofile_ops.switch_events()) 27638 if (oprofile_ops.switch_events())
27610 return; 27639 return;
@@ -27614,9 +27643,9 @@ diff -urNp linux-2.6.32.23/drivers/oprofile/oprof.c linux-2.6.32.23/drivers/opro
27614 start_switch_worker(); 27643 start_switch_worker();
27615 } 27644 }
27616 27645
27617diff -urNp linux-2.6.32.23/drivers/oprofile/oprofilefs.c linux-2.6.32.23/drivers/oprofile/oprofilefs.c 27646diff -urNp linux-2.6.32.24/drivers/oprofile/oprofilefs.c linux-2.6.32.24/drivers/oprofile/oprofilefs.c
27618--- linux-2.6.32.23/drivers/oprofile/oprofilefs.c 2010-08-13 16:24:37.000000000 -0400 27647--- linux-2.6.32.24/drivers/oprofile/oprofilefs.c 2010-08-13 16:24:37.000000000 -0400
27619+++ linux-2.6.32.23/drivers/oprofile/oprofilefs.c 2010-09-04 15:54:52.000000000 -0400 27648+++ linux-2.6.32.24/drivers/oprofile/oprofilefs.c 2010-09-04 15:54:52.000000000 -0400
27620@@ -187,7 +187,7 @@ static const struct file_operations atom 27649@@ -187,7 +187,7 @@ static const struct file_operations atom
27621 27650
27622 27651
@@ -27626,9 +27655,9 @@ diff -urNp linux-2.6.32.23/drivers/oprofile/oprofilefs.c linux-2.6.32.23/drivers
27626 { 27655 {
27627 struct dentry *d = __oprofilefs_create_file(sb, root, name, 27656 struct dentry *d = __oprofilefs_create_file(sb, root, name,
27628 &atomic_ro_fops, 0444); 27657 &atomic_ro_fops, 0444);
27629diff -urNp linux-2.6.32.23/drivers/oprofile/oprofile_stats.c linux-2.6.32.23/drivers/oprofile/oprofile_stats.c 27658diff -urNp linux-2.6.32.24/drivers/oprofile/oprofile_stats.c linux-2.6.32.24/drivers/oprofile/oprofile_stats.c
27630--- linux-2.6.32.23/drivers/oprofile/oprofile_stats.c 2010-08-13 16:24:37.000000000 -0400 27659--- linux-2.6.32.24/drivers/oprofile/oprofile_stats.c 2010-08-13 16:24:37.000000000 -0400
27631+++ linux-2.6.32.23/drivers/oprofile/oprofile_stats.c 2010-09-04 15:54:52.000000000 -0400 27660+++ linux-2.6.32.24/drivers/oprofile/oprofile_stats.c 2010-09-04 15:54:52.000000000 -0400
27632@@ -30,11 +30,11 @@ void oprofile_reset_stats(void) 27661@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
27633 cpu_buf->sample_invalid_eip = 0; 27662 cpu_buf->sample_invalid_eip = 0;
27634 } 27663 }
@@ -27646,9 +27675,9 @@ diff -urNp linux-2.6.32.23/drivers/oprofile/oprofile_stats.c linux-2.6.32.23/dri
27646 } 27675 }
27647 27676
27648 27677
27649diff -urNp linux-2.6.32.23/drivers/oprofile/oprofile_stats.h linux-2.6.32.23/drivers/oprofile/oprofile_stats.h 27678diff -urNp linux-2.6.32.24/drivers/oprofile/oprofile_stats.h linux-2.6.32.24/drivers/oprofile/oprofile_stats.h
27650--- linux-2.6.32.23/drivers/oprofile/oprofile_stats.h 2010-08-13 16:24:37.000000000 -0400 27679--- linux-2.6.32.24/drivers/oprofile/oprofile_stats.h 2010-08-13 16:24:37.000000000 -0400
27651+++ linux-2.6.32.23/drivers/oprofile/oprofile_stats.h 2010-09-04 15:54:52.000000000 -0400 27680+++ linux-2.6.32.24/drivers/oprofile/oprofile_stats.h 2010-09-04 15:54:52.000000000 -0400
27652@@ -13,11 +13,11 @@ 27681@@ -13,11 +13,11 @@
27653 #include <asm/atomic.h> 27682 #include <asm/atomic.h>
27654 27683
@@ -27666,9 +27695,9 @@ diff -urNp linux-2.6.32.23/drivers/oprofile/oprofile_stats.h linux-2.6.32.23/dri
27666 }; 27695 };
27667 27696
27668 extern struct oprofile_stat_struct oprofile_stats; 27697 extern struct oprofile_stat_struct oprofile_stats;
27669diff -urNp linux-2.6.32.23/drivers/parisc/pdc_stable.c linux-2.6.32.23/drivers/parisc/pdc_stable.c 27698diff -urNp linux-2.6.32.24/drivers/parisc/pdc_stable.c linux-2.6.32.24/drivers/parisc/pdc_stable.c
27670--- linux-2.6.32.23/drivers/parisc/pdc_stable.c 2010-08-13 16:24:37.000000000 -0400 27699--- linux-2.6.32.24/drivers/parisc/pdc_stable.c 2010-08-13 16:24:37.000000000 -0400
27671+++ linux-2.6.32.23/drivers/parisc/pdc_stable.c 2010-09-04 15:54:52.000000000 -0400 27700+++ linux-2.6.32.24/drivers/parisc/pdc_stable.c 2010-09-04 15:54:52.000000000 -0400
27672@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj 27701@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
27673 return ret; 27702 return ret;
27674 } 27703 }
@@ -27678,9 +27707,9 @@ diff -urNp linux-2.6.32.23/drivers/parisc/pdc_stable.c linux-2.6.32.23/drivers/p
27678 .show = pdcspath_attr_show, 27707 .show = pdcspath_attr_show,
27679 .store = pdcspath_attr_store, 27708 .store = pdcspath_attr_store,
27680 }; 27709 };
27681diff -urNp linux-2.6.32.23/drivers/parport/procfs.c linux-2.6.32.23/drivers/parport/procfs.c 27710diff -urNp linux-2.6.32.24/drivers/parport/procfs.c linux-2.6.32.24/drivers/parport/procfs.c
27682--- linux-2.6.32.23/drivers/parport/procfs.c 2010-08-13 16:24:37.000000000 -0400 27711--- linux-2.6.32.24/drivers/parport/procfs.c 2010-08-13 16:24:37.000000000 -0400
27683+++ linux-2.6.32.23/drivers/parport/procfs.c 2010-09-04 15:54:52.000000000 -0400 27712+++ linux-2.6.32.24/drivers/parport/procfs.c 2010-09-04 15:54:52.000000000 -0400
27684@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t 27713@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
27685 27714
27686 *ppos += len; 27715 *ppos += len;
@@ -27699,9 +27728,9 @@ diff -urNp linux-2.6.32.23/drivers/parport/procfs.c linux-2.6.32.23/drivers/parp
27699 } 27728 }
27700 #endif /* IEEE1284.3 support. */ 27729 #endif /* IEEE1284.3 support. */
27701 27730
27702diff -urNp linux-2.6.32.23/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.23/drivers/pci/hotplug/acpiphp_glue.c 27731diff -urNp linux-2.6.32.24/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.24/drivers/pci/hotplug/acpiphp_glue.c
27703--- linux-2.6.32.23/drivers/pci/hotplug/acpiphp_glue.c 2010-08-13 16:24:37.000000000 -0400 27732--- linux-2.6.32.24/drivers/pci/hotplug/acpiphp_glue.c 2010-08-13 16:24:37.000000000 -0400
27704+++ linux-2.6.32.23/drivers/pci/hotplug/acpiphp_glue.c 2010-09-04 15:54:52.000000000 -0400 27733+++ linux-2.6.32.24/drivers/pci/hotplug/acpiphp_glue.c 2010-09-04 15:54:52.000000000 -0400
27705@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif 27734@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
27706 } 27735 }
27707 27736
@@ -27711,9 +27740,9 @@ diff -urNp linux-2.6.32.23/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.23/dr
27711 .handler = handle_hotplug_event_func, 27740 .handler = handle_hotplug_event_func,
27712 }; 27741 };
27713 27742
27714diff -urNp linux-2.6.32.23/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.23/drivers/pci/hotplug/cpqphp_nvram.c 27743diff -urNp linux-2.6.32.24/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.24/drivers/pci/hotplug/cpqphp_nvram.c
27715--- linux-2.6.32.23/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-13 16:24:37.000000000 -0400 27744--- linux-2.6.32.24/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-13 16:24:37.000000000 -0400
27716+++ linux-2.6.32.23/drivers/pci/hotplug/cpqphp_nvram.c 2010-09-04 15:54:52.000000000 -0400 27745+++ linux-2.6.32.24/drivers/pci/hotplug/cpqphp_nvram.c 2010-09-04 15:54:52.000000000 -0400
27717@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ 27746@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
27718 27747
27719 void compaq_nvram_init (void __iomem *rom_start) 27748 void compaq_nvram_init (void __iomem *rom_start)
@@ -27728,9 +27757,9 @@ diff -urNp linux-2.6.32.23/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.23/dr
27728 dbg("int15 entry = %p\n", compaq_int15_entry_point); 27757 dbg("int15 entry = %p\n", compaq_int15_entry_point);
27729 27758
27730 /* initialize our int15 lock */ 27759 /* initialize our int15 lock */
27731diff -urNp linux-2.6.32.23/drivers/pci/hotplug/fakephp.c linux-2.6.32.23/drivers/pci/hotplug/fakephp.c 27760diff -urNp linux-2.6.32.24/drivers/pci/hotplug/fakephp.c linux-2.6.32.24/drivers/pci/hotplug/fakephp.c
27732--- linux-2.6.32.23/drivers/pci/hotplug/fakephp.c 2010-08-13 16:24:37.000000000 -0400 27761--- linux-2.6.32.24/drivers/pci/hotplug/fakephp.c 2010-08-13 16:24:37.000000000 -0400
27733+++ linux-2.6.32.23/drivers/pci/hotplug/fakephp.c 2010-09-04 15:54:52.000000000 -0400 27762+++ linux-2.6.32.24/drivers/pci/hotplug/fakephp.c 2010-09-04 15:54:52.000000000 -0400
27734@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec 27763@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
27735 } 27764 }
27736 27765
@@ -27740,9 +27769,9 @@ diff -urNp linux-2.6.32.23/drivers/pci/hotplug/fakephp.c linux-2.6.32.23/drivers
27740 .store = legacy_store, .show = legacy_show 27769 .store = legacy_store, .show = legacy_show
27741 }, 27770 },
27742 .release = &legacy_release, 27771 .release = &legacy_release,
27743diff -urNp linux-2.6.32.23/drivers/pci/intel-iommu.c linux-2.6.32.23/drivers/pci/intel-iommu.c 27772diff -urNp linux-2.6.32.24/drivers/pci/intel-iommu.c linux-2.6.32.24/drivers/pci/intel-iommu.c
27744--- linux-2.6.32.23/drivers/pci/intel-iommu.c 2010-09-26 17:26:05.000000000 -0400 27773--- linux-2.6.32.24/drivers/pci/intel-iommu.c 2010-09-26 17:26:05.000000000 -0400
27745+++ linux-2.6.32.23/drivers/pci/intel-iommu.c 2010-09-26 17:26:38.000000000 -0400 27774+++ linux-2.6.32.24/drivers/pci/intel-iommu.c 2010-09-26 17:26:38.000000000 -0400
27746@@ -2643,7 +2643,7 @@ error: 27775@@ -2643,7 +2643,7 @@ error:
27747 return 0; 27776 return 0;
27748 } 27777 }
@@ -27812,9 +27841,9 @@ diff -urNp linux-2.6.32.23/drivers/pci/intel-iommu.c linux-2.6.32.23/drivers/pci
27812 .alloc_coherent = intel_alloc_coherent, 27841 .alloc_coherent = intel_alloc_coherent,
27813 .free_coherent = intel_free_coherent, 27842 .free_coherent = intel_free_coherent,
27814 .map_sg = intel_map_sg, 27843 .map_sg = intel_map_sg,
27815diff -urNp linux-2.6.32.23/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.23/drivers/pci/pcie/portdrv_pci.c 27844diff -urNp linux-2.6.32.24/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.24/drivers/pci/pcie/portdrv_pci.c
27816--- linux-2.6.32.23/drivers/pci/pcie/portdrv_pci.c 2010-08-13 16:24:37.000000000 -0400 27845--- linux-2.6.32.24/drivers/pci/pcie/portdrv_pci.c 2010-08-13 16:24:37.000000000 -0400
27817+++ linux-2.6.32.23/drivers/pci/pcie/portdrv_pci.c 2010-09-04 15:54:52.000000000 -0400 27846+++ linux-2.6.32.24/drivers/pci/pcie/portdrv_pci.c 2010-09-04 15:54:52.000000000 -0400
27818@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru 27847@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru
27819 static const struct pci_device_id port_pci_ids[] = { { 27848 static const struct pci_device_id port_pci_ids[] = { {
27820 /* handle any PCI-Express port */ 27849 /* handle any PCI-Express port */
@@ -27824,9 +27853,9 @@ diff -urNp linux-2.6.32.23/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.23/driver
27824 }; 27853 };
27825 MODULE_DEVICE_TABLE(pci, port_pci_ids); 27854 MODULE_DEVICE_TABLE(pci, port_pci_ids);
27826 27855
27827diff -urNp linux-2.6.32.23/drivers/pci/probe.c linux-2.6.32.23/drivers/pci/probe.c 27856diff -urNp linux-2.6.32.24/drivers/pci/probe.c linux-2.6.32.24/drivers/pci/probe.c
27828--- linux-2.6.32.23/drivers/pci/probe.c 2010-08-13 16:24:37.000000000 -0400 27857--- linux-2.6.32.24/drivers/pci/probe.c 2010-08-13 16:24:37.000000000 -0400
27829+++ linux-2.6.32.23/drivers/pci/probe.c 2010-09-04 15:54:52.000000000 -0400 27858+++ linux-2.6.32.24/drivers/pci/probe.c 2010-09-04 15:54:52.000000000 -0400
27830@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( 27859@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
27831 return ret; 27860 return ret;
27832 } 27861 }
@@ -27844,9 +27873,9 @@ diff -urNp linux-2.6.32.23/drivers/pci/probe.c linux-2.6.32.23/drivers/pci/probe
27844 struct device_attribute *attr, 27873 struct device_attribute *attr,
27845 char *buf) 27874 char *buf)
27846 { 27875 {
27847diff -urNp linux-2.6.32.23/drivers/pci/proc.c linux-2.6.32.23/drivers/pci/proc.c 27876diff -urNp linux-2.6.32.24/drivers/pci/proc.c linux-2.6.32.24/drivers/pci/proc.c
27848--- linux-2.6.32.23/drivers/pci/proc.c 2010-08-13 16:24:37.000000000 -0400 27877--- linux-2.6.32.24/drivers/pci/proc.c 2010-08-13 16:24:37.000000000 -0400
27849+++ linux-2.6.32.23/drivers/pci/proc.c 2010-09-04 15:54:52.000000000 -0400 27878+++ linux-2.6.32.24/drivers/pci/proc.c 2010-09-04 15:54:52.000000000 -0400
27850@@ -480,7 +480,16 @@ static const struct file_operations proc 27879@@ -480,7 +480,16 @@ static const struct file_operations proc
27851 static int __init pci_proc_init(void) 27880 static int __init pci_proc_init(void)
27852 { 27881 {
@@ -27864,9 +27893,9 @@ diff -urNp linux-2.6.32.23/drivers/pci/proc.c linux-2.6.32.23/drivers/pci/proc.c
27864 proc_create("devices", 0, proc_bus_pci_dir, 27893 proc_create("devices", 0, proc_bus_pci_dir,
27865 &proc_bus_pci_dev_operations); 27894 &proc_bus_pci_dev_operations);
27866 proc_initialized = 1; 27895 proc_initialized = 1;
27867diff -urNp linux-2.6.32.23/drivers/pci/slot.c linux-2.6.32.23/drivers/pci/slot.c 27896diff -urNp linux-2.6.32.24/drivers/pci/slot.c linux-2.6.32.24/drivers/pci/slot.c
27868--- linux-2.6.32.23/drivers/pci/slot.c 2010-08-13 16:24:37.000000000 -0400 27897--- linux-2.6.32.24/drivers/pci/slot.c 2010-08-13 16:24:37.000000000 -0400
27869+++ linux-2.6.32.23/drivers/pci/slot.c 2010-09-04 15:54:52.000000000 -0400 27898+++ linux-2.6.32.24/drivers/pci/slot.c 2010-09-04 15:54:52.000000000 -0400
27870@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc 27899@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
27871 return attribute->store ? attribute->store(slot, buf, len) : -EIO; 27900 return attribute->store ? attribute->store(slot, buf, len) : -EIO;
27872 } 27901 }
@@ -27876,9 +27905,9 @@ diff -urNp linux-2.6.32.23/drivers/pci/slot.c linux-2.6.32.23/drivers/pci/slot.c
27876 .show = pci_slot_attr_show, 27905 .show = pci_slot_attr_show,
27877 .store = pci_slot_attr_store, 27906 .store = pci_slot_attr_store,
27878 }; 27907 };
27879diff -urNp linux-2.6.32.23/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.23/drivers/pcmcia/pcmcia_ioctl.c 27908diff -urNp linux-2.6.32.24/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.24/drivers/pcmcia/pcmcia_ioctl.c
27880--- linux-2.6.32.23/drivers/pcmcia/pcmcia_ioctl.c 2010-08-13 16:24:37.000000000 -0400 27909--- linux-2.6.32.24/drivers/pcmcia/pcmcia_ioctl.c 2010-08-13 16:24:37.000000000 -0400
27881+++ linux-2.6.32.23/drivers/pcmcia/pcmcia_ioctl.c 2010-09-04 15:54:52.000000000 -0400 27910+++ linux-2.6.32.24/drivers/pcmcia/pcmcia_ioctl.c 2010-09-04 15:54:52.000000000 -0400
27882@@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode 27911@@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode
27883 return -EFAULT; 27912 return -EFAULT;
27884 } 27913 }
@@ -27888,9 +27917,9 @@ diff -urNp linux-2.6.32.23/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.23/drivers
27888 if (!buf) 27917 if (!buf)
27889 return -ENOMEM; 27918 return -ENOMEM;
27890 27919
27891diff -urNp linux-2.6.32.23/drivers/pcmcia/ti113x.h linux-2.6.32.23/drivers/pcmcia/ti113x.h 27920diff -urNp linux-2.6.32.24/drivers/pcmcia/ti113x.h linux-2.6.32.24/drivers/pcmcia/ti113x.h
27892--- linux-2.6.32.23/drivers/pcmcia/ti113x.h 2010-08-13 16:24:37.000000000 -0400 27921--- linux-2.6.32.24/drivers/pcmcia/ti113x.h 2010-08-13 16:24:37.000000000 -0400
27893+++ linux-2.6.32.23/drivers/pcmcia/ti113x.h 2010-09-04 15:54:52.000000000 -0400 27922+++ linux-2.6.32.24/drivers/pcmcia/ti113x.h 2010-09-04 15:54:52.000000000 -0400
27894@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl 27923@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
27895 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, 27924 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
27896 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), 27925 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
@@ -27900,9 +27929,9 @@ diff -urNp linux-2.6.32.23/drivers/pcmcia/ti113x.h linux-2.6.32.23/drivers/pcmci
27900 }; 27929 };
27901 27930
27902 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) 27931 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
27903diff -urNp linux-2.6.32.23/drivers/pcmcia/yenta_socket.c linux-2.6.32.23/drivers/pcmcia/yenta_socket.c 27932diff -urNp linux-2.6.32.24/drivers/pcmcia/yenta_socket.c linux-2.6.32.24/drivers/pcmcia/yenta_socket.c
27904--- linux-2.6.32.23/drivers/pcmcia/yenta_socket.c 2010-08-13 16:24:37.000000000 -0400 27933--- linux-2.6.32.24/drivers/pcmcia/yenta_socket.c 2010-08-13 16:24:37.000000000 -0400
27905+++ linux-2.6.32.23/drivers/pcmcia/yenta_socket.c 2010-09-04 15:54:52.000000000 -0400 27934+++ linux-2.6.32.24/drivers/pcmcia/yenta_socket.c 2010-09-04 15:54:52.000000000 -0400
27906@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table 27935@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
27907 27936
27908 /* match any cardbus bridge */ 27937 /* match any cardbus bridge */
@@ -27912,9 +27941,9 @@ diff -urNp linux-2.6.32.23/drivers/pcmcia/yenta_socket.c linux-2.6.32.23/drivers
27912 }; 27941 };
27913 MODULE_DEVICE_TABLE(pci, yenta_table); 27942 MODULE_DEVICE_TABLE(pci, yenta_table);
27914 27943
27915diff -urNp linux-2.6.32.23/drivers/platform/x86/acer-wmi.c linux-2.6.32.23/drivers/platform/x86/acer-wmi.c 27944diff -urNp linux-2.6.32.24/drivers/platform/x86/acer-wmi.c linux-2.6.32.24/drivers/platform/x86/acer-wmi.c
27916--- linux-2.6.32.23/drivers/platform/x86/acer-wmi.c 2010-08-13 16:24:37.000000000 -0400 27945--- linux-2.6.32.24/drivers/platform/x86/acer-wmi.c 2010-08-13 16:24:37.000000000 -0400
27917+++ linux-2.6.32.23/drivers/platform/x86/acer-wmi.c 2010-09-04 15:54:52.000000000 -0400 27946+++ linux-2.6.32.24/drivers/platform/x86/acer-wmi.c 2010-09-04 15:54:52.000000000 -0400
27918@@ -918,7 +918,7 @@ static int update_bl_status(struct backl 27947@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
27919 return 0; 27948 return 0;
27920 } 27949 }
@@ -27924,9 +27953,9 @@ diff -urNp linux-2.6.32.23/drivers/platform/x86/acer-wmi.c linux-2.6.32.23/drive
27924 .get_brightness = read_brightness, 27953 .get_brightness = read_brightness,
27925 .update_status = update_bl_status, 27954 .update_status = update_bl_status,
27926 }; 27955 };
27927diff -urNp linux-2.6.32.23/drivers/platform/x86/asus_acpi.c linux-2.6.32.23/drivers/platform/x86/asus_acpi.c 27956diff -urNp linux-2.6.32.24/drivers/platform/x86/asus_acpi.c linux-2.6.32.24/drivers/platform/x86/asus_acpi.c
27928--- linux-2.6.32.23/drivers/platform/x86/asus_acpi.c 2010-08-13 16:24:37.000000000 -0400 27957--- linux-2.6.32.24/drivers/platform/x86/asus_acpi.c 2010-08-13 16:24:37.000000000 -0400
27929+++ linux-2.6.32.23/drivers/platform/x86/asus_acpi.c 2010-09-04 15:54:52.000000000 -0400 27958+++ linux-2.6.32.24/drivers/platform/x86/asus_acpi.c 2010-09-04 15:54:52.000000000 -0400
27930@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ 27959@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
27931 return 0; 27960 return 0;
27932 } 27961 }
@@ -27936,9 +27965,9 @@ diff -urNp linux-2.6.32.23/drivers/platform/x86/asus_acpi.c linux-2.6.32.23/driv
27936 .get_brightness = read_brightness, 27965 .get_brightness = read_brightness,
27937 .update_status = set_brightness_status, 27966 .update_status = set_brightness_status,
27938 }; 27967 };
27939diff -urNp linux-2.6.32.23/drivers/platform/x86/asus-laptop.c linux-2.6.32.23/drivers/platform/x86/asus-laptop.c 27968diff -urNp linux-2.6.32.24/drivers/platform/x86/asus-laptop.c linux-2.6.32.24/drivers/platform/x86/asus-laptop.c
27940--- linux-2.6.32.23/drivers/platform/x86/asus-laptop.c 2010-08-13 16:24:37.000000000 -0400 27969--- linux-2.6.32.24/drivers/platform/x86/asus-laptop.c 2010-08-13 16:24:37.000000000 -0400
27941+++ linux-2.6.32.23/drivers/platform/x86/asus-laptop.c 2010-09-04 15:54:52.000000000 -0400 27970+++ linux-2.6.32.24/drivers/platform/x86/asus-laptop.c 2010-09-04 15:54:52.000000000 -0400
27942@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac 27971@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
27943 */ 27972 */
27944 static int read_brightness(struct backlight_device *bd); 27973 static int read_brightness(struct backlight_device *bd);
@@ -27948,9 +27977,9 @@ diff -urNp linux-2.6.32.23/drivers/platform/x86/asus-laptop.c linux-2.6.32.23/dr
27948 .get_brightness = read_brightness, 27977 .get_brightness = read_brightness,
27949 .update_status = update_bl_status, 27978 .update_status = update_bl_status,
27950 }; 27979 };
27951diff -urNp linux-2.6.32.23/drivers/platform/x86/compal-laptop.c linux-2.6.32.23/drivers/platform/x86/compal-laptop.c 27980diff -urNp linux-2.6.32.24/drivers/platform/x86/compal-laptop.c linux-2.6.32.24/drivers/platform/x86/compal-laptop.c
27952--- linux-2.6.32.23/drivers/platform/x86/compal-laptop.c 2010-08-13 16:24:37.000000000 -0400 27981--- linux-2.6.32.24/drivers/platform/x86/compal-laptop.c 2010-08-13 16:24:37.000000000 -0400
27953+++ linux-2.6.32.23/drivers/platform/x86/compal-laptop.c 2010-09-04 15:54:52.000000000 -0400 27982+++ linux-2.6.32.24/drivers/platform/x86/compal-laptop.c 2010-09-04 15:54:52.000000000 -0400
27954@@ -163,7 +163,7 @@ static int bl_update_status(struct backl 27983@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
27955 return set_lcd_level(b->props.brightness); 27984 return set_lcd_level(b->props.brightness);
27956 } 27985 }
@@ -27960,9 +27989,9 @@ diff -urNp linux-2.6.32.23/drivers/platform/x86/compal-laptop.c linux-2.6.32.23/
27960 .get_brightness = bl_get_brightness, 27989 .get_brightness = bl_get_brightness,
27961 .update_status = bl_update_status, 27990 .update_status = bl_update_status,
27962 }; 27991 };
27963diff -urNp linux-2.6.32.23/drivers/platform/x86/dell-laptop.c linux-2.6.32.23/drivers/platform/x86/dell-laptop.c 27992diff -urNp linux-2.6.32.24/drivers/platform/x86/dell-laptop.c linux-2.6.32.24/drivers/platform/x86/dell-laptop.c
27964--- linux-2.6.32.23/drivers/platform/x86/dell-laptop.c 2010-08-13 16:24:37.000000000 -0400 27993--- linux-2.6.32.24/drivers/platform/x86/dell-laptop.c 2010-08-13 16:24:37.000000000 -0400
27965+++ linux-2.6.32.23/drivers/platform/x86/dell-laptop.c 2010-09-04 15:54:52.000000000 -0400 27994+++ linux-2.6.32.24/drivers/platform/x86/dell-laptop.c 2010-09-04 15:54:52.000000000 -0400
27966@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac 27995@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
27967 return buffer.output[1]; 27996 return buffer.output[1];
27968 } 27997 }
@@ -27972,9 +28001,9 @@ diff -urNp linux-2.6.32.23/drivers/platform/x86/dell-laptop.c linux-2.6.32.23/dr
27972 .get_brightness = dell_get_intensity, 28001 .get_brightness = dell_get_intensity,
27973 .update_status = dell_send_intensity, 28002 .update_status = dell_send_intensity,
27974 }; 28003 };
27975diff -urNp linux-2.6.32.23/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.23/drivers/platform/x86/eeepc-laptop.c 28004diff -urNp linux-2.6.32.24/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.24/drivers/platform/x86/eeepc-laptop.c
27976--- linux-2.6.32.23/drivers/platform/x86/eeepc-laptop.c 2010-08-13 16:24:37.000000000 -0400 28005--- linux-2.6.32.24/drivers/platform/x86/eeepc-laptop.c 2010-08-13 16:24:37.000000000 -0400
27977+++ linux-2.6.32.23/drivers/platform/x86/eeepc-laptop.c 2010-09-04 15:54:52.000000000 -0400 28006+++ linux-2.6.32.24/drivers/platform/x86/eeepc-laptop.c 2010-09-04 15:54:52.000000000 -0400
27978@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device 28007@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
27979 */ 28008 */
27980 static int read_brightness(struct backlight_device *bd); 28009 static int read_brightness(struct backlight_device *bd);
@@ -27984,9 +28013,9 @@ diff -urNp linux-2.6.32.23/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.23/d
27984 .get_brightness = read_brightness, 28013 .get_brightness = read_brightness,
27985 .update_status = update_bl_status, 28014 .update_status = update_bl_status,
27986 }; 28015 };
27987diff -urNp linux-2.6.32.23/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.23/drivers/platform/x86/fujitsu-laptop.c 28016diff -urNp linux-2.6.32.24/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.24/drivers/platform/x86/fujitsu-laptop.c
27988--- linux-2.6.32.23/drivers/platform/x86/fujitsu-laptop.c 2010-08-13 16:24:37.000000000 -0400 28017--- linux-2.6.32.24/drivers/platform/x86/fujitsu-laptop.c 2010-08-13 16:24:37.000000000 -0400
27989+++ linux-2.6.32.23/drivers/platform/x86/fujitsu-laptop.c 2010-09-04 15:54:52.000000000 -0400 28018+++ linux-2.6.32.24/drivers/platform/x86/fujitsu-laptop.c 2010-09-04 15:54:52.000000000 -0400
27990@@ -436,7 +436,7 @@ static int bl_update_status(struct backl 28019@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
27991 return ret; 28020 return ret;
27992 } 28021 }
@@ -27996,9 +28025,9 @@ diff -urNp linux-2.6.32.23/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.23
27996 .get_brightness = bl_get_brightness, 28025 .get_brightness = bl_get_brightness,
27997 .update_status = bl_update_status, 28026 .update_status = bl_update_status,
27998 }; 28027 };
27999diff -urNp linux-2.6.32.23/drivers/platform/x86/msi-laptop.c linux-2.6.32.23/drivers/platform/x86/msi-laptop.c 28028diff -urNp linux-2.6.32.24/drivers/platform/x86/msi-laptop.c linux-2.6.32.24/drivers/platform/x86/msi-laptop.c
28000--- linux-2.6.32.23/drivers/platform/x86/msi-laptop.c 2010-08-13 16:24:37.000000000 -0400 28029--- linux-2.6.32.24/drivers/platform/x86/msi-laptop.c 2010-08-13 16:24:37.000000000 -0400
28001+++ linux-2.6.32.23/drivers/platform/x86/msi-laptop.c 2010-09-04 15:54:52.000000000 -0400 28030+++ linux-2.6.32.24/drivers/platform/x86/msi-laptop.c 2010-09-04 15:54:52.000000000 -0400
28002@@ -161,7 +161,7 @@ static int bl_update_status(struct backl 28031@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
28003 return set_lcd_level(b->props.brightness); 28032 return set_lcd_level(b->props.brightness);
28004 } 28033 }
@@ -28008,9 +28037,9 @@ diff -urNp linux-2.6.32.23/drivers/platform/x86/msi-laptop.c linux-2.6.32.23/dri
28008 .get_brightness = bl_get_brightness, 28037 .get_brightness = bl_get_brightness,
28009 .update_status = bl_update_status, 28038 .update_status = bl_update_status,
28010 }; 28039 };
28011diff -urNp linux-2.6.32.23/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.23/drivers/platform/x86/panasonic-laptop.c 28040diff -urNp linux-2.6.32.24/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.24/drivers/platform/x86/panasonic-laptop.c
28012--- linux-2.6.32.23/drivers/platform/x86/panasonic-laptop.c 2010-08-13 16:24:37.000000000 -0400 28041--- linux-2.6.32.24/drivers/platform/x86/panasonic-laptop.c 2010-08-13 16:24:37.000000000 -0400
28013+++ linux-2.6.32.23/drivers/platform/x86/panasonic-laptop.c 2010-09-04 15:54:52.000000000 -0400 28042+++ linux-2.6.32.24/drivers/platform/x86/panasonic-laptop.c 2010-09-04 15:54:52.000000000 -0400
28014@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh 28043@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
28015 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); 28044 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
28016 } 28045 }
@@ -28020,9 +28049,9 @@ diff -urNp linux-2.6.32.23/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.
28020 .get_brightness = bl_get, 28049 .get_brightness = bl_get,
28021 .update_status = bl_set_status, 28050 .update_status = bl_set_status,
28022 }; 28051 };
28023diff -urNp linux-2.6.32.23/drivers/platform/x86/sony-laptop.c linux-2.6.32.23/drivers/platform/x86/sony-laptop.c 28052diff -urNp linux-2.6.32.24/drivers/platform/x86/sony-laptop.c linux-2.6.32.24/drivers/platform/x86/sony-laptop.c
28024--- linux-2.6.32.23/drivers/platform/x86/sony-laptop.c 2010-08-13 16:24:37.000000000 -0400 28053--- linux-2.6.32.24/drivers/platform/x86/sony-laptop.c 2010-08-13 16:24:37.000000000 -0400
28025+++ linux-2.6.32.23/drivers/platform/x86/sony-laptop.c 2010-09-04 15:54:52.000000000 -0400 28054+++ linux-2.6.32.24/drivers/platform/x86/sony-laptop.c 2010-09-04 15:54:52.000000000 -0400
28026@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness 28055@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
28027 } 28056 }
28028 28057
@@ -28032,9 +28061,9 @@ diff -urNp linux-2.6.32.23/drivers/platform/x86/sony-laptop.c linux-2.6.32.23/dr
28032 .update_status = sony_backlight_update_status, 28061 .update_status = sony_backlight_update_status,
28033 .get_brightness = sony_backlight_get_brightness, 28062 .get_brightness = sony_backlight_get_brightness,
28034 }; 28063 };
28035diff -urNp linux-2.6.32.23/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.23/drivers/platform/x86/thinkpad_acpi.c 28064diff -urNp linux-2.6.32.24/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.24/drivers/platform/x86/thinkpad_acpi.c
28036--- linux-2.6.32.23/drivers/platform/x86/thinkpad_acpi.c 2010-08-13 16:24:37.000000000 -0400 28065--- linux-2.6.32.24/drivers/platform/x86/thinkpad_acpi.c 2010-08-13 16:24:37.000000000 -0400
28037+++ linux-2.6.32.23/drivers/platform/x86/thinkpad_acpi.c 2010-09-04 15:54:52.000000000 -0400 28066+++ linux-2.6.32.24/drivers/platform/x86/thinkpad_acpi.c 2010-09-04 15:54:52.000000000 -0400
28038@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha 28067@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
28039 BACKLIGHT_UPDATE_HOTKEY); 28068 BACKLIGHT_UPDATE_HOTKEY);
28040 } 28069 }
@@ -28044,9 +28073,9 @@ diff -urNp linux-2.6.32.23/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.23/
28044 .get_brightness = brightness_get, 28073 .get_brightness = brightness_get,
28045 .update_status = brightness_update_status, 28074 .update_status = brightness_update_status,
28046 }; 28075 };
28047diff -urNp linux-2.6.32.23/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.23/drivers/platform/x86/toshiba_acpi.c 28076diff -urNp linux-2.6.32.24/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.24/drivers/platform/x86/toshiba_acpi.c
28048--- linux-2.6.32.23/drivers/platform/x86/toshiba_acpi.c 2010-08-13 16:24:37.000000000 -0400 28077--- linux-2.6.32.24/drivers/platform/x86/toshiba_acpi.c 2010-08-13 16:24:37.000000000 -0400
28049+++ linux-2.6.32.23/drivers/platform/x86/toshiba_acpi.c 2010-09-04 15:54:52.000000000 -0400 28078+++ linux-2.6.32.24/drivers/platform/x86/toshiba_acpi.c 2010-09-04 15:54:52.000000000 -0400
28050@@ -671,7 +671,7 @@ static acpi_status remove_device(void) 28079@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
28051 return AE_OK; 28080 return AE_OK;
28052 } 28081 }
@@ -28056,9 +28085,9 @@ diff -urNp linux-2.6.32.23/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.23/d
28056 .get_brightness = get_lcd, 28085 .get_brightness = get_lcd,
28057 .update_status = set_lcd_status, 28086 .update_status = set_lcd_status,
28058 }; 28087 };
28059diff -urNp linux-2.6.32.23/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.23/drivers/pnp/pnpbios/bioscalls.c 28088diff -urNp linux-2.6.32.24/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.24/drivers/pnp/pnpbios/bioscalls.c
28060--- linux-2.6.32.23/drivers/pnp/pnpbios/bioscalls.c 2010-08-13 16:24:37.000000000 -0400 28089--- linux-2.6.32.24/drivers/pnp/pnpbios/bioscalls.c 2010-08-13 16:24:37.000000000 -0400
28061+++ linux-2.6.32.23/drivers/pnp/pnpbios/bioscalls.c 2010-09-04 15:54:52.000000000 -0400 28090+++ linux-2.6.32.24/drivers/pnp/pnpbios/bioscalls.c 2010-09-04 15:54:52.000000000 -0400
28062@@ -60,7 +60,7 @@ do { \ 28091@@ -60,7 +60,7 @@ do { \
28063 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ 28092 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
28064 } while(0) 28093 } while(0)
@@ -28115,9 +28144,9 @@ diff -urNp linux-2.6.32.23/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.23/drive
28115+ 28144+
28116+ pax_close_kernel(); 28145+ pax_close_kernel();
28117 } 28146 }
28118diff -urNp linux-2.6.32.23/drivers/pnp/quirks.c linux-2.6.32.23/drivers/pnp/quirks.c 28147diff -urNp linux-2.6.32.24/drivers/pnp/quirks.c linux-2.6.32.24/drivers/pnp/quirks.c
28119--- linux-2.6.32.23/drivers/pnp/quirks.c 2010-08-13 16:24:37.000000000 -0400 28148--- linux-2.6.32.24/drivers/pnp/quirks.c 2010-08-13 16:24:37.000000000 -0400
28120+++ linux-2.6.32.23/drivers/pnp/quirks.c 2010-09-04 15:54:52.000000000 -0400 28149+++ linux-2.6.32.24/drivers/pnp/quirks.c 2010-09-04 15:54:52.000000000 -0400
28121@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { 28150@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
28122 /* PnP resources that might overlap PCI BARs */ 28151 /* PnP resources that might overlap PCI BARs */
28123 {"PNP0c01", quirk_system_pci_resources}, 28152 {"PNP0c01", quirk_system_pci_resources},
@@ -28127,9 +28156,9 @@ diff -urNp linux-2.6.32.23/drivers/pnp/quirks.c linux-2.6.32.23/drivers/pnp/quir
28127 }; 28156 };
28128 28157
28129 void pnp_fixup_device(struct pnp_dev *dev) 28158 void pnp_fixup_device(struct pnp_dev *dev)
28130diff -urNp linux-2.6.32.23/drivers/pnp/resource.c linux-2.6.32.23/drivers/pnp/resource.c 28159diff -urNp linux-2.6.32.24/drivers/pnp/resource.c linux-2.6.32.24/drivers/pnp/resource.c
28131--- linux-2.6.32.23/drivers/pnp/resource.c 2010-08-13 16:24:37.000000000 -0400 28160--- linux-2.6.32.24/drivers/pnp/resource.c 2010-08-13 16:24:37.000000000 -0400
28132+++ linux-2.6.32.23/drivers/pnp/resource.c 2010-09-04 15:54:52.000000000 -0400 28161+++ linux-2.6.32.24/drivers/pnp/resource.c 2010-09-04 15:54:52.000000000 -0400
28133@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s 28162@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
28134 return 1; 28163 return 1;
28135 28164
@@ -28148,9 +28177,9 @@ diff -urNp linux-2.6.32.23/drivers/pnp/resource.c linux-2.6.32.23/drivers/pnp/re
28148 return 0; 28177 return 0;
28149 28178
28150 /* check if the resource is reserved */ 28179 /* check if the resource is reserved */
28151diff -urNp linux-2.6.32.23/drivers/s390/cio/qdio_perf.c linux-2.6.32.23/drivers/s390/cio/qdio_perf.c 28180diff -urNp linux-2.6.32.24/drivers/s390/cio/qdio_perf.c linux-2.6.32.24/drivers/s390/cio/qdio_perf.c
28152--- linux-2.6.32.23/drivers/s390/cio/qdio_perf.c 2010-08-13 16:24:37.000000000 -0400 28181--- linux-2.6.32.24/drivers/s390/cio/qdio_perf.c 2010-08-13 16:24:37.000000000 -0400
28153+++ linux-2.6.32.23/drivers/s390/cio/qdio_perf.c 2010-09-04 15:54:52.000000000 -0400 28182+++ linux-2.6.32.24/drivers/s390/cio/qdio_perf.c 2010-09-04 15:54:52.000000000 -0400
28154@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ 28183@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
28155 static int qdio_perf_proc_show(struct seq_file *m, void *v) 28184 static int qdio_perf_proc_show(struct seq_file *m, void *v)
28156 { 28185 {
@@ -28226,9 +28255,9 @@ diff -urNp linux-2.6.32.23/drivers/s390/cio/qdio_perf.c linux-2.6.32.23/drivers/
28226 seq_printf(m, "\n"); 28255 seq_printf(m, "\n");
28227 return 0; 28256 return 0;
28228 } 28257 }
28229diff -urNp linux-2.6.32.23/drivers/s390/cio/qdio_perf.h linux-2.6.32.23/drivers/s390/cio/qdio_perf.h 28258diff -urNp linux-2.6.32.24/drivers/s390/cio/qdio_perf.h linux-2.6.32.24/drivers/s390/cio/qdio_perf.h
28230--- linux-2.6.32.23/drivers/s390/cio/qdio_perf.h 2010-08-13 16:24:37.000000000 -0400 28259--- linux-2.6.32.24/drivers/s390/cio/qdio_perf.h 2010-08-13 16:24:37.000000000 -0400
28231+++ linux-2.6.32.23/drivers/s390/cio/qdio_perf.h 2010-09-04 15:54:52.000000000 -0400 28260+++ linux-2.6.32.24/drivers/s390/cio/qdio_perf.h 2010-09-04 15:54:52.000000000 -0400
28232@@ -13,46 +13,46 @@ 28261@@ -13,46 +13,46 @@
28233 28262
28234 struct qdio_perf_stats { 28263 struct qdio_perf_stats {
@@ -28301,9 +28330,9 @@ diff -urNp linux-2.6.32.23/drivers/s390/cio/qdio_perf.h linux-2.6.32.23/drivers/
28301 } 28330 }
28302 28331
28303 int qdio_setup_perf_stats(void); 28332 int qdio_setup_perf_stats(void);
28304diff -urNp linux-2.6.32.23/drivers/scsi/ipr.c linux-2.6.32.23/drivers/scsi/ipr.c 28333diff -urNp linux-2.6.32.24/drivers/scsi/ipr.c linux-2.6.32.24/drivers/scsi/ipr.c
28305--- linux-2.6.32.23/drivers/scsi/ipr.c 2010-08-13 16:24:37.000000000 -0400 28334--- linux-2.6.32.24/drivers/scsi/ipr.c 2010-08-13 16:24:37.000000000 -0400
28306+++ linux-2.6.32.23/drivers/scsi/ipr.c 2010-09-04 15:54:52.000000000 -0400 28335+++ linux-2.6.32.24/drivers/scsi/ipr.c 2010-09-04 15:54:52.000000000 -0400
28307@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q 28336@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
28308 return true; 28337 return true;
28309 } 28338 }
@@ -28313,9 +28342,9 @@ diff -urNp linux-2.6.32.23/drivers/scsi/ipr.c linux-2.6.32.23/drivers/scsi/ipr.c
28313 .phy_reset = ipr_ata_phy_reset, 28342 .phy_reset = ipr_ata_phy_reset,
28314 .hardreset = ipr_sata_reset, 28343 .hardreset = ipr_sata_reset,
28315 .post_internal_cmd = ipr_ata_post_internal, 28344 .post_internal_cmd = ipr_ata_post_internal,
28316diff -urNp linux-2.6.32.23/drivers/scsi/libfc/fc_exch.c linux-2.6.32.23/drivers/scsi/libfc/fc_exch.c 28345diff -urNp linux-2.6.32.24/drivers/scsi/libfc/fc_exch.c linux-2.6.32.24/drivers/scsi/libfc/fc_exch.c
28317--- linux-2.6.32.23/drivers/scsi/libfc/fc_exch.c 2010-08-13 16:24:37.000000000 -0400 28346--- linux-2.6.32.24/drivers/scsi/libfc/fc_exch.c 2010-08-13 16:24:37.000000000 -0400
28318+++ linux-2.6.32.23/drivers/scsi/libfc/fc_exch.c 2010-09-04 15:54:52.000000000 -0400 28347+++ linux-2.6.32.24/drivers/scsi/libfc/fc_exch.c 2010-09-04 15:54:52.000000000 -0400
28319@@ -86,12 +86,12 @@ struct fc_exch_mgr { 28348@@ -86,12 +86,12 @@ struct fc_exch_mgr {
28320 * all together if not used XXX 28349 * all together if not used XXX
28321 */ 28350 */
@@ -28437,9 +28466,9 @@ diff -urNp linux-2.6.32.23/drivers/scsi/libfc/fc_exch.c linux-2.6.32.23/drivers/
28437 28466
28438 fc_frame_free(fp); 28467 fc_frame_free(fp);
28439 } 28468 }
28440diff -urNp linux-2.6.32.23/drivers/scsi/libsas/sas_ata.c linux-2.6.32.23/drivers/scsi/libsas/sas_ata.c 28469diff -urNp linux-2.6.32.24/drivers/scsi/libsas/sas_ata.c linux-2.6.32.24/drivers/scsi/libsas/sas_ata.c
28441--- linux-2.6.32.23/drivers/scsi/libsas/sas_ata.c 2010-08-13 16:24:37.000000000 -0400 28470--- linux-2.6.32.24/drivers/scsi/libsas/sas_ata.c 2010-08-13 16:24:37.000000000 -0400
28442+++ linux-2.6.32.23/drivers/scsi/libsas/sas_ata.c 2010-09-04 15:54:52.000000000 -0400 28471+++ linux-2.6.32.24/drivers/scsi/libsas/sas_ata.c 2010-09-04 15:54:52.000000000 -0400
28443@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l 28472@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
28444 } 28473 }
28445 } 28474 }
@@ -28449,9 +28478,9 @@ diff -urNp linux-2.6.32.23/drivers/scsi/libsas/sas_ata.c linux-2.6.32.23/drivers
28449 .phy_reset = sas_ata_phy_reset, 28478 .phy_reset = sas_ata_phy_reset,
28450 .post_internal_cmd = sas_ata_post_internal, 28479 .post_internal_cmd = sas_ata_post_internal,
28451 .qc_prep = ata_noop_qc_prep, 28480 .qc_prep = ata_noop_qc_prep,
28452diff -urNp linux-2.6.32.23/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.23/drivers/scsi/mpt2sas/mpt2sas_debug.h 28481diff -urNp linux-2.6.32.24/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.24/drivers/scsi/mpt2sas/mpt2sas_debug.h
28453--- linux-2.6.32.23/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-13 16:24:37.000000000 -0400 28482--- linux-2.6.32.24/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-13 16:24:37.000000000 -0400
28454+++ linux-2.6.32.23/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-09-04 15:54:52.000000000 -0400 28483+++ linux-2.6.32.24/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-09-04 15:54:52.000000000 -0400
28455@@ -79,7 +79,7 @@ 28484@@ -79,7 +79,7 @@
28456 CMD; \ 28485 CMD; \
28457 } 28486 }
@@ -28461,9 +28490,9 @@ diff -urNp linux-2.6.32.23/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.23/
28461 #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */ 28490 #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
28462 28491
28463 28492
28464diff -urNp linux-2.6.32.23/drivers/scsi/scsi_logging.h linux-2.6.32.23/drivers/scsi/scsi_logging.h 28493diff -urNp linux-2.6.32.24/drivers/scsi/scsi_logging.h linux-2.6.32.24/drivers/scsi/scsi_logging.h
28465--- linux-2.6.32.23/drivers/scsi/scsi_logging.h 2010-08-13 16:24:37.000000000 -0400 28494--- linux-2.6.32.24/drivers/scsi/scsi_logging.h 2010-08-13 16:24:37.000000000 -0400
28466+++ linux-2.6.32.23/drivers/scsi/scsi_logging.h 2010-09-04 15:54:52.000000000 -0400 28495+++ linux-2.6.32.24/drivers/scsi/scsi_logging.h 2010-09-04 15:54:52.000000000 -0400
28467@@ -51,7 +51,7 @@ do { \ 28496@@ -51,7 +51,7 @@ do { \
28468 } while (0); \ 28497 } while (0); \
28469 } while (0) 28498 } while (0)
@@ -28473,9 +28502,9 @@ diff -urNp linux-2.6.32.23/drivers/scsi/scsi_logging.h linux-2.6.32.23/drivers/s
28473 #endif /* CONFIG_SCSI_LOGGING */ 28502 #endif /* CONFIG_SCSI_LOGGING */
28474 28503
28475 /* 28504 /*
28476diff -urNp linux-2.6.32.23/drivers/scsi/sg.c linux-2.6.32.23/drivers/scsi/sg.c 28505diff -urNp linux-2.6.32.24/drivers/scsi/sg.c linux-2.6.32.24/drivers/scsi/sg.c
28477--- linux-2.6.32.23/drivers/scsi/sg.c 2010-08-13 16:24:37.000000000 -0400 28506--- linux-2.6.32.24/drivers/scsi/sg.c 2010-08-13 16:24:37.000000000 -0400
28478+++ linux-2.6.32.23/drivers/scsi/sg.c 2010-09-04 15:54:52.000000000 -0400 28507+++ linux-2.6.32.24/drivers/scsi/sg.c 2010-09-04 15:54:52.000000000 -0400
28479@@ -2292,7 +2292,7 @@ struct sg_proc_leaf { 28508@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
28480 const struct file_operations * fops; 28509 const struct file_operations * fops;
28481 }; 28510 };
@@ -28494,9 +28523,9 @@ diff -urNp linux-2.6.32.23/drivers/scsi/sg.c linux-2.6.32.23/drivers/scsi/sg.c
28494 28523
28495 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); 28524 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
28496 if (!sg_proc_sgp) 28525 if (!sg_proc_sgp)
28497diff -urNp linux-2.6.32.23/drivers/serial/8250_pci.c linux-2.6.32.23/drivers/serial/8250_pci.c 28526diff -urNp linux-2.6.32.24/drivers/serial/8250_pci.c linux-2.6.32.24/drivers/serial/8250_pci.c
28498--- linux-2.6.32.23/drivers/serial/8250_pci.c 2010-08-13 16:24:37.000000000 -0400 28527--- linux-2.6.32.24/drivers/serial/8250_pci.c 2010-08-13 16:24:37.000000000 -0400
28499+++ linux-2.6.32.23/drivers/serial/8250_pci.c 2010-09-04 15:54:52.000000000 -0400 28528+++ linux-2.6.32.24/drivers/serial/8250_pci.c 2010-09-04 15:54:52.000000000 -0400
28500@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t 28529@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
28501 PCI_ANY_ID, PCI_ANY_ID, 28530 PCI_ANY_ID, PCI_ANY_ID,
28502 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 28531 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
@@ -28506,9 +28535,9 @@ diff -urNp linux-2.6.32.23/drivers/serial/8250_pci.c linux-2.6.32.23/drivers/ser
28506 }; 28535 };
28507 28536
28508 static struct pci_driver serial_pci_driver = { 28537 static struct pci_driver serial_pci_driver = {
28509diff -urNp linux-2.6.32.23/drivers/serial/kgdboc.c linux-2.6.32.23/drivers/serial/kgdboc.c 28538diff -urNp linux-2.6.32.24/drivers/serial/kgdboc.c linux-2.6.32.24/drivers/serial/kgdboc.c
28510--- linux-2.6.32.23/drivers/serial/kgdboc.c 2010-08-13 16:24:37.000000000 -0400 28539--- linux-2.6.32.24/drivers/serial/kgdboc.c 2010-08-13 16:24:37.000000000 -0400
28511+++ linux-2.6.32.23/drivers/serial/kgdboc.c 2010-09-04 15:54:52.000000000 -0400 28540+++ linux-2.6.32.24/drivers/serial/kgdboc.c 2010-09-04 15:54:52.000000000 -0400
28512@@ -18,7 +18,7 @@ 28541@@ -18,7 +18,7 @@
28513 28542
28514 #define MAX_CONFIG_LEN 40 28543 #define MAX_CONFIG_LEN 40
@@ -28527,9 +28556,9 @@ diff -urNp linux-2.6.32.23/drivers/serial/kgdboc.c linux-2.6.32.23/drivers/seria
28527 .name = "kgdboc", 28556 .name = "kgdboc",
28528 .read_char = kgdboc_get_char, 28557 .read_char = kgdboc_get_char,
28529 .write_char = kgdboc_put_char, 28558 .write_char = kgdboc_put_char,
28530diff -urNp linux-2.6.32.23/drivers/staging/android/binder.c linux-2.6.32.23/drivers/staging/android/binder.c 28559diff -urNp linux-2.6.32.24/drivers/staging/android/binder.c linux-2.6.32.24/drivers/staging/android/binder.c
28531--- linux-2.6.32.23/drivers/staging/android/binder.c 2010-08-13 16:24:37.000000000 -0400 28560--- linux-2.6.32.24/drivers/staging/android/binder.c 2010-08-13 16:24:37.000000000 -0400
28532+++ linux-2.6.32.23/drivers/staging/android/binder.c 2010-09-04 15:54:52.000000000 -0400 28561+++ linux-2.6.32.24/drivers/staging/android/binder.c 2010-09-04 15:54:52.000000000 -0400
28533@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a 28562@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
28534 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); 28563 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
28535 } 28564 }
@@ -28539,9 +28568,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/android/binder.c linux-2.6.32.23/driv
28539 .open = binder_vma_open, 28568 .open = binder_vma_open,
28540 .close = binder_vma_close, 28569 .close = binder_vma_close,
28541 }; 28570 };
28542diff -urNp linux-2.6.32.23/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.23/drivers/staging/b3dfg/b3dfg.c 28571diff -urNp linux-2.6.32.24/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.24/drivers/staging/b3dfg/b3dfg.c
28543--- linux-2.6.32.23/drivers/staging/b3dfg/b3dfg.c 2010-08-13 16:24:37.000000000 -0400 28572--- linux-2.6.32.24/drivers/staging/b3dfg/b3dfg.c 2010-08-13 16:24:37.000000000 -0400
28544+++ linux-2.6.32.23/drivers/staging/b3dfg/b3dfg.c 2010-09-04 15:54:52.000000000 -0400 28573+++ linux-2.6.32.24/drivers/staging/b3dfg/b3dfg.c 2010-09-04 15:54:52.000000000 -0400
28545@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are 28574@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
28546 return VM_FAULT_NOPAGE; 28575 return VM_FAULT_NOPAGE;
28547 } 28576 }
@@ -28560,9 +28589,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.23/drivers
28560 .owner = THIS_MODULE, 28589 .owner = THIS_MODULE,
28561 .open = b3dfg_open, 28590 .open = b3dfg_open,
28562 .release = b3dfg_release, 28591 .release = b3dfg_release,
28563diff -urNp linux-2.6.32.23/drivers/staging/comedi/comedi_fops.c linux-2.6.32.23/drivers/staging/comedi/comedi_fops.c 28592diff -urNp linux-2.6.32.24/drivers/staging/comedi/comedi_fops.c linux-2.6.32.24/drivers/staging/comedi/comedi_fops.c
28564--- linux-2.6.32.23/drivers/staging/comedi/comedi_fops.c 2010-08-13 16:24:37.000000000 -0400 28593--- linux-2.6.32.24/drivers/staging/comedi/comedi_fops.c 2010-08-13 16:24:37.000000000 -0400
28565+++ linux-2.6.32.23/drivers/staging/comedi/comedi_fops.c 2010-09-04 15:54:52.000000000 -0400 28594+++ linux-2.6.32.24/drivers/staging/comedi/comedi_fops.c 2010-09-04 15:54:52.000000000 -0400
28566@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct 28595@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
28567 mutex_unlock(&dev->mutex); 28596 mutex_unlock(&dev->mutex);
28568 } 28597 }
@@ -28572,9 +28601,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/comedi/comedi_fops.c linux-2.6.32.23/
28572 .close = comedi_unmap, 28601 .close = comedi_unmap,
28573 }; 28602 };
28574 28603
28575diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.23/drivers/staging/dream/qdsp5/adsp_driver.c 28604diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.24/drivers/staging/dream/qdsp5/adsp_driver.c
28576--- linux-2.6.32.23/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-13 16:24:37.000000000 -0400 28605--- linux-2.6.32.24/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-13 16:24:37.000000000 -0400
28577+++ linux-2.6.32.23/drivers/staging/dream/qdsp5/adsp_driver.c 2010-09-04 15:54:52.000000000 -0400 28606+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/adsp_driver.c 2010-09-04 15:54:52.000000000 -0400
28578@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi 28607@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
28579 static dev_t adsp_devno; 28608 static dev_t adsp_devno;
28580 static struct class *adsp_class; 28609 static struct class *adsp_class;
@@ -28584,9 +28613,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3
28584 .owner = THIS_MODULE, 28613 .owner = THIS_MODULE,
28585 .open = adsp_open, 28614 .open = adsp_open,
28586 .unlocked_ioctl = adsp_ioctl, 28615 .unlocked_ioctl = adsp_ioctl,
28587diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_aac.c 28616diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_aac.c
28588--- linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-13 16:24:37.000000000 -0400 28617--- linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-13 16:24:37.000000000 -0400
28589+++ linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_aac.c 2010-09-04 15:54:52.000000000 -0400 28618+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_aac.c 2010-09-04 15:54:52.000000000 -0400
28590@@ -1022,7 +1022,7 @@ done: 28619@@ -1022,7 +1022,7 @@ done:
28591 return rc; 28620 return rc;
28592 } 28621 }
@@ -28596,9 +28625,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
28596 .owner = THIS_MODULE, 28625 .owner = THIS_MODULE,
28597 .open = audio_open, 28626 .open = audio_open,
28598 .release = audio_release, 28627 .release = audio_release,
28599diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_amrnb.c 28628diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_amrnb.c
28600--- linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-13 16:24:37.000000000 -0400 28629--- linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-13 16:24:37.000000000 -0400
28601+++ linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-09-04 15:54:52.000000000 -0400 28630+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-09-04 15:54:52.000000000 -0400
28602@@ -833,7 +833,7 @@ done: 28631@@ -833,7 +833,7 @@ done:
28603 return rc; 28632 return rc;
28604 } 28633 }
@@ -28608,9 +28637,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
28608 .owner = THIS_MODULE, 28637 .owner = THIS_MODULE,
28609 .open = audamrnb_open, 28638 .open = audamrnb_open,
28610 .release = audamrnb_release, 28639 .release = audamrnb_release,
28611diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_evrc.c 28640diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_evrc.c
28612--- linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-13 16:24:37.000000000 -0400 28641--- linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-13 16:24:37.000000000 -0400
28613+++ linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_evrc.c 2010-09-04 15:54:52.000000000 -0400 28642+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_evrc.c 2010-09-04 15:54:52.000000000 -0400
28614@@ -805,7 +805,7 @@ dma_fail: 28643@@ -805,7 +805,7 @@ dma_fail:
28615 return rc; 28644 return rc;
28616 } 28645 }
@@ -28620,9 +28649,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32
28620 .owner = THIS_MODULE, 28649 .owner = THIS_MODULE,
28621 .open = audevrc_open, 28650 .open = audevrc_open,
28622 .release = audevrc_release, 28651 .release = audevrc_release,
28623diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_in.c 28652diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_in.c
28624--- linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_in.c 2010-08-13 16:24:37.000000000 -0400 28653--- linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_in.c 2010-08-13 16:24:37.000000000 -0400
28625+++ linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_in.c 2010-09-04 15:54:52.000000000 -0400 28654+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_in.c 2010-09-04 15:54:52.000000000 -0400
28626@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino 28655@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
28627 return 0; 28656 return 0;
28628 } 28657 }
@@ -28641,9 +28670,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.2
28641 .owner = THIS_MODULE, 28670 .owner = THIS_MODULE,
28642 .open = audpre_open, 28671 .open = audpre_open,
28643 .unlocked_ioctl = audpre_ioctl, 28672 .unlocked_ioctl = audpre_ioctl,
28644diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_mp3.c 28673diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_mp3.c
28645--- linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-13 16:24:37.000000000 -0400 28674--- linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-13 16:24:37.000000000 -0400
28646+++ linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_mp3.c 2010-09-04 15:54:52.000000000 -0400 28675+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_mp3.c 2010-09-04 15:54:52.000000000 -0400
28647@@ -941,7 +941,7 @@ done: 28676@@ -941,7 +941,7 @@ done:
28648 return rc; 28677 return rc;
28649 } 28678 }
@@ -28653,9 +28682,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
28653 .owner = THIS_MODULE, 28682 .owner = THIS_MODULE,
28654 .open = audio_open, 28683 .open = audio_open,
28655 .release = audio_release, 28684 .release = audio_release,
28656diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_out.c 28685diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_out.c
28657--- linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_out.c 2010-08-13 16:24:37.000000000 -0400 28686--- linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_out.c 2010-08-13 16:24:37.000000000 -0400
28658+++ linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_out.c 2010-09-04 15:54:52.000000000 -0400 28687+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_out.c 2010-09-04 15:54:52.000000000 -0400
28659@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod 28688@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
28660 return 0; 28689 return 0;
28661 } 28690 }
@@ -28674,9 +28703,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
28674 .owner = THIS_MODULE, 28703 .owner = THIS_MODULE,
28675 .open = audpp_open, 28704 .open = audpp_open,
28676 .unlocked_ioctl = audpp_ioctl, 28705 .unlocked_ioctl = audpp_ioctl,
28677diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_qcelp.c 28706diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_qcelp.c
28678--- linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-13 16:24:37.000000000 -0400 28707--- linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-13 16:24:37.000000000 -0400
28679+++ linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-09-04 15:54:52.000000000 -0400 28708+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-09-04 15:54:52.000000000 -0400
28680@@ -816,7 +816,7 @@ err: 28709@@ -816,7 +816,7 @@ err:
28681 return rc; 28710 return rc;
28682 } 28711 }
@@ -28686,9 +28715,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
28686 .owner = THIS_MODULE, 28715 .owner = THIS_MODULE,
28687 .open = audqcelp_open, 28716 .open = audqcelp_open,
28688 .release = audqcelp_release, 28717 .release = audqcelp_release,
28689diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.23/drivers/staging/dream/qdsp5/snd.c 28718diff -urNp linux-2.6.32.24/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.24/drivers/staging/dream/qdsp5/snd.c
28690--- linux-2.6.32.23/drivers/staging/dream/qdsp5/snd.c 2010-08-13 16:24:37.000000000 -0400 28719--- linux-2.6.32.24/drivers/staging/dream/qdsp5/snd.c 2010-08-13 16:24:37.000000000 -0400
28691+++ linux-2.6.32.23/drivers/staging/dream/qdsp5/snd.c 2010-09-04 15:54:52.000000000 -0400 28720+++ linux-2.6.32.24/drivers/staging/dream/qdsp5/snd.c 2010-09-04 15:54:52.000000000 -0400
28692@@ -242,7 +242,7 @@ err: 28721@@ -242,7 +242,7 @@ err:
28693 return rc; 28722 return rc;
28694 } 28723 }
@@ -28698,9 +28727,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.23/dri
28698 .owner = THIS_MODULE, 28727 .owner = THIS_MODULE,
28699 .open = snd_open, 28728 .open = snd_open,
28700 .release = snd_release, 28729 .release = snd_release,
28701diff -urNp linux-2.6.32.23/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.23/drivers/staging/dream/smd/smd_qmi.c 28730diff -urNp linux-2.6.32.24/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.24/drivers/staging/dream/smd/smd_qmi.c
28702--- linux-2.6.32.23/drivers/staging/dream/smd/smd_qmi.c 2010-08-13 16:24:37.000000000 -0400 28731--- linux-2.6.32.24/drivers/staging/dream/smd/smd_qmi.c 2010-08-13 16:24:37.000000000 -0400
28703+++ linux-2.6.32.23/drivers/staging/dream/smd/smd_qmi.c 2010-09-04 15:54:52.000000000 -0400 28732+++ linux-2.6.32.24/drivers/staging/dream/smd/smd_qmi.c 2010-09-04 15:54:52.000000000 -0400
28704@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, 28733@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
28705 return 0; 28734 return 0;
28706 } 28735 }
@@ -28710,9 +28739,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.23/d
28710 .owner = THIS_MODULE, 28739 .owner = THIS_MODULE,
28711 .read = qmi_read, 28740 .read = qmi_read,
28712 .write = qmi_write, 28741 .write = qmi_write,
28713diff -urNp linux-2.6.32.23/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.23/drivers/staging/dream/smd/smd_rpcrouter_device.c 28742diff -urNp linux-2.6.32.24/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.24/drivers/staging/dream/smd/smd_rpcrouter_device.c
28714--- linux-2.6.32.23/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-13 16:24:37.000000000 -0400 28743--- linux-2.6.32.24/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-13 16:24:37.000000000 -0400
28715+++ linux-2.6.32.23/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-09-04 15:54:52.000000000 -0400 28744+++ linux-2.6.32.24/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-09-04 15:54:52.000000000 -0400
28716@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file 28745@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
28717 return rc; 28746 return rc;
28718 } 28747 }
@@ -28731,9 +28760,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
28731 .owner = THIS_MODULE, 28760 .owner = THIS_MODULE,
28732 .open = rpcrouter_open, 28761 .open = rpcrouter_open,
28733 .release = rpcrouter_release, 28762 .release = rpcrouter_release,
28734diff -urNp linux-2.6.32.23/drivers/staging/dst/dcore.c linux-2.6.32.23/drivers/staging/dst/dcore.c 28763diff -urNp linux-2.6.32.24/drivers/staging/dst/dcore.c linux-2.6.32.24/drivers/staging/dst/dcore.c
28735--- linux-2.6.32.23/drivers/staging/dst/dcore.c 2010-08-13 16:24:37.000000000 -0400 28764--- linux-2.6.32.24/drivers/staging/dst/dcore.c 2010-08-13 16:24:37.000000000 -0400
28736+++ linux-2.6.32.23/drivers/staging/dst/dcore.c 2010-09-04 15:54:52.000000000 -0400 28765+++ linux-2.6.32.24/drivers/staging/dst/dcore.c 2010-09-04 15:54:52.000000000 -0400
28737@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi 28766@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
28738 return 0; 28767 return 0;
28739 } 28768 }
@@ -28752,9 +28781,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/dst/dcore.c linux-2.6.32.23/drivers/s
28752 snprintf(n->name, sizeof(n->name), "%s", ctl->name); 28781 snprintf(n->name, sizeof(n->name), "%s", ctl->name);
28753 28782
28754 err = dst_node_sysfs_init(n); 28783 err = dst_node_sysfs_init(n);
28755diff -urNp linux-2.6.32.23/drivers/staging/dst/trans.c linux-2.6.32.23/drivers/staging/dst/trans.c 28784diff -urNp linux-2.6.32.24/drivers/staging/dst/trans.c linux-2.6.32.24/drivers/staging/dst/trans.c
28756--- linux-2.6.32.23/drivers/staging/dst/trans.c 2010-08-13 16:24:37.000000000 -0400 28785--- linux-2.6.32.24/drivers/staging/dst/trans.c 2010-08-13 16:24:37.000000000 -0400
28757+++ linux-2.6.32.23/drivers/staging/dst/trans.c 2010-09-04 15:54:52.000000000 -0400 28786+++ linux-2.6.32.24/drivers/staging/dst/trans.c 2010-09-04 15:54:52.000000000 -0400
28758@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, 28787@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
28759 t->error = 0; 28788 t->error = 0;
28760 t->retries = 0; 28789 t->retries = 0;
@@ -28764,9 +28793,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/dst/trans.c linux-2.6.32.23/drivers/s
28764 28793
28765 t->enc = bio_data_dir(bio); 28794 t->enc = bio_data_dir(bio);
28766 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); 28795 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
28767diff -urNp linux-2.6.32.23/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.23/drivers/staging/go7007/go7007-v4l2.c 28796diff -urNp linux-2.6.32.24/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.24/drivers/staging/go7007/go7007-v4l2.c
28768--- linux-2.6.32.23/drivers/staging/go7007/go7007-v4l2.c 2010-08-13 16:24:37.000000000 -0400 28797--- linux-2.6.32.24/drivers/staging/go7007/go7007-v4l2.c 2010-08-13 16:24:37.000000000 -0400
28769+++ linux-2.6.32.23/drivers/staging/go7007/go7007-v4l2.c 2010-09-04 15:54:52.000000000 -0400 28798+++ linux-2.6.32.24/drivers/staging/go7007/go7007-v4l2.c 2010-09-04 15:54:52.000000000 -0400
28770@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are 28799@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
28771 return 0; 28800 return 0;
28772 } 28801 }
@@ -28776,9 +28805,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.23/
28776 .open = go7007_vm_open, 28805 .open = go7007_vm_open,
28777 .close = go7007_vm_close, 28806 .close = go7007_vm_close,
28778 .fault = go7007_vm_fault, 28807 .fault = go7007_vm_fault,
28779diff -urNp linux-2.6.32.23/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.23/drivers/staging/hv/blkvsc_drv.c 28808diff -urNp linux-2.6.32.24/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.24/drivers/staging/hv/blkvsc_drv.c
28780--- linux-2.6.32.23/drivers/staging/hv/blkvsc_drv.c 2010-08-13 16:24:37.000000000 -0400 28809--- linux-2.6.32.24/drivers/staging/hv/blkvsc_drv.c 2010-08-13 16:24:37.000000000 -0400
28781+++ linux-2.6.32.23/drivers/staging/hv/blkvsc_drv.c 2010-09-04 15:54:52.000000000 -0400 28810+++ linux-2.6.32.24/drivers/staging/hv/blkvsc_drv.c 2010-09-04 15:54:52.000000000 -0400
28782@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV 28811@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
28783 /* The one and only one */ 28812 /* The one and only one */
28784 static struct blkvsc_driver_context g_blkvsc_drv; 28813 static struct blkvsc_driver_context g_blkvsc_drv;
@@ -28788,9 +28817,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.23/drive
28788 .owner = THIS_MODULE, 28817 .owner = THIS_MODULE,
28789 .open = blkvsc_open, 28818 .open = blkvsc_open,
28790 .release = blkvsc_release, 28819 .release = blkvsc_release,
28791diff -urNp linux-2.6.32.23/drivers/staging/hv/Hv.c linux-2.6.32.23/drivers/staging/hv/Hv.c 28820diff -urNp linux-2.6.32.24/drivers/staging/hv/Hv.c linux-2.6.32.24/drivers/staging/hv/Hv.c
28792--- linux-2.6.32.23/drivers/staging/hv/Hv.c 2010-08-13 16:24:37.000000000 -0400 28821--- linux-2.6.32.24/drivers/staging/hv/Hv.c 2010-08-13 16:24:37.000000000 -0400
28793+++ linux-2.6.32.23/drivers/staging/hv/Hv.c 2010-09-04 15:54:52.000000000 -0400 28822+++ linux-2.6.32.24/drivers/staging/hv/Hv.c 2010-09-04 15:54:52.000000000 -0400
28794@@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo 28823@@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo
28795 u64 outputAddress = (Output) ? virt_to_phys(Output) : 0; 28824 u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
28796 u32 outputAddressHi = outputAddress >> 32; 28825 u32 outputAddressHi = outputAddress >> 32;
@@ -28800,9 +28829,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/hv/Hv.c linux-2.6.32.23/drivers/stagi
28800 28829
28801 DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>", 28830 DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
28802 Control, Input, Output); 28831 Control, Input, Output);
28803diff -urNp linux-2.6.32.23/drivers/staging/panel/panel.c linux-2.6.32.23/drivers/staging/panel/panel.c 28832diff -urNp linux-2.6.32.24/drivers/staging/panel/panel.c linux-2.6.32.24/drivers/staging/panel/panel.c
28804--- linux-2.6.32.23/drivers/staging/panel/panel.c 2010-08-13 16:24:37.000000000 -0400 28833--- linux-2.6.32.24/drivers/staging/panel/panel.c 2010-08-13 16:24:37.000000000 -0400
28805+++ linux-2.6.32.23/drivers/staging/panel/panel.c 2010-09-04 15:54:52.000000000 -0400 28834+++ linux-2.6.32.24/drivers/staging/panel/panel.c 2010-09-04 15:54:52.000000000 -0400
28806@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino 28835@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
28807 return 0; 28836 return 0;
28808 } 28837 }
@@ -28821,9 +28850,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/panel/panel.c linux-2.6.32.23/drivers
28821 .read = keypad_read, /* read */ 28850 .read = keypad_read, /* read */
28822 .open = keypad_open, /* open */ 28851 .open = keypad_open, /* open */
28823 .release = keypad_release, /* close */ 28852 .release = keypad_release, /* close */
28824diff -urNp linux-2.6.32.23/drivers/staging/phison/phison.c linux-2.6.32.23/drivers/staging/phison/phison.c 28853diff -urNp linux-2.6.32.24/drivers/staging/phison/phison.c linux-2.6.32.24/drivers/staging/phison/phison.c
28825--- linux-2.6.32.23/drivers/staging/phison/phison.c 2010-08-13 16:24:37.000000000 -0400 28854--- linux-2.6.32.24/drivers/staging/phison/phison.c 2010-08-13 16:24:37.000000000 -0400
28826+++ linux-2.6.32.23/drivers/staging/phison/phison.c 2010-09-04 15:54:52.000000000 -0400 28855+++ linux-2.6.32.24/drivers/staging/phison/phison.c 2010-09-04 15:54:52.000000000 -0400
28827@@ -43,7 +43,7 @@ static struct scsi_host_template phison_ 28856@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
28828 ATA_BMDMA_SHT(DRV_NAME), 28857 ATA_BMDMA_SHT(DRV_NAME),
28829 }; 28858 };
@@ -28833,9 +28862,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/phison/phison.c linux-2.6.32.23/drive
28833 .inherits = &ata_bmdma_port_ops, 28862 .inherits = &ata_bmdma_port_ops,
28834 .prereset = phison_pre_reset, 28863 .prereset = phison_pre_reset,
28835 }; 28864 };
28836diff -urNp linux-2.6.32.23/drivers/staging/poch/poch.c linux-2.6.32.23/drivers/staging/poch/poch.c 28865diff -urNp linux-2.6.32.24/drivers/staging/poch/poch.c linux-2.6.32.24/drivers/staging/poch/poch.c
28837--- linux-2.6.32.23/drivers/staging/poch/poch.c 2010-08-13 16:24:37.000000000 -0400 28866--- linux-2.6.32.24/drivers/staging/poch/poch.c 2010-08-13 16:24:37.000000000 -0400
28838+++ linux-2.6.32.23/drivers/staging/poch/poch.c 2010-09-04 15:54:52.000000000 -0400 28867+++ linux-2.6.32.24/drivers/staging/poch/poch.c 2010-09-04 15:54:52.000000000 -0400
28839@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod 28868@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
28840 return 0; 28869 return 0;
28841 } 28870 }
@@ -28845,9 +28874,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/poch/poch.c linux-2.6.32.23/drivers/s
28845 .owner = THIS_MODULE, 28874 .owner = THIS_MODULE,
28846 .open = poch_open, 28875 .open = poch_open,
28847 .release = poch_release, 28876 .release = poch_release,
28848diff -urNp linux-2.6.32.23/drivers/staging/pohmelfs/inode.c linux-2.6.32.23/drivers/staging/pohmelfs/inode.c 28877diff -urNp linux-2.6.32.24/drivers/staging/pohmelfs/inode.c linux-2.6.32.24/drivers/staging/pohmelfs/inode.c
28849--- linux-2.6.32.23/drivers/staging/pohmelfs/inode.c 2010-08-13 16:24:37.000000000 -0400 28878--- linux-2.6.32.24/drivers/staging/pohmelfs/inode.c 2010-08-13 16:24:37.000000000 -0400
28850+++ linux-2.6.32.23/drivers/staging/pohmelfs/inode.c 2010-09-04 15:54:52.000000000 -0400 28879+++ linux-2.6.32.24/drivers/staging/pohmelfs/inode.c 2010-09-04 15:54:52.000000000 -0400
28851@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su 28880@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
28852 mutex_init(&psb->mcache_lock); 28881 mutex_init(&psb->mcache_lock);
28853 psb->mcache_root = RB_ROOT; 28882 psb->mcache_root = RB_ROOT;
@@ -28857,9 +28886,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/pohmelfs/inode.c linux-2.6.32.23/driv
28857 28886
28858 psb->trans_max_pages = 100; 28887 psb->trans_max_pages = 100;
28859 28888
28860diff -urNp linux-2.6.32.23/drivers/staging/pohmelfs/mcache.c linux-2.6.32.23/drivers/staging/pohmelfs/mcache.c 28889diff -urNp linux-2.6.32.24/drivers/staging/pohmelfs/mcache.c linux-2.6.32.24/drivers/staging/pohmelfs/mcache.c
28861--- linux-2.6.32.23/drivers/staging/pohmelfs/mcache.c 2010-08-13 16:24:37.000000000 -0400 28890--- linux-2.6.32.24/drivers/staging/pohmelfs/mcache.c 2010-08-13 16:24:37.000000000 -0400
28862+++ linux-2.6.32.23/drivers/staging/pohmelfs/mcache.c 2010-09-04 15:54:52.000000000 -0400 28891+++ linux-2.6.32.24/drivers/staging/pohmelfs/mcache.c 2010-09-04 15:54:52.000000000 -0400
28863@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ 28892@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
28864 m->data = data; 28893 m->data = data;
28865 m->start = start; 28894 m->start = start;
@@ -28869,9 +28898,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/pohmelfs/mcache.c linux-2.6.32.23/dri
28869 28898
28870 mutex_lock(&psb->mcache_lock); 28899 mutex_lock(&psb->mcache_lock);
28871 err = pohmelfs_mcache_insert(psb, m); 28900 err = pohmelfs_mcache_insert(psb, m);
28872diff -urNp linux-2.6.32.23/drivers/staging/pohmelfs/netfs.h linux-2.6.32.23/drivers/staging/pohmelfs/netfs.h 28901diff -urNp linux-2.6.32.24/drivers/staging/pohmelfs/netfs.h linux-2.6.32.24/drivers/staging/pohmelfs/netfs.h
28873--- linux-2.6.32.23/drivers/staging/pohmelfs/netfs.h 2010-08-13 16:24:37.000000000 -0400 28902--- linux-2.6.32.24/drivers/staging/pohmelfs/netfs.h 2010-08-13 16:24:37.000000000 -0400
28874+++ linux-2.6.32.23/drivers/staging/pohmelfs/netfs.h 2010-09-04 15:54:52.000000000 -0400 28903+++ linux-2.6.32.24/drivers/staging/pohmelfs/netfs.h 2010-09-04 15:54:52.000000000 -0400
28875@@ -570,7 +570,7 @@ struct pohmelfs_config; 28904@@ -570,7 +570,7 @@ struct pohmelfs_config;
28876 struct pohmelfs_sb { 28905 struct pohmelfs_sb {
28877 struct rb_root mcache_root; 28906 struct rb_root mcache_root;
@@ -28881,9 +28910,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/pohmelfs/netfs.h linux-2.6.32.23/driv
28881 unsigned long mcache_timeout; 28910 unsigned long mcache_timeout;
28882 28911
28883 unsigned int idx; 28912 unsigned int idx;
28884diff -urNp linux-2.6.32.23/drivers/staging/sep/sep_driver.c linux-2.6.32.23/drivers/staging/sep/sep_driver.c 28913diff -urNp linux-2.6.32.24/drivers/staging/sep/sep_driver.c linux-2.6.32.24/drivers/staging/sep/sep_driver.c
28885--- linux-2.6.32.23/drivers/staging/sep/sep_driver.c 2010-08-13 16:24:37.000000000 -0400 28914--- linux-2.6.32.24/drivers/staging/sep/sep_driver.c 2010-08-13 16:24:37.000000000 -0400
28886+++ linux-2.6.32.23/drivers/staging/sep/sep_driver.c 2010-09-04 15:54:52.000000000 -0400 28915+++ linux-2.6.32.24/drivers/staging/sep/sep_driver.c 2010-09-04 15:54:52.000000000 -0400
28887@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver 28916@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
28888 static dev_t sep_devno; 28917 static dev_t sep_devno;
28889 28918
@@ -28893,9 +28922,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/sep/sep_driver.c linux-2.6.32.23/driv
28893 .owner = THIS_MODULE, 28922 .owner = THIS_MODULE,
28894 .ioctl = sep_ioctl, 28923 .ioctl = sep_ioctl,
28895 .poll = sep_poll, 28924 .poll = sep_poll,
28896diff -urNp linux-2.6.32.23/drivers/staging/vme/devices/vme_user.c linux-2.6.32.23/drivers/staging/vme/devices/vme_user.c 28925diff -urNp linux-2.6.32.24/drivers/staging/vme/devices/vme_user.c linux-2.6.32.24/drivers/staging/vme/devices/vme_user.c
28897--- linux-2.6.32.23/drivers/staging/vme/devices/vme_user.c 2010-08-13 16:24:37.000000000 -0400 28926--- linux-2.6.32.24/drivers/staging/vme/devices/vme_user.c 2010-08-13 16:24:37.000000000 -0400
28898+++ linux-2.6.32.23/drivers/staging/vme/devices/vme_user.c 2010-09-04 15:54:52.000000000 -0400 28927+++ linux-2.6.32.24/drivers/staging/vme/devices/vme_user.c 2010-09-04 15:54:52.000000000 -0400
28899@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * 28928@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
28900 static int __init vme_user_probe(struct device *, int, int); 28929 static int __init vme_user_probe(struct device *, int, int);
28901 static int __exit vme_user_remove(struct device *, int, int); 28930 static int __exit vme_user_remove(struct device *, int, int);
@@ -28905,9 +28934,9 @@ diff -urNp linux-2.6.32.23/drivers/staging/vme/devices/vme_user.c linux-2.6.32.2
28905 .open = vme_user_open, 28934 .open = vme_user_open,
28906 .release = vme_user_release, 28935 .release = vme_user_release,
28907 .read = vme_user_read, 28936 .read = vme_user_read,
28908diff -urNp linux-2.6.32.23/drivers/uio/uio.c linux-2.6.32.23/drivers/uio/uio.c 28937diff -urNp linux-2.6.32.24/drivers/uio/uio.c linux-2.6.32.24/drivers/uio/uio.c
28909--- linux-2.6.32.23/drivers/uio/uio.c 2010-08-13 16:24:37.000000000 -0400 28938--- linux-2.6.32.24/drivers/uio/uio.c 2010-08-13 16:24:37.000000000 -0400
28910+++ linux-2.6.32.23/drivers/uio/uio.c 2010-09-04 15:54:52.000000000 -0400 28939+++ linux-2.6.32.24/drivers/uio/uio.c 2010-09-04 15:54:52.000000000 -0400
28911@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj 28940@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
28912 return entry->show(mem, buf); 28941 return entry->show(mem, buf);
28913 } 28942 }
@@ -28926,9 +28955,9 @@ diff -urNp linux-2.6.32.23/drivers/uio/uio.c linux-2.6.32.23/drivers/uio/uio.c
28926 .show = portio_type_show, 28955 .show = portio_type_show,
28927 }; 28956 };
28928 28957
28929diff -urNp linux-2.6.32.23/drivers/usb/atm/usbatm.c linux-2.6.32.23/drivers/usb/atm/usbatm.c 28958diff -urNp linux-2.6.32.24/drivers/usb/atm/usbatm.c linux-2.6.32.24/drivers/usb/atm/usbatm.c
28930--- linux-2.6.32.23/drivers/usb/atm/usbatm.c 2010-08-13 16:24:37.000000000 -0400 28959--- linux-2.6.32.24/drivers/usb/atm/usbatm.c 2010-08-13 16:24:37.000000000 -0400
28931+++ linux-2.6.32.23/drivers/usb/atm/usbatm.c 2010-09-04 15:54:52.000000000 -0400 28960+++ linux-2.6.32.24/drivers/usb/atm/usbatm.c 2010-09-04 15:54:52.000000000 -0400
28932@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru 28961@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
28933 if (printk_ratelimit()) 28962 if (printk_ratelimit())
28934 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", 28963 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -29008,9 +29037,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/atm/usbatm.c linux-2.6.32.23/drivers/usb/
29008 29037
29009 if (!left--) { 29038 if (!left--) {
29010 if (instance->disconnected) 29039 if (instance->disconnected)
29011diff -urNp linux-2.6.32.23/drivers/usb/class/cdc-acm.c linux-2.6.32.23/drivers/usb/class/cdc-acm.c 29040diff -urNp linux-2.6.32.24/drivers/usb/class/cdc-acm.c linux-2.6.32.24/drivers/usb/class/cdc-acm.c
29012--- linux-2.6.32.23/drivers/usb/class/cdc-acm.c 2010-09-20 17:26:42.000000000 -0400 29041--- linux-2.6.32.24/drivers/usb/class/cdc-acm.c 2010-09-20 17:26:42.000000000 -0400
29013+++ linux-2.6.32.23/drivers/usb/class/cdc-acm.c 2010-09-20 17:32:02.000000000 -0400 29042+++ linux-2.6.32.24/drivers/usb/class/cdc-acm.c 2010-09-20 17:32:02.000000000 -0400
29014@@ -1618,7 +1618,7 @@ static struct usb_device_id acm_ids[] = 29043@@ -1618,7 +1618,7 @@ static struct usb_device_id acm_ids[] =
29015 { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, 29044 { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
29016 USB_CDC_ACM_PROTO_AT_CDMA) }, 29045 USB_CDC_ACM_PROTO_AT_CDMA) },
@@ -29020,9 +29049,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/class/cdc-acm.c linux-2.6.32.23/drivers/u
29020 }; 29049 };
29021 29050
29022 MODULE_DEVICE_TABLE(usb, acm_ids); 29051 MODULE_DEVICE_TABLE(usb, acm_ids);
29023diff -urNp linux-2.6.32.23/drivers/usb/class/cdc-wdm.c linux-2.6.32.23/drivers/usb/class/cdc-wdm.c 29052diff -urNp linux-2.6.32.24/drivers/usb/class/cdc-wdm.c linux-2.6.32.24/drivers/usb/class/cdc-wdm.c
29024--- linux-2.6.32.23/drivers/usb/class/cdc-wdm.c 2010-08-13 16:24:37.000000000 -0400 29053--- linux-2.6.32.24/drivers/usb/class/cdc-wdm.c 2010-08-13 16:24:37.000000000 -0400
29025+++ linux-2.6.32.23/drivers/usb/class/cdc-wdm.c 2010-09-04 15:54:52.000000000 -0400 29054+++ linux-2.6.32.24/drivers/usb/class/cdc-wdm.c 2010-09-04 15:54:52.000000000 -0400
29026@@ -314,7 +314,7 @@ static ssize_t wdm_write 29055@@ -314,7 +314,7 @@ static ssize_t wdm_write
29027 if (r < 0) 29056 if (r < 0)
29028 goto outnp; 29057 goto outnp;
@@ -29032,9 +29061,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/class/cdc-wdm.c linux-2.6.32.23/drivers/u
29032 r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE, 29061 r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
29033 &desc->flags)); 29062 &desc->flags));
29034 else 29063 else
29035diff -urNp linux-2.6.32.23/drivers/usb/class/usblp.c linux-2.6.32.23/drivers/usb/class/usblp.c 29064diff -urNp linux-2.6.32.24/drivers/usb/class/usblp.c linux-2.6.32.24/drivers/usb/class/usblp.c
29036--- linux-2.6.32.23/drivers/usb/class/usblp.c 2010-08-13 16:24:37.000000000 -0400 29065--- linux-2.6.32.24/drivers/usb/class/usblp.c 2010-08-13 16:24:37.000000000 -0400
29037+++ linux-2.6.32.23/drivers/usb/class/usblp.c 2010-09-04 15:54:52.000000000 -0400 29066+++ linux-2.6.32.24/drivers/usb/class/usblp.c 2010-09-04 15:54:52.000000000 -0400
29038@@ -228,7 +228,7 @@ static const struct quirk_printer_struct 29067@@ -228,7 +228,7 @@ static const struct quirk_printer_struct
29039 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ 29068 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
29040 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ 29069 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
@@ -29053,9 +29082,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/class/usblp.c linux-2.6.32.23/drivers/usb
29053 }; 29082 };
29054 29083
29055 MODULE_DEVICE_TABLE (usb, usblp_ids); 29084 MODULE_DEVICE_TABLE (usb, usblp_ids);
29056diff -urNp linux-2.6.32.23/drivers/usb/core/hcd.c linux-2.6.32.23/drivers/usb/core/hcd.c 29085diff -urNp linux-2.6.32.24/drivers/usb/core/hcd.c linux-2.6.32.24/drivers/usb/core/hcd.c
29057--- linux-2.6.32.23/drivers/usb/core/hcd.c 2010-08-13 16:24:37.000000000 -0400 29086--- linux-2.6.32.24/drivers/usb/core/hcd.c 2010-08-13 16:24:37.000000000 -0400
29058+++ linux-2.6.32.23/drivers/usb/core/hcd.c 2010-09-04 15:54:52.000000000 -0400 29087+++ linux-2.6.32.24/drivers/usb/core/hcd.c 2010-09-04 15:54:52.000000000 -0400
29059@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd 29088@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
29060 29089
29061 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 29090 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -29074,9 +29103,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/core/hcd.c linux-2.6.32.23/drivers/usb/co
29074 { 29103 {
29075 29104
29076 if (mon_ops) 29105 if (mon_ops)
29077diff -urNp linux-2.6.32.23/drivers/usb/core/hcd.h linux-2.6.32.23/drivers/usb/core/hcd.h 29106diff -urNp linux-2.6.32.24/drivers/usb/core/hcd.h linux-2.6.32.24/drivers/usb/core/hcd.h
29078--- linux-2.6.32.23/drivers/usb/core/hcd.h 2010-08-13 16:24:37.000000000 -0400 29107--- linux-2.6.32.24/drivers/usb/core/hcd.h 2010-08-13 16:24:37.000000000 -0400
29079+++ linux-2.6.32.23/drivers/usb/core/hcd.h 2010-09-04 15:54:52.000000000 -0400 29108+++ linux-2.6.32.24/drivers/usb/core/hcd.h 2010-09-04 15:54:52.000000000 -0400
29080@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { 29109@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
29081 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 29110 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
29082 29111
@@ -29104,9 +29133,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/core/hcd.h linux-2.6.32.23/drivers/usb/co
29104 void usb_mon_deregister(void); 29133 void usb_mon_deregister(void);
29105 29134
29106 #else 29135 #else
29107diff -urNp linux-2.6.32.23/drivers/usb/core/hub.c linux-2.6.32.23/drivers/usb/core/hub.c 29136diff -urNp linux-2.6.32.24/drivers/usb/core/hub.c linux-2.6.32.24/drivers/usb/core/hub.c
29108--- linux-2.6.32.23/drivers/usb/core/hub.c 2010-08-13 16:24:37.000000000 -0400 29137--- linux-2.6.32.24/drivers/usb/core/hub.c 2010-08-13 16:24:37.000000000 -0400
29109+++ linux-2.6.32.23/drivers/usb/core/hub.c 2010-09-04 15:54:52.000000000 -0400 29138+++ linux-2.6.32.24/drivers/usb/core/hub.c 2010-09-04 15:54:52.000000000 -0400
29110@@ -3401,7 +3401,7 @@ static struct usb_device_id hub_id_table 29139@@ -3401,7 +3401,7 @@ static struct usb_device_id hub_id_table
29111 .bDeviceClass = USB_CLASS_HUB}, 29140 .bDeviceClass = USB_CLASS_HUB},
29112 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, 29141 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
@@ -29116,9 +29145,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/core/hub.c linux-2.6.32.23/drivers/usb/co
29116 }; 29145 };
29117 29146
29118 MODULE_DEVICE_TABLE (usb, hub_id_table); 29147 MODULE_DEVICE_TABLE (usb, hub_id_table);
29119diff -urNp linux-2.6.32.23/drivers/usb/core/message.c linux-2.6.32.23/drivers/usb/core/message.c 29148diff -urNp linux-2.6.32.24/drivers/usb/core/message.c linux-2.6.32.24/drivers/usb/core/message.c
29120--- linux-2.6.32.23/drivers/usb/core/message.c 2010-08-13 16:24:37.000000000 -0400 29149--- linux-2.6.32.24/drivers/usb/core/message.c 2010-08-13 16:24:37.000000000 -0400
29121+++ linux-2.6.32.23/drivers/usb/core/message.c 2010-09-04 15:54:52.000000000 -0400 29150+++ linux-2.6.32.24/drivers/usb/core/message.c 2010-09-04 15:54:52.000000000 -0400
29122@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device 29151@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
29123 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); 29152 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
29124 if (buf) { 29153 if (buf) {
@@ -29130,9 +29159,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/core/message.c linux-2.6.32.23/drivers/us
29130 if (!smallbuf) 29159 if (!smallbuf)
29131 return buf; 29160 return buf;
29132 memcpy(smallbuf, buf, len); 29161 memcpy(smallbuf, buf, len);
29133diff -urNp linux-2.6.32.23/drivers/usb/host/ehci-pci.c linux-2.6.32.23/drivers/usb/host/ehci-pci.c 29162diff -urNp linux-2.6.32.24/drivers/usb/host/ehci-pci.c linux-2.6.32.24/drivers/usb/host/ehci-pci.c
29134--- linux-2.6.32.23/drivers/usb/host/ehci-pci.c 2010-08-13 16:24:37.000000000 -0400 29163--- linux-2.6.32.24/drivers/usb/host/ehci-pci.c 2010-08-13 16:24:37.000000000 -0400
29135+++ linux-2.6.32.23/drivers/usb/host/ehci-pci.c 2010-09-04 15:54:52.000000000 -0400 29164+++ linux-2.6.32.24/drivers/usb/host/ehci-pci.c 2010-09-04 15:54:52.000000000 -0400
29136@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id 29165@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
29137 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), 29166 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
29138 .driver_data = (unsigned long) &ehci_pci_hc_driver, 29167 .driver_data = (unsigned long) &ehci_pci_hc_driver,
@@ -29142,9 +29171,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/host/ehci-pci.c linux-2.6.32.23/drivers/u
29142 }; 29171 };
29143 MODULE_DEVICE_TABLE(pci, pci_ids); 29172 MODULE_DEVICE_TABLE(pci, pci_ids);
29144 29173
29145diff -urNp linux-2.6.32.23/drivers/usb/host/uhci-hcd.c linux-2.6.32.23/drivers/usb/host/uhci-hcd.c 29174diff -urNp linux-2.6.32.24/drivers/usb/host/uhci-hcd.c linux-2.6.32.24/drivers/usb/host/uhci-hcd.c
29146--- linux-2.6.32.23/drivers/usb/host/uhci-hcd.c 2010-08-13 16:24:37.000000000 -0400 29175--- linux-2.6.32.24/drivers/usb/host/uhci-hcd.c 2010-08-13 16:24:37.000000000 -0400
29147+++ linux-2.6.32.23/drivers/usb/host/uhci-hcd.c 2010-09-04 15:54:52.000000000 -0400 29176+++ linux-2.6.32.24/drivers/usb/host/uhci-hcd.c 2010-09-04 15:54:52.000000000 -0400
29148@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p 29177@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
29149 /* handle any USB UHCI controller */ 29178 /* handle any USB UHCI controller */
29150 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), 29179 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -29154,9 +29183,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/host/uhci-hcd.c linux-2.6.32.23/drivers/u
29154 }; 29183 };
29155 29184
29156 MODULE_DEVICE_TABLE(pci, uhci_pci_ids); 29185 MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
29157diff -urNp linux-2.6.32.23/drivers/usb/misc/appledisplay.c linux-2.6.32.23/drivers/usb/misc/appledisplay.c 29186diff -urNp linux-2.6.32.24/drivers/usb/misc/appledisplay.c linux-2.6.32.24/drivers/usb/misc/appledisplay.c
29158--- linux-2.6.32.23/drivers/usb/misc/appledisplay.c 2010-08-13 16:24:37.000000000 -0400 29187--- linux-2.6.32.24/drivers/usb/misc/appledisplay.c 2010-08-13 16:24:37.000000000 -0400
29159+++ linux-2.6.32.23/drivers/usb/misc/appledisplay.c 2010-09-04 15:54:52.000000000 -0400 29188+++ linux-2.6.32.24/drivers/usb/misc/appledisplay.c 2010-09-04 15:54:52.000000000 -0400
29160@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes 29189@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
29161 return pdata->msgdata[1]; 29190 return pdata->msgdata[1];
29162 } 29191 }
@@ -29166,9 +29195,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/misc/appledisplay.c linux-2.6.32.23/drive
29166 .get_brightness = appledisplay_bl_get_brightness, 29195 .get_brightness = appledisplay_bl_get_brightness,
29167 .update_status = appledisplay_bl_update_status, 29196 .update_status = appledisplay_bl_update_status,
29168 }; 29197 };
29169diff -urNp linux-2.6.32.23/drivers/usb/mon/mon_main.c linux-2.6.32.23/drivers/usb/mon/mon_main.c 29198diff -urNp linux-2.6.32.24/drivers/usb/mon/mon_main.c linux-2.6.32.24/drivers/usb/mon/mon_main.c
29170--- linux-2.6.32.23/drivers/usb/mon/mon_main.c 2010-08-13 16:24:37.000000000 -0400 29199--- linux-2.6.32.24/drivers/usb/mon/mon_main.c 2010-08-13 16:24:37.000000000 -0400
29171+++ linux-2.6.32.23/drivers/usb/mon/mon_main.c 2010-09-04 15:54:52.000000000 -0400 29200+++ linux-2.6.32.24/drivers/usb/mon/mon_main.c 2010-09-04 15:54:52.000000000 -0400
29172@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { 29201@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
29173 /* 29202 /*
29174 * Ops 29203 * Ops
@@ -29178,9 +29207,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/mon/mon_main.c linux-2.6.32.23/drivers/us
29178 .urb_submit = mon_submit, 29207 .urb_submit = mon_submit,
29179 .urb_submit_error = mon_submit_error, 29208 .urb_submit_error = mon_submit_error,
29180 .urb_complete = mon_complete, 29209 .urb_complete = mon_complete,
29181diff -urNp linux-2.6.32.23/drivers/usb/storage/debug.h linux-2.6.32.23/drivers/usb/storage/debug.h 29210diff -urNp linux-2.6.32.24/drivers/usb/storage/debug.h linux-2.6.32.24/drivers/usb/storage/debug.h
29182--- linux-2.6.32.23/drivers/usb/storage/debug.h 2010-08-13 16:24:37.000000000 -0400 29211--- linux-2.6.32.24/drivers/usb/storage/debug.h 2010-08-13 16:24:37.000000000 -0400
29183+++ linux-2.6.32.23/drivers/usb/storage/debug.h 2010-09-04 15:54:52.000000000 -0400 29212+++ linux-2.6.32.24/drivers/usb/storage/debug.h 2010-09-04 15:54:52.000000000 -0400
29184@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char 29213@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
29185 #define US_DEBUGPX(x...) printk( x ) 29214 #define US_DEBUGPX(x...) printk( x )
29186 #define US_DEBUG(x) x 29215 #define US_DEBUG(x) x
@@ -29194,9 +29223,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/storage/debug.h linux-2.6.32.23/drivers/u
29194 #endif 29223 #endif
29195 29224
29196 #endif 29225 #endif
29197diff -urNp linux-2.6.32.23/drivers/usb/storage/usb.c linux-2.6.32.23/drivers/usb/storage/usb.c 29226diff -urNp linux-2.6.32.24/drivers/usb/storage/usb.c linux-2.6.32.24/drivers/usb/storage/usb.c
29198--- linux-2.6.32.23/drivers/usb/storage/usb.c 2010-08-13 16:24:37.000000000 -0400 29227--- linux-2.6.32.24/drivers/usb/storage/usb.c 2010-08-13 16:24:37.000000000 -0400
29199+++ linux-2.6.32.23/drivers/usb/storage/usb.c 2010-09-04 15:54:52.000000000 -0400 29228+++ linux-2.6.32.24/drivers/usb/storage/usb.c 2010-09-04 15:54:52.000000000 -0400
29200@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l 29229@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
29201 29230
29202 static struct us_unusual_dev us_unusual_dev_list[] = { 29231 static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -29206,9 +29235,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/storage/usb.c linux-2.6.32.23/drivers/usb
29206 }; 29235 };
29207 29236
29208 #undef UNUSUAL_DEV 29237 #undef UNUSUAL_DEV
29209diff -urNp linux-2.6.32.23/drivers/usb/storage/usual-tables.c linux-2.6.32.23/drivers/usb/storage/usual-tables.c 29238diff -urNp linux-2.6.32.24/drivers/usb/storage/usual-tables.c linux-2.6.32.24/drivers/usb/storage/usual-tables.c
29210--- linux-2.6.32.23/drivers/usb/storage/usual-tables.c 2010-08-13 16:24:37.000000000 -0400 29239--- linux-2.6.32.24/drivers/usb/storage/usual-tables.c 2010-08-13 16:24:37.000000000 -0400
29211+++ linux-2.6.32.23/drivers/usb/storage/usual-tables.c 2010-09-04 15:54:52.000000000 -0400 29240+++ linux-2.6.32.24/drivers/usb/storage/usual-tables.c 2010-09-04 15:54:52.000000000 -0400
29212@@ -48,7 +48,7 @@ 29241@@ -48,7 +48,7 @@
29213 29242
29214 struct usb_device_id usb_storage_usb_ids[] = { 29243 struct usb_device_id usb_storage_usb_ids[] = {
@@ -29218,9 +29247,9 @@ diff -urNp linux-2.6.32.23/drivers/usb/storage/usual-tables.c linux-2.6.32.23/dr
29218 }; 29247 };
29219 EXPORT_SYMBOL_GPL(usb_storage_usb_ids); 29248 EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
29220 29249
29221diff -urNp linux-2.6.32.23/drivers/uwb/wlp/messages.c linux-2.6.32.23/drivers/uwb/wlp/messages.c 29250diff -urNp linux-2.6.32.24/drivers/uwb/wlp/messages.c linux-2.6.32.24/drivers/uwb/wlp/messages.c
29222--- linux-2.6.32.23/drivers/uwb/wlp/messages.c 2010-08-13 16:24:37.000000000 -0400 29251--- linux-2.6.32.24/drivers/uwb/wlp/messages.c 2010-08-13 16:24:37.000000000 -0400
29223+++ linux-2.6.32.23/drivers/uwb/wlp/messages.c 2010-09-04 15:54:52.000000000 -0400 29252+++ linux-2.6.32.24/drivers/uwb/wlp/messages.c 2010-09-04 15:54:52.000000000 -0400
29224@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct 29253@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
29225 size_t len = skb->len; 29254 size_t len = skb->len;
29226 size_t used; 29255 size_t used;
@@ -29230,9 +29259,9 @@ diff -urNp linux-2.6.32.23/drivers/uwb/wlp/messages.c linux-2.6.32.23/drivers/uw
29230 enum wlp_assc_error assc_err; 29259 enum wlp_assc_error assc_err;
29231 char enonce_buf[WLP_WSS_NONCE_STRSIZE]; 29260 char enonce_buf[WLP_WSS_NONCE_STRSIZE];
29232 char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; 29261 char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
29233diff -urNp linux-2.6.32.23/drivers/uwb/wlp/sysfs.c linux-2.6.32.23/drivers/uwb/wlp/sysfs.c 29262diff -urNp linux-2.6.32.24/drivers/uwb/wlp/sysfs.c linux-2.6.32.24/drivers/uwb/wlp/sysfs.c
29234--- linux-2.6.32.23/drivers/uwb/wlp/sysfs.c 2010-08-13 16:24:37.000000000 -0400 29263--- linux-2.6.32.24/drivers/uwb/wlp/sysfs.c 2010-08-13 16:24:37.000000000 -0400
29235+++ linux-2.6.32.23/drivers/uwb/wlp/sysfs.c 2010-09-04 15:54:52.000000000 -0400 29264+++ linux-2.6.32.24/drivers/uwb/wlp/sysfs.c 2010-09-04 15:54:52.000000000 -0400
29236@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec 29265@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
29237 return ret; 29266 return ret;
29238 } 29267 }
@@ -29243,9 +29272,9 @@ diff -urNp linux-2.6.32.23/drivers/uwb/wlp/sysfs.c linux-2.6.32.23/drivers/uwb/w
29243 .show = wlp_wss_attr_show, 29272 .show = wlp_wss_attr_show,
29244 .store = wlp_wss_attr_store, 29273 .store = wlp_wss_attr_store,
29245 }; 29274 };
29246diff -urNp linux-2.6.32.23/drivers/video/atmel_lcdfb.c linux-2.6.32.23/drivers/video/atmel_lcdfb.c 29275diff -urNp linux-2.6.32.24/drivers/video/atmel_lcdfb.c linux-2.6.32.24/drivers/video/atmel_lcdfb.c
29247--- linux-2.6.32.23/drivers/video/atmel_lcdfb.c 2010-08-13 16:24:37.000000000 -0400 29276--- linux-2.6.32.24/drivers/video/atmel_lcdfb.c 2010-08-13 16:24:37.000000000 -0400
29248+++ linux-2.6.32.23/drivers/video/atmel_lcdfb.c 2010-09-04 15:54:52.000000000 -0400 29277+++ linux-2.6.32.24/drivers/video/atmel_lcdfb.c 2010-09-04 15:54:52.000000000 -0400
29249@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc 29278@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
29250 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); 29279 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
29251 } 29280 }
@@ -29255,9 +29284,9 @@ diff -urNp linux-2.6.32.23/drivers/video/atmel_lcdfb.c linux-2.6.32.23/drivers/v
29255 .update_status = atmel_bl_update_status, 29284 .update_status = atmel_bl_update_status,
29256 .get_brightness = atmel_bl_get_brightness, 29285 .get_brightness = atmel_bl_get_brightness,
29257 }; 29286 };
29258diff -urNp linux-2.6.32.23/drivers/video/aty/aty128fb.c linux-2.6.32.23/drivers/video/aty/aty128fb.c 29287diff -urNp linux-2.6.32.24/drivers/video/aty/aty128fb.c linux-2.6.32.24/drivers/video/aty/aty128fb.c
29259--- linux-2.6.32.23/drivers/video/aty/aty128fb.c 2010-08-13 16:24:37.000000000 -0400 29288--- linux-2.6.32.24/drivers/video/aty/aty128fb.c 2010-08-13 16:24:37.000000000 -0400
29260+++ linux-2.6.32.23/drivers/video/aty/aty128fb.c 2010-09-04 15:54:52.000000000 -0400 29289+++ linux-2.6.32.24/drivers/video/aty/aty128fb.c 2010-09-04 15:54:52.000000000 -0400
29261@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru 29290@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
29262 return bd->props.brightness; 29291 return bd->props.brightness;
29263 } 29292 }
@@ -29267,9 +29296,9 @@ diff -urNp linux-2.6.32.23/drivers/video/aty/aty128fb.c linux-2.6.32.23/drivers/
29267 .get_brightness = aty128_bl_get_brightness, 29296 .get_brightness = aty128_bl_get_brightness,
29268 .update_status = aty128_bl_update_status, 29297 .update_status = aty128_bl_update_status,
29269 }; 29298 };
29270diff -urNp linux-2.6.32.23/drivers/video/aty/atyfb_base.c linux-2.6.32.23/drivers/video/aty/atyfb_base.c 29299diff -urNp linux-2.6.32.24/drivers/video/aty/atyfb_base.c linux-2.6.32.24/drivers/video/aty/atyfb_base.c
29271--- linux-2.6.32.23/drivers/video/aty/atyfb_base.c 2010-08-13 16:24:37.000000000 -0400 29300--- linux-2.6.32.24/drivers/video/aty/atyfb_base.c 2010-08-13 16:24:37.000000000 -0400
29272+++ linux-2.6.32.23/drivers/video/aty/atyfb_base.c 2010-09-04 15:54:52.000000000 -0400 29301+++ linux-2.6.32.24/drivers/video/aty/atyfb_base.c 2010-09-04 15:54:52.000000000 -0400
29273@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct 29302@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
29274 return bd->props.brightness; 29303 return bd->props.brightness;
29275 } 29304 }
@@ -29279,9 +29308,9 @@ diff -urNp linux-2.6.32.23/drivers/video/aty/atyfb_base.c linux-2.6.32.23/driver
29279 .get_brightness = aty_bl_get_brightness, 29308 .get_brightness = aty_bl_get_brightness,
29280 .update_status = aty_bl_update_status, 29309 .update_status = aty_bl_update_status,
29281 }; 29310 };
29282diff -urNp linux-2.6.32.23/drivers/video/aty/radeon_backlight.c linux-2.6.32.23/drivers/video/aty/radeon_backlight.c 29311diff -urNp linux-2.6.32.24/drivers/video/aty/radeon_backlight.c linux-2.6.32.24/drivers/video/aty/radeon_backlight.c
29283--- linux-2.6.32.23/drivers/video/aty/radeon_backlight.c 2010-08-13 16:24:37.000000000 -0400 29312--- linux-2.6.32.24/drivers/video/aty/radeon_backlight.c 2010-08-13 16:24:37.000000000 -0400
29284+++ linux-2.6.32.23/drivers/video/aty/radeon_backlight.c 2010-09-04 15:54:52.000000000 -0400 29313+++ linux-2.6.32.24/drivers/video/aty/radeon_backlight.c 2010-09-04 15:54:52.000000000 -0400
29285@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru 29314@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
29286 return bd->props.brightness; 29315 return bd->props.brightness;
29287 } 29316 }
@@ -29291,9 +29320,9 @@ diff -urNp linux-2.6.32.23/drivers/video/aty/radeon_backlight.c linux-2.6.32.23/
29291 .get_brightness = radeon_bl_get_brightness, 29320 .get_brightness = radeon_bl_get_brightness,
29292 .update_status = radeon_bl_update_status, 29321 .update_status = radeon_bl_update_status,
29293 }; 29322 };
29294diff -urNp linux-2.6.32.23/drivers/video/backlight/adp5520_bl.c linux-2.6.32.23/drivers/video/backlight/adp5520_bl.c 29323diff -urNp linux-2.6.32.24/drivers/video/backlight/adp5520_bl.c linux-2.6.32.24/drivers/video/backlight/adp5520_bl.c
29295--- linux-2.6.32.23/drivers/video/backlight/adp5520_bl.c 2010-08-13 16:24:37.000000000 -0400 29324--- linux-2.6.32.24/drivers/video/backlight/adp5520_bl.c 2010-08-13 16:24:37.000000000 -0400
29296+++ linux-2.6.32.23/drivers/video/backlight/adp5520_bl.c 2010-09-04 15:54:52.000000000 -0400 29325+++ linux-2.6.32.24/drivers/video/backlight/adp5520_bl.c 2010-09-04 15:54:52.000000000 -0400
29297@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str 29326@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
29298 return error ? data->current_brightness : reg_val; 29327 return error ? data->current_brightness : reg_val;
29299 } 29328 }
@@ -29303,9 +29332,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/adp5520_bl.c linux-2.6.32.23/
29303 .update_status = adp5520_bl_update_status, 29332 .update_status = adp5520_bl_update_status,
29304 .get_brightness = adp5520_bl_get_brightness, 29333 .get_brightness = adp5520_bl_get_brightness,
29305 }; 29334 };
29306diff -urNp linux-2.6.32.23/drivers/video/backlight/adx_bl.c linux-2.6.32.23/drivers/video/backlight/adx_bl.c 29335diff -urNp linux-2.6.32.24/drivers/video/backlight/adx_bl.c linux-2.6.32.24/drivers/video/backlight/adx_bl.c
29307--- linux-2.6.32.23/drivers/video/backlight/adx_bl.c 2010-08-13 16:24:37.000000000 -0400 29336--- linux-2.6.32.24/drivers/video/backlight/adx_bl.c 2010-08-13 16:24:37.000000000 -0400
29308+++ linux-2.6.32.23/drivers/video/backlight/adx_bl.c 2010-09-04 15:54:52.000000000 -0400 29337+++ linux-2.6.32.24/drivers/video/backlight/adx_bl.c 2010-09-04 15:54:52.000000000 -0400
29309@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct 29338@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
29310 return 1; 29339 return 1;
29311 } 29340 }
@@ -29315,9 +29344,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/adx_bl.c linux-2.6.32.23/driv
29315 .options = 0, 29344 .options = 0,
29316 .update_status = adx_backlight_update_status, 29345 .update_status = adx_backlight_update_status,
29317 .get_brightness = adx_backlight_get_brightness, 29346 .get_brightness = adx_backlight_get_brightness,
29318diff -urNp linux-2.6.32.23/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.23/drivers/video/backlight/atmel-pwm-bl.c 29347diff -urNp linux-2.6.32.24/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.24/drivers/video/backlight/atmel-pwm-bl.c
29319--- linux-2.6.32.23/drivers/video/backlight/atmel-pwm-bl.c 2010-08-13 16:24:37.000000000 -0400 29348--- linux-2.6.32.24/drivers/video/backlight/atmel-pwm-bl.c 2010-08-13 16:24:37.000000000 -0400
29320+++ linux-2.6.32.23/drivers/video/backlight/atmel-pwm-bl.c 2010-09-04 15:54:52.000000000 -0400 29349+++ linux-2.6.32.24/drivers/video/backlight/atmel-pwm-bl.c 2010-09-04 15:54:52.000000000 -0400
29321@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct 29350@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
29322 return pwm_channel_enable(&pwmbl->pwmc); 29351 return pwm_channel_enable(&pwmbl->pwmc);
29323 } 29352 }
@@ -29327,9 +29356,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.2
29327 .get_brightness = atmel_pwm_bl_get_intensity, 29356 .get_brightness = atmel_pwm_bl_get_intensity,
29328 .update_status = atmel_pwm_bl_set_intensity, 29357 .update_status = atmel_pwm_bl_set_intensity,
29329 }; 29358 };
29330diff -urNp linux-2.6.32.23/drivers/video/backlight/backlight.c linux-2.6.32.23/drivers/video/backlight/backlight.c 29359diff -urNp linux-2.6.32.24/drivers/video/backlight/backlight.c linux-2.6.32.24/drivers/video/backlight/backlight.c
29331--- linux-2.6.32.23/drivers/video/backlight/backlight.c 2010-08-13 16:24:37.000000000 -0400 29360--- linux-2.6.32.24/drivers/video/backlight/backlight.c 2010-08-13 16:24:37.000000000 -0400
29332+++ linux-2.6.32.23/drivers/video/backlight/backlight.c 2010-09-04 15:54:52.000000000 -0400 29361+++ linux-2.6.32.24/drivers/video/backlight/backlight.c 2010-09-04 15:54:52.000000000 -0400
29333@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); 29362@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
29334 * ERR_PTR() or a pointer to the newly allocated device. 29363 * ERR_PTR() or a pointer to the newly allocated device.
29335 */ 29364 */
@@ -29339,9 +29368,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/backlight.c linux-2.6.32.23/d
29339 { 29368 {
29340 struct backlight_device *new_bd; 29369 struct backlight_device *new_bd;
29341 int rc; 29370 int rc;
29342diff -urNp linux-2.6.32.23/drivers/video/backlight/corgi_lcd.c linux-2.6.32.23/drivers/video/backlight/corgi_lcd.c 29371diff -urNp linux-2.6.32.24/drivers/video/backlight/corgi_lcd.c linux-2.6.32.24/drivers/video/backlight/corgi_lcd.c
29343--- linux-2.6.32.23/drivers/video/backlight/corgi_lcd.c 2010-08-13 16:24:37.000000000 -0400 29372--- linux-2.6.32.24/drivers/video/backlight/corgi_lcd.c 2010-08-13 16:24:37.000000000 -0400
29344+++ linux-2.6.32.23/drivers/video/backlight/corgi_lcd.c 2010-09-04 15:54:52.000000000 -0400 29373+++ linux-2.6.32.24/drivers/video/backlight/corgi_lcd.c 2010-09-04 15:54:52.000000000 -0400
29345@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit 29374@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
29346 } 29375 }
29347 EXPORT_SYMBOL(corgi_lcd_limit_intensity); 29376 EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -29351,9 +29380,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/corgi_lcd.c linux-2.6.32.23/d
29351 .get_brightness = corgi_bl_get_intensity, 29380 .get_brightness = corgi_bl_get_intensity,
29352 .update_status = corgi_bl_update_status, 29381 .update_status = corgi_bl_update_status,
29353 }; 29382 };
29354diff -urNp linux-2.6.32.23/drivers/video/backlight/cr_bllcd.c linux-2.6.32.23/drivers/video/backlight/cr_bllcd.c 29383diff -urNp linux-2.6.32.24/drivers/video/backlight/cr_bllcd.c linux-2.6.32.24/drivers/video/backlight/cr_bllcd.c
29355--- linux-2.6.32.23/drivers/video/backlight/cr_bllcd.c 2010-08-13 16:24:37.000000000 -0400 29384--- linux-2.6.32.24/drivers/video/backlight/cr_bllcd.c 2010-08-13 16:24:37.000000000 -0400
29356+++ linux-2.6.32.23/drivers/video/backlight/cr_bllcd.c 2010-09-04 15:54:52.000000000 -0400 29385+++ linux-2.6.32.24/drivers/video/backlight/cr_bllcd.c 2010-09-04 15:54:52.000000000 -0400
29357@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st 29386@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
29358 return intensity; 29387 return intensity;
29359 } 29388 }
@@ -29363,9 +29392,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/cr_bllcd.c linux-2.6.32.23/dr
29363 .get_brightness = cr_backlight_get_intensity, 29392 .get_brightness = cr_backlight_get_intensity,
29364 .update_status = cr_backlight_set_intensity, 29393 .update_status = cr_backlight_set_intensity,
29365 }; 29394 };
29366diff -urNp linux-2.6.32.23/drivers/video/backlight/da903x_bl.c linux-2.6.32.23/drivers/video/backlight/da903x_bl.c 29395diff -urNp linux-2.6.32.24/drivers/video/backlight/da903x_bl.c linux-2.6.32.24/drivers/video/backlight/da903x_bl.c
29367--- linux-2.6.32.23/drivers/video/backlight/da903x_bl.c 2010-08-13 16:24:37.000000000 -0400 29396--- linux-2.6.32.24/drivers/video/backlight/da903x_bl.c 2010-08-13 16:24:37.000000000 -0400
29368+++ linux-2.6.32.23/drivers/video/backlight/da903x_bl.c 2010-09-04 15:54:52.000000000 -0400 29397+++ linux-2.6.32.24/drivers/video/backlight/da903x_bl.c 2010-09-04 15:54:52.000000000 -0400
29369@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne 29398@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
29370 return data->current_brightness; 29399 return data->current_brightness;
29371 } 29400 }
@@ -29375,9 +29404,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/da903x_bl.c linux-2.6.32.23/d
29375 .update_status = da903x_backlight_update_status, 29404 .update_status = da903x_backlight_update_status,
29376 .get_brightness = da903x_backlight_get_brightness, 29405 .get_brightness = da903x_backlight_get_brightness,
29377 }; 29406 };
29378diff -urNp linux-2.6.32.23/drivers/video/backlight/generic_bl.c linux-2.6.32.23/drivers/video/backlight/generic_bl.c 29407diff -urNp linux-2.6.32.24/drivers/video/backlight/generic_bl.c linux-2.6.32.24/drivers/video/backlight/generic_bl.c
29379--- linux-2.6.32.23/drivers/video/backlight/generic_bl.c 2010-08-13 16:24:37.000000000 -0400 29408--- linux-2.6.32.24/drivers/video/backlight/generic_bl.c 2010-08-13 16:24:37.000000000 -0400
29380+++ linux-2.6.32.23/drivers/video/backlight/generic_bl.c 2010-09-04 15:54:52.000000000 -0400 29409+++ linux-2.6.32.24/drivers/video/backlight/generic_bl.c 2010-09-04 15:54:52.000000000 -0400
29381@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) 29410@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
29382 } 29411 }
29383 EXPORT_SYMBOL(corgibl_limit_intensity); 29412 EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -29387,9 +29416,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/generic_bl.c linux-2.6.32.23/
29387 .options = BL_CORE_SUSPENDRESUME, 29416 .options = BL_CORE_SUSPENDRESUME,
29388 .get_brightness = genericbl_get_intensity, 29417 .get_brightness = genericbl_get_intensity,
29389 .update_status = genericbl_send_intensity, 29418 .update_status = genericbl_send_intensity,
29390diff -urNp linux-2.6.32.23/drivers/video/backlight/hp680_bl.c linux-2.6.32.23/drivers/video/backlight/hp680_bl.c 29419diff -urNp linux-2.6.32.24/drivers/video/backlight/hp680_bl.c linux-2.6.32.24/drivers/video/backlight/hp680_bl.c
29391--- linux-2.6.32.23/drivers/video/backlight/hp680_bl.c 2010-08-13 16:24:37.000000000 -0400 29420--- linux-2.6.32.24/drivers/video/backlight/hp680_bl.c 2010-08-13 16:24:37.000000000 -0400
29392+++ linux-2.6.32.23/drivers/video/backlight/hp680_bl.c 2010-09-04 15:54:52.000000000 -0400 29421+++ linux-2.6.32.24/drivers/video/backlight/hp680_bl.c 2010-09-04 15:54:52.000000000 -0400
29393@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct 29422@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
29394 return current_intensity; 29423 return current_intensity;
29395 } 29424 }
@@ -29399,9 +29428,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/hp680_bl.c linux-2.6.32.23/dr
29399 .get_brightness = hp680bl_get_intensity, 29428 .get_brightness = hp680bl_get_intensity,
29400 .update_status = hp680bl_set_intensity, 29429 .update_status = hp680bl_set_intensity,
29401 }; 29430 };
29402diff -urNp linux-2.6.32.23/drivers/video/backlight/jornada720_bl.c linux-2.6.32.23/drivers/video/backlight/jornada720_bl.c 29431diff -urNp linux-2.6.32.24/drivers/video/backlight/jornada720_bl.c linux-2.6.32.24/drivers/video/backlight/jornada720_bl.c
29403--- linux-2.6.32.23/drivers/video/backlight/jornada720_bl.c 2010-08-13 16:24:37.000000000 -0400 29432--- linux-2.6.32.24/drivers/video/backlight/jornada720_bl.c 2010-08-13 16:24:37.000000000 -0400
29404+++ linux-2.6.32.23/drivers/video/backlight/jornada720_bl.c 2010-09-04 15:54:52.000000000 -0400 29433+++ linux-2.6.32.24/drivers/video/backlight/jornada720_bl.c 2010-09-04 15:54:52.000000000 -0400
29405@@ -93,7 +93,7 @@ out: 29434@@ -93,7 +93,7 @@ out:
29406 return ret; 29435 return ret;
29407 } 29436 }
@@ -29411,9 +29440,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/jornada720_bl.c linux-2.6.32.
29411 .get_brightness = jornada_bl_get_brightness, 29440 .get_brightness = jornada_bl_get_brightness,
29412 .update_status = jornada_bl_update_status, 29441 .update_status = jornada_bl_update_status,
29413 .options = BL_CORE_SUSPENDRESUME, 29442 .options = BL_CORE_SUSPENDRESUME,
29414diff -urNp linux-2.6.32.23/drivers/video/backlight/kb3886_bl.c linux-2.6.32.23/drivers/video/backlight/kb3886_bl.c 29443diff -urNp linux-2.6.32.24/drivers/video/backlight/kb3886_bl.c linux-2.6.32.24/drivers/video/backlight/kb3886_bl.c
29415--- linux-2.6.32.23/drivers/video/backlight/kb3886_bl.c 2010-08-13 16:24:37.000000000 -0400 29444--- linux-2.6.32.24/drivers/video/backlight/kb3886_bl.c 2010-08-13 16:24:37.000000000 -0400
29416+++ linux-2.6.32.23/drivers/video/backlight/kb3886_bl.c 2010-09-04 15:54:52.000000000 -0400 29445+++ linux-2.6.32.24/drivers/video/backlight/kb3886_bl.c 2010-09-04 15:54:52.000000000 -0400
29417@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct 29446@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
29418 return kb3886bl_intensity; 29447 return kb3886bl_intensity;
29419 } 29448 }
@@ -29423,9 +29452,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/kb3886_bl.c linux-2.6.32.23/d
29423 .get_brightness = kb3886bl_get_intensity, 29452 .get_brightness = kb3886bl_get_intensity,
29424 .update_status = kb3886bl_send_intensity, 29453 .update_status = kb3886bl_send_intensity,
29425 }; 29454 };
29426diff -urNp linux-2.6.32.23/drivers/video/backlight/locomolcd.c linux-2.6.32.23/drivers/video/backlight/locomolcd.c 29455diff -urNp linux-2.6.32.24/drivers/video/backlight/locomolcd.c linux-2.6.32.24/drivers/video/backlight/locomolcd.c
29427--- linux-2.6.32.23/drivers/video/backlight/locomolcd.c 2010-08-13 16:24:37.000000000 -0400 29456--- linux-2.6.32.24/drivers/video/backlight/locomolcd.c 2010-08-13 16:24:37.000000000 -0400
29428+++ linux-2.6.32.23/drivers/video/backlight/locomolcd.c 2010-09-04 15:54:52.000000000 -0400 29457+++ linux-2.6.32.24/drivers/video/backlight/locomolcd.c 2010-09-04 15:54:52.000000000 -0400
29429@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc 29458@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
29430 return current_intensity; 29459 return current_intensity;
29431 } 29460 }
@@ -29435,9 +29464,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/locomolcd.c linux-2.6.32.23/d
29435 .get_brightness = locomolcd_get_intensity, 29464 .get_brightness = locomolcd_get_intensity,
29436 .update_status = locomolcd_set_intensity, 29465 .update_status = locomolcd_set_intensity,
29437 }; 29466 };
29438diff -urNp linux-2.6.32.23/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.23/drivers/video/backlight/mbp_nvidia_bl.c 29467diff -urNp linux-2.6.32.24/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.24/drivers/video/backlight/mbp_nvidia_bl.c
29439--- linux-2.6.32.23/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-13 16:24:37.000000000 -0400 29468--- linux-2.6.32.24/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-13 16:24:37.000000000 -0400
29440+++ linux-2.6.32.23/drivers/video/backlight/mbp_nvidia_bl.c 2010-09-04 15:54:52.000000000 -0400 29469+++ linux-2.6.32.24/drivers/video/backlight/mbp_nvidia_bl.c 2010-09-04 15:54:52.000000000 -0400
29441@@ -33,7 +33,7 @@ struct dmi_match_data { 29470@@ -33,7 +33,7 @@ struct dmi_match_data {
29442 unsigned long iostart; 29471 unsigned long iostart;
29443 unsigned long iolen; 29472 unsigned long iolen;
@@ -29447,9 +29476,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
29447 }; 29476 };
29448 29477
29449 /* Module parameters. */ 29478 /* Module parameters. */
29450diff -urNp linux-2.6.32.23/drivers/video/backlight/omap1_bl.c linux-2.6.32.23/drivers/video/backlight/omap1_bl.c 29479diff -urNp linux-2.6.32.24/drivers/video/backlight/omap1_bl.c linux-2.6.32.24/drivers/video/backlight/omap1_bl.c
29451--- linux-2.6.32.23/drivers/video/backlight/omap1_bl.c 2010-08-13 16:24:37.000000000 -0400 29480--- linux-2.6.32.24/drivers/video/backlight/omap1_bl.c 2010-08-13 16:24:37.000000000 -0400
29452+++ linux-2.6.32.23/drivers/video/backlight/omap1_bl.c 2010-09-04 15:54:52.000000000 -0400 29481+++ linux-2.6.32.24/drivers/video/backlight/omap1_bl.c 2010-09-04 15:54:52.000000000 -0400
29453@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b 29482@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
29454 return bl->current_intensity; 29483 return bl->current_intensity;
29455 } 29484 }
@@ -29459,9 +29488,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/omap1_bl.c linux-2.6.32.23/dr
29459 .get_brightness = omapbl_get_intensity, 29488 .get_brightness = omapbl_get_intensity,
29460 .update_status = omapbl_update_status, 29489 .update_status = omapbl_update_status,
29461 }; 29490 };
29462diff -urNp linux-2.6.32.23/drivers/video/backlight/progear_bl.c linux-2.6.32.23/drivers/video/backlight/progear_bl.c 29491diff -urNp linux-2.6.32.24/drivers/video/backlight/progear_bl.c linux-2.6.32.24/drivers/video/backlight/progear_bl.c
29463--- linux-2.6.32.23/drivers/video/backlight/progear_bl.c 2010-08-13 16:24:37.000000000 -0400 29492--- linux-2.6.32.24/drivers/video/backlight/progear_bl.c 2010-08-13 16:24:37.000000000 -0400
29464+++ linux-2.6.32.23/drivers/video/backlight/progear_bl.c 2010-09-04 15:54:52.000000000 -0400 29493+++ linux-2.6.32.24/drivers/video/backlight/progear_bl.c 2010-09-04 15:54:52.000000000 -0400
29465@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc 29494@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
29466 return intensity - HW_LEVEL_MIN; 29495 return intensity - HW_LEVEL_MIN;
29467 } 29496 }
@@ -29471,9 +29500,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/progear_bl.c linux-2.6.32.23/
29471 .get_brightness = progearbl_get_intensity, 29500 .get_brightness = progearbl_get_intensity,
29472 .update_status = progearbl_set_intensity, 29501 .update_status = progearbl_set_intensity,
29473 }; 29502 };
29474diff -urNp linux-2.6.32.23/drivers/video/backlight/pwm_bl.c linux-2.6.32.23/drivers/video/backlight/pwm_bl.c 29503diff -urNp linux-2.6.32.24/drivers/video/backlight/pwm_bl.c linux-2.6.32.24/drivers/video/backlight/pwm_bl.c
29475--- linux-2.6.32.23/drivers/video/backlight/pwm_bl.c 2010-08-13 16:24:37.000000000 -0400 29504--- linux-2.6.32.24/drivers/video/backlight/pwm_bl.c 2010-08-13 16:24:37.000000000 -0400
29476+++ linux-2.6.32.23/drivers/video/backlight/pwm_bl.c 2010-09-04 15:54:52.000000000 -0400 29505+++ linux-2.6.32.24/drivers/video/backlight/pwm_bl.c 2010-09-04 15:54:52.000000000 -0400
29477@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( 29506@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
29478 return bl->props.brightness; 29507 return bl->props.brightness;
29479 } 29508 }
@@ -29483,9 +29512,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/pwm_bl.c linux-2.6.32.23/driv
29483 .update_status = pwm_backlight_update_status, 29512 .update_status = pwm_backlight_update_status,
29484 .get_brightness = pwm_backlight_get_brightness, 29513 .get_brightness = pwm_backlight_get_brightness,
29485 }; 29514 };
29486diff -urNp linux-2.6.32.23/drivers/video/backlight/tosa_bl.c linux-2.6.32.23/drivers/video/backlight/tosa_bl.c 29515diff -urNp linux-2.6.32.24/drivers/video/backlight/tosa_bl.c linux-2.6.32.24/drivers/video/backlight/tosa_bl.c
29487--- linux-2.6.32.23/drivers/video/backlight/tosa_bl.c 2010-08-13 16:24:37.000000000 -0400 29516--- linux-2.6.32.24/drivers/video/backlight/tosa_bl.c 2010-08-13 16:24:37.000000000 -0400
29488+++ linux-2.6.32.23/drivers/video/backlight/tosa_bl.c 2010-09-04 15:54:52.000000000 -0400 29517+++ linux-2.6.32.24/drivers/video/backlight/tosa_bl.c 2010-09-04 15:54:52.000000000 -0400
29489@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct 29518@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
29490 return props->brightness; 29519 return props->brightness;
29491 } 29520 }
@@ -29495,9 +29524,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/tosa_bl.c linux-2.6.32.23/dri
29495 .get_brightness = tosa_bl_get_brightness, 29524 .get_brightness = tosa_bl_get_brightness,
29496 .update_status = tosa_bl_update_status, 29525 .update_status = tosa_bl_update_status,
29497 }; 29526 };
29498diff -urNp linux-2.6.32.23/drivers/video/backlight/wm831x_bl.c linux-2.6.32.23/drivers/video/backlight/wm831x_bl.c 29527diff -urNp linux-2.6.32.24/drivers/video/backlight/wm831x_bl.c linux-2.6.32.24/drivers/video/backlight/wm831x_bl.c
29499--- linux-2.6.32.23/drivers/video/backlight/wm831x_bl.c 2010-08-13 16:24:37.000000000 -0400 29528--- linux-2.6.32.24/drivers/video/backlight/wm831x_bl.c 2010-08-13 16:24:37.000000000 -0400
29500+++ linux-2.6.32.23/drivers/video/backlight/wm831x_bl.c 2010-09-04 15:54:52.000000000 -0400 29529+++ linux-2.6.32.24/drivers/video/backlight/wm831x_bl.c 2010-09-04 15:54:52.000000000 -0400
29501@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne 29530@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
29502 return data->current_brightness; 29531 return data->current_brightness;
29503 } 29532 }
@@ -29507,9 +29536,9 @@ diff -urNp linux-2.6.32.23/drivers/video/backlight/wm831x_bl.c linux-2.6.32.23/d
29507 .options = BL_CORE_SUSPENDRESUME, 29536 .options = BL_CORE_SUSPENDRESUME,
29508 .update_status = wm831x_backlight_update_status, 29537 .update_status = wm831x_backlight_update_status,
29509 .get_brightness = wm831x_backlight_get_brightness, 29538 .get_brightness = wm831x_backlight_get_brightness,
29510diff -urNp linux-2.6.32.23/drivers/video/bf54x-lq043fb.c linux-2.6.32.23/drivers/video/bf54x-lq043fb.c 29539diff -urNp linux-2.6.32.24/drivers/video/bf54x-lq043fb.c linux-2.6.32.24/drivers/video/bf54x-lq043fb.c
29511--- linux-2.6.32.23/drivers/video/bf54x-lq043fb.c 2010-08-13 16:24:37.000000000 -0400 29540--- linux-2.6.32.24/drivers/video/bf54x-lq043fb.c 2010-08-13 16:24:37.000000000 -0400
29512+++ linux-2.6.32.23/drivers/video/bf54x-lq043fb.c 2010-09-04 15:54:52.000000000 -0400 29541+++ linux-2.6.32.24/drivers/video/bf54x-lq043fb.c 2010-09-04 15:54:52.000000000 -0400
29513@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back 29542@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
29514 return 0; 29543 return 0;
29515 } 29544 }
@@ -29519,9 +29548,9 @@ diff -urNp linux-2.6.32.23/drivers/video/bf54x-lq043fb.c linux-2.6.32.23/drivers
29519 .get_brightness = bl_get_brightness, 29548 .get_brightness = bl_get_brightness,
29520 }; 29549 };
29521 29550
29522diff -urNp linux-2.6.32.23/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.23/drivers/video/bfin-t350mcqb-fb.c 29551diff -urNp linux-2.6.32.24/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.24/drivers/video/bfin-t350mcqb-fb.c
29523--- linux-2.6.32.23/drivers/video/bfin-t350mcqb-fb.c 2010-08-13 16:24:37.000000000 -0400 29552--- linux-2.6.32.24/drivers/video/bfin-t350mcqb-fb.c 2010-08-13 16:24:37.000000000 -0400
29524+++ linux-2.6.32.23/drivers/video/bfin-t350mcqb-fb.c 2010-09-04 15:54:52.000000000 -0400 29553+++ linux-2.6.32.24/drivers/video/bfin-t350mcqb-fb.c 2010-09-04 15:54:52.000000000 -0400
29525@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back 29554@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
29526 return 0; 29555 return 0;
29527 } 29556 }
@@ -29531,9 +29560,9 @@ diff -urNp linux-2.6.32.23/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.23/driv
29531 .get_brightness = bl_get_brightness, 29560 .get_brightness = bl_get_brightness,
29532 }; 29561 };
29533 29562
29534diff -urNp linux-2.6.32.23/drivers/video/fbcmap.c linux-2.6.32.23/drivers/video/fbcmap.c 29563diff -urNp linux-2.6.32.24/drivers/video/fbcmap.c linux-2.6.32.24/drivers/video/fbcmap.c
29535--- linux-2.6.32.23/drivers/video/fbcmap.c 2010-08-13 16:24:37.000000000 -0400 29564--- linux-2.6.32.24/drivers/video/fbcmap.c 2010-08-13 16:24:37.000000000 -0400
29536+++ linux-2.6.32.23/drivers/video/fbcmap.c 2010-09-04 15:54:52.000000000 -0400 29565+++ linux-2.6.32.24/drivers/video/fbcmap.c 2010-09-04 15:54:52.000000000 -0400
29537@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user 29566@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
29538 rc = -ENODEV; 29567 rc = -ENODEV;
29539 goto out; 29568 goto out;
@@ -29544,9 +29573,9 @@ diff -urNp linux-2.6.32.23/drivers/video/fbcmap.c linux-2.6.32.23/drivers/video/
29544 rc = -EINVAL; 29573 rc = -EINVAL;
29545 goto out1; 29574 goto out1;
29546 } 29575 }
29547diff -urNp linux-2.6.32.23/drivers/video/fbmem.c linux-2.6.32.23/drivers/video/fbmem.c 29576diff -urNp linux-2.6.32.24/drivers/video/fbmem.c linux-2.6.32.24/drivers/video/fbmem.c
29548--- linux-2.6.32.23/drivers/video/fbmem.c 2010-08-13 16:24:37.000000000 -0400 29577--- linux-2.6.32.24/drivers/video/fbmem.c 2010-08-13 16:24:37.000000000 -0400
29549+++ linux-2.6.32.23/drivers/video/fbmem.c 2010-09-04 15:54:52.000000000 -0400 29578+++ linux-2.6.32.24/drivers/video/fbmem.c 2010-09-04 15:54:52.000000000 -0400
29550@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in 29579@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
29551 image->dx += image->width + 8; 29580 image->dx += image->width + 8;
29552 } 29581 }
@@ -29574,9 +29603,9 @@ diff -urNp linux-2.6.32.23/drivers/video/fbmem.c linux-2.6.32.23/drivers/video/f
29574 return -EINVAL; 29603 return -EINVAL;
29575 if (!registered_fb[con2fb.framebuffer]) 29604 if (!registered_fb[con2fb.framebuffer])
29576 request_module("fb%d", con2fb.framebuffer); 29605 request_module("fb%d", con2fb.framebuffer);
29577diff -urNp linux-2.6.32.23/drivers/video/fbmon.c linux-2.6.32.23/drivers/video/fbmon.c 29606diff -urNp linux-2.6.32.24/drivers/video/fbmon.c linux-2.6.32.24/drivers/video/fbmon.c
29578--- linux-2.6.32.23/drivers/video/fbmon.c 2010-08-13 16:24:37.000000000 -0400 29607--- linux-2.6.32.24/drivers/video/fbmon.c 2010-08-13 16:24:37.000000000 -0400
29579+++ linux-2.6.32.23/drivers/video/fbmon.c 2010-09-04 15:54:52.000000000 -0400 29608+++ linux-2.6.32.24/drivers/video/fbmon.c 2010-09-04 15:54:52.000000000 -0400
29580@@ -45,7 +45,7 @@ 29609@@ -45,7 +45,7 @@
29581 #ifdef DEBUG 29610 #ifdef DEBUG
29582 #define DPRINTK(fmt, args...) printk(fmt,## args) 29611 #define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -29586,9 +29615,9 @@ diff -urNp linux-2.6.32.23/drivers/video/fbmon.c linux-2.6.32.23/drivers/video/f
29586 #endif 29615 #endif
29587 29616
29588 #define FBMON_FIX_HEADER 1 29617 #define FBMON_FIX_HEADER 1
29589diff -urNp linux-2.6.32.23/drivers/video/i810/i810_accel.c linux-2.6.32.23/drivers/video/i810/i810_accel.c 29618diff -urNp linux-2.6.32.24/drivers/video/i810/i810_accel.c linux-2.6.32.24/drivers/video/i810/i810_accel.c
29590--- linux-2.6.32.23/drivers/video/i810/i810_accel.c 2010-08-13 16:24:37.000000000 -0400 29619--- linux-2.6.32.24/drivers/video/i810/i810_accel.c 2010-08-13 16:24:37.000000000 -0400
29591+++ linux-2.6.32.23/drivers/video/i810/i810_accel.c 2010-09-04 15:54:52.000000000 -0400 29620+++ linux-2.6.32.24/drivers/video/i810/i810_accel.c 2010-09-04 15:54:52.000000000 -0400
29592@@ -73,6 +73,7 @@ static inline int wait_for_space(struct 29621@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
29593 } 29622 }
29594 } 29623 }
@@ -29597,9 +29626,9 @@ diff -urNp linux-2.6.32.23/drivers/video/i810/i810_accel.c linux-2.6.32.23/drive
29597 i810_report_error(mmio); 29626 i810_report_error(mmio);
29598 par->dev_flags |= LOCKUP; 29627 par->dev_flags |= LOCKUP;
29599 info->pixmap.scan_align = 1; 29628 info->pixmap.scan_align = 1;
29600diff -urNp linux-2.6.32.23/drivers/video/i810/i810_main.c linux-2.6.32.23/drivers/video/i810/i810_main.c 29629diff -urNp linux-2.6.32.24/drivers/video/i810/i810_main.c linux-2.6.32.24/drivers/video/i810/i810_main.c
29601--- linux-2.6.32.23/drivers/video/i810/i810_main.c 2010-08-13 16:24:37.000000000 -0400 29630--- linux-2.6.32.24/drivers/video/i810/i810_main.c 2010-08-13 16:24:37.000000000 -0400
29602+++ linux-2.6.32.23/drivers/video/i810/i810_main.c 2010-09-04 15:54:52.000000000 -0400 29631+++ linux-2.6.32.24/drivers/video/i810/i810_main.c 2010-09-04 15:54:52.000000000 -0400
29603@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t 29632@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
29604 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, 29633 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
29605 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, 29634 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -29609,9 +29638,9 @@ diff -urNp linux-2.6.32.23/drivers/video/i810/i810_main.c linux-2.6.32.23/driver
29609 }; 29638 };
29610 29639
29611 static struct pci_driver i810fb_driver = { 29640 static struct pci_driver i810fb_driver = {
29612diff -urNp linux-2.6.32.23/drivers/video/modedb.c linux-2.6.32.23/drivers/video/modedb.c 29641diff -urNp linux-2.6.32.24/drivers/video/modedb.c linux-2.6.32.24/drivers/video/modedb.c
29613--- linux-2.6.32.23/drivers/video/modedb.c 2010-08-13 16:24:37.000000000 -0400 29642--- linux-2.6.32.24/drivers/video/modedb.c 2010-08-13 16:24:37.000000000 -0400
29614+++ linux-2.6.32.23/drivers/video/modedb.c 2010-09-04 15:54:52.000000000 -0400 29643+++ linux-2.6.32.24/drivers/video/modedb.c 2010-09-04 15:54:52.000000000 -0400
29615@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ 29644@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
29616 { 29645 {
29617 /* 640x400 @ 70 Hz, 31.5 kHz hsync */ 29646 /* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -29912,9 +29941,9 @@ diff -urNp linux-2.6.32.23/drivers/video/modedb.c linux-2.6.32.23/drivers/video/
29912 }, 29941 },
29913 }; 29942 };
29914 29943
29915diff -urNp linux-2.6.32.23/drivers/video/nvidia/nv_backlight.c linux-2.6.32.23/drivers/video/nvidia/nv_backlight.c 29944diff -urNp linux-2.6.32.24/drivers/video/nvidia/nv_backlight.c linux-2.6.32.24/drivers/video/nvidia/nv_backlight.c
29916--- linux-2.6.32.23/drivers/video/nvidia/nv_backlight.c 2010-08-13 16:24:37.000000000 -0400 29945--- linux-2.6.32.24/drivers/video/nvidia/nv_backlight.c 2010-08-13 16:24:37.000000000 -0400
29917+++ linux-2.6.32.23/drivers/video/nvidia/nv_backlight.c 2010-09-04 15:54:52.000000000 -0400 29946+++ linux-2.6.32.24/drivers/video/nvidia/nv_backlight.c 2010-09-04 15:54:52.000000000 -0400
29918@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru 29947@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
29919 return bd->props.brightness; 29948 return bd->props.brightness;
29920 } 29949 }
@@ -29924,9 +29953,9 @@ diff -urNp linux-2.6.32.23/drivers/video/nvidia/nv_backlight.c linux-2.6.32.23/d
29924 .get_brightness = nvidia_bl_get_brightness, 29953 .get_brightness = nvidia_bl_get_brightness,
29925 .update_status = nvidia_bl_update_status, 29954 .update_status = nvidia_bl_update_status,
29926 }; 29955 };
29927diff -urNp linux-2.6.32.23/drivers/video/riva/fbdev.c linux-2.6.32.23/drivers/video/riva/fbdev.c 29956diff -urNp linux-2.6.32.24/drivers/video/riva/fbdev.c linux-2.6.32.24/drivers/video/riva/fbdev.c
29928--- linux-2.6.32.23/drivers/video/riva/fbdev.c 2010-08-13 16:24:37.000000000 -0400 29957--- linux-2.6.32.24/drivers/video/riva/fbdev.c 2010-08-13 16:24:37.000000000 -0400
29929+++ linux-2.6.32.23/drivers/video/riva/fbdev.c 2010-09-04 15:54:52.000000000 -0400 29958+++ linux-2.6.32.24/drivers/video/riva/fbdev.c 2010-09-04 15:54:52.000000000 -0400
29930@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct 29959@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
29931 return bd->props.brightness; 29960 return bd->props.brightness;
29932 } 29961 }
@@ -29936,9 +29965,9 @@ diff -urNp linux-2.6.32.23/drivers/video/riva/fbdev.c linux-2.6.32.23/drivers/vi
29936 .get_brightness = riva_bl_get_brightness, 29965 .get_brightness = riva_bl_get_brightness,
29937 .update_status = riva_bl_update_status, 29966 .update_status = riva_bl_update_status,
29938 }; 29967 };
29939diff -urNp linux-2.6.32.23/drivers/video/uvesafb.c linux-2.6.32.23/drivers/video/uvesafb.c 29968diff -urNp linux-2.6.32.24/drivers/video/uvesafb.c linux-2.6.32.24/drivers/video/uvesafb.c
29940--- linux-2.6.32.23/drivers/video/uvesafb.c 2010-08-13 16:24:37.000000000 -0400 29969--- linux-2.6.32.24/drivers/video/uvesafb.c 2010-08-13 16:24:37.000000000 -0400
29941+++ linux-2.6.32.23/drivers/video/uvesafb.c 2010-09-04 15:54:52.000000000 -0400 29970+++ linux-2.6.32.24/drivers/video/uvesafb.c 2010-09-04 15:54:52.000000000 -0400
29942@@ -18,6 +18,7 @@ 29971@@ -18,6 +18,7 @@
29943 #include <linux/fb.h> 29972 #include <linux/fb.h>
29944 #include <linux/io.h> 29973 #include <linux/io.h>
@@ -30014,9 +30043,9 @@ diff -urNp linux-2.6.32.23/drivers/video/uvesafb.c linux-2.6.32.23/drivers/video
30014 } 30043 }
30015 30044
30016 framebuffer_release(info); 30045 framebuffer_release(info);
30017diff -urNp linux-2.6.32.23/drivers/video/vesafb.c linux-2.6.32.23/drivers/video/vesafb.c 30046diff -urNp linux-2.6.32.24/drivers/video/vesafb.c linux-2.6.32.24/drivers/video/vesafb.c
30018--- linux-2.6.32.23/drivers/video/vesafb.c 2010-08-13 16:24:37.000000000 -0400 30047--- linux-2.6.32.24/drivers/video/vesafb.c 2010-08-13 16:24:37.000000000 -0400
30019+++ linux-2.6.32.23/drivers/video/vesafb.c 2010-09-04 15:54:52.000000000 -0400 30048+++ linux-2.6.32.24/drivers/video/vesafb.c 2010-09-04 15:54:52.000000000 -0400
30020@@ -9,6 +9,7 @@ 30049@@ -9,6 +9,7 @@
30021 */ 30050 */
30022 30051
@@ -30120,21 +30149,9 @@ diff -urNp linux-2.6.32.23/drivers/video/vesafb.c linux-2.6.32.23/drivers/video/
30120 if (info->screen_base) 30149 if (info->screen_base)
30121 iounmap(info->screen_base); 30150 iounmap(info->screen_base);
30122 framebuffer_release(info); 30151 framebuffer_release(info);
30123diff -urNp linux-2.6.32.23/drivers/xen/events.c linux-2.6.32.23/drivers/xen/events.c 30152diff -urNp linux-2.6.32.24/drivers/xen/sys-hypervisor.c linux-2.6.32.24/drivers/xen/sys-hypervisor.c
30124--- linux-2.6.32.23/drivers/xen/events.c 2010-09-20 17:26:42.000000000 -0400 30153--- linux-2.6.32.24/drivers/xen/sys-hypervisor.c 2010-08-13 16:24:37.000000000 -0400
30125+++ linux-2.6.32.23/drivers/xen/events.c 2010-09-26 21:25:12.000000000 -0400 30154+++ linux-2.6.32.24/drivers/xen/sys-hypervisor.c 2010-09-04 15:54:52.000000000 -0400
30126@@ -930,7 +930,7 @@ static struct irq_chip xen_dynamic_chip
30127 .retrigger = retrigger_dynirq,
30128 };
30129
30130-static struct irq_chip en_percpu_chip __read_mostly = {
30131+static struct irq_chip xen_percpu_chip __read_mostly = {
30132 .name = "xen-percpu",
30133
30134 .disable = disable_dynirq,
30135diff -urNp linux-2.6.32.23/drivers/xen/sys-hypervisor.c linux-2.6.32.23/drivers/xen/sys-hypervisor.c
30136--- linux-2.6.32.23/drivers/xen/sys-hypervisor.c 2010-08-13 16:24:37.000000000 -0400
30137+++ linux-2.6.32.23/drivers/xen/sys-hypervisor.c 2010-09-04 15:54:52.000000000 -0400
30138@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko 30155@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
30139 return 0; 30156 return 0;
30140 } 30157 }
@@ -30144,9 +30161,9 @@ diff -urNp linux-2.6.32.23/drivers/xen/sys-hypervisor.c linux-2.6.32.23/drivers/
30144 .show = hyp_sysfs_show, 30161 .show = hyp_sysfs_show,
30145 .store = hyp_sysfs_store, 30162 .store = hyp_sysfs_store,
30146 }; 30163 };
30147diff -urNp linux-2.6.32.23/fs/9p/vfs_inode.c linux-2.6.32.23/fs/9p/vfs_inode.c 30164diff -urNp linux-2.6.32.24/fs/9p/vfs_inode.c linux-2.6.32.24/fs/9p/vfs_inode.c
30148--- linux-2.6.32.23/fs/9p/vfs_inode.c 2010-08-13 16:24:37.000000000 -0400 30165--- linux-2.6.32.24/fs/9p/vfs_inode.c 2010-08-13 16:24:37.000000000 -0400
30149+++ linux-2.6.32.23/fs/9p/vfs_inode.c 2010-09-04 15:54:52.000000000 -0400 30166+++ linux-2.6.32.24/fs/9p/vfs_inode.c 2010-09-04 15:54:52.000000000 -0400
30150@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct 30167@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
30151 static void 30168 static void
30152 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 30169 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -30156,9 +30173,9 @@ diff -urNp linux-2.6.32.23/fs/9p/vfs_inode.c linux-2.6.32.23/fs/9p/vfs_inode.c
30156 30173
30157 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, 30174 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
30158 IS_ERR(s) ? "<error>" : s); 30175 IS_ERR(s) ? "<error>" : s);
30159diff -urNp linux-2.6.32.23/fs/aio.c linux-2.6.32.23/fs/aio.c 30176diff -urNp linux-2.6.32.24/fs/aio.c linux-2.6.32.24/fs/aio.c
30160--- linux-2.6.32.23/fs/aio.c 2010-09-26 17:26:05.000000000 -0400 30177--- linux-2.6.32.24/fs/aio.c 2010-09-26 17:26:05.000000000 -0400
30161+++ linux-2.6.32.23/fs/aio.c 2010-09-20 17:25:35.000000000 -0400 30178+++ linux-2.6.32.24/fs/aio.c 2010-09-20 17:25:35.000000000 -0400
30162@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx 30179@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
30163 size += sizeof(struct io_event) * nr_events; 30180 size += sizeof(struct io_event) * nr_events;
30164 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; 30181 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -30168,9 +30185,9 @@ diff -urNp linux-2.6.32.23/fs/aio.c linux-2.6.32.23/fs/aio.c
30168 return -EINVAL; 30185 return -EINVAL;
30169 30186
30170 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); 30187 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
30171diff -urNp linux-2.6.32.23/fs/attr.c linux-2.6.32.23/fs/attr.c 30188diff -urNp linux-2.6.32.24/fs/attr.c linux-2.6.32.24/fs/attr.c
30172--- linux-2.6.32.23/fs/attr.c 2010-08-13 16:24:37.000000000 -0400 30189--- linux-2.6.32.24/fs/attr.c 2010-08-13 16:24:37.000000000 -0400
30173+++ linux-2.6.32.23/fs/attr.c 2010-09-04 15:54:52.000000000 -0400 30190+++ linux-2.6.32.24/fs/attr.c 2010-09-04 15:54:52.000000000 -0400
30174@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode 30191@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
30175 unsigned long limit; 30192 unsigned long limit;
30176 30193
@@ -30179,9 +30196,9 @@ diff -urNp linux-2.6.32.23/fs/attr.c linux-2.6.32.23/fs/attr.c
30179 if (limit != RLIM_INFINITY && offset > limit) 30196 if (limit != RLIM_INFINITY && offset > limit)
30180 goto out_sig; 30197 goto out_sig;
30181 if (offset > inode->i_sb->s_maxbytes) 30198 if (offset > inode->i_sb->s_maxbytes)
30182diff -urNp linux-2.6.32.23/fs/autofs/root.c linux-2.6.32.23/fs/autofs/root.c 30199diff -urNp linux-2.6.32.24/fs/autofs/root.c linux-2.6.32.24/fs/autofs/root.c
30183--- linux-2.6.32.23/fs/autofs/root.c 2010-08-13 16:24:37.000000000 -0400 30200--- linux-2.6.32.24/fs/autofs/root.c 2010-08-13 16:24:37.000000000 -0400
30184+++ linux-2.6.32.23/fs/autofs/root.c 2010-09-04 15:54:52.000000000 -0400 30201+++ linux-2.6.32.24/fs/autofs/root.c 2010-09-04 15:54:52.000000000 -0400
30185@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in 30202@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
30186 set_bit(n,sbi->symlink_bitmap); 30203 set_bit(n,sbi->symlink_bitmap);
30187 sl = &sbi->symlink[n]; 30204 sl = &sbi->symlink[n];
@@ -30192,9 +30209,9 @@ diff -urNp linux-2.6.32.23/fs/autofs/root.c linux-2.6.32.23/fs/autofs/root.c
30192 if (!sl->data) { 30209 if (!sl->data) {
30193 clear_bit(n,sbi->symlink_bitmap); 30210 clear_bit(n,sbi->symlink_bitmap);
30194 unlock_kernel(); 30211 unlock_kernel();
30195diff -urNp linux-2.6.32.23/fs/autofs4/symlink.c linux-2.6.32.23/fs/autofs4/symlink.c 30212diff -urNp linux-2.6.32.24/fs/autofs4/symlink.c linux-2.6.32.24/fs/autofs4/symlink.c
30196--- linux-2.6.32.23/fs/autofs4/symlink.c 2010-08-13 16:24:37.000000000 -0400 30213--- linux-2.6.32.24/fs/autofs4/symlink.c 2010-08-13 16:24:37.000000000 -0400
30197+++ linux-2.6.32.23/fs/autofs4/symlink.c 2010-09-04 15:54:52.000000000 -0400 30214+++ linux-2.6.32.24/fs/autofs4/symlink.c 2010-09-04 15:54:52.000000000 -0400
30198@@ -15,7 +15,7 @@ 30215@@ -15,7 +15,7 @@
30199 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) 30216 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
30200 { 30217 {
@@ -30204,9 +30221,9 @@ diff -urNp linux-2.6.32.23/fs/autofs4/symlink.c linux-2.6.32.23/fs/autofs4/symli
30204 return NULL; 30221 return NULL;
30205 } 30222 }
30206 30223
30207diff -urNp linux-2.6.32.23/fs/befs/linuxvfs.c linux-2.6.32.23/fs/befs/linuxvfs.c 30224diff -urNp linux-2.6.32.24/fs/befs/linuxvfs.c linux-2.6.32.24/fs/befs/linuxvfs.c
30208--- linux-2.6.32.23/fs/befs/linuxvfs.c 2010-08-13 16:24:37.000000000 -0400 30225--- linux-2.6.32.24/fs/befs/linuxvfs.c 2010-08-13 16:24:37.000000000 -0400
30209+++ linux-2.6.32.23/fs/befs/linuxvfs.c 2010-09-04 15:54:52.000000000 -0400 30226+++ linux-2.6.32.24/fs/befs/linuxvfs.c 2010-09-04 15:54:52.000000000 -0400
30210@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry 30227@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
30211 { 30228 {
30212 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); 30229 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -30216,9 +30233,9 @@ diff -urNp linux-2.6.32.23/fs/befs/linuxvfs.c linux-2.6.32.23/fs/befs/linuxvfs.c
30216 if (!IS_ERR(link)) 30233 if (!IS_ERR(link))
30217 kfree(link); 30234 kfree(link);
30218 } 30235 }
30219diff -urNp linux-2.6.32.23/fs/binfmt_aout.c linux-2.6.32.23/fs/binfmt_aout.c 30236diff -urNp linux-2.6.32.24/fs/binfmt_aout.c linux-2.6.32.24/fs/binfmt_aout.c
30220--- linux-2.6.32.23/fs/binfmt_aout.c 2010-08-13 16:24:37.000000000 -0400 30237--- linux-2.6.32.24/fs/binfmt_aout.c 2010-08-13 16:24:37.000000000 -0400
30221+++ linux-2.6.32.23/fs/binfmt_aout.c 2010-09-23 20:12:17.000000000 -0400 30238+++ linux-2.6.32.24/fs/binfmt_aout.c 2010-09-23 20:12:17.000000000 -0400
30222@@ -16,6 +16,7 @@ 30239@@ -16,6 +16,7 @@
30223 #include <linux/string.h> 30240 #include <linux/string.h>
30224 #include <linux/fs.h> 30241 #include <linux/fs.h>
@@ -30306,9 +30323,9 @@ diff -urNp linux-2.6.32.23/fs/binfmt_aout.c linux-2.6.32.23/fs/binfmt_aout.c
30306 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, 30323 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
30307 fd_offset + ex.a_text); 30324 fd_offset + ex.a_text);
30308 up_write(&current->mm->mmap_sem); 30325 up_write(&current->mm->mmap_sem);
30309diff -urNp linux-2.6.32.23/fs/binfmt_elf.c linux-2.6.32.23/fs/binfmt_elf.c 30326diff -urNp linux-2.6.32.24/fs/binfmt_elf.c linux-2.6.32.24/fs/binfmt_elf.c
30310--- linux-2.6.32.23/fs/binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400 30327--- linux-2.6.32.24/fs/binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
30311+++ linux-2.6.32.23/fs/binfmt_elf.c 2010-09-04 15:54:52.000000000 -0400 30328+++ linux-2.6.32.24/fs/binfmt_elf.c 2010-09-04 15:54:52.000000000 -0400
30312@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str 30329@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
30313 #define elf_core_dump NULL 30330 #define elf_core_dump NULL
30314 #endif 30331 #endif
@@ -30944,9 +30961,9 @@ diff -urNp linux-2.6.32.23/fs/binfmt_elf.c linux-2.6.32.23/fs/binfmt_elf.c
30944 static int __init init_elf_binfmt(void) 30961 static int __init init_elf_binfmt(void)
30945 { 30962 {
30946 return register_binfmt(&elf_format); 30963 return register_binfmt(&elf_format);
30947diff -urNp linux-2.6.32.23/fs/binfmt_flat.c linux-2.6.32.23/fs/binfmt_flat.c 30964diff -urNp linux-2.6.32.24/fs/binfmt_flat.c linux-2.6.32.24/fs/binfmt_flat.c
30948--- linux-2.6.32.23/fs/binfmt_flat.c 2010-08-13 16:24:37.000000000 -0400 30965--- linux-2.6.32.24/fs/binfmt_flat.c 2010-08-13 16:24:37.000000000 -0400
30949+++ linux-2.6.32.23/fs/binfmt_flat.c 2010-09-04 15:54:52.000000000 -0400 30966+++ linux-2.6.32.24/fs/binfmt_flat.c 2010-09-04 15:54:52.000000000 -0400
30950@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b 30967@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
30951 realdatastart = (unsigned long) -ENOMEM; 30968 realdatastart = (unsigned long) -ENOMEM;
30952 printk("Unable to allocate RAM for process data, errno %d\n", 30969 printk("Unable to allocate RAM for process data, errno %d\n",
@@ -30979,9 +30996,9 @@ diff -urNp linux-2.6.32.23/fs/binfmt_flat.c linux-2.6.32.23/fs/binfmt_flat.c
30979 ret = result; 30996 ret = result;
30980 goto err; 30997 goto err;
30981 } 30998 }
30982diff -urNp linux-2.6.32.23/fs/binfmt_misc.c linux-2.6.32.23/fs/binfmt_misc.c 30999diff -urNp linux-2.6.32.24/fs/binfmt_misc.c linux-2.6.32.24/fs/binfmt_misc.c
30983--- linux-2.6.32.23/fs/binfmt_misc.c 2010-09-20 17:26:42.000000000 -0400 31000--- linux-2.6.32.24/fs/binfmt_misc.c 2010-09-20 17:26:42.000000000 -0400
30984+++ linux-2.6.32.23/fs/binfmt_misc.c 2010-09-20 17:27:14.000000000 -0400 31001+++ linux-2.6.32.24/fs/binfmt_misc.c 2010-09-20 17:27:14.000000000 -0400
30985@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl 31002@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
30986 static struct tree_descr bm_files[] = { 31003 static struct tree_descr bm_files[] = {
30987 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, 31004 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -30991,9 +31008,9 @@ diff -urNp linux-2.6.32.23/fs/binfmt_misc.c linux-2.6.32.23/fs/binfmt_misc.c
30991 }; 31008 };
30992 int err = simple_fill_super(sb, 0x42494e4d, bm_files); 31009 int err = simple_fill_super(sb, 0x42494e4d, bm_files);
30993 if (!err) 31010 if (!err)
30994diff -urNp linux-2.6.32.23/fs/bio.c linux-2.6.32.23/fs/bio.c 31011diff -urNp linux-2.6.32.24/fs/bio.c linux-2.6.32.24/fs/bio.c
30995--- linux-2.6.32.23/fs/bio.c 2010-08-13 16:24:37.000000000 -0400 31012--- linux-2.6.32.24/fs/bio.c 2010-08-13 16:24:37.000000000 -0400
30996+++ linux-2.6.32.23/fs/bio.c 2010-09-04 15:54:52.000000000 -0400 31013+++ linux-2.6.32.24/fs/bio.c 2010-09-04 15:54:52.000000000 -0400
30997@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr 31014@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
30998 31015
30999 i = 0; 31016 i = 0;
@@ -31012,9 +31029,9 @@ diff -urNp linux-2.6.32.23/fs/bio.c linux-2.6.32.23/fs/bio.c
31012 31029
31013 __bio_for_each_segment(bvec, bio, i, 0) { 31030 __bio_for_each_segment(bvec, bio, i, 0) {
31014 char *addr = page_address(bvec->bv_page); 31031 char *addr = page_address(bvec->bv_page);
31015diff -urNp linux-2.6.32.23/fs/block_dev.c linux-2.6.32.23/fs/block_dev.c 31032diff -urNp linux-2.6.32.24/fs/block_dev.c linux-2.6.32.24/fs/block_dev.c
31016--- linux-2.6.32.23/fs/block_dev.c 2010-08-13 16:24:37.000000000 -0400 31033--- linux-2.6.32.24/fs/block_dev.c 2010-08-13 16:24:37.000000000 -0400
31017+++ linux-2.6.32.23/fs/block_dev.c 2010-09-04 15:54:52.000000000 -0400 31034+++ linux-2.6.32.24/fs/block_dev.c 2010-09-04 15:54:52.000000000 -0400
31018@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, 31035@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev,
31019 else if (bdev->bd_contains == bdev) 31036 else if (bdev->bd_contains == bdev)
31020 res = 0; /* is a whole device which isn't held */ 31037 res = 0; /* is a whole device which isn't held */
@@ -31024,9 +31041,9 @@ diff -urNp linux-2.6.32.23/fs/block_dev.c linux-2.6.32.23/fs/block_dev.c
31024 res = 0; /* is a partition of a device that is being partitioned */ 31041 res = 0; /* is a partition of a device that is being partitioned */
31025 else if (bdev->bd_contains->bd_holder != NULL) 31042 else if (bdev->bd_contains->bd_holder != NULL)
31026 res = -EBUSY; /* is a partition of a held device */ 31043 res = -EBUSY; /* is a partition of a held device */
31027diff -urNp linux-2.6.32.23/fs/btrfs/ctree.c linux-2.6.32.23/fs/btrfs/ctree.c 31044diff -urNp linux-2.6.32.24/fs/btrfs/ctree.c linux-2.6.32.24/fs/btrfs/ctree.c
31028--- linux-2.6.32.23/fs/btrfs/ctree.c 2010-08-13 16:24:37.000000000 -0400 31045--- linux-2.6.32.24/fs/btrfs/ctree.c 2010-08-13 16:24:37.000000000 -0400
31029+++ linux-2.6.32.23/fs/btrfs/ctree.c 2010-09-04 15:54:52.000000000 -0400 31046+++ linux-2.6.32.24/fs/btrfs/ctree.c 2010-09-04 15:54:52.000000000 -0400
31030@@ -3645,7 +3645,6 @@ setup_items_for_insert(struct btrfs_tran 31047@@ -3645,7 +3645,6 @@ setup_items_for_insert(struct btrfs_tran
31031 31048
31032 ret = 0; 31049 ret = 0;
@@ -31035,9 +31052,9 @@ diff -urNp linux-2.6.32.23/fs/btrfs/ctree.c linux-2.6.32.23/fs/btrfs/ctree.c
31035 btrfs_cpu_key_to_disk(&disk_key, cpu_key); 31052 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
31036 ret = fixup_low_keys(trans, root, path, &disk_key, 1); 31053 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
31037 } 31054 }
31038diff -urNp linux-2.6.32.23/fs/btrfs/disk-io.c linux-2.6.32.23/fs/btrfs/disk-io.c 31055diff -urNp linux-2.6.32.24/fs/btrfs/disk-io.c linux-2.6.32.24/fs/btrfs/disk-io.c
31039--- linux-2.6.32.23/fs/btrfs/disk-io.c 2010-08-13 16:24:37.000000000 -0400 31056--- linux-2.6.32.24/fs/btrfs/disk-io.c 2010-08-13 16:24:37.000000000 -0400
31040+++ linux-2.6.32.23/fs/btrfs/disk-io.c 2010-09-04 15:54:52.000000000 -0400 31057+++ linux-2.6.32.24/fs/btrfs/disk-io.c 2010-09-04 15:54:52.000000000 -0400
31041@@ -39,7 +39,7 @@ 31058@@ -39,7 +39,7 @@
31042 #include "tree-log.h" 31059 #include "tree-log.h"
31043 #include "free-space-cache.h" 31060 #include "free-space-cache.h"
@@ -31056,9 +31073,9 @@ diff -urNp linux-2.6.32.23/fs/btrfs/disk-io.c linux-2.6.32.23/fs/btrfs/disk-io.c
31056 .write_cache_pages_lock_hook = btree_lock_page_hook, 31073 .write_cache_pages_lock_hook = btree_lock_page_hook,
31057 .readpage_end_io_hook = btree_readpage_end_io_hook, 31074 .readpage_end_io_hook = btree_readpage_end_io_hook,
31058 .submit_bio_hook = btree_submit_bio_hook, 31075 .submit_bio_hook = btree_submit_bio_hook,
31059diff -urNp linux-2.6.32.23/fs/btrfs/extent_io.h linux-2.6.32.23/fs/btrfs/extent_io.h 31076diff -urNp linux-2.6.32.24/fs/btrfs/extent_io.h linux-2.6.32.24/fs/btrfs/extent_io.h
31060--- linux-2.6.32.23/fs/btrfs/extent_io.h 2010-08-13 16:24:37.000000000 -0400 31077--- linux-2.6.32.24/fs/btrfs/extent_io.h 2010-08-13 16:24:37.000000000 -0400
31061+++ linux-2.6.32.23/fs/btrfs/extent_io.h 2010-09-04 15:54:52.000000000 -0400 31078+++ linux-2.6.32.24/fs/btrfs/extent_io.h 2010-09-04 15:54:52.000000000 -0400
31062@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s 31079@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
31063 struct bio *bio, int mirror_num, 31080 struct bio *bio, int mirror_num,
31064 unsigned long bio_flags); 31081 unsigned long bio_flags);
@@ -31119,9 +31136,9 @@ diff -urNp linux-2.6.32.23/fs/btrfs/extent_io.h linux-2.6.32.23/fs/btrfs/extent_
31119 }; 31136 };
31120 31137
31121 struct extent_state { 31138 struct extent_state {
31122diff -urNp linux-2.6.32.23/fs/btrfs/free-space-cache.c linux-2.6.32.23/fs/btrfs/free-space-cache.c 31139diff -urNp linux-2.6.32.24/fs/btrfs/free-space-cache.c linux-2.6.32.24/fs/btrfs/free-space-cache.c
31123--- linux-2.6.32.23/fs/btrfs/free-space-cache.c 2010-08-13 16:24:37.000000000 -0400 31140--- linux-2.6.32.24/fs/btrfs/free-space-cache.c 2010-08-13 16:24:37.000000000 -0400
31124+++ linux-2.6.32.23/fs/btrfs/free-space-cache.c 2010-09-04 15:54:52.000000000 -0400 31141+++ linux-2.6.32.24/fs/btrfs/free-space-cache.c 2010-09-04 15:54:52.000000000 -0400
31125@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf 31142@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
31126 31143
31127 while(1) { 31144 while(1) {
@@ -31140,9 +31157,9 @@ diff -urNp linux-2.6.32.23/fs/btrfs/free-space-cache.c linux-2.6.32.23/fs/btrfs/
31140 31157
31141 if (entry->bitmap && entry->bytes > bytes + empty_size) { 31158 if (entry->bitmap && entry->bytes > bytes + empty_size) {
31142 ret = btrfs_bitmap_cluster(block_group, entry, cluster, 31159 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
31143diff -urNp linux-2.6.32.23/fs/btrfs/inode.c linux-2.6.32.23/fs/btrfs/inode.c 31160diff -urNp linux-2.6.32.24/fs/btrfs/inode.c linux-2.6.32.24/fs/btrfs/inode.c
31144--- linux-2.6.32.23/fs/btrfs/inode.c 2010-08-13 16:24:37.000000000 -0400 31161--- linux-2.6.32.24/fs/btrfs/inode.c 2010-08-13 16:24:37.000000000 -0400
31145+++ linux-2.6.32.23/fs/btrfs/inode.c 2010-09-04 15:54:52.000000000 -0400 31162+++ linux-2.6.32.24/fs/btrfs/inode.c 2010-09-04 15:54:52.000000000 -0400
31146@@ -63,7 +63,7 @@ static const struct inode_operations btr 31163@@ -63,7 +63,7 @@ static const struct inode_operations btr
31147 static const struct address_space_operations btrfs_aops; 31164 static const struct address_space_operations btrfs_aops;
31148 static const struct address_space_operations btrfs_symlink_aops; 31165 static const struct address_space_operations btrfs_symlink_aops;
@@ -31161,9 +31178,9 @@ diff -urNp linux-2.6.32.23/fs/btrfs/inode.c linux-2.6.32.23/fs/btrfs/inode.c
31161 .fill_delalloc = run_delalloc_range, 31178 .fill_delalloc = run_delalloc_range,
31162 .submit_bio_hook = btrfs_submit_bio_hook, 31179 .submit_bio_hook = btrfs_submit_bio_hook,
31163 .merge_bio_hook = btrfs_merge_bio_hook, 31180 .merge_bio_hook = btrfs_merge_bio_hook,
31164diff -urNp linux-2.6.32.23/fs/btrfs/sysfs.c linux-2.6.32.23/fs/btrfs/sysfs.c 31181diff -urNp linux-2.6.32.24/fs/btrfs/sysfs.c linux-2.6.32.24/fs/btrfs/sysfs.c
31165--- linux-2.6.32.23/fs/btrfs/sysfs.c 2010-08-13 16:24:37.000000000 -0400 31182--- linux-2.6.32.24/fs/btrfs/sysfs.c 2010-08-13 16:24:37.000000000 -0400
31166+++ linux-2.6.32.23/fs/btrfs/sysfs.c 2010-09-04 15:54:52.000000000 -0400 31183+++ linux-2.6.32.24/fs/btrfs/sysfs.c 2010-09-04 15:54:52.000000000 -0400
31167@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko 31184@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
31168 complete(&root->kobj_unregister); 31185 complete(&root->kobj_unregister);
31169 } 31186 }
@@ -31179,9 +31196,9 @@ diff -urNp linux-2.6.32.23/fs/btrfs/sysfs.c linux-2.6.32.23/fs/btrfs/sysfs.c
31179 .show = btrfs_root_attr_show, 31196 .show = btrfs_root_attr_show,
31180 .store = btrfs_root_attr_store, 31197 .store = btrfs_root_attr_store,
31181 }; 31198 };
31182diff -urNp linux-2.6.32.23/fs/buffer.c linux-2.6.32.23/fs/buffer.c 31199diff -urNp linux-2.6.32.24/fs/buffer.c linux-2.6.32.24/fs/buffer.c
31183--- linux-2.6.32.23/fs/buffer.c 2010-08-13 16:24:37.000000000 -0400 31200--- linux-2.6.32.24/fs/buffer.c 2010-08-13 16:24:37.000000000 -0400
31184+++ linux-2.6.32.23/fs/buffer.c 2010-09-04 15:54:52.000000000 -0400 31201+++ linux-2.6.32.24/fs/buffer.c 2010-09-04 15:54:52.000000000 -0400
31185@@ -25,6 +25,7 @@ 31202@@ -25,6 +25,7 @@
31186 #include <linux/percpu.h> 31203 #include <linux/percpu.h>
31187 #include <linux/slab.h> 31204 #include <linux/slab.h>
@@ -31190,9 +31207,9 @@ diff -urNp linux-2.6.32.23/fs/buffer.c linux-2.6.32.23/fs/buffer.c
31190 #include <linux/blkdev.h> 31207 #include <linux/blkdev.h>
31191 #include <linux/file.h> 31208 #include <linux/file.h>
31192 #include <linux/quotaops.h> 31209 #include <linux/quotaops.h>
31193diff -urNp linux-2.6.32.23/fs/cachefiles/bind.c linux-2.6.32.23/fs/cachefiles/bind.c 31210diff -urNp linux-2.6.32.24/fs/cachefiles/bind.c linux-2.6.32.24/fs/cachefiles/bind.c
31194--- linux-2.6.32.23/fs/cachefiles/bind.c 2010-08-13 16:24:37.000000000 -0400 31211--- linux-2.6.32.24/fs/cachefiles/bind.c 2010-08-13 16:24:37.000000000 -0400
31195+++ linux-2.6.32.23/fs/cachefiles/bind.c 2010-09-04 15:54:52.000000000 -0400 31212+++ linux-2.6.32.24/fs/cachefiles/bind.c 2010-09-04 15:54:52.000000000 -0400
31196@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef 31213@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
31197 args); 31214 args);
31198 31215
@@ -31209,9 +31226,9 @@ diff -urNp linux-2.6.32.23/fs/cachefiles/bind.c linux-2.6.32.23/fs/cachefiles/bi
31209 cache->bcull_percent < cache->brun_percent && 31226 cache->bcull_percent < cache->brun_percent &&
31210 cache->brun_percent < 100); 31227 cache->brun_percent < 100);
31211 31228
31212diff -urNp linux-2.6.32.23/fs/cachefiles/daemon.c linux-2.6.32.23/fs/cachefiles/daemon.c 31229diff -urNp linux-2.6.32.24/fs/cachefiles/daemon.c linux-2.6.32.24/fs/cachefiles/daemon.c
31213--- linux-2.6.32.23/fs/cachefiles/daemon.c 2010-08-13 16:24:37.000000000 -0400 31230--- linux-2.6.32.24/fs/cachefiles/daemon.c 2010-08-13 16:24:37.000000000 -0400
31214+++ linux-2.6.32.23/fs/cachefiles/daemon.c 2010-09-04 15:54:52.000000000 -0400 31231+++ linux-2.6.32.24/fs/cachefiles/daemon.c 2010-09-04 15:54:52.000000000 -0400
31215@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s 31232@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
31216 if (test_bit(CACHEFILES_DEAD, &cache->flags)) 31233 if (test_bit(CACHEFILES_DEAD, &cache->flags))
31217 return -EIO; 31234 return -EIO;
@@ -31239,9 +31256,9 @@ diff -urNp linux-2.6.32.23/fs/cachefiles/daemon.c linux-2.6.32.23/fs/cachefiles/
31239 return cachefiles_daemon_range_error(cache, args); 31256 return cachefiles_daemon_range_error(cache, args);
31240 31257
31241 cache->bstop_percent = bstop; 31258 cache->bstop_percent = bstop;
31242diff -urNp linux-2.6.32.23/fs/cachefiles/rdwr.c linux-2.6.32.23/fs/cachefiles/rdwr.c 31259diff -urNp linux-2.6.32.24/fs/cachefiles/rdwr.c linux-2.6.32.24/fs/cachefiles/rdwr.c
31243--- linux-2.6.32.23/fs/cachefiles/rdwr.c 2010-08-13 16:24:37.000000000 -0400 31260--- linux-2.6.32.24/fs/cachefiles/rdwr.c 2010-08-13 16:24:37.000000000 -0400
31244+++ linux-2.6.32.23/fs/cachefiles/rdwr.c 2010-09-04 15:54:52.000000000 -0400 31261+++ linux-2.6.32.24/fs/cachefiles/rdwr.c 2010-09-04 15:54:52.000000000 -0400
31245@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache 31262@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
31246 old_fs = get_fs(); 31263 old_fs = get_fs();
31247 set_fs(KERNEL_DS); 31264 set_fs(KERNEL_DS);
@@ -31251,9 +31268,9 @@ diff -urNp linux-2.6.32.23/fs/cachefiles/rdwr.c linux-2.6.32.23/fs/cachefiles/rd
31251 set_fs(old_fs); 31268 set_fs(old_fs);
31252 kunmap(page); 31269 kunmap(page);
31253 if (ret != len) 31270 if (ret != len)
31254diff -urNp linux-2.6.32.23/fs/cifs/cifs_uniupr.h linux-2.6.32.23/fs/cifs/cifs_uniupr.h 31271diff -urNp linux-2.6.32.24/fs/cifs/cifs_uniupr.h linux-2.6.32.24/fs/cifs/cifs_uniupr.h
31255--- linux-2.6.32.23/fs/cifs/cifs_uniupr.h 2010-08-13 16:24:37.000000000 -0400 31272--- linux-2.6.32.24/fs/cifs/cifs_uniupr.h 2010-08-13 16:24:37.000000000 -0400
31256+++ linux-2.6.32.23/fs/cifs/cifs_uniupr.h 2010-09-04 15:54:52.000000000 -0400 31273+++ linux-2.6.32.24/fs/cifs/cifs_uniupr.h 2010-09-04 15:54:52.000000000 -0400
31257@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa 31274@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
31258 {0x0490, 0x04cc, UniCaseRangeU0490}, 31275 {0x0490, 0x04cc, UniCaseRangeU0490},
31259 {0x1e00, 0x1ffc, UniCaseRangeU1e00}, 31276 {0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -31263,9 +31280,9 @@ diff -urNp linux-2.6.32.23/fs/cifs/cifs_uniupr.h linux-2.6.32.23/fs/cifs/cifs_un
31263 }; 31280 };
31264 #endif 31281 #endif
31265 31282
31266diff -urNp linux-2.6.32.23/fs/cifs/link.c linux-2.6.32.23/fs/cifs/link.c 31283diff -urNp linux-2.6.32.24/fs/cifs/link.c linux-2.6.32.24/fs/cifs/link.c
31267--- linux-2.6.32.23/fs/cifs/link.c 2010-08-13 16:24:37.000000000 -0400 31284--- linux-2.6.32.24/fs/cifs/link.c 2010-08-13 16:24:37.000000000 -0400
31268+++ linux-2.6.32.23/fs/cifs/link.c 2010-09-04 15:54:52.000000000 -0400 31285+++ linux-2.6.32.24/fs/cifs/link.c 2010-09-04 15:54:52.000000000 -0400
31269@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct 31286@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
31270 31287
31271 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) 31288 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -31275,9 +31292,9 @@ diff -urNp linux-2.6.32.23/fs/cifs/link.c linux-2.6.32.23/fs/cifs/link.c
31275 if (!IS_ERR(p)) 31292 if (!IS_ERR(p))
31276 kfree(p); 31293 kfree(p);
31277 } 31294 }
31278diff -urNp linux-2.6.32.23/fs/compat_binfmt_elf.c linux-2.6.32.23/fs/compat_binfmt_elf.c 31295diff -urNp linux-2.6.32.24/fs/compat_binfmt_elf.c linux-2.6.32.24/fs/compat_binfmt_elf.c
31279--- linux-2.6.32.23/fs/compat_binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400 31296--- linux-2.6.32.24/fs/compat_binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
31280+++ linux-2.6.32.23/fs/compat_binfmt_elf.c 2010-09-04 15:54:52.000000000 -0400 31297+++ linux-2.6.32.24/fs/compat_binfmt_elf.c 2010-09-04 15:54:52.000000000 -0400
31281@@ -29,10 +29,12 @@ 31298@@ -29,10 +29,12 @@
31282 #undef elfhdr 31299 #undef elfhdr
31283 #undef elf_phdr 31300 #undef elf_phdr
@@ -31291,9 +31308,9 @@ diff -urNp linux-2.6.32.23/fs/compat_binfmt_elf.c linux-2.6.32.23/fs/compat_binf
31291 #define elf_addr_t Elf32_Addr 31308 #define elf_addr_t Elf32_Addr
31292 31309
31293 /* 31310 /*
31294diff -urNp linux-2.6.32.23/fs/compat.c linux-2.6.32.23/fs/compat.c 31311diff -urNp linux-2.6.32.24/fs/compat.c linux-2.6.32.24/fs/compat.c
31295--- linux-2.6.32.23/fs/compat.c 2010-08-13 16:24:37.000000000 -0400 31312--- linux-2.6.32.24/fs/compat.c 2010-08-13 16:24:37.000000000 -0400
31296+++ linux-2.6.32.23/fs/compat.c 2010-09-04 15:54:52.000000000 -0400 31313+++ linux-2.6.32.24/fs/compat.c 2010-09-04 15:54:52.000000000 -0400
31297@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, 31314@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc,
31298 if (!kmapped_page || kpos != (pos & PAGE_MASK)) { 31315 if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
31299 struct page *page; 31316 struct page *page;
@@ -31393,9 +31410,9 @@ diff -urNp linux-2.6.32.23/fs/compat.c linux-2.6.32.23/fs/compat.c
31393 out: 31410 out:
31394 if (bprm->mm) 31411 if (bprm->mm)
31395 mmput(bprm->mm); 31412 mmput(bprm->mm);
31396diff -urNp linux-2.6.32.23/fs/compat_ioctl.c linux-2.6.32.23/fs/compat_ioctl.c 31413diff -urNp linux-2.6.32.24/fs/compat_ioctl.c linux-2.6.32.24/fs/compat_ioctl.c
31397--- linux-2.6.32.23/fs/compat_ioctl.c 2010-08-13 16:24:37.000000000 -0400 31414--- linux-2.6.32.24/fs/compat_ioctl.c 2010-08-13 16:24:37.000000000 -0400
31398+++ linux-2.6.32.23/fs/compat_ioctl.c 2010-09-04 15:54:52.000000000 -0400 31415+++ linux-2.6.32.24/fs/compat_ioctl.c 2010-09-04 15:54:52.000000000 -0400
31399@@ -1827,15 +1827,15 @@ struct ioctl_trans { 31416@@ -1827,15 +1827,15 @@ struct ioctl_trans {
31400 }; 31417 };
31401 31418
@@ -31415,9 +31432,9 @@ diff -urNp linux-2.6.32.23/fs/compat_ioctl.c linux-2.6.32.23/fs/compat_ioctl.c
31415 31432
31416 /* ioctl should not be warned about even if it's not implemented. 31433 /* ioctl should not be warned about even if it's not implemented.
31417 Valid reasons to use this: 31434 Valid reasons to use this:
31418diff -urNp linux-2.6.32.23/fs/debugfs/inode.c linux-2.6.32.23/fs/debugfs/inode.c 31435diff -urNp linux-2.6.32.24/fs/debugfs/inode.c linux-2.6.32.24/fs/debugfs/inode.c
31419--- linux-2.6.32.23/fs/debugfs/inode.c 2010-08-13 16:24:37.000000000 -0400 31436--- linux-2.6.32.24/fs/debugfs/inode.c 2010-08-13 16:24:37.000000000 -0400
31420+++ linux-2.6.32.23/fs/debugfs/inode.c 2010-09-04 15:54:52.000000000 -0400 31437+++ linux-2.6.32.24/fs/debugfs/inode.c 2010-09-04 15:54:52.000000000 -0400
31421@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc 31438@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
31422 31439
31423 static int debug_fill_super(struct super_block *sb, void *data, int silent) 31440 static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -31427,9 +31444,9 @@ diff -urNp linux-2.6.32.23/fs/debugfs/inode.c linux-2.6.32.23/fs/debugfs/inode.c
31427 31444
31428 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); 31445 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
31429 } 31446 }
31430diff -urNp linux-2.6.32.23/fs/dlm/lockspace.c linux-2.6.32.23/fs/dlm/lockspace.c 31447diff -urNp linux-2.6.32.24/fs/dlm/lockspace.c linux-2.6.32.24/fs/dlm/lockspace.c
31431--- linux-2.6.32.23/fs/dlm/lockspace.c 2010-08-13 16:24:37.000000000 -0400 31448--- linux-2.6.32.24/fs/dlm/lockspace.c 2010-08-13 16:24:37.000000000 -0400
31432+++ linux-2.6.32.23/fs/dlm/lockspace.c 2010-09-04 15:54:52.000000000 -0400 31449+++ linux-2.6.32.24/fs/dlm/lockspace.c 2010-09-04 15:54:52.000000000 -0400
31433@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc 31450@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
31434 kfree(ls); 31451 kfree(ls);
31435 } 31452 }
@@ -31439,9 +31456,9 @@ diff -urNp linux-2.6.32.23/fs/dlm/lockspace.c linux-2.6.32.23/fs/dlm/lockspace.c
31439 .show = dlm_attr_show, 31456 .show = dlm_attr_show,
31440 .store = dlm_attr_store, 31457 .store = dlm_attr_store,
31441 }; 31458 };
31442diff -urNp linux-2.6.32.23/fs/ecryptfs/inode.c linux-2.6.32.23/fs/ecryptfs/inode.c 31459diff -urNp linux-2.6.32.24/fs/ecryptfs/inode.c linux-2.6.32.24/fs/ecryptfs/inode.c
31443--- linux-2.6.32.23/fs/ecryptfs/inode.c 2010-08-13 16:24:37.000000000 -0400 31460--- linux-2.6.32.24/fs/ecryptfs/inode.c 2010-08-13 16:24:37.000000000 -0400
31444+++ linux-2.6.32.23/fs/ecryptfs/inode.c 2010-09-04 15:54:52.000000000 -0400 31461+++ linux-2.6.32.24/fs/ecryptfs/inode.c 2010-09-04 15:54:52.000000000 -0400
31445@@ -656,7 +656,7 @@ static int ecryptfs_readlink_lower(struc 31462@@ -656,7 +656,7 @@ static int ecryptfs_readlink_lower(struc
31446 old_fs = get_fs(); 31463 old_fs = get_fs();
31447 set_fs(get_ds()); 31464 set_fs(get_ds());
@@ -31460,9 +31477,9 @@ diff -urNp linux-2.6.32.23/fs/ecryptfs/inode.c linux-2.6.32.23/fs/ecryptfs/inode
31460 set_fs(old_fs); 31477 set_fs(old_fs);
31461 if (rc < 0) 31478 if (rc < 0)
31462 goto out_free; 31479 goto out_free;
31463diff -urNp linux-2.6.32.23/fs/exec.c linux-2.6.32.23/fs/exec.c 31480diff -urNp linux-2.6.32.24/fs/exec.c linux-2.6.32.24/fs/exec.c
31464--- linux-2.6.32.23/fs/exec.c 2010-08-13 16:24:37.000000000 -0400 31481--- linux-2.6.32.24/fs/exec.c 2010-08-13 16:24:37.000000000 -0400
31465+++ linux-2.6.32.23/fs/exec.c 2010-09-20 17:21:37.000000000 -0400 31482+++ linux-2.6.32.24/fs/exec.c 2010-09-28 18:47:47.000000000 -0400
31466@@ -56,12 +56,24 @@ 31483@@ -56,12 +56,24 @@
31467 #include <linux/fsnotify.h> 31484 #include <linux/fsnotify.h>
31468 #include <linux/fs_struct.h> 31485 #include <linux/fs_struct.h>
@@ -31760,7 +31777,7 @@ diff -urNp linux-2.6.32.23/fs/exec.c linux-2.6.32.23/fs/exec.c
31760 out: 31777 out:
31761 if (bprm->mm) 31778 if (bprm->mm)
31762 mmput (bprm->mm); 31779 mmput (bprm->mm);
31763@@ -1551,6 +1649,225 @@ out: 31780@@ -1551,6 +1649,217 @@ out:
31764 return ispipe; 31781 return ispipe;
31765 } 31782 }
31766 31783
@@ -31904,59 +31921,51 @@ diff -urNp linux-2.6.32.23/fs/exec.c linux-2.6.32.23/fs/exec.c
31904+#endif 31921+#endif
31905+ 31922+
31906+#ifdef CONFIG_PAX_USERCOPY 31923+#ifdef CONFIG_PAX_USERCOPY
31924+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
31925+int object_is_on_stack(const void *obj, unsigned long len)
31926+{
31927+ const void * const stack = task_stack_page(current);
31928+ const void * const stackend = stack + THREAD_SIZE;
31929+
31907+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86) 31930+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
31908+struct stack_frame { 31931+ const void *frame = NULL;
31909+ struct stack_frame *next_frame; 31932+ const void *oldframe;
31910+ unsigned long return_address;
31911+};
31912+#endif 31933+#endif
31913+ 31934+
31914+/* 0: not at all, 1: fully, 2: fully inside frame, 31935+ if (obj + len < obj)
31915+ -1: partially (implies an error) */ 31936+ return -1;
31916+ 31937+
31917+int object_is_on_stack(const void *obj, unsigned long len) 31938+ if (obj + len <= stack || stackend <= obj)
31918+{ 31939+ return 0;
31919+ const void *stack = task_stack_page(current);
31920+ const void *stackend = stack + THREAD_SIZE;
31921+ 31940+
31922+ if (obj + len < obj) 31941+ if (obj < stack || stackend < obj + len)
31923+ return -1; 31942+ return -1;
31924+ 31943+
31925+ if (stack <= obj && obj + len <= stackend) {
31926+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86) 31944+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
31927+ void *frame = __builtin_frame_address(2); 31945+ oldframe = __builtin_frame_address(1);
31928+ void *oldframe = __builtin_frame_address(1); 31946+ if (oldframe)
31929+ /* 31947+ frame = __builtin_frame_address(2);
31930+ bottom ----------------------------------------------> top 31948+ /*
31931+ [saved bp][saved ip][args][local vars][saved bp][saved ip] 31949+ low ----------------------------------------------> high
31932+ ^----------------^ 31950+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
31933+ allow copies only within here 31951+ ^----------------^
31952+ allow copies only within here
31953+ */
31954+ while (stack <= frame && frame < stackend) {
31955+ /* if obj + len extends past the last frame, this
31956+ check won't pass and the next frame will be 0,
31957+ causing us to bail out and correctly report
31958+ the copy as invalid
31934+ */ 31959+ */
31935+ while (frame) { 31960+ if (obj + len <= frame)
31936+ /* if obj + len extends past the last frame, this 31961+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
31937+ check won't pass and the next frame will be 0, 31962+ oldframe = frame;
31938+ causing us to bail out and correctly report 31963+ frame = *(const void * const *)frame;
31939+ the copy as invalid
31940+ */
31941+ if (obj + len <= frame) {
31942+ if (obj >= (oldframe + (2 * sizeof(void *))))
31943+ return 2;
31944+ else
31945+ return -1;
31946+ }
31947+ oldframe = frame;
31948+ frame = ((struct stack_frame *)frame)->next_frame;
31949+ }
31950+ return -1;
31951+#else
31952+ return 1;
31953+#endif
31954+ } 31964+ }
31955+
31956+ if (obj + len <= stack || stackend <= obj)
31957+ return 0;
31958+
31959+ return -1; 31965+ return -1;
31966+#else
31967+ return 1;
31968+#endif
31960+} 31969+}
31961+ 31970+
31962+ 31971+
@@ -31986,7 +31995,7 @@ diff -urNp linux-2.6.32.23/fs/exec.c linux-2.6.32.23/fs/exec.c
31986 static int zap_process(struct task_struct *start) 31995 static int zap_process(struct task_struct *start)
31987 { 31996 {
31988 struct task_struct *t; 31997 struct task_struct *t;
31989@@ -1753,17 +2070,17 @@ static void wait_for_dump_helpers(struct 31998@@ -1753,17 +2062,17 @@ static void wait_for_dump_helpers(struct
31990 pipe = file->f_path.dentry->d_inode->i_pipe; 31999 pipe = file->f_path.dentry->d_inode->i_pipe;
31991 32000
31992 pipe_lock(pipe); 32001 pipe_lock(pipe);
@@ -32009,7 +32018,7 @@ diff -urNp linux-2.6.32.23/fs/exec.c linux-2.6.32.23/fs/exec.c
32009 pipe_unlock(pipe); 32018 pipe_unlock(pipe);
32010 32019
32011 } 32020 }
32012@@ -1834,6 +2151,10 @@ void do_coredump(long signr, int exit_co 32021@@ -1834,6 +2143,10 @@ void do_coredump(long signr, int exit_co
32013 */ 32022 */
32014 clear_thread_flag(TIF_SIGPENDING); 32023 clear_thread_flag(TIF_SIGPENDING);
32015 32024
@@ -32020,9 +32029,9 @@ diff -urNp linux-2.6.32.23/fs/exec.c linux-2.6.32.23/fs/exec.c
32020 /* 32029 /*
32021 * lock_kernel() because format_corename() is controlled by sysctl, which 32030 * lock_kernel() because format_corename() is controlled by sysctl, which
32022 * uses lock_kernel() 32031 * uses lock_kernel()
32023diff -urNp linux-2.6.32.23/fs/ext2/balloc.c linux-2.6.32.23/fs/ext2/balloc.c 32032diff -urNp linux-2.6.32.24/fs/ext2/balloc.c linux-2.6.32.24/fs/ext2/balloc.c
32024--- linux-2.6.32.23/fs/ext2/balloc.c 2010-08-13 16:24:37.000000000 -0400 32033--- linux-2.6.32.24/fs/ext2/balloc.c 2010-08-13 16:24:37.000000000 -0400
32025+++ linux-2.6.32.23/fs/ext2/balloc.c 2010-09-04 15:54:52.000000000 -0400 32034+++ linux-2.6.32.24/fs/ext2/balloc.c 2010-09-04 15:54:52.000000000 -0400
32026@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e 32035@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
32027 32036
32028 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 32037 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -32032,9 +32041,9 @@ diff -urNp linux-2.6.32.23/fs/ext2/balloc.c linux-2.6.32.23/fs/ext2/balloc.c
32032 sbi->s_resuid != current_fsuid() && 32041 sbi->s_resuid != current_fsuid() &&
32033 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 32042 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
32034 return 0; 32043 return 0;
32035diff -urNp linux-2.6.32.23/fs/ext2/xattr.c linux-2.6.32.23/fs/ext2/xattr.c 32044diff -urNp linux-2.6.32.24/fs/ext2/xattr.c linux-2.6.32.24/fs/ext2/xattr.c
32036--- linux-2.6.32.23/fs/ext2/xattr.c 2010-08-13 16:24:37.000000000 -0400 32045--- linux-2.6.32.24/fs/ext2/xattr.c 2010-08-13 16:24:37.000000000 -0400
32037+++ linux-2.6.32.23/fs/ext2/xattr.c 2010-09-04 15:54:52.000000000 -0400 32046+++ linux-2.6.32.24/fs/ext2/xattr.c 2010-09-04 15:54:52.000000000 -0400
32038@@ -85,8 +85,8 @@ 32047@@ -85,8 +85,8 @@
32039 printk("\n"); \ 32048 printk("\n"); \
32040 } while (0) 32049 } while (0)
@@ -32046,9 +32055,9 @@ diff -urNp linux-2.6.32.23/fs/ext2/xattr.c linux-2.6.32.23/fs/ext2/xattr.c
32046 #endif 32055 #endif
32047 32056
32048 static int ext2_xattr_set2(struct inode *, struct buffer_head *, 32057 static int ext2_xattr_set2(struct inode *, struct buffer_head *,
32049diff -urNp linux-2.6.32.23/fs/ext3/balloc.c linux-2.6.32.23/fs/ext3/balloc.c 32058diff -urNp linux-2.6.32.24/fs/ext3/balloc.c linux-2.6.32.24/fs/ext3/balloc.c
32050--- linux-2.6.32.23/fs/ext3/balloc.c 2010-08-13 16:24:37.000000000 -0400 32059--- linux-2.6.32.24/fs/ext3/balloc.c 2010-08-13 16:24:37.000000000 -0400
32051+++ linux-2.6.32.23/fs/ext3/balloc.c 2010-09-04 15:54:52.000000000 -0400 32060+++ linux-2.6.32.24/fs/ext3/balloc.c 2010-09-04 15:54:52.000000000 -0400
32052@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e 32061@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
32053 32062
32054 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 32063 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -32058,9 +32067,9 @@ diff -urNp linux-2.6.32.23/fs/ext3/balloc.c linux-2.6.32.23/fs/ext3/balloc.c
32058 sbi->s_resuid != current_fsuid() && 32067 sbi->s_resuid != current_fsuid() &&
32059 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 32068 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
32060 return 0; 32069 return 0;
32061diff -urNp linux-2.6.32.23/fs/ext3/namei.c linux-2.6.32.23/fs/ext3/namei.c 32070diff -urNp linux-2.6.32.24/fs/ext3/namei.c linux-2.6.32.24/fs/ext3/namei.c
32062--- linux-2.6.32.23/fs/ext3/namei.c 2010-08-13 16:24:37.000000000 -0400 32071--- linux-2.6.32.24/fs/ext3/namei.c 2010-08-13 16:24:37.000000000 -0400
32063+++ linux-2.6.32.23/fs/ext3/namei.c 2010-09-04 15:54:52.000000000 -0400 32072+++ linux-2.6.32.24/fs/ext3/namei.c 2010-09-04 15:54:52.000000000 -0400
32064@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split 32073@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
32065 char *data1 = (*bh)->b_data, *data2; 32074 char *data1 = (*bh)->b_data, *data2;
32066 unsigned split, move, size; 32075 unsigned split, move, size;
@@ -32070,9 +32079,9 @@ diff -urNp linux-2.6.32.23/fs/ext3/namei.c linux-2.6.32.23/fs/ext3/namei.c
32070 32079
32071 bh2 = ext3_append (handle, dir, &newblock, &err); 32080 bh2 = ext3_append (handle, dir, &newblock, &err);
32072 if (!(bh2)) { 32081 if (!(bh2)) {
32073diff -urNp linux-2.6.32.23/fs/ext3/xattr.c linux-2.6.32.23/fs/ext3/xattr.c 32082diff -urNp linux-2.6.32.24/fs/ext3/xattr.c linux-2.6.32.24/fs/ext3/xattr.c
32074--- linux-2.6.32.23/fs/ext3/xattr.c 2010-08-13 16:24:37.000000000 -0400 32083--- linux-2.6.32.24/fs/ext3/xattr.c 2010-08-13 16:24:37.000000000 -0400
32075+++ linux-2.6.32.23/fs/ext3/xattr.c 2010-09-04 15:54:52.000000000 -0400 32084+++ linux-2.6.32.24/fs/ext3/xattr.c 2010-09-04 15:54:52.000000000 -0400
32076@@ -89,8 +89,8 @@ 32085@@ -89,8 +89,8 @@
32077 printk("\n"); \ 32086 printk("\n"); \
32078 } while (0) 32087 } while (0)
@@ -32084,9 +32093,9 @@ diff -urNp linux-2.6.32.23/fs/ext3/xattr.c linux-2.6.32.23/fs/ext3/xattr.c
32084 #endif 32093 #endif
32085 32094
32086 static void ext3_xattr_cache_insert(struct buffer_head *); 32095 static void ext3_xattr_cache_insert(struct buffer_head *);
32087diff -urNp linux-2.6.32.23/fs/ext4/balloc.c linux-2.6.32.23/fs/ext4/balloc.c 32096diff -urNp linux-2.6.32.24/fs/ext4/balloc.c linux-2.6.32.24/fs/ext4/balloc.c
32088--- linux-2.6.32.23/fs/ext4/balloc.c 2010-08-29 21:08:20.000000000 -0400 32097--- linux-2.6.32.24/fs/ext4/balloc.c 2010-08-29 21:08:20.000000000 -0400
32089+++ linux-2.6.32.23/fs/ext4/balloc.c 2010-09-04 15:54:52.000000000 -0400 32098+++ linux-2.6.32.24/fs/ext4/balloc.c 2010-09-04 15:54:52.000000000 -0400
32090@@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_ 32099@@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_
32091 /* Hm, nope. Are (enough) root reserved blocks available? */ 32100 /* Hm, nope. Are (enough) root reserved blocks available? */
32092 if (sbi->s_resuid == current_fsuid() || 32101 if (sbi->s_resuid == current_fsuid() ||
@@ -32096,9 +32105,9 @@ diff -urNp linux-2.6.32.23/fs/ext4/balloc.c linux-2.6.32.23/fs/ext4/balloc.c
32096 if (free_blocks >= (nblocks + dirty_blocks)) 32105 if (free_blocks >= (nblocks + dirty_blocks))
32097 return 1; 32106 return 1;
32098 } 32107 }
32099diff -urNp linux-2.6.32.23/fs/ext4/namei.c linux-2.6.32.23/fs/ext4/namei.c 32108diff -urNp linux-2.6.32.24/fs/ext4/namei.c linux-2.6.32.24/fs/ext4/namei.c
32100--- linux-2.6.32.23/fs/ext4/namei.c 2010-08-13 16:24:37.000000000 -0400 32109--- linux-2.6.32.24/fs/ext4/namei.c 2010-08-13 16:24:37.000000000 -0400
32101+++ linux-2.6.32.23/fs/ext4/namei.c 2010-09-04 15:54:52.000000000 -0400 32110+++ linux-2.6.32.24/fs/ext4/namei.c 2010-09-04 15:54:52.000000000 -0400
32102@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split 32111@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
32103 char *data1 = (*bh)->b_data, *data2; 32112 char *data1 = (*bh)->b_data, *data2;
32104 unsigned split, move, size; 32113 unsigned split, move, size;
@@ -32108,9 +32117,9 @@ diff -urNp linux-2.6.32.23/fs/ext4/namei.c linux-2.6.32.23/fs/ext4/namei.c
32108 32117
32109 bh2 = ext4_append (handle, dir, &newblock, &err); 32118 bh2 = ext4_append (handle, dir, &newblock, &err);
32110 if (!(bh2)) { 32119 if (!(bh2)) {
32111diff -urNp linux-2.6.32.23/fs/ext4/super.c linux-2.6.32.23/fs/ext4/super.c 32120diff -urNp linux-2.6.32.24/fs/ext4/super.c linux-2.6.32.24/fs/ext4/super.c
32112--- linux-2.6.32.23/fs/ext4/super.c 2010-08-13 16:24:37.000000000 -0400 32121--- linux-2.6.32.24/fs/ext4/super.c 2010-08-13 16:24:37.000000000 -0400
32113+++ linux-2.6.32.23/fs/ext4/super.c 2010-09-04 15:54:52.000000000 -0400 32122+++ linux-2.6.32.24/fs/ext4/super.c 2010-09-04 15:54:52.000000000 -0400
32114@@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje 32123@@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje
32115 } 32124 }
32116 32125
@@ -32120,9 +32129,9 @@ diff -urNp linux-2.6.32.23/fs/ext4/super.c linux-2.6.32.23/fs/ext4/super.c
32120 .show = ext4_attr_show, 32129 .show = ext4_attr_show,
32121 .store = ext4_attr_store, 32130 .store = ext4_attr_store,
32122 }; 32131 };
32123diff -urNp linux-2.6.32.23/fs/ext4/xattr.c linux-2.6.32.23/fs/ext4/xattr.c 32132diff -urNp linux-2.6.32.24/fs/ext4/xattr.c linux-2.6.32.24/fs/ext4/xattr.c
32124--- linux-2.6.32.23/fs/ext4/xattr.c 2010-08-13 16:24:37.000000000 -0400 32133--- linux-2.6.32.24/fs/ext4/xattr.c 2010-08-13 16:24:37.000000000 -0400
32125+++ linux-2.6.32.23/fs/ext4/xattr.c 2010-09-04 15:54:52.000000000 -0400 32134+++ linux-2.6.32.24/fs/ext4/xattr.c 2010-09-04 15:54:52.000000000 -0400
32126@@ -82,8 +82,8 @@ 32135@@ -82,8 +82,8 @@
32127 printk("\n"); \ 32136 printk("\n"); \
32128 } while (0) 32137 } while (0)
@@ -32134,9 +32143,9 @@ diff -urNp linux-2.6.32.23/fs/ext4/xattr.c linux-2.6.32.23/fs/ext4/xattr.c
32134 #endif 32143 #endif
32135 32144
32136 static void ext4_xattr_cache_insert(struct buffer_head *); 32145 static void ext4_xattr_cache_insert(struct buffer_head *);
32137diff -urNp linux-2.6.32.23/fs/fcntl.c linux-2.6.32.23/fs/fcntl.c 32146diff -urNp linux-2.6.32.24/fs/fcntl.c linux-2.6.32.24/fs/fcntl.c
32138--- linux-2.6.32.23/fs/fcntl.c 2010-08-13 16:24:37.000000000 -0400 32147--- linux-2.6.32.24/fs/fcntl.c 2010-08-13 16:24:37.000000000 -0400
32139+++ linux-2.6.32.23/fs/fcntl.c 2010-09-04 15:54:52.000000000 -0400 32148+++ linux-2.6.32.24/fs/fcntl.c 2010-09-04 15:54:52.000000000 -0400
32140@@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct 32149@@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct
32141 if (err) 32150 if (err)
32142 return err; 32151 return err;
@@ -32157,9 +32166,9 @@ diff -urNp linux-2.6.32.23/fs/fcntl.c linux-2.6.32.23/fs/fcntl.c
32157 if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 32166 if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
32158 break; 32167 break;
32159 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); 32168 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
32160diff -urNp linux-2.6.32.23/fs/fifo.c linux-2.6.32.23/fs/fifo.c 32169diff -urNp linux-2.6.32.24/fs/fifo.c linux-2.6.32.24/fs/fifo.c
32161--- linux-2.6.32.23/fs/fifo.c 2010-08-13 16:24:37.000000000 -0400 32170--- linux-2.6.32.24/fs/fifo.c 2010-08-13 16:24:37.000000000 -0400
32162+++ linux-2.6.32.23/fs/fifo.c 2010-09-04 15:54:52.000000000 -0400 32171+++ linux-2.6.32.24/fs/fifo.c 2010-09-04 15:54:52.000000000 -0400
32163@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode 32172@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
32164 */ 32173 */
32165 filp->f_op = &read_pipefifo_fops; 32174 filp->f_op = &read_pipefifo_fops;
@@ -32230,9 +32239,9 @@ diff -urNp linux-2.6.32.23/fs/fifo.c linux-2.6.32.23/fs/fifo.c
32230 free_pipe_info(inode); 32239 free_pipe_info(inode);
32231 32240
32232 err_nocleanup: 32241 err_nocleanup:
32233diff -urNp linux-2.6.32.23/fs/file.c linux-2.6.32.23/fs/file.c 32242diff -urNp linux-2.6.32.24/fs/file.c linux-2.6.32.24/fs/file.c
32234--- linux-2.6.32.23/fs/file.c 2010-08-13 16:24:37.000000000 -0400 32243--- linux-2.6.32.24/fs/file.c 2010-08-13 16:24:37.000000000 -0400
32235+++ linux-2.6.32.23/fs/file.c 2010-09-04 15:54:52.000000000 -0400 32244+++ linux-2.6.32.24/fs/file.c 2010-09-04 15:54:52.000000000 -0400
32236@@ -14,6 +14,7 @@ 32245@@ -14,6 +14,7 @@
32237 #include <linux/slab.h> 32246 #include <linux/slab.h>
32238 #include <linux/vmalloc.h> 32247 #include <linux/vmalloc.h>
@@ -32250,9 +32259,9 @@ diff -urNp linux-2.6.32.23/fs/file.c linux-2.6.32.23/fs/file.c
32250 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 32259 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
32251 return -EMFILE; 32260 return -EMFILE;
32252 32261
32253diff -urNp linux-2.6.32.23/fs/fs_struct.c linux-2.6.32.23/fs/fs_struct.c 32262diff -urNp linux-2.6.32.24/fs/fs_struct.c linux-2.6.32.24/fs/fs_struct.c
32254--- linux-2.6.32.23/fs/fs_struct.c 2010-08-13 16:24:37.000000000 -0400 32263--- linux-2.6.32.24/fs/fs_struct.c 2010-08-13 16:24:37.000000000 -0400
32255+++ linux-2.6.32.23/fs/fs_struct.c 2010-09-04 15:54:52.000000000 -0400 32264+++ linux-2.6.32.24/fs/fs_struct.c 2010-09-04 15:54:52.000000000 -0400
32256@@ -4,6 +4,7 @@ 32265@@ -4,6 +4,7 @@
32257 #include <linux/path.h> 32266 #include <linux/path.h>
32258 #include <linux/slab.h> 32267 #include <linux/slab.h>
@@ -32332,9 +32341,9 @@ diff -urNp linux-2.6.32.23/fs/fs_struct.c linux-2.6.32.23/fs/fs_struct.c
32332 write_unlock(&fs->lock); 32341 write_unlock(&fs->lock);
32333 32342
32334 task_unlock(current); 32343 task_unlock(current);
32335diff -urNp linux-2.6.32.23/fs/fuse/control.c linux-2.6.32.23/fs/fuse/control.c 32344diff -urNp linux-2.6.32.24/fs/fuse/control.c linux-2.6.32.24/fs/fuse/control.c
32336--- linux-2.6.32.23/fs/fuse/control.c 2010-08-13 16:24:37.000000000 -0400 32345--- linux-2.6.32.24/fs/fuse/control.c 2010-08-13 16:24:37.000000000 -0400
32337+++ linux-2.6.32.23/fs/fuse/control.c 2010-09-04 15:54:52.000000000 -0400 32346+++ linux-2.6.32.24/fs/fuse/control.c 2010-09-04 15:54:52.000000000 -0400
32338@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co 32347@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
32339 32348
32340 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) 32349 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -32344,9 +32353,9 @@ diff -urNp linux-2.6.32.23/fs/fuse/control.c linux-2.6.32.23/fs/fuse/control.c
32344 struct fuse_conn *fc; 32353 struct fuse_conn *fc;
32345 int err; 32354 int err;
32346 32355
32347diff -urNp linux-2.6.32.23/fs/fuse/cuse.c linux-2.6.32.23/fs/fuse/cuse.c 32356diff -urNp linux-2.6.32.24/fs/fuse/cuse.c linux-2.6.32.24/fs/fuse/cuse.c
32348--- linux-2.6.32.23/fs/fuse/cuse.c 2010-08-13 16:24:37.000000000 -0400 32357--- linux-2.6.32.24/fs/fuse/cuse.c 2010-08-13 16:24:37.000000000 -0400
32349+++ linux-2.6.32.23/fs/fuse/cuse.c 2010-09-04 15:54:52.000000000 -0400 32358+++ linux-2.6.32.24/fs/fuse/cuse.c 2010-09-04 15:54:52.000000000 -0400
32350@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i 32359@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
32351 return rc; 32360 return rc;
32352 } 32361 }
@@ -32381,9 +32390,9 @@ diff -urNp linux-2.6.32.23/fs/fuse/cuse.c linux-2.6.32.23/fs/fuse/cuse.c
32381 cuse_class = class_create(THIS_MODULE, "cuse"); 32390 cuse_class = class_create(THIS_MODULE, "cuse");
32382 if (IS_ERR(cuse_class)) 32391 if (IS_ERR(cuse_class))
32383 return PTR_ERR(cuse_class); 32392 return PTR_ERR(cuse_class);
32384diff -urNp linux-2.6.32.23/fs/fuse/dev.c linux-2.6.32.23/fs/fuse/dev.c 32393diff -urNp linux-2.6.32.24/fs/fuse/dev.c linux-2.6.32.24/fs/fuse/dev.c
32385--- linux-2.6.32.23/fs/fuse/dev.c 2010-09-20 17:26:42.000000000 -0400 32394--- linux-2.6.32.24/fs/fuse/dev.c 2010-09-20 17:26:42.000000000 -0400
32386+++ linux-2.6.32.23/fs/fuse/dev.c 2010-09-20 17:27:14.000000000 -0400 32395+++ linux-2.6.32.24/fs/fuse/dev.c 2010-09-20 17:27:14.000000000 -0400
32387@@ -745,7 +745,7 @@ __releases(&fc->lock) 32396@@ -745,7 +745,7 @@ __releases(&fc->lock)
32388 * request_end(). Otherwise add it to the processing list, and set 32397 * request_end(). Otherwise add it to the processing list, and set
32389 * the 'sent' flag. 32398 * the 'sent' flag.
@@ -32489,9 +32498,9 @@ diff -urNp linux-2.6.32.23/fs/fuse/dev.c linux-2.6.32.23/fs/fuse/dev.c
32489 32498
32490 const struct file_operations fuse_dev_operations = { 32499 const struct file_operations fuse_dev_operations = {
32491 .owner = THIS_MODULE, 32500 .owner = THIS_MODULE,
32492diff -urNp linux-2.6.32.23/fs/fuse/dir.c linux-2.6.32.23/fs/fuse/dir.c 32501diff -urNp linux-2.6.32.24/fs/fuse/dir.c linux-2.6.32.24/fs/fuse/dir.c
32493--- linux-2.6.32.23/fs/fuse/dir.c 2010-08-13 16:24:37.000000000 -0400 32502--- linux-2.6.32.24/fs/fuse/dir.c 2010-08-13 16:24:37.000000000 -0400
32494+++ linux-2.6.32.23/fs/fuse/dir.c 2010-09-04 15:54:52.000000000 -0400 32503+++ linux-2.6.32.24/fs/fuse/dir.c 2010-09-04 15:54:52.000000000 -0400
32495@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de 32504@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
32496 return link; 32505 return link;
32497 } 32506 }
@@ -32501,9 +32510,9 @@ diff -urNp linux-2.6.32.23/fs/fuse/dir.c linux-2.6.32.23/fs/fuse/dir.c
32501 { 32510 {
32502 if (!IS_ERR(link)) 32511 if (!IS_ERR(link))
32503 free_page((unsigned long) link); 32512 free_page((unsigned long) link);
32504diff -urNp linux-2.6.32.23/fs/fuse/fuse_i.h linux-2.6.32.23/fs/fuse/fuse_i.h 32513diff -urNp linux-2.6.32.24/fs/fuse/fuse_i.h linux-2.6.32.24/fs/fuse/fuse_i.h
32505--- linux-2.6.32.23/fs/fuse/fuse_i.h 2010-08-13 16:24:37.000000000 -0400 32514--- linux-2.6.32.24/fs/fuse/fuse_i.h 2010-08-13 16:24:37.000000000 -0400
32506+++ linux-2.6.32.23/fs/fuse/fuse_i.h 2010-09-04 15:54:52.000000000 -0400 32515+++ linux-2.6.32.24/fs/fuse/fuse_i.h 2010-09-04 15:54:52.000000000 -0400
32507@@ -521,6 +521,16 @@ extern const struct file_operations fuse 32516@@ -521,6 +521,16 @@ extern const struct file_operations fuse
32508 32517
32509 extern const struct dentry_operations fuse_dentry_operations; 32518 extern const struct dentry_operations fuse_dentry_operations;
@@ -32521,9 +32530,9 @@ diff -urNp linux-2.6.32.23/fs/fuse/fuse_i.h linux-2.6.32.23/fs/fuse/fuse_i.h
32521 /** 32530 /**
32522 * Inode to nodeid comparison. 32531 * Inode to nodeid comparison.
32523 */ 32532 */
32524diff -urNp linux-2.6.32.23/fs/gfs2/sys.c linux-2.6.32.23/fs/gfs2/sys.c 32533diff -urNp linux-2.6.32.24/fs/gfs2/sys.c linux-2.6.32.24/fs/gfs2/sys.c
32525--- linux-2.6.32.23/fs/gfs2/sys.c 2010-08-13 16:24:37.000000000 -0400 32534--- linux-2.6.32.24/fs/gfs2/sys.c 2010-08-13 16:24:37.000000000 -0400
32526+++ linux-2.6.32.23/fs/gfs2/sys.c 2010-09-04 15:54:52.000000000 -0400 32535+++ linux-2.6.32.24/fs/gfs2/sys.c 2010-09-04 15:54:52.000000000 -0400
32527@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko 32536@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
32528 return a->store ? a->store(sdp, buf, len) : len; 32537 return a->store ? a->store(sdp, buf, len) : len;
32529 } 32538 }
@@ -32542,9 +32551,9 @@ diff -urNp linux-2.6.32.23/fs/gfs2/sys.c linux-2.6.32.23/fs/gfs2/sys.c
32542 .uevent = gfs2_uevent, 32551 .uevent = gfs2_uevent,
32543 }; 32552 };
32544 32553
32545diff -urNp linux-2.6.32.23/fs/hfs/inode.c linux-2.6.32.23/fs/hfs/inode.c 32554diff -urNp linux-2.6.32.24/fs/hfs/inode.c linux-2.6.32.24/fs/hfs/inode.c
32546--- linux-2.6.32.23/fs/hfs/inode.c 2010-08-13 16:24:37.000000000 -0400 32555--- linux-2.6.32.24/fs/hfs/inode.c 2010-08-13 16:24:37.000000000 -0400
32547+++ linux-2.6.32.23/fs/hfs/inode.c 2010-09-04 15:54:52.000000000 -0400 32556+++ linux-2.6.32.24/fs/hfs/inode.c 2010-09-04 15:54:52.000000000 -0400
32548@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, 32557@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
32549 32558
32550 if (S_ISDIR(main_inode->i_mode)) { 32559 if (S_ISDIR(main_inode->i_mode)) {
@@ -32563,9 +32572,9 @@ diff -urNp linux-2.6.32.23/fs/hfs/inode.c linux-2.6.32.23/fs/hfs/inode.c
32563 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, 32572 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
32564 sizeof(struct hfs_cat_file)); 32573 sizeof(struct hfs_cat_file));
32565 if (rec.type != HFS_CDR_FIL || 32574 if (rec.type != HFS_CDR_FIL ||
32566diff -urNp linux-2.6.32.23/fs/hfsplus/inode.c linux-2.6.32.23/fs/hfsplus/inode.c 32575diff -urNp linux-2.6.32.24/fs/hfsplus/inode.c linux-2.6.32.24/fs/hfsplus/inode.c
32567--- linux-2.6.32.23/fs/hfsplus/inode.c 2010-08-13 16:24:37.000000000 -0400 32576--- linux-2.6.32.24/fs/hfsplus/inode.c 2010-08-13 16:24:37.000000000 -0400
32568+++ linux-2.6.32.23/fs/hfsplus/inode.c 2010-09-04 15:54:52.000000000 -0400 32577+++ linux-2.6.32.24/fs/hfsplus/inode.c 2010-09-04 15:54:52.000000000 -0400
32569@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode 32578@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
32570 struct hfsplus_cat_folder *folder = &entry.folder; 32579 struct hfsplus_cat_folder *folder = &entry.folder;
32571 32580
@@ -32602,9 +32611,9 @@ diff -urNp linux-2.6.32.23/fs/hfsplus/inode.c linux-2.6.32.23/fs/hfsplus/inode.c
32602 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, 32611 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
32603 sizeof(struct hfsplus_cat_file)); 32612 sizeof(struct hfsplus_cat_file));
32604 hfsplus_inode_write_fork(inode, &file->data_fork); 32613 hfsplus_inode_write_fork(inode, &file->data_fork);
32605diff -urNp linux-2.6.32.23/fs/hugetlbfs/inode.c linux-2.6.32.23/fs/hugetlbfs/inode.c 32614diff -urNp linux-2.6.32.24/fs/hugetlbfs/inode.c linux-2.6.32.24/fs/hugetlbfs/inode.c
32606--- linux-2.6.32.23/fs/hugetlbfs/inode.c 2010-08-13 16:24:37.000000000 -0400 32615--- linux-2.6.32.24/fs/hugetlbfs/inode.c 2010-08-13 16:24:37.000000000 -0400
32607+++ linux-2.6.32.23/fs/hugetlbfs/inode.c 2010-09-04 15:54:52.000000000 -0400 32616+++ linux-2.6.32.24/fs/hugetlbfs/inode.c 2010-09-04 15:54:52.000000000 -0400
32608@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs 32617@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
32609 .kill_sb = kill_litter_super, 32618 .kill_sb = kill_litter_super,
32610 }; 32619 };
@@ -32614,9 +32623,9 @@ diff -urNp linux-2.6.32.23/fs/hugetlbfs/inode.c linux-2.6.32.23/fs/hugetlbfs/ino
32614 32623
32615 static int can_do_hugetlb_shm(void) 32624 static int can_do_hugetlb_shm(void)
32616 { 32625 {
32617diff -urNp linux-2.6.32.23/fs/ioctl.c linux-2.6.32.23/fs/ioctl.c 32626diff -urNp linux-2.6.32.24/fs/ioctl.c linux-2.6.32.24/fs/ioctl.c
32618--- linux-2.6.32.23/fs/ioctl.c 2010-08-13 16:24:37.000000000 -0400 32627--- linux-2.6.32.24/fs/ioctl.c 2010-08-13 16:24:37.000000000 -0400
32619+++ linux-2.6.32.23/fs/ioctl.c 2010-09-04 15:54:52.000000000 -0400 32628+++ linux-2.6.32.24/fs/ioctl.c 2010-09-04 15:54:52.000000000 -0400
32620@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema 32629@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
32621 u64 phys, u64 len, u32 flags) 32630 u64 phys, u64 len, u32 flags)
32622 { 32631 {
@@ -32644,9 +32653,9 @@ diff -urNp linux-2.6.32.23/fs/ioctl.c linux-2.6.32.23/fs/ioctl.c
32644 error = -EFAULT; 32653 error = -EFAULT;
32645 32654
32646 return error; 32655 return error;
32647diff -urNp linux-2.6.32.23/fs/jffs2/debug.h linux-2.6.32.23/fs/jffs2/debug.h 32656diff -urNp linux-2.6.32.24/fs/jffs2/debug.h linux-2.6.32.24/fs/jffs2/debug.h
32648--- linux-2.6.32.23/fs/jffs2/debug.h 2010-08-13 16:24:37.000000000 -0400 32657--- linux-2.6.32.24/fs/jffs2/debug.h 2010-08-13 16:24:37.000000000 -0400
32649+++ linux-2.6.32.23/fs/jffs2/debug.h 2010-09-04 15:54:52.000000000 -0400 32658+++ linux-2.6.32.24/fs/jffs2/debug.h 2010-09-04 15:54:52.000000000 -0400
32650@@ -52,13 +52,13 @@ 32659@@ -52,13 +52,13 @@
32651 #if CONFIG_JFFS2_FS_DEBUG > 0 32660 #if CONFIG_JFFS2_FS_DEBUG > 0
32652 #define D1(x) x 32661 #define D1(x) x
@@ -32748,9 +32757,9 @@ diff -urNp linux-2.6.32.23/fs/jffs2/debug.h linux-2.6.32.23/fs/jffs2/debug.h
32748 #endif 32757 #endif
32749 32758
32750 /* "Sanity" checks */ 32759 /* "Sanity" checks */
32751diff -urNp linux-2.6.32.23/fs/jffs2/erase.c linux-2.6.32.23/fs/jffs2/erase.c 32760diff -urNp linux-2.6.32.24/fs/jffs2/erase.c linux-2.6.32.24/fs/jffs2/erase.c
32752--- linux-2.6.32.23/fs/jffs2/erase.c 2010-08-13 16:24:37.000000000 -0400 32761--- linux-2.6.32.24/fs/jffs2/erase.c 2010-08-13 16:24:37.000000000 -0400
32753+++ linux-2.6.32.23/fs/jffs2/erase.c 2010-09-04 15:54:52.000000000 -0400 32762+++ linux-2.6.32.24/fs/jffs2/erase.c 2010-09-04 15:54:52.000000000 -0400
32754@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru 32763@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
32755 struct jffs2_unknown_node marker = { 32764 struct jffs2_unknown_node marker = {
32756 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), 32765 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -32761,9 +32770,9 @@ diff -urNp linux-2.6.32.23/fs/jffs2/erase.c linux-2.6.32.23/fs/jffs2/erase.c
32761 }; 32770 };
32762 32771
32763 jffs2_prealloc_raw_node_refs(c, jeb, 1); 32772 jffs2_prealloc_raw_node_refs(c, jeb, 1);
32764diff -urNp linux-2.6.32.23/fs/jffs2/summary.h linux-2.6.32.23/fs/jffs2/summary.h 32773diff -urNp linux-2.6.32.24/fs/jffs2/summary.h linux-2.6.32.24/fs/jffs2/summary.h
32765--- linux-2.6.32.23/fs/jffs2/summary.h 2010-08-13 16:24:37.000000000 -0400 32774--- linux-2.6.32.24/fs/jffs2/summary.h 2010-08-13 16:24:37.000000000 -0400
32766+++ linux-2.6.32.23/fs/jffs2/summary.h 2010-09-04 15:54:52.000000000 -0400 32775+++ linux-2.6.32.24/fs/jffs2/summary.h 2010-09-04 15:54:52.000000000 -0400
32767@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ 32776@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
32768 32777
32769 #define jffs2_sum_active() (0) 32778 #define jffs2_sum_active() (0)
@@ -32792,9 +32801,9 @@ diff -urNp linux-2.6.32.23/fs/jffs2/summary.h linux-2.6.32.23/fs/jffs2/summary.h
32792 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) 32801 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
32793 32802
32794 #endif /* CONFIG_JFFS2_SUMMARY */ 32803 #endif /* CONFIG_JFFS2_SUMMARY */
32795diff -urNp linux-2.6.32.23/fs/jffs2/wbuf.c linux-2.6.32.23/fs/jffs2/wbuf.c 32804diff -urNp linux-2.6.32.24/fs/jffs2/wbuf.c linux-2.6.32.24/fs/jffs2/wbuf.c
32796--- linux-2.6.32.23/fs/jffs2/wbuf.c 2010-08-13 16:24:37.000000000 -0400 32805--- linux-2.6.32.24/fs/jffs2/wbuf.c 2010-08-13 16:24:37.000000000 -0400
32797+++ linux-2.6.32.23/fs/jffs2/wbuf.c 2010-09-04 15:54:52.000000000 -0400 32806+++ linux-2.6.32.24/fs/jffs2/wbuf.c 2010-09-04 15:54:52.000000000 -0400
32798@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o 32807@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
32799 { 32808 {
32800 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), 32809 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -32805,9 +32814,9 @@ diff -urNp linux-2.6.32.23/fs/jffs2/wbuf.c linux-2.6.32.23/fs/jffs2/wbuf.c
32805 }; 32814 };
32806 32815
32807 /* 32816 /*
32808diff -urNp linux-2.6.32.23/fs/Kconfig.binfmt linux-2.6.32.23/fs/Kconfig.binfmt 32817diff -urNp linux-2.6.32.24/fs/Kconfig.binfmt linux-2.6.32.24/fs/Kconfig.binfmt
32809--- linux-2.6.32.23/fs/Kconfig.binfmt 2010-08-13 16:24:37.000000000 -0400 32818--- linux-2.6.32.24/fs/Kconfig.binfmt 2010-08-13 16:24:37.000000000 -0400
32810+++ linux-2.6.32.23/fs/Kconfig.binfmt 2010-09-23 20:14:19.000000000 -0400 32819+++ linux-2.6.32.24/fs/Kconfig.binfmt 2010-09-23 20:14:19.000000000 -0400
32811@@ -86,7 +86,7 @@ config HAVE_AOUT 32820@@ -86,7 +86,7 @@ config HAVE_AOUT
32812 32821
32813 config BINFMT_AOUT 32822 config BINFMT_AOUT
@@ -32817,9 +32826,9 @@ diff -urNp linux-2.6.32.23/fs/Kconfig.binfmt linux-2.6.32.23/fs/Kconfig.binfmt
32817 ---help--- 32826 ---help---
32818 A.out (Assembler.OUTput) is a set of formats for libraries and 32827 A.out (Assembler.OUTput) is a set of formats for libraries and
32819 executables used in the earliest versions of UNIX. Linux used 32828 executables used in the earliest versions of UNIX. Linux used
32820diff -urNp linux-2.6.32.23/fs/lockd/svc.c linux-2.6.32.23/fs/lockd/svc.c 32829diff -urNp linux-2.6.32.24/fs/lockd/svc.c linux-2.6.32.24/fs/lockd/svc.c
32821--- linux-2.6.32.23/fs/lockd/svc.c 2010-08-13 16:24:37.000000000 -0400 32830--- linux-2.6.32.24/fs/lockd/svc.c 2010-08-13 16:24:37.000000000 -0400
32822+++ linux-2.6.32.23/fs/lockd/svc.c 2010-09-04 15:54:52.000000000 -0400 32831+++ linux-2.6.32.24/fs/lockd/svc.c 2010-09-04 15:54:52.000000000 -0400
32823@@ -43,7 +43,7 @@ 32832@@ -43,7 +43,7 @@
32824 32833
32825 static struct svc_program nlmsvc_program; 32834 static struct svc_program nlmsvc_program;
@@ -32829,9 +32838,9 @@ diff -urNp linux-2.6.32.23/fs/lockd/svc.c linux-2.6.32.23/fs/lockd/svc.c
32829 EXPORT_SYMBOL_GPL(nlmsvc_ops); 32838 EXPORT_SYMBOL_GPL(nlmsvc_ops);
32830 32839
32831 static DEFINE_MUTEX(nlmsvc_mutex); 32840 static DEFINE_MUTEX(nlmsvc_mutex);
32832diff -urNp linux-2.6.32.23/fs/locks.c linux-2.6.32.23/fs/locks.c 32841diff -urNp linux-2.6.32.24/fs/locks.c linux-2.6.32.24/fs/locks.c
32833--- linux-2.6.32.23/fs/locks.c 2010-08-13 16:24:37.000000000 -0400 32842--- linux-2.6.32.24/fs/locks.c 2010-08-13 16:24:37.000000000 -0400
32834+++ linux-2.6.32.23/fs/locks.c 2010-09-04 15:54:52.000000000 -0400 32843+++ linux-2.6.32.24/fs/locks.c 2010-09-04 15:54:52.000000000 -0400
32835@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil 32844@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
32836 return; 32845 return;
32837 32846
@@ -32853,9 +32862,9 @@ diff -urNp linux-2.6.32.23/fs/locks.c linux-2.6.32.23/fs/locks.c
32853 } 32862 }
32854 32863
32855 lock_kernel(); 32864 lock_kernel();
32856diff -urNp linux-2.6.32.23/fs/namei.c linux-2.6.32.23/fs/namei.c 32865diff -urNp linux-2.6.32.24/fs/namei.c linux-2.6.32.24/fs/namei.c
32857--- linux-2.6.32.23/fs/namei.c 2010-08-13 16:24:37.000000000 -0400 32866--- linux-2.6.32.24/fs/namei.c 2010-08-13 16:24:37.000000000 -0400
32858+++ linux-2.6.32.23/fs/namei.c 2010-09-04 15:54:52.000000000 -0400 32867+++ linux-2.6.32.24/fs/namei.c 2010-09-04 15:54:52.000000000 -0400
32859@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l 32868@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l
32860 cookie = dentry->d_inode->i_op->follow_link(dentry, nd); 32869 cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
32861 error = PTR_ERR(cookie); 32870 error = PTR_ERR(cookie);
@@ -33182,9 +33191,9 @@ diff -urNp linux-2.6.32.23/fs/namei.c linux-2.6.32.23/fs/namei.c
33182 exit6: 33191 exit6:
33183 mnt_drop_write(oldnd.path.mnt); 33192 mnt_drop_write(oldnd.path.mnt);
33184 exit5: 33193 exit5:
33185diff -urNp linux-2.6.32.23/fs/namespace.c linux-2.6.32.23/fs/namespace.c 33194diff -urNp linux-2.6.32.24/fs/namespace.c linux-2.6.32.24/fs/namespace.c
33186--- linux-2.6.32.23/fs/namespace.c 2010-08-13 16:24:37.000000000 -0400 33195--- linux-2.6.32.24/fs/namespace.c 2010-08-13 16:24:37.000000000 -0400
33187+++ linux-2.6.32.23/fs/namespace.c 2010-09-04 15:54:52.000000000 -0400 33196+++ linux-2.6.32.24/fs/namespace.c 2010-09-04 15:54:52.000000000 -0400
33188@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn 33197@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
33189 if (!(sb->s_flags & MS_RDONLY)) 33198 if (!(sb->s_flags & MS_RDONLY))
33190 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); 33199 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -33245,9 +33254,9 @@ diff -urNp linux-2.6.32.23/fs/namespace.c linux-2.6.32.23/fs/namespace.c
33245 read_lock(&current->fs->lock); 33254 read_lock(&current->fs->lock);
33246 root = current->fs->root; 33255 root = current->fs->root;
33247 path_get(&current->fs->root); 33256 path_get(&current->fs->root);
33248diff -urNp linux-2.6.32.23/fs/nfs/inode.c linux-2.6.32.23/fs/nfs/inode.c 33257diff -urNp linux-2.6.32.24/fs/nfs/inode.c linux-2.6.32.24/fs/nfs/inode.c
33249--- linux-2.6.32.23/fs/nfs/inode.c 2010-08-13 16:24:37.000000000 -0400 33258--- linux-2.6.32.24/fs/nfs/inode.c 2010-08-13 16:24:37.000000000 -0400
33250+++ linux-2.6.32.23/fs/nfs/inode.c 2010-09-04 15:54:52.000000000 -0400 33259+++ linux-2.6.32.24/fs/nfs/inode.c 2010-09-04 15:54:52.000000000 -0400
33251@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st 33260@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
33252 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); 33261 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
33253 } 33262 }
@@ -33268,9 +33277,9 @@ diff -urNp linux-2.6.32.23/fs/nfs/inode.c linux-2.6.32.23/fs/nfs/inode.c
33268 } 33277 }
33269 33278
33270 void nfs_fattr_init(struct nfs_fattr *fattr) 33279 void nfs_fattr_init(struct nfs_fattr *fattr)
33271diff -urNp linux-2.6.32.23/fs/nfs/nfs4proc.c linux-2.6.32.23/fs/nfs/nfs4proc.c 33280diff -urNp linux-2.6.32.24/fs/nfs/nfs4proc.c linux-2.6.32.24/fs/nfs/nfs4proc.c
33272--- linux-2.6.32.23/fs/nfs/nfs4proc.c 2010-08-13 16:24:37.000000000 -0400 33281--- linux-2.6.32.24/fs/nfs/nfs4proc.c 2010-08-13 16:24:37.000000000 -0400
33273+++ linux-2.6.32.23/fs/nfs/nfs4proc.c 2010-09-04 15:54:52.000000000 -0400 33282+++ linux-2.6.32.24/fs/nfs/nfs4proc.c 2010-09-04 15:54:52.000000000 -0400
33274@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct 33283@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct
33275 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) 33284 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
33276 { 33285 {
@@ -33541,9 +33550,9 @@ diff -urNp linux-2.6.32.23/fs/nfs/nfs4proc.c linux-2.6.32.23/fs/nfs/nfs4proc.c
33541 int err; 33550 int err;
33542 33551
33543 err = nfs4_set_lock_state(state, fl); 33552 err = nfs4_set_lock_state(state, fl);
33544diff -urNp linux-2.6.32.23/fs/nfsd/lockd.c linux-2.6.32.23/fs/nfsd/lockd.c 33553diff -urNp linux-2.6.32.24/fs/nfsd/lockd.c linux-2.6.32.24/fs/nfsd/lockd.c
33545--- linux-2.6.32.23/fs/nfsd/lockd.c 2010-08-13 16:24:37.000000000 -0400 33554--- linux-2.6.32.24/fs/nfsd/lockd.c 2010-08-13 16:24:37.000000000 -0400
33546+++ linux-2.6.32.23/fs/nfsd/lockd.c 2010-09-04 15:54:52.000000000 -0400 33555+++ linux-2.6.32.24/fs/nfsd/lockd.c 2010-09-04 15:54:52.000000000 -0400
33547@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) 33556@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
33548 fput(filp); 33557 fput(filp);
33549 } 33558 }
@@ -33553,9 +33562,9 @@ diff -urNp linux-2.6.32.23/fs/nfsd/lockd.c linux-2.6.32.23/fs/nfsd/lockd.c
33553 .fopen = nlm_fopen, /* open file for locking */ 33562 .fopen = nlm_fopen, /* open file for locking */
33554 .fclose = nlm_fclose, /* close file */ 33563 .fclose = nlm_fclose, /* close file */
33555 }; 33564 };
33556diff -urNp linux-2.6.32.23/fs/nfsd/vfs.c linux-2.6.32.23/fs/nfsd/vfs.c 33565diff -urNp linux-2.6.32.24/fs/nfsd/vfs.c linux-2.6.32.24/fs/nfsd/vfs.c
33557--- linux-2.6.32.23/fs/nfsd/vfs.c 2010-08-13 16:24:37.000000000 -0400 33566--- linux-2.6.32.24/fs/nfsd/vfs.c 2010-08-13 16:24:37.000000000 -0400
33558+++ linux-2.6.32.23/fs/nfsd/vfs.c 2010-09-04 15:54:52.000000000 -0400 33567+++ linux-2.6.32.24/fs/nfsd/vfs.c 2010-09-04 15:54:52.000000000 -0400
33559@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st 33568@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
33560 } else { 33569 } else {
33561 oldfs = get_fs(); 33570 oldfs = get_fs();
@@ -33583,9 +33592,9 @@ diff -urNp linux-2.6.32.23/fs/nfsd/vfs.c linux-2.6.32.23/fs/nfsd/vfs.c
33583 set_fs(oldfs); 33592 set_fs(oldfs);
33584 33593
33585 if (host_err < 0) 33594 if (host_err < 0)
33586diff -urNp linux-2.6.32.23/fs/nls/nls_base.c linux-2.6.32.23/fs/nls/nls_base.c 33595diff -urNp linux-2.6.32.24/fs/nls/nls_base.c linux-2.6.32.24/fs/nls/nls_base.c
33587--- linux-2.6.32.23/fs/nls/nls_base.c 2010-08-13 16:24:37.000000000 -0400 33596--- linux-2.6.32.24/fs/nls/nls_base.c 2010-08-13 16:24:37.000000000 -0400
33588+++ linux-2.6.32.23/fs/nls/nls_base.c 2010-09-04 15:54:52.000000000 -0400 33597+++ linux-2.6.32.24/fs/nls/nls_base.c 2010-09-04 15:54:52.000000000 -0400
33589@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl 33598@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
33590 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, 33599 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
33591 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, 33600 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
@@ -33595,9 +33604,9 @@ diff -urNp linux-2.6.32.23/fs/nls/nls_base.c linux-2.6.32.23/fs/nls/nls_base.c
33595 }; 33604 };
33596 33605
33597 #define UNICODE_MAX 0x0010ffff 33606 #define UNICODE_MAX 0x0010ffff
33598diff -urNp linux-2.6.32.23/fs/ntfs/file.c linux-2.6.32.23/fs/ntfs/file.c 33607diff -urNp linux-2.6.32.24/fs/ntfs/file.c linux-2.6.32.24/fs/ntfs/file.c
33599--- linux-2.6.32.23/fs/ntfs/file.c 2010-08-13 16:24:37.000000000 -0400 33608--- linux-2.6.32.24/fs/ntfs/file.c 2010-08-13 16:24:37.000000000 -0400
33600+++ linux-2.6.32.23/fs/ntfs/file.c 2010-09-04 15:54:52.000000000 -0400 33609+++ linux-2.6.32.24/fs/ntfs/file.c 2010-09-04 15:54:52.000000000 -0400
33601@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ 33610@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
33602 #endif /* NTFS_RW */ 33611 #endif /* NTFS_RW */
33603 }; 33612 };
@@ -33607,9 +33616,9 @@ diff -urNp linux-2.6.32.23/fs/ntfs/file.c linux-2.6.32.23/fs/ntfs/file.c
33607 33616
33608-const struct inode_operations ntfs_empty_inode_ops = {}; 33617-const struct inode_operations ntfs_empty_inode_ops = {};
33609+const struct inode_operations ntfs_empty_inode_ops __read_only; 33618+const struct inode_operations ntfs_empty_inode_ops __read_only;
33610diff -urNp linux-2.6.32.23/fs/ocfs2/cluster/masklog.c linux-2.6.32.23/fs/ocfs2/cluster/masklog.c 33619diff -urNp linux-2.6.32.24/fs/ocfs2/cluster/masklog.c linux-2.6.32.24/fs/ocfs2/cluster/masklog.c
33611--- linux-2.6.32.23/fs/ocfs2/cluster/masklog.c 2010-08-13 16:24:37.000000000 -0400 33620--- linux-2.6.32.24/fs/ocfs2/cluster/masklog.c 2010-08-13 16:24:37.000000000 -0400
33612+++ linux-2.6.32.23/fs/ocfs2/cluster/masklog.c 2010-09-04 15:54:52.000000000 -0400 33621+++ linux-2.6.32.24/fs/ocfs2/cluster/masklog.c 2010-09-04 15:54:52.000000000 -0400
33613@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject 33622@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
33614 return mlog_mask_store(mlog_attr->mask, buf, count); 33623 return mlog_mask_store(mlog_attr->mask, buf, count);
33615 } 33624 }
@@ -33619,9 +33628,9 @@ diff -urNp linux-2.6.32.23/fs/ocfs2/cluster/masklog.c linux-2.6.32.23/fs/ocfs2/c
33619 .show = mlog_show, 33628 .show = mlog_show,
33620 .store = mlog_store, 33629 .store = mlog_store,
33621 }; 33630 };
33622diff -urNp linux-2.6.32.23/fs/ocfs2/localalloc.c linux-2.6.32.23/fs/ocfs2/localalloc.c 33631diff -urNp linux-2.6.32.24/fs/ocfs2/localalloc.c linux-2.6.32.24/fs/ocfs2/localalloc.c
33623--- linux-2.6.32.23/fs/ocfs2/localalloc.c 2010-08-13 16:24:37.000000000 -0400 33632--- linux-2.6.32.24/fs/ocfs2/localalloc.c 2010-08-13 16:24:37.000000000 -0400
33624+++ linux-2.6.32.23/fs/ocfs2/localalloc.c 2010-09-04 15:54:52.000000000 -0400 33633+++ linux-2.6.32.24/fs/ocfs2/localalloc.c 2010-09-04 15:54:52.000000000 -0400
33625@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo 33634@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
33626 goto bail; 33635 goto bail;
33627 } 33636 }
@@ -33631,9 +33640,9 @@ diff -urNp linux-2.6.32.23/fs/ocfs2/localalloc.c linux-2.6.32.23/fs/ocfs2/locala
33631 33640
33632 status = 0; 33641 status = 0;
33633 bail: 33642 bail:
33634diff -urNp linux-2.6.32.23/fs/ocfs2/ocfs2.h linux-2.6.32.23/fs/ocfs2/ocfs2.h 33643diff -urNp linux-2.6.32.24/fs/ocfs2/ocfs2.h linux-2.6.32.24/fs/ocfs2/ocfs2.h
33635--- linux-2.6.32.23/fs/ocfs2/ocfs2.h 2010-08-13 16:24:37.000000000 -0400 33644--- linux-2.6.32.24/fs/ocfs2/ocfs2.h 2010-08-13 16:24:37.000000000 -0400
33636+++ linux-2.6.32.23/fs/ocfs2/ocfs2.h 2010-09-04 15:54:52.000000000 -0400 33645+++ linux-2.6.32.24/fs/ocfs2/ocfs2.h 2010-09-04 15:54:52.000000000 -0400
33637@@ -217,11 +217,11 @@ enum ocfs2_vol_state 33646@@ -217,11 +217,11 @@ enum ocfs2_vol_state
33638 33647
33639 struct ocfs2_alloc_stats 33648 struct ocfs2_alloc_stats
@@ -33651,9 +33660,9 @@ diff -urNp linux-2.6.32.23/fs/ocfs2/ocfs2.h linux-2.6.32.23/fs/ocfs2/ocfs2.h
33651 }; 33660 };
33652 33661
33653 enum ocfs2_local_alloc_state 33662 enum ocfs2_local_alloc_state
33654diff -urNp linux-2.6.32.23/fs/ocfs2/suballoc.c linux-2.6.32.23/fs/ocfs2/suballoc.c 33663diff -urNp linux-2.6.32.24/fs/ocfs2/suballoc.c linux-2.6.32.24/fs/ocfs2/suballoc.c
33655--- linux-2.6.32.23/fs/ocfs2/suballoc.c 2010-08-13 16:24:37.000000000 -0400 33664--- linux-2.6.32.24/fs/ocfs2/suballoc.c 2010-08-13 16:24:37.000000000 -0400
33656+++ linux-2.6.32.23/fs/ocfs2/suballoc.c 2010-09-04 15:54:52.000000000 -0400 33665+++ linux-2.6.32.24/fs/ocfs2/suballoc.c 2010-09-04 15:54:52.000000000 -0400
33657@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s 33666@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
33658 mlog_errno(status); 33667 mlog_errno(status);
33659 goto bail; 33668 goto bail;
@@ -33699,9 +33708,9 @@ diff -urNp linux-2.6.32.23/fs/ocfs2/suballoc.c linux-2.6.32.23/fs/ocfs2/suballoc
33699 } 33708 }
33700 } 33709 }
33701 if (status < 0) { 33710 if (status < 0) {
33702diff -urNp linux-2.6.32.23/fs/ocfs2/super.c linux-2.6.32.23/fs/ocfs2/super.c 33711diff -urNp linux-2.6.32.24/fs/ocfs2/super.c linux-2.6.32.24/fs/ocfs2/super.c
33703--- linux-2.6.32.23/fs/ocfs2/super.c 2010-08-13 16:24:37.000000000 -0400 33712--- linux-2.6.32.24/fs/ocfs2/super.c 2010-08-13 16:24:37.000000000 -0400
33704+++ linux-2.6.32.23/fs/ocfs2/super.c 2010-09-04 15:54:52.000000000 -0400 33713+++ linux-2.6.32.24/fs/ocfs2/super.c 2010-09-04 15:54:52.000000000 -0400
33705@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s 33714@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
33706 "%10s => GlobalAllocs: %d LocalAllocs: %d " 33715 "%10s => GlobalAllocs: %d LocalAllocs: %d "
33707 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", 33716 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
@@ -33736,9 +33745,9 @@ diff -urNp linux-2.6.32.23/fs/ocfs2/super.c linux-2.6.32.23/fs/ocfs2/super.c
33736 33745
33737 /* Copy the blockcheck stats from the superblock probe */ 33746 /* Copy the blockcheck stats from the superblock probe */
33738 osb->osb_ecc_stats = *stats; 33747 osb->osb_ecc_stats = *stats;
33739diff -urNp linux-2.6.32.23/fs/open.c linux-2.6.32.23/fs/open.c 33748diff -urNp linux-2.6.32.24/fs/open.c linux-2.6.32.24/fs/open.c
33740--- linux-2.6.32.23/fs/open.c 2010-08-13 16:24:37.000000000 -0400 33749--- linux-2.6.32.24/fs/open.c 2010-08-13 16:24:37.000000000 -0400
33741+++ linux-2.6.32.23/fs/open.c 2010-09-04 15:54:52.000000000 -0400 33750+++ linux-2.6.32.24/fs/open.c 2010-09-04 15:54:52.000000000 -0400
33742@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l 33751@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l
33743 if (length < 0) 33752 if (length < 0)
33744 return -EINVAL; 33753 return -EINVAL;
@@ -33912,9 +33921,9 @@ diff -urNp linux-2.6.32.23/fs/open.c linux-2.6.32.23/fs/open.c
33912 mnt_drop_write(file->f_path.mnt); 33921 mnt_drop_write(file->f_path.mnt);
33913 out_fput: 33922 out_fput:
33914 fput(file); 33923 fput(file);
33915diff -urNp linux-2.6.32.23/fs/pipe.c linux-2.6.32.23/fs/pipe.c 33924diff -urNp linux-2.6.32.24/fs/pipe.c linux-2.6.32.24/fs/pipe.c
33916--- linux-2.6.32.23/fs/pipe.c 2010-08-13 16:24:37.000000000 -0400 33925--- linux-2.6.32.24/fs/pipe.c 2010-08-13 16:24:37.000000000 -0400
33917+++ linux-2.6.32.23/fs/pipe.c 2010-09-04 15:54:52.000000000 -0400 33926+++ linux-2.6.32.24/fs/pipe.c 2010-09-04 15:54:52.000000000 -0400
33918@@ -401,9 +401,9 @@ redo: 33927@@ -401,9 +401,9 @@ redo:
33919 } 33928 }
33920 if (bufs) /* More to do? */ 33929 if (bufs) /* More to do? */
@@ -34038,9 +34047,9 @@ diff -urNp linux-2.6.32.23/fs/pipe.c linux-2.6.32.23/fs/pipe.c
34038 inode->i_fop = &rdwr_pipefifo_fops; 34047 inode->i_fop = &rdwr_pipefifo_fops;
34039 34048
34040 /* 34049 /*
34041diff -urNp linux-2.6.32.23/fs/proc/array.c linux-2.6.32.23/fs/proc/array.c 34050diff -urNp linux-2.6.32.24/fs/proc/array.c linux-2.6.32.24/fs/proc/array.c
34042--- linux-2.6.32.23/fs/proc/array.c 2010-08-13 16:24:37.000000000 -0400 34051--- linux-2.6.32.24/fs/proc/array.c 2010-08-13 16:24:37.000000000 -0400
34043+++ linux-2.6.32.23/fs/proc/array.c 2010-09-04 15:54:52.000000000 -0400 34052+++ linux-2.6.32.24/fs/proc/array.c 2010-09-04 15:54:52.000000000 -0400
34044@@ -321,6 +321,21 @@ static inline void task_context_switch_c 34053@@ -321,6 +321,21 @@ static inline void task_context_switch_c
34045 p->nivcsw); 34054 p->nivcsw);
34046 } 34055 }
@@ -34131,9 +34140,9 @@ diff -urNp linux-2.6.32.23/fs/proc/array.c linux-2.6.32.23/fs/proc/array.c
34131+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); 34140+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
34132+} 34141+}
34133+#endif 34142+#endif
34134diff -urNp linux-2.6.32.23/fs/proc/base.c linux-2.6.32.23/fs/proc/base.c 34143diff -urNp linux-2.6.32.24/fs/proc/base.c linux-2.6.32.24/fs/proc/base.c
34135--- linux-2.6.32.23/fs/proc/base.c 2010-08-13 16:24:37.000000000 -0400 34144--- linux-2.6.32.24/fs/proc/base.c 2010-08-13 16:24:37.000000000 -0400
34136+++ linux-2.6.32.23/fs/proc/base.c 2010-09-22 18:44:37.000000000 -0400 34145+++ linux-2.6.32.24/fs/proc/base.c 2010-09-22 18:44:37.000000000 -0400
34137@@ -102,6 +102,22 @@ struct pid_entry { 34146@@ -102,6 +102,22 @@ struct pid_entry {
34138 union proc_op op; 34147 union proc_op op;
34139 }; 34148 };
@@ -34506,9 +34515,9 @@ diff -urNp linux-2.6.32.23/fs/proc/base.c linux-2.6.32.23/fs/proc/base.c
34506 ONE("stack", S_IRUSR, proc_pid_stack), 34515 ONE("stack", S_IRUSR, proc_pid_stack),
34507 #endif 34516 #endif
34508 #ifdef CONFIG_SCHEDSTATS 34517 #ifdef CONFIG_SCHEDSTATS
34509diff -urNp linux-2.6.32.23/fs/proc/cmdline.c linux-2.6.32.23/fs/proc/cmdline.c 34518diff -urNp linux-2.6.32.24/fs/proc/cmdline.c linux-2.6.32.24/fs/proc/cmdline.c
34510--- linux-2.6.32.23/fs/proc/cmdline.c 2010-08-13 16:24:37.000000000 -0400 34519--- linux-2.6.32.24/fs/proc/cmdline.c 2010-08-13 16:24:37.000000000 -0400
34511+++ linux-2.6.32.23/fs/proc/cmdline.c 2010-09-04 15:54:52.000000000 -0400 34520+++ linux-2.6.32.24/fs/proc/cmdline.c 2010-09-04 15:54:52.000000000 -0400
34512@@ -23,7 +23,11 @@ static const struct file_operations cmdl 34521@@ -23,7 +23,11 @@ static const struct file_operations cmdl
34513 34522
34514 static int __init proc_cmdline_init(void) 34523 static int __init proc_cmdline_init(void)
@@ -34521,9 +34530,9 @@ diff -urNp linux-2.6.32.23/fs/proc/cmdline.c linux-2.6.32.23/fs/proc/cmdline.c
34521 return 0; 34530 return 0;
34522 } 34531 }
34523 module_init(proc_cmdline_init); 34532 module_init(proc_cmdline_init);
34524diff -urNp linux-2.6.32.23/fs/proc/devices.c linux-2.6.32.23/fs/proc/devices.c 34533diff -urNp linux-2.6.32.24/fs/proc/devices.c linux-2.6.32.24/fs/proc/devices.c
34525--- linux-2.6.32.23/fs/proc/devices.c 2010-08-13 16:24:37.000000000 -0400 34534--- linux-2.6.32.24/fs/proc/devices.c 2010-08-13 16:24:37.000000000 -0400
34526+++ linux-2.6.32.23/fs/proc/devices.c 2010-09-04 15:54:52.000000000 -0400 34535+++ linux-2.6.32.24/fs/proc/devices.c 2010-09-04 15:54:52.000000000 -0400
34527@@ -64,7 +64,11 @@ static const struct file_operations proc 34536@@ -64,7 +64,11 @@ static const struct file_operations proc
34528 34537
34529 static int __init proc_devices_init(void) 34538 static int __init proc_devices_init(void)
@@ -34536,9 +34545,9 @@ diff -urNp linux-2.6.32.23/fs/proc/devices.c linux-2.6.32.23/fs/proc/devices.c
34536 return 0; 34545 return 0;
34537 } 34546 }
34538 module_init(proc_devices_init); 34547 module_init(proc_devices_init);
34539diff -urNp linux-2.6.32.23/fs/proc/inode.c linux-2.6.32.23/fs/proc/inode.c 34548diff -urNp linux-2.6.32.24/fs/proc/inode.c linux-2.6.32.24/fs/proc/inode.c
34540--- linux-2.6.32.23/fs/proc/inode.c 2010-08-13 16:24:37.000000000 -0400 34549--- linux-2.6.32.24/fs/proc/inode.c 2010-08-13 16:24:37.000000000 -0400
34541+++ linux-2.6.32.23/fs/proc/inode.c 2010-09-04 15:54:52.000000000 -0400 34550+++ linux-2.6.32.24/fs/proc/inode.c 2010-09-04 15:54:52.000000000 -0400
34542@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe 34551@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
34543 if (de->mode) { 34552 if (de->mode) {
34544 inode->i_mode = de->mode; 34553 inode->i_mode = de->mode;
@@ -34551,9 +34560,9 @@ diff -urNp linux-2.6.32.23/fs/proc/inode.c linux-2.6.32.23/fs/proc/inode.c
34551 } 34560 }
34552 if (de->size) 34561 if (de->size)
34553 inode->i_size = de->size; 34562 inode->i_size = de->size;
34554diff -urNp linux-2.6.32.23/fs/proc/internal.h linux-2.6.32.23/fs/proc/internal.h 34563diff -urNp linux-2.6.32.24/fs/proc/internal.h linux-2.6.32.24/fs/proc/internal.h
34555--- linux-2.6.32.23/fs/proc/internal.h 2010-08-13 16:24:37.000000000 -0400 34564--- linux-2.6.32.24/fs/proc/internal.h 2010-08-13 16:24:37.000000000 -0400
34556+++ linux-2.6.32.23/fs/proc/internal.h 2010-09-04 15:54:52.000000000 -0400 34565+++ linux-2.6.32.24/fs/proc/internal.h 2010-09-04 15:54:52.000000000 -0400
34557@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi 34566@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
34558 struct pid *pid, struct task_struct *task); 34567 struct pid *pid, struct task_struct *task);
34559 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, 34568 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -34564,9 +34573,9 @@ diff -urNp linux-2.6.32.23/fs/proc/internal.h linux-2.6.32.23/fs/proc/internal.h
34564 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); 34573 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
34565 34574
34566 extern const struct file_operations proc_maps_operations; 34575 extern const struct file_operations proc_maps_operations;
34567diff -urNp linux-2.6.32.23/fs/proc/Kconfig linux-2.6.32.23/fs/proc/Kconfig 34576diff -urNp linux-2.6.32.24/fs/proc/Kconfig linux-2.6.32.24/fs/proc/Kconfig
34568--- linux-2.6.32.23/fs/proc/Kconfig 2010-08-13 16:24:37.000000000 -0400 34577--- linux-2.6.32.24/fs/proc/Kconfig 2010-08-13 16:24:37.000000000 -0400
34569+++ linux-2.6.32.23/fs/proc/Kconfig 2010-09-04 15:54:52.000000000 -0400 34578+++ linux-2.6.32.24/fs/proc/Kconfig 2010-09-04 15:54:52.000000000 -0400
34570@@ -30,12 +30,12 @@ config PROC_FS 34579@@ -30,12 +30,12 @@ config PROC_FS
34571 34580
34572 config PROC_KCORE 34581 config PROC_KCORE
@@ -34594,9 +34603,9 @@ diff -urNp linux-2.6.32.23/fs/proc/Kconfig linux-2.6.32.23/fs/proc/Kconfig
34594 bool "Enable /proc page monitoring" if EMBEDDED 34603 bool "Enable /proc page monitoring" if EMBEDDED
34595 help 34604 help
34596 Various /proc files exist to monitor process memory utilization: 34605 Various /proc files exist to monitor process memory utilization:
34597diff -urNp linux-2.6.32.23/fs/proc/kcore.c linux-2.6.32.23/fs/proc/kcore.c 34606diff -urNp linux-2.6.32.24/fs/proc/kcore.c linux-2.6.32.24/fs/proc/kcore.c
34598--- linux-2.6.32.23/fs/proc/kcore.c 2010-08-13 16:24:37.000000000 -0400 34607--- linux-2.6.32.24/fs/proc/kcore.c 2010-08-13 16:24:37.000000000 -0400
34599+++ linux-2.6.32.23/fs/proc/kcore.c 2010-09-04 15:54:52.000000000 -0400 34608+++ linux-2.6.32.24/fs/proc/kcore.c 2010-09-04 15:54:52.000000000 -0400
34600@@ -477,9 +477,10 @@ read_kcore(struct file *file, char __use 34609@@ -477,9 +477,10 @@ read_kcore(struct file *file, char __use
34601 * the addresses in the elf_phdr on our list. 34610 * the addresses in the elf_phdr on our list.
34602 */ 34611 */
@@ -34650,9 +34659,9 @@ diff -urNp linux-2.6.32.23/fs/proc/kcore.c linux-2.6.32.23/fs/proc/kcore.c
34650 if (!capable(CAP_SYS_RAWIO)) 34659 if (!capable(CAP_SYS_RAWIO))
34651 return -EPERM; 34660 return -EPERM;
34652 if (kcore_need_update) 34661 if (kcore_need_update)
34653diff -urNp linux-2.6.32.23/fs/proc/meminfo.c linux-2.6.32.23/fs/proc/meminfo.c 34662diff -urNp linux-2.6.32.24/fs/proc/meminfo.c linux-2.6.32.24/fs/proc/meminfo.c
34654--- linux-2.6.32.23/fs/proc/meminfo.c 2010-08-13 16:24:37.000000000 -0400 34663--- linux-2.6.32.24/fs/proc/meminfo.c 2010-08-13 16:24:37.000000000 -0400
34655+++ linux-2.6.32.23/fs/proc/meminfo.c 2010-09-04 15:54:52.000000000 -0400 34664+++ linux-2.6.32.24/fs/proc/meminfo.c 2010-09-04 15:54:52.000000000 -0400
34656@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ 34665@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
34657 vmi.used >> 10, 34666 vmi.used >> 10,
34658 vmi.largest_chunk >> 10 34667 vmi.largest_chunk >> 10
@@ -34662,9 +34671,9 @@ diff -urNp linux-2.6.32.23/fs/proc/meminfo.c linux-2.6.32.23/fs/proc/meminfo.c
34662 #endif 34671 #endif
34663 ); 34672 );
34664 34673
34665diff -urNp linux-2.6.32.23/fs/proc/nommu.c linux-2.6.32.23/fs/proc/nommu.c 34674diff -urNp linux-2.6.32.24/fs/proc/nommu.c linux-2.6.32.24/fs/proc/nommu.c
34666--- linux-2.6.32.23/fs/proc/nommu.c 2010-08-13 16:24:37.000000000 -0400 34675--- linux-2.6.32.24/fs/proc/nommu.c 2010-08-13 16:24:37.000000000 -0400
34667+++ linux-2.6.32.23/fs/proc/nommu.c 2010-09-04 15:54:52.000000000 -0400 34676+++ linux-2.6.32.24/fs/proc/nommu.c 2010-09-04 15:54:52.000000000 -0400
34668@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ 34677@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
34669 if (len < 1) 34678 if (len < 1)
34670 len = 1; 34679 len = 1;
@@ -34674,9 +34683,9 @@ diff -urNp linux-2.6.32.23/fs/proc/nommu.c linux-2.6.32.23/fs/proc/nommu.c
34674 } 34683 }
34675 34684
34676 seq_putc(m, '\n'); 34685 seq_putc(m, '\n');
34677diff -urNp linux-2.6.32.23/fs/proc/proc_net.c linux-2.6.32.23/fs/proc/proc_net.c 34686diff -urNp linux-2.6.32.24/fs/proc/proc_net.c linux-2.6.32.24/fs/proc/proc_net.c
34678--- linux-2.6.32.23/fs/proc/proc_net.c 2010-08-13 16:24:37.000000000 -0400 34687--- linux-2.6.32.24/fs/proc/proc_net.c 2010-08-13 16:24:37.000000000 -0400
34679+++ linux-2.6.32.23/fs/proc/proc_net.c 2010-09-04 15:54:52.000000000 -0400 34688+++ linux-2.6.32.24/fs/proc/proc_net.c 2010-09-04 15:54:52.000000000 -0400
34680@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str 34689@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
34681 struct task_struct *task; 34690 struct task_struct *task;
34682 struct nsproxy *ns; 34691 struct nsproxy *ns;
@@ -34695,9 +34704,9 @@ diff -urNp linux-2.6.32.23/fs/proc/proc_net.c linux-2.6.32.23/fs/proc/proc_net.c
34695 34704
34696 rcu_read_lock(); 34705 rcu_read_lock();
34697 task = pid_task(proc_pid(dir), PIDTYPE_PID); 34706 task = pid_task(proc_pid(dir), PIDTYPE_PID);
34698diff -urNp linux-2.6.32.23/fs/proc/proc_sysctl.c linux-2.6.32.23/fs/proc/proc_sysctl.c 34707diff -urNp linux-2.6.32.24/fs/proc/proc_sysctl.c linux-2.6.32.24/fs/proc/proc_sysctl.c
34699--- linux-2.6.32.23/fs/proc/proc_sysctl.c 2010-08-13 16:24:37.000000000 -0400 34708--- linux-2.6.32.24/fs/proc/proc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
34700+++ linux-2.6.32.23/fs/proc/proc_sysctl.c 2010-09-04 15:54:52.000000000 -0400 34709+++ linux-2.6.32.24/fs/proc/proc_sysctl.c 2010-09-04 15:54:52.000000000 -0400
34701@@ -7,6 +7,8 @@ 34710@@ -7,6 +7,8 @@
34702 #include <linux/security.h> 34711 #include <linux/security.h>
34703 #include "internal.h" 34712 #include "internal.h"
@@ -34737,9 +34746,9 @@ diff -urNp linux-2.6.32.23/fs/proc/proc_sysctl.c linux-2.6.32.23/fs/proc/proc_sy
34737 generic_fillattr(inode, stat); 34746 generic_fillattr(inode, stat);
34738 if (table) 34747 if (table)
34739 stat->mode = (stat->mode & S_IFMT) | table->mode; 34748 stat->mode = (stat->mode & S_IFMT) | table->mode;
34740diff -urNp linux-2.6.32.23/fs/proc/root.c linux-2.6.32.23/fs/proc/root.c 34749diff -urNp linux-2.6.32.24/fs/proc/root.c linux-2.6.32.24/fs/proc/root.c
34741--- linux-2.6.32.23/fs/proc/root.c 2010-08-13 16:24:37.000000000 -0400 34750--- linux-2.6.32.24/fs/proc/root.c 2010-08-13 16:24:37.000000000 -0400
34742+++ linux-2.6.32.23/fs/proc/root.c 2010-09-04 15:54:52.000000000 -0400 34751+++ linux-2.6.32.24/fs/proc/root.c 2010-09-04 15:54:52.000000000 -0400
34743@@ -134,7 +134,15 @@ void __init proc_root_init(void) 34752@@ -134,7 +134,15 @@ void __init proc_root_init(void)
34744 #ifdef CONFIG_PROC_DEVICETREE 34753 #ifdef CONFIG_PROC_DEVICETREE
34745 proc_device_tree_init(); 34754 proc_device_tree_init();
@@ -34756,9 +34765,9 @@ diff -urNp linux-2.6.32.23/fs/proc/root.c linux-2.6.32.23/fs/proc/root.c
34756 proc_sys_init(); 34765 proc_sys_init();
34757 } 34766 }
34758 34767
34759diff -urNp linux-2.6.32.23/fs/proc/task_mmu.c linux-2.6.32.23/fs/proc/task_mmu.c 34768diff -urNp linux-2.6.32.24/fs/proc/task_mmu.c linux-2.6.32.24/fs/proc/task_mmu.c
34760--- linux-2.6.32.23/fs/proc/task_mmu.c 2010-08-29 21:08:16.000000000 -0400 34769--- linux-2.6.32.24/fs/proc/task_mmu.c 2010-08-29 21:08:16.000000000 -0400
34761+++ linux-2.6.32.23/fs/proc/task_mmu.c 2010-09-17 18:40:06.000000000 -0400 34770+++ linux-2.6.32.24/fs/proc/task_mmu.c 2010-09-17 18:40:06.000000000 -0400
34762@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct 34771@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
34763 "VmStk:\t%8lu kB\n" 34772 "VmStk:\t%8lu kB\n"
34764 "VmExe:\t%8lu kB\n" 34773 "VmExe:\t%8lu kB\n"
@@ -34894,9 +34903,9 @@ diff -urNp linux-2.6.32.23/fs/proc/task_mmu.c linux-2.6.32.23/fs/proc/task_mmu.c
34894 mss.resident >> 10, 34903 mss.resident >> 10,
34895 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), 34904 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
34896 mss.shared_clean >> 10, 34905 mss.shared_clean >> 10,
34897diff -urNp linux-2.6.32.23/fs/proc/task_nommu.c linux-2.6.32.23/fs/proc/task_nommu.c 34906diff -urNp linux-2.6.32.24/fs/proc/task_nommu.c linux-2.6.32.24/fs/proc/task_nommu.c
34898--- linux-2.6.32.23/fs/proc/task_nommu.c 2010-08-13 16:24:37.000000000 -0400 34907--- linux-2.6.32.24/fs/proc/task_nommu.c 2010-08-13 16:24:37.000000000 -0400
34899+++ linux-2.6.32.23/fs/proc/task_nommu.c 2010-09-04 15:54:52.000000000 -0400 34908+++ linux-2.6.32.24/fs/proc/task_nommu.c 2010-09-04 15:54:52.000000000 -0400
34900@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct 34909@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
34901 else 34910 else
34902 bytes += kobjsize(mm); 34911 bytes += kobjsize(mm);
@@ -34915,9 +34924,9 @@ diff -urNp linux-2.6.32.23/fs/proc/task_nommu.c linux-2.6.32.23/fs/proc/task_nom
34915 } 34924 }
34916 34925
34917 seq_putc(m, '\n'); 34926 seq_putc(m, '\n');
34918diff -urNp linux-2.6.32.23/fs/readdir.c linux-2.6.32.23/fs/readdir.c 34927diff -urNp linux-2.6.32.24/fs/readdir.c linux-2.6.32.24/fs/readdir.c
34919--- linux-2.6.32.23/fs/readdir.c 2010-08-13 16:24:37.000000000 -0400 34928--- linux-2.6.32.24/fs/readdir.c 2010-08-13 16:24:37.000000000 -0400
34920+++ linux-2.6.32.23/fs/readdir.c 2010-09-04 15:54:52.000000000 -0400 34929+++ linux-2.6.32.24/fs/readdir.c 2010-09-04 15:54:52.000000000 -0400
34921@@ -16,6 +16,7 @@ 34930@@ -16,6 +16,7 @@
34922 #include <linux/security.h> 34931 #include <linux/security.h>
34923 #include <linux/syscalls.h> 34932 #include <linux/syscalls.h>
@@ -35007,9 +35016,9 @@ diff -urNp linux-2.6.32.23/fs/readdir.c linux-2.6.32.23/fs/readdir.c
35007 buf.count = count; 35016 buf.count = count;
35008 buf.error = 0; 35017 buf.error = 0;
35009 35018
35010diff -urNp linux-2.6.32.23/fs/reiserfs/do_balan.c linux-2.6.32.23/fs/reiserfs/do_balan.c 35019diff -urNp linux-2.6.32.24/fs/reiserfs/do_balan.c linux-2.6.32.24/fs/reiserfs/do_balan.c
35011--- linux-2.6.32.23/fs/reiserfs/do_balan.c 2010-08-13 16:24:37.000000000 -0400 35020--- linux-2.6.32.24/fs/reiserfs/do_balan.c 2010-08-13 16:24:37.000000000 -0400
35012+++ linux-2.6.32.23/fs/reiserfs/do_balan.c 2010-09-04 15:54:52.000000000 -0400 35021+++ linux-2.6.32.24/fs/reiserfs/do_balan.c 2010-09-04 15:54:52.000000000 -0400
35013@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, 35022@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
35014 return; 35023 return;
35015 } 35024 }
@@ -35019,9 +35028,9 @@ diff -urNp linux-2.6.32.23/fs/reiserfs/do_balan.c linux-2.6.32.23/fs/reiserfs/do
35019 do_balance_starts(tb); 35028 do_balance_starts(tb);
35020 35029
35021 /* balance leaf returns 0 except if combining L R and S into 35030 /* balance leaf returns 0 except if combining L R and S into
35022diff -urNp linux-2.6.32.23/fs/reiserfs/item_ops.c linux-2.6.32.23/fs/reiserfs/item_ops.c 35031diff -urNp linux-2.6.32.24/fs/reiserfs/item_ops.c linux-2.6.32.24/fs/reiserfs/item_ops.c
35023--- linux-2.6.32.23/fs/reiserfs/item_ops.c 2010-08-13 16:24:37.000000000 -0400 35032--- linux-2.6.32.24/fs/reiserfs/item_ops.c 2010-08-13 16:24:37.000000000 -0400
35024+++ linux-2.6.32.23/fs/reiserfs/item_ops.c 2010-09-04 15:54:52.000000000 -0400 35033+++ linux-2.6.32.24/fs/reiserfs/item_ops.c 2010-09-04 15:54:52.000000000 -0400
35025@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i 35034@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
35026 vi->vi_index, vi->vi_type, vi->vi_ih); 35035 vi->vi_index, vi->vi_type, vi->vi_ih);
35027 } 35036 }
@@ -35076,9 +35085,9 @@ diff -urNp linux-2.6.32.23/fs/reiserfs/item_ops.c linux-2.6.32.23/fs/reiserfs/it
35076 &stat_data_ops, 35085 &stat_data_ops,
35077 &indirect_ops, 35086 &indirect_ops,
35078 &direct_ops, 35087 &direct_ops,
35079diff -urNp linux-2.6.32.23/fs/reiserfs/procfs.c linux-2.6.32.23/fs/reiserfs/procfs.c 35088diff -urNp linux-2.6.32.24/fs/reiserfs/procfs.c linux-2.6.32.24/fs/reiserfs/procfs.c
35080--- linux-2.6.32.23/fs/reiserfs/procfs.c 2010-08-13 16:24:37.000000000 -0400 35089--- linux-2.6.32.24/fs/reiserfs/procfs.c 2010-08-13 16:24:37.000000000 -0400
35081+++ linux-2.6.32.23/fs/reiserfs/procfs.c 2010-09-04 15:54:52.000000000 -0400 35090+++ linux-2.6.32.24/fs/reiserfs/procfs.c 2010-09-04 15:54:52.000000000 -0400
35082@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m 35091@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
35083 "SMALL_TAILS " : "NO_TAILS ", 35092 "SMALL_TAILS " : "NO_TAILS ",
35084 replay_only(sb) ? "REPLAY_ONLY " : "", 35093 replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -35088,9 +35097,9 @@ diff -urNp linux-2.6.32.23/fs/reiserfs/procfs.c linux-2.6.32.23/fs/reiserfs/proc
35088 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), 35097 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
35089 SF(s_do_balance), SF(s_unneeded_left_neighbor), 35098 SF(s_do_balance), SF(s_unneeded_left_neighbor),
35090 SF(s_good_search_by_key_reada), SF(s_bmaps), 35099 SF(s_good_search_by_key_reada), SF(s_bmaps),
35091diff -urNp linux-2.6.32.23/fs/select.c linux-2.6.32.23/fs/select.c 35100diff -urNp linux-2.6.32.24/fs/select.c linux-2.6.32.24/fs/select.c
35092--- linux-2.6.32.23/fs/select.c 2010-08-13 16:24:37.000000000 -0400 35101--- linux-2.6.32.24/fs/select.c 2010-08-13 16:24:37.000000000 -0400
35093+++ linux-2.6.32.23/fs/select.c 2010-09-04 15:54:52.000000000 -0400 35102+++ linux-2.6.32.24/fs/select.c 2010-09-04 15:54:52.000000000 -0400
35094@@ -20,6 +20,7 @@ 35103@@ -20,6 +20,7 @@
35095 #include <linux/module.h> 35104 #include <linux/module.h>
35096 #include <linux/slab.h> 35105 #include <linux/slab.h>
@@ -35107,9 +35116,9 @@ diff -urNp linux-2.6.32.23/fs/select.c linux-2.6.32.23/fs/select.c
35107 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 35116 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
35108 return -EINVAL; 35117 return -EINVAL;
35109 35118
35110diff -urNp linux-2.6.32.23/fs/seq_file.c linux-2.6.32.23/fs/seq_file.c 35119diff -urNp linux-2.6.32.24/fs/seq_file.c linux-2.6.32.24/fs/seq_file.c
35111--- linux-2.6.32.23/fs/seq_file.c 2010-08-13 16:24:37.000000000 -0400 35120--- linux-2.6.32.24/fs/seq_file.c 2010-08-13 16:24:37.000000000 -0400
35112+++ linux-2.6.32.23/fs/seq_file.c 2010-09-04 15:54:52.000000000 -0400 35121+++ linux-2.6.32.24/fs/seq_file.c 2010-09-04 15:54:52.000000000 -0400
35113@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 35122@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
35114 return 0; 35123 return 0;
35115 } 35124 }
@@ -35150,9 +35159,9 @@ diff -urNp linux-2.6.32.23/fs/seq_file.c linux-2.6.32.23/fs/seq_file.c
35150 if (!m->buf) 35159 if (!m->buf)
35151 goto Enomem; 35160 goto Enomem;
35152 m->count = 0; 35161 m->count = 0;
35153diff -urNp linux-2.6.32.23/fs/smbfs/symlink.c linux-2.6.32.23/fs/smbfs/symlink.c 35162diff -urNp linux-2.6.32.24/fs/smbfs/symlink.c linux-2.6.32.24/fs/smbfs/symlink.c
35154--- linux-2.6.32.23/fs/smbfs/symlink.c 2010-08-13 16:24:37.000000000 -0400 35163--- linux-2.6.32.24/fs/smbfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
35155+++ linux-2.6.32.23/fs/smbfs/symlink.c 2010-09-04 15:54:52.000000000 -0400 35164+++ linux-2.6.32.24/fs/smbfs/symlink.c 2010-09-04 15:54:52.000000000 -0400
35156@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent 35165@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
35157 35166
35158 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 35167 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -35162,9 +35171,9 @@ diff -urNp linux-2.6.32.23/fs/smbfs/symlink.c linux-2.6.32.23/fs/smbfs/symlink.c
35162 if (!IS_ERR(s)) 35171 if (!IS_ERR(s))
35163 __putname(s); 35172 __putname(s);
35164 } 35173 }
35165diff -urNp linux-2.6.32.23/fs/splice.c linux-2.6.32.23/fs/splice.c 35174diff -urNp linux-2.6.32.24/fs/splice.c linux-2.6.32.24/fs/splice.c
35166--- linux-2.6.32.23/fs/splice.c 2010-08-13 16:24:37.000000000 -0400 35175--- linux-2.6.32.24/fs/splice.c 2010-08-13 16:24:37.000000000 -0400
35167+++ linux-2.6.32.23/fs/splice.c 2010-09-04 15:54:52.000000000 -0400 35176+++ linux-2.6.32.24/fs/splice.c 2010-09-04 15:54:52.000000000 -0400
35168@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode 35177@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
35169 pipe_lock(pipe); 35178 pipe_lock(pipe);
35170 35179
@@ -35303,9 +35312,9 @@ diff -urNp linux-2.6.32.23/fs/splice.c linux-2.6.32.23/fs/splice.c
35303 ret = -EAGAIN; 35312 ret = -EAGAIN;
35304 35313
35305 pipe_unlock(ipipe); 35314 pipe_unlock(ipipe);
35306diff -urNp linux-2.6.32.23/fs/sysfs/file.c linux-2.6.32.23/fs/sysfs/file.c 35315diff -urNp linux-2.6.32.24/fs/sysfs/file.c linux-2.6.32.24/fs/sysfs/file.c
35307--- linux-2.6.32.23/fs/sysfs/file.c 2010-09-20 17:26:42.000000000 -0400 35316--- linux-2.6.32.24/fs/sysfs/file.c 2010-09-20 17:26:42.000000000 -0400
35308+++ linux-2.6.32.23/fs/sysfs/file.c 2010-09-20 17:27:14.000000000 -0400 35317+++ linux-2.6.32.24/fs/sysfs/file.c 2010-09-20 17:27:14.000000000 -0400
35309@@ -53,7 +53,7 @@ struct sysfs_buffer { 35318@@ -53,7 +53,7 @@ struct sysfs_buffer {
35310 size_t count; 35319 size_t count;
35311 loff_t pos; 35320 loff_t pos;
@@ -35342,9 +35351,9 @@ diff -urNp linux-2.6.32.23/fs/sysfs/file.c linux-2.6.32.23/fs/sysfs/file.c
35342 int error = -EACCES; 35351 int error = -EACCES;
35343 char *p; 35352 char *p;
35344 35353
35345diff -urNp linux-2.6.32.23/fs/sysfs/symlink.c linux-2.6.32.23/fs/sysfs/symlink.c 35354diff -urNp linux-2.6.32.24/fs/sysfs/symlink.c linux-2.6.32.24/fs/sysfs/symlink.c
35346--- linux-2.6.32.23/fs/sysfs/symlink.c 2010-08-13 16:24:37.000000000 -0400 35355--- linux-2.6.32.24/fs/sysfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
35347+++ linux-2.6.32.23/fs/sysfs/symlink.c 2010-09-04 15:54:52.000000000 -0400 35356+++ linux-2.6.32.24/fs/sysfs/symlink.c 2010-09-04 15:54:52.000000000 -0400
35348@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de 35357@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
35349 35358
35350 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) 35359 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -35354,9 +35363,9 @@ diff -urNp linux-2.6.32.23/fs/sysfs/symlink.c linux-2.6.32.23/fs/sysfs/symlink.c
35354 if (!IS_ERR(page)) 35363 if (!IS_ERR(page))
35355 free_page((unsigned long)page); 35364 free_page((unsigned long)page);
35356 } 35365 }
35357diff -urNp linux-2.6.32.23/fs/udf/balloc.c linux-2.6.32.23/fs/udf/balloc.c 35366diff -urNp linux-2.6.32.24/fs/udf/balloc.c linux-2.6.32.24/fs/udf/balloc.c
35358--- linux-2.6.32.23/fs/udf/balloc.c 2010-08-13 16:24:37.000000000 -0400 35367--- linux-2.6.32.24/fs/udf/balloc.c 2010-08-13 16:24:37.000000000 -0400
35359+++ linux-2.6.32.23/fs/udf/balloc.c 2010-09-04 15:54:52.000000000 -0400 35368+++ linux-2.6.32.24/fs/udf/balloc.c 2010-09-04 15:54:52.000000000 -0400
35360@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc 35369@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
35361 35370
35362 mutex_lock(&sbi->s_alloc_mutex); 35371 mutex_lock(&sbi->s_alloc_mutex);
@@ -35379,9 +35388,9 @@ diff -urNp linux-2.6.32.23/fs/udf/balloc.c linux-2.6.32.23/fs/udf/balloc.c
35379 udf_debug("%d < %d || %d + %d > %d\n", 35388 udf_debug("%d < %d || %d + %d > %d\n",
35380 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, 35389 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
35381 partmap->s_partition_len); 35390 partmap->s_partition_len);
35382diff -urNp linux-2.6.32.23/fs/udf/misc.c linux-2.6.32.23/fs/udf/misc.c 35391diff -urNp linux-2.6.32.24/fs/udf/misc.c linux-2.6.32.24/fs/udf/misc.c
35383--- linux-2.6.32.23/fs/udf/misc.c 2010-08-13 16:24:37.000000000 -0400 35392--- linux-2.6.32.24/fs/udf/misc.c 2010-08-13 16:24:37.000000000 -0400
35384+++ linux-2.6.32.23/fs/udf/misc.c 2010-09-04 15:54:52.000000000 -0400 35393+++ linux-2.6.32.24/fs/udf/misc.c 2010-09-04 15:54:52.000000000 -0400
35385@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat 35394@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
35386 iinfo->i_lenEAttr += size; 35395 iinfo->i_lenEAttr += size;
35387 return (struct genericFormat *)&ea[offset]; 35396 return (struct genericFormat *)&ea[offset];
@@ -35393,9 +35402,9 @@ diff -urNp linux-2.6.32.23/fs/udf/misc.c linux-2.6.32.23/fs/udf/misc.c
35393 35402
35394 return NULL; 35403 return NULL;
35395 } 35404 }
35396diff -urNp linux-2.6.32.23/fs/udf/udfdecl.h linux-2.6.32.23/fs/udf/udfdecl.h 35405diff -urNp linux-2.6.32.24/fs/udf/udfdecl.h linux-2.6.32.24/fs/udf/udfdecl.h
35397--- linux-2.6.32.23/fs/udf/udfdecl.h 2010-08-13 16:24:37.000000000 -0400 35406--- linux-2.6.32.24/fs/udf/udfdecl.h 2010-08-13 16:24:37.000000000 -0400
35398+++ linux-2.6.32.23/fs/udf/udfdecl.h 2010-09-04 15:54:52.000000000 -0400 35407+++ linux-2.6.32.24/fs/udf/udfdecl.h 2010-09-04 15:54:52.000000000 -0400
35399@@ -26,7 +26,7 @@ do { \ 35408@@ -26,7 +26,7 @@ do { \
35400 printk(f, ##a); \ 35409 printk(f, ##a); \
35401 } while (0) 35410 } while (0)
@@ -35405,9 +35414,9 @@ diff -urNp linux-2.6.32.23/fs/udf/udfdecl.h linux-2.6.32.23/fs/udf/udfdecl.h
35405 #endif 35414 #endif
35406 35415
35407 #define udf_info(f, a...) \ 35416 #define udf_info(f, a...) \
35408diff -urNp linux-2.6.32.23/fs/utimes.c linux-2.6.32.23/fs/utimes.c 35417diff -urNp linux-2.6.32.24/fs/utimes.c linux-2.6.32.24/fs/utimes.c
35409--- linux-2.6.32.23/fs/utimes.c 2010-08-13 16:24:37.000000000 -0400 35418--- linux-2.6.32.24/fs/utimes.c 2010-08-13 16:24:37.000000000 -0400
35410+++ linux-2.6.32.23/fs/utimes.c 2010-09-04 15:54:52.000000000 -0400 35419+++ linux-2.6.32.24/fs/utimes.c 2010-09-04 15:54:52.000000000 -0400
35411@@ -1,6 +1,7 @@ 35420@@ -1,6 +1,7 @@
35412 #include <linux/compiler.h> 35421 #include <linux/compiler.h>
35413 #include <linux/file.h> 35422 #include <linux/file.h>
@@ -35429,9 +35438,9 @@ diff -urNp linux-2.6.32.23/fs/utimes.c linux-2.6.32.23/fs/utimes.c
35429 mutex_lock(&inode->i_mutex); 35438 mutex_lock(&inode->i_mutex);
35430 error = notify_change(path->dentry, &newattrs); 35439 error = notify_change(path->dentry, &newattrs);
35431 mutex_unlock(&inode->i_mutex); 35440 mutex_unlock(&inode->i_mutex);
35432diff -urNp linux-2.6.32.23/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.23/fs/xfs/linux-2.6/xfs_ioctl.c 35441diff -urNp linux-2.6.32.24/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.24/fs/xfs/linux-2.6/xfs_ioctl.c
35433--- linux-2.6.32.23/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-26 17:26:05.000000000 -0400 35442--- linux-2.6.32.24/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-26 17:26:05.000000000 -0400
35434+++ linux-2.6.32.23/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-26 17:26:57.000000000 -0400 35443+++ linux-2.6.32.24/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-26 17:26:57.000000000 -0400
35435@@ -134,7 +134,7 @@ xfs_find_handle( 35444@@ -134,7 +134,7 @@ xfs_find_handle(
35436 } 35445 }
35437 35446
@@ -35441,9 +35450,9 @@ diff -urNp linux-2.6.32.23/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.23/fs/xfs/l
35441 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) 35450 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
35442 goto out_put; 35451 goto out_put;
35443 35452
35444diff -urNp linux-2.6.32.23/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.23/fs/xfs/linux-2.6/xfs_iops.c 35453diff -urNp linux-2.6.32.24/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.24/fs/xfs/linux-2.6/xfs_iops.c
35445--- linux-2.6.32.23/fs/xfs/linux-2.6/xfs_iops.c 2010-08-13 16:24:37.000000000 -0400 35454--- linux-2.6.32.24/fs/xfs/linux-2.6/xfs_iops.c 2010-08-13 16:24:37.000000000 -0400
35446+++ linux-2.6.32.23/fs/xfs/linux-2.6/xfs_iops.c 2010-09-04 15:54:52.000000000 -0400 35455+++ linux-2.6.32.24/fs/xfs/linux-2.6/xfs_iops.c 2010-09-04 15:54:52.000000000 -0400
35447@@ -468,7 +468,7 @@ xfs_vn_put_link( 35456@@ -468,7 +468,7 @@ xfs_vn_put_link(
35448 struct nameidata *nd, 35457 struct nameidata *nd,
35449 void *p) 35458 void *p)
@@ -35453,9 +35462,9 @@ diff -urNp linux-2.6.32.23/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.23/fs/xfs/li
35453 35462
35454 if (!IS_ERR(s)) 35463 if (!IS_ERR(s))
35455 kfree(s); 35464 kfree(s);
35456diff -urNp linux-2.6.32.23/fs/xfs/xfs_bmap.c linux-2.6.32.23/fs/xfs/xfs_bmap.c 35465diff -urNp linux-2.6.32.24/fs/xfs/xfs_bmap.c linux-2.6.32.24/fs/xfs/xfs_bmap.c
35457--- linux-2.6.32.23/fs/xfs/xfs_bmap.c 2010-08-13 16:24:37.000000000 -0400 35466--- linux-2.6.32.24/fs/xfs/xfs_bmap.c 2010-08-13 16:24:37.000000000 -0400
35458+++ linux-2.6.32.23/fs/xfs/xfs_bmap.c 2010-09-04 15:54:52.000000000 -0400 35467+++ linux-2.6.32.24/fs/xfs/xfs_bmap.c 2010-09-04 15:54:52.000000000 -0400
35459@@ -360,7 +360,7 @@ xfs_bmap_validate_ret( 35468@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
35460 int nmap, 35469 int nmap,
35461 int ret_nmap); 35470 int ret_nmap);
@@ -35465,9 +35474,9 @@ diff -urNp linux-2.6.32.23/fs/xfs/xfs_bmap.c linux-2.6.32.23/fs/xfs/xfs_bmap.c
35465 #endif /* DEBUG */ 35474 #endif /* DEBUG */
35466 35475
35467 #if defined(XFS_RW_TRACE) 35476 #if defined(XFS_RW_TRACE)
35468diff -urNp linux-2.6.32.23/grsecurity/gracl_alloc.c linux-2.6.32.23/grsecurity/gracl_alloc.c 35477diff -urNp linux-2.6.32.24/grsecurity/gracl_alloc.c linux-2.6.32.24/grsecurity/gracl_alloc.c
35469--- linux-2.6.32.23/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 35478--- linux-2.6.32.24/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
35470+++ linux-2.6.32.23/grsecurity/gracl_alloc.c 2010-09-04 15:54:52.000000000 -0400 35479+++ linux-2.6.32.24/grsecurity/gracl_alloc.c 2010-09-04 15:54:52.000000000 -0400
35471@@ -0,0 +1,105 @@ 35480@@ -0,0 +1,105 @@
35472+#include <linux/kernel.h> 35481+#include <linux/kernel.h>
35473+#include <linux/mm.h> 35482+#include <linux/mm.h>
@@ -35574,10 +35583,10 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl_alloc.c linux-2.6.32.23/grsecurity/g
35574+ else 35583+ else
35575+ return 1; 35584+ return 1;
35576+} 35585+}
35577diff -urNp linux-2.6.32.23/grsecurity/gracl.c linux-2.6.32.23/grsecurity/gracl.c 35586diff -urNp linux-2.6.32.24/grsecurity/gracl.c linux-2.6.32.24/grsecurity/gracl.c
35578--- linux-2.6.32.23/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 35587--- linux-2.6.32.24/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
35579+++ linux-2.6.32.23/grsecurity/gracl.c 2010-09-04 15:54:52.000000000 -0400 35588+++ linux-2.6.32.24/grsecurity/gracl.c 2010-09-28 19:14:25.000000000 -0400
35580@@ -0,0 +1,3919 @@ 35589@@ -0,0 +1,3922 @@
35581+#include <linux/kernel.h> 35590+#include <linux/kernel.h>
35582+#include <linux/module.h> 35591+#include <linux/module.h>
35583+#include <linux/sched.h> 35592+#include <linux/sched.h>
@@ -38356,7 +38365,7 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl.c linux-2.6.32.23/grsecurity/gracl.c
38356+ read_lock(&tasklist_lock); 38365+ read_lock(&tasklist_lock);
38357+ read_lock(&grsec_exec_file_lock); 38366+ read_lock(&grsec_exec_file_lock);
38358+ 38367+
38359+ tsk = current->parent; 38368+ tsk = current->real_parent;
38360+ if (tsk == NULL) 38369+ if (tsk == NULL)
38361+ goto out_unlock; 38370+ goto out_unlock;
38362+ 38371+
@@ -38438,7 +38447,7 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl.c linux-2.6.32.23/grsecurity/gracl.c
38438+ while (p3->pid > 0) { 38447+ while (p3->pid > 0) {
38439+ if (p3 == p) 38448+ if (p3 == p)
38440+ break; 38449+ break;
38441+ p3 = p3->parent; 38450+ p3 = p3->real_parent;
38442+ } 38451+ }
38443+ if (p3 == p) 38452+ if (p3 == p)
38444+ break; 38453+ break;
@@ -38650,8 +38659,8 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl.c linux-2.6.32.23/grsecurity/gracl.c
38650+ char *p = ""; 38659+ char *p = "";
38651+ assign_special_role(gr_usermode->sp_role); 38660+ assign_special_role(gr_usermode->sp_role);
38652+ read_lock(&tasklist_lock); 38661+ read_lock(&tasklist_lock);
38653+ if (current->parent) 38662+ if (current->real_parent)
38654+ p = current->parent->role->rolename; 38663+ p = current->real_parent->role->rolename;
38655+ read_unlock(&tasklist_lock); 38664+ read_unlock(&tasklist_lock);
38656+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG, 38665+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
38657+ p, acl_sp_role_value); 38666+ p, acl_sp_role_value);
@@ -38676,9 +38685,9 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl.c linux-2.6.32.23/grsecurity/gracl.c
38676+ int i = 0; 38685+ int i = 0;
38677+ 38686+
38678+ read_lock(&tasklist_lock); 38687+ read_lock(&tasklist_lock);
38679+ if (current->parent) { 38688+ if (current->real_parent) {
38680+ p = current->parent->role->rolename; 38689+ p = current->real_parent->role->rolename;
38681+ i = current->parent->acl_role_id; 38690+ i = current->real_parent->acl_role_id;
38682+ } 38691+ }
38683+ read_unlock(&tasklist_lock); 38692+ read_unlock(&tasklist_lock);
38684+ 38693+
@@ -39137,7 +39146,7 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl.c linux-2.6.32.23/grsecurity/gracl.c
39137+ while (tmp->pid > 0) { 39146+ while (tmp->pid > 0) {
39138+ if (tmp == curtemp) 39147+ if (tmp == curtemp)
39139+ break; 39148+ break;
39140+ tmp = tmp->parent; 39149+ tmp = tmp->real_parent;
39141+ } 39150+ }
39142+ 39151+
39143+ if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) || 39152+ if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
@@ -39186,7 +39195,7 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl.c linux-2.6.32.23/grsecurity/gracl.c
39186+ while (tmp->pid > 0) { 39195+ while (tmp->pid > 0) {
39187+ if (tmp == curtemp) 39196+ if (tmp == curtemp)
39188+ break; 39197+ break;
39189+ tmp = tmp->parent; 39198+ tmp = tmp->real_parent;
39190+ } 39199+ }
39191+ 39200+
39192+ if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) || 39201+ if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
@@ -39490,6 +39499,9 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl.c linux-2.6.32.23/grsecurity/gracl.c
39490+ return (obj->mode & GR_FIND) ? 1 : 0; 39499+ return (obj->mode & GR_FIND) ? 1 : 0;
39491+} 39500+}
39492+ 39501+
39502+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
39503+EXPORT_SYMBOL(gr_acl_is_enabled);
39504+#endif
39493+EXPORT_SYMBOL(gr_learn_resource); 39505+EXPORT_SYMBOL(gr_learn_resource);
39494+EXPORT_SYMBOL(gr_set_kernel_label); 39506+EXPORT_SYMBOL(gr_set_kernel_label);
39495+#ifdef CONFIG_SECURITY 39507+#ifdef CONFIG_SECURITY
@@ -39497,9 +39509,9 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl.c linux-2.6.32.23/grsecurity/gracl.c
39497+EXPORT_SYMBOL(gr_check_group_change); 39509+EXPORT_SYMBOL(gr_check_group_change);
39498+#endif 39510+#endif
39499+ 39511+
39500diff -urNp linux-2.6.32.23/grsecurity/gracl_cap.c linux-2.6.32.23/grsecurity/gracl_cap.c 39512diff -urNp linux-2.6.32.24/grsecurity/gracl_cap.c linux-2.6.32.24/grsecurity/gracl_cap.c
39501--- linux-2.6.32.23/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 39513--- linux-2.6.32.24/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
39502+++ linux-2.6.32.23/grsecurity/gracl_cap.c 2010-09-04 15:54:52.000000000 -0400 39514+++ linux-2.6.32.24/grsecurity/gracl_cap.c 2010-09-04 15:54:52.000000000 -0400
39503@@ -0,0 +1,138 @@ 39515@@ -0,0 +1,138 @@
39504+#include <linux/kernel.h> 39516+#include <linux/kernel.h>
39505+#include <linux/module.h> 39517+#include <linux/module.h>
@@ -39639,9 +39651,9 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl_cap.c linux-2.6.32.23/grsecurity/gra
39639+ return 0; 39651+ return 0;
39640+} 39652+}
39641+ 39653+
39642diff -urNp linux-2.6.32.23/grsecurity/gracl_fs.c linux-2.6.32.23/grsecurity/gracl_fs.c 39654diff -urNp linux-2.6.32.24/grsecurity/gracl_fs.c linux-2.6.32.24/grsecurity/gracl_fs.c
39643--- linux-2.6.32.23/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 39655--- linux-2.6.32.24/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
39644+++ linux-2.6.32.23/grsecurity/gracl_fs.c 2010-09-04 15:54:52.000000000 -0400 39656+++ linux-2.6.32.24/grsecurity/gracl_fs.c 2010-09-04 15:54:52.000000000 -0400
39645@@ -0,0 +1,424 @@ 39657@@ -0,0 +1,424 @@
39646+#include <linux/kernel.h> 39658+#include <linux/kernel.h>
39647+#include <linux/sched.h> 39659+#include <linux/sched.h>
@@ -40067,9 +40079,9 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl_fs.c linux-2.6.32.23/grsecurity/grac
40067+ 40079+
40068+ return 0; 40080+ return 0;
40069+} 40081+}
40070diff -urNp linux-2.6.32.23/grsecurity/gracl_ip.c linux-2.6.32.23/grsecurity/gracl_ip.c 40082diff -urNp linux-2.6.32.24/grsecurity/gracl_ip.c linux-2.6.32.24/grsecurity/gracl_ip.c
40071--- linux-2.6.32.23/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 40083--- linux-2.6.32.24/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
40072+++ linux-2.6.32.23/grsecurity/gracl_ip.c 2010-09-04 15:54:52.000000000 -0400 40084+++ linux-2.6.32.24/grsecurity/gracl_ip.c 2010-09-04 15:54:52.000000000 -0400
40073@@ -0,0 +1,339 @@ 40085@@ -0,0 +1,339 @@
40074+#include <linux/kernel.h> 40086+#include <linux/kernel.h>
40075+#include <asm/uaccess.h> 40087+#include <asm/uaccess.h>
@@ -40410,9 +40422,9 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl_ip.c linux-2.6.32.23/grsecurity/grac
40410+ 40422+
40411+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); 40423+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
40412+} 40424+}
40413diff -urNp linux-2.6.32.23/grsecurity/gracl_learn.c linux-2.6.32.23/grsecurity/gracl_learn.c 40425diff -urNp linux-2.6.32.24/grsecurity/gracl_learn.c linux-2.6.32.24/grsecurity/gracl_learn.c
40414--- linux-2.6.32.23/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 40426--- linux-2.6.32.24/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
40415+++ linux-2.6.32.23/grsecurity/gracl_learn.c 2010-09-04 15:54:52.000000000 -0400 40427+++ linux-2.6.32.24/grsecurity/gracl_learn.c 2010-09-04 15:54:52.000000000 -0400
40416@@ -0,0 +1,211 @@ 40428@@ -0,0 +1,211 @@
40417+#include <linux/kernel.h> 40429+#include <linux/kernel.h>
40418+#include <linux/mm.h> 40430+#include <linux/mm.h>
@@ -40625,9 +40637,9 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl_learn.c linux-2.6.32.23/grsecurity/g
40625+ .release = close_learn, 40637+ .release = close_learn,
40626+ .poll = poll_learn, 40638+ .poll = poll_learn,
40627+}; 40639+};
40628diff -urNp linux-2.6.32.23/grsecurity/gracl_res.c linux-2.6.32.23/grsecurity/gracl_res.c 40640diff -urNp linux-2.6.32.24/grsecurity/gracl_res.c linux-2.6.32.24/grsecurity/gracl_res.c
40629--- linux-2.6.32.23/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 40641--- linux-2.6.32.24/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
40630+++ linux-2.6.32.23/grsecurity/gracl_res.c 2010-09-04 15:54:52.000000000 -0400 40642+++ linux-2.6.32.24/grsecurity/gracl_res.c 2010-09-04 15:54:52.000000000 -0400
40631@@ -0,0 +1,67 @@ 40643@@ -0,0 +1,67 @@
40632+#include <linux/kernel.h> 40644+#include <linux/kernel.h>
40633+#include <linux/sched.h> 40645+#include <linux/sched.h>
@@ -40696,9 +40708,9 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl_res.c linux-2.6.32.23/grsecurity/gra
40696+ rcu_read_unlock(); 40708+ rcu_read_unlock();
40697+ return; 40709+ return;
40698+} 40710+}
40699diff -urNp linux-2.6.32.23/grsecurity/gracl_segv.c linux-2.6.32.23/grsecurity/gracl_segv.c 40711diff -urNp linux-2.6.32.24/grsecurity/gracl_segv.c linux-2.6.32.24/grsecurity/gracl_segv.c
40700--- linux-2.6.32.23/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 40712--- linux-2.6.32.24/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
40701+++ linux-2.6.32.23/grsecurity/gracl_segv.c 2010-09-04 15:54:52.000000000 -0400 40713+++ linux-2.6.32.24/grsecurity/gracl_segv.c 2010-09-04 15:54:52.000000000 -0400
40702@@ -0,0 +1,310 @@ 40714@@ -0,0 +1,310 @@
40703+#include <linux/kernel.h> 40715+#include <linux/kernel.h>
40704+#include <linux/mm.h> 40716+#include <linux/mm.h>
@@ -41010,9 +41022,9 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl_segv.c linux-2.6.32.23/grsecurity/gr
41010+ 41022+
41011+ return; 41023+ return;
41012+} 41024+}
41013diff -urNp linux-2.6.32.23/grsecurity/gracl_shm.c linux-2.6.32.23/grsecurity/gracl_shm.c 41025diff -urNp linux-2.6.32.24/grsecurity/gracl_shm.c linux-2.6.32.24/grsecurity/gracl_shm.c
41014--- linux-2.6.32.23/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 41026--- linux-2.6.32.24/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
41015+++ linux-2.6.32.23/grsecurity/gracl_shm.c 2010-09-04 15:54:52.000000000 -0400 41027+++ linux-2.6.32.24/grsecurity/gracl_shm.c 2010-09-04 15:54:52.000000000 -0400
41016@@ -0,0 +1,40 @@ 41028@@ -0,0 +1,40 @@
41017+#include <linux/kernel.h> 41029+#include <linux/kernel.h>
41018+#include <linux/mm.h> 41030+#include <linux/mm.h>
@@ -41054,9 +41066,9 @@ diff -urNp linux-2.6.32.23/grsecurity/gracl_shm.c linux-2.6.32.23/grsecurity/gra
41054+ 41066+
41055+ return 1; 41067+ return 1;
41056+} 41068+}
41057diff -urNp linux-2.6.32.23/grsecurity/grsec_chdir.c linux-2.6.32.23/grsecurity/grsec_chdir.c 41069diff -urNp linux-2.6.32.24/grsecurity/grsec_chdir.c linux-2.6.32.24/grsecurity/grsec_chdir.c
41058--- linux-2.6.32.23/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 41070--- linux-2.6.32.24/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
41059+++ linux-2.6.32.23/grsecurity/grsec_chdir.c 2010-09-04 15:54:52.000000000 -0400 41071+++ linux-2.6.32.24/grsecurity/grsec_chdir.c 2010-09-04 15:54:52.000000000 -0400
41060@@ -0,0 +1,19 @@ 41072@@ -0,0 +1,19 @@
41061+#include <linux/kernel.h> 41073+#include <linux/kernel.h>
41062+#include <linux/sched.h> 41074+#include <linux/sched.h>
@@ -41077,9 +41089,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_chdir.c linux-2.6.32.23/grsecurity/g
41077+#endif 41089+#endif
41078+ return; 41090+ return;
41079+} 41091+}
41080diff -urNp linux-2.6.32.23/grsecurity/grsec_chroot.c linux-2.6.32.23/grsecurity/grsec_chroot.c 41092diff -urNp linux-2.6.32.24/grsecurity/grsec_chroot.c linux-2.6.32.24/grsecurity/grsec_chroot.c
41081--- linux-2.6.32.23/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 41093--- linux-2.6.32.24/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
41082+++ linux-2.6.32.23/grsecurity/grsec_chroot.c 2010-09-04 15:54:52.000000000 -0400 41094+++ linux-2.6.32.24/grsecurity/grsec_chroot.c 2010-09-04 15:54:52.000000000 -0400
41083@@ -0,0 +1,389 @@ 41095@@ -0,0 +1,389 @@
41084+#include <linux/kernel.h> 41096+#include <linux/kernel.h>
41085+#include <linux/module.h> 41097+#include <linux/module.h>
@@ -41470,9 +41482,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_chroot.c linux-2.6.32.23/grsecurity/
41470+#ifdef CONFIG_SECURITY 41482+#ifdef CONFIG_SECURITY
41471+EXPORT_SYMBOL(gr_handle_chroot_caps); 41483+EXPORT_SYMBOL(gr_handle_chroot_caps);
41472+#endif 41484+#endif
41473diff -urNp linux-2.6.32.23/grsecurity/grsec_disabled.c linux-2.6.32.23/grsecurity/grsec_disabled.c 41485diff -urNp linux-2.6.32.24/grsecurity/grsec_disabled.c linux-2.6.32.24/grsecurity/grsec_disabled.c
41474--- linux-2.6.32.23/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 41486--- linux-2.6.32.24/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
41475+++ linux-2.6.32.23/grsecurity/grsec_disabled.c 2010-09-04 15:54:52.000000000 -0400 41487+++ linux-2.6.32.24/grsecurity/grsec_disabled.c 2010-09-04 15:54:52.000000000 -0400
41476@@ -0,0 +1,431 @@ 41488@@ -0,0 +1,431 @@
41477+#include <linux/kernel.h> 41489+#include <linux/kernel.h>
41478+#include <linux/module.h> 41490+#include <linux/module.h>
@@ -41905,9 +41917,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_disabled.c linux-2.6.32.23/grsecurit
41905+EXPORT_SYMBOL(gr_check_user_change); 41917+EXPORT_SYMBOL(gr_check_user_change);
41906+EXPORT_SYMBOL(gr_check_group_change); 41918+EXPORT_SYMBOL(gr_check_group_change);
41907+#endif 41919+#endif
41908diff -urNp linux-2.6.32.23/grsecurity/grsec_exec.c linux-2.6.32.23/grsecurity/grsec_exec.c 41920diff -urNp linux-2.6.32.24/grsecurity/grsec_exec.c linux-2.6.32.24/grsecurity/grsec_exec.c
41909--- linux-2.6.32.23/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 41921--- linux-2.6.32.24/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
41910+++ linux-2.6.32.23/grsecurity/grsec_exec.c 2010-09-04 15:54:52.000000000 -0400 41922+++ linux-2.6.32.24/grsecurity/grsec_exec.c 2010-09-04 15:54:52.000000000 -0400
41911@@ -0,0 +1,89 @@ 41923@@ -0,0 +1,89 @@
41912+#include <linux/kernel.h> 41924+#include <linux/kernel.h>
41913+#include <linux/sched.h> 41925+#include <linux/sched.h>
@@ -41998,9 +42010,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_exec.c linux-2.6.32.23/grsecurity/gr
41998+#endif 42010+#endif
41999+ return; 42011+ return;
42000+} 42012+}
42001diff -urNp linux-2.6.32.23/grsecurity/grsec_fifo.c linux-2.6.32.23/grsecurity/grsec_fifo.c 42013diff -urNp linux-2.6.32.24/grsecurity/grsec_fifo.c linux-2.6.32.24/grsecurity/grsec_fifo.c
42002--- linux-2.6.32.23/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 42014--- linux-2.6.32.24/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
42003+++ linux-2.6.32.23/grsecurity/grsec_fifo.c 2010-09-04 15:54:52.000000000 -0400 42015+++ linux-2.6.32.24/grsecurity/grsec_fifo.c 2010-09-04 15:54:52.000000000 -0400
42004@@ -0,0 +1,24 @@ 42016@@ -0,0 +1,24 @@
42005+#include <linux/kernel.h> 42017+#include <linux/kernel.h>
42006+#include <linux/sched.h> 42018+#include <linux/sched.h>
@@ -42026,9 +42038,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_fifo.c linux-2.6.32.23/grsecurity/gr
42026+#endif 42038+#endif
42027+ return 0; 42039+ return 0;
42028+} 42040+}
42029diff -urNp linux-2.6.32.23/grsecurity/grsec_fork.c linux-2.6.32.23/grsecurity/grsec_fork.c 42041diff -urNp linux-2.6.32.24/grsecurity/grsec_fork.c linux-2.6.32.24/grsecurity/grsec_fork.c
42030--- linux-2.6.32.23/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 42042--- linux-2.6.32.24/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
42031+++ linux-2.6.32.23/grsecurity/grsec_fork.c 2010-09-23 20:36:06.000000000 -0400 42043+++ linux-2.6.32.24/grsecurity/grsec_fork.c 2010-09-23 20:36:06.000000000 -0400
42032@@ -0,0 +1,23 @@ 42044@@ -0,0 +1,23 @@
42033+#include <linux/kernel.h> 42045+#include <linux/kernel.h>
42034+#include <linux/sched.h> 42046+#include <linux/sched.h>
@@ -42053,9 +42065,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_fork.c linux-2.6.32.23/grsecurity/gr
42053+#endif 42065+#endif
42054+ return; 42066+ return;
42055+} 42067+}
42056diff -urNp linux-2.6.32.23/grsecurity/grsec_init.c linux-2.6.32.23/grsecurity/grsec_init.c 42068diff -urNp linux-2.6.32.24/grsecurity/grsec_init.c linux-2.6.32.24/grsecurity/grsec_init.c
42057--- linux-2.6.32.23/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 42069--- linux-2.6.32.24/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
42058+++ linux-2.6.32.23/grsecurity/grsec_init.c 2010-09-17 19:24:55.000000000 -0400 42070+++ linux-2.6.32.24/grsecurity/grsec_init.c 2010-09-17 19:24:55.000000000 -0400
42059@@ -0,0 +1,266 @@ 42071@@ -0,0 +1,266 @@
42060+#include <linux/kernel.h> 42072+#include <linux/kernel.h>
42061+#include <linux/sched.h> 42073+#include <linux/sched.h>
@@ -42323,9 +42335,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_init.c linux-2.6.32.23/grsecurity/gr
42323+ 42335+
42324+ return; 42336+ return;
42325+} 42337+}
42326diff -urNp linux-2.6.32.23/grsecurity/grsec_link.c linux-2.6.32.23/grsecurity/grsec_link.c 42338diff -urNp linux-2.6.32.24/grsecurity/grsec_link.c linux-2.6.32.24/grsecurity/grsec_link.c
42327--- linux-2.6.32.23/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 42339--- linux-2.6.32.24/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
42328+++ linux-2.6.32.23/grsecurity/grsec_link.c 2010-09-04 15:54:52.000000000 -0400 42340+++ linux-2.6.32.24/grsecurity/grsec_link.c 2010-09-04 15:54:52.000000000 -0400
42329@@ -0,0 +1,43 @@ 42341@@ -0,0 +1,43 @@
42330+#include <linux/kernel.h> 42342+#include <linux/kernel.h>
42331+#include <linux/sched.h> 42343+#include <linux/sched.h>
@@ -42370,9 +42382,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_link.c linux-2.6.32.23/grsecurity/gr
42370+#endif 42382+#endif
42371+ return 0; 42383+ return 0;
42372+} 42384+}
42373diff -urNp linux-2.6.32.23/grsecurity/grsec_log.c linux-2.6.32.23/grsecurity/grsec_log.c 42385diff -urNp linux-2.6.32.24/grsecurity/grsec_log.c linux-2.6.32.24/grsecurity/grsec_log.c
42374--- linux-2.6.32.23/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 42386--- linux-2.6.32.24/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
42375+++ linux-2.6.32.23/grsecurity/grsec_log.c 2010-09-04 15:54:52.000000000 -0400 42387+++ linux-2.6.32.24/grsecurity/grsec_log.c 2010-09-28 19:12:37.000000000 -0400
42376@@ -0,0 +1,306 @@ 42388@@ -0,0 +1,306 @@
42377+#include <linux/kernel.h> 42389+#include <linux/kernel.h>
42378+#include <linux/sched.h> 42390+#include <linux/sched.h>
@@ -42495,7 +42507,7 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_log.c linux-2.6.32.23/grsecurity/grs
42495+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf; 42507+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
42496+ unsigned int len = strlen(buf); 42508+ unsigned int len = strlen(buf);
42497+ 42509+
42498+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->parent))); 42510+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
42499+ printk("%s\n", buf); 42511+ printk("%s\n", buf);
42500+ 42512+
42501+ return; 42513+ return;
@@ -42526,7 +42538,7 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_log.c linux-2.6.32.23/grsecurity/grs
42526+ switch (argtypes) { 42538+ switch (argtypes) {
42527+ case GR_TTYSNIFF: 42539+ case GR_TTYSNIFF:
42528+ task = va_arg(ap, struct task_struct *); 42540+ task = va_arg(ap, struct task_struct *);
42529+ gr_log_middle_varargs(audit, msg, &task->signal->curr_ip, gr_task_fullpath0(task), task->comm, task->pid, gr_parent_task_fullpath0(task), task->parent->comm, task->parent->pid); 42541+ gr_log_middle_varargs(audit, msg, &task->signal->curr_ip, gr_task_fullpath0(task), task->comm, task->pid, gr_parent_task_fullpath0(task), task->real_parent->comm, task->real_parent->pid);
42530+ break; 42542+ break;
42531+ case GR_SYSCTL_HIDDEN: 42543+ case GR_SYSCTL_HIDDEN:
42532+ str1 = va_arg(ap, char *); 42544+ str1 = va_arg(ap, char *);
@@ -42609,18 +42621,18 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_log.c linux-2.6.32.23/grsecurity/grs
42609+ case GR_RESOURCE: 42621+ case GR_RESOURCE:
42610+ task = va_arg(ap, struct task_struct *); 42622+ task = va_arg(ap, struct task_struct *);
42611+ cred = __task_cred(task); 42623+ cred = __task_cred(task);
42612+ pcred = __task_cred(task->parent); 42624+ pcred = __task_cred(task->real_parent);
42613+ ulong1 = va_arg(ap, unsigned long); 42625+ ulong1 = va_arg(ap, unsigned long);
42614+ str1 = va_arg(ap, char *); 42626+ str1 = va_arg(ap, char *);
42615+ ulong2 = va_arg(ap, unsigned long); 42627+ ulong2 = va_arg(ap, unsigned long);
42616+ gr_log_middle_varargs(audit, msg, ulong1, str1, ulong2, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid); 42628+ gr_log_middle_varargs(audit, msg, ulong1, str1, ulong2, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
42617+ break; 42629+ break;
42618+ case GR_CAP: 42630+ case GR_CAP:
42619+ task = va_arg(ap, struct task_struct *); 42631+ task = va_arg(ap, struct task_struct *);
42620+ cred = __task_cred(task); 42632+ cred = __task_cred(task);
42621+ pcred = __task_cred(task->parent); 42633+ pcred = __task_cred(task->real_parent);
42622+ str1 = va_arg(ap, char *); 42634+ str1 = va_arg(ap, char *);
42623+ gr_log_middle_varargs(audit, msg, str1, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid); 42635+ gr_log_middle_varargs(audit, msg, str1, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
42624+ break; 42636+ break;
42625+ case GR_SIG: 42637+ case GR_SIG:
42626+ str1 = va_arg(ap, char *); 42638+ str1 = va_arg(ap, char *);
@@ -42630,23 +42642,23 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_log.c linux-2.6.32.23/grsecurity/grs
42630+ case GR_SIG2: 42642+ case GR_SIG2:
42631+ task = va_arg(ap, struct task_struct *); 42643+ task = va_arg(ap, struct task_struct *);
42632+ cred = __task_cred(task); 42644+ cred = __task_cred(task);
42633+ pcred = __task_cred(task->parent); 42645+ pcred = __task_cred(task->real_parent);
42634+ num1 = va_arg(ap, int); 42646+ num1 = va_arg(ap, int);
42635+ gr_log_middle_varargs(audit, msg, num1, gr_task_fullpath0(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath0(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid); 42647+ gr_log_middle_varargs(audit, msg, num1, gr_task_fullpath0(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath0(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid);
42636+ break; 42648+ break;
42637+ case GR_CRASH1: 42649+ case GR_CRASH1:
42638+ task = va_arg(ap, struct task_struct *); 42650+ task = va_arg(ap, struct task_struct *);
42639+ cred = __task_cred(task); 42651+ cred = __task_cred(task);
42640+ pcred = __task_cred(task->parent); 42652+ pcred = __task_cred(task->real_parent);
42641+ ulong1 = va_arg(ap, unsigned long); 42653+ ulong1 = va_arg(ap, unsigned long);
42642+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, cred->uid, ulong1); 42654+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, cred->uid, ulong1);
42643+ break; 42655+ break;
42644+ case GR_CRASH2: 42656+ case GR_CRASH2:
42645+ task = va_arg(ap, struct task_struct *); 42657+ task = va_arg(ap, struct task_struct *);
42646+ cred = __task_cred(task); 42658+ cred = __task_cred(task);
42647+ pcred = __task_cred(task->parent); 42659+ pcred = __task_cred(task->real_parent);
42648+ ulong1 = va_arg(ap, unsigned long); 42660+ ulong1 = va_arg(ap, unsigned long);
42649+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, ulong1); 42661+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, cred->uid, cred->euid, cred->gid, cred->egid, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, pcred->uid, pcred->euid, pcred->gid, pcred->egid, ulong1);
42650+ break; 42662+ break;
42651+ case GR_PSACCT: 42663+ case GR_PSACCT:
42652+ { 42664+ {
@@ -42668,9 +42680,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_log.c linux-2.6.32.23/grsecurity/grs
42668+ csec = va_arg(ap, int); 42680+ csec = va_arg(ap, int);
42669+ ulong1 = va_arg(ap, unsigned long); 42681+ ulong1 = va_arg(ap, unsigned long);
42670+ cred = __task_cred(task); 42682+ cred = __task_cred(task);
42671+ pcred = __task_cred(task->parent); 42683+ pcred = __task_cred(task->real_parent);
42672+ 42684+
42673+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, &task->signal->curr_ip, tty_name(task->signal->tty, cur_tty), cred->uid, cred->euid, cred->gid, cred->egid, wday, whr, wmin, wsec, cday, chr, cmin, csec, (task->flags & PF_SIGNALED) ? "killed by signal" : "exited", ulong1, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, &task->parent->signal->curr_ip, tty_name(task->parent->signal->tty, parent_tty), pcred->uid, pcred->euid, pcred->gid, pcred->egid); 42685+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, &task->signal->curr_ip, tty_name(task->signal->tty, cur_tty), cred->uid, cred->euid, cred->gid, cred->egid, wday, whr, wmin, wsec, cday, chr, cmin, csec, (task->flags & PF_SIGNALED) ? "killed by signal" : "exited", ulong1, gr_parent_task_fullpath(task), task->real_parent->comm, task->real_parent->pid, &task->real_parent->signal->curr_ip, tty_name(task->real_parent->signal->tty, parent_tty), pcred->uid, pcred->euid, pcred->gid, pcred->egid);
42674+ } 42686+ }
42675+ break; 42687+ break;
42676+ default: 42688+ default:
@@ -42680,9 +42692,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_log.c linux-2.6.32.23/grsecurity/grs
42680+ gr_log_end(audit); 42692+ gr_log_end(audit);
42681+ END_LOCKS(audit); 42693+ END_LOCKS(audit);
42682+} 42694+}
42683diff -urNp linux-2.6.32.23/grsecurity/grsec_mem.c linux-2.6.32.23/grsecurity/grsec_mem.c 42695diff -urNp linux-2.6.32.24/grsecurity/grsec_mem.c linux-2.6.32.24/grsecurity/grsec_mem.c
42684--- linux-2.6.32.23/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 42696--- linux-2.6.32.24/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
42685+++ linux-2.6.32.23/grsecurity/grsec_mem.c 2010-09-04 15:54:52.000000000 -0400 42697+++ linux-2.6.32.24/grsecurity/grsec_mem.c 2010-09-04 15:54:52.000000000 -0400
42686@@ -0,0 +1,85 @@ 42698@@ -0,0 +1,85 @@
42687+#include <linux/kernel.h> 42699+#include <linux/kernel.h>
42688+#include <linux/sched.h> 42700+#include <linux/sched.h>
@@ -42769,9 +42781,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_mem.c linux-2.6.32.23/grsecurity/grs
42769+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); 42781+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
42770+ return; 42782+ return;
42771+} 42783+}
42772diff -urNp linux-2.6.32.23/grsecurity/grsec_mount.c linux-2.6.32.23/grsecurity/grsec_mount.c 42784diff -urNp linux-2.6.32.24/grsecurity/grsec_mount.c linux-2.6.32.24/grsecurity/grsec_mount.c
42773--- linux-2.6.32.23/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 42785--- linux-2.6.32.24/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
42774+++ linux-2.6.32.23/grsecurity/grsec_mount.c 2010-09-04 15:54:52.000000000 -0400 42786+++ linux-2.6.32.24/grsecurity/grsec_mount.c 2010-09-04 15:54:52.000000000 -0400
42775@@ -0,0 +1,62 @@ 42787@@ -0,0 +1,62 @@
42776+#include <linux/kernel.h> 42788+#include <linux/kernel.h>
42777+#include <linux/sched.h> 42789+#include <linux/sched.h>
@@ -42835,9 +42847,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_mount.c linux-2.6.32.23/grsecurity/g
42835+#endif 42847+#endif
42836+ return 0; 42848+ return 0;
42837+} 42849+}
42838diff -urNp linux-2.6.32.23/grsecurity/grsec_ptrace.c linux-2.6.32.23/grsecurity/grsec_ptrace.c 42850diff -urNp linux-2.6.32.24/grsecurity/grsec_ptrace.c linux-2.6.32.24/grsecurity/grsec_ptrace.c
42839--- linux-2.6.32.23/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 42851--- linux-2.6.32.24/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
42840+++ linux-2.6.32.23/grsecurity/grsec_ptrace.c 2010-09-04 15:54:52.000000000 -0400 42852+++ linux-2.6.32.24/grsecurity/grsec_ptrace.c 2010-09-04 15:54:52.000000000 -0400
42841@@ -0,0 +1,14 @@ 42853@@ -0,0 +1,14 @@
42842+#include <linux/kernel.h> 42854+#include <linux/kernel.h>
42843+#include <linux/sched.h> 42855+#include <linux/sched.h>
@@ -42853,9 +42865,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_ptrace.c linux-2.6.32.23/grsecurity/
42853+#endif 42865+#endif
42854+ return; 42866+ return;
42855+} 42867+}
42856diff -urNp linux-2.6.32.23/grsecurity/grsec_sig.c linux-2.6.32.23/grsecurity/grsec_sig.c 42868diff -urNp linux-2.6.32.24/grsecurity/grsec_sig.c linux-2.6.32.24/grsecurity/grsec_sig.c
42857--- linux-2.6.32.23/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 42869--- linux-2.6.32.24/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
42858+++ linux-2.6.32.23/grsecurity/grsec_sig.c 2010-09-04 15:54:52.000000000 -0400 42870+++ linux-2.6.32.24/grsecurity/grsec_sig.c 2010-09-28 19:13:01.000000000 -0400
42859@@ -0,0 +1,65 @@ 42871@@ -0,0 +1,65 @@
42860+#include <linux/kernel.h> 42872+#include <linux/kernel.h>
42861+#include <linux/sched.h> 42873+#include <linux/sched.h>
@@ -42905,8 +42917,8 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_sig.c linux-2.6.32.23/grsecurity/grs
42905+#ifdef CONFIG_GRKERNSEC_BRUTE 42917+#ifdef CONFIG_GRKERNSEC_BRUTE
42906+ read_lock(&tasklist_lock); 42918+ read_lock(&tasklist_lock);
42907+ read_lock(&grsec_exec_file_lock); 42919+ read_lock(&grsec_exec_file_lock);
42908+ if (p->parent && p->parent->exec_file == p->exec_file) 42920+ if (p->real_parent && p->real_parent->exec_file == p->exec_file)
42909+ p->parent->brute = 1; 42921+ p->real_parent->brute = 1;
42910+ read_unlock(&grsec_exec_file_lock); 42922+ read_unlock(&grsec_exec_file_lock);
42911+ read_unlock(&tasklist_lock); 42923+ read_unlock(&tasklist_lock);
42912+#endif 42924+#endif
@@ -42922,9 +42934,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_sig.c linux-2.6.32.23/grsecurity/grs
42922+ return; 42934+ return;
42923+} 42935+}
42924+ 42936+
42925diff -urNp linux-2.6.32.23/grsecurity/grsec_sock.c linux-2.6.32.23/grsecurity/grsec_sock.c 42937diff -urNp linux-2.6.32.24/grsecurity/grsec_sock.c linux-2.6.32.24/grsecurity/grsec_sock.c
42926--- linux-2.6.32.23/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 42938--- linux-2.6.32.24/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
42927+++ linux-2.6.32.23/grsecurity/grsec_sock.c 2010-09-04 15:54:52.000000000 -0400 42939+++ linux-2.6.32.24/grsecurity/grsec_sock.c 2010-09-04 15:54:52.000000000 -0400
42928@@ -0,0 +1,271 @@ 42940@@ -0,0 +1,271 @@
42929+#include <linux/kernel.h> 42941+#include <linux/kernel.h>
42930+#include <linux/module.h> 42942+#include <linux/module.h>
@@ -43197,9 +43209,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_sock.c linux-2.6.32.23/grsecurity/gr
43197+ return current_cap(); 43209+ return current_cap();
43198+#endif 43210+#endif
43199+} 43211+}
43200diff -urNp linux-2.6.32.23/grsecurity/grsec_sysctl.c linux-2.6.32.23/grsecurity/grsec_sysctl.c 43212diff -urNp linux-2.6.32.24/grsecurity/grsec_sysctl.c linux-2.6.32.24/grsecurity/grsec_sysctl.c
43201--- linux-2.6.32.23/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 43213--- linux-2.6.32.24/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
43202+++ linux-2.6.32.23/grsecurity/grsec_sysctl.c 2010-09-17 19:22:27.000000000 -0400 43214+++ linux-2.6.32.24/grsecurity/grsec_sysctl.c 2010-09-17 19:22:27.000000000 -0400
43203@@ -0,0 +1,469 @@ 43215@@ -0,0 +1,469 @@
43204+#include <linux/kernel.h> 43216+#include <linux/kernel.h>
43205+#include <linux/sched.h> 43217+#include <linux/sched.h>
@@ -43670,9 +43682,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_sysctl.c linux-2.6.32.23/grsecurity/
43670+ { .ctl_name = 0 } 43682+ { .ctl_name = 0 }
43671+}; 43683+};
43672+#endif 43684+#endif
43673diff -urNp linux-2.6.32.23/grsecurity/grsec_textrel.c linux-2.6.32.23/grsecurity/grsec_textrel.c 43685diff -urNp linux-2.6.32.24/grsecurity/grsec_textrel.c linux-2.6.32.24/grsecurity/grsec_textrel.c
43674--- linux-2.6.32.23/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 43686--- linux-2.6.32.24/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
43675+++ linux-2.6.32.23/grsecurity/grsec_textrel.c 2010-09-04 15:54:52.000000000 -0400 43687+++ linux-2.6.32.24/grsecurity/grsec_textrel.c 2010-09-04 15:54:52.000000000 -0400
43676@@ -0,0 +1,16 @@ 43688@@ -0,0 +1,16 @@
43677+#include <linux/kernel.h> 43689+#include <linux/kernel.h>
43678+#include <linux/sched.h> 43690+#include <linux/sched.h>
@@ -43690,9 +43702,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_textrel.c linux-2.6.32.23/grsecurity
43690+#endif 43702+#endif
43691+ return; 43703+ return;
43692+} 43704+}
43693diff -urNp linux-2.6.32.23/grsecurity/grsec_time.c linux-2.6.32.23/grsecurity/grsec_time.c 43705diff -urNp linux-2.6.32.24/grsecurity/grsec_time.c linux-2.6.32.24/grsecurity/grsec_time.c
43694--- linux-2.6.32.23/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 43706--- linux-2.6.32.24/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
43695+++ linux-2.6.32.23/grsecurity/grsec_time.c 2010-09-04 15:54:52.000000000 -0400 43707+++ linux-2.6.32.24/grsecurity/grsec_time.c 2010-09-04 15:54:52.000000000 -0400
43696@@ -0,0 +1,13 @@ 43708@@ -0,0 +1,13 @@
43697+#include <linux/kernel.h> 43709+#include <linux/kernel.h>
43698+#include <linux/sched.h> 43710+#include <linux/sched.h>
@@ -43707,9 +43719,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_time.c linux-2.6.32.23/grsecurity/gr
43707+#endif 43719+#endif
43708+ return; 43720+ return;
43709+} 43721+}
43710diff -urNp linux-2.6.32.23/grsecurity/grsec_tpe.c linux-2.6.32.23/grsecurity/grsec_tpe.c 43722diff -urNp linux-2.6.32.24/grsecurity/grsec_tpe.c linux-2.6.32.24/grsecurity/grsec_tpe.c
43711--- linux-2.6.32.23/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 43723--- linux-2.6.32.24/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
43712+++ linux-2.6.32.23/grsecurity/grsec_tpe.c 2010-09-17 19:28:20.000000000 -0400 43724+++ linux-2.6.32.24/grsecurity/grsec_tpe.c 2010-09-17 19:28:20.000000000 -0400
43713@@ -0,0 +1,39 @@ 43725@@ -0,0 +1,39 @@
43714+#include <linux/kernel.h> 43726+#include <linux/kernel.h>
43715+#include <linux/sched.h> 43727+#include <linux/sched.h>
@@ -43750,9 +43762,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsec_tpe.c linux-2.6.32.23/grsecurity/grs
43750+#endif 43762+#endif
43751+ return 1; 43763+ return 1;
43752+} 43764+}
43753diff -urNp linux-2.6.32.23/grsecurity/grsum.c linux-2.6.32.23/grsecurity/grsum.c 43765diff -urNp linux-2.6.32.24/grsecurity/grsum.c linux-2.6.32.24/grsecurity/grsum.c
43754--- linux-2.6.32.23/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 43766--- linux-2.6.32.24/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
43755+++ linux-2.6.32.23/grsecurity/grsum.c 2010-09-04 15:54:52.000000000 -0400 43767+++ linux-2.6.32.24/grsecurity/grsum.c 2010-09-04 15:54:52.000000000 -0400
43756@@ -0,0 +1,61 @@ 43768@@ -0,0 +1,61 @@
43757+#include <linux/err.h> 43769+#include <linux/err.h>
43758+#include <linux/kernel.h> 43770+#include <linux/kernel.h>
@@ -43815,9 +43827,9 @@ diff -urNp linux-2.6.32.23/grsecurity/grsum.c linux-2.6.32.23/grsecurity/grsum.c
43815+ 43827+
43816+ return retval; 43828+ return retval;
43817+} 43829+}
43818diff -urNp linux-2.6.32.23/grsecurity/Kconfig linux-2.6.32.23/grsecurity/Kconfig 43830diff -urNp linux-2.6.32.24/grsecurity/Kconfig linux-2.6.32.24/grsecurity/Kconfig
43819--- linux-2.6.32.23/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 43831--- linux-2.6.32.24/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
43820+++ linux-2.6.32.23/grsecurity/Kconfig 2010-09-17 19:36:28.000000000 -0400 43832+++ linux-2.6.32.24/grsecurity/Kconfig 2010-09-17 19:36:28.000000000 -0400
43821@@ -0,0 +1,986 @@ 43833@@ -0,0 +1,986 @@
43822+# 43834+#
43823+# grecurity configuration 43835+# grecurity configuration
@@ -44805,9 +44817,9 @@ diff -urNp linux-2.6.32.23/grsecurity/Kconfig linux-2.6.32.23/grsecurity/Kconfig
44805+endmenu 44817+endmenu
44806+ 44818+
44807+endmenu 44819+endmenu
44808diff -urNp linux-2.6.32.23/grsecurity/Makefile linux-2.6.32.23/grsecurity/Makefile 44820diff -urNp linux-2.6.32.24/grsecurity/Makefile linux-2.6.32.24/grsecurity/Makefile
44809--- linux-2.6.32.23/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 44821--- linux-2.6.32.24/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
44810+++ linux-2.6.32.23/grsecurity/Makefile 2010-09-04 15:54:52.000000000 -0400 44822+++ linux-2.6.32.24/grsecurity/Makefile 2010-09-04 15:54:52.000000000 -0400
44811@@ -0,0 +1,29 @@ 44823@@ -0,0 +1,29 @@
44812+# grsecurity's ACL system was originally written in 2001 by Michael Dalton 44824+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
44813+# during 2001-2009 it has been completely redesigned by Brad Spengler 44825+# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -44838,9 +44850,9 @@ diff -urNp linux-2.6.32.23/grsecurity/Makefile linux-2.6.32.23/grsecurity/Makefi
44838+ @-chmod -f 700 . 44850+ @-chmod -f 700 .
44839+ @echo ' grsec: protected kernel image paths' 44851+ @echo ' grsec: protected kernel image paths'
44840+endif 44852+endif
44841diff -urNp linux-2.6.32.23/include/acpi/acoutput.h linux-2.6.32.23/include/acpi/acoutput.h 44853diff -urNp linux-2.6.32.24/include/acpi/acoutput.h linux-2.6.32.24/include/acpi/acoutput.h
44842--- linux-2.6.32.23/include/acpi/acoutput.h 2010-08-13 16:24:37.000000000 -0400 44854--- linux-2.6.32.24/include/acpi/acoutput.h 2010-08-13 16:24:37.000000000 -0400
44843+++ linux-2.6.32.23/include/acpi/acoutput.h 2010-09-04 15:54:52.000000000 -0400 44855+++ linux-2.6.32.24/include/acpi/acoutput.h 2010-09-04 15:54:52.000000000 -0400
44844@@ -264,8 +264,8 @@ 44856@@ -264,8 +264,8 @@
44845 * leaving no executable debug code! 44857 * leaving no executable debug code!
44846 */ 44858 */
@@ -44852,9 +44864,9 @@ diff -urNp linux-2.6.32.23/include/acpi/acoutput.h linux-2.6.32.23/include/acpi/
44852 44864
44853 #endif /* ACPI_DEBUG_OUTPUT */ 44865 #endif /* ACPI_DEBUG_OUTPUT */
44854 44866
44855diff -urNp linux-2.6.32.23/include/acpi/acpi_drivers.h linux-2.6.32.23/include/acpi/acpi_drivers.h 44867diff -urNp linux-2.6.32.24/include/acpi/acpi_drivers.h linux-2.6.32.24/include/acpi/acpi_drivers.h
44856--- linux-2.6.32.23/include/acpi/acpi_drivers.h 2010-08-13 16:24:37.000000000 -0400 44868--- linux-2.6.32.24/include/acpi/acpi_drivers.h 2010-08-13 16:24:37.000000000 -0400
44857+++ linux-2.6.32.23/include/acpi/acpi_drivers.h 2010-09-04 15:54:52.000000000 -0400 44869+++ linux-2.6.32.24/include/acpi/acpi_drivers.h 2010-09-04 15:54:52.000000000 -0400
44858@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp 44870@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
44859 Dock Station 44871 Dock Station
44860 -------------------------------------------------------------------------- */ 44872 -------------------------------------------------------------------------- */
@@ -44884,9 +44896,9 @@ diff -urNp linux-2.6.32.23/include/acpi/acpi_drivers.h linux-2.6.32.23/include/a
44884 void *context) 44896 void *context)
44885 { 44897 {
44886 return -ENODEV; 44898 return -ENODEV;
44887diff -urNp linux-2.6.32.23/include/asm-generic/atomic-long.h linux-2.6.32.23/include/asm-generic/atomic-long.h 44899diff -urNp linux-2.6.32.24/include/asm-generic/atomic-long.h linux-2.6.32.24/include/asm-generic/atomic-long.h
44888--- linux-2.6.32.23/include/asm-generic/atomic-long.h 2010-08-13 16:24:37.000000000 -0400 44900--- linux-2.6.32.24/include/asm-generic/atomic-long.h 2010-08-13 16:24:37.000000000 -0400
44889+++ linux-2.6.32.23/include/asm-generic/atomic-long.h 2010-09-04 15:54:56.000000000 -0400 44901+++ linux-2.6.32.24/include/asm-generic/atomic-long.h 2010-09-04 15:54:56.000000000 -0400
44890@@ -22,6 +22,12 @@ 44902@@ -22,6 +22,12 @@
44891 44903
44892 typedef atomic64_t atomic_long_t; 44904 typedef atomic64_t atomic_long_t;
@@ -45143,9 +45155,9 @@ diff -urNp linux-2.6.32.23/include/asm-generic/atomic-long.h linux-2.6.32.23/inc
45143+#endif 45155+#endif
45144+ 45156+
45145 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ 45157 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
45146diff -urNp linux-2.6.32.23/include/asm-generic/dma-mapping-common.h linux-2.6.32.23/include/asm-generic/dma-mapping-common.h 45158diff -urNp linux-2.6.32.24/include/asm-generic/dma-mapping-common.h linux-2.6.32.24/include/asm-generic/dma-mapping-common.h
45147--- linux-2.6.32.23/include/asm-generic/dma-mapping-common.h 2010-08-13 16:24:37.000000000 -0400 45159--- linux-2.6.32.24/include/asm-generic/dma-mapping-common.h 2010-08-13 16:24:37.000000000 -0400
45148+++ linux-2.6.32.23/include/asm-generic/dma-mapping-common.h 2010-09-04 15:54:52.000000000 -0400 45160+++ linux-2.6.32.24/include/asm-generic/dma-mapping-common.h 2010-09-04 15:54:52.000000000 -0400
45149@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ 45161@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
45150 enum dma_data_direction dir, 45162 enum dma_data_direction dir,
45151 struct dma_attrs *attrs) 45163 struct dma_attrs *attrs)
@@ -45254,9 +45266,9 @@ diff -urNp linux-2.6.32.23/include/asm-generic/dma-mapping-common.h linux-2.6.32
45254 45266
45255 BUG_ON(!valid_dma_direction(dir)); 45267 BUG_ON(!valid_dma_direction(dir));
45256 if (ops->sync_sg_for_device) 45268 if (ops->sync_sg_for_device)
45257diff -urNp linux-2.6.32.23/include/asm-generic/futex.h linux-2.6.32.23/include/asm-generic/futex.h 45269diff -urNp linux-2.6.32.24/include/asm-generic/futex.h linux-2.6.32.24/include/asm-generic/futex.h
45258--- linux-2.6.32.23/include/asm-generic/futex.h 2010-08-13 16:24:37.000000000 -0400 45270--- linux-2.6.32.24/include/asm-generic/futex.h 2010-08-13 16:24:37.000000000 -0400
45259+++ linux-2.6.32.23/include/asm-generic/futex.h 2010-09-04 15:54:52.000000000 -0400 45271+++ linux-2.6.32.24/include/asm-generic/futex.h 2010-09-04 15:54:52.000000000 -0400
45260@@ -6,7 +6,7 @@ 45272@@ -6,7 +6,7 @@
45261 #include <asm/errno.h> 45273 #include <asm/errno.h>
45262 45274
@@ -45275,9 +45287,9 @@ diff -urNp linux-2.6.32.23/include/asm-generic/futex.h linux-2.6.32.23/include/a
45275 { 45287 {
45276 return -ENOSYS; 45288 return -ENOSYS;
45277 } 45289 }
45278diff -urNp linux-2.6.32.23/include/asm-generic/int-l64.h linux-2.6.32.23/include/asm-generic/int-l64.h 45290diff -urNp linux-2.6.32.24/include/asm-generic/int-l64.h linux-2.6.32.24/include/asm-generic/int-l64.h
45279--- linux-2.6.32.23/include/asm-generic/int-l64.h 2010-08-13 16:24:37.000000000 -0400 45291--- linux-2.6.32.24/include/asm-generic/int-l64.h 2010-08-13 16:24:37.000000000 -0400
45280+++ linux-2.6.32.23/include/asm-generic/int-l64.h 2010-09-04 15:54:52.000000000 -0400 45292+++ linux-2.6.32.24/include/asm-generic/int-l64.h 2010-09-04 15:54:52.000000000 -0400
45281@@ -46,6 +46,8 @@ typedef unsigned int u32; 45293@@ -46,6 +46,8 @@ typedef unsigned int u32;
45282 typedef signed long s64; 45294 typedef signed long s64;
45283 typedef unsigned long u64; 45295 typedef unsigned long u64;
@@ -45287,9 +45299,9 @@ diff -urNp linux-2.6.32.23/include/asm-generic/int-l64.h linux-2.6.32.23/include
45287 #define S8_C(x) x 45299 #define S8_C(x) x
45288 #define U8_C(x) x ## U 45300 #define U8_C(x) x ## U
45289 #define S16_C(x) x 45301 #define S16_C(x) x
45290diff -urNp linux-2.6.32.23/include/asm-generic/int-ll64.h linux-2.6.32.23/include/asm-generic/int-ll64.h 45302diff -urNp linux-2.6.32.24/include/asm-generic/int-ll64.h linux-2.6.32.24/include/asm-generic/int-ll64.h
45291--- linux-2.6.32.23/include/asm-generic/int-ll64.h 2010-08-13 16:24:37.000000000 -0400 45303--- linux-2.6.32.24/include/asm-generic/int-ll64.h 2010-08-13 16:24:37.000000000 -0400
45292+++ linux-2.6.32.23/include/asm-generic/int-ll64.h 2010-09-04 15:54:52.000000000 -0400 45304+++ linux-2.6.32.24/include/asm-generic/int-ll64.h 2010-09-04 15:54:52.000000000 -0400
45293@@ -51,6 +51,8 @@ typedef unsigned int u32; 45305@@ -51,6 +51,8 @@ typedef unsigned int u32;
45294 typedef signed long long s64; 45306 typedef signed long long s64;
45295 typedef unsigned long long u64; 45307 typedef unsigned long long u64;
@@ -45299,9 +45311,9 @@ diff -urNp linux-2.6.32.23/include/asm-generic/int-ll64.h linux-2.6.32.23/includ
45299 #define S8_C(x) x 45311 #define S8_C(x) x
45300 #define U8_C(x) x ## U 45312 #define U8_C(x) x ## U
45301 #define S16_C(x) x 45313 #define S16_C(x) x
45302diff -urNp linux-2.6.32.23/include/asm-generic/kmap_types.h linux-2.6.32.23/include/asm-generic/kmap_types.h 45314diff -urNp linux-2.6.32.24/include/asm-generic/kmap_types.h linux-2.6.32.24/include/asm-generic/kmap_types.h
45303--- linux-2.6.32.23/include/asm-generic/kmap_types.h 2010-08-13 16:24:37.000000000 -0400 45315--- linux-2.6.32.24/include/asm-generic/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
45304+++ linux-2.6.32.23/include/asm-generic/kmap_types.h 2010-09-04 15:54:52.000000000 -0400 45316+++ linux-2.6.32.24/include/asm-generic/kmap_types.h 2010-09-04 15:54:52.000000000 -0400
45305@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, 45317@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
45306 KMAP_D(16) KM_IRQ_PTE, 45318 KMAP_D(16) KM_IRQ_PTE,
45307 KMAP_D(17) KM_NMI, 45319 KMAP_D(17) KM_NMI,
@@ -45312,9 +45324,9 @@ diff -urNp linux-2.6.32.23/include/asm-generic/kmap_types.h linux-2.6.32.23/incl
45312 }; 45324 };
45313 45325
45314 #undef KMAP_D 45326 #undef KMAP_D
45315diff -urNp linux-2.6.32.23/include/asm-generic/pgtable.h linux-2.6.32.23/include/asm-generic/pgtable.h 45327diff -urNp linux-2.6.32.24/include/asm-generic/pgtable.h linux-2.6.32.24/include/asm-generic/pgtable.h
45316--- linux-2.6.32.23/include/asm-generic/pgtable.h 2010-08-13 16:24:37.000000000 -0400 45328--- linux-2.6.32.24/include/asm-generic/pgtable.h 2010-08-13 16:24:37.000000000 -0400
45317+++ linux-2.6.32.23/include/asm-generic/pgtable.h 2010-09-04 15:54:52.000000000 -0400 45329+++ linux-2.6.32.24/include/asm-generic/pgtable.h 2010-09-04 15:54:52.000000000 -0400
45318@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar 45330@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
45319 unsigned long size); 45331 unsigned long size);
45320 #endif 45332 #endif
@@ -45330,9 +45342,9 @@ diff -urNp linux-2.6.32.23/include/asm-generic/pgtable.h linux-2.6.32.23/include
45330 #endif /* !__ASSEMBLY__ */ 45342 #endif /* !__ASSEMBLY__ */
45331 45343
45332 #endif /* _ASM_GENERIC_PGTABLE_H */ 45344 #endif /* _ASM_GENERIC_PGTABLE_H */
45333diff -urNp linux-2.6.32.23/include/asm-generic/pgtable-nopmd.h linux-2.6.32.23/include/asm-generic/pgtable-nopmd.h 45345diff -urNp linux-2.6.32.24/include/asm-generic/pgtable-nopmd.h linux-2.6.32.24/include/asm-generic/pgtable-nopmd.h
45334--- linux-2.6.32.23/include/asm-generic/pgtable-nopmd.h 2010-08-13 16:24:37.000000000 -0400 45346--- linux-2.6.32.24/include/asm-generic/pgtable-nopmd.h 2010-08-13 16:24:37.000000000 -0400
45335+++ linux-2.6.32.23/include/asm-generic/pgtable-nopmd.h 2010-09-04 15:54:52.000000000 -0400 45347+++ linux-2.6.32.24/include/asm-generic/pgtable-nopmd.h 2010-09-04 15:54:52.000000000 -0400
45336@@ -1,14 +1,19 @@ 45348@@ -1,14 +1,19 @@
45337 #ifndef _PGTABLE_NOPMD_H 45349 #ifndef _PGTABLE_NOPMD_H
45338 #define _PGTABLE_NOPMD_H 45350 #define _PGTABLE_NOPMD_H
@@ -45369,9 +45381,9 @@ diff -urNp linux-2.6.32.23/include/asm-generic/pgtable-nopmd.h linux-2.6.32.23/i
45369 /* 45381 /*
45370 * The "pud_xxx()" functions here are trivial for a folded two-level 45382 * The "pud_xxx()" functions here are trivial for a folded two-level
45371 * setup: the pmd is never bad, and a pmd always exists (as it's folded 45383 * setup: the pmd is never bad, and a pmd always exists (as it's folded
45372diff -urNp linux-2.6.32.23/include/asm-generic/pgtable-nopud.h linux-2.6.32.23/include/asm-generic/pgtable-nopud.h 45384diff -urNp linux-2.6.32.24/include/asm-generic/pgtable-nopud.h linux-2.6.32.24/include/asm-generic/pgtable-nopud.h
45373--- linux-2.6.32.23/include/asm-generic/pgtable-nopud.h 2010-08-13 16:24:37.000000000 -0400 45385--- linux-2.6.32.24/include/asm-generic/pgtable-nopud.h 2010-08-13 16:24:37.000000000 -0400
45374+++ linux-2.6.32.23/include/asm-generic/pgtable-nopud.h 2010-09-04 15:54:52.000000000 -0400 45386+++ linux-2.6.32.24/include/asm-generic/pgtable-nopud.h 2010-09-04 15:54:52.000000000 -0400
45375@@ -1,10 +1,15 @@ 45387@@ -1,10 +1,15 @@
45376 #ifndef _PGTABLE_NOPUD_H 45388 #ifndef _PGTABLE_NOPUD_H
45377 #define _PGTABLE_NOPUD_H 45389 #define _PGTABLE_NOPUD_H
@@ -45402,9 +45414,9 @@ diff -urNp linux-2.6.32.23/include/asm-generic/pgtable-nopud.h linux-2.6.32.23/i
45402 /* 45414 /*
45403 * The "pgd_xxx()" functions here are trivial for a folded two-level 45415 * The "pgd_xxx()" functions here are trivial for a folded two-level
45404 * setup: the pud is never bad, and a pud always exists (as it's folded 45416 * setup: the pud is never bad, and a pud always exists (as it's folded
45405diff -urNp linux-2.6.32.23/include/asm-generic/vmlinux.lds.h linux-2.6.32.23/include/asm-generic/vmlinux.lds.h 45417diff -urNp linux-2.6.32.24/include/asm-generic/vmlinux.lds.h linux-2.6.32.24/include/asm-generic/vmlinux.lds.h
45406--- linux-2.6.32.23/include/asm-generic/vmlinux.lds.h 2010-08-13 16:24:37.000000000 -0400 45418--- linux-2.6.32.24/include/asm-generic/vmlinux.lds.h 2010-08-13 16:24:37.000000000 -0400
45407+++ linux-2.6.32.23/include/asm-generic/vmlinux.lds.h 2010-09-04 15:54:52.000000000 -0400 45419+++ linux-2.6.32.24/include/asm-generic/vmlinux.lds.h 2010-09-04 15:54:52.000000000 -0400
45408@@ -199,6 +199,7 @@ 45420@@ -199,6 +199,7 @@
45409 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ 45421 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
45410 VMLINUX_SYMBOL(__start_rodata) = .; \ 45422 VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -45443,9 +45455,9 @@ diff -urNp linux-2.6.32.23/include/asm-generic/vmlinux.lds.h linux-2.6.32.23/inc
45443 45455
45444 /** 45456 /**
45445 * PERCPU - define output section for percpu area, simple version 45457 * PERCPU - define output section for percpu area, simple version
45446diff -urNp linux-2.6.32.23/include/drm/drm_pciids.h linux-2.6.32.23/include/drm/drm_pciids.h 45458diff -urNp linux-2.6.32.24/include/drm/drm_pciids.h linux-2.6.32.24/include/drm/drm_pciids.h
45447--- linux-2.6.32.23/include/drm/drm_pciids.h 2010-08-13 16:24:37.000000000 -0400 45459--- linux-2.6.32.24/include/drm/drm_pciids.h 2010-08-13 16:24:37.000000000 -0400
45448+++ linux-2.6.32.23/include/drm/drm_pciids.h 2010-09-04 15:54:52.000000000 -0400 45460+++ linux-2.6.32.24/include/drm/drm_pciids.h 2010-09-04 15:54:52.000000000 -0400
45449@@ -377,7 +377,7 @@ 45461@@ -377,7 +377,7 @@
45450 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 45462 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
45451 {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 45463 {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -45549,9 +45561,9 @@ diff -urNp linux-2.6.32.23/include/drm/drm_pciids.h linux-2.6.32.23/include/drm/
45549 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 45561 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
45550- {0, 0, 0} 45562- {0, 0, 0}
45551+ {0, 0, 0, 0, 0, 0} 45563+ {0, 0, 0, 0, 0, 0}
45552diff -urNp linux-2.6.32.23/include/drm/drmP.h linux-2.6.32.23/include/drm/drmP.h 45564diff -urNp linux-2.6.32.24/include/drm/drmP.h linux-2.6.32.24/include/drm/drmP.h
45553--- linux-2.6.32.23/include/drm/drmP.h 2010-08-13 16:24:37.000000000 -0400 45565--- linux-2.6.32.24/include/drm/drmP.h 2010-08-13 16:24:37.000000000 -0400
45554+++ linux-2.6.32.23/include/drm/drmP.h 2010-09-04 15:54:52.000000000 -0400 45566+++ linux-2.6.32.24/include/drm/drmP.h 2010-09-04 15:54:52.000000000 -0400
45555@@ -814,7 +814,7 @@ struct drm_driver { 45567@@ -814,7 +814,7 @@ struct drm_driver {
45556 void (*vgaarb_irq)(struct drm_device *dev, bool state); 45568 void (*vgaarb_irq)(struct drm_device *dev, bool state);
45557 45569
@@ -45579,9 +45591,9 @@ diff -urNp linux-2.6.32.23/include/drm/drmP.h linux-2.6.32.23/include/drm/drmP.h
45579 /*@} */ 45591 /*@} */
45580 45592
45581 struct list_head filelist; 45593 struct list_head filelist;
45582diff -urNp linux-2.6.32.23/include/linux/a.out.h linux-2.6.32.23/include/linux/a.out.h 45594diff -urNp linux-2.6.32.24/include/linux/a.out.h linux-2.6.32.24/include/linux/a.out.h
45583--- linux-2.6.32.23/include/linux/a.out.h 2010-08-13 16:24:37.000000000 -0400 45595--- linux-2.6.32.24/include/linux/a.out.h 2010-08-13 16:24:37.000000000 -0400
45584+++ linux-2.6.32.23/include/linux/a.out.h 2010-09-04 15:54:52.000000000 -0400 45596+++ linux-2.6.32.24/include/linux/a.out.h 2010-09-04 15:54:52.000000000 -0400
45585@@ -39,6 +39,14 @@ enum machine_type { 45597@@ -39,6 +39,14 @@ enum machine_type {
45586 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ 45598 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
45587 }; 45599 };
@@ -45597,9 +45609,9 @@ diff -urNp linux-2.6.32.23/include/linux/a.out.h linux-2.6.32.23/include/linux/a
45597 #if !defined (N_MAGIC) 45609 #if !defined (N_MAGIC)
45598 #define N_MAGIC(exec) ((exec).a_info & 0xffff) 45610 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
45599 #endif 45611 #endif
45600diff -urNp linux-2.6.32.23/include/linux/atmdev.h linux-2.6.32.23/include/linux/atmdev.h 45612diff -urNp linux-2.6.32.24/include/linux/atmdev.h linux-2.6.32.24/include/linux/atmdev.h
45601--- linux-2.6.32.23/include/linux/atmdev.h 2010-08-13 16:24:37.000000000 -0400 45613--- linux-2.6.32.24/include/linux/atmdev.h 2010-08-13 16:24:37.000000000 -0400
45602+++ linux-2.6.32.23/include/linux/atmdev.h 2010-09-04 15:54:52.000000000 -0400 45614+++ linux-2.6.32.24/include/linux/atmdev.h 2010-09-04 15:54:52.000000000 -0400
45603@@ -237,7 +237,7 @@ struct compat_atm_iobuf { 45615@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
45604 #endif 45616 #endif
45605 45617
@@ -45609,9 +45621,9 @@ diff -urNp linux-2.6.32.23/include/linux/atmdev.h linux-2.6.32.23/include/linux/
45609 __AAL_STAT_ITEMS 45621 __AAL_STAT_ITEMS
45610 #undef __HANDLE_ITEM 45622 #undef __HANDLE_ITEM
45611 }; 45623 };
45612diff -urNp linux-2.6.32.23/include/linux/backlight.h linux-2.6.32.23/include/linux/backlight.h 45624diff -urNp linux-2.6.32.24/include/linux/backlight.h linux-2.6.32.24/include/linux/backlight.h
45613--- linux-2.6.32.23/include/linux/backlight.h 2010-08-13 16:24:37.000000000 -0400 45625--- linux-2.6.32.24/include/linux/backlight.h 2010-08-13 16:24:37.000000000 -0400
45614+++ linux-2.6.32.23/include/linux/backlight.h 2010-09-04 15:54:52.000000000 -0400 45626+++ linux-2.6.32.24/include/linux/backlight.h 2010-09-04 15:54:52.000000000 -0400
45615@@ -36,18 +36,18 @@ struct backlight_device; 45627@@ -36,18 +36,18 @@ struct backlight_device;
45616 struct fb_info; 45628 struct fb_info;
45617 45629
@@ -45653,9 +45665,9 @@ diff -urNp linux-2.6.32.23/include/linux/backlight.h linux-2.6.32.23/include/lin
45653 extern void backlight_device_unregister(struct backlight_device *bd); 45665 extern void backlight_device_unregister(struct backlight_device *bd);
45654 extern void backlight_force_update(struct backlight_device *bd, 45666 extern void backlight_force_update(struct backlight_device *bd,
45655 enum backlight_update_reason reason); 45667 enum backlight_update_reason reason);
45656diff -urNp linux-2.6.32.23/include/linux/binfmts.h linux-2.6.32.23/include/linux/binfmts.h 45668diff -urNp linux-2.6.32.24/include/linux/binfmts.h linux-2.6.32.24/include/linux/binfmts.h
45657--- linux-2.6.32.23/include/linux/binfmts.h 2010-08-13 16:24:37.000000000 -0400 45669--- linux-2.6.32.24/include/linux/binfmts.h 2010-08-13 16:24:37.000000000 -0400
45658+++ linux-2.6.32.23/include/linux/binfmts.h 2010-09-04 15:54:52.000000000 -0400 45670+++ linux-2.6.32.24/include/linux/binfmts.h 2010-09-04 15:54:52.000000000 -0400
45659@@ -78,6 +78,7 @@ struct linux_binfmt { 45671@@ -78,6 +78,7 @@ struct linux_binfmt {
45660 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); 45672 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
45661 int (*load_shlib)(struct file *); 45673 int (*load_shlib)(struct file *);
@@ -45664,9 +45676,9 @@ diff -urNp linux-2.6.32.23/include/linux/binfmts.h linux-2.6.32.23/include/linux
45664 unsigned long min_coredump; /* minimal dump size */ 45676 unsigned long min_coredump; /* minimal dump size */
45665 int hasvdso; 45677 int hasvdso;
45666 }; 45678 };
45667diff -urNp linux-2.6.32.23/include/linux/blkdev.h linux-2.6.32.23/include/linux/blkdev.h 45679diff -urNp linux-2.6.32.24/include/linux/blkdev.h linux-2.6.32.24/include/linux/blkdev.h
45668--- linux-2.6.32.23/include/linux/blkdev.h 2010-08-13 16:24:37.000000000 -0400 45680--- linux-2.6.32.24/include/linux/blkdev.h 2010-08-13 16:24:37.000000000 -0400
45669+++ linux-2.6.32.23/include/linux/blkdev.h 2010-09-04 15:54:52.000000000 -0400 45681+++ linux-2.6.32.24/include/linux/blkdev.h 2010-09-04 15:54:52.000000000 -0400
45670@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc 45682@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc
45671 #endif /* CONFIG_BLK_DEV_INTEGRITY */ 45683 #endif /* CONFIG_BLK_DEV_INTEGRITY */
45672 45684
@@ -45698,9 +45710,9 @@ diff -urNp linux-2.6.32.23/include/linux/blkdev.h linux-2.6.32.23/include/linux/
45698 }; 45710 };
45699 45711
45700 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, 45712 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
45701diff -urNp linux-2.6.32.23/include/linux/cache.h linux-2.6.32.23/include/linux/cache.h 45713diff -urNp linux-2.6.32.24/include/linux/cache.h linux-2.6.32.24/include/linux/cache.h
45702--- linux-2.6.32.23/include/linux/cache.h 2010-08-13 16:24:37.000000000 -0400 45714--- linux-2.6.32.24/include/linux/cache.h 2010-08-13 16:24:37.000000000 -0400
45703+++ linux-2.6.32.23/include/linux/cache.h 2010-09-04 15:54:52.000000000 -0400 45715+++ linux-2.6.32.24/include/linux/cache.h 2010-09-04 15:54:52.000000000 -0400
45704@@ -16,6 +16,10 @@ 45716@@ -16,6 +16,10 @@
45705 #define __read_mostly 45717 #define __read_mostly
45706 #endif 45718 #endif
@@ -45712,9 +45724,9 @@ diff -urNp linux-2.6.32.23/include/linux/cache.h linux-2.6.32.23/include/linux/c
45712 #ifndef ____cacheline_aligned 45724 #ifndef ____cacheline_aligned
45713 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) 45725 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
45714 #endif 45726 #endif
45715diff -urNp linux-2.6.32.23/include/linux/capability.h linux-2.6.32.23/include/linux/capability.h 45727diff -urNp linux-2.6.32.24/include/linux/capability.h linux-2.6.32.24/include/linux/capability.h
45716--- linux-2.6.32.23/include/linux/capability.h 2010-08-13 16:24:37.000000000 -0400 45728--- linux-2.6.32.24/include/linux/capability.h 2010-08-13 16:24:37.000000000 -0400
45717+++ linux-2.6.32.23/include/linux/capability.h 2010-09-04 15:54:52.000000000 -0400 45729+++ linux-2.6.32.24/include/linux/capability.h 2010-09-04 15:54:52.000000000 -0400
45718@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff 45730@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
45719 (security_real_capable_noaudit((t), (cap)) == 0) 45731 (security_real_capable_noaudit((t), (cap)) == 0)
45720 45732
@@ -45723,9 +45735,9 @@ diff -urNp linux-2.6.32.23/include/linux/capability.h linux-2.6.32.23/include/li
45723 45735
45724 /* audit system wants to get cap info from files as well */ 45736 /* audit system wants to get cap info from files as well */
45725 struct dentry; 45737 struct dentry;
45726diff -urNp linux-2.6.32.23/include/linux/compiler-gcc4.h linux-2.6.32.23/include/linux/compiler-gcc4.h 45738diff -urNp linux-2.6.32.24/include/linux/compiler-gcc4.h linux-2.6.32.24/include/linux/compiler-gcc4.h
45727--- linux-2.6.32.23/include/linux/compiler-gcc4.h 2010-08-13 16:24:37.000000000 -0400 45739--- linux-2.6.32.24/include/linux/compiler-gcc4.h 2010-08-13 16:24:37.000000000 -0400
45728+++ linux-2.6.32.23/include/linux/compiler-gcc4.h 2010-09-04 15:54:52.000000000 -0400 45740+++ linux-2.6.32.24/include/linux/compiler-gcc4.h 2010-09-04 15:54:52.000000000 -0400
45729@@ -36,4 +36,8 @@ 45741@@ -36,4 +36,8 @@
45730 the kernel context */ 45742 the kernel context */
45731 #define __cold __attribute__((__cold__)) 45743 #define __cold __attribute__((__cold__))
@@ -45735,9 +45747,9 @@ diff -urNp linux-2.6.32.23/include/linux/compiler-gcc4.h linux-2.6.32.23/include
45735+#define __bos0(ptr) __bos((ptr), 0) 45747+#define __bos0(ptr) __bos((ptr), 0)
45736+#define __bos1(ptr) __bos((ptr), 1) 45748+#define __bos1(ptr) __bos((ptr), 1)
45737 #endif 45749 #endif
45738diff -urNp linux-2.6.32.23/include/linux/compiler.h linux-2.6.32.23/include/linux/compiler.h 45750diff -urNp linux-2.6.32.24/include/linux/compiler.h linux-2.6.32.24/include/linux/compiler.h
45739--- linux-2.6.32.23/include/linux/compiler.h 2010-08-13 16:24:37.000000000 -0400 45751--- linux-2.6.32.24/include/linux/compiler.h 2010-08-13 16:24:37.000000000 -0400
45740+++ linux-2.6.32.23/include/linux/compiler.h 2010-09-04 15:54:52.000000000 -0400 45752+++ linux-2.6.32.24/include/linux/compiler.h 2010-09-04 15:54:52.000000000 -0400
45741@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ 45753@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
45742 #define __cold 45754 #define __cold
45743 #endif 45755 #endif
@@ -45761,9 +45773,9 @@ diff -urNp linux-2.6.32.23/include/linux/compiler.h linux-2.6.32.23/include/linu
45761 /* Simple shorthand for a section definition */ 45773 /* Simple shorthand for a section definition */
45762 #ifndef __section 45774 #ifndef __section
45763 # define __section(S) __attribute__ ((__section__(#S))) 45775 # define __section(S) __attribute__ ((__section__(#S)))
45764diff -urNp linux-2.6.32.23/include/linux/decompress/mm.h linux-2.6.32.23/include/linux/decompress/mm.h 45776diff -urNp linux-2.6.32.24/include/linux/decompress/mm.h linux-2.6.32.24/include/linux/decompress/mm.h
45765--- linux-2.6.32.23/include/linux/decompress/mm.h 2010-08-13 16:24:37.000000000 -0400 45777--- linux-2.6.32.24/include/linux/decompress/mm.h 2010-08-13 16:24:37.000000000 -0400
45766+++ linux-2.6.32.23/include/linux/decompress/mm.h 2010-09-04 15:54:52.000000000 -0400 45778+++ linux-2.6.32.24/include/linux/decompress/mm.h 2010-09-04 15:54:52.000000000 -0400
45767@@ -78,7 +78,7 @@ static void free(void *where) 45779@@ -78,7 +78,7 @@ static void free(void *where)
45768 * warnings when not needed (indeed large_malloc / large_free are not 45780 * warnings when not needed (indeed large_malloc / large_free are not
45769 * needed by inflate */ 45781 * needed by inflate */
@@ -45773,9 +45785,9 @@ diff -urNp linux-2.6.32.23/include/linux/decompress/mm.h linux-2.6.32.23/include
45773 #define free(a) kfree(a) 45785 #define free(a) kfree(a)
45774 45786
45775 #define large_malloc(a) vmalloc(a) 45787 #define large_malloc(a) vmalloc(a)
45776diff -urNp linux-2.6.32.23/include/linux/dma-mapping.h linux-2.6.32.23/include/linux/dma-mapping.h 45788diff -urNp linux-2.6.32.24/include/linux/dma-mapping.h linux-2.6.32.24/include/linux/dma-mapping.h
45777--- linux-2.6.32.23/include/linux/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400 45789--- linux-2.6.32.24/include/linux/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
45778+++ linux-2.6.32.23/include/linux/dma-mapping.h 2010-09-04 15:54:52.000000000 -0400 45790+++ linux-2.6.32.24/include/linux/dma-mapping.h 2010-09-04 15:54:52.000000000 -0400
45779@@ -16,50 +16,50 @@ enum dma_data_direction { 45791@@ -16,50 +16,50 @@ enum dma_data_direction {
45780 }; 45792 };
45781 45793
@@ -45842,9 +45854,9 @@ diff -urNp linux-2.6.32.23/include/linux/dma-mapping.h linux-2.6.32.23/include/l
45842 }; 45854 };
45843 45855
45844 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) 45856 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
45845diff -urNp linux-2.6.32.23/include/linux/dst.h linux-2.6.32.23/include/linux/dst.h 45857diff -urNp linux-2.6.32.24/include/linux/dst.h linux-2.6.32.24/include/linux/dst.h
45846--- linux-2.6.32.23/include/linux/dst.h 2010-08-13 16:24:37.000000000 -0400 45858--- linux-2.6.32.24/include/linux/dst.h 2010-08-13 16:24:37.000000000 -0400
45847+++ linux-2.6.32.23/include/linux/dst.h 2010-09-04 15:54:52.000000000 -0400 45859+++ linux-2.6.32.24/include/linux/dst.h 2010-09-04 15:54:52.000000000 -0400
45848@@ -380,7 +380,7 @@ struct dst_node 45860@@ -380,7 +380,7 @@ struct dst_node
45849 struct thread_pool *pool; 45861 struct thread_pool *pool;
45850 45862
@@ -45854,9 +45866,9 @@ diff -urNp linux-2.6.32.23/include/linux/dst.h linux-2.6.32.23/include/linux/dst
45854 45866
45855 /* 45867 /*
45856 * How frequently and how many times transaction 45868 * How frequently and how many times transaction
45857diff -urNp linux-2.6.32.23/include/linux/elf.h linux-2.6.32.23/include/linux/elf.h 45869diff -urNp linux-2.6.32.24/include/linux/elf.h linux-2.6.32.24/include/linux/elf.h
45858--- linux-2.6.32.23/include/linux/elf.h 2010-08-13 16:24:37.000000000 -0400 45870--- linux-2.6.32.24/include/linux/elf.h 2010-08-13 16:24:37.000000000 -0400
45859+++ linux-2.6.32.23/include/linux/elf.h 2010-09-04 15:54:52.000000000 -0400 45871+++ linux-2.6.32.24/include/linux/elf.h 2010-09-04 15:54:52.000000000 -0400
45860@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; 45872@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
45861 #define PT_GNU_EH_FRAME 0x6474e550 45873 #define PT_GNU_EH_FRAME 0x6474e550
45862 45874
@@ -45929,9 +45941,9 @@ diff -urNp linux-2.6.32.23/include/linux/elf.h linux-2.6.32.23/include/linux/elf
45929 45941
45930 #endif 45942 #endif
45931 45943
45932diff -urNp linux-2.6.32.23/include/linux/fs.h linux-2.6.32.23/include/linux/fs.h 45944diff -urNp linux-2.6.32.24/include/linux/fs.h linux-2.6.32.24/include/linux/fs.h
45933--- linux-2.6.32.23/include/linux/fs.h 2010-08-13 16:24:37.000000000 -0400 45945--- linux-2.6.32.24/include/linux/fs.h 2010-08-13 16:24:37.000000000 -0400
45934+++ linux-2.6.32.23/include/linux/fs.h 2010-09-04 15:54:52.000000000 -0400 45946+++ linux-2.6.32.24/include/linux/fs.h 2010-09-04 15:54:52.000000000 -0400
45935@@ -90,6 +90,11 @@ struct inodes_stat_t { 45947@@ -90,6 +90,11 @@ struct inodes_stat_t {
45936 /* Expect random access pattern */ 45948 /* Expect random access pattern */
45937 #define FMODE_RANDOM ((__force fmode_t)4096) 45949 #define FMODE_RANDOM ((__force fmode_t)4096)
@@ -46093,9 +46105,9 @@ diff -urNp linux-2.6.32.23/include/linux/fs.h linux-2.6.32.23/include/linux/fs.h
46093 }; 46105 };
46094 46106
46095 /* 46107 /*
46096diff -urNp linux-2.6.32.23/include/linux/fs_struct.h linux-2.6.32.23/include/linux/fs_struct.h 46108diff -urNp linux-2.6.32.24/include/linux/fs_struct.h linux-2.6.32.24/include/linux/fs_struct.h
46097--- linux-2.6.32.23/include/linux/fs_struct.h 2010-08-13 16:24:37.000000000 -0400 46109--- linux-2.6.32.24/include/linux/fs_struct.h 2010-08-13 16:24:37.000000000 -0400
46098+++ linux-2.6.32.23/include/linux/fs_struct.h 2010-09-04 15:54:52.000000000 -0400 46110+++ linux-2.6.32.24/include/linux/fs_struct.h 2010-09-04 15:54:52.000000000 -0400
46099@@ -4,7 +4,7 @@ 46111@@ -4,7 +4,7 @@
46100 #include <linux/path.h> 46112 #include <linux/path.h>
46101 46113
@@ -46105,9 +46117,9 @@ diff -urNp linux-2.6.32.23/include/linux/fs_struct.h linux-2.6.32.23/include/lin
46105 rwlock_t lock; 46117 rwlock_t lock;
46106 int umask; 46118 int umask;
46107 int in_exec; 46119 int in_exec;
46108diff -urNp linux-2.6.32.23/include/linux/genhd.h linux-2.6.32.23/include/linux/genhd.h 46120diff -urNp linux-2.6.32.24/include/linux/genhd.h linux-2.6.32.24/include/linux/genhd.h
46109--- linux-2.6.32.23/include/linux/genhd.h 2010-08-13 16:24:37.000000000 -0400 46121--- linux-2.6.32.24/include/linux/genhd.h 2010-08-13 16:24:37.000000000 -0400
46110+++ linux-2.6.32.23/include/linux/genhd.h 2010-09-04 15:54:52.000000000 -0400 46122+++ linux-2.6.32.24/include/linux/genhd.h 2010-09-04 15:54:52.000000000 -0400
46111@@ -161,7 +161,7 @@ struct gendisk { 46123@@ -161,7 +161,7 @@ struct gendisk {
46112 46124
46113 struct timer_rand_state *random; 46125 struct timer_rand_state *random;
@@ -46117,9 +46129,9 @@ diff -urNp linux-2.6.32.23/include/linux/genhd.h linux-2.6.32.23/include/linux/g
46117 struct work_struct async_notify; 46129 struct work_struct async_notify;
46118 #ifdef CONFIG_BLK_DEV_INTEGRITY 46130 #ifdef CONFIG_BLK_DEV_INTEGRITY
46119 struct blk_integrity *integrity; 46131 struct blk_integrity *integrity;
46120diff -urNp linux-2.6.32.23/include/linux/gracl.h linux-2.6.32.23/include/linux/gracl.h 46132diff -urNp linux-2.6.32.24/include/linux/gracl.h linux-2.6.32.24/include/linux/gracl.h
46121--- linux-2.6.32.23/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 46133--- linux-2.6.32.24/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
46122+++ linux-2.6.32.23/include/linux/gracl.h 2010-09-04 15:54:52.000000000 -0400 46134+++ linux-2.6.32.24/include/linux/gracl.h 2010-09-04 15:54:52.000000000 -0400
46123@@ -0,0 +1,310 @@ 46135@@ -0,0 +1,310 @@
46124+#ifndef GR_ACL_H 46136+#ifndef GR_ACL_H
46125+#define GR_ACL_H 46137+#define GR_ACL_H
@@ -46431,9 +46443,9 @@ diff -urNp linux-2.6.32.23/include/linux/gracl.h linux-2.6.32.23/include/linux/g
46431+ 46443+
46432+#endif 46444+#endif
46433+ 46445+
46434diff -urNp linux-2.6.32.23/include/linux/gralloc.h linux-2.6.32.23/include/linux/gralloc.h 46446diff -urNp linux-2.6.32.24/include/linux/gralloc.h linux-2.6.32.24/include/linux/gralloc.h
46435--- linux-2.6.32.23/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 46447--- linux-2.6.32.24/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
46436+++ linux-2.6.32.23/include/linux/gralloc.h 2010-09-04 15:54:52.000000000 -0400 46448+++ linux-2.6.32.24/include/linux/gralloc.h 2010-09-04 15:54:52.000000000 -0400
46437@@ -0,0 +1,9 @@ 46449@@ -0,0 +1,9 @@
46438+#ifndef __GRALLOC_H 46450+#ifndef __GRALLOC_H
46439+#define __GRALLOC_H 46451+#define __GRALLOC_H
@@ -46444,9 +46456,9 @@ diff -urNp linux-2.6.32.23/include/linux/gralloc.h linux-2.6.32.23/include/linux
46444+void *acl_alloc_num(unsigned long num, unsigned long len); 46456+void *acl_alloc_num(unsigned long num, unsigned long len);
46445+ 46457+
46446+#endif 46458+#endif
46447diff -urNp linux-2.6.32.23/include/linux/grdefs.h linux-2.6.32.23/include/linux/grdefs.h 46459diff -urNp linux-2.6.32.24/include/linux/grdefs.h linux-2.6.32.24/include/linux/grdefs.h
46448--- linux-2.6.32.23/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 46460--- linux-2.6.32.24/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
46449+++ linux-2.6.32.23/include/linux/grdefs.h 2010-09-04 15:54:52.000000000 -0400 46461+++ linux-2.6.32.24/include/linux/grdefs.h 2010-09-04 15:54:52.000000000 -0400
46450@@ -0,0 +1,136 @@ 46462@@ -0,0 +1,136 @@
46451+#ifndef GRDEFS_H 46463+#ifndef GRDEFS_H
46452+#define GRDEFS_H 46464+#define GRDEFS_H
@@ -46584,9 +46596,9 @@ diff -urNp linux-2.6.32.23/include/linux/grdefs.h linux-2.6.32.23/include/linux/
46584+}; 46596+};
46585+ 46597+
46586+#endif 46598+#endif
46587diff -urNp linux-2.6.32.23/include/linux/grinternal.h linux-2.6.32.23/include/linux/grinternal.h 46599diff -urNp linux-2.6.32.24/include/linux/grinternal.h linux-2.6.32.24/include/linux/grinternal.h
46588--- linux-2.6.32.23/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 46600--- linux-2.6.32.24/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
46589+++ linux-2.6.32.23/include/linux/grinternal.h 2010-09-17 19:39:50.000000000 -0400 46601+++ linux-2.6.32.24/include/linux/grinternal.h 2010-09-28 19:06:47.000000000 -0400
46590@@ -0,0 +1,211 @@ 46602@@ -0,0 +1,211 @@
46591+#ifndef __GRINTERNAL_H 46603+#ifndef __GRINTERNAL_H
46592+#define __GRINTERNAL_H 46604+#define __GRINTERNAL_H
@@ -46677,33 +46689,33 @@ diff -urNp linux-2.6.32.23/include/linux/grinternal.h linux-2.6.32.23/include/li
46677+ 46689+
46678+extern rwlock_t grsec_exec_file_lock; 46690+extern rwlock_t grsec_exec_file_lock;
46679+ 46691+
46680+#define gr_task_fullpath(tsk) (tsk->exec_file ? \ 46692+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
46681+ gr_to_filename2(tsk->exec_file->f_path.dentry, \ 46693+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
46682+ tsk->exec_file->f_vfsmnt) : "/") 46694+ (tsk)->exec_file->f_vfsmnt) : "/")
46683+ 46695+
46684+#define gr_parent_task_fullpath(tsk) (tsk->parent->exec_file ? \ 46696+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
46685+ gr_to_filename3(tsk->parent->exec_file->f_path.dentry, \ 46697+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
46686+ tsk->parent->exec_file->f_vfsmnt) : "/") 46698+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
46687+ 46699+
46688+#define gr_task_fullpath0(tsk) (tsk->exec_file ? \ 46700+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
46689+ gr_to_filename(tsk->exec_file->f_path.dentry, \ 46701+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
46690+ tsk->exec_file->f_vfsmnt) : "/") 46702+ (tsk)->exec_file->f_vfsmnt) : "/")
46691+ 46703+
46692+#define gr_parent_task_fullpath0(tsk) (tsk->parent->exec_file ? \ 46704+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
46693+ gr_to_filename1(tsk->parent->exec_file->f_path.dentry, \ 46705+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
46694+ tsk->parent->exec_file->f_vfsmnt) : "/") 46706+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
46695+ 46707+
46696+#define proc_is_chrooted(tsk_a) (tsk_a->gr_is_chrooted) 46708+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
46697+ 46709+
46698+#define have_same_root(tsk_a,tsk_b) (tsk_a->gr_chroot_dentry == tsk_b->gr_chroot_dentry) 46710+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
46699+ 46711+
46700+#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), task->comm, \ 46712+#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
46701+ task->pid, cred->uid, \ 46713+ (task)->pid, (cred)->uid, \
46702+ cred->euid, cred->gid, cred->egid, \ 46714+ (cred)->euid, (cred)->gid, (cred)->egid, \
46703+ gr_parent_task_fullpath(task), \ 46715+ gr_parent_task_fullpath(task), \
46704+ task->parent->comm, task->parent->pid, \ 46716+ (task)->real_parent->comm, (task)->real_parent->pid, \
46705+ pcred->uid, pcred->euid, \ 46717+ (pcred)->uid, (pcred)->euid, \
46706+ pcred->gid, pcred->egid 46718+ (pcred)->gid, (pcred)->egid
46707+ 46719+
46708+#define GR_CHROOT_CAPS {{ \ 46720+#define GR_CHROOT_CAPS {{ \
46709+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \ 46721+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
@@ -46799,9 +46811,9 @@ diff -urNp linux-2.6.32.23/include/linux/grinternal.h linux-2.6.32.23/include/li
46799+#endif 46811+#endif
46800+ 46812+
46801+#endif 46813+#endif
46802diff -urNp linux-2.6.32.23/include/linux/grmsg.h linux-2.6.32.23/include/linux/grmsg.h 46814diff -urNp linux-2.6.32.24/include/linux/grmsg.h linux-2.6.32.24/include/linux/grmsg.h
46803--- linux-2.6.32.23/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 46815--- linux-2.6.32.24/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
46804+++ linux-2.6.32.23/include/linux/grmsg.h 2010-09-23 20:35:45.000000000 -0400 46816+++ linux-2.6.32.24/include/linux/grmsg.h 2010-09-23 20:35:45.000000000 -0400
46805@@ -0,0 +1,108 @@ 46817@@ -0,0 +1,108 @@
46806+#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" 46818+#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"
46807+#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" 46819+#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"
@@ -46911,9 +46923,9 @@ diff -urNp linux-2.6.32.23/include/linux/grmsg.h linux-2.6.32.23/include/linux/g
46911+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " 46923+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
46912+#define GR_VM86_MSG "denied use of vm86 by " 46924+#define GR_VM86_MSG "denied use of vm86 by "
46913+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " 46925+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
46914diff -urNp linux-2.6.32.23/include/linux/grsecurity.h linux-2.6.32.23/include/linux/grsecurity.h 46926diff -urNp linux-2.6.32.24/include/linux/grsecurity.h linux-2.6.32.24/include/linux/grsecurity.h
46915--- linux-2.6.32.23/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 46927--- linux-2.6.32.24/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
46916+++ linux-2.6.32.23/include/linux/grsecurity.h 2010-09-04 15:54:52.000000000 -0400 46928+++ linux-2.6.32.24/include/linux/grsecurity.h 2010-09-04 15:54:52.000000000 -0400
46917@@ -0,0 +1,203 @@ 46929@@ -0,0 +1,203 @@
46918+#ifndef GR_SECURITY_H 46930+#ifndef GR_SECURITY_H
46919+#define GR_SECURITY_H 46931+#define GR_SECURITY_H
@@ -47118,9 +47130,9 @@ diff -urNp linux-2.6.32.23/include/linux/grsecurity.h linux-2.6.32.23/include/li
47118+#endif 47130+#endif
47119+ 47131+
47120+#endif 47132+#endif
47121diff -urNp linux-2.6.32.23/include/linux/hdpu_features.h linux-2.6.32.23/include/linux/hdpu_features.h 47133diff -urNp linux-2.6.32.24/include/linux/hdpu_features.h linux-2.6.32.24/include/linux/hdpu_features.h
47122--- linux-2.6.32.23/include/linux/hdpu_features.h 2010-08-13 16:24:37.000000000 -0400 47134--- linux-2.6.32.24/include/linux/hdpu_features.h 2010-08-13 16:24:37.000000000 -0400
47123+++ linux-2.6.32.23/include/linux/hdpu_features.h 2010-09-04 15:54:52.000000000 -0400 47135+++ linux-2.6.32.24/include/linux/hdpu_features.h 2010-09-04 15:54:52.000000000 -0400
47124@@ -3,7 +3,7 @@ 47136@@ -3,7 +3,7 @@
47125 struct cpustate_t { 47137 struct cpustate_t {
47126 spinlock_t lock; 47138 spinlock_t lock;
@@ -47130,9 +47142,9 @@ diff -urNp linux-2.6.32.23/include/linux/hdpu_features.h linux-2.6.32.23/include
47130 unsigned char cached_val; 47142 unsigned char cached_val;
47131 int inited; 47143 int inited;
47132 unsigned long *set_addr; 47144 unsigned long *set_addr;
47133diff -urNp linux-2.6.32.23/include/linux/highmem.h linux-2.6.32.23/include/linux/highmem.h 47145diff -urNp linux-2.6.32.24/include/linux/highmem.h linux-2.6.32.24/include/linux/highmem.h
47134--- linux-2.6.32.23/include/linux/highmem.h 2010-08-13 16:24:37.000000000 -0400 47146--- linux-2.6.32.24/include/linux/highmem.h 2010-08-13 16:24:37.000000000 -0400
47135+++ linux-2.6.32.23/include/linux/highmem.h 2010-09-04 15:54:52.000000000 -0400 47147+++ linux-2.6.32.24/include/linux/highmem.h 2010-09-04 15:54:52.000000000 -0400
47136@@ -137,6 +137,18 @@ static inline void clear_highpage(struct 47148@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
47137 kunmap_atomic(kaddr, KM_USER0); 47149 kunmap_atomic(kaddr, KM_USER0);
47138 } 47150 }
@@ -47152,9 +47164,9 @@ diff -urNp linux-2.6.32.23/include/linux/highmem.h linux-2.6.32.23/include/linux
47152 static inline void zero_user_segments(struct page *page, 47164 static inline void zero_user_segments(struct page *page,
47153 unsigned start1, unsigned end1, 47165 unsigned start1, unsigned end1,
47154 unsigned start2, unsigned end2) 47166 unsigned start2, unsigned end2)
47155diff -urNp linux-2.6.32.23/include/linux/interrupt.h linux-2.6.32.23/include/linux/interrupt.h 47167diff -urNp linux-2.6.32.24/include/linux/interrupt.h linux-2.6.32.24/include/linux/interrupt.h
47156--- linux-2.6.32.23/include/linux/interrupt.h 2010-08-13 16:24:37.000000000 -0400 47168--- linux-2.6.32.24/include/linux/interrupt.h 2010-08-13 16:24:37.000000000 -0400
47157+++ linux-2.6.32.23/include/linux/interrupt.h 2010-09-04 15:54:52.000000000 -0400 47169+++ linux-2.6.32.24/include/linux/interrupt.h 2010-09-04 15:54:52.000000000 -0400
47158@@ -362,7 +362,7 @@ enum 47170@@ -362,7 +362,7 @@ enum
47159 /* map softirq index to softirq name. update 'softirq_to_name' in 47171 /* map softirq index to softirq name. update 'softirq_to_name' in
47160 * kernel/softirq.c when adding a new softirq. 47172 * kernel/softirq.c when adding a new softirq.
@@ -47179,9 +47191,9 @@ diff -urNp linux-2.6.32.23/include/linux/interrupt.h linux-2.6.32.23/include/lin
47179 extern void softirq_init(void); 47191 extern void softirq_init(void);
47180 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) 47192 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
47181 extern void raise_softirq_irqoff(unsigned int nr); 47193 extern void raise_softirq_irqoff(unsigned int nr);
47182diff -urNp linux-2.6.32.23/include/linux/jbd2.h linux-2.6.32.23/include/linux/jbd2.h 47194diff -urNp linux-2.6.32.24/include/linux/jbd2.h linux-2.6.32.24/include/linux/jbd2.h
47183--- linux-2.6.32.23/include/linux/jbd2.h 2010-08-13 16:24:37.000000000 -0400 47195--- linux-2.6.32.24/include/linux/jbd2.h 2010-08-13 16:24:37.000000000 -0400
47184+++ linux-2.6.32.23/include/linux/jbd2.h 2010-09-04 15:54:52.000000000 -0400 47196+++ linux-2.6.32.24/include/linux/jbd2.h 2010-09-04 15:54:52.000000000 -0400
47185@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; 47197@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
47186 } \ 47198 } \
47187 } while (0) 47199 } while (0)
@@ -47191,9 +47203,9 @@ diff -urNp linux-2.6.32.23/include/linux/jbd2.h linux-2.6.32.23/include/linux/jb
47191 #endif 47203 #endif
47192 47204
47193 static inline void *jbd2_alloc(size_t size, gfp_t flags) 47205 static inline void *jbd2_alloc(size_t size, gfp_t flags)
47194diff -urNp linux-2.6.32.23/include/linux/jbd.h linux-2.6.32.23/include/linux/jbd.h 47206diff -urNp linux-2.6.32.24/include/linux/jbd.h linux-2.6.32.24/include/linux/jbd.h
47195--- linux-2.6.32.23/include/linux/jbd.h 2010-08-13 16:24:37.000000000 -0400 47207--- linux-2.6.32.24/include/linux/jbd.h 2010-08-13 16:24:37.000000000 -0400
47196+++ linux-2.6.32.23/include/linux/jbd.h 2010-09-04 15:54:52.000000000 -0400 47208+++ linux-2.6.32.24/include/linux/jbd.h 2010-09-04 15:54:52.000000000 -0400
47197@@ -66,7 +66,7 @@ extern u8 journal_enable_debug; 47209@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
47198 } \ 47210 } \
47199 } while (0) 47211 } while (0)
@@ -47203,9 +47215,9 @@ diff -urNp linux-2.6.32.23/include/linux/jbd.h linux-2.6.32.23/include/linux/jbd
47203 #endif 47215 #endif
47204 47216
47205 static inline void *jbd_alloc(size_t size, gfp_t flags) 47217 static inline void *jbd_alloc(size_t size, gfp_t flags)
47206diff -urNp linux-2.6.32.23/include/linux/kallsyms.h linux-2.6.32.23/include/linux/kallsyms.h 47218diff -urNp linux-2.6.32.24/include/linux/kallsyms.h linux-2.6.32.24/include/linux/kallsyms.h
47207--- linux-2.6.32.23/include/linux/kallsyms.h 2010-08-13 16:24:37.000000000 -0400 47219--- linux-2.6.32.24/include/linux/kallsyms.h 2010-08-13 16:24:37.000000000 -0400
47208+++ linux-2.6.32.23/include/linux/kallsyms.h 2010-09-04 15:54:52.000000000 -0400 47220+++ linux-2.6.32.24/include/linux/kallsyms.h 2010-09-04 15:54:52.000000000 -0400
47209@@ -15,7 +15,8 @@ 47221@@ -15,7 +15,8 @@
47210 47222
47211 struct module; 47223 struct module;
@@ -47226,9 +47238,9 @@ diff -urNp linux-2.6.32.23/include/linux/kallsyms.h linux-2.6.32.23/include/linu
47226 47238
47227 /* This macro allows us to keep printk typechecking */ 47239 /* This macro allows us to keep printk typechecking */
47228 static void __check_printsym_format(const char *fmt, ...) 47240 static void __check_printsym_format(const char *fmt, ...)
47229diff -urNp linux-2.6.32.23/include/linux/kgdb.h linux-2.6.32.23/include/linux/kgdb.h 47241diff -urNp linux-2.6.32.24/include/linux/kgdb.h linux-2.6.32.24/include/linux/kgdb.h
47230--- linux-2.6.32.23/include/linux/kgdb.h 2010-08-13 16:24:37.000000000 -0400 47242--- linux-2.6.32.24/include/linux/kgdb.h 2010-08-13 16:24:37.000000000 -0400
47231+++ linux-2.6.32.23/include/linux/kgdb.h 2010-09-04 15:54:52.000000000 -0400 47243+++ linux-2.6.32.24/include/linux/kgdb.h 2010-09-04 15:54:52.000000000 -0400
47232@@ -251,20 +251,20 @@ struct kgdb_arch { 47244@@ -251,20 +251,20 @@ struct kgdb_arch {
47233 */ 47245 */
47234 struct kgdb_io { 47246 struct kgdb_io {
@@ -47259,9 +47271,9 @@ diff -urNp linux-2.6.32.23/include/linux/kgdb.h linux-2.6.32.23/include/linux/kg
47259 47271
47260 extern int kgdb_hex2long(char **ptr, unsigned long *long_val); 47272 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
47261 extern int kgdb_mem2hex(char *mem, char *buf, int count); 47273 extern int kgdb_mem2hex(char *mem, char *buf, int count);
47262diff -urNp linux-2.6.32.23/include/linux/kobject.h linux-2.6.32.23/include/linux/kobject.h 47274diff -urNp linux-2.6.32.24/include/linux/kobject.h linux-2.6.32.24/include/linux/kobject.h
47263--- linux-2.6.32.23/include/linux/kobject.h 2010-08-13 16:24:37.000000000 -0400 47275--- linux-2.6.32.24/include/linux/kobject.h 2010-08-13 16:24:37.000000000 -0400
47264+++ linux-2.6.32.23/include/linux/kobject.h 2010-09-04 15:54:52.000000000 -0400 47276+++ linux-2.6.32.24/include/linux/kobject.h 2010-09-04 15:54:52.000000000 -0400
47265@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob 47277@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
47266 47278
47267 struct kobj_type { 47279 struct kobj_type {
@@ -47310,9 +47322,9 @@ diff -urNp linux-2.6.32.23/include/linux/kobject.h linux-2.6.32.23/include/linux
47310 struct kobject *parent_kobj); 47322 struct kobject *parent_kobj);
47311 47323
47312 static inline struct kset *to_kset(struct kobject *kobj) 47324 static inline struct kset *to_kset(struct kobject *kobj)
47313diff -urNp linux-2.6.32.23/include/linux/kvm_host.h linux-2.6.32.23/include/linux/kvm_host.h 47325diff -urNp linux-2.6.32.24/include/linux/kvm_host.h linux-2.6.32.24/include/linux/kvm_host.h
47314--- linux-2.6.32.23/include/linux/kvm_host.h 2010-08-13 16:24:37.000000000 -0400 47326--- linux-2.6.32.24/include/linux/kvm_host.h 2010-08-13 16:24:37.000000000 -0400
47315+++ linux-2.6.32.23/include/linux/kvm_host.h 2010-09-04 15:54:52.000000000 -0400 47327+++ linux-2.6.32.24/include/linux/kvm_host.h 2010-09-04 15:54:52.000000000 -0400
47316@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc 47328@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
47317 void vcpu_load(struct kvm_vcpu *vcpu); 47329 void vcpu_load(struct kvm_vcpu *vcpu);
47318 void vcpu_put(struct kvm_vcpu *vcpu); 47330 void vcpu_put(struct kvm_vcpu *vcpu);
@@ -47331,9 +47343,9 @@ diff -urNp linux-2.6.32.23/include/linux/kvm_host.h linux-2.6.32.23/include/linu
47331 void kvm_arch_exit(void); 47343 void kvm_arch_exit(void);
47332 47344
47333 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); 47345 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
47334diff -urNp linux-2.6.32.23/include/linux/libata.h linux-2.6.32.23/include/linux/libata.h 47346diff -urNp linux-2.6.32.24/include/linux/libata.h linux-2.6.32.24/include/linux/libata.h
47335--- linux-2.6.32.23/include/linux/libata.h 2010-09-20 17:26:42.000000000 -0400 47347--- linux-2.6.32.24/include/linux/libata.h 2010-09-20 17:26:42.000000000 -0400
47336+++ linux-2.6.32.23/include/linux/libata.h 2010-09-20 17:27:30.000000000 -0400 47348+++ linux-2.6.32.24/include/linux/libata.h 2010-09-20 17:27:30.000000000 -0400
47337@@ -64,11 +64,11 @@ 47349@@ -64,11 +64,11 @@
47338 #ifdef ATA_VERBOSE_DEBUG 47350 #ifdef ATA_VERBOSE_DEBUG
47339 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) 47351 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -47399,9 +47411,9 @@ diff -urNp linux-2.6.32.23/include/linux/libata.h linux-2.6.32.23/include/linux/
47399 extern int ata_scsi_detect(struct scsi_host_template *sht); 47411 extern int ata_scsi_detect(struct scsi_host_template *sht);
47400 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); 47412 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
47401 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); 47413 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
47402diff -urNp linux-2.6.32.23/include/linux/lockd/bind.h linux-2.6.32.23/include/linux/lockd/bind.h 47414diff -urNp linux-2.6.32.24/include/linux/lockd/bind.h linux-2.6.32.24/include/linux/lockd/bind.h
47403--- linux-2.6.32.23/include/linux/lockd/bind.h 2010-08-13 16:24:37.000000000 -0400 47415--- linux-2.6.32.24/include/linux/lockd/bind.h 2010-08-13 16:24:37.000000000 -0400
47404+++ linux-2.6.32.23/include/linux/lockd/bind.h 2010-09-04 15:54:52.000000000 -0400 47416+++ linux-2.6.32.24/include/linux/lockd/bind.h 2010-09-04 15:54:52.000000000 -0400
47405@@ -23,13 +23,13 @@ struct svc_rqst; 47417@@ -23,13 +23,13 @@ struct svc_rqst;
47406 * This is the set of functions for lockd->nfsd communication 47418 * This is the set of functions for lockd->nfsd communication
47407 */ 47419 */
@@ -47419,9 +47431,9 @@ diff -urNp linux-2.6.32.23/include/linux/lockd/bind.h linux-2.6.32.23/include/li
47419 47431
47420 /* 47432 /*
47421 * Similar to nfs_client_initdata, but without the NFS-specific 47433 * Similar to nfs_client_initdata, but without the NFS-specific
47422diff -urNp linux-2.6.32.23/include/linux/mm.h linux-2.6.32.23/include/linux/mm.h 47434diff -urNp linux-2.6.32.24/include/linux/mm.h linux-2.6.32.24/include/linux/mm.h
47423--- linux-2.6.32.23/include/linux/mm.h 2010-09-26 17:26:05.000000000 -0400 47435--- linux-2.6.32.24/include/linux/mm.h 2010-09-26 17:26:05.000000000 -0400
47424+++ linux-2.6.32.23/include/linux/mm.h 2010-09-26 17:26:57.000000000 -0400 47436+++ linux-2.6.32.24/include/linux/mm.h 2010-09-26 17:26:57.000000000 -0400
47425@@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void 47437@@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void
47426 47438
47427 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */ 47439 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
@@ -47488,9 +47500,9 @@ diff -urNp linux-2.6.32.23/include/linux/mm.h linux-2.6.32.23/include/linux/mm.h
47488 47500
47489 #endif /* __KERNEL__ */ 47501 #endif /* __KERNEL__ */
47490 #endif /* _LINUX_MM_H */ 47502 #endif /* _LINUX_MM_H */
47491diff -urNp linux-2.6.32.23/include/linux/mm_types.h linux-2.6.32.23/include/linux/mm_types.h 47503diff -urNp linux-2.6.32.24/include/linux/mm_types.h linux-2.6.32.24/include/linux/mm_types.h
47492--- linux-2.6.32.23/include/linux/mm_types.h 2010-08-29 21:08:20.000000000 -0400 47504--- linux-2.6.32.24/include/linux/mm_types.h 2010-08-29 21:08:20.000000000 -0400
47493+++ linux-2.6.32.23/include/linux/mm_types.h 2010-09-04 15:54:52.000000000 -0400 47505+++ linux-2.6.32.24/include/linux/mm_types.h 2010-09-04 15:54:52.000000000 -0400
47494@@ -186,6 +186,8 @@ struct vm_area_struct { 47506@@ -186,6 +186,8 @@ struct vm_area_struct {
47495 #ifdef CONFIG_NUMA 47507 #ifdef CONFIG_NUMA
47496 struct mempolicy *vm_policy; /* NUMA policy for the VMA */ 47508 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -47525,9 +47537,9 @@ diff -urNp linux-2.6.32.23/include/linux/mm_types.h linux-2.6.32.23/include/linu
47525 }; 47537 };
47526 47538
47527 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ 47539 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
47528diff -urNp linux-2.6.32.23/include/linux/mmu_notifier.h linux-2.6.32.23/include/linux/mmu_notifier.h 47540diff -urNp linux-2.6.32.24/include/linux/mmu_notifier.h linux-2.6.32.24/include/linux/mmu_notifier.h
47529--- linux-2.6.32.23/include/linux/mmu_notifier.h 2010-08-13 16:24:37.000000000 -0400 47541--- linux-2.6.32.24/include/linux/mmu_notifier.h 2010-08-13 16:24:37.000000000 -0400
47530+++ linux-2.6.32.23/include/linux/mmu_notifier.h 2010-09-04 15:54:52.000000000 -0400 47542+++ linux-2.6.32.24/include/linux/mmu_notifier.h 2010-09-04 15:54:52.000000000 -0400
47531@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr 47543@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
47532 */ 47544 */
47533 #define ptep_clear_flush_notify(__vma, __address, __ptep) \ 47545 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -47544,9 +47556,9 @@ diff -urNp linux-2.6.32.23/include/linux/mmu_notifier.h linux-2.6.32.23/include/
47544 }) 47556 })
47545 47557
47546 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ 47558 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
47547diff -urNp linux-2.6.32.23/include/linux/mmzone.h linux-2.6.32.23/include/linux/mmzone.h 47559diff -urNp linux-2.6.32.24/include/linux/mmzone.h linux-2.6.32.24/include/linux/mmzone.h
47548--- linux-2.6.32.23/include/linux/mmzone.h 2010-09-26 17:26:05.000000000 -0400 47560--- linux-2.6.32.24/include/linux/mmzone.h 2010-09-26 17:26:05.000000000 -0400
47549+++ linux-2.6.32.23/include/linux/mmzone.h 2010-09-26 17:26:57.000000000 -0400 47561+++ linux-2.6.32.24/include/linux/mmzone.h 2010-09-26 17:26:57.000000000 -0400
47550@@ -350,7 +350,7 @@ struct zone { 47562@@ -350,7 +350,7 @@ struct zone {
47551 unsigned long flags; /* zone flags, see below */ 47563 unsigned long flags; /* zone flags, see below */
47552 47564
@@ -47556,9 +47568,9 @@ diff -urNp linux-2.6.32.23/include/linux/mmzone.h linux-2.6.32.23/include/linux/
47556 47568
47557 /* 47569 /*
47558 * prev_priority holds the scanning priority for this zone. It is 47570 * prev_priority holds the scanning priority for this zone. It is
47559diff -urNp linux-2.6.32.23/include/linux/mod_devicetable.h linux-2.6.32.23/include/linux/mod_devicetable.h 47571diff -urNp linux-2.6.32.24/include/linux/mod_devicetable.h linux-2.6.32.24/include/linux/mod_devicetable.h
47560--- linux-2.6.32.23/include/linux/mod_devicetable.h 2010-08-13 16:24:37.000000000 -0400 47572--- linux-2.6.32.24/include/linux/mod_devicetable.h 2010-08-13 16:24:37.000000000 -0400
47561+++ linux-2.6.32.23/include/linux/mod_devicetable.h 2010-09-04 15:54:52.000000000 -0400 47573+++ linux-2.6.32.24/include/linux/mod_devicetable.h 2010-09-04 15:54:52.000000000 -0400
47562@@ -12,7 +12,7 @@ 47574@@ -12,7 +12,7 @@
47563 typedef unsigned long kernel_ulong_t; 47575 typedef unsigned long kernel_ulong_t;
47564 #endif 47576 #endif
@@ -47577,9 +47589,9 @@ diff -urNp linux-2.6.32.23/include/linux/mod_devicetable.h linux-2.6.32.23/inclu
47577 47589
47578 struct hid_device_id { 47590 struct hid_device_id {
47579 __u16 bus; 47591 __u16 bus;
47580diff -urNp linux-2.6.32.23/include/linux/module.h linux-2.6.32.23/include/linux/module.h 47592diff -urNp linux-2.6.32.24/include/linux/module.h linux-2.6.32.24/include/linux/module.h
47581--- linux-2.6.32.23/include/linux/module.h 2010-08-13 16:24:37.000000000 -0400 47593--- linux-2.6.32.24/include/linux/module.h 2010-08-13 16:24:37.000000000 -0400
47582+++ linux-2.6.32.23/include/linux/module.h 2010-09-04 15:54:52.000000000 -0400 47594+++ linux-2.6.32.24/include/linux/module.h 2010-09-04 15:54:52.000000000 -0400
47583@@ -287,16 +287,16 @@ struct module 47595@@ -287,16 +287,16 @@ struct module
47584 int (*init)(void); 47596 int (*init)(void);
47585 47597
@@ -47652,9 +47664,9 @@ diff -urNp linux-2.6.32.23/include/linux/module.h linux-2.6.32.23/include/linux/
47652 } 47664 }
47653 47665
47654 /* Search for module by name: must hold module_mutex. */ 47666 /* Search for module by name: must hold module_mutex. */
47655diff -urNp linux-2.6.32.23/include/linux/moduleloader.h linux-2.6.32.23/include/linux/moduleloader.h 47667diff -urNp linux-2.6.32.24/include/linux/moduleloader.h linux-2.6.32.24/include/linux/moduleloader.h
47656--- linux-2.6.32.23/include/linux/moduleloader.h 2010-08-13 16:24:37.000000000 -0400 47668--- linux-2.6.32.24/include/linux/moduleloader.h 2010-08-13 16:24:37.000000000 -0400
47657+++ linux-2.6.32.23/include/linux/moduleloader.h 2010-09-04 15:54:52.000000000 -0400 47669+++ linux-2.6.32.24/include/linux/moduleloader.h 2010-09-04 15:54:52.000000000 -0400
47658@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st 47670@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
47659 sections. Returns NULL on failure. */ 47671 sections. Returns NULL on failure. */
47660 void *module_alloc(unsigned long size); 47672 void *module_alloc(unsigned long size);
@@ -47677,9 +47689,9 @@ diff -urNp linux-2.6.32.23/include/linux/moduleloader.h linux-2.6.32.23/include/
47677 /* Apply the given relocation to the (simplified) ELF. Return -error 47689 /* Apply the given relocation to the (simplified) ELF. Return -error
47678 or 0. */ 47690 or 0. */
47679 int apply_relocate(Elf_Shdr *sechdrs, 47691 int apply_relocate(Elf_Shdr *sechdrs,
47680diff -urNp linux-2.6.32.23/include/linux/namei.h linux-2.6.32.23/include/linux/namei.h 47692diff -urNp linux-2.6.32.24/include/linux/namei.h linux-2.6.32.24/include/linux/namei.h
47681--- linux-2.6.32.23/include/linux/namei.h 2010-08-13 16:24:37.000000000 -0400 47693--- linux-2.6.32.24/include/linux/namei.h 2010-08-13 16:24:37.000000000 -0400
47682+++ linux-2.6.32.23/include/linux/namei.h 2010-09-04 15:54:52.000000000 -0400 47694+++ linux-2.6.32.24/include/linux/namei.h 2010-09-04 15:54:52.000000000 -0400
47683@@ -22,7 +22,7 @@ struct nameidata { 47695@@ -22,7 +22,7 @@ struct nameidata {
47684 unsigned int flags; 47696 unsigned int flags;
47685 int last_type; 47697 int last_type;
@@ -47704,9 +47716,22 @@ diff -urNp linux-2.6.32.23/include/linux/namei.h linux-2.6.32.23/include/linux/n
47704 { 47716 {
47705 return nd->saved_names[nd->depth]; 47717 return nd->saved_names[nd->depth];
47706 } 47718 }
47707diff -urNp linux-2.6.32.23/include/linux/nodemask.h linux-2.6.32.23/include/linux/nodemask.h 47719diff -urNp linux-2.6.32.24/include/linux/netfilter/xt_gradm.h linux-2.6.32.24/include/linux/netfilter/xt_gradm.h
47708--- linux-2.6.32.23/include/linux/nodemask.h 2010-08-13 16:24:37.000000000 -0400 47720--- linux-2.6.32.24/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
47709+++ linux-2.6.32.23/include/linux/nodemask.h 2010-09-04 15:54:52.000000000 -0400 47721+++ linux-2.6.32.24/include/linux/netfilter/xt_gradm.h 2010-09-28 18:01:53.000000000 -0400
47722@@ -0,0 +1,9 @@
47723+#ifndef _LINUX_NETFILTER_XT_GRADM_H
47724+#define _LINUX_NETFILTER_XT_GRADM_H 1
47725+
47726+struct xt_gradm_mtinfo {
47727+ __u16 flags;
47728+ __u16 invflags;
47729+};
47730+
47731+#endif
47732diff -urNp linux-2.6.32.24/include/linux/nodemask.h linux-2.6.32.24/include/linux/nodemask.h
47733--- linux-2.6.32.24/include/linux/nodemask.h 2010-08-13 16:24:37.000000000 -0400
47734+++ linux-2.6.32.24/include/linux/nodemask.h 2010-09-04 15:54:52.000000000 -0400
47710@@ -464,11 +464,11 @@ static inline int num_node_state(enum no 47735@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
47711 47736
47712 #define any_online_node(mask) \ 47737 #define any_online_node(mask) \
@@ -47723,9 +47748,9 @@ diff -urNp linux-2.6.32.23/include/linux/nodemask.h linux-2.6.32.23/include/linu
47723 }) 47748 })
47724 47749
47725 #define num_online_nodes() num_node_state(N_ONLINE) 47750 #define num_online_nodes() num_node_state(N_ONLINE)
47726diff -urNp linux-2.6.32.23/include/linux/oprofile.h linux-2.6.32.23/include/linux/oprofile.h 47751diff -urNp linux-2.6.32.24/include/linux/oprofile.h linux-2.6.32.24/include/linux/oprofile.h
47727--- linux-2.6.32.23/include/linux/oprofile.h 2010-08-13 16:24:37.000000000 -0400 47752--- linux-2.6.32.24/include/linux/oprofile.h 2010-08-13 16:24:37.000000000 -0400
47728+++ linux-2.6.32.23/include/linux/oprofile.h 2010-09-04 15:54:52.000000000 -0400 47753+++ linux-2.6.32.24/include/linux/oprofile.h 2010-09-04 15:54:52.000000000 -0400
47729@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super 47754@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
47730 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, 47755 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
47731 char const * name, ulong * val); 47756 char const * name, ulong * val);
@@ -47738,9 +47763,9 @@ diff -urNp linux-2.6.32.23/include/linux/oprofile.h linux-2.6.32.23/include/linu
47738 47763
47739 /** create a directory */ 47764 /** create a directory */
47740 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, 47765 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
47741diff -urNp linux-2.6.32.23/include/linux/pipe_fs_i.h linux-2.6.32.23/include/linux/pipe_fs_i.h 47766diff -urNp linux-2.6.32.24/include/linux/pipe_fs_i.h linux-2.6.32.24/include/linux/pipe_fs_i.h
47742--- linux-2.6.32.23/include/linux/pipe_fs_i.h 2010-08-13 16:24:37.000000000 -0400 47767--- linux-2.6.32.24/include/linux/pipe_fs_i.h 2010-08-13 16:24:37.000000000 -0400
47743+++ linux-2.6.32.23/include/linux/pipe_fs_i.h 2010-09-04 15:54:52.000000000 -0400 47768+++ linux-2.6.32.24/include/linux/pipe_fs_i.h 2010-09-04 15:54:52.000000000 -0400
47744@@ -46,9 +46,9 @@ struct pipe_inode_info { 47769@@ -46,9 +46,9 @@ struct pipe_inode_info {
47745 wait_queue_head_t wait; 47770 wait_queue_head_t wait;
47746 unsigned int nrbufs, curbuf; 47771 unsigned int nrbufs, curbuf;
@@ -47754,9 +47779,9 @@ diff -urNp linux-2.6.32.23/include/linux/pipe_fs_i.h linux-2.6.32.23/include/lin
47754 unsigned int r_counter; 47779 unsigned int r_counter;
47755 unsigned int w_counter; 47780 unsigned int w_counter;
47756 struct fasync_struct *fasync_readers; 47781 struct fasync_struct *fasync_readers;
47757diff -urNp linux-2.6.32.23/include/linux/poison.h linux-2.6.32.23/include/linux/poison.h 47782diff -urNp linux-2.6.32.24/include/linux/poison.h linux-2.6.32.24/include/linux/poison.h
47758--- linux-2.6.32.23/include/linux/poison.h 2010-08-13 16:24:37.000000000 -0400 47783--- linux-2.6.32.24/include/linux/poison.h 2010-08-13 16:24:37.000000000 -0400
47759+++ linux-2.6.32.23/include/linux/poison.h 2010-09-04 15:54:52.000000000 -0400 47784+++ linux-2.6.32.24/include/linux/poison.h 2010-09-04 15:54:52.000000000 -0400
47760@@ -19,8 +19,8 @@ 47785@@ -19,8 +19,8 @@
47761 * under normal circumstances, used to verify that nobody uses 47786 * under normal circumstances, used to verify that nobody uses
47762 * non-initialized list entries. 47787 * non-initialized list entries.
@@ -47768,9 +47793,9 @@ diff -urNp linux-2.6.32.23/include/linux/poison.h linux-2.6.32.23/include/linux/
47768 47793
47769 /********** include/linux/timer.h **********/ 47794 /********** include/linux/timer.h **********/
47770 /* 47795 /*
47771diff -urNp linux-2.6.32.23/include/linux/proc_fs.h linux-2.6.32.23/include/linux/proc_fs.h 47796diff -urNp linux-2.6.32.24/include/linux/proc_fs.h linux-2.6.32.24/include/linux/proc_fs.h
47772--- linux-2.6.32.23/include/linux/proc_fs.h 2010-08-13 16:24:37.000000000 -0400 47797--- linux-2.6.32.24/include/linux/proc_fs.h 2010-08-13 16:24:37.000000000 -0400
47773+++ linux-2.6.32.23/include/linux/proc_fs.h 2010-09-04 15:54:52.000000000 -0400 47798+++ linux-2.6.32.24/include/linux/proc_fs.h 2010-09-04 15:54:52.000000000 -0400
47774@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro 47799@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
47775 return proc_create_data(name, mode, parent, proc_fops, NULL); 47800 return proc_create_data(name, mode, parent, proc_fops, NULL);
47776 } 47801 }
@@ -47791,9 +47816,9 @@ diff -urNp linux-2.6.32.23/include/linux/proc_fs.h linux-2.6.32.23/include/linux
47791 static inline struct proc_dir_entry *create_proc_read_entry(const char *name, 47816 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
47792 mode_t mode, struct proc_dir_entry *base, 47817 mode_t mode, struct proc_dir_entry *base,
47793 read_proc_t *read_proc, void * data) 47818 read_proc_t *read_proc, void * data)
47794diff -urNp linux-2.6.32.23/include/linux/random.h linux-2.6.32.23/include/linux/random.h 47819diff -urNp linux-2.6.32.24/include/linux/random.h linux-2.6.32.24/include/linux/random.h
47795--- linux-2.6.32.23/include/linux/random.h 2010-08-13 16:24:37.000000000 -0400 47820--- linux-2.6.32.24/include/linux/random.h 2010-08-13 16:24:37.000000000 -0400
47796+++ linux-2.6.32.23/include/linux/random.h 2010-09-04 15:54:52.000000000 -0400 47821+++ linux-2.6.32.24/include/linux/random.h 2010-09-04 15:54:52.000000000 -0400
47797@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l 47822@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
47798 u32 random32(void); 47823 u32 random32(void);
47799 void srandom32(u32 seed); 47824 void srandom32(u32 seed);
@@ -47806,9 +47831,9 @@ diff -urNp linux-2.6.32.23/include/linux/random.h linux-2.6.32.23/include/linux/
47806 #endif /* __KERNEL___ */ 47831 #endif /* __KERNEL___ */
47807 47832
47808 #endif /* _LINUX_RANDOM_H */ 47833 #endif /* _LINUX_RANDOM_H */
47809diff -urNp linux-2.6.32.23/include/linux/reiserfs_fs.h linux-2.6.32.23/include/linux/reiserfs_fs.h 47834diff -urNp linux-2.6.32.24/include/linux/reiserfs_fs.h linux-2.6.32.24/include/linux/reiserfs_fs.h
47810--- linux-2.6.32.23/include/linux/reiserfs_fs.h 2010-08-13 16:24:37.000000000 -0400 47835--- linux-2.6.32.24/include/linux/reiserfs_fs.h 2010-08-13 16:24:37.000000000 -0400
47811+++ linux-2.6.32.23/include/linux/reiserfs_fs.h 2010-09-04 15:54:52.000000000 -0400 47836+++ linux-2.6.32.24/include/linux/reiserfs_fs.h 2010-09-04 15:54:52.000000000 -0400
47812@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset 47837@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
47813 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ 47838 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
47814 47839
@@ -47855,9 +47880,9 @@ diff -urNp linux-2.6.32.23/include/linux/reiserfs_fs.h linux-2.6.32.23/include/l
47855 47880
47856 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) 47881 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
47857 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) 47882 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
47858diff -urNp linux-2.6.32.23/include/linux/reiserfs_fs_sb.h linux-2.6.32.23/include/linux/reiserfs_fs_sb.h 47883diff -urNp linux-2.6.32.24/include/linux/reiserfs_fs_sb.h linux-2.6.32.24/include/linux/reiserfs_fs_sb.h
47859--- linux-2.6.32.23/include/linux/reiserfs_fs_sb.h 2010-08-13 16:24:37.000000000 -0400 47884--- linux-2.6.32.24/include/linux/reiserfs_fs_sb.h 2010-08-13 16:24:37.000000000 -0400
47860+++ linux-2.6.32.23/include/linux/reiserfs_fs_sb.h 2010-09-04 15:54:52.000000000 -0400 47885+++ linux-2.6.32.24/include/linux/reiserfs_fs_sb.h 2010-09-04 15:54:52.000000000 -0400
47861@@ -377,7 +377,7 @@ struct reiserfs_sb_info { 47886@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
47862 /* Comment? -Hans */ 47887 /* Comment? -Hans */
47863 wait_queue_head_t s_wait; 47888 wait_queue_head_t s_wait;
@@ -47867,9 +47892,9 @@ diff -urNp linux-2.6.32.23/include/linux/reiserfs_fs_sb.h linux-2.6.32.23/includ
47867 // tree gets re-balanced 47892 // tree gets re-balanced
47868 unsigned long s_properties; /* File system properties. Currently holds 47893 unsigned long s_properties; /* File system properties. Currently holds
47869 on-disk FS format */ 47894 on-disk FS format */
47870diff -urNp linux-2.6.32.23/include/linux/sched.h linux-2.6.32.23/include/linux/sched.h 47895diff -urNp linux-2.6.32.24/include/linux/sched.h linux-2.6.32.24/include/linux/sched.h
47871--- linux-2.6.32.23/include/linux/sched.h 2010-09-20 17:26:42.000000000 -0400 47896--- linux-2.6.32.24/include/linux/sched.h 2010-09-20 17:26:42.000000000 -0400
47872+++ linux-2.6.32.23/include/linux/sched.h 2010-09-20 17:27:30.000000000 -0400 47897+++ linux-2.6.32.24/include/linux/sched.h 2010-09-20 17:27:30.000000000 -0400
47873@@ -101,6 +101,7 @@ struct bio; 47898@@ -101,6 +101,7 @@ struct bio;
47874 struct fs_struct; 47899 struct fs_struct;
47875 struct bts_context; 47900 struct bts_context;
@@ -48083,9 +48108,9 @@ diff -urNp linux-2.6.32.23/include/linux/sched.h linux-2.6.32.23/include/linux/s
48083 extern void thread_info_cache_init(void); 48108 extern void thread_info_cache_init(void);
48084 48109
48085 #ifdef CONFIG_DEBUG_STACK_USAGE 48110 #ifdef CONFIG_DEBUG_STACK_USAGE
48086diff -urNp linux-2.6.32.23/include/linux/screen_info.h linux-2.6.32.23/include/linux/screen_info.h 48111diff -urNp linux-2.6.32.24/include/linux/screen_info.h linux-2.6.32.24/include/linux/screen_info.h
48087--- linux-2.6.32.23/include/linux/screen_info.h 2010-08-13 16:24:37.000000000 -0400 48112--- linux-2.6.32.24/include/linux/screen_info.h 2010-08-13 16:24:37.000000000 -0400
48088+++ linux-2.6.32.23/include/linux/screen_info.h 2010-09-04 15:54:52.000000000 -0400 48113+++ linux-2.6.32.24/include/linux/screen_info.h 2010-09-04 15:54:52.000000000 -0400
48089@@ -42,7 +42,8 @@ struct screen_info { 48114@@ -42,7 +42,8 @@ struct screen_info {
48090 __u16 pages; /* 0x32 */ 48115 __u16 pages; /* 0x32 */
48091 __u16 vesa_attributes; /* 0x34 */ 48116 __u16 vesa_attributes; /* 0x34 */
@@ -48096,9 +48121,9 @@ diff -urNp linux-2.6.32.23/include/linux/screen_info.h linux-2.6.32.23/include/l
48096 } __attribute__((packed)); 48121 } __attribute__((packed));
48097 48122
48098 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ 48123 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
48099diff -urNp linux-2.6.32.23/include/linux/security.h linux-2.6.32.23/include/linux/security.h 48124diff -urNp linux-2.6.32.24/include/linux/security.h linux-2.6.32.24/include/linux/security.h
48100--- linux-2.6.32.23/include/linux/security.h 2010-08-13 16:24:37.000000000 -0400 48125--- linux-2.6.32.24/include/linux/security.h 2010-08-13 16:24:37.000000000 -0400
48101+++ linux-2.6.32.23/include/linux/security.h 2010-09-04 15:54:52.000000000 -0400 48126+++ linux-2.6.32.24/include/linux/security.h 2010-09-04 15:54:52.000000000 -0400
48102@@ -34,6 +34,7 @@ 48127@@ -34,6 +34,7 @@
48103 #include <linux/key.h> 48128 #include <linux/key.h>
48104 #include <linux/xfrm.h> 48129 #include <linux/xfrm.h>
@@ -48107,9 +48132,9 @@ diff -urNp linux-2.6.32.23/include/linux/security.h linux-2.6.32.23/include/linu
48107 #include <net/flow.h> 48132 #include <net/flow.h>
48108 48133
48109 /* Maximum number of letters for an LSM name string */ 48134 /* Maximum number of letters for an LSM name string */
48110diff -urNp linux-2.6.32.23/include/linux/shm.h linux-2.6.32.23/include/linux/shm.h 48135diff -urNp linux-2.6.32.24/include/linux/shm.h linux-2.6.32.24/include/linux/shm.h
48111--- linux-2.6.32.23/include/linux/shm.h 2010-08-13 16:24:37.000000000 -0400 48136--- linux-2.6.32.24/include/linux/shm.h 2010-08-13 16:24:37.000000000 -0400
48112+++ linux-2.6.32.23/include/linux/shm.h 2010-09-04 15:54:52.000000000 -0400 48137+++ linux-2.6.32.24/include/linux/shm.h 2010-09-04 15:54:52.000000000 -0400
48113@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke 48138@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
48114 pid_t shm_cprid; 48139 pid_t shm_cprid;
48115 pid_t shm_lprid; 48140 pid_t shm_lprid;
@@ -48121,9 +48146,9 @@ diff -urNp linux-2.6.32.23/include/linux/shm.h linux-2.6.32.23/include/linux/shm
48121 }; 48146 };
48122 48147
48123 /* shm_mode upper byte flags */ 48148 /* shm_mode upper byte flags */
48124diff -urNp linux-2.6.32.23/include/linux/slab.h linux-2.6.32.23/include/linux/slab.h 48149diff -urNp linux-2.6.32.24/include/linux/slab.h linux-2.6.32.24/include/linux/slab.h
48125--- linux-2.6.32.23/include/linux/slab.h 2010-08-13 16:24:37.000000000 -0400 48150--- linux-2.6.32.24/include/linux/slab.h 2010-08-13 16:24:37.000000000 -0400
48126+++ linux-2.6.32.23/include/linux/slab.h 2010-09-04 15:54:52.000000000 -0400 48151+++ linux-2.6.32.24/include/linux/slab.h 2010-09-04 15:54:52.000000000 -0400
48127@@ -11,6 +11,7 @@ 48152@@ -11,6 +11,7 @@
48128 48153
48129 #include <linux/gfp.h> 48154 #include <linux/gfp.h>
@@ -48195,9 +48220,9 @@ diff -urNp linux-2.6.32.23/include/linux/slab.h linux-2.6.32.23/include/linux/sl
48195+}) 48220+})
48196+ 48221+
48197 #endif /* _LINUX_SLAB_H */ 48222 #endif /* _LINUX_SLAB_H */
48198diff -urNp linux-2.6.32.23/include/linux/slub_def.h linux-2.6.32.23/include/linux/slub_def.h 48223diff -urNp linux-2.6.32.24/include/linux/slub_def.h linux-2.6.32.24/include/linux/slub_def.h
48199--- linux-2.6.32.23/include/linux/slub_def.h 2010-08-13 16:24:37.000000000 -0400 48224--- linux-2.6.32.24/include/linux/slub_def.h 2010-08-13 16:24:37.000000000 -0400
48200+++ linux-2.6.32.23/include/linux/slub_def.h 2010-09-04 15:54:52.000000000 -0400 48225+++ linux-2.6.32.24/include/linux/slub_def.h 2010-09-04 15:54:52.000000000 -0400
48201@@ -86,7 +86,7 @@ struct kmem_cache { 48226@@ -86,7 +86,7 @@ struct kmem_cache {
48202 struct kmem_cache_order_objects max; 48227 struct kmem_cache_order_objects max;
48203 struct kmem_cache_order_objects min; 48228 struct kmem_cache_order_objects min;
@@ -48207,9 +48232,9 @@ diff -urNp linux-2.6.32.23/include/linux/slub_def.h linux-2.6.32.23/include/linu
48207 void (*ctor)(void *); 48232 void (*ctor)(void *);
48208 int inuse; /* Offset to metadata */ 48233 int inuse; /* Offset to metadata */
48209 int align; /* Alignment */ 48234 int align; /* Alignment */
48210diff -urNp linux-2.6.32.23/include/linux/sonet.h linux-2.6.32.23/include/linux/sonet.h 48235diff -urNp linux-2.6.32.24/include/linux/sonet.h linux-2.6.32.24/include/linux/sonet.h
48211--- linux-2.6.32.23/include/linux/sonet.h 2010-08-13 16:24:37.000000000 -0400 48236--- linux-2.6.32.24/include/linux/sonet.h 2010-08-13 16:24:37.000000000 -0400
48212+++ linux-2.6.32.23/include/linux/sonet.h 2010-09-04 15:54:52.000000000 -0400 48237+++ linux-2.6.32.24/include/linux/sonet.h 2010-09-04 15:54:52.000000000 -0400
48213@@ -61,7 +61,7 @@ struct sonet_stats { 48238@@ -61,7 +61,7 @@ struct sonet_stats {
48214 #include <asm/atomic.h> 48239 #include <asm/atomic.h>
48215 48240
@@ -48219,9 +48244,9 @@ diff -urNp linux-2.6.32.23/include/linux/sonet.h linux-2.6.32.23/include/linux/s
48219 __SONET_ITEMS 48244 __SONET_ITEMS
48220 #undef __HANDLE_ITEM 48245 #undef __HANDLE_ITEM
48221 }; 48246 };
48222diff -urNp linux-2.6.32.23/include/linux/suspend.h linux-2.6.32.23/include/linux/suspend.h 48247diff -urNp linux-2.6.32.24/include/linux/suspend.h linux-2.6.32.24/include/linux/suspend.h
48223--- linux-2.6.32.23/include/linux/suspend.h 2010-08-13 16:24:37.000000000 -0400 48248--- linux-2.6.32.24/include/linux/suspend.h 2010-08-13 16:24:37.000000000 -0400
48224+++ linux-2.6.32.23/include/linux/suspend.h 2010-09-04 15:54:52.000000000 -0400 48249+++ linux-2.6.32.24/include/linux/suspend.h 2010-09-04 15:54:52.000000000 -0400
48225@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; 48250@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
48226 * which require special recovery actions in that situation. 48251 * which require special recovery actions in that situation.
48227 */ 48252 */
@@ -48310,9 +48335,9 @@ diff -urNp linux-2.6.32.23/include/linux/suspend.h linux-2.6.32.23/include/linux
48310 static inline int hibernate(void) { return -ENOSYS; } 48335 static inline int hibernate(void) { return -ENOSYS; }
48311 static inline bool system_entering_hibernation(void) { return false; } 48336 static inline bool system_entering_hibernation(void) { return false; }
48312 #endif /* CONFIG_HIBERNATION */ 48337 #endif /* CONFIG_HIBERNATION */
48313diff -urNp linux-2.6.32.23/include/linux/sysctl.h linux-2.6.32.23/include/linux/sysctl.h 48338diff -urNp linux-2.6.32.24/include/linux/sysctl.h linux-2.6.32.24/include/linux/sysctl.h
48314--- linux-2.6.32.23/include/linux/sysctl.h 2010-08-13 16:24:37.000000000 -0400 48339--- linux-2.6.32.24/include/linux/sysctl.h 2010-08-13 16:24:37.000000000 -0400
48315+++ linux-2.6.32.23/include/linux/sysctl.h 2010-09-04 15:54:52.000000000 -0400 48340+++ linux-2.6.32.24/include/linux/sysctl.h 2010-09-04 15:54:52.000000000 -0400
48316@@ -164,7 +164,11 @@ enum 48341@@ -164,7 +164,11 @@ enum
48317 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ 48342 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
48318 }; 48343 };
@@ -48326,9 +48351,9 @@ diff -urNp linux-2.6.32.23/include/linux/sysctl.h linux-2.6.32.23/include/linux/
48326 48351
48327 /* CTL_VM names: */ 48352 /* CTL_VM names: */
48328 enum 48353 enum
48329diff -urNp linux-2.6.32.23/include/linux/sysfs.h linux-2.6.32.23/include/linux/sysfs.h 48354diff -urNp linux-2.6.32.24/include/linux/sysfs.h linux-2.6.32.24/include/linux/sysfs.h
48330--- linux-2.6.32.23/include/linux/sysfs.h 2010-08-13 16:24:37.000000000 -0400 48355--- linux-2.6.32.24/include/linux/sysfs.h 2010-08-13 16:24:37.000000000 -0400
48331+++ linux-2.6.32.23/include/linux/sysfs.h 2010-09-04 15:54:52.000000000 -0400 48356+++ linux-2.6.32.24/include/linux/sysfs.h 2010-09-04 15:54:52.000000000 -0400
48332@@ -75,8 +75,8 @@ struct bin_attribute { 48357@@ -75,8 +75,8 @@ struct bin_attribute {
48333 }; 48358 };
48334 48359
@@ -48340,9 +48365,9 @@ diff -urNp linux-2.6.32.23/include/linux/sysfs.h linux-2.6.32.23/include/linux/s
48340 }; 48365 };
48341 48366
48342 struct sysfs_dirent; 48367 struct sysfs_dirent;
48343diff -urNp linux-2.6.32.23/include/linux/thread_info.h linux-2.6.32.23/include/linux/thread_info.h 48368diff -urNp linux-2.6.32.24/include/linux/thread_info.h linux-2.6.32.24/include/linux/thread_info.h
48344--- linux-2.6.32.23/include/linux/thread_info.h 2010-08-13 16:24:37.000000000 -0400 48369--- linux-2.6.32.24/include/linux/thread_info.h 2010-08-13 16:24:37.000000000 -0400
48345+++ linux-2.6.32.23/include/linux/thread_info.h 2010-09-04 15:54:52.000000000 -0400 48370+++ linux-2.6.32.24/include/linux/thread_info.h 2010-09-04 15:54:52.000000000 -0400
48346@@ -23,7 +23,7 @@ struct restart_block { 48371@@ -23,7 +23,7 @@ struct restart_block {
48347 }; 48372 };
48348 /* For futex_wait and futex_wait_requeue_pi */ 48373 /* For futex_wait and futex_wait_requeue_pi */
@@ -48352,9 +48377,9 @@ diff -urNp linux-2.6.32.23/include/linux/thread_info.h linux-2.6.32.23/include/l
48352 u32 val; 48377 u32 val;
48353 u32 flags; 48378 u32 flags;
48354 u32 bitset; 48379 u32 bitset;
48355diff -urNp linux-2.6.32.23/include/linux/tty.h linux-2.6.32.23/include/linux/tty.h 48380diff -urNp linux-2.6.32.24/include/linux/tty.h linux-2.6.32.24/include/linux/tty.h
48356--- linux-2.6.32.23/include/linux/tty.h 2010-08-13 16:24:37.000000000 -0400 48381--- linux-2.6.32.24/include/linux/tty.h 2010-08-13 16:24:37.000000000 -0400
48357+++ linux-2.6.32.23/include/linux/tty.h 2010-09-04 15:54:52.000000000 -0400 48382+++ linux-2.6.32.24/include/linux/tty.h 2010-09-04 15:54:52.000000000 -0400
48358@@ -13,6 +13,7 @@ 48383@@ -13,6 +13,7 @@
48359 #include <linux/tty_driver.h> 48384 #include <linux/tty_driver.h>
48360 #include <linux/tty_ldisc.h> 48385 #include <linux/tty_ldisc.h>
@@ -48390,9 +48415,9 @@ diff -urNp linux-2.6.32.23/include/linux/tty.h linux-2.6.32.23/include/linux/tty
48390 48415
48391 /* n_tty.c */ 48416 /* n_tty.c */
48392 extern struct tty_ldisc_ops tty_ldisc_N_TTY; 48417 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
48393diff -urNp linux-2.6.32.23/include/linux/tty_ldisc.h linux-2.6.32.23/include/linux/tty_ldisc.h 48418diff -urNp linux-2.6.32.24/include/linux/tty_ldisc.h linux-2.6.32.24/include/linux/tty_ldisc.h
48394--- linux-2.6.32.23/include/linux/tty_ldisc.h 2010-08-13 16:24:37.000000000 -0400 48419--- linux-2.6.32.24/include/linux/tty_ldisc.h 2010-08-13 16:24:37.000000000 -0400
48395+++ linux-2.6.32.23/include/linux/tty_ldisc.h 2010-09-04 15:54:52.000000000 -0400 48420+++ linux-2.6.32.24/include/linux/tty_ldisc.h 2010-09-04 15:54:52.000000000 -0400
48396@@ -139,7 +139,7 @@ struct tty_ldisc_ops { 48421@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
48397 48422
48398 struct module *owner; 48423 struct module *owner;
@@ -48402,9 +48427,9 @@ diff -urNp linux-2.6.32.23/include/linux/tty_ldisc.h linux-2.6.32.23/include/lin
48402 }; 48427 };
48403 48428
48404 struct tty_ldisc { 48429 struct tty_ldisc {
48405diff -urNp linux-2.6.32.23/include/linux/types.h linux-2.6.32.23/include/linux/types.h 48430diff -urNp linux-2.6.32.24/include/linux/types.h linux-2.6.32.24/include/linux/types.h
48406--- linux-2.6.32.23/include/linux/types.h 2010-08-13 16:24:37.000000000 -0400 48431--- linux-2.6.32.24/include/linux/types.h 2010-08-13 16:24:37.000000000 -0400
48407+++ linux-2.6.32.23/include/linux/types.h 2010-09-04 15:54:52.000000000 -0400 48432+++ linux-2.6.32.24/include/linux/types.h 2010-09-04 15:54:52.000000000 -0400
48408@@ -191,10 +191,26 @@ typedef struct { 48433@@ -191,10 +191,26 @@ typedef struct {
48409 volatile int counter; 48434 volatile int counter;
48410 } atomic_t; 48435 } atomic_t;
@@ -48432,9 +48457,9 @@ diff -urNp linux-2.6.32.23/include/linux/types.h linux-2.6.32.23/include/linux/t
48432 #endif 48457 #endif
48433 48458
48434 struct ustat { 48459 struct ustat {
48435diff -urNp linux-2.6.32.23/include/linux/uaccess.h linux-2.6.32.23/include/linux/uaccess.h 48460diff -urNp linux-2.6.32.24/include/linux/uaccess.h linux-2.6.32.24/include/linux/uaccess.h
48436--- linux-2.6.32.23/include/linux/uaccess.h 2010-08-13 16:24:37.000000000 -0400 48461--- linux-2.6.32.24/include/linux/uaccess.h 2010-08-13 16:24:37.000000000 -0400
48437+++ linux-2.6.32.23/include/linux/uaccess.h 2010-09-04 15:54:52.000000000 -0400 48462+++ linux-2.6.32.24/include/linux/uaccess.h 2010-09-04 15:54:52.000000000 -0400
48438@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ 48463@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
48439 long ret; \ 48464 long ret; \
48440 mm_segment_t old_fs = get_fs(); \ 48465 mm_segment_t old_fs = get_fs(); \
@@ -48466,9 +48491,9 @@ diff -urNp linux-2.6.32.23/include/linux/uaccess.h linux-2.6.32.23/include/linux
48466+extern long probe_kernel_write(void *dst, const void *src, size_t size); 48491+extern long probe_kernel_write(void *dst, const void *src, size_t size);
48467 48492
48468 #endif /* __LINUX_UACCESS_H__ */ 48493 #endif /* __LINUX_UACCESS_H__ */
48469diff -urNp linux-2.6.32.23/include/linux/vmalloc.h linux-2.6.32.23/include/linux/vmalloc.h 48494diff -urNp linux-2.6.32.24/include/linux/vmalloc.h linux-2.6.32.24/include/linux/vmalloc.h
48470--- linux-2.6.32.23/include/linux/vmalloc.h 2010-08-13 16:24:37.000000000 -0400 48495--- linux-2.6.32.24/include/linux/vmalloc.h 2010-08-13 16:24:37.000000000 -0400
48471+++ linux-2.6.32.23/include/linux/vmalloc.h 2010-09-04 15:54:52.000000000 -0400 48496+++ linux-2.6.32.24/include/linux/vmalloc.h 2010-09-04 15:54:52.000000000 -0400
48472@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining 48497@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
48473 #define VM_MAP 0x00000004 /* vmap()ed pages */ 48498 #define VM_MAP 0x00000004 /* vmap()ed pages */
48474 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ 48499 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
@@ -48563,9 +48588,9 @@ diff -urNp linux-2.6.32.23/include/linux/vmalloc.h linux-2.6.32.23/include/linux
48563+}) 48588+})
48564+ 48589+
48565 #endif /* _LINUX_VMALLOC_H */ 48590 #endif /* _LINUX_VMALLOC_H */
48566diff -urNp linux-2.6.32.23/include/linux/vmstat.h linux-2.6.32.23/include/linux/vmstat.h 48591diff -urNp linux-2.6.32.24/include/linux/vmstat.h linux-2.6.32.24/include/linux/vmstat.h
48567--- linux-2.6.32.23/include/linux/vmstat.h 2010-09-26 17:26:05.000000000 -0400 48592--- linux-2.6.32.24/include/linux/vmstat.h 2010-09-26 17:26:05.000000000 -0400
48568+++ linux-2.6.32.23/include/linux/vmstat.h 2010-09-26 22:01:38.000000000 -0400 48593+++ linux-2.6.32.24/include/linux/vmstat.h 2010-09-26 22:01:38.000000000 -0400
48569@@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in 48594@@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in
48570 /* 48595 /*
48571 * Zone based page accounting with per cpu differentials. 48596 * Zone based page accounting with per cpu differentials.
@@ -48629,9 +48654,9 @@ diff -urNp linux-2.6.32.23/include/linux/vmstat.h linux-2.6.32.23/include/linux/
48629 } 48654 }
48630 48655
48631 static inline void __dec_zone_page_state(struct page *page, 48656 static inline void __dec_zone_page_state(struct page *page,
48632diff -urNp linux-2.6.32.23/include/net/irda/ircomm_tty.h linux-2.6.32.23/include/net/irda/ircomm_tty.h 48657diff -urNp linux-2.6.32.24/include/net/irda/ircomm_tty.h linux-2.6.32.24/include/net/irda/ircomm_tty.h
48633--- linux-2.6.32.23/include/net/irda/ircomm_tty.h 2010-08-13 16:24:37.000000000 -0400 48658--- linux-2.6.32.24/include/net/irda/ircomm_tty.h 2010-08-13 16:24:37.000000000 -0400
48634+++ linux-2.6.32.23/include/net/irda/ircomm_tty.h 2010-09-04 15:54:52.000000000 -0400 48659+++ linux-2.6.32.24/include/net/irda/ircomm_tty.h 2010-09-04 15:54:52.000000000 -0400
48635@@ -105,8 +105,8 @@ struct ircomm_tty_cb { 48660@@ -105,8 +105,8 @@ struct ircomm_tty_cb {
48636 unsigned short close_delay; 48661 unsigned short close_delay;
48637 unsigned short closing_wait; /* time to wait before closing */ 48662 unsigned short closing_wait; /* time to wait before closing */
@@ -48643,9 +48668,9 @@ diff -urNp linux-2.6.32.23/include/net/irda/ircomm_tty.h linux-2.6.32.23/include
48643 48668
48644 /* Protect concurent access to : 48669 /* Protect concurent access to :
48645 * o self->open_count 48670 * o self->open_count
48646diff -urNp linux-2.6.32.23/include/net/neighbour.h linux-2.6.32.23/include/net/neighbour.h 48671diff -urNp linux-2.6.32.24/include/net/neighbour.h linux-2.6.32.24/include/net/neighbour.h
48647--- linux-2.6.32.23/include/net/neighbour.h 2010-08-13 16:24:37.000000000 -0400 48672--- linux-2.6.32.24/include/net/neighbour.h 2010-08-13 16:24:37.000000000 -0400
48648+++ linux-2.6.32.23/include/net/neighbour.h 2010-09-04 15:54:52.000000000 -0400 48673+++ linux-2.6.32.24/include/net/neighbour.h 2010-09-04 15:54:52.000000000 -0400
48649@@ -125,12 +125,12 @@ struct neighbour 48674@@ -125,12 +125,12 @@ struct neighbour
48650 struct neigh_ops 48675 struct neigh_ops
48651 { 48676 {
@@ -48665,9 +48690,9 @@ diff -urNp linux-2.6.32.23/include/net/neighbour.h linux-2.6.32.23/include/net/n
48665 }; 48690 };
48666 48691
48667 struct pneigh_entry 48692 struct pneigh_entry
48668diff -urNp linux-2.6.32.23/include/net/sctp/sctp.h linux-2.6.32.23/include/net/sctp/sctp.h 48693diff -urNp linux-2.6.32.24/include/net/sctp/sctp.h linux-2.6.32.24/include/net/sctp/sctp.h
48669--- linux-2.6.32.23/include/net/sctp/sctp.h 2010-08-13 16:24:37.000000000 -0400 48694--- linux-2.6.32.24/include/net/sctp/sctp.h 2010-08-13 16:24:37.000000000 -0400
48670+++ linux-2.6.32.23/include/net/sctp/sctp.h 2010-09-04 15:54:52.000000000 -0400 48695+++ linux-2.6.32.24/include/net/sctp/sctp.h 2010-09-04 15:54:52.000000000 -0400
48671@@ -305,8 +305,8 @@ extern int sctp_debug_flag; 48696@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
48672 48697
48673 #else /* SCTP_DEBUG */ 48698 #else /* SCTP_DEBUG */
@@ -48679,9 +48704,9 @@ diff -urNp linux-2.6.32.23/include/net/sctp/sctp.h linux-2.6.32.23/include/net/s
48679 #define SCTP_ENABLE_DEBUG 48704 #define SCTP_ENABLE_DEBUG
48680 #define SCTP_DISABLE_DEBUG 48705 #define SCTP_DISABLE_DEBUG
48681 #define SCTP_ASSERT(expr, str, func) 48706 #define SCTP_ASSERT(expr, str, func)
48682diff -urNp linux-2.6.32.23/include/net/tcp.h linux-2.6.32.23/include/net/tcp.h 48707diff -urNp linux-2.6.32.24/include/net/tcp.h linux-2.6.32.24/include/net/tcp.h
48683--- linux-2.6.32.23/include/net/tcp.h 2010-09-26 17:26:05.000000000 -0400 48708--- linux-2.6.32.24/include/net/tcp.h 2010-09-26 17:26:05.000000000 -0400
48684+++ linux-2.6.32.23/include/net/tcp.h 2010-09-26 17:26:57.000000000 -0400 48709+++ linux-2.6.32.24/include/net/tcp.h 2010-09-26 17:26:57.000000000 -0400
48685@@ -1444,6 +1444,7 @@ enum tcp_seq_states { 48710@@ -1444,6 +1444,7 @@ enum tcp_seq_states {
48686 struct tcp_seq_afinfo { 48711 struct tcp_seq_afinfo {
48687 char *name; 48712 char *name;
@@ -48690,9 +48715,9 @@ diff -urNp linux-2.6.32.23/include/net/tcp.h linux-2.6.32.23/include/net/tcp.h
48690 struct file_operations seq_fops; 48715 struct file_operations seq_fops;
48691 struct seq_operations seq_ops; 48716 struct seq_operations seq_ops;
48692 }; 48717 };
48693diff -urNp linux-2.6.32.23/include/net/udp.h linux-2.6.32.23/include/net/udp.h 48718diff -urNp linux-2.6.32.24/include/net/udp.h linux-2.6.32.24/include/net/udp.h
48694--- linux-2.6.32.23/include/net/udp.h 2010-08-13 16:24:37.000000000 -0400 48719--- linux-2.6.32.24/include/net/udp.h 2010-08-13 16:24:37.000000000 -0400
48695+++ linux-2.6.32.23/include/net/udp.h 2010-09-04 15:54:52.000000000 -0400 48720+++ linux-2.6.32.24/include/net/udp.h 2010-09-04 15:54:52.000000000 -0400
48696@@ -187,6 +187,7 @@ struct udp_seq_afinfo { 48721@@ -187,6 +187,7 @@ struct udp_seq_afinfo {
48697 char *name; 48722 char *name;
48698 sa_family_t family; 48723 sa_family_t family;
@@ -48701,9 +48726,9 @@ diff -urNp linux-2.6.32.23/include/net/udp.h linux-2.6.32.23/include/net/udp.h
48701 struct file_operations seq_fops; 48726 struct file_operations seq_fops;
48702 struct seq_operations seq_ops; 48727 struct seq_operations seq_ops;
48703 }; 48728 };
48704diff -urNp linux-2.6.32.23/include/sound/ac97_codec.h linux-2.6.32.23/include/sound/ac97_codec.h 48729diff -urNp linux-2.6.32.24/include/sound/ac97_codec.h linux-2.6.32.24/include/sound/ac97_codec.h
48705--- linux-2.6.32.23/include/sound/ac97_codec.h 2010-08-13 16:24:37.000000000 -0400 48730--- linux-2.6.32.24/include/sound/ac97_codec.h 2010-08-13 16:24:37.000000000 -0400
48706+++ linux-2.6.32.23/include/sound/ac97_codec.h 2010-09-04 15:54:52.000000000 -0400 48731+++ linux-2.6.32.24/include/sound/ac97_codec.h 2010-09-04 15:54:52.000000000 -0400
48707@@ -419,15 +419,15 @@ 48732@@ -419,15 +419,15 @@
48708 struct snd_ac97; 48733 struct snd_ac97;
48709 48734
@@ -48736,9 +48761,9 @@ diff -urNp linux-2.6.32.23/include/sound/ac97_codec.h linux-2.6.32.23/include/so
48736 void *private_data; 48761 void *private_data;
48737 void (*private_free) (struct snd_ac97 *ac97); 48762 void (*private_free) (struct snd_ac97 *ac97);
48738 /* --- */ 48763 /* --- */
48739diff -urNp linux-2.6.32.23/include/trace/events/irq.h linux-2.6.32.23/include/trace/events/irq.h 48764diff -urNp linux-2.6.32.24/include/trace/events/irq.h linux-2.6.32.24/include/trace/events/irq.h
48740--- linux-2.6.32.23/include/trace/events/irq.h 2010-08-13 16:24:37.000000000 -0400 48765--- linux-2.6.32.24/include/trace/events/irq.h 2010-08-13 16:24:37.000000000 -0400
48741+++ linux-2.6.32.23/include/trace/events/irq.h 2010-09-04 15:54:52.000000000 -0400 48766+++ linux-2.6.32.24/include/trace/events/irq.h 2010-09-04 15:54:52.000000000 -0400
48742@@ -34,7 +34,7 @@ 48767@@ -34,7 +34,7 @@
48743 */ 48768 */
48744 TRACE_EVENT(irq_handler_entry, 48769 TRACE_EVENT(irq_handler_entry,
@@ -48775,9 +48800,9 @@ diff -urNp linux-2.6.32.23/include/trace/events/irq.h linux-2.6.32.23/include/tr
48775 48800
48776 TP_ARGS(h, vec), 48801 TP_ARGS(h, vec),
48777 48802
48778diff -urNp linux-2.6.32.23/include/video/uvesafb.h linux-2.6.32.23/include/video/uvesafb.h 48803diff -urNp linux-2.6.32.24/include/video/uvesafb.h linux-2.6.32.24/include/video/uvesafb.h
48779--- linux-2.6.32.23/include/video/uvesafb.h 2010-08-13 16:24:37.000000000 -0400 48804--- linux-2.6.32.24/include/video/uvesafb.h 2010-08-13 16:24:37.000000000 -0400
48780+++ linux-2.6.32.23/include/video/uvesafb.h 2010-09-04 15:54:52.000000000 -0400 48805+++ linux-2.6.32.24/include/video/uvesafb.h 2010-09-04 15:54:52.000000000 -0400
48781@@ -177,6 +177,7 @@ struct uvesafb_par { 48806@@ -177,6 +177,7 @@ struct uvesafb_par {
48782 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ 48807 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
48783 u8 pmi_setpal; /* PMI for palette changes */ 48808 u8 pmi_setpal; /* PMI for palette changes */
@@ -48786,9 +48811,9 @@ diff -urNp linux-2.6.32.23/include/video/uvesafb.h linux-2.6.32.23/include/video
48786 void *pmi_start; 48811 void *pmi_start;
48787 void *pmi_pal; 48812 void *pmi_pal;
48788 u8 *vbe_state_orig; /* 48813 u8 *vbe_state_orig; /*
48789diff -urNp linux-2.6.32.23/init/do_mounts.c linux-2.6.32.23/init/do_mounts.c 48814diff -urNp linux-2.6.32.24/init/do_mounts.c linux-2.6.32.24/init/do_mounts.c
48790--- linux-2.6.32.23/init/do_mounts.c 2010-08-13 16:24:37.000000000 -0400 48815--- linux-2.6.32.24/init/do_mounts.c 2010-08-13 16:24:37.000000000 -0400
48791+++ linux-2.6.32.23/init/do_mounts.c 2010-09-04 15:54:52.000000000 -0400 48816+++ linux-2.6.32.24/init/do_mounts.c 2010-09-04 15:54:52.000000000 -0400
48792@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa 48817@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
48793 48818
48794 static int __init do_mount_root(char *name, char *fs, int flags, void *data) 48819 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -48834,9 +48859,9 @@ diff -urNp linux-2.6.32.23/init/do_mounts.c linux-2.6.32.23/init/do_mounts.c
48834+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); 48859+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
48835+ sys_chroot((__force char __user *)"."); 48860+ sys_chroot((__force char __user *)".");
48836 } 48861 }
48837diff -urNp linux-2.6.32.23/init/do_mounts.h linux-2.6.32.23/init/do_mounts.h 48862diff -urNp linux-2.6.32.24/init/do_mounts.h linux-2.6.32.24/init/do_mounts.h
48838--- linux-2.6.32.23/init/do_mounts.h 2010-08-13 16:24:37.000000000 -0400 48863--- linux-2.6.32.24/init/do_mounts.h 2010-08-13 16:24:37.000000000 -0400
48839+++ linux-2.6.32.23/init/do_mounts.h 2010-09-04 15:54:52.000000000 -0400 48864+++ linux-2.6.32.24/init/do_mounts.h 2010-09-04 15:54:52.000000000 -0400
48840@@ -15,15 +15,15 @@ extern int root_mountflags; 48865@@ -15,15 +15,15 @@ extern int root_mountflags;
48841 48866
48842 static inline int create_dev(char *name, dev_t dev) 48867 static inline int create_dev(char *name, dev_t dev)
@@ -48856,9 +48881,9 @@ diff -urNp linux-2.6.32.23/init/do_mounts.h linux-2.6.32.23/init/do_mounts.h
48856 return 0; 48881 return 0;
48857 if (!S_ISBLK(stat.st_mode)) 48882 if (!S_ISBLK(stat.st_mode))
48858 return 0; 48883 return 0;
48859diff -urNp linux-2.6.32.23/init/do_mounts_initrd.c linux-2.6.32.23/init/do_mounts_initrd.c 48884diff -urNp linux-2.6.32.24/init/do_mounts_initrd.c linux-2.6.32.24/init/do_mounts_initrd.c
48860--- linux-2.6.32.23/init/do_mounts_initrd.c 2010-08-13 16:24:37.000000000 -0400 48885--- linux-2.6.32.24/init/do_mounts_initrd.c 2010-08-13 16:24:37.000000000 -0400
48861+++ linux-2.6.32.23/init/do_mounts_initrd.c 2010-09-04 15:54:52.000000000 -0400 48886+++ linux-2.6.32.24/init/do_mounts_initrd.c 2010-09-04 15:54:52.000000000 -0400
48862@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel 48887@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
48863 sys_close(old_fd);sys_close(root_fd); 48888 sys_close(old_fd);sys_close(root_fd);
48864 sys_close(0);sys_close(1);sys_close(2); 48889 sys_close(0);sys_close(1);sys_close(2);
@@ -48942,9 +48967,9 @@ diff -urNp linux-2.6.32.23/init/do_mounts_initrd.c linux-2.6.32.23/init/do_mount
48942+ sys_unlink((__force const char __user *)"/initrd.image"); 48967+ sys_unlink((__force const char __user *)"/initrd.image");
48943 return 0; 48968 return 0;
48944 } 48969 }
48945diff -urNp linux-2.6.32.23/init/do_mounts_md.c linux-2.6.32.23/init/do_mounts_md.c 48970diff -urNp linux-2.6.32.24/init/do_mounts_md.c linux-2.6.32.24/init/do_mounts_md.c
48946--- linux-2.6.32.23/init/do_mounts_md.c 2010-08-13 16:24:37.000000000 -0400 48971--- linux-2.6.32.24/init/do_mounts_md.c 2010-08-13 16:24:37.000000000 -0400
48947+++ linux-2.6.32.23/init/do_mounts_md.c 2010-09-04 15:54:52.000000000 -0400 48972+++ linux-2.6.32.24/init/do_mounts_md.c 2010-09-04 15:54:52.000000000 -0400
48948@@ -170,7 +170,7 @@ static void __init md_setup_drive(void) 48973@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
48949 partitioned ? "_d" : "", minor, 48974 partitioned ? "_d" : "", minor,
48950 md_setup_args[ent].device_names); 48975 md_setup_args[ent].device_names);
@@ -48972,9 +48997,9 @@ diff -urNp linux-2.6.32.23/init/do_mounts_md.c linux-2.6.32.23/init/do_mounts_md
48972 if (fd >= 0) { 48997 if (fd >= 0) {
48973 sys_ioctl(fd, RAID_AUTORUN, raid_autopart); 48998 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
48974 sys_close(fd); 48999 sys_close(fd);
48975diff -urNp linux-2.6.32.23/init/initramfs.c linux-2.6.32.23/init/initramfs.c 49000diff -urNp linux-2.6.32.24/init/initramfs.c linux-2.6.32.24/init/initramfs.c
48976--- linux-2.6.32.23/init/initramfs.c 2010-08-13 16:24:37.000000000 -0400 49001--- linux-2.6.32.24/init/initramfs.c 2010-08-13 16:24:37.000000000 -0400
48977+++ linux-2.6.32.23/init/initramfs.c 2010-09-04 15:54:52.000000000 -0400 49002+++ linux-2.6.32.24/init/initramfs.c 2010-09-04 15:54:52.000000000 -0400
48978@@ -74,7 +74,7 @@ static void __init free_hash(void) 49003@@ -74,7 +74,7 @@ static void __init free_hash(void)
48979 } 49004 }
48980 } 49005 }
@@ -49083,9 +49108,9 @@ diff -urNp linux-2.6.32.23/init/initramfs.c linux-2.6.32.23/init/initramfs.c
49083 state = SkipIt; 49108 state = SkipIt;
49084 next_state = Reset; 49109 next_state = Reset;
49085 return 0; 49110 return 0;
49086diff -urNp linux-2.6.32.23/init/Kconfig linux-2.6.32.23/init/Kconfig 49111diff -urNp linux-2.6.32.24/init/Kconfig linux-2.6.32.24/init/Kconfig
49087--- linux-2.6.32.23/init/Kconfig 2010-08-13 16:24:37.000000000 -0400 49112--- linux-2.6.32.24/init/Kconfig 2010-08-13 16:24:37.000000000 -0400
49088+++ linux-2.6.32.23/init/Kconfig 2010-09-04 15:54:52.000000000 -0400 49113+++ linux-2.6.32.24/init/Kconfig 2010-09-04 15:54:52.000000000 -0400
49089@@ -1026,7 +1026,7 @@ config SLUB_DEBUG 49114@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
49090 49115
49091 config COMPAT_BRK 49116 config COMPAT_BRK
@@ -49095,9 +49120,9 @@ diff -urNp linux-2.6.32.23/init/Kconfig linux-2.6.32.23/init/Kconfig
49095 help 49120 help
49096 Randomizing heap placement makes heap exploits harder, but it 49121 Randomizing heap placement makes heap exploits harder, but it
49097 also breaks ancient binaries (including anything libc5 based). 49122 also breaks ancient binaries (including anything libc5 based).
49098diff -urNp linux-2.6.32.23/init/main.c linux-2.6.32.23/init/main.c 49123diff -urNp linux-2.6.32.24/init/main.c linux-2.6.32.24/init/main.c
49099--- linux-2.6.32.23/init/main.c 2010-08-13 16:24:37.000000000 -0400 49124--- linux-2.6.32.24/init/main.c 2010-08-13 16:24:37.000000000 -0400
49100+++ linux-2.6.32.23/init/main.c 2010-09-04 15:54:52.000000000 -0400 49125+++ linux-2.6.32.24/init/main.c 2010-09-04 15:54:52.000000000 -0400
49101@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) 49126@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
49102 #ifdef CONFIG_TC 49127 #ifdef CONFIG_TC
49103 extern void tc_init(void); 49128 extern void tc_init(void);
@@ -49242,9 +49267,9 @@ diff -urNp linux-2.6.32.23/init/main.c linux-2.6.32.23/init/main.c
49242 /* 49267 /*
49243 * Ok, we have completed the initial bootup, and 49268 * Ok, we have completed the initial bootup, and
49244 * we're essentially up and running. Get rid of the 49269 * we're essentially up and running. Get rid of the
49245diff -urNp linux-2.6.32.23/init/noinitramfs.c linux-2.6.32.23/init/noinitramfs.c 49270diff -urNp linux-2.6.32.24/init/noinitramfs.c linux-2.6.32.24/init/noinitramfs.c
49246--- linux-2.6.32.23/init/noinitramfs.c 2010-08-13 16:24:37.000000000 -0400 49271--- linux-2.6.32.24/init/noinitramfs.c 2010-08-13 16:24:37.000000000 -0400
49247+++ linux-2.6.32.23/init/noinitramfs.c 2010-09-04 15:54:52.000000000 -0400 49272+++ linux-2.6.32.24/init/noinitramfs.c 2010-09-04 15:54:52.000000000 -0400
49248@@ -29,7 +29,7 @@ static int __init default_rootfs(void) 49273@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
49249 { 49274 {
49250 int err; 49275 int err;
@@ -49263,9 +49288,9 @@ diff -urNp linux-2.6.32.23/init/noinitramfs.c linux-2.6.32.23/init/noinitramfs.c
49263 if (err < 0) 49288 if (err < 0)
49264 goto out; 49289 goto out;
49265 49290
49266diff -urNp linux-2.6.32.23/ipc/ipc_sysctl.c linux-2.6.32.23/ipc/ipc_sysctl.c 49291diff -urNp linux-2.6.32.24/ipc/ipc_sysctl.c linux-2.6.32.24/ipc/ipc_sysctl.c
49267--- linux-2.6.32.23/ipc/ipc_sysctl.c 2010-08-13 16:24:37.000000000 -0400 49292--- linux-2.6.32.24/ipc/ipc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
49268+++ linux-2.6.32.23/ipc/ipc_sysctl.c 2010-09-04 15:54:52.000000000 -0400 49293+++ linux-2.6.32.24/ipc/ipc_sysctl.c 2010-09-04 15:54:52.000000000 -0400
49269@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] 49294@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
49270 .extra1 = &zero, 49295 .extra1 = &zero,
49271 .extra2 = &one, 49296 .extra2 = &one,
@@ -49284,9 +49309,9 @@ diff -urNp linux-2.6.32.23/ipc/ipc_sysctl.c linux-2.6.32.23/ipc/ipc_sysctl.c
49284 }; 49309 };
49285 49310
49286 static int __init ipc_sysctl_init(void) 49311 static int __init ipc_sysctl_init(void)
49287diff -urNp linux-2.6.32.23/ipc/mqueue.c linux-2.6.32.23/ipc/mqueue.c 49312diff -urNp linux-2.6.32.24/ipc/mqueue.c linux-2.6.32.24/ipc/mqueue.c
49288--- linux-2.6.32.23/ipc/mqueue.c 2010-08-13 16:24:37.000000000 -0400 49313--- linux-2.6.32.24/ipc/mqueue.c 2010-08-13 16:24:37.000000000 -0400
49289+++ linux-2.6.32.23/ipc/mqueue.c 2010-09-04 15:54:52.000000000 -0400 49314+++ linux-2.6.32.24/ipc/mqueue.c 2010-09-04 15:54:52.000000000 -0400
49290@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st 49315@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
49291 mq_bytes = (mq_msg_tblsz + 49316 mq_bytes = (mq_msg_tblsz +
49292 (info->attr.mq_maxmsg * info->attr.mq_msgsize)); 49317 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -49295,9 +49320,21 @@ diff -urNp linux-2.6.32.23/ipc/mqueue.c linux-2.6.32.23/ipc/mqueue.c
49295 spin_lock(&mq_lock); 49320 spin_lock(&mq_lock);
49296 if (u->mq_bytes + mq_bytes < u->mq_bytes || 49321 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
49297 u->mq_bytes + mq_bytes > 49322 u->mq_bytes + mq_bytes >
49298diff -urNp linux-2.6.32.23/ipc/shm.c linux-2.6.32.23/ipc/shm.c 49323diff -urNp linux-2.6.32.24/ipc/sem.c linux-2.6.32.24/ipc/sem.c
49299--- linux-2.6.32.23/ipc/shm.c 2010-08-13 16:24:37.000000000 -0400 49324--- linux-2.6.32.24/ipc/sem.c 2010-08-13 16:24:37.000000000 -0400
49300+++ linux-2.6.32.23/ipc/shm.c 2010-09-04 15:54:52.000000000 -0400 49325+++ linux-2.6.32.24/ipc/sem.c 2010-09-28 18:24:37.000000000 -0400
49326@@ -560,6 +560,8 @@ static unsigned long copy_semid_to_user(
49327 {
49328 struct semid_ds out;
49329
49330+ memset(&out, 0, sizeof(out));
49331+
49332 ipc64_perm_to_ipc_perm(&in->sem_perm, &out.sem_perm);
49333
49334 out.sem_otime = in->sem_otime;
49335diff -urNp linux-2.6.32.24/ipc/shm.c linux-2.6.32.24/ipc/shm.c
49336--- linux-2.6.32.24/ipc/shm.c 2010-08-13 16:24:37.000000000 -0400
49337+++ linux-2.6.32.24/ipc/shm.c 2010-09-04 15:54:52.000000000 -0400
49301@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name 49338@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
49302 static int sysvipc_shm_proc_show(struct seq_file *s, void *it); 49339 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
49303 #endif 49340 #endif
@@ -49350,9 +49387,9 @@ diff -urNp linux-2.6.32.23/ipc/shm.c linux-2.6.32.23/ipc/shm.c
49350 size = i_size_read(path.dentry->d_inode); 49387 size = i_size_read(path.dentry->d_inode);
49351 shm_unlock(shp); 49388 shm_unlock(shp);
49352 49389
49353diff -urNp linux-2.6.32.23/kernel/acct.c linux-2.6.32.23/kernel/acct.c 49390diff -urNp linux-2.6.32.24/kernel/acct.c linux-2.6.32.24/kernel/acct.c
49354--- linux-2.6.32.23/kernel/acct.c 2010-08-13 16:24:37.000000000 -0400 49391--- linux-2.6.32.24/kernel/acct.c 2010-08-13 16:24:37.000000000 -0400
49355+++ linux-2.6.32.23/kernel/acct.c 2010-09-04 15:54:52.000000000 -0400 49392+++ linux-2.6.32.24/kernel/acct.c 2010-09-04 15:54:52.000000000 -0400
49356@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a 49393@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
49357 */ 49394 */
49358 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; 49395 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -49362,9 +49399,9 @@ diff -urNp linux-2.6.32.23/kernel/acct.c linux-2.6.32.23/kernel/acct.c
49362 sizeof(acct_t), &file->f_pos); 49399 sizeof(acct_t), &file->f_pos);
49363 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; 49400 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
49364 set_fs(fs); 49401 set_fs(fs);
49365diff -urNp linux-2.6.32.23/kernel/capability.c linux-2.6.32.23/kernel/capability.c 49402diff -urNp linux-2.6.32.24/kernel/capability.c linux-2.6.32.24/kernel/capability.c
49366--- linux-2.6.32.23/kernel/capability.c 2010-08-13 16:24:37.000000000 -0400 49403--- linux-2.6.32.24/kernel/capability.c 2010-08-13 16:24:37.000000000 -0400
49367+++ linux-2.6.32.23/kernel/capability.c 2010-09-04 15:54:52.000000000 -0400 49404+++ linux-2.6.32.24/kernel/capability.c 2010-09-04 15:54:52.000000000 -0400
49368@@ -306,10 +306,21 @@ int capable(int cap) 49405@@ -306,10 +306,21 @@ int capable(int cap)
49369 BUG(); 49406 BUG();
49370 } 49407 }
@@ -49388,9 +49425,9 @@ diff -urNp linux-2.6.32.23/kernel/capability.c linux-2.6.32.23/kernel/capability
49388+ 49425+
49389 EXPORT_SYMBOL(capable); 49426 EXPORT_SYMBOL(capable);
49390+EXPORT_SYMBOL(capable_nolog); 49427+EXPORT_SYMBOL(capable_nolog);
49391diff -urNp linux-2.6.32.23/kernel/configs.c linux-2.6.32.23/kernel/configs.c 49428diff -urNp linux-2.6.32.24/kernel/configs.c linux-2.6.32.24/kernel/configs.c
49392--- linux-2.6.32.23/kernel/configs.c 2010-08-13 16:24:37.000000000 -0400 49429--- linux-2.6.32.24/kernel/configs.c 2010-08-13 16:24:37.000000000 -0400
49393+++ linux-2.6.32.23/kernel/configs.c 2010-09-04 15:54:52.000000000 -0400 49430+++ linux-2.6.32.24/kernel/configs.c 2010-09-04 15:54:52.000000000 -0400
49394@@ -73,8 +73,19 @@ static int __init ikconfig_init(void) 49431@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
49395 struct proc_dir_entry *entry; 49432 struct proc_dir_entry *entry;
49396 49433
@@ -49411,9 +49448,9 @@ diff -urNp linux-2.6.32.23/kernel/configs.c linux-2.6.32.23/kernel/configs.c
49411 if (!entry) 49448 if (!entry)
49412 return -ENOMEM; 49449 return -ENOMEM;
49413 49450
49414diff -urNp linux-2.6.32.23/kernel/cpu.c linux-2.6.32.23/kernel/cpu.c 49451diff -urNp linux-2.6.32.24/kernel/cpu.c linux-2.6.32.24/kernel/cpu.c
49415--- linux-2.6.32.23/kernel/cpu.c 2010-09-20 17:26:42.000000000 -0400 49452--- linux-2.6.32.24/kernel/cpu.c 2010-09-20 17:26:42.000000000 -0400
49416+++ linux-2.6.32.23/kernel/cpu.c 2010-09-20 17:27:30.000000000 -0400 49453+++ linux-2.6.32.24/kernel/cpu.c 2010-09-20 17:27:30.000000000 -0400
49417@@ -19,7 +19,7 @@ 49454@@ -19,7 +19,7 @@
49418 /* Serializes the updates to cpu_online_mask, cpu_present_mask */ 49455 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
49419 static DEFINE_MUTEX(cpu_add_remove_lock); 49456 static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -49423,9 +49460,9 @@ diff -urNp linux-2.6.32.23/kernel/cpu.c linux-2.6.32.23/kernel/cpu.c
49423 49460
49424 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. 49461 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
49425 * Should always be manipulated under cpu_add_remove_lock 49462 * Should always be manipulated under cpu_add_remove_lock
49426diff -urNp linux-2.6.32.23/kernel/cred.c linux-2.6.32.23/kernel/cred.c 49463diff -urNp linux-2.6.32.24/kernel/cred.c linux-2.6.32.24/kernel/cred.c
49427--- linux-2.6.32.23/kernel/cred.c 2010-08-13 16:24:37.000000000 -0400 49464--- linux-2.6.32.24/kernel/cred.c 2010-08-13 16:24:37.000000000 -0400
49428+++ linux-2.6.32.23/kernel/cred.c 2010-09-04 15:54:52.000000000 -0400 49465+++ linux-2.6.32.24/kernel/cred.c 2010-09-04 15:54:52.000000000 -0400
49429@@ -520,6 +520,8 @@ int commit_creds(struct cred *new) 49466@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
49430 49467
49431 get_cred(new); /* we will require a ref for the subj creds too */ 49468 get_cred(new); /* we will require a ref for the subj creds too */
@@ -49435,9 +49472,9 @@ diff -urNp linux-2.6.32.23/kernel/cred.c linux-2.6.32.23/kernel/cred.c
49435 /* dumpability changes */ 49472 /* dumpability changes */
49436 if (old->euid != new->euid || 49473 if (old->euid != new->euid ||
49437 old->egid != new->egid || 49474 old->egid != new->egid ||
49438diff -urNp linux-2.6.32.23/kernel/exit.c linux-2.6.32.23/kernel/exit.c 49475diff -urNp linux-2.6.32.24/kernel/exit.c linux-2.6.32.24/kernel/exit.c
49439--- linux-2.6.32.23/kernel/exit.c 2010-09-26 17:26:05.000000000 -0400 49476--- linux-2.6.32.24/kernel/exit.c 2010-09-26 17:26:05.000000000 -0400
49440+++ linux-2.6.32.23/kernel/exit.c 2010-09-26 17:26:57.000000000 -0400 49477+++ linux-2.6.32.24/kernel/exit.c 2010-09-26 17:26:57.000000000 -0400
49441@@ -56,6 +56,10 @@ 49478@@ -56,6 +56,10 @@
49442 #include <asm/mmu_context.h> 49479 #include <asm/mmu_context.h>
49443 #include "cred-internals.h" 49480 #include "cred-internals.h"
@@ -49527,9 +49564,9 @@ diff -urNp linux-2.6.32.23/kernel/exit.c linux-2.6.32.23/kernel/exit.c
49527 49564
49528 get_task_struct(p); 49565 get_task_struct(p);
49529 read_unlock(&tasklist_lock); 49566 read_unlock(&tasklist_lock);
49530diff -urNp linux-2.6.32.23/kernel/fork.c linux-2.6.32.23/kernel/fork.c 49567diff -urNp linux-2.6.32.24/kernel/fork.c linux-2.6.32.24/kernel/fork.c
49531--- linux-2.6.32.23/kernel/fork.c 2010-09-20 17:26:42.000000000 -0400 49568--- linux-2.6.32.24/kernel/fork.c 2010-09-20 17:26:42.000000000 -0400
49532+++ linux-2.6.32.23/kernel/fork.c 2010-09-20 17:27:30.000000000 -0400 49569+++ linux-2.6.32.24/kernel/fork.c 2010-09-20 17:27:30.000000000 -0400
49533@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru 49570@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
49534 *stackend = STACK_END_MAGIC; /* for overflow detection */ 49571 *stackend = STACK_END_MAGIC; /* for overflow detection */
49535 49572
@@ -49668,9 +49705,9 @@ diff -urNp linux-2.6.32.23/kernel/fork.c linux-2.6.32.23/kernel/fork.c
49668 new_fs = NULL; 49705 new_fs = NULL;
49669 else 49706 else
49670 new_fs = fs; 49707 new_fs = fs;
49671diff -urNp linux-2.6.32.23/kernel/futex.c linux-2.6.32.23/kernel/futex.c 49708diff -urNp linux-2.6.32.24/kernel/futex.c linux-2.6.32.24/kernel/futex.c
49672--- linux-2.6.32.23/kernel/futex.c 2010-08-13 16:24:37.000000000 -0400 49709--- linux-2.6.32.24/kernel/futex.c 2010-08-13 16:24:37.000000000 -0400
49673+++ linux-2.6.32.23/kernel/futex.c 2010-09-17 17:43:01.000000000 -0400 49710+++ linux-2.6.32.24/kernel/futex.c 2010-09-17 17:43:01.000000000 -0400
49674@@ -54,6 +54,7 @@ 49711@@ -54,6 +54,7 @@
49675 #include <linux/mount.h> 49712 #include <linux/mount.h>
49676 #include <linux/pagemap.h> 49713 #include <linux/pagemap.h>
@@ -49736,9 +49773,9 @@ diff -urNp linux-2.6.32.23/kernel/futex.c linux-2.6.32.23/kernel/futex.c
49736 { 49773 {
49737 unsigned long uentry; 49774 unsigned long uentry;
49738 49775
49739diff -urNp linux-2.6.32.23/kernel/futex_compat.c linux-2.6.32.23/kernel/futex_compat.c 49776diff -urNp linux-2.6.32.24/kernel/futex_compat.c linux-2.6.32.24/kernel/futex_compat.c
49740--- linux-2.6.32.23/kernel/futex_compat.c 2010-08-13 16:24:37.000000000 -0400 49777--- linux-2.6.32.24/kernel/futex_compat.c 2010-08-13 16:24:37.000000000 -0400
49741+++ linux-2.6.32.23/kernel/futex_compat.c 2010-09-04 15:54:52.000000000 -0400 49778+++ linux-2.6.32.24/kernel/futex_compat.c 2010-09-04 15:54:52.000000000 -0400
49742@@ -10,6 +10,7 @@ 49779@@ -10,6 +10,7 @@
49743 #include <linux/compat.h> 49780 #include <linux/compat.h>
49744 #include <linux/nsproxy.h> 49781 #include <linux/nsproxy.h>
@@ -49776,9 +49813,9 @@ diff -urNp linux-2.6.32.23/kernel/futex_compat.c linux-2.6.32.23/kernel/futex_co
49776 head = p->compat_robust_list; 49813 head = p->compat_robust_list;
49777 read_unlock(&tasklist_lock); 49814 read_unlock(&tasklist_lock);
49778 } 49815 }
49779diff -urNp linux-2.6.32.23/kernel/gcov/base.c linux-2.6.32.23/kernel/gcov/base.c 49816diff -urNp linux-2.6.32.24/kernel/gcov/base.c linux-2.6.32.24/kernel/gcov/base.c
49780--- linux-2.6.32.23/kernel/gcov/base.c 2010-08-13 16:24:37.000000000 -0400 49817--- linux-2.6.32.24/kernel/gcov/base.c 2010-08-13 16:24:37.000000000 -0400
49781+++ linux-2.6.32.23/kernel/gcov/base.c 2010-09-04 15:54:52.000000000 -0400 49818+++ linux-2.6.32.24/kernel/gcov/base.c 2010-09-04 15:54:52.000000000 -0400
49782@@ -102,11 +102,6 @@ void gcov_enable_events(void) 49819@@ -102,11 +102,6 @@ void gcov_enable_events(void)
49783 } 49820 }
49784 49821
@@ -49800,9 +49837,9 @@ diff -urNp linux-2.6.32.23/kernel/gcov/base.c linux-2.6.32.23/kernel/gcov/base.c
49800 if (prev) 49837 if (prev)
49801 prev->next = info->next; 49838 prev->next = info->next;
49802 else 49839 else
49803diff -urNp linux-2.6.32.23/kernel/hrtimer.c linux-2.6.32.23/kernel/hrtimer.c 49840diff -urNp linux-2.6.32.24/kernel/hrtimer.c linux-2.6.32.24/kernel/hrtimer.c
49804--- linux-2.6.32.23/kernel/hrtimer.c 2010-08-13 16:24:37.000000000 -0400 49841--- linux-2.6.32.24/kernel/hrtimer.c 2010-08-13 16:24:37.000000000 -0400
49805+++ linux-2.6.32.23/kernel/hrtimer.c 2010-09-04 15:54:52.000000000 -0400 49842+++ linux-2.6.32.24/kernel/hrtimer.c 2010-09-04 15:54:52.000000000 -0400
49806@@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void) 49843@@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void)
49807 local_irq_restore(flags); 49844 local_irq_restore(flags);
49808 } 49845 }
@@ -49812,9 +49849,9 @@ diff -urNp linux-2.6.32.23/kernel/hrtimer.c linux-2.6.32.23/kernel/hrtimer.c
49812 { 49849 {
49813 hrtimer_peek_ahead_timers(); 49850 hrtimer_peek_ahead_timers();
49814 } 49851 }
49815diff -urNp linux-2.6.32.23/kernel/kallsyms.c linux-2.6.32.23/kernel/kallsyms.c 49852diff -urNp linux-2.6.32.24/kernel/kallsyms.c linux-2.6.32.24/kernel/kallsyms.c
49816--- linux-2.6.32.23/kernel/kallsyms.c 2010-08-13 16:24:37.000000000 -0400 49853--- linux-2.6.32.24/kernel/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
49817+++ linux-2.6.32.23/kernel/kallsyms.c 2010-09-04 15:54:52.000000000 -0400 49854+++ linux-2.6.32.24/kernel/kallsyms.c 2010-09-04 15:54:52.000000000 -0400
49818@@ -11,6 +11,9 @@ 49855@@ -11,6 +11,9 @@
49819 * Changed the compression method from stem compression to "table lookup" 49856 * Changed the compression method from stem compression to "table lookup"
49820 * compression (see scripts/kallsyms.c for a more complete description) 49857 * compression (see scripts/kallsyms.c for a more complete description)
@@ -49917,9 +49954,9 @@ diff -urNp linux-2.6.32.23/kernel/kallsyms.c linux-2.6.32.23/kernel/kallsyms.c
49917 if (!iter) 49954 if (!iter)
49918 return -ENOMEM; 49955 return -ENOMEM;
49919 reset_iter(iter, 0); 49956 reset_iter(iter, 0);
49920diff -urNp linux-2.6.32.23/kernel/kgdb.c linux-2.6.32.23/kernel/kgdb.c 49957diff -urNp linux-2.6.32.24/kernel/kgdb.c linux-2.6.32.24/kernel/kgdb.c
49921--- linux-2.6.32.23/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400 49958--- linux-2.6.32.24/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
49922+++ linux-2.6.32.23/kernel/kgdb.c 2010-09-04 15:54:52.000000000 -0400 49959+++ linux-2.6.32.24/kernel/kgdb.c 2010-09-04 15:54:52.000000000 -0400
49923@@ -86,7 +86,7 @@ static int kgdb_io_module_registered; 49960@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
49924 /* Guard for recursive entry */ 49961 /* Guard for recursive entry */
49925 static int exception_level; 49962 static int exception_level;
@@ -49947,9 +49984,9 @@ diff -urNp linux-2.6.32.23/kernel/kgdb.c linux-2.6.32.23/kernel/kgdb.c
49947 { 49984 {
49948 BUG_ON(kgdb_connected); 49985 BUG_ON(kgdb_connected);
49949 49986
49950diff -urNp linux-2.6.32.23/kernel/kmod.c linux-2.6.32.23/kernel/kmod.c 49987diff -urNp linux-2.6.32.24/kernel/kmod.c linux-2.6.32.24/kernel/kmod.c
49951--- linux-2.6.32.23/kernel/kmod.c 2010-08-13 16:24:37.000000000 -0400 49988--- linux-2.6.32.24/kernel/kmod.c 2010-08-13 16:24:37.000000000 -0400
49952+++ linux-2.6.32.23/kernel/kmod.c 2010-09-04 15:54:52.000000000 -0400 49989+++ linux-2.6.32.24/kernel/kmod.c 2010-09-04 15:54:52.000000000 -0400
49953@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch 49990@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
49954 if (ret >= MODULE_NAME_LEN) 49991 if (ret >= MODULE_NAME_LEN)
49955 return -ENAMETOOLONG; 49992 return -ENAMETOOLONG;
@@ -49969,9 +50006,9 @@ diff -urNp linux-2.6.32.23/kernel/kmod.c linux-2.6.32.23/kernel/kmod.c
49969 /* If modprobe needs a service that is in a module, we get a recursive 50006 /* If modprobe needs a service that is in a module, we get a recursive
49970 * loop. Limit the number of running kmod threads to max_threads/2 or 50007 * loop. Limit the number of running kmod threads to max_threads/2 or
49971 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method 50008 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
49972diff -urNp linux-2.6.32.23/kernel/kprobes.c linux-2.6.32.23/kernel/kprobes.c 50009diff -urNp linux-2.6.32.24/kernel/kprobes.c linux-2.6.32.24/kernel/kprobes.c
49973--- linux-2.6.32.23/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400 50010--- linux-2.6.32.24/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
49974+++ linux-2.6.32.23/kernel/kprobes.c 2010-09-04 15:54:52.000000000 -0400 50011+++ linux-2.6.32.24/kernel/kprobes.c 2010-09-04 15:54:52.000000000 -0400
49975@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ 50012@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
49976 * kernel image and loaded module images reside. This is required 50013 * kernel image and loaded module images reside. This is required
49977 * so x86_64 can correctly handle the %rip-relative fixups. 50014 * so x86_64 can correctly handle the %rip-relative fixups.
@@ -50008,9 +50045,9 @@ diff -urNp linux-2.6.32.23/kernel/kprobes.c linux-2.6.32.23/kernel/kprobes.c
50008 50045
50009 head = &kprobe_table[i]; 50046 head = &kprobe_table[i];
50010 preempt_disable(); 50047 preempt_disable();
50011diff -urNp linux-2.6.32.23/kernel/lockdep.c linux-2.6.32.23/kernel/lockdep.c 50048diff -urNp linux-2.6.32.24/kernel/lockdep.c linux-2.6.32.24/kernel/lockdep.c
50012--- linux-2.6.32.23/kernel/lockdep.c 2010-08-13 16:24:37.000000000 -0400 50049--- linux-2.6.32.24/kernel/lockdep.c 2010-08-13 16:24:37.000000000 -0400
50013+++ linux-2.6.32.23/kernel/lockdep.c 2010-09-04 15:54:52.000000000 -0400 50050+++ linux-2.6.32.24/kernel/lockdep.c 2010-09-04 15:54:52.000000000 -0400
50014@@ -577,6 +577,10 @@ static int static_obj(void *obj) 50051@@ -577,6 +577,10 @@ static int static_obj(void *obj)
50015 int i; 50052 int i;
50016 #endif 50053 #endif
@@ -50040,9 +50077,9 @@ diff -urNp linux-2.6.32.23/kernel/lockdep.c linux-2.6.32.23/kernel/lockdep.c
50040 printk("the code is fine but needs lockdep annotation.\n"); 50077 printk("the code is fine but needs lockdep annotation.\n");
50041 printk("turning off the locking correctness validator.\n"); 50078 printk("turning off the locking correctness validator.\n");
50042 dump_stack(); 50079 dump_stack();
50043diff -urNp linux-2.6.32.23/kernel/lockdep_proc.c linux-2.6.32.23/kernel/lockdep_proc.c 50080diff -urNp linux-2.6.32.24/kernel/lockdep_proc.c linux-2.6.32.24/kernel/lockdep_proc.c
50044--- linux-2.6.32.23/kernel/lockdep_proc.c 2010-08-13 16:24:37.000000000 -0400 50081--- linux-2.6.32.24/kernel/lockdep_proc.c 2010-08-13 16:24:37.000000000 -0400
50045+++ linux-2.6.32.23/kernel/lockdep_proc.c 2010-09-04 15:54:52.000000000 -0400 50082+++ linux-2.6.32.24/kernel/lockdep_proc.c 2010-09-04 15:54:52.000000000 -0400
50046@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v 50083@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
50047 50084
50048 static void print_name(struct seq_file *m, struct lock_class *class) 50085 static void print_name(struct seq_file *m, struct lock_class *class)
@@ -50052,9 +50089,9 @@ diff -urNp linux-2.6.32.23/kernel/lockdep_proc.c linux-2.6.32.23/kernel/lockdep_
50052 const char *name = class->name; 50089 const char *name = class->name;
50053 50090
50054 if (!name) { 50091 if (!name) {
50055diff -urNp linux-2.6.32.23/kernel/module.c linux-2.6.32.23/kernel/module.c 50092diff -urNp linux-2.6.32.24/kernel/module.c linux-2.6.32.24/kernel/module.c
50056--- linux-2.6.32.23/kernel/module.c 2010-08-13 16:24:37.000000000 -0400 50093--- linux-2.6.32.24/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
50057+++ linux-2.6.32.23/kernel/module.c 2010-09-04 15:54:52.000000000 -0400 50094+++ linux-2.6.32.24/kernel/module.c 2010-09-04 15:54:52.000000000 -0400
50058@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq 50095@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
50059 static BLOCKING_NOTIFIER_HEAD(module_notify_list); 50096 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
50060 50097
@@ -50594,9 +50631,9 @@ diff -urNp linux-2.6.32.23/kernel/module.c linux-2.6.32.23/kernel/module.c
50594 mod = NULL; 50631 mod = NULL;
50595 } 50632 }
50596 return mod; 50633 return mod;
50597diff -urNp linux-2.6.32.23/kernel/panic.c linux-2.6.32.23/kernel/panic.c 50634diff -urNp linux-2.6.32.24/kernel/panic.c linux-2.6.32.24/kernel/panic.c
50598--- linux-2.6.32.23/kernel/panic.c 2010-08-13 16:24:37.000000000 -0400 50635--- linux-2.6.32.24/kernel/panic.c 2010-08-13 16:24:37.000000000 -0400
50599+++ linux-2.6.32.23/kernel/panic.c 2010-09-04 15:54:52.000000000 -0400 50636+++ linux-2.6.32.24/kernel/panic.c 2010-09-04 15:54:52.000000000 -0400
50600@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); 50637@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
50601 */ 50638 */
50602 void __stack_chk_fail(void) 50639 void __stack_chk_fail(void)
@@ -50607,9 +50644,9 @@ diff -urNp linux-2.6.32.23/kernel/panic.c linux-2.6.32.23/kernel/panic.c
50607 __builtin_return_address(0)); 50644 __builtin_return_address(0));
50608 } 50645 }
50609 EXPORT_SYMBOL(__stack_chk_fail); 50646 EXPORT_SYMBOL(__stack_chk_fail);
50610diff -urNp linux-2.6.32.23/kernel/params.c linux-2.6.32.23/kernel/params.c 50647diff -urNp linux-2.6.32.24/kernel/params.c linux-2.6.32.24/kernel/params.c
50611--- linux-2.6.32.23/kernel/params.c 2010-08-13 16:24:37.000000000 -0400 50648--- linux-2.6.32.24/kernel/params.c 2010-08-13 16:24:37.000000000 -0400
50612+++ linux-2.6.32.23/kernel/params.c 2010-09-04 15:54:52.000000000 -0400 50649+++ linux-2.6.32.24/kernel/params.c 2010-09-04 15:54:52.000000000 -0400
50613@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct 50650@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
50614 return ret; 50651 return ret;
50615 } 50652 }
@@ -50628,9 +50665,9 @@ diff -urNp linux-2.6.32.23/kernel/params.c linux-2.6.32.23/kernel/params.c
50628 .filter = uevent_filter, 50665 .filter = uevent_filter,
50629 }; 50666 };
50630 50667
50631diff -urNp linux-2.6.32.23/kernel/pid.c linux-2.6.32.23/kernel/pid.c 50668diff -urNp linux-2.6.32.24/kernel/pid.c linux-2.6.32.24/kernel/pid.c
50632--- linux-2.6.32.23/kernel/pid.c 2010-08-13 16:24:37.000000000 -0400 50669--- linux-2.6.32.24/kernel/pid.c 2010-08-13 16:24:37.000000000 -0400
50633+++ linux-2.6.32.23/kernel/pid.c 2010-09-04 15:54:52.000000000 -0400 50670+++ linux-2.6.32.24/kernel/pid.c 2010-09-04 15:54:52.000000000 -0400
50634@@ -33,6 +33,7 @@ 50671@@ -33,6 +33,7 @@
50635 #include <linux/rculist.h> 50672 #include <linux/rculist.h>
50636 #include <linux/bootmem.h> 50673 #include <linux/bootmem.h>
@@ -50664,9 +50701,9 @@ diff -urNp linux-2.6.32.23/kernel/pid.c linux-2.6.32.23/kernel/pid.c
50664 } 50701 }
50665 50702
50666 struct task_struct *find_task_by_vpid(pid_t vnr) 50703 struct task_struct *find_task_by_vpid(pid_t vnr)
50667diff -urNp linux-2.6.32.23/kernel/posix-cpu-timers.c linux-2.6.32.23/kernel/posix-cpu-timers.c 50704diff -urNp linux-2.6.32.24/kernel/posix-cpu-timers.c linux-2.6.32.24/kernel/posix-cpu-timers.c
50668--- linux-2.6.32.23/kernel/posix-cpu-timers.c 2010-08-13 16:24:37.000000000 -0400 50705--- linux-2.6.32.24/kernel/posix-cpu-timers.c 2010-08-13 16:24:37.000000000 -0400
50669+++ linux-2.6.32.23/kernel/posix-cpu-timers.c 2010-09-04 15:54:52.000000000 -0400 50706+++ linux-2.6.32.24/kernel/posix-cpu-timers.c 2010-09-04 15:54:52.000000000 -0400
50670@@ -6,6 +6,7 @@ 50707@@ -6,6 +6,7 @@
50671 #include <linux/posix-timers.h> 50708 #include <linux/posix-timers.h>
50672 #include <linux/errno.h> 50709 #include <linux/errno.h>
@@ -50691,9 +50728,9 @@ diff -urNp linux-2.6.32.23/kernel/posix-cpu-timers.c linux-2.6.32.23/kernel/posi
50691 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_max) { 50728 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_max) {
50692 /* 50729 /*
50693 * At the hard limit, we just die. 50730 * At the hard limit, we just die.
50694diff -urNp linux-2.6.32.23/kernel/power/hibernate.c linux-2.6.32.23/kernel/power/hibernate.c 50731diff -urNp linux-2.6.32.24/kernel/power/hibernate.c linux-2.6.32.24/kernel/power/hibernate.c
50695--- linux-2.6.32.23/kernel/power/hibernate.c 2010-08-13 16:24:37.000000000 -0400 50732--- linux-2.6.32.24/kernel/power/hibernate.c 2010-08-13 16:24:37.000000000 -0400
50696+++ linux-2.6.32.23/kernel/power/hibernate.c 2010-09-04 15:54:52.000000000 -0400 50733+++ linux-2.6.32.24/kernel/power/hibernate.c 2010-09-04 15:54:52.000000000 -0400
50697@@ -48,14 +48,14 @@ enum { 50734@@ -48,14 +48,14 @@ enum {
50698 50735
50699 static int hibernation_mode = HIBERNATION_SHUTDOWN; 50736 static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -50711,9 +50748,9 @@ diff -urNp linux-2.6.32.23/kernel/power/hibernate.c linux-2.6.32.23/kernel/power
50711 { 50748 {
50712 if (ops && !(ops->begin && ops->end && ops->pre_snapshot 50749 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
50713 && ops->prepare && ops->finish && ops->enter && ops->pre_restore 50750 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
50714diff -urNp linux-2.6.32.23/kernel/power/poweroff.c linux-2.6.32.23/kernel/power/poweroff.c 50751diff -urNp linux-2.6.32.24/kernel/power/poweroff.c linux-2.6.32.24/kernel/power/poweroff.c
50715--- linux-2.6.32.23/kernel/power/poweroff.c 2010-08-13 16:24:37.000000000 -0400 50752--- linux-2.6.32.24/kernel/power/poweroff.c 2010-08-13 16:24:37.000000000 -0400
50716+++ linux-2.6.32.23/kernel/power/poweroff.c 2010-09-04 15:54:52.000000000 -0400 50753+++ linux-2.6.32.24/kernel/power/poweroff.c 2010-09-04 15:54:52.000000000 -0400
50717@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof 50754@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
50718 .enable_mask = SYSRQ_ENABLE_BOOT, 50755 .enable_mask = SYSRQ_ENABLE_BOOT,
50719 }; 50756 };
@@ -50723,9 +50760,9 @@ diff -urNp linux-2.6.32.23/kernel/power/poweroff.c linux-2.6.32.23/kernel/power/
50723 { 50760 {
50724 register_sysrq_key('o', &sysrq_poweroff_op); 50761 register_sysrq_key('o', &sysrq_poweroff_op);
50725 return 0; 50762 return 0;
50726diff -urNp linux-2.6.32.23/kernel/power/process.c linux-2.6.32.23/kernel/power/process.c 50763diff -urNp linux-2.6.32.24/kernel/power/process.c linux-2.6.32.24/kernel/power/process.c
50727--- linux-2.6.32.23/kernel/power/process.c 2010-08-13 16:24:37.000000000 -0400 50764--- linux-2.6.32.24/kernel/power/process.c 2010-08-13 16:24:37.000000000 -0400
50728+++ linux-2.6.32.23/kernel/power/process.c 2010-09-04 15:54:52.000000000 -0400 50765+++ linux-2.6.32.24/kernel/power/process.c 2010-09-04 15:54:52.000000000 -0400
50729@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ 50766@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
50730 struct timeval start, end; 50767 struct timeval start, end;
50731 u64 elapsed_csecs64; 50768 u64 elapsed_csecs64;
@@ -50765,9 +50802,9 @@ diff -urNp linux-2.6.32.23/kernel/power/process.c linux-2.6.32.23/kernel/power/p
50765 50802
50766 do_gettimeofday(&end); 50803 do_gettimeofday(&end);
50767 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); 50804 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
50768diff -urNp linux-2.6.32.23/kernel/power/suspend.c linux-2.6.32.23/kernel/power/suspend.c 50805diff -urNp linux-2.6.32.24/kernel/power/suspend.c linux-2.6.32.24/kernel/power/suspend.c
50769--- linux-2.6.32.23/kernel/power/suspend.c 2010-08-13 16:24:37.000000000 -0400 50806--- linux-2.6.32.24/kernel/power/suspend.c 2010-08-13 16:24:37.000000000 -0400
50770+++ linux-2.6.32.23/kernel/power/suspend.c 2010-09-04 15:54:52.000000000 -0400 50807+++ linux-2.6.32.24/kernel/power/suspend.c 2010-09-04 15:54:52.000000000 -0400
50771@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M 50808@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
50772 [PM_SUSPEND_MEM] = "mem", 50809 [PM_SUSPEND_MEM] = "mem",
50773 }; 50810 };
@@ -50784,9 +50821,9 @@ diff -urNp linux-2.6.32.23/kernel/power/suspend.c linux-2.6.32.23/kernel/power/s
50784 { 50821 {
50785 mutex_lock(&pm_mutex); 50822 mutex_lock(&pm_mutex);
50786 suspend_ops = ops; 50823 suspend_ops = ops;
50787diff -urNp linux-2.6.32.23/kernel/printk.c linux-2.6.32.23/kernel/printk.c 50824diff -urNp linux-2.6.32.24/kernel/printk.c linux-2.6.32.24/kernel/printk.c
50788--- linux-2.6.32.23/kernel/printk.c 2010-08-13 16:24:37.000000000 -0400 50825--- linux-2.6.32.24/kernel/printk.c 2010-08-13 16:24:37.000000000 -0400
50789+++ linux-2.6.32.23/kernel/printk.c 2010-09-04 15:54:52.000000000 -0400 50826+++ linux-2.6.32.24/kernel/printk.c 2010-09-04 15:54:52.000000000 -0400
50790@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf 50827@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
50791 char c; 50828 char c;
50792 int error = 0; 50829 int error = 0;
@@ -50799,9 +50836,9 @@ diff -urNp linux-2.6.32.23/kernel/printk.c linux-2.6.32.23/kernel/printk.c
50799 error = security_syslog(type); 50836 error = security_syslog(type);
50800 if (error) 50837 if (error)
50801 return error; 50838 return error;
50802diff -urNp linux-2.6.32.23/kernel/ptrace.c linux-2.6.32.23/kernel/ptrace.c 50839diff -urNp linux-2.6.32.24/kernel/ptrace.c linux-2.6.32.24/kernel/ptrace.c
50803--- linux-2.6.32.23/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400 50840--- linux-2.6.32.24/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
50804+++ linux-2.6.32.23/kernel/ptrace.c 2010-09-04 15:54:52.000000000 -0400 50841+++ linux-2.6.32.24/kernel/ptrace.c 2010-09-04 15:54:52.000000000 -0400
50805@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru 50842@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
50806 cred->gid != tcred->egid || 50843 cred->gid != tcred->egid ||
50807 cred->gid != tcred->sgid || 50844 cred->gid != tcred->sgid ||
@@ -50883,9 +50920,9 @@ diff -urNp linux-2.6.32.23/kernel/ptrace.c linux-2.6.32.23/kernel/ptrace.c
50883 } 50920 }
50884 50921
50885 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) 50922 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
50886diff -urNp linux-2.6.32.23/kernel/rcutree.c linux-2.6.32.23/kernel/rcutree.c 50923diff -urNp linux-2.6.32.24/kernel/rcutree.c linux-2.6.32.24/kernel/rcutree.c
50887--- linux-2.6.32.23/kernel/rcutree.c 2010-08-13 16:24:37.000000000 -0400 50924--- linux-2.6.32.24/kernel/rcutree.c 2010-08-13 16:24:37.000000000 -0400
50888+++ linux-2.6.32.23/kernel/rcutree.c 2010-09-04 15:54:52.000000000 -0400 50925+++ linux-2.6.32.24/kernel/rcutree.c 2010-09-04 15:54:52.000000000 -0400
50889@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state 50926@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
50890 /* 50927 /*
50891 * Do softirq processing for the current CPU. 50928 * Do softirq processing for the current CPU.
@@ -50895,9 +50932,9 @@ diff -urNp linux-2.6.32.23/kernel/rcutree.c linux-2.6.32.23/kernel/rcutree.c
50895 { 50932 {
50896 /* 50933 /*
50897 * Memory references from any prior RCU read-side critical sections 50934 * Memory references from any prior RCU read-side critical sections
50898diff -urNp linux-2.6.32.23/kernel/relay.c linux-2.6.32.23/kernel/relay.c 50935diff -urNp linux-2.6.32.24/kernel/relay.c linux-2.6.32.24/kernel/relay.c
50899--- linux-2.6.32.23/kernel/relay.c 2010-08-13 16:24:37.000000000 -0400 50936--- linux-2.6.32.24/kernel/relay.c 2010-08-13 16:24:37.000000000 -0400
50900+++ linux-2.6.32.23/kernel/relay.c 2010-09-04 15:54:52.000000000 -0400 50937+++ linux-2.6.32.24/kernel/relay.c 2010-09-04 15:54:52.000000000 -0400
50901@@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi 50938@@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi
50902 unsigned int flags, 50939 unsigned int flags,
50903 int *nonpad_ret) 50940 int *nonpad_ret)
@@ -50915,9 +50952,9 @@ diff -urNp linux-2.6.32.23/kernel/relay.c linux-2.6.32.23/kernel/relay.c
50915 50952
50916 if (rbuf->subbufs_produced == rbuf->subbufs_consumed) 50953 if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
50917 return 0; 50954 return 0;
50918diff -urNp linux-2.6.32.23/kernel/resource.c linux-2.6.32.23/kernel/resource.c 50955diff -urNp linux-2.6.32.24/kernel/resource.c linux-2.6.32.24/kernel/resource.c
50919--- linux-2.6.32.23/kernel/resource.c 2010-08-13 16:24:37.000000000 -0400 50956--- linux-2.6.32.24/kernel/resource.c 2010-08-13 16:24:37.000000000 -0400
50920+++ linux-2.6.32.23/kernel/resource.c 2010-09-04 15:54:52.000000000 -0400 50957+++ linux-2.6.32.24/kernel/resource.c 2010-09-04 15:54:52.000000000 -0400
50921@@ -132,8 +132,18 @@ static const struct file_operations proc 50958@@ -132,8 +132,18 @@ static const struct file_operations proc
50922 50959
50923 static int __init ioresources_init(void) 50960 static int __init ioresources_init(void)
@@ -50937,9 +50974,9 @@ diff -urNp linux-2.6.32.23/kernel/resource.c linux-2.6.32.23/kernel/resource.c
50937 return 0; 50974 return 0;
50938 } 50975 }
50939 __initcall(ioresources_init); 50976 __initcall(ioresources_init);
50940diff -urNp linux-2.6.32.23/kernel/sched.c linux-2.6.32.23/kernel/sched.c 50977diff -urNp linux-2.6.32.24/kernel/sched.c linux-2.6.32.24/kernel/sched.c
50941--- linux-2.6.32.23/kernel/sched.c 2010-09-26 17:26:05.000000000 -0400 50978--- linux-2.6.32.24/kernel/sched.c 2010-09-26 17:26:05.000000000 -0400
50942+++ linux-2.6.32.23/kernel/sched.c 2010-09-26 17:26:57.000000000 -0400 50979+++ linux-2.6.32.24/kernel/sched.c 2010-09-26 17:26:57.000000000 -0400
50943@@ -4905,7 +4905,7 @@ out: 50980@@ -4905,7 +4905,7 @@ out:
50944 * In CONFIG_NO_HZ case, the idle load balance owner will do the 50981 * In CONFIG_NO_HZ case, the idle load balance owner will do the
50945 * rebalancing for all the cpus for whom scheduler ticks are stopped. 50982 * rebalancing for all the cpus for whom scheduler ticks are stopped.
@@ -50986,9 +51023,9 @@ diff -urNp linux-2.6.32.23/kernel/sched.c linux-2.6.32.23/kernel/sched.c
50986 }; 51023 };
50987 51024
50988 static struct ctl_table *sd_alloc_ctl_entry(int n) 51025 static struct ctl_table *sd_alloc_ctl_entry(int n)
50989diff -urNp linux-2.6.32.23/kernel/signal.c linux-2.6.32.23/kernel/signal.c 51026diff -urNp linux-2.6.32.24/kernel/signal.c linux-2.6.32.24/kernel/signal.c
50990--- linux-2.6.32.23/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400 51027--- linux-2.6.32.24/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
50991+++ linux-2.6.32.23/kernel/signal.c 2010-09-04 15:54:52.000000000 -0400 51028+++ linux-2.6.32.24/kernel/signal.c 2010-09-04 15:54:52.000000000 -0400
50992@@ -41,12 +41,12 @@ 51029@@ -41,12 +41,12 @@
50993 51030
50994 static struct kmem_cache *sigqueue_cachep; 51031 static struct kmem_cache *sigqueue_cachep;
@@ -51074,9 +51111,9 @@ diff -urNp linux-2.6.32.23/kernel/signal.c linux-2.6.32.23/kernel/signal.c
51074 51111
51075 return ret; 51112 return ret;
51076 } 51113 }
51077diff -urNp linux-2.6.32.23/kernel/smp.c linux-2.6.32.23/kernel/smp.c 51114diff -urNp linux-2.6.32.24/kernel/smp.c linux-2.6.32.24/kernel/smp.c
51078--- linux-2.6.32.23/kernel/smp.c 2010-08-13 16:24:37.000000000 -0400 51115--- linux-2.6.32.24/kernel/smp.c 2010-08-13 16:24:37.000000000 -0400
51079+++ linux-2.6.32.23/kernel/smp.c 2010-09-04 15:54:52.000000000 -0400 51116+++ linux-2.6.32.24/kernel/smp.c 2010-09-04 15:54:52.000000000 -0400
51080@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void 51117@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void
51081 } 51118 }
51082 EXPORT_SYMBOL(smp_call_function); 51119 EXPORT_SYMBOL(smp_call_function);
@@ -51104,9 +51141,9 @@ diff -urNp linux-2.6.32.23/kernel/smp.c linux-2.6.32.23/kernel/smp.c
51104 { 51141 {
51105 spin_unlock_irq(&call_function.lock); 51142 spin_unlock_irq(&call_function.lock);
51106 } 51143 }
51107diff -urNp linux-2.6.32.23/kernel/softirq.c linux-2.6.32.23/kernel/softirq.c 51144diff -urNp linux-2.6.32.24/kernel/softirq.c linux-2.6.32.24/kernel/softirq.c
51108--- linux-2.6.32.23/kernel/softirq.c 2010-08-13 16:24:37.000000000 -0400 51145--- linux-2.6.32.24/kernel/softirq.c 2010-08-13 16:24:37.000000000 -0400
51109+++ linux-2.6.32.23/kernel/softirq.c 2010-09-04 15:54:52.000000000 -0400 51146+++ linux-2.6.32.24/kernel/softirq.c 2010-09-04 15:54:52.000000000 -0400
51110@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec 51147@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
51111 51148
51112 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); 51149 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -51161,9 +51198,9 @@ diff -urNp linux-2.6.32.23/kernel/softirq.c linux-2.6.32.23/kernel/softirq.c
51161 { 51198 {
51162 struct tasklet_struct *list; 51199 struct tasklet_struct *list;
51163 51200
51164diff -urNp linux-2.6.32.23/kernel/sys.c linux-2.6.32.23/kernel/sys.c 51201diff -urNp linux-2.6.32.24/kernel/sys.c linux-2.6.32.24/kernel/sys.c
51165--- linux-2.6.32.23/kernel/sys.c 2010-09-26 17:26:05.000000000 -0400 51202--- linux-2.6.32.24/kernel/sys.c 2010-09-26 17:26:05.000000000 -0400
51166+++ linux-2.6.32.23/kernel/sys.c 2010-09-26 17:26:57.000000000 -0400 51203+++ linux-2.6.32.24/kernel/sys.c 2010-09-26 17:26:57.000000000 -0400
51167@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru 51204@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
51168 error = -EACCES; 51205 error = -EACCES;
51169 goto out; 51206 goto out;
@@ -51299,9 +51336,9 @@ diff -urNp linux-2.6.32.23/kernel/sys.c linux-2.6.32.23/kernel/sys.c
51299 error = -EINVAL; 51336 error = -EINVAL;
51300 break; 51337 break;
51301 } 51338 }
51302diff -urNp linux-2.6.32.23/kernel/sysctl.c linux-2.6.32.23/kernel/sysctl.c 51339diff -urNp linux-2.6.32.24/kernel/sysctl.c linux-2.6.32.24/kernel/sysctl.c
51303--- linux-2.6.32.23/kernel/sysctl.c 2010-08-13 16:24:37.000000000 -0400 51340--- linux-2.6.32.24/kernel/sysctl.c 2010-08-13 16:24:37.000000000 -0400
51304+++ linux-2.6.32.23/kernel/sysctl.c 2010-09-17 18:34:04.000000000 -0400 51341+++ linux-2.6.32.24/kernel/sysctl.c 2010-09-17 18:34:04.000000000 -0400
51305@@ -63,6 +63,13 @@ 51342@@ -63,6 +63,13 @@
51306 static int deprecated_sysctl_warning(struct __sysctl_args *args); 51343 static int deprecated_sysctl_warning(struct __sysctl_args *args);
51307 51344
@@ -51437,9 +51474,9 @@ diff -urNp linux-2.6.32.23/kernel/sysctl.c linux-2.6.32.23/kernel/sysctl.c
51437 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); 51474 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
51438 if (error) 51475 if (error)
51439 return error; 51476 return error;
51440diff -urNp linux-2.6.32.23/kernel/taskstats.c linux-2.6.32.23/kernel/taskstats.c 51477diff -urNp linux-2.6.32.24/kernel/taskstats.c linux-2.6.32.24/kernel/taskstats.c
51441--- linux-2.6.32.23/kernel/taskstats.c 2010-08-13 16:24:37.000000000 -0400 51478--- linux-2.6.32.24/kernel/taskstats.c 2010-08-13 16:24:37.000000000 -0400
51442+++ linux-2.6.32.23/kernel/taskstats.c 2010-09-04 15:54:52.000000000 -0400 51479+++ linux-2.6.32.24/kernel/taskstats.c 2010-09-04 15:54:52.000000000 -0400
51443@@ -26,9 +26,12 @@ 51480@@ -26,9 +26,12 @@
51444 #include <linux/cgroup.h> 51481 #include <linux/cgroup.h>
51445 #include <linux/fs.h> 51482 #include <linux/fs.h>
@@ -51463,9 +51500,9 @@ diff -urNp linux-2.6.32.23/kernel/taskstats.c linux-2.6.32.23/kernel/taskstats.c
51463 if (!alloc_cpumask_var(&mask, GFP_KERNEL)) 51500 if (!alloc_cpumask_var(&mask, GFP_KERNEL))
51464 return -ENOMEM; 51501 return -ENOMEM;
51465 51502
51466diff -urNp linux-2.6.32.23/kernel/time/tick-broadcast.c linux-2.6.32.23/kernel/time/tick-broadcast.c 51503diff -urNp linux-2.6.32.24/kernel/time/tick-broadcast.c linux-2.6.32.24/kernel/time/tick-broadcast.c
51467--- linux-2.6.32.23/kernel/time/tick-broadcast.c 2010-08-13 16:24:37.000000000 -0400 51504--- linux-2.6.32.24/kernel/time/tick-broadcast.c 2010-08-13 16:24:37.000000000 -0400
51468+++ linux-2.6.32.23/kernel/time/tick-broadcast.c 2010-09-04 15:54:52.000000000 -0400 51505+++ linux-2.6.32.24/kernel/time/tick-broadcast.c 2010-09-04 15:54:52.000000000 -0400
51469@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl 51506@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
51470 * then clear the broadcast bit. 51507 * then clear the broadcast bit.
51471 */ 51508 */
@@ -51475,9 +51512,9 @@ diff -urNp linux-2.6.32.23/kernel/time/tick-broadcast.c linux-2.6.32.23/kernel/t
51475 51512
51476 cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); 51513 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
51477 tick_broadcast_clear_oneshot(cpu); 51514 tick_broadcast_clear_oneshot(cpu);
51478diff -urNp linux-2.6.32.23/kernel/time/timer_list.c linux-2.6.32.23/kernel/time/timer_list.c 51515diff -urNp linux-2.6.32.24/kernel/time/timer_list.c linux-2.6.32.24/kernel/time/timer_list.c
51479--- linux-2.6.32.23/kernel/time/timer_list.c 2010-08-13 16:24:37.000000000 -0400 51516--- linux-2.6.32.24/kernel/time/timer_list.c 2010-08-13 16:24:37.000000000 -0400
51480+++ linux-2.6.32.23/kernel/time/timer_list.c 2010-09-14 22:29:01.000000000 -0400 51517+++ linux-2.6.32.24/kernel/time/timer_list.c 2010-09-14 22:29:01.000000000 -0400
51481@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, 51518@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
51482 51519
51483 static void print_name_offset(struct seq_file *m, void *sym) 51520 static void print_name_offset(struct seq_file *m, void *sym)
@@ -51519,9 +51556,9 @@ diff -urNp linux-2.6.32.23/kernel/time/timer_list.c linux-2.6.32.23/kernel/time/
51519 if (!pe) 51556 if (!pe)
51520 return -ENOMEM; 51557 return -ENOMEM;
51521 return 0; 51558 return 0;
51522diff -urNp linux-2.6.32.23/kernel/time/timer_stats.c linux-2.6.32.23/kernel/time/timer_stats.c 51559diff -urNp linux-2.6.32.24/kernel/time/timer_stats.c linux-2.6.32.24/kernel/time/timer_stats.c
51523--- linux-2.6.32.23/kernel/time/timer_stats.c 2010-08-13 16:24:37.000000000 -0400 51560--- linux-2.6.32.24/kernel/time/timer_stats.c 2010-08-13 16:24:37.000000000 -0400
51524+++ linux-2.6.32.23/kernel/time/timer_stats.c 2010-09-14 22:28:35.000000000 -0400 51561+++ linux-2.6.32.24/kernel/time/timer_stats.c 2010-09-14 22:28:35.000000000 -0400
51525@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time 51562@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time
51526 51563
51527 static void print_name_offset(struct seq_file *m, unsigned long addr) 51564 static void print_name_offset(struct seq_file *m, unsigned long addr)
@@ -51551,9 +51588,9 @@ diff -urNp linux-2.6.32.23/kernel/time/timer_stats.c linux-2.6.32.23/kernel/time
51551 if (!pe) 51588 if (!pe)
51552 return -ENOMEM; 51589 return -ENOMEM;
51553 return 0; 51590 return 0;
51554diff -urNp linux-2.6.32.23/kernel/time.c linux-2.6.32.23/kernel/time.c 51591diff -urNp linux-2.6.32.24/kernel/time.c linux-2.6.32.24/kernel/time.c
51555--- linux-2.6.32.23/kernel/time.c 2010-08-13 16:24:37.000000000 -0400 51592--- linux-2.6.32.24/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
51556+++ linux-2.6.32.23/kernel/time.c 2010-09-04 15:54:52.000000000 -0400 51593+++ linux-2.6.32.24/kernel/time.c 2010-09-04 15:54:52.000000000 -0400
51557@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, 51594@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *,
51558 return err; 51595 return err;
51559 51596
@@ -51591,9 +51628,9 @@ diff -urNp linux-2.6.32.23/kernel/time.c linux-2.6.32.23/kernel/time.c
51591 { 51628 {
51592 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) 51629 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
51593 return (USEC_PER_SEC / HZ) * j; 51630 return (USEC_PER_SEC / HZ) * j;
51594diff -urNp linux-2.6.32.23/kernel/timer.c linux-2.6.32.23/kernel/timer.c 51631diff -urNp linux-2.6.32.24/kernel/timer.c linux-2.6.32.24/kernel/timer.c
51595--- linux-2.6.32.23/kernel/timer.c 2010-08-13 16:24:37.000000000 -0400 51632--- linux-2.6.32.24/kernel/timer.c 2010-08-13 16:24:37.000000000 -0400
51596+++ linux-2.6.32.23/kernel/timer.c 2010-09-04 15:54:52.000000000 -0400 51633+++ linux-2.6.32.24/kernel/timer.c 2010-09-04 15:54:52.000000000 -0400
51597@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) 51634@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick)
51598 /* 51635 /*
51599 * This function runs timers and the timer-tq in bottom half context. 51636 * This function runs timers and the timer-tq in bottom half context.
@@ -51603,9 +51640,9 @@ diff -urNp linux-2.6.32.23/kernel/timer.c linux-2.6.32.23/kernel/timer.c
51603 { 51640 {
51604 struct tvec_base *base = __get_cpu_var(tvec_bases); 51641 struct tvec_base *base = __get_cpu_var(tvec_bases);
51605 51642
51606diff -urNp linux-2.6.32.23/kernel/trace/ftrace.c linux-2.6.32.23/kernel/trace/ftrace.c 51643diff -urNp linux-2.6.32.24/kernel/trace/ftrace.c linux-2.6.32.24/kernel/trace/ftrace.c
51607--- linux-2.6.32.23/kernel/trace/ftrace.c 2010-09-20 17:26:42.000000000 -0400 51644--- linux-2.6.32.24/kernel/trace/ftrace.c 2010-09-20 17:26:42.000000000 -0400
51608+++ linux-2.6.32.23/kernel/trace/ftrace.c 2010-09-20 17:27:30.000000000 -0400 51645+++ linux-2.6.32.24/kernel/trace/ftrace.c 2010-09-20 17:27:30.000000000 -0400
51609@@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod, 51646@@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod,
51610 51647
51611 ip = rec->ip; 51648 ip = rec->ip;
@@ -51627,9 +51664,9 @@ diff -urNp linux-2.6.32.23/kernel/trace/ftrace.c linux-2.6.32.23/kernel/trace/ft
51627 } 51664 }
51628 51665
51629 /* 51666 /*
51630diff -urNp linux-2.6.32.23/kernel/trace/ring_buffer.c linux-2.6.32.23/kernel/trace/ring_buffer.c 51667diff -urNp linux-2.6.32.24/kernel/trace/ring_buffer.c linux-2.6.32.24/kernel/trace/ring_buffer.c
51631--- linux-2.6.32.23/kernel/trace/ring_buffer.c 2010-08-13 16:24:37.000000000 -0400 51668--- linux-2.6.32.24/kernel/trace/ring_buffer.c 2010-08-13 16:24:37.000000000 -0400
51632+++ linux-2.6.32.23/kernel/trace/ring_buffer.c 2010-09-04 15:54:52.000000000 -0400 51669+++ linux-2.6.32.24/kernel/trace/ring_buffer.c 2010-09-04 15:54:52.000000000 -0400
51633@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st 51670@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st
51634 * the reader page). But if the next page is a header page, 51671 * the reader page). But if the next page is a header page,
51635 * its flags will be non zero. 51672 * its flags will be non zero.
@@ -51639,9 +51676,9 @@ diff -urNp linux-2.6.32.23/kernel/trace/ring_buffer.c linux-2.6.32.23/kernel/tra
51639 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, 51676 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
51640 struct buffer_page *page, struct list_head *list) 51677 struct buffer_page *page, struct list_head *list)
51641 { 51678 {
51642diff -urNp linux-2.6.32.23/kernel/trace/trace.c linux-2.6.32.23/kernel/trace/trace.c 51679diff -urNp linux-2.6.32.24/kernel/trace/trace.c linux-2.6.32.24/kernel/trace/trace.c
51643--- linux-2.6.32.23/kernel/trace/trace.c 2010-08-13 16:24:37.000000000 -0400 51680--- linux-2.6.32.24/kernel/trace/trace.c 2010-08-13 16:24:37.000000000 -0400
51644+++ linux-2.6.32.23/kernel/trace/trace.c 2010-09-04 15:54:52.000000000 -0400 51681+++ linux-2.6.32.24/kernel/trace/trace.c 2010-09-04 15:54:52.000000000 -0400
51645@@ -3808,10 +3808,9 @@ static const struct file_operations trac 51682@@ -3808,10 +3808,9 @@ static const struct file_operations trac
51646 }; 51683 };
51647 #endif 51684 #endif
@@ -51666,9 +51703,9 @@ diff -urNp linux-2.6.32.23/kernel/trace/trace.c linux-2.6.32.23/kernel/trace/tra
51666 static int once; 51703 static int once;
51667 struct dentry *d_tracer; 51704 struct dentry *d_tracer;
51668 51705
51669diff -urNp linux-2.6.32.23/kernel/trace/trace_events.c linux-2.6.32.23/kernel/trace/trace_events.c 51706diff -urNp linux-2.6.32.24/kernel/trace/trace_events.c linux-2.6.32.24/kernel/trace/trace_events.c
51670--- linux-2.6.32.23/kernel/trace/trace_events.c 2010-08-13 16:24:37.000000000 -0400 51707--- linux-2.6.32.24/kernel/trace/trace_events.c 2010-08-13 16:24:37.000000000 -0400
51671+++ linux-2.6.32.23/kernel/trace/trace_events.c 2010-09-04 15:54:52.000000000 -0400 51708+++ linux-2.6.32.24/kernel/trace/trace_events.c 2010-09-04 15:54:52.000000000 -0400
51672@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list 51709@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
51673 * Modules must own their file_operations to keep up with 51710 * Modules must own their file_operations to keep up with
51674 * reference counting. 51711 * reference counting.
@@ -51678,9 +51715,9 @@ diff -urNp linux-2.6.32.23/kernel/trace/trace_events.c linux-2.6.32.23/kernel/tr
51678 struct ftrace_module_file_ops { 51715 struct ftrace_module_file_ops {
51679 struct list_head list; 51716 struct list_head list;
51680 struct module *mod; 51717 struct module *mod;
51681diff -urNp linux-2.6.32.23/kernel/trace/trace_output.c linux-2.6.32.23/kernel/trace/trace_output.c 51718diff -urNp linux-2.6.32.24/kernel/trace/trace_output.c linux-2.6.32.24/kernel/trace/trace_output.c
51682--- linux-2.6.32.23/kernel/trace/trace_output.c 2010-08-13 16:24:37.000000000 -0400 51719--- linux-2.6.32.24/kernel/trace/trace_output.c 2010-08-13 16:24:37.000000000 -0400
51683+++ linux-2.6.32.23/kernel/trace/trace_output.c 2010-09-04 15:54:52.000000000 -0400 51720+++ linux-2.6.32.24/kernel/trace/trace_output.c 2010-09-04 15:54:52.000000000 -0400
51684@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, 51721@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
51685 return 0; 51722 return 0;
51686 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); 51723 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -51690,9 +51727,9 @@ diff -urNp linux-2.6.32.23/kernel/trace/trace_output.c linux-2.6.32.23/kernel/tr
51690 if (p) { 51727 if (p) {
51691 s->len = p - s->buffer; 51728 s->len = p - s->buffer;
51692 return 1; 51729 return 1;
51693diff -urNp linux-2.6.32.23/kernel/trace/trace_stack.c linux-2.6.32.23/kernel/trace/trace_stack.c 51730diff -urNp linux-2.6.32.24/kernel/trace/trace_stack.c linux-2.6.32.24/kernel/trace/trace_stack.c
51694--- linux-2.6.32.23/kernel/trace/trace_stack.c 2010-08-13 16:24:37.000000000 -0400 51731--- linux-2.6.32.24/kernel/trace/trace_stack.c 2010-08-13 16:24:37.000000000 -0400
51695+++ linux-2.6.32.23/kernel/trace/trace_stack.c 2010-09-04 15:54:52.000000000 -0400 51732+++ linux-2.6.32.24/kernel/trace/trace_stack.c 2010-09-04 15:54:52.000000000 -0400
51696@@ -50,7 +50,7 @@ static inline void check_stack(void) 51733@@ -50,7 +50,7 @@ static inline void check_stack(void)
51697 return; 51734 return;
51698 51735
@@ -51702,9 +51739,9 @@ diff -urNp linux-2.6.32.23/kernel/trace/trace_stack.c linux-2.6.32.23/kernel/tra
51702 return; 51739 return;
51703 51740
51704 local_irq_save(flags); 51741 local_irq_save(flags);
51705diff -urNp linux-2.6.32.23/kernel/utsname_sysctl.c linux-2.6.32.23/kernel/utsname_sysctl.c 51742diff -urNp linux-2.6.32.24/kernel/utsname_sysctl.c linux-2.6.32.24/kernel/utsname_sysctl.c
51706--- linux-2.6.32.23/kernel/utsname_sysctl.c 2010-08-13 16:24:37.000000000 -0400 51743--- linux-2.6.32.24/kernel/utsname_sysctl.c 2010-08-13 16:24:37.000000000 -0400
51707+++ linux-2.6.32.23/kernel/utsname_sysctl.c 2010-09-04 15:54:52.000000000 -0400 51744+++ linux-2.6.32.24/kernel/utsname_sysctl.c 2010-09-04 15:54:52.000000000 -0400
51708@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] 51745@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
51709 .proc_handler = proc_do_uts_string, 51746 .proc_handler = proc_do_uts_string,
51710 .strategy = sysctl_uts_string, 51747 .strategy = sysctl_uts_string,
@@ -51723,9 +51760,9 @@ diff -urNp linux-2.6.32.23/kernel/utsname_sysctl.c linux-2.6.32.23/kernel/utsnam
51723 }; 51760 };
51724 51761
51725 static int __init utsname_sysctl_init(void) 51762 static int __init utsname_sysctl_init(void)
51726diff -urNp linux-2.6.32.23/lib/bug.c linux-2.6.32.23/lib/bug.c 51763diff -urNp linux-2.6.32.24/lib/bug.c linux-2.6.32.24/lib/bug.c
51727--- linux-2.6.32.23/lib/bug.c 2010-08-13 16:24:37.000000000 -0400 51764--- linux-2.6.32.24/lib/bug.c 2010-08-13 16:24:37.000000000 -0400
51728+++ linux-2.6.32.23/lib/bug.c 2010-09-04 15:54:52.000000000 -0400 51765+++ linux-2.6.32.24/lib/bug.c 2010-09-04 15:54:52.000000000 -0400
51729@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l 51766@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
51730 return BUG_TRAP_TYPE_NONE; 51767 return BUG_TRAP_TYPE_NONE;
51731 51768
@@ -51735,9 +51772,9 @@ diff -urNp linux-2.6.32.23/lib/bug.c linux-2.6.32.23/lib/bug.c
51735 51772
51736 printk(KERN_EMERG "------------[ cut here ]------------\n"); 51773 printk(KERN_EMERG "------------[ cut here ]------------\n");
51737 51774
51738diff -urNp linux-2.6.32.23/lib/debugobjects.c linux-2.6.32.23/lib/debugobjects.c 51775diff -urNp linux-2.6.32.24/lib/debugobjects.c linux-2.6.32.24/lib/debugobjects.c
51739--- linux-2.6.32.23/lib/debugobjects.c 2010-08-13 16:24:37.000000000 -0400 51776--- linux-2.6.32.24/lib/debugobjects.c 2010-08-13 16:24:37.000000000 -0400
51740+++ linux-2.6.32.23/lib/debugobjects.c 2010-09-04 15:54:52.000000000 -0400 51777+++ linux-2.6.32.24/lib/debugobjects.c 2010-09-04 15:54:52.000000000 -0400
51741@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi 51778@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
51742 if (limit > 4) 51779 if (limit > 4)
51743 return; 51780 return;
@@ -51747,9 +51784,9 @@ diff -urNp linux-2.6.32.23/lib/debugobjects.c linux-2.6.32.23/lib/debugobjects.c
51747 if (is_on_stack == onstack) 51784 if (is_on_stack == onstack)
51748 return; 51785 return;
51749 51786
51750diff -urNp linux-2.6.32.23/lib/dma-debug.c linux-2.6.32.23/lib/dma-debug.c 51787diff -urNp linux-2.6.32.24/lib/dma-debug.c linux-2.6.32.24/lib/dma-debug.c
51751--- linux-2.6.32.23/lib/dma-debug.c 2010-08-13 16:24:37.000000000 -0400 51788--- linux-2.6.32.24/lib/dma-debug.c 2010-08-13 16:24:37.000000000 -0400
51752+++ linux-2.6.32.23/lib/dma-debug.c 2010-09-04 15:54:52.000000000 -0400 51789+++ linux-2.6.32.24/lib/dma-debug.c 2010-09-04 15:54:52.000000000 -0400
51753@@ -861,7 +861,7 @@ out: 51790@@ -861,7 +861,7 @@ out:
51754 51791
51755 static void check_for_stack(struct device *dev, void *addr) 51792 static void check_for_stack(struct device *dev, void *addr)
@@ -51759,9 +51796,9 @@ diff -urNp linux-2.6.32.23/lib/dma-debug.c linux-2.6.32.23/lib/dma-debug.c
51759 err_printk(dev, NULL, "DMA-API: device driver maps memory from" 51796 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
51760 "stack [addr=%p]\n", addr); 51797 "stack [addr=%p]\n", addr);
51761 } 51798 }
51762diff -urNp linux-2.6.32.23/lib/idr.c linux-2.6.32.23/lib/idr.c 51799diff -urNp linux-2.6.32.24/lib/idr.c linux-2.6.32.24/lib/idr.c
51763--- linux-2.6.32.23/lib/idr.c 2010-08-13 16:24:37.000000000 -0400 51800--- linux-2.6.32.24/lib/idr.c 2010-08-13 16:24:37.000000000 -0400
51764+++ linux-2.6.32.23/lib/idr.c 2010-09-04 15:54:52.000000000 -0400 51801+++ linux-2.6.32.24/lib/idr.c 2010-09-04 15:54:52.000000000 -0400
51765@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in 51802@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
51766 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; 51803 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
51767 51804
@@ -51771,9 +51808,9 @@ diff -urNp linux-2.6.32.23/lib/idr.c linux-2.6.32.23/lib/idr.c
51771 *starting_id = id; 51808 *starting_id = id;
51772 return IDR_NEED_TO_GROW; 51809 return IDR_NEED_TO_GROW;
51773 } 51810 }
51774diff -urNp linux-2.6.32.23/lib/inflate.c linux-2.6.32.23/lib/inflate.c 51811diff -urNp linux-2.6.32.24/lib/inflate.c linux-2.6.32.24/lib/inflate.c
51775--- linux-2.6.32.23/lib/inflate.c 2010-08-13 16:24:37.000000000 -0400 51812--- linux-2.6.32.24/lib/inflate.c 2010-08-13 16:24:37.000000000 -0400
51776+++ linux-2.6.32.23/lib/inflate.c 2010-09-04 15:54:52.000000000 -0400 51813+++ linux-2.6.32.24/lib/inflate.c 2010-09-04 15:54:52.000000000 -0400
51777@@ -266,7 +266,7 @@ static void free(void *where) 51814@@ -266,7 +266,7 @@ static void free(void *where)
51778 malloc_ptr = free_mem_ptr; 51815 malloc_ptr = free_mem_ptr;
51779 } 51816 }
@@ -51783,9 +51820,9 @@ diff -urNp linux-2.6.32.23/lib/inflate.c linux-2.6.32.23/lib/inflate.c
51783 #define free(a) kfree(a) 51820 #define free(a) kfree(a)
51784 #endif 51821 #endif
51785 51822
51786diff -urNp linux-2.6.32.23/lib/Kconfig.debug linux-2.6.32.23/lib/Kconfig.debug 51823diff -urNp linux-2.6.32.24/lib/Kconfig.debug linux-2.6.32.24/lib/Kconfig.debug
51787--- linux-2.6.32.23/lib/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400 51824--- linux-2.6.32.24/lib/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
51788+++ linux-2.6.32.23/lib/Kconfig.debug 2010-09-04 15:54:52.000000000 -0400 51825+++ linux-2.6.32.24/lib/Kconfig.debug 2010-09-04 15:54:52.000000000 -0400
51789@@ -905,7 +905,7 @@ config LATENCYTOP 51826@@ -905,7 +905,7 @@ config LATENCYTOP
51790 select STACKTRACE 51827 select STACKTRACE
51791 select SCHEDSTATS 51828 select SCHEDSTATS
@@ -51795,9 +51832,9 @@ diff -urNp linux-2.6.32.23/lib/Kconfig.debug linux-2.6.32.23/lib/Kconfig.debug
51795 help 51832 help
51796 Enable this option if you want to use the LatencyTOP tool 51833 Enable this option if you want to use the LatencyTOP tool
51797 to find out which userspace is blocking on what kernel operations. 51834 to find out which userspace is blocking on what kernel operations.
51798diff -urNp linux-2.6.32.23/lib/kobject.c linux-2.6.32.23/lib/kobject.c 51835diff -urNp linux-2.6.32.24/lib/kobject.c linux-2.6.32.24/lib/kobject.c
51799--- linux-2.6.32.23/lib/kobject.c 2010-08-13 16:24:37.000000000 -0400 51836--- linux-2.6.32.24/lib/kobject.c 2010-08-13 16:24:37.000000000 -0400
51800+++ linux-2.6.32.23/lib/kobject.c 2010-09-04 15:54:52.000000000 -0400 51837+++ linux-2.6.32.24/lib/kobject.c 2010-09-04 15:54:52.000000000 -0400
51801@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko 51838@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
51802 return ret; 51839 return ret;
51803 } 51840 }
@@ -51825,9 +51862,9 @@ diff -urNp linux-2.6.32.23/lib/kobject.c linux-2.6.32.23/lib/kobject.c
51825 struct kobject *parent_kobj) 51862 struct kobject *parent_kobj)
51826 { 51863 {
51827 struct kset *kset; 51864 struct kset *kset;
51828diff -urNp linux-2.6.32.23/lib/kobject_uevent.c linux-2.6.32.23/lib/kobject_uevent.c 51865diff -urNp linux-2.6.32.24/lib/kobject_uevent.c linux-2.6.32.24/lib/kobject_uevent.c
51829--- linux-2.6.32.23/lib/kobject_uevent.c 2010-08-13 16:24:37.000000000 -0400 51866--- linux-2.6.32.24/lib/kobject_uevent.c 2010-08-13 16:24:37.000000000 -0400
51830+++ linux-2.6.32.23/lib/kobject_uevent.c 2010-09-04 15:54:52.000000000 -0400 51867+++ linux-2.6.32.24/lib/kobject_uevent.c 2010-09-04 15:54:52.000000000 -0400
51831@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k 51868@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
51832 const char *subsystem; 51869 const char *subsystem;
51833 struct kobject *top_kobj; 51870 struct kobject *top_kobj;
@@ -51837,9 +51874,9 @@ diff -urNp linux-2.6.32.23/lib/kobject_uevent.c linux-2.6.32.23/lib/kobject_ueve
51837 u64 seq; 51874 u64 seq;
51838 int i = 0; 51875 int i = 0;
51839 int retval = 0; 51876 int retval = 0;
51840diff -urNp linux-2.6.32.23/lib/parser.c linux-2.6.32.23/lib/parser.c 51877diff -urNp linux-2.6.32.24/lib/parser.c linux-2.6.32.24/lib/parser.c
51841--- linux-2.6.32.23/lib/parser.c 2010-08-13 16:24:37.000000000 -0400 51878--- linux-2.6.32.24/lib/parser.c 2010-08-13 16:24:37.000000000 -0400
51842+++ linux-2.6.32.23/lib/parser.c 2010-09-04 15:54:52.000000000 -0400 51879+++ linux-2.6.32.24/lib/parser.c 2010-09-04 15:54:52.000000000 -0400
51843@@ -126,7 +126,7 @@ static int match_number(substring_t *s, 51880@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
51844 char *buf; 51881 char *buf;
51845 int ret; 51882 int ret;
@@ -51849,9 +51886,9 @@ diff -urNp linux-2.6.32.23/lib/parser.c linux-2.6.32.23/lib/parser.c
51849 if (!buf) 51886 if (!buf)
51850 return -ENOMEM; 51887 return -ENOMEM;
51851 memcpy(buf, s->from, s->to - s->from); 51888 memcpy(buf, s->from, s->to - s->from);
51852diff -urNp linux-2.6.32.23/lib/radix-tree.c linux-2.6.32.23/lib/radix-tree.c 51889diff -urNp linux-2.6.32.24/lib/radix-tree.c linux-2.6.32.24/lib/radix-tree.c
51853--- linux-2.6.32.23/lib/radix-tree.c 2010-08-13 16:24:37.000000000 -0400 51890--- linux-2.6.32.24/lib/radix-tree.c 2010-08-13 16:24:37.000000000 -0400
51854+++ linux-2.6.32.23/lib/radix-tree.c 2010-09-04 15:54:52.000000000 -0400 51891+++ linux-2.6.32.24/lib/radix-tree.c 2010-09-04 15:54:52.000000000 -0400
51855@@ -81,7 +81,7 @@ struct radix_tree_preload { 51892@@ -81,7 +81,7 @@ struct radix_tree_preload {
51856 int nr; 51893 int nr;
51857 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; 51894 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -51861,9 +51898,9 @@ diff -urNp linux-2.6.32.23/lib/radix-tree.c linux-2.6.32.23/lib/radix-tree.c
51861 51898
51862 static inline gfp_t root_gfp_mask(struct radix_tree_root *root) 51899 static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
51863 { 51900 {
51864diff -urNp linux-2.6.32.23/lib/random32.c linux-2.6.32.23/lib/random32.c 51901diff -urNp linux-2.6.32.24/lib/random32.c linux-2.6.32.24/lib/random32.c
51865--- linux-2.6.32.23/lib/random32.c 2010-08-13 16:24:37.000000000 -0400 51902--- linux-2.6.32.24/lib/random32.c 2010-08-13 16:24:37.000000000 -0400
51866+++ linux-2.6.32.23/lib/random32.c 2010-09-04 15:54:52.000000000 -0400 51903+++ linux-2.6.32.24/lib/random32.c 2010-09-04 15:54:52.000000000 -0400
51867@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * 51904@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
51868 */ 51905 */
51869 static inline u32 __seed(u32 x, u32 m) 51906 static inline u32 __seed(u32 x, u32 m)
@@ -51873,9 +51910,9 @@ diff -urNp linux-2.6.32.23/lib/random32.c linux-2.6.32.23/lib/random32.c
51873 } 51910 }
51874 51911
51875 /** 51912 /**
51876diff -urNp linux-2.6.32.23/lib/vsprintf.c linux-2.6.32.23/lib/vsprintf.c 51913diff -urNp linux-2.6.32.24/lib/vsprintf.c linux-2.6.32.24/lib/vsprintf.c
51877--- linux-2.6.32.23/lib/vsprintf.c 2010-08-13 16:24:37.000000000 -0400 51914--- linux-2.6.32.24/lib/vsprintf.c 2010-08-13 16:24:37.000000000 -0400
51878+++ linux-2.6.32.23/lib/vsprintf.c 2010-09-23 19:51:59.000000000 -0400 51915+++ linux-2.6.32.24/lib/vsprintf.c 2010-09-23 19:51:59.000000000 -0400
51879@@ -551,7 +551,7 @@ static char *string(char *buf, char *end 51916@@ -551,7 +551,7 @@ static char *string(char *buf, char *end
51880 int len, i; 51917 int len, i;
51881 51918
@@ -51903,14 +51940,14 @@ diff -urNp linux-2.6.32.23/lib/vsprintf.c linux-2.6.32.23/lib/vsprintf.c
51903 len = strlen(save_str); 51940 len = strlen(save_str);
51904 if (str + len + 1 < end) 51941 if (str + len + 1 < end)
51905 memcpy(str, save_str, len + 1); 51942 memcpy(str, save_str, len + 1);
51906diff -urNp linux-2.6.32.23/localversion-grsec linux-2.6.32.23/localversion-grsec 51943diff -urNp linux-2.6.32.24/localversion-grsec linux-2.6.32.24/localversion-grsec
51907--- linux-2.6.32.23/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 51944--- linux-2.6.32.24/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
51908+++ linux-2.6.32.23/localversion-grsec 2010-09-04 15:54:52.000000000 -0400 51945+++ linux-2.6.32.24/localversion-grsec 2010-09-04 15:54:52.000000000 -0400
51909@@ -0,0 +1 @@ 51946@@ -0,0 +1 @@
51910+-grsec 51947+-grsec
51911diff -urNp linux-2.6.32.23/Makefile linux-2.6.32.23/Makefile 51948diff -urNp linux-2.6.32.24/Makefile linux-2.6.32.24/Makefile
51912--- linux-2.6.32.23/Makefile 2010-09-26 17:26:05.000000000 -0400 51949--- linux-2.6.32.24/Makefile 2010-09-28 17:23:28.000000000 -0400
51913+++ linux-2.6.32.23/Makefile 2010-09-26 17:26:38.000000000 -0400 51950+++ linux-2.6.32.24/Makefile 2010-09-28 17:23:43.000000000 -0400
51914@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" 51951@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
51915 51952
51916 HOSTCC = gcc 51953 HOSTCC = gcc
@@ -51931,9 +51968,9 @@ diff -urNp linux-2.6.32.23/Makefile linux-2.6.32.23/Makefile
51931 51968
51932 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ 51969 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
51933 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ 51970 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
51934diff -urNp linux-2.6.32.23/mm/filemap.c linux-2.6.32.23/mm/filemap.c 51971diff -urNp linux-2.6.32.24/mm/filemap.c linux-2.6.32.24/mm/filemap.c
51935--- linux-2.6.32.23/mm/filemap.c 2010-08-13 16:24:37.000000000 -0400 51972--- linux-2.6.32.24/mm/filemap.c 2010-08-13 16:24:37.000000000 -0400
51936+++ linux-2.6.32.23/mm/filemap.c 2010-09-04 15:54:52.000000000 -0400 51973+++ linux-2.6.32.24/mm/filemap.c 2010-09-04 15:54:52.000000000 -0400
51937@@ -1628,7 +1628,7 @@ int generic_file_mmap(struct file * file 51974@@ -1628,7 +1628,7 @@ int generic_file_mmap(struct file * file
51938 struct address_space *mapping = file->f_mapping; 51975 struct address_space *mapping = file->f_mapping;
51939 51976
@@ -51951,9 +51988,9 @@ diff -urNp linux-2.6.32.23/mm/filemap.c linux-2.6.32.23/mm/filemap.c
51951 if (*pos >= limit) { 51988 if (*pos >= limit) {
51952 send_sig(SIGXFSZ, current, 0); 51989 send_sig(SIGXFSZ, current, 0);
51953 return -EFBIG; 51990 return -EFBIG;
51954diff -urNp linux-2.6.32.23/mm/fremap.c linux-2.6.32.23/mm/fremap.c 51991diff -urNp linux-2.6.32.24/mm/fremap.c linux-2.6.32.24/mm/fremap.c
51955--- linux-2.6.32.23/mm/fremap.c 2010-08-13 16:24:37.000000000 -0400 51992--- linux-2.6.32.24/mm/fremap.c 2010-08-13 16:24:37.000000000 -0400
51956+++ linux-2.6.32.23/mm/fremap.c 2010-09-04 15:54:56.000000000 -0400 51993+++ linux-2.6.32.24/mm/fremap.c 2010-09-04 15:54:56.000000000 -0400
51957@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign 51994@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
51958 retry: 51995 retry:
51959 vma = find_vma(mm, start); 51996 vma = find_vma(mm, start);
@@ -51975,9 +52012,9 @@ diff -urNp linux-2.6.32.23/mm/fremap.c linux-2.6.32.23/mm/fremap.c
51975 munlock_vma_pages_range(vma, start, start + size); 52012 munlock_vma_pages_range(vma, start, start + size);
51976 vma->vm_flags = saved_flags; 52013 vma->vm_flags = saved_flags;
51977 } 52014 }
51978diff -urNp linux-2.6.32.23/mm/highmem.c linux-2.6.32.23/mm/highmem.c 52015diff -urNp linux-2.6.32.24/mm/highmem.c linux-2.6.32.24/mm/highmem.c
51979--- linux-2.6.32.23/mm/highmem.c 2010-08-13 16:24:37.000000000 -0400 52016--- linux-2.6.32.24/mm/highmem.c 2010-08-13 16:24:37.000000000 -0400
51980+++ linux-2.6.32.23/mm/highmem.c 2010-09-04 15:54:52.000000000 -0400 52017+++ linux-2.6.32.24/mm/highmem.c 2010-09-04 15:54:52.000000000 -0400
51981@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) 52018@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
51982 * So no dangers, even with speculative execution. 52019 * So no dangers, even with speculative execution.
51983 */ 52020 */
@@ -52003,9 +52040,9 @@ diff -urNp linux-2.6.32.23/mm/highmem.c linux-2.6.32.23/mm/highmem.c
52003 pkmap_count[last_pkmap_nr] = 1; 52040 pkmap_count[last_pkmap_nr] = 1;
52004 set_page_address(page, (void *)vaddr); 52041 set_page_address(page, (void *)vaddr);
52005 52042
52006diff -urNp linux-2.6.32.23/mm/hugetlb.c linux-2.6.32.23/mm/hugetlb.c 52043diff -urNp linux-2.6.32.24/mm/hugetlb.c linux-2.6.32.24/mm/hugetlb.c
52007--- linux-2.6.32.23/mm/hugetlb.c 2010-08-13 16:24:37.000000000 -0400 52044--- linux-2.6.32.24/mm/hugetlb.c 2010-08-13 16:24:37.000000000 -0400
52008+++ linux-2.6.32.23/mm/hugetlb.c 2010-09-04 15:54:52.000000000 -0400 52045+++ linux-2.6.32.24/mm/hugetlb.c 2010-09-04 15:54:52.000000000 -0400
52009@@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s 52046@@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s
52010 return 1; 52047 return 1;
52011 } 52048 }
@@ -52085,9 +52122,9 @@ diff -urNp linux-2.6.32.23/mm/hugetlb.c linux-2.6.32.23/mm/hugetlb.c
52085 ptep = huge_pte_alloc(mm, address, huge_page_size(h)); 52122 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
52086 if (!ptep) 52123 if (!ptep)
52087 return VM_FAULT_OOM; 52124 return VM_FAULT_OOM;
52088diff -urNp linux-2.6.32.23/mm/Kconfig linux-2.6.32.23/mm/Kconfig 52125diff -urNp linux-2.6.32.24/mm/Kconfig linux-2.6.32.24/mm/Kconfig
52089--- linux-2.6.32.23/mm/Kconfig 2010-08-13 16:24:37.000000000 -0400 52126--- linux-2.6.32.24/mm/Kconfig 2010-08-13 16:24:37.000000000 -0400
52090+++ linux-2.6.32.23/mm/Kconfig 2010-09-04 15:54:52.000000000 -0400 52127+++ linux-2.6.32.24/mm/Kconfig 2010-09-04 15:54:52.000000000 -0400
52091@@ -228,7 +228,7 @@ config KSM 52128@@ -228,7 +228,7 @@ config KSM
52092 config DEFAULT_MMAP_MIN_ADDR 52129 config DEFAULT_MMAP_MIN_ADDR
52093 int "Low address space to protect from user allocation" 52130 int "Low address space to protect from user allocation"
@@ -52097,9 +52134,9 @@ diff -urNp linux-2.6.32.23/mm/Kconfig linux-2.6.32.23/mm/Kconfig
52097 help 52134 help
52098 This is the portion of low virtual memory which should be protected 52135 This is the portion of low virtual memory which should be protected
52099 from userspace allocation. Keeping a user from writing to low pages 52136 from userspace allocation. Keeping a user from writing to low pages
52100diff -urNp linux-2.6.32.23/mm/maccess.c linux-2.6.32.23/mm/maccess.c 52137diff -urNp linux-2.6.32.24/mm/maccess.c linux-2.6.32.24/mm/maccess.c
52101--- linux-2.6.32.23/mm/maccess.c 2010-08-13 16:24:37.000000000 -0400 52138--- linux-2.6.32.24/mm/maccess.c 2010-08-13 16:24:37.000000000 -0400
52102+++ linux-2.6.32.23/mm/maccess.c 2010-09-04 15:54:52.000000000 -0400 52139+++ linux-2.6.32.24/mm/maccess.c 2010-09-04 15:54:52.000000000 -0400
52103@@ -14,7 +14,7 @@ 52140@@ -14,7 +14,7 @@
52104 * Safely read from address @src to the buffer at @dst. If a kernel fault 52141 * Safely read from address @src to the buffer at @dst. If a kernel fault
52105 * happens, handle that and return -EFAULT. 52142 * happens, handle that and return -EFAULT.
@@ -52118,9 +52155,9 @@ diff -urNp linux-2.6.32.23/mm/maccess.c linux-2.6.32.23/mm/maccess.c
52118 { 52155 {
52119 long ret; 52156 long ret;
52120 mm_segment_t old_fs = get_fs(); 52157 mm_segment_t old_fs = get_fs();
52121diff -urNp linux-2.6.32.23/mm/madvise.c linux-2.6.32.23/mm/madvise.c 52158diff -urNp linux-2.6.32.24/mm/madvise.c linux-2.6.32.24/mm/madvise.c
52122--- linux-2.6.32.23/mm/madvise.c 2010-08-13 16:24:37.000000000 -0400 52159--- linux-2.6.32.24/mm/madvise.c 2010-08-13 16:24:37.000000000 -0400
52123+++ linux-2.6.32.23/mm/madvise.c 2010-09-04 15:54:52.000000000 -0400 52160+++ linux-2.6.32.24/mm/madvise.c 2010-09-04 15:54:52.000000000 -0400
52124@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a 52161@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
52125 pgoff_t pgoff; 52162 pgoff_t pgoff;
52126 unsigned long new_flags = vma->vm_flags; 52163 unsigned long new_flags = vma->vm_flags;
@@ -52197,9 +52234,9 @@ diff -urNp linux-2.6.32.23/mm/madvise.c linux-2.6.32.23/mm/madvise.c
52197 error = 0; 52234 error = 0;
52198 if (end == start) 52235 if (end == start)
52199 goto out; 52236 goto out;
52200diff -urNp linux-2.6.32.23/mm/memory.c linux-2.6.32.23/mm/memory.c 52237diff -urNp linux-2.6.32.24/mm/memory.c linux-2.6.32.24/mm/memory.c
52201--- linux-2.6.32.23/mm/memory.c 2010-09-26 17:26:05.000000000 -0400 52238--- linux-2.6.32.24/mm/memory.c 2010-09-26 17:26:05.000000000 -0400
52202+++ linux-2.6.32.23/mm/memory.c 2010-09-26 17:26:57.000000000 -0400 52239+++ linux-2.6.32.24/mm/memory.c 2010-09-26 17:26:57.000000000 -0400
52203@@ -187,8 +187,12 @@ static inline void free_pmd_range(struct 52240@@ -187,8 +187,12 @@ static inline void free_pmd_range(struct
52204 return; 52241 return;
52205 52242
@@ -52687,9 +52724,9 @@ diff -urNp linux-2.6.32.23/mm/memory.c linux-2.6.32.23/mm/memory.c
52687 /* 52724 /*
52688 * Make sure the vDSO gets into every core dump. 52725 * Make sure the vDSO gets into every core dump.
52689 * Dumping its contents makes post-mortem fully interpretable later 52726 * Dumping its contents makes post-mortem fully interpretable later
52690diff -urNp linux-2.6.32.23/mm/memory-failure.c linux-2.6.32.23/mm/memory-failure.c 52727diff -urNp linux-2.6.32.24/mm/memory-failure.c linux-2.6.32.24/mm/memory-failure.c
52691--- linux-2.6.32.23/mm/memory-failure.c 2010-08-13 16:24:37.000000000 -0400 52728--- linux-2.6.32.24/mm/memory-failure.c 2010-08-13 16:24:37.000000000 -0400
52692+++ linux-2.6.32.23/mm/memory-failure.c 2010-09-04 15:54:52.000000000 -0400 52729+++ linux-2.6.32.24/mm/memory-failure.c 2010-09-04 15:54:52.000000000 -0400
52693@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r 52730@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
52694 52731
52695 int sysctl_memory_failure_recovery __read_mostly = 1; 52732 int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -52708,9 +52745,9 @@ diff -urNp linux-2.6.32.23/mm/memory-failure.c linux-2.6.32.23/mm/memory-failure
52708 52745
52709 /* 52746 /*
52710 * We need/can do nothing about count=0 pages. 52747 * We need/can do nothing about count=0 pages.
52711diff -urNp linux-2.6.32.23/mm/mempolicy.c linux-2.6.32.23/mm/mempolicy.c 52748diff -urNp linux-2.6.32.24/mm/mempolicy.c linux-2.6.32.24/mm/mempolicy.c
52712--- linux-2.6.32.23/mm/mempolicy.c 2010-08-13 16:24:37.000000000 -0400 52749--- linux-2.6.32.24/mm/mempolicy.c 2010-08-13 16:24:37.000000000 -0400
52713+++ linux-2.6.32.23/mm/mempolicy.c 2010-09-04 15:54:52.000000000 -0400 52750+++ linux-2.6.32.24/mm/mempolicy.c 2010-09-04 15:54:52.000000000 -0400
52714@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st 52751@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
52715 struct vm_area_struct *next; 52752 struct vm_area_struct *next;
52716 int err; 52753 int err;
@@ -52791,9 +52828,9 @@ diff -urNp linux-2.6.32.23/mm/mempolicy.c linux-2.6.32.23/mm/mempolicy.c
52791 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { 52828 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
52792 seq_printf(m, " heap"); 52829 seq_printf(m, " heap");
52793 } else if (vma->vm_start <= mm->start_stack && 52830 } else if (vma->vm_start <= mm->start_stack &&
52794diff -urNp linux-2.6.32.23/mm/migrate.c linux-2.6.32.23/mm/migrate.c 52831diff -urNp linux-2.6.32.24/mm/migrate.c linux-2.6.32.24/mm/migrate.c
52795--- linux-2.6.32.23/mm/migrate.c 2010-08-13 16:24:37.000000000 -0400 52832--- linux-2.6.32.24/mm/migrate.c 2010-08-13 16:24:37.000000000 -0400
52796+++ linux-2.6.32.23/mm/migrate.c 2010-09-04 15:54:52.000000000 -0400 52833+++ linux-2.6.32.24/mm/migrate.c 2010-09-04 15:54:52.000000000 -0400
52797@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 52834@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
52798 if (!mm) 52835 if (!mm)
52799 return -EINVAL; 52836 return -EINVAL;
@@ -52819,9 +52856,9 @@ diff -urNp linux-2.6.32.23/mm/migrate.c linux-2.6.32.23/mm/migrate.c
52819 rcu_read_unlock(); 52856 rcu_read_unlock();
52820 err = -EPERM; 52857 err = -EPERM;
52821 goto out; 52858 goto out;
52822diff -urNp linux-2.6.32.23/mm/mlock.c linux-2.6.32.23/mm/mlock.c 52859diff -urNp linux-2.6.32.24/mm/mlock.c linux-2.6.32.24/mm/mlock.c
52823--- linux-2.6.32.23/mm/mlock.c 2010-08-29 21:08:20.000000000 -0400 52860--- linux-2.6.32.24/mm/mlock.c 2010-08-29 21:08:20.000000000 -0400
52824+++ linux-2.6.32.23/mm/mlock.c 2010-09-17 18:47:09.000000000 -0400 52861+++ linux-2.6.32.24/mm/mlock.c 2010-09-17 18:47:09.000000000 -0400
52825@@ -13,6 +13,7 @@ 52862@@ -13,6 +13,7 @@
52826 #include <linux/pagemap.h> 52863 #include <linux/pagemap.h>
52827 #include <linux/mempolicy.h> 52864 #include <linux/mempolicy.h>
@@ -52929,9 +52966,9 @@ diff -urNp linux-2.6.32.23/mm/mlock.c linux-2.6.32.23/mm/mlock.c
52929 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || 52966 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
52930 capable(CAP_IPC_LOCK)) 52967 capable(CAP_IPC_LOCK))
52931 ret = do_mlockall(flags); 52968 ret = do_mlockall(flags);
52932diff -urNp linux-2.6.32.23/mm/mmap.c linux-2.6.32.23/mm/mmap.c 52969diff -urNp linux-2.6.32.24/mm/mmap.c linux-2.6.32.24/mm/mmap.c
52933--- linux-2.6.32.23/mm/mmap.c 2010-09-26 17:26:05.000000000 -0400 52970--- linux-2.6.32.24/mm/mmap.c 2010-09-26 17:26:05.000000000 -0400
52934+++ linux-2.6.32.23/mm/mmap.c 2010-09-26 17:26:57.000000000 -0400 52971+++ linux-2.6.32.24/mm/mmap.c 2010-09-26 17:26:57.000000000 -0400
52935@@ -45,6 +45,16 @@ 52972@@ -45,6 +45,16 @@
52936 #define arch_rebalance_pgtables(addr, len) (addr) 52973 #define arch_rebalance_pgtables(addr, len) (addr)
52937 #endif 52974 #endif
@@ -54114,9 +54151,9 @@ diff -urNp linux-2.6.32.23/mm/mmap.c linux-2.6.32.23/mm/mmap.c
54114 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; 54151 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
54115 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 54152 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
54116 54153
54117diff -urNp linux-2.6.32.23/mm/mprotect.c linux-2.6.32.23/mm/mprotect.c 54154diff -urNp linux-2.6.32.24/mm/mprotect.c linux-2.6.32.24/mm/mprotect.c
54118--- linux-2.6.32.23/mm/mprotect.c 2010-08-13 16:24:37.000000000 -0400 54155--- linux-2.6.32.24/mm/mprotect.c 2010-08-13 16:24:37.000000000 -0400
54119+++ linux-2.6.32.23/mm/mprotect.c 2010-09-17 18:34:04.000000000 -0400 54156+++ linux-2.6.32.24/mm/mprotect.c 2010-09-17 18:34:04.000000000 -0400
54120@@ -24,10 +24,16 @@ 54157@@ -24,10 +24,16 @@
54121 #include <linux/mmu_notifier.h> 54158 #include <linux/mmu_notifier.h>
54122 #include <linux/migrate.h> 54159 #include <linux/migrate.h>
@@ -54329,9 +54366,9 @@ diff -urNp linux-2.6.32.23/mm/mprotect.c linux-2.6.32.23/mm/mprotect.c
54329 nstart = tmp; 54366 nstart = tmp;
54330 54367
54331 if (nstart < prev->vm_end) 54368 if (nstart < prev->vm_end)
54332diff -urNp linux-2.6.32.23/mm/mremap.c linux-2.6.32.23/mm/mremap.c 54369diff -urNp linux-2.6.32.24/mm/mremap.c linux-2.6.32.24/mm/mremap.c
54333--- linux-2.6.32.23/mm/mremap.c 2010-08-13 16:24:37.000000000 -0400 54370--- linux-2.6.32.24/mm/mremap.c 2010-08-13 16:24:37.000000000 -0400
54334+++ linux-2.6.32.23/mm/mremap.c 2010-09-26 22:08:46.000000000 -0400 54371+++ linux-2.6.32.24/mm/mremap.c 2010-09-26 22:08:46.000000000 -0400
54335@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str 54372@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
54336 continue; 54373 continue;
54337 pte = ptep_clear_flush(vma, old_addr, old_pte); 54374 pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -54436,9 +54473,9 @@ diff -urNp linux-2.6.32.23/mm/mremap.c linux-2.6.32.23/mm/mremap.c
54436 } 54473 }
54437 out: 54474 out:
54438 if (ret & ~PAGE_MASK) 54475 if (ret & ~PAGE_MASK)
54439diff -urNp linux-2.6.32.23/mm/nommu.c linux-2.6.32.23/mm/nommu.c 54476diff -urNp linux-2.6.32.24/mm/nommu.c linux-2.6.32.24/mm/nommu.c
54440--- linux-2.6.32.23/mm/nommu.c 2010-08-29 21:08:20.000000000 -0400 54477--- linux-2.6.32.24/mm/nommu.c 2010-08-29 21:08:20.000000000 -0400
54441+++ linux-2.6.32.23/mm/nommu.c 2010-09-17 18:34:04.000000000 -0400 54478+++ linux-2.6.32.24/mm/nommu.c 2010-09-17 18:34:04.000000000 -0400
54442@@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMI 54479@@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMI
54443 int sysctl_overcommit_ratio = 50; /* default is 50% */ 54480 int sysctl_overcommit_ratio = 50; /* default is 50% */
54444 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT; 54481 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
@@ -54463,9 +54500,9 @@ diff -urNp linux-2.6.32.23/mm/nommu.c linux-2.6.32.23/mm/nommu.c
54463 * expand a stack to a given address 54500 * expand a stack to a given address
54464 * - not supported under NOMMU conditions 54501 * - not supported under NOMMU conditions
54465 */ 54502 */
54466diff -urNp linux-2.6.32.23/mm/page_alloc.c linux-2.6.32.23/mm/page_alloc.c 54503diff -urNp linux-2.6.32.24/mm/page_alloc.c linux-2.6.32.24/mm/page_alloc.c
54467--- linux-2.6.32.23/mm/page_alloc.c 2010-09-26 17:26:05.000000000 -0400 54504--- linux-2.6.32.24/mm/page_alloc.c 2010-09-26 17:26:05.000000000 -0400
54468+++ linux-2.6.32.23/mm/page_alloc.c 2010-09-26 17:26:57.000000000 -0400 54505+++ linux-2.6.32.24/mm/page_alloc.c 2010-09-26 17:26:57.000000000 -0400
54469@@ -587,6 +587,10 @@ static void __free_pages_ok(struct page 54506@@ -587,6 +587,10 @@ static void __free_pages_ok(struct page
54470 int bad = 0; 54507 int bad = 0;
54471 int wasMlocked = __TestClearPageMlocked(page); 54508 int wasMlocked = __TestClearPageMlocked(page);
@@ -54522,9 +54559,9 @@ diff -urNp linux-2.6.32.23/mm/page_alloc.c linux-2.6.32.23/mm/page_alloc.c
54522 struct zone *zone, unsigned long zonesize) {} 54559 struct zone *zone, unsigned long zonesize) {}
54523 #endif /* CONFIG_SPARSEMEM */ 54560 #endif /* CONFIG_SPARSEMEM */
54524 54561
54525diff -urNp linux-2.6.32.23/mm/percpu.c linux-2.6.32.23/mm/percpu.c 54562diff -urNp linux-2.6.32.24/mm/percpu.c linux-2.6.32.24/mm/percpu.c
54526--- linux-2.6.32.23/mm/percpu.c 2010-09-26 17:26:05.000000000 -0400 54563--- linux-2.6.32.24/mm/percpu.c 2010-09-26 17:26:05.000000000 -0400
54527+++ linux-2.6.32.23/mm/percpu.c 2010-09-26 17:26:57.000000000 -0400 54564+++ linux-2.6.32.24/mm/percpu.c 2010-09-26 17:26:57.000000000 -0400
54528@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu 54565@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
54529 static unsigned int pcpu_last_unit_cpu __read_mostly; 54566 static unsigned int pcpu_last_unit_cpu __read_mostly;
54530 54567
@@ -54534,9 +54571,9 @@ diff -urNp linux-2.6.32.23/mm/percpu.c linux-2.6.32.23/mm/percpu.c
54534 EXPORT_SYMBOL_GPL(pcpu_base_addr); 54571 EXPORT_SYMBOL_GPL(pcpu_base_addr);
54535 54572
54536 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ 54573 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
54537diff -urNp linux-2.6.32.23/mm/rmap.c linux-2.6.32.23/mm/rmap.c 54574diff -urNp linux-2.6.32.24/mm/rmap.c linux-2.6.32.24/mm/rmap.c
54538--- linux-2.6.32.23/mm/rmap.c 2010-08-13 16:24:37.000000000 -0400 54575--- linux-2.6.32.24/mm/rmap.c 2010-08-13 16:24:37.000000000 -0400
54539+++ linux-2.6.32.23/mm/rmap.c 2010-09-04 15:54:52.000000000 -0400 54576+++ linux-2.6.32.24/mm/rmap.c 2010-09-04 15:54:52.000000000 -0400
54540@@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_stru 54577@@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_stru
54541 /* page_table_lock to protect against threads */ 54578 /* page_table_lock to protect against threads */
54542 spin_lock(&mm->page_table_lock); 54579 spin_lock(&mm->page_table_lock);
@@ -54555,9 +54592,9 @@ diff -urNp linux-2.6.32.23/mm/rmap.c linux-2.6.32.23/mm/rmap.c
54555 vma->anon_vma = anon_vma; 54592 vma->anon_vma = anon_vma;
54556 list_add_tail(&vma->anon_vma_node, &anon_vma->head); 54593 list_add_tail(&vma->anon_vma_node, &anon_vma->head);
54557 allocated = NULL; 54594 allocated = NULL;
54558diff -urNp linux-2.6.32.23/mm/shmem.c linux-2.6.32.23/mm/shmem.c 54595diff -urNp linux-2.6.32.24/mm/shmem.c linux-2.6.32.24/mm/shmem.c
54559--- linux-2.6.32.23/mm/shmem.c 2010-08-13 16:24:37.000000000 -0400 54596--- linux-2.6.32.24/mm/shmem.c 2010-08-13 16:24:37.000000000 -0400
54560+++ linux-2.6.32.23/mm/shmem.c 2010-09-04 15:54:52.000000000 -0400 54597+++ linux-2.6.32.24/mm/shmem.c 2010-09-04 15:54:52.000000000 -0400
54561@@ -31,7 +31,7 @@ 54598@@ -31,7 +31,7 @@
54562 #include <linux/swap.h> 54599 #include <linux/swap.h>
54563 #include <linux/ima.h> 54600 #include <linux/ima.h>
@@ -54567,9 +54604,9 @@ diff -urNp linux-2.6.32.23/mm/shmem.c linux-2.6.32.23/mm/shmem.c
54567 54604
54568 #ifdef CONFIG_SHMEM 54605 #ifdef CONFIG_SHMEM
54569 /* 54606 /*
54570diff -urNp linux-2.6.32.23/mm/slab.c linux-2.6.32.23/mm/slab.c 54607diff -urNp linux-2.6.32.24/mm/slab.c linux-2.6.32.24/mm/slab.c
54571--- linux-2.6.32.23/mm/slab.c 2010-08-29 21:08:20.000000000 -0400 54608--- linux-2.6.32.24/mm/slab.c 2010-08-29 21:08:20.000000000 -0400
54572+++ linux-2.6.32.23/mm/slab.c 2010-09-04 15:54:52.000000000 -0400 54609+++ linux-2.6.32.24/mm/slab.c 2010-09-04 15:54:52.000000000 -0400
54573@@ -308,7 +308,7 @@ struct kmem_list3 { 54610@@ -308,7 +308,7 @@ struct kmem_list3 {
54574 * Need this for bootstrapping a per node allocator. 54611 * Need this for bootstrapping a per node allocator.
54575 */ 54612 */
@@ -54675,9 +54712,9 @@ diff -urNp linux-2.6.32.23/mm/slab.c linux-2.6.32.23/mm/slab.c
54675 /** 54712 /**
54676 * ksize - get the actual amount of memory allocated for a given object 54713 * ksize - get the actual amount of memory allocated for a given object
54677 * @objp: Pointer to the object 54714 * @objp: Pointer to the object
54678diff -urNp linux-2.6.32.23/mm/slob.c linux-2.6.32.23/mm/slob.c 54715diff -urNp linux-2.6.32.24/mm/slob.c linux-2.6.32.24/mm/slob.c
54679--- linux-2.6.32.23/mm/slob.c 2010-08-13 16:24:37.000000000 -0400 54716--- linux-2.6.32.24/mm/slob.c 2010-08-13 16:24:37.000000000 -0400
54680+++ linux-2.6.32.23/mm/slob.c 2010-09-04 15:54:52.000000000 -0400 54717+++ linux-2.6.32.24/mm/slob.c 2010-09-04 15:54:52.000000000 -0400
54681@@ -29,7 +29,7 @@ 54718@@ -29,7 +29,7 @@
54682 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls 54719 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
54683 * alloc_pages() directly, allocating compound pages so the page order 54720 * alloc_pages() directly, allocating compound pages so the page order
@@ -54998,9 +55035,9 @@ diff -urNp linux-2.6.32.23/mm/slob.c linux-2.6.32.23/mm/slob.c
54998 } 55035 }
54999 55036
55000 trace_kmem_cache_free(_RET_IP_, b); 55037 trace_kmem_cache_free(_RET_IP_, b);
55001diff -urNp linux-2.6.32.23/mm/slub.c linux-2.6.32.23/mm/slub.c 55038diff -urNp linux-2.6.32.24/mm/slub.c linux-2.6.32.24/mm/slub.c
55002--- linux-2.6.32.23/mm/slub.c 2010-08-13 16:24:37.000000000 -0400 55039--- linux-2.6.32.24/mm/slub.c 2010-08-13 16:24:37.000000000 -0400
55003+++ linux-2.6.32.23/mm/slub.c 2010-09-04 15:54:52.000000000 -0400 55040+++ linux-2.6.32.24/mm/slub.c 2010-09-04 15:54:52.000000000 -0400
55004@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * 55041@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *
55005 55042
55006 page = virt_to_head_page(x); 55043 page = virt_to_head_page(x);
@@ -55163,9 +55200,9 @@ diff -urNp linux-2.6.32.23/mm/slub.c linux-2.6.32.23/mm/slub.c
55163 return 0; 55200 return 0;
55164 } 55201 }
55165 module_init(slab_proc_init); 55202 module_init(slab_proc_init);
55166diff -urNp linux-2.6.32.23/mm/util.c linux-2.6.32.23/mm/util.c 55203diff -urNp linux-2.6.32.24/mm/util.c linux-2.6.32.24/mm/util.c
55167--- linux-2.6.32.23/mm/util.c 2010-08-13 16:24:37.000000000 -0400 55204--- linux-2.6.32.24/mm/util.c 2010-08-13 16:24:37.000000000 -0400
55168+++ linux-2.6.32.23/mm/util.c 2010-09-04 15:54:52.000000000 -0400 55205+++ linux-2.6.32.24/mm/util.c 2010-09-04 15:54:52.000000000 -0400
55169@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); 55206@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
55170 void arch_pick_mmap_layout(struct mm_struct *mm) 55207 void arch_pick_mmap_layout(struct mm_struct *mm)
55171 { 55208 {
@@ -55179,9 +55216,9 @@ diff -urNp linux-2.6.32.23/mm/util.c linux-2.6.32.23/mm/util.c
55179 mm->get_unmapped_area = arch_get_unmapped_area; 55216 mm->get_unmapped_area = arch_get_unmapped_area;
55180 mm->unmap_area = arch_unmap_area; 55217 mm->unmap_area = arch_unmap_area;
55181 } 55218 }
55182diff -urNp linux-2.6.32.23/mm/vmalloc.c linux-2.6.32.23/mm/vmalloc.c 55219diff -urNp linux-2.6.32.24/mm/vmalloc.c linux-2.6.32.24/mm/vmalloc.c
55183--- linux-2.6.32.23/mm/vmalloc.c 2010-08-13 16:24:37.000000000 -0400 55220--- linux-2.6.32.24/mm/vmalloc.c 2010-08-13 16:24:37.000000000 -0400
55184+++ linux-2.6.32.23/mm/vmalloc.c 2010-09-04 15:54:52.000000000 -0400 55221+++ linux-2.6.32.24/mm/vmalloc.c 2010-09-04 15:54:52.000000000 -0400
55185@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, 55222@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
55186 55223
55187 pte = pte_offset_kernel(pmd, addr); 55224 pte = pte_offset_kernel(pmd, addr);
@@ -55409,9 +55446,9 @@ diff -urNp linux-2.6.32.23/mm/vmalloc.c linux-2.6.32.23/mm/vmalloc.c
55409 void *vmalloc_32_user(unsigned long size) 55446 void *vmalloc_32_user(unsigned long size)
55410 { 55447 {
55411 struct vm_struct *area; 55448 struct vm_struct *area;
55412diff -urNp linux-2.6.32.23/mm/vmstat.c linux-2.6.32.23/mm/vmstat.c 55449diff -urNp linux-2.6.32.24/mm/vmstat.c linux-2.6.32.24/mm/vmstat.c
55413--- linux-2.6.32.23/mm/vmstat.c 2010-09-26 17:26:05.000000000 -0400 55450--- linux-2.6.32.24/mm/vmstat.c 2010-09-26 17:26:05.000000000 -0400
55414+++ linux-2.6.32.23/mm/vmstat.c 2010-09-26 17:26:57.000000000 -0400 55451+++ linux-2.6.32.24/mm/vmstat.c 2010-09-26 17:26:57.000000000 -0400
55415@@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu) 55452@@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu)
55416 * 55453 *
55417 * vm_stat contains the global counters 55454 * vm_stat contains the global counters
@@ -55460,9 +55497,9 @@ diff -urNp linux-2.6.32.23/mm/vmstat.c linux-2.6.32.23/mm/vmstat.c
55460 #endif 55497 #endif
55461 return 0; 55498 return 0;
55462 } 55499 }
55463diff -urNp linux-2.6.32.23/net/8021q/vlan.c linux-2.6.32.23/net/8021q/vlan.c 55500diff -urNp linux-2.6.32.24/net/8021q/vlan.c linux-2.6.32.24/net/8021q/vlan.c
55464--- linux-2.6.32.23/net/8021q/vlan.c 2010-08-13 16:24:37.000000000 -0400 55501--- linux-2.6.32.24/net/8021q/vlan.c 2010-08-13 16:24:37.000000000 -0400
55465+++ linux-2.6.32.23/net/8021q/vlan.c 2010-09-04 15:54:52.000000000 -0400 55502+++ linux-2.6.32.24/net/8021q/vlan.c 2010-09-04 15:54:52.000000000 -0400
55466@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net 55503@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
55467 err = -EPERM; 55504 err = -EPERM;
55468 if (!capable(CAP_NET_ADMIN)) 55505 if (!capable(CAP_NET_ADMIN))
@@ -55473,9 +55510,9 @@ diff -urNp linux-2.6.32.23/net/8021q/vlan.c linux-2.6.32.23/net/8021q/vlan.c
55473 struct vlan_net *vn; 55510 struct vlan_net *vn;
55474 55511
55475 vn = net_generic(net, vlan_net_id); 55512 vn = net_generic(net, vlan_net_id);
55476diff -urNp linux-2.6.32.23/net/atm/atm_misc.c linux-2.6.32.23/net/atm/atm_misc.c 55513diff -urNp linux-2.6.32.24/net/atm/atm_misc.c linux-2.6.32.24/net/atm/atm_misc.c
55477--- linux-2.6.32.23/net/atm/atm_misc.c 2010-08-13 16:24:37.000000000 -0400 55514--- linux-2.6.32.24/net/atm/atm_misc.c 2010-08-13 16:24:37.000000000 -0400
55478+++ linux-2.6.32.23/net/atm/atm_misc.c 2010-09-04 15:54:52.000000000 -0400 55515+++ linux-2.6.32.24/net/atm/atm_misc.c 2010-09-04 15:54:52.000000000 -0400
55479@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t 55516@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
55480 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) 55517 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
55481 return 1; 55518 return 1;
@@ -55512,9 +55549,9 @@ diff -urNp linux-2.6.32.23/net/atm/atm_misc.c linux-2.6.32.23/net/atm/atm_misc.c
55512 __SONET_ITEMS 55549 __SONET_ITEMS
55513 #undef __HANDLE_ITEM 55550 #undef __HANDLE_ITEM
55514 } 55551 }
55515diff -urNp linux-2.6.32.23/net/atm/proc.c linux-2.6.32.23/net/atm/proc.c 55552diff -urNp linux-2.6.32.24/net/atm/proc.c linux-2.6.32.24/net/atm/proc.c
55516--- linux-2.6.32.23/net/atm/proc.c 2010-08-13 16:24:37.000000000 -0400 55553--- linux-2.6.32.24/net/atm/proc.c 2010-08-13 16:24:37.000000000 -0400
55517+++ linux-2.6.32.23/net/atm/proc.c 2010-09-14 21:47:17.000000000 -0400 55554+++ linux-2.6.32.24/net/atm/proc.c 2010-09-14 21:47:17.000000000 -0400
55518@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s 55555@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
55519 const struct k_atm_aal_stats *stats) 55556 const struct k_atm_aal_stats *stats)
55520 { 55557 {
@@ -55541,9 +55578,9 @@ diff -urNp linux-2.6.32.23/net/atm/proc.c linux-2.6.32.23/net/atm/proc.c
55541 if (!vcc->dev) 55578 if (!vcc->dev)
55542 seq_printf(seq, "Unassigned "); 55579 seq_printf(seq, "Unassigned ");
55543 else 55580 else
55544diff -urNp linux-2.6.32.23/net/atm/resources.c linux-2.6.32.23/net/atm/resources.c 55581diff -urNp linux-2.6.32.24/net/atm/resources.c linux-2.6.32.24/net/atm/resources.c
55545--- linux-2.6.32.23/net/atm/resources.c 2010-08-13 16:24:37.000000000 -0400 55582--- linux-2.6.32.24/net/atm/resources.c 2010-08-13 16:24:37.000000000 -0400
55546+++ linux-2.6.32.23/net/atm/resources.c 2010-09-04 15:54:52.000000000 -0400 55583+++ linux-2.6.32.24/net/atm/resources.c 2010-09-04 15:54:52.000000000 -0400
55547@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * 55584@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
55548 static void copy_aal_stats(struct k_atm_aal_stats *from, 55585 static void copy_aal_stats(struct k_atm_aal_stats *from,
55549 struct atm_aal_stats *to) 55586 struct atm_aal_stats *to)
@@ -55562,9 +55599,9 @@ diff -urNp linux-2.6.32.23/net/atm/resources.c linux-2.6.32.23/net/atm/resources
55562 __AAL_STAT_ITEMS 55599 __AAL_STAT_ITEMS
55563 #undef __HANDLE_ITEM 55600 #undef __HANDLE_ITEM
55564 } 55601 }
55565diff -urNp linux-2.6.32.23/net/bridge/br_private.h linux-2.6.32.23/net/bridge/br_private.h 55602diff -urNp linux-2.6.32.24/net/bridge/br_private.h linux-2.6.32.24/net/bridge/br_private.h
55566--- linux-2.6.32.23/net/bridge/br_private.h 2010-08-13 16:24:37.000000000 -0400 55603--- linux-2.6.32.24/net/bridge/br_private.h 2010-08-13 16:24:37.000000000 -0400
55567+++ linux-2.6.32.23/net/bridge/br_private.h 2010-09-04 15:54:52.000000000 -0400 55604+++ linux-2.6.32.24/net/bridge/br_private.h 2010-09-04 15:54:52.000000000 -0400
55568@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, 55605@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
55569 55606
55570 #ifdef CONFIG_SYSFS 55607 #ifdef CONFIG_SYSFS
@@ -55574,9 +55611,9 @@ diff -urNp linux-2.6.32.23/net/bridge/br_private.h linux-2.6.32.23/net/bridge/br
55574 extern int br_sysfs_addif(struct net_bridge_port *p); 55611 extern int br_sysfs_addif(struct net_bridge_port *p);
55575 55612
55576 /* br_sysfs_br.c */ 55613 /* br_sysfs_br.c */
55577diff -urNp linux-2.6.32.23/net/bridge/br_stp_if.c linux-2.6.32.23/net/bridge/br_stp_if.c 55614diff -urNp linux-2.6.32.24/net/bridge/br_stp_if.c linux-2.6.32.24/net/bridge/br_stp_if.c
55578--- linux-2.6.32.23/net/bridge/br_stp_if.c 2010-08-13 16:24:37.000000000 -0400 55615--- linux-2.6.32.24/net/bridge/br_stp_if.c 2010-08-13 16:24:37.000000000 -0400
55579+++ linux-2.6.32.23/net/bridge/br_stp_if.c 2010-09-04 15:54:52.000000000 -0400 55616+++ linux-2.6.32.24/net/bridge/br_stp_if.c 2010-09-04 15:54:52.000000000 -0400
55580@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg 55617@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
55581 char *envp[] = { NULL }; 55618 char *envp[] = { NULL };
55582 55619
@@ -55586,9 +55623,9 @@ diff -urNp linux-2.6.32.23/net/bridge/br_stp_if.c linux-2.6.32.23/net/bridge/br_
55586 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", 55623 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
55587 br->dev->name, r); 55624 br->dev->name, r);
55588 55625
55589diff -urNp linux-2.6.32.23/net/bridge/br_sysfs_if.c linux-2.6.32.23/net/bridge/br_sysfs_if.c 55626diff -urNp linux-2.6.32.24/net/bridge/br_sysfs_if.c linux-2.6.32.24/net/bridge/br_sysfs_if.c
55590--- linux-2.6.32.23/net/bridge/br_sysfs_if.c 2010-08-13 16:24:37.000000000 -0400 55627--- linux-2.6.32.24/net/bridge/br_sysfs_if.c 2010-08-13 16:24:37.000000000 -0400
55591+++ linux-2.6.32.23/net/bridge/br_sysfs_if.c 2010-09-04 15:54:52.000000000 -0400 55628+++ linux-2.6.32.24/net/bridge/br_sysfs_if.c 2010-09-04 15:54:52.000000000 -0400
55592@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje 55629@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
55593 return ret; 55630 return ret;
55594 } 55631 }
@@ -55598,9 +55635,9 @@ diff -urNp linux-2.6.32.23/net/bridge/br_sysfs_if.c linux-2.6.32.23/net/bridge/b
55598 .show = brport_show, 55635 .show = brport_show,
55599 .store = brport_store, 55636 .store = brport_store,
55600 }; 55637 };
55601diff -urNp linux-2.6.32.23/net/core/dev.c linux-2.6.32.23/net/core/dev.c 55638diff -urNp linux-2.6.32.24/net/core/dev.c linux-2.6.32.24/net/core/dev.c
55602--- linux-2.6.32.23/net/core/dev.c 2010-08-29 21:08:20.000000000 -0400 55639--- linux-2.6.32.24/net/core/dev.c 2010-08-29 21:08:20.000000000 -0400
55603+++ linux-2.6.32.23/net/core/dev.c 2010-09-04 15:54:52.000000000 -0400 55640+++ linux-2.6.32.24/net/core/dev.c 2010-09-04 15:54:52.000000000 -0400
55604@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) 55641@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb)
55605 } 55642 }
55606 EXPORT_SYMBOL(netif_rx_ni); 55643 EXPORT_SYMBOL(netif_rx_ni);
@@ -55619,9 +55656,9 @@ diff -urNp linux-2.6.32.23/net/core/dev.c linux-2.6.32.23/net/core/dev.c
55619 { 55656 {
55620 struct list_head *list = &__get_cpu_var(softnet_data).poll_list; 55657 struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
55621 unsigned long time_limit = jiffies + 2; 55658 unsigned long time_limit = jiffies + 2;
55622diff -urNp linux-2.6.32.23/net/core/flow.c linux-2.6.32.23/net/core/flow.c 55659diff -urNp linux-2.6.32.24/net/core/flow.c linux-2.6.32.24/net/core/flow.c
55623--- linux-2.6.32.23/net/core/flow.c 2010-08-13 16:24:37.000000000 -0400 55660--- linux-2.6.32.24/net/core/flow.c 2010-08-13 16:24:37.000000000 -0400
55624+++ linux-2.6.32.23/net/core/flow.c 2010-09-04 15:54:52.000000000 -0400 55661+++ linux-2.6.32.24/net/core/flow.c 2010-09-04 15:54:52.000000000 -0400
55625@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( 55662@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
55626 55663
55627 static u32 flow_hash_shift; 55664 static u32 flow_hash_shift;
@@ -55649,9 +55686,9 @@ diff -urNp linux-2.6.32.23/net/core/flow.c linux-2.6.32.23/net/core/flow.c
55649 55686
55650 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) 55687 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
55651 55688
55652diff -urNp linux-2.6.32.23/net/dccp/ccids/ccid3.c linux-2.6.32.23/net/dccp/ccids/ccid3.c 55689diff -urNp linux-2.6.32.24/net/dccp/ccids/ccid3.c linux-2.6.32.24/net/dccp/ccids/ccid3.c
55653--- linux-2.6.32.23/net/dccp/ccids/ccid3.c 2010-08-13 16:24:37.000000000 -0400 55690--- linux-2.6.32.24/net/dccp/ccids/ccid3.c 2010-08-13 16:24:37.000000000 -0400
55654+++ linux-2.6.32.23/net/dccp/ccids/ccid3.c 2010-09-04 15:54:52.000000000 -0400 55691+++ linux-2.6.32.24/net/dccp/ccids/ccid3.c 2010-09-04 15:54:52.000000000 -0400
55655@@ -41,7 +41,7 @@ 55692@@ -41,7 +41,7 @@
55656 static int ccid3_debug; 55693 static int ccid3_debug;
55657 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) 55694 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -55661,9 +55698,9 @@ diff -urNp linux-2.6.32.23/net/dccp/ccids/ccid3.c linux-2.6.32.23/net/dccp/ccids
55661 #endif 55698 #endif
55662 55699
55663 /* 55700 /*
55664diff -urNp linux-2.6.32.23/net/dccp/dccp.h linux-2.6.32.23/net/dccp/dccp.h 55701diff -urNp linux-2.6.32.24/net/dccp/dccp.h linux-2.6.32.24/net/dccp/dccp.h
55665--- linux-2.6.32.23/net/dccp/dccp.h 2010-08-13 16:24:37.000000000 -0400 55702--- linux-2.6.32.24/net/dccp/dccp.h 2010-08-13 16:24:37.000000000 -0400
55666+++ linux-2.6.32.23/net/dccp/dccp.h 2010-09-04 15:54:52.000000000 -0400 55703+++ linux-2.6.32.24/net/dccp/dccp.h 2010-09-04 15:54:52.000000000 -0400
55667@@ -44,9 +44,9 @@ extern int dccp_debug; 55704@@ -44,9 +44,9 @@ extern int dccp_debug;
55668 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) 55705 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
55669 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) 55706 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -55677,9 +55714,9 @@ diff -urNp linux-2.6.32.23/net/dccp/dccp.h linux-2.6.32.23/net/dccp/dccp.h
55677 #endif 55714 #endif
55678 55715
55679 extern struct inet_hashinfo dccp_hashinfo; 55716 extern struct inet_hashinfo dccp_hashinfo;
55680diff -urNp linux-2.6.32.23/net/decnet/sysctl_net_decnet.c linux-2.6.32.23/net/decnet/sysctl_net_decnet.c 55717diff -urNp linux-2.6.32.24/net/decnet/sysctl_net_decnet.c linux-2.6.32.24/net/decnet/sysctl_net_decnet.c
55681--- linux-2.6.32.23/net/decnet/sysctl_net_decnet.c 2010-08-13 16:24:37.000000000 -0400 55718--- linux-2.6.32.24/net/decnet/sysctl_net_decnet.c 2010-08-13 16:24:37.000000000 -0400
55682+++ linux-2.6.32.23/net/decnet/sysctl_net_decnet.c 2010-09-04 15:54:52.000000000 -0400 55719+++ linux-2.6.32.24/net/decnet/sysctl_net_decnet.c 2010-09-04 15:54:52.000000000 -0400
55683@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t 55720@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
55684 55721
55685 if (len > *lenp) len = *lenp; 55722 if (len > *lenp) len = *lenp;
@@ -55698,9 +55735,9 @@ diff -urNp linux-2.6.32.23/net/decnet/sysctl_net_decnet.c linux-2.6.32.23/net/de
55698 return -EFAULT; 55735 return -EFAULT;
55699 55736
55700 *lenp = len; 55737 *lenp = len;
55701diff -urNp linux-2.6.32.23/net/ipv4/inet_hashtables.c linux-2.6.32.23/net/ipv4/inet_hashtables.c 55738diff -urNp linux-2.6.32.24/net/ipv4/inet_hashtables.c linux-2.6.32.24/net/ipv4/inet_hashtables.c
55702--- linux-2.6.32.23/net/ipv4/inet_hashtables.c 2010-08-13 16:24:37.000000000 -0400 55739--- linux-2.6.32.24/net/ipv4/inet_hashtables.c 2010-08-13 16:24:37.000000000 -0400
55703+++ linux-2.6.32.23/net/ipv4/inet_hashtables.c 2010-09-04 15:54:52.000000000 -0400 55740+++ linux-2.6.32.24/net/ipv4/inet_hashtables.c 2010-09-04 15:54:52.000000000 -0400
55704@@ -18,11 +18,14 @@ 55741@@ -18,11 +18,14 @@
55705 #include <linux/sched.h> 55742 #include <linux/sched.h>
55706 #include <linux/slab.h> 55743 #include <linux/slab.h>
@@ -55725,9 +55762,9 @@ diff -urNp linux-2.6.32.23/net/ipv4/inet_hashtables.c linux-2.6.32.23/net/ipv4/i
55725 if (tw) { 55762 if (tw) {
55726 inet_twsk_deschedule(tw, death_row); 55763 inet_twsk_deschedule(tw, death_row);
55727 inet_twsk_put(tw); 55764 inet_twsk_put(tw);
55728diff -urNp linux-2.6.32.23/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.23/net/ipv4/netfilter/nf_nat_snmp_basic.c 55765diff -urNp linux-2.6.32.24/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.24/net/ipv4/netfilter/nf_nat_snmp_basic.c
55729--- linux-2.6.32.23/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-13 16:24:37.000000000 -0400 55766--- linux-2.6.32.24/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-13 16:24:37.000000000 -0400
55730+++ linux-2.6.32.23/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-09-04 15:54:52.000000000 -0400 55767+++ linux-2.6.32.24/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-09-04 15:54:52.000000000 -0400
55731@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( 55768@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
55732 55769
55733 *len = 0; 55770 *len = 0;
@@ -55737,9 +55774,9 @@ diff -urNp linux-2.6.32.23/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.2
55737 if (*octets == NULL) { 55774 if (*octets == NULL) {
55738 if (net_ratelimit()) 55775 if (net_ratelimit())
55739 printk("OOM in bsalg (%d)\n", __LINE__); 55776 printk("OOM in bsalg (%d)\n", __LINE__);
55740diff -urNp linux-2.6.32.23/net/ipv4/tcp_ipv4.c linux-2.6.32.23/net/ipv4/tcp_ipv4.c 55777diff -urNp linux-2.6.32.24/net/ipv4/tcp_ipv4.c linux-2.6.32.24/net/ipv4/tcp_ipv4.c
55741--- linux-2.6.32.23/net/ipv4/tcp_ipv4.c 2010-08-13 16:24:37.000000000 -0400 55778--- linux-2.6.32.24/net/ipv4/tcp_ipv4.c 2010-08-13 16:24:37.000000000 -0400
55742+++ linux-2.6.32.23/net/ipv4/tcp_ipv4.c 2010-09-14 21:42:19.000000000 -0400 55779+++ linux-2.6.32.24/net/ipv4/tcp_ipv4.c 2010-09-14 21:42:19.000000000 -0400
55743@@ -84,6 +84,9 @@ 55780@@ -84,6 +84,9 @@
55744 int sysctl_tcp_tw_reuse __read_mostly; 55781 int sysctl_tcp_tw_reuse __read_mostly;
55745 int sysctl_tcp_low_latency __read_mostly; 55782 int sysctl_tcp_low_latency __read_mostly;
@@ -55835,9 +55872,9 @@ diff -urNp linux-2.6.32.23/net/ipv4/tcp_ipv4.c linux-2.6.32.23/net/ipv4/tcp_ipv4
55835 } 55872 }
55836 55873
55837 #define TMPSZ 150 55874 #define TMPSZ 150
55838diff -urNp linux-2.6.32.23/net/ipv4/tcp_minisocks.c linux-2.6.32.23/net/ipv4/tcp_minisocks.c 55875diff -urNp linux-2.6.32.24/net/ipv4/tcp_minisocks.c linux-2.6.32.24/net/ipv4/tcp_minisocks.c
55839--- linux-2.6.32.23/net/ipv4/tcp_minisocks.c 2010-08-13 16:24:37.000000000 -0400 55876--- linux-2.6.32.24/net/ipv4/tcp_minisocks.c 2010-08-13 16:24:37.000000000 -0400
55840+++ linux-2.6.32.23/net/ipv4/tcp_minisocks.c 2010-09-04 15:54:52.000000000 -0400 55877+++ linux-2.6.32.24/net/ipv4/tcp_minisocks.c 2010-09-04 15:54:52.000000000 -0400
55841@@ -26,6 +26,10 @@ 55878@@ -26,6 +26,10 @@
55842 #include <net/inet_common.h> 55879 #include <net/inet_common.h>
55843 #include <net/xfrm.h> 55880 #include <net/xfrm.h>
@@ -55860,9 +55897,9 @@ diff -urNp linux-2.6.32.23/net/ipv4/tcp_minisocks.c linux-2.6.32.23/net/ipv4/tcp
55860 if (!(flg & TCP_FLAG_RST)) 55897 if (!(flg & TCP_FLAG_RST))
55861 req->rsk_ops->send_reset(sk, skb); 55898 req->rsk_ops->send_reset(sk, skb);
55862 55899
55863diff -urNp linux-2.6.32.23/net/ipv4/tcp_probe.c linux-2.6.32.23/net/ipv4/tcp_probe.c 55900diff -urNp linux-2.6.32.24/net/ipv4/tcp_probe.c linux-2.6.32.24/net/ipv4/tcp_probe.c
55864--- linux-2.6.32.23/net/ipv4/tcp_probe.c 2010-08-13 16:24:37.000000000 -0400 55901--- linux-2.6.32.24/net/ipv4/tcp_probe.c 2010-08-13 16:24:37.000000000 -0400
55865+++ linux-2.6.32.23/net/ipv4/tcp_probe.c 2010-09-04 15:54:52.000000000 -0400 55902+++ linux-2.6.32.24/net/ipv4/tcp_probe.c 2010-09-04 15:54:52.000000000 -0400
55866@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file 55903@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
55867 if (cnt + width >= len) 55904 if (cnt + width >= len)
55868 break; 55905 break;
@@ -55872,9 +55909,9 @@ diff -urNp linux-2.6.32.23/net/ipv4/tcp_probe.c linux-2.6.32.23/net/ipv4/tcp_pro
55872 return -EFAULT; 55909 return -EFAULT;
55873 cnt += width; 55910 cnt += width;
55874 } 55911 }
55875diff -urNp linux-2.6.32.23/net/ipv4/tcp_timer.c linux-2.6.32.23/net/ipv4/tcp_timer.c 55912diff -urNp linux-2.6.32.24/net/ipv4/tcp_timer.c linux-2.6.32.24/net/ipv4/tcp_timer.c
55876--- linux-2.6.32.23/net/ipv4/tcp_timer.c 2010-09-26 17:26:06.000000000 -0400 55913--- linux-2.6.32.24/net/ipv4/tcp_timer.c 2010-09-26 17:26:06.000000000 -0400
55877+++ linux-2.6.32.23/net/ipv4/tcp_timer.c 2010-09-26 17:26:57.000000000 -0400 55914+++ linux-2.6.32.24/net/ipv4/tcp_timer.c 2010-09-26 17:26:57.000000000 -0400
55878@@ -21,6 +21,10 @@ 55915@@ -21,6 +21,10 @@
55879 #include <linux/module.h> 55916 #include <linux/module.h>
55880 #include <net/tcp.h> 55917 #include <net/tcp.h>
@@ -55900,9 +55937,9 @@ diff -urNp linux-2.6.32.23/net/ipv4/tcp_timer.c linux-2.6.32.23/net/ipv4/tcp_tim
55900 if (retransmits_timed_out(sk, retry_until)) { 55937 if (retransmits_timed_out(sk, retry_until)) {
55901 /* Has it gone just too far? */ 55938 /* Has it gone just too far? */
55902 tcp_write_err(sk); 55939 tcp_write_err(sk);
55903diff -urNp linux-2.6.32.23/net/ipv4/udp.c linux-2.6.32.23/net/ipv4/udp.c 55940diff -urNp linux-2.6.32.24/net/ipv4/udp.c linux-2.6.32.24/net/ipv4/udp.c
55904--- linux-2.6.32.23/net/ipv4/udp.c 2010-08-13 16:24:37.000000000 -0400 55941--- linux-2.6.32.24/net/ipv4/udp.c 2010-08-13 16:24:37.000000000 -0400
55905+++ linux-2.6.32.23/net/ipv4/udp.c 2010-09-14 21:43:22.000000000 -0400 55942+++ linux-2.6.32.24/net/ipv4/udp.c 2010-09-14 21:43:22.000000000 -0400
55906@@ -86,6 +86,7 @@ 55943@@ -86,6 +86,7 @@
55907 #include <linux/types.h> 55944 #include <linux/types.h>
55908 #include <linux/fcntl.h> 55945 #include <linux/fcntl.h>
@@ -55986,9 +56023,9 @@ diff -urNp linux-2.6.32.23/net/ipv4/udp.c linux-2.6.32.23/net/ipv4/udp.c
55986 atomic_read(&sp->sk_drops), len); 56023 atomic_read(&sp->sk_drops), len);
55987 } 56024 }
55988 56025
55989diff -urNp linux-2.6.32.23/net/ipv6/exthdrs.c linux-2.6.32.23/net/ipv6/exthdrs.c 56026diff -urNp linux-2.6.32.24/net/ipv6/exthdrs.c linux-2.6.32.24/net/ipv6/exthdrs.c
55990--- linux-2.6.32.23/net/ipv6/exthdrs.c 2010-08-13 16:24:37.000000000 -0400 56027--- linux-2.6.32.24/net/ipv6/exthdrs.c 2010-08-13 16:24:37.000000000 -0400
55991+++ linux-2.6.32.23/net/ipv6/exthdrs.c 2010-09-04 15:54:52.000000000 -0400 56028+++ linux-2.6.32.24/net/ipv6/exthdrs.c 2010-09-04 15:54:52.000000000 -0400
55992@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt 56029@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
55993 .type = IPV6_TLV_JUMBO, 56030 .type = IPV6_TLV_JUMBO,
55994 .func = ipv6_hop_jumbo, 56031 .func = ipv6_hop_jumbo,
@@ -55998,9 +56035,9 @@ diff -urNp linux-2.6.32.23/net/ipv6/exthdrs.c linux-2.6.32.23/net/ipv6/exthdrs.c
55998 }; 56035 };
55999 56036
56000 int ipv6_parse_hopopts(struct sk_buff *skb) 56037 int ipv6_parse_hopopts(struct sk_buff *skb)
56001diff -urNp linux-2.6.32.23/net/ipv6/raw.c linux-2.6.32.23/net/ipv6/raw.c 56038diff -urNp linux-2.6.32.24/net/ipv6/raw.c linux-2.6.32.24/net/ipv6/raw.c
56002--- linux-2.6.32.23/net/ipv6/raw.c 2010-08-13 16:24:37.000000000 -0400 56039--- linux-2.6.32.24/net/ipv6/raw.c 2010-08-13 16:24:37.000000000 -0400
56003+++ linux-2.6.32.23/net/ipv6/raw.c 2010-09-04 15:54:52.000000000 -0400 56040+++ linux-2.6.32.24/net/ipv6/raw.c 2010-09-04 15:54:52.000000000 -0400
56004@@ -600,7 +600,7 @@ out: 56041@@ -600,7 +600,7 @@ out:
56005 return err; 56042 return err;
56006 } 56043 }
@@ -56010,9 +56047,9 @@ diff -urNp linux-2.6.32.23/net/ipv6/raw.c linux-2.6.32.23/net/ipv6/raw.c
56010 struct flowi *fl, struct rt6_info *rt, 56047 struct flowi *fl, struct rt6_info *rt,
56011 unsigned int flags) 56048 unsigned int flags)
56012 { 56049 {
56013diff -urNp linux-2.6.32.23/net/ipv6/tcp_ipv6.c linux-2.6.32.23/net/ipv6/tcp_ipv6.c 56050diff -urNp linux-2.6.32.24/net/ipv6/tcp_ipv6.c linux-2.6.32.24/net/ipv6/tcp_ipv6.c
56014--- linux-2.6.32.23/net/ipv6/tcp_ipv6.c 2010-08-13 16:24:37.000000000 -0400 56051--- linux-2.6.32.24/net/ipv6/tcp_ipv6.c 2010-08-13 16:24:37.000000000 -0400
56015+++ linux-2.6.32.23/net/ipv6/tcp_ipv6.c 2010-09-04 15:54:52.000000000 -0400 56052+++ linux-2.6.32.24/net/ipv6/tcp_ipv6.c 2010-09-04 15:54:52.000000000 -0400
56016@@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5 56053@@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
56017 } 56054 }
56018 #endif 56055 #endif
@@ -56068,9 +56105,9 @@ diff -urNp linux-2.6.32.23/net/ipv6/tcp_ipv6.c linux-2.6.32.23/net/ipv6/tcp_ipv6
56068 tcp_v6_send_reset(NULL, skb); 56105 tcp_v6_send_reset(NULL, skb);
56069 } 56106 }
56070 56107
56071diff -urNp linux-2.6.32.23/net/ipv6/udp.c linux-2.6.32.23/net/ipv6/udp.c 56108diff -urNp linux-2.6.32.24/net/ipv6/udp.c linux-2.6.32.24/net/ipv6/udp.c
56072--- linux-2.6.32.23/net/ipv6/udp.c 2010-08-13 16:24:37.000000000 -0400 56109--- linux-2.6.32.24/net/ipv6/udp.c 2010-08-13 16:24:37.000000000 -0400
56073+++ linux-2.6.32.23/net/ipv6/udp.c 2010-09-04 15:54:52.000000000 -0400 56110+++ linux-2.6.32.24/net/ipv6/udp.c 2010-09-04 15:54:52.000000000 -0400
56074@@ -49,6 +49,10 @@ 56111@@ -49,6 +49,10 @@
56075 #include <linux/seq_file.h> 56112 #include <linux/seq_file.h>
56076 #include "udp_impl.h" 56113 #include "udp_impl.h"
@@ -56092,9 +56129,9 @@ diff -urNp linux-2.6.32.23/net/ipv6/udp.c linux-2.6.32.23/net/ipv6/udp.c
56092 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); 56129 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
56093 56130
56094 kfree_skb(skb); 56131 kfree_skb(skb);
56095diff -urNp linux-2.6.32.23/net/irda/ircomm/ircomm_tty.c linux-2.6.32.23/net/irda/ircomm/ircomm_tty.c 56132diff -urNp linux-2.6.32.24/net/irda/ircomm/ircomm_tty.c linux-2.6.32.24/net/irda/ircomm/ircomm_tty.c
56096--- linux-2.6.32.23/net/irda/ircomm/ircomm_tty.c 2010-08-13 16:24:37.000000000 -0400 56133--- linux-2.6.32.24/net/irda/ircomm/ircomm_tty.c 2010-08-13 16:24:37.000000000 -0400
56097+++ linux-2.6.32.23/net/irda/ircomm/ircomm_tty.c 2010-09-04 15:54:52.000000000 -0400 56134+++ linux-2.6.32.24/net/irda/ircomm/ircomm_tty.c 2010-09-04 15:54:52.000000000 -0400
56098@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st 56135@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
56099 add_wait_queue(&self->open_wait, &wait); 56136 add_wait_queue(&self->open_wait, &wait);
56100 56137
@@ -56217,9 +56254,9 @@ diff -urNp linux-2.6.32.23/net/irda/ircomm/ircomm_tty.c linux-2.6.32.23/net/irda
56217 seq_printf(m, "Max data size: %d\n", self->max_data_size); 56254 seq_printf(m, "Max data size: %d\n", self->max_data_size);
56218 seq_printf(m, "Max header size: %d\n", self->max_header_size); 56255 seq_printf(m, "Max header size: %d\n", self->max_header_size);
56219 56256
56220diff -urNp linux-2.6.32.23/net/key/af_key.c linux-2.6.32.23/net/key/af_key.c 56257diff -urNp linux-2.6.32.24/net/key/af_key.c linux-2.6.32.24/net/key/af_key.c
56221--- linux-2.6.32.23/net/key/af_key.c 2010-08-13 16:24:37.000000000 -0400 56258--- linux-2.6.32.24/net/key/af_key.c 2010-08-13 16:24:37.000000000 -0400
56222+++ linux-2.6.32.23/net/key/af_key.c 2010-09-14 21:25:29.000000000 -0400 56259+++ linux-2.6.32.24/net/key/af_key.c 2010-09-14 21:25:29.000000000 -0400
56223@@ -3660,7 +3660,11 @@ static int pfkey_seq_show(struct seq_fil 56260@@ -3660,7 +3660,11 @@ static int pfkey_seq_show(struct seq_fil
56224 seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n"); 56261 seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
56225 else 56262 else
@@ -56232,9 +56269,9 @@ diff -urNp linux-2.6.32.23/net/key/af_key.c linux-2.6.32.23/net/key/af_key.c
56232 atomic_read(&s->sk_refcnt), 56269 atomic_read(&s->sk_refcnt),
56233 sk_rmem_alloc_get(s), 56270 sk_rmem_alloc_get(s),
56234 sk_wmem_alloc_get(s), 56271 sk_wmem_alloc_get(s),
56235diff -urNp linux-2.6.32.23/net/mac80211/ieee80211_i.h linux-2.6.32.23/net/mac80211/ieee80211_i.h 56272diff -urNp linux-2.6.32.24/net/mac80211/ieee80211_i.h linux-2.6.32.24/net/mac80211/ieee80211_i.h
56236--- linux-2.6.32.23/net/mac80211/ieee80211_i.h 2010-08-13 16:24:37.000000000 -0400 56273--- linux-2.6.32.24/net/mac80211/ieee80211_i.h 2010-08-13 16:24:37.000000000 -0400
56237+++ linux-2.6.32.23/net/mac80211/ieee80211_i.h 2010-09-04 15:54:52.000000000 -0400 56274+++ linux-2.6.32.24/net/mac80211/ieee80211_i.h 2010-09-04 15:54:52.000000000 -0400
56238@@ -635,7 +635,7 @@ struct ieee80211_local { 56275@@ -635,7 +635,7 @@ struct ieee80211_local {
56239 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ 56276 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
56240 spinlock_t queue_stop_reason_lock; 56277 spinlock_t queue_stop_reason_lock;
@@ -56244,9 +56281,9 @@ diff -urNp linux-2.6.32.23/net/mac80211/ieee80211_i.h linux-2.6.32.23/net/mac802
56244 int monitors, cooked_mntrs; 56281 int monitors, cooked_mntrs;
56245 /* number of interfaces with corresponding FIF_ flags */ 56282 /* number of interfaces with corresponding FIF_ flags */
56246 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; 56283 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
56247diff -urNp linux-2.6.32.23/net/mac80211/iface.c linux-2.6.32.23/net/mac80211/iface.c 56284diff -urNp linux-2.6.32.24/net/mac80211/iface.c linux-2.6.32.24/net/mac80211/iface.c
56248--- linux-2.6.32.23/net/mac80211/iface.c 2010-08-13 16:24:37.000000000 -0400 56285--- linux-2.6.32.24/net/mac80211/iface.c 2010-08-13 16:24:37.000000000 -0400
56249+++ linux-2.6.32.23/net/mac80211/iface.c 2010-09-04 15:54:52.000000000 -0400 56286+++ linux-2.6.32.24/net/mac80211/iface.c 2010-09-04 15:54:52.000000000 -0400
56250@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev 56287@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
56251 break; 56288 break;
56252 } 56289 }
@@ -56301,9 +56338,9 @@ diff -urNp linux-2.6.32.23/net/mac80211/iface.c linux-2.6.32.23/net/mac80211/ifa
56301 ieee80211_clear_tx_pending(local); 56338 ieee80211_clear_tx_pending(local);
56302 ieee80211_stop_device(local); 56339 ieee80211_stop_device(local);
56303 56340
56304diff -urNp linux-2.6.32.23/net/mac80211/main.c linux-2.6.32.23/net/mac80211/main.c 56341diff -urNp linux-2.6.32.24/net/mac80211/main.c linux-2.6.32.24/net/mac80211/main.c
56305--- linux-2.6.32.23/net/mac80211/main.c 2010-08-13 16:24:37.000000000 -0400 56342--- linux-2.6.32.24/net/mac80211/main.c 2010-08-13 16:24:37.000000000 -0400
56306+++ linux-2.6.32.23/net/mac80211/main.c 2010-09-04 15:54:52.000000000 -0400 56343+++ linux-2.6.32.24/net/mac80211/main.c 2010-09-04 15:54:52.000000000 -0400
56307@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 56344@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
56308 local->hw.conf.power_level = power; 56345 local->hw.conf.power_level = power;
56309 } 56346 }
@@ -56313,9 +56350,9 @@ diff -urNp linux-2.6.32.23/net/mac80211/main.c linux-2.6.32.23/net/mac80211/main
56313 ret = drv_config(local, changed); 56350 ret = drv_config(local, changed);
56314 /* 56351 /*
56315 * Goal: 56352 * Goal:
56316diff -urNp linux-2.6.32.23/net/mac80211/pm.c linux-2.6.32.23/net/mac80211/pm.c 56353diff -urNp linux-2.6.32.24/net/mac80211/pm.c linux-2.6.32.24/net/mac80211/pm.c
56317--- linux-2.6.32.23/net/mac80211/pm.c 2010-08-13 16:24:37.000000000 -0400 56354--- linux-2.6.32.24/net/mac80211/pm.c 2010-08-13 16:24:37.000000000 -0400
56318+++ linux-2.6.32.23/net/mac80211/pm.c 2010-09-04 15:54:52.000000000 -0400 56355+++ linux-2.6.32.24/net/mac80211/pm.c 2010-09-04 15:54:52.000000000 -0400
56319@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 56356@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
56320 } 56357 }
56321 56358
@@ -56325,9 +56362,9 @@ diff -urNp linux-2.6.32.23/net/mac80211/pm.c linux-2.6.32.23/net/mac80211/pm.c
56325 ieee80211_stop_device(local); 56362 ieee80211_stop_device(local);
56326 56363
56327 local->suspended = true; 56364 local->suspended = true;
56328diff -urNp linux-2.6.32.23/net/mac80211/rate.c linux-2.6.32.23/net/mac80211/rate.c 56365diff -urNp linux-2.6.32.24/net/mac80211/rate.c linux-2.6.32.24/net/mac80211/rate.c
56329--- linux-2.6.32.23/net/mac80211/rate.c 2010-08-13 16:24:37.000000000 -0400 56366--- linux-2.6.32.24/net/mac80211/rate.c 2010-08-13 16:24:37.000000000 -0400
56330+++ linux-2.6.32.23/net/mac80211/rate.c 2010-09-04 15:54:52.000000000 -0400 56367+++ linux-2.6.32.24/net/mac80211/rate.c 2010-09-04 15:54:52.000000000 -0400
56331@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct 56368@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
56332 struct rate_control_ref *ref, *old; 56369 struct rate_control_ref *ref, *old;
56333 56370
@@ -56337,9 +56374,9 @@ diff -urNp linux-2.6.32.23/net/mac80211/rate.c linux-2.6.32.23/net/mac80211/rate
56337 return -EBUSY; 56374 return -EBUSY;
56338 56375
56339 ref = rate_control_alloc(name, local); 56376 ref = rate_control_alloc(name, local);
56340diff -urNp linux-2.6.32.23/net/mac80211/tx.c linux-2.6.32.23/net/mac80211/tx.c 56377diff -urNp linux-2.6.32.24/net/mac80211/tx.c linux-2.6.32.24/net/mac80211/tx.c
56341--- linux-2.6.32.23/net/mac80211/tx.c 2010-08-13 16:24:37.000000000 -0400 56378--- linux-2.6.32.24/net/mac80211/tx.c 2010-08-13 16:24:37.000000000 -0400
56342+++ linux-2.6.32.23/net/mac80211/tx.c 2010-09-04 15:54:52.000000000 -0400 56379+++ linux-2.6.32.24/net/mac80211/tx.c 2010-09-04 15:54:52.000000000 -0400
56343@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct 56380@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
56344 return cpu_to_le16(dur); 56381 return cpu_to_le16(dur);
56345 } 56382 }
@@ -56349,10 +56386,10 @@ diff -urNp linux-2.6.32.23/net/mac80211/tx.c linux-2.6.32.23/net/mac80211/tx.c
56349 struct net_device *dev) 56386 struct net_device *dev)
56350 { 56387 {
56351 return local == wdev_priv(dev->ieee80211_ptr); 56388 return local == wdev_priv(dev->ieee80211_ptr);
56352diff -urNp linux-2.6.32.23/net/mac80211/util.c linux-2.6.32.23/net/mac80211/util.c 56389diff -urNp linux-2.6.32.24/net/mac80211/util.c linux-2.6.32.24/net/mac80211/util.c
56353--- linux-2.6.32.23/net/mac80211/util.c 2010-08-13 16:24:37.000000000 -0400 56390--- linux-2.6.32.24/net/mac80211/util.c 2010-08-13 16:24:37.000000000 -0400
56354+++ linux-2.6.32.23/net/mac80211/util.c 2010-09-04 15:54:52.000000000 -0400 56391+++ linux-2.6.32.24/net/mac80211/util.c 2010-09-28 18:23:33.000000000 -0400
56355@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ 56392@@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_
56356 local->resuming = true; 56393 local->resuming = true;
56357 56394
56358 /* restart hardware */ 56395 /* restart hardware */
@@ -56361,17 +56398,95 @@ diff -urNp linux-2.6.32.23/net/mac80211/util.c linux-2.6.32.23/net/mac80211/util
56361 /* 56398 /*
56362 * Upon resume hardware can sometimes be goofy due to 56399 * Upon resume hardware can sometimes be goofy due to
56363 * various platform / driver / bus issues, so restarting 56400 * various platform / driver / bus issues, so restarting
56364 * the device may at times not work immediately. Propagate 56401diff -urNp linux-2.6.32.24/net/netfilter/Kconfig linux-2.6.32.24/net/netfilter/Kconfig
56365 * the error. 56402--- linux-2.6.32.24/net/netfilter/Kconfig 2010-08-13 16:24:37.000000000 -0400
56366 */ 56403+++ linux-2.6.32.24/net/netfilter/Kconfig 2010-09-28 18:10:16.000000000 -0400
56367- res = drv_start(local); 56404@@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP
56368+ res = drv_start(local); 56405
56369 if (res) { 56406 To compile it as a module, choose M here. If unsure, say N.
56370 WARN(local->suspended, "Harware became unavailable " 56407
56371 "upon resume. This is could be a software issue" 56408+config NETFILTER_XT_MATCH_GRADM
56372diff -urNp linux-2.6.32.23/net/netlink/af_netlink.c linux-2.6.32.23/net/netlink/af_netlink.c 56409+ tristate '"gradm" match support'
56373--- linux-2.6.32.23/net/netlink/af_netlink.c 2010-08-29 21:08:20.000000000 -0400 56410+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
56374+++ linux-2.6.32.23/net/netlink/af_netlink.c 2010-09-15 02:14:48.000000000 -0400 56411+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
56412+ ---help---
56413+ The gradm match allows to match on grsecurity RBAC being enabled.
56414+ It is useful when iptables rules are applied early on bootup to
56415+ prevent connections to the machine (except from a trusted host)
56416+ while the RBAC system is disabled.
56417+
56418 config NETFILTER_XT_MATCH_HASHLIMIT
56419 tristate '"hashlimit" match support'
56420 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
56421diff -urNp linux-2.6.32.24/net/netfilter/Makefile linux-2.6.32.24/net/netfilter/Makefile
56422--- linux-2.6.32.24/net/netfilter/Makefile 2010-08-13 16:24:37.000000000 -0400
56423+++ linux-2.6.32.24/net/netfilter/Makefile 2010-09-28 18:01:53.000000000 -0400
56424@@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRAC
56425 obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
56426 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
56427 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
56428+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
56429 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
56430 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
56431 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
56432diff -urNp linux-2.6.32.24/net/netfilter/xt_gradm.c linux-2.6.32.24/net/netfilter/xt_gradm.c
56433--- linux-2.6.32.24/net/netfilter/xt_gradm.c 1969-12-31 19:00:00.000000000 -0500
56434+++ linux-2.6.32.24/net/netfilter/xt_gradm.c 2010-09-28 18:01:53.000000000 -0400
56435@@ -0,0 +1,51 @@
56436+/*
56437+ * gradm match for netfilter
56438+ * Copyright © Zbigniew Krzystolik, 2010
56439+ *
56440+ * This program is free software; you can redistribute it and/or modify
56441+ * it under the terms of the GNU General Public License; either version
56442+ * 2 or 3 as published by the Free Software Foundation.
56443+ */
56444+#include <linux/module.h>
56445+#include <linux/moduleparam.h>
56446+#include <linux/skbuff.h>
56447+#include <linux/netfilter/x_tables.h>
56448+#include <linux/grsecurity.h>
56449+#include <linux/netfilter/xt_gradm.h>
56450+
56451+static bool
56452+gradm_mt(const struct sk_buff *skb, const struct xt_match_param *par)
56453+{
56454+ const struct xt_gradm_mtinfo *info = par->matchinfo;
56455+ bool retval = false;
56456+ if (gr_acl_is_enabled())
56457+ retval = true;
56458+ return retval ^ info->invflags;
56459+}
56460+
56461+static struct xt_match gradm_mt_reg __read_mostly = {
56462+ .name = "gradm",
56463+ .revision = 0,
56464+ .family = NFPROTO_UNSPEC,
56465+ .match = gradm_mt,
56466+ .matchsize = XT_ALIGN(sizeof(struct xt_gradm_mtinfo)),
56467+ .me = THIS_MODULE,
56468+};
56469+
56470+static int __init gradm_mt_init(void)
56471+{
56472+ return xt_register_match(&gradm_mt_reg);
56473+}
56474+
56475+static void __exit gradm_mt_exit(void)
56476+{
56477+ xt_unregister_match(&gradm_mt_reg);
56478+}
56479+
56480+module_init(gradm_mt_init);
56481+module_exit(gradm_mt_exit);
56482+MODULE_AUTHOR("Zbigniew Krzystolik <zbyniu@destrukcja.pl>");
56483+MODULE_DESCRIPTION("Xtables: Grsecurity RBAC match");
56484+MODULE_LICENSE("GPL");
56485+MODULE_ALIAS("ipt_gradm");
56486+MODULE_ALIAS("ip6t_gradm");
56487diff -urNp linux-2.6.32.24/net/netlink/af_netlink.c linux-2.6.32.24/net/netlink/af_netlink.c
56488--- linux-2.6.32.24/net/netlink/af_netlink.c 2010-08-29 21:08:20.000000000 -0400
56489+++ linux-2.6.32.24/net/netlink/af_netlink.c 2010-09-15 02:14:48.000000000 -0400
56375@@ -1964,13 +1964,21 @@ static int netlink_seq_show(struct seq_f 56490@@ -1964,13 +1964,21 @@ static int netlink_seq_show(struct seq_f
56376 struct netlink_sock *nlk = nlk_sk(s); 56491 struct netlink_sock *nlk = nlk_sk(s);
56377 56492
@@ -56394,9 +56509,9 @@ diff -urNp linux-2.6.32.23/net/netlink/af_netlink.c linux-2.6.32.23/net/netlink/
56394 atomic_read(&s->sk_refcnt), 56509 atomic_read(&s->sk_refcnt),
56395 atomic_read(&s->sk_drops) 56510 atomic_read(&s->sk_drops)
56396 ); 56511 );
56397diff -urNp linux-2.6.32.23/net/packet/af_packet.c linux-2.6.32.23/net/packet/af_packet.c 56512diff -urNp linux-2.6.32.24/net/packet/af_packet.c linux-2.6.32.24/net/packet/af_packet.c
56398--- linux-2.6.32.23/net/packet/af_packet.c 2010-08-13 16:24:37.000000000 -0400 56513--- linux-2.6.32.24/net/packet/af_packet.c 2010-08-13 16:24:37.000000000 -0400
56399+++ linux-2.6.32.23/net/packet/af_packet.c 2010-09-14 21:26:39.000000000 -0400 56514+++ linux-2.6.32.24/net/packet/af_packet.c 2010-09-14 21:26:39.000000000 -0400
56400@@ -2426,7 +2426,11 @@ static int packet_seq_show(struct seq_fi 56515@@ -2426,7 +2426,11 @@ static int packet_seq_show(struct seq_fi
56401 56516
56402 seq_printf(seq, 56517 seq_printf(seq,
@@ -56409,9 +56524,9 @@ diff -urNp linux-2.6.32.23/net/packet/af_packet.c linux-2.6.32.23/net/packet/af_
56409 atomic_read(&s->sk_refcnt), 56524 atomic_read(&s->sk_refcnt),
56410 s->sk_type, 56525 s->sk_type,
56411 ntohs(po->num), 56526 ntohs(po->num),
56412diff -urNp linux-2.6.32.23/net/rose/af_rose.c linux-2.6.32.23/net/rose/af_rose.c 56527diff -urNp linux-2.6.32.24/net/rose/af_rose.c linux-2.6.32.24/net/rose/af_rose.c
56413--- linux-2.6.32.23/net/rose/af_rose.c 2010-08-13 16:24:37.000000000 -0400 56528--- linux-2.6.32.24/net/rose/af_rose.c 2010-08-13 16:24:37.000000000 -0400
56414+++ linux-2.6.32.23/net/rose/af_rose.c 2010-09-20 17:17:15.000000000 -0400 56529+++ linux-2.6.32.24/net/rose/af_rose.c 2010-09-20 17:17:15.000000000 -0400
56415@@ -677,7 +677,7 @@ static int rose_bind(struct socket *sock 56530@@ -677,7 +677,7 @@ static int rose_bind(struct socket *sock
56416 if (addr_len == sizeof(struct sockaddr_rose) && addr->srose_ndigis > 1) 56531 if (addr_len == sizeof(struct sockaddr_rose) && addr->srose_ndigis > 1)
56417 return -EINVAL; 56532 return -EINVAL;
@@ -56430,9 +56545,35 @@ diff -urNp linux-2.6.32.23/net/rose/af_rose.c linux-2.6.32.23/net/rose/af_rose.c
56430 return -EINVAL; 56545 return -EINVAL;
56431 56546
56432 /* Source + Destination digis should not exceed ROSE_MAX_DIGIS */ 56547 /* Source + Destination digis should not exceed ROSE_MAX_DIGIS */
56433diff -urNp linux-2.6.32.23/net/sctp/socket.c linux-2.6.32.23/net/sctp/socket.c 56548diff -urNp linux-2.6.32.24/net/sctp/auth.c linux-2.6.32.24/net/sctp/auth.c
56434--- linux-2.6.32.23/net/sctp/socket.c 2010-08-13 16:24:37.000000000 -0400 56549--- linux-2.6.32.24/net/sctp/auth.c 2010-08-13 16:24:37.000000000 -0400
56435+++ linux-2.6.32.23/net/sctp/socket.c 2010-09-04 15:54:52.000000000 -0400 56550+++ linux-2.6.32.24/net/sctp/auth.c 2010-09-28 18:26:47.000000000 -0400
56551@@ -542,16 +542,20 @@ struct sctp_hmac *sctp_auth_asoc_get_hma
56552 id = ntohs(hmacs->hmac_ids[i]);
56553
56554 /* Check the id is in the supported range */
56555- if (id > SCTP_AUTH_HMAC_ID_MAX)
56556+ if (id > SCTP_AUTH_HMAC_ID_MAX) {
56557+ id = 0;
56558 continue;
56559+ }
56560
56561 /* See is we support the id. Supported IDs have name and
56562 * length fields set, so that we can allocated and use
56563 * them. We can safely just check for name, for without the
56564 * name, we can't allocate the TFM.
56565 */
56566- if (!sctp_hmac_list[id].hmac_name)
56567+ if (!sctp_hmac_list[id].hmac_name) {
56568+ id = 0;
56569 continue;
56570+ }
56571
56572 break;
56573 }
56574diff -urNp linux-2.6.32.24/net/sctp/socket.c linux-2.6.32.24/net/sctp/socket.c
56575--- linux-2.6.32.24/net/sctp/socket.c 2010-08-13 16:24:37.000000000 -0400
56576+++ linux-2.6.32.24/net/sctp/socket.c 2010-09-04 15:54:52.000000000 -0400
56436@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc 56577@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
56437 struct sctp_sndrcvinfo *sinfo; 56578 struct sctp_sndrcvinfo *sinfo;
56438 struct sctp_initmsg *sinit; 56579 struct sctp_initmsg *sinit;
@@ -56450,9 +56591,9 @@ diff -urNp linux-2.6.32.23/net/sctp/socket.c linux-2.6.32.23/net/sctp/socket.c
56450 56591
56451 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); 56592 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
56452 if (pp->fastreuse && sk->sk_reuse && 56593 if (pp->fastreuse && sk->sk_reuse &&
56453diff -urNp linux-2.6.32.23/net/socket.c linux-2.6.32.23/net/socket.c 56594diff -urNp linux-2.6.32.24/net/socket.c linux-2.6.32.24/net/socket.c
56454--- linux-2.6.32.23/net/socket.c 2010-08-13 16:24:37.000000000 -0400 56595--- linux-2.6.32.24/net/socket.c 2010-08-13 16:24:37.000000000 -0400
56455+++ linux-2.6.32.23/net/socket.c 2010-09-04 15:54:52.000000000 -0400 56596+++ linux-2.6.32.24/net/socket.c 2010-09-04 15:54:52.000000000 -0400
56456@@ -87,6 +87,7 @@ 56597@@ -87,6 +87,7 @@
56457 #include <linux/wireless.h> 56598 #include <linux/wireless.h>
56458 #include <linux/nsproxy.h> 56599 #include <linux/nsproxy.h>
@@ -56607,9 +56748,9 @@ diff -urNp linux-2.6.32.23/net/socket.c linux-2.6.32.23/net/socket.c
56607 err = 56748 err =
56608 security_socket_connect(sock, (struct sockaddr *)&address, addrlen); 56749 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
56609 if (err) 56750 if (err)
56610diff -urNp linux-2.6.32.23/net/sunrpc/sched.c linux-2.6.32.23/net/sunrpc/sched.c 56751diff -urNp linux-2.6.32.24/net/sunrpc/sched.c linux-2.6.32.24/net/sunrpc/sched.c
56611--- linux-2.6.32.23/net/sunrpc/sched.c 2010-08-13 16:24:37.000000000 -0400 56752--- linux-2.6.32.24/net/sunrpc/sched.c 2010-08-13 16:24:37.000000000 -0400
56612+++ linux-2.6.32.23/net/sunrpc/sched.c 2010-09-04 15:54:52.000000000 -0400 56753+++ linux-2.6.32.24/net/sunrpc/sched.c 2010-09-04 15:54:52.000000000 -0400
56613@@ -234,10 +234,10 @@ static int rpc_wait_bit_killable(void *w 56754@@ -234,10 +234,10 @@ static int rpc_wait_bit_killable(void *w
56614 #ifdef RPC_DEBUG 56755 #ifdef RPC_DEBUG
56615 static void rpc_task_set_debuginfo(struct rpc_task *task) 56756 static void rpc_task_set_debuginfo(struct rpc_task *task)
@@ -56623,9 +56764,9 @@ diff -urNp linux-2.6.32.23/net/sunrpc/sched.c linux-2.6.32.23/net/sunrpc/sched.c
56623 } 56764 }
56624 #else 56765 #else
56625 static inline void rpc_task_set_debuginfo(struct rpc_task *task) 56766 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
56626diff -urNp linux-2.6.32.23/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.23/net/sunrpc/xprtrdma/svc_rdma.c 56767diff -urNp linux-2.6.32.24/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.24/net/sunrpc/xprtrdma/svc_rdma.c
56627--- linux-2.6.32.23/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-13 16:24:37.000000000 -0400 56768--- linux-2.6.32.24/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-13 16:24:37.000000000 -0400
56628+++ linux-2.6.32.23/net/sunrpc/xprtrdma/svc_rdma.c 2010-09-04 15:54:52.000000000 -0400 56769+++ linux-2.6.32.24/net/sunrpc/xprtrdma/svc_rdma.c 2010-09-04 15:54:52.000000000 -0400
56629@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta 56770@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
56630 len -= *ppos; 56771 len -= *ppos;
56631 if (len > *lenp) 56772 if (len > *lenp)
@@ -56635,9 +56776,9 @@ diff -urNp linux-2.6.32.23/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.23/net/su
56635 return -EFAULT; 56776 return -EFAULT;
56636 *lenp = len; 56777 *lenp = len;
56637 *ppos += len; 56778 *ppos += len;
56638diff -urNp linux-2.6.32.23/net/sysctl_net.c linux-2.6.32.23/net/sysctl_net.c 56779diff -urNp linux-2.6.32.24/net/sysctl_net.c linux-2.6.32.24/net/sysctl_net.c
56639--- linux-2.6.32.23/net/sysctl_net.c 2010-08-13 16:24:37.000000000 -0400 56780--- linux-2.6.32.24/net/sysctl_net.c 2010-08-13 16:24:37.000000000 -0400
56640+++ linux-2.6.32.23/net/sysctl_net.c 2010-09-04 15:54:52.000000000 -0400 56781+++ linux-2.6.32.24/net/sysctl_net.c 2010-09-04 15:54:52.000000000 -0400
56641@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct 56782@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
56642 struct ctl_table *table) 56783 struct ctl_table *table)
56643 { 56784 {
@@ -56647,9 +56788,9 @@ diff -urNp linux-2.6.32.23/net/sysctl_net.c linux-2.6.32.23/net/sysctl_net.c
56647 int mode = (table->mode >> 6) & 7; 56788 int mode = (table->mode >> 6) & 7;
56648 return (mode << 6) | (mode << 3) | mode; 56789 return (mode << 6) | (mode << 3) | mode;
56649 } 56790 }
56650diff -urNp linux-2.6.32.23/net/tipc/socket.c linux-2.6.32.23/net/tipc/socket.c 56791diff -urNp linux-2.6.32.24/net/tipc/socket.c linux-2.6.32.24/net/tipc/socket.c
56651--- linux-2.6.32.23/net/tipc/socket.c 2010-08-13 16:24:37.000000000 -0400 56792--- linux-2.6.32.24/net/tipc/socket.c 2010-08-13 16:24:37.000000000 -0400
56652+++ linux-2.6.32.23/net/tipc/socket.c 2010-09-04 15:54:52.000000000 -0400 56793+++ linux-2.6.32.24/net/tipc/socket.c 2010-09-04 15:54:52.000000000 -0400
56653@@ -1449,8 +1449,9 @@ static int connect(struct socket *sock, 56794@@ -1449,8 +1449,9 @@ static int connect(struct socket *sock,
56654 } else { 56795 } else {
56655 if (res == 0) 56796 if (res == 0)
@@ -56662,9 +56803,9 @@ diff -urNp linux-2.6.32.23/net/tipc/socket.c linux-2.6.32.23/net/tipc/socket.c
56662 sock->state = SS_DISCONNECTING; 56803 sock->state = SS_DISCONNECTING;
56663 } 56804 }
56664 56805
56665diff -urNp linux-2.6.32.23/net/unix/af_unix.c linux-2.6.32.23/net/unix/af_unix.c 56806diff -urNp linux-2.6.32.24/net/unix/af_unix.c linux-2.6.32.24/net/unix/af_unix.c
56666--- linux-2.6.32.23/net/unix/af_unix.c 2010-09-26 17:26:06.000000000 -0400 56807--- linux-2.6.32.24/net/unix/af_unix.c 2010-09-26 17:26:06.000000000 -0400
56667+++ linux-2.6.32.23/net/unix/af_unix.c 2010-09-26 17:27:02.000000000 -0400 56808+++ linux-2.6.32.24/net/unix/af_unix.c 2010-09-26 17:27:02.000000000 -0400
56668@@ -743,6 +743,12 @@ static struct sock *unix_find_other(stru 56809@@ -743,6 +743,12 @@ static struct sock *unix_find_other(stru
56669 err = -ECONNREFUSED; 56810 err = -ECONNREFUSED;
56670 if (!S_ISSOCK(inode->i_mode)) 56811 if (!S_ISSOCK(inode->i_mode))
@@ -56734,9 +56875,9 @@ diff -urNp linux-2.6.32.23/net/unix/af_unix.c linux-2.6.32.23/net/unix/af_unix.c
56734 atomic_read(&s->sk_refcnt), 56875 atomic_read(&s->sk_refcnt),
56735 0, 56876 0,
56736 s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0, 56877 s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
56737diff -urNp linux-2.6.32.23/net/wireless/wext.c linux-2.6.32.23/net/wireless/wext.c 56878diff -urNp linux-2.6.32.24/net/wireless/wext.c linux-2.6.32.24/net/wireless/wext.c
56738--- linux-2.6.32.23/net/wireless/wext.c 2010-09-20 17:26:42.000000000 -0400 56879--- linux-2.6.32.24/net/wireless/wext.c 2010-09-20 17:26:42.000000000 -0400
56739+++ linux-2.6.32.23/net/wireless/wext.c 2010-09-23 19:57:05.000000000 -0400 56880+++ linux-2.6.32.24/net/wireless/wext.c 2010-09-23 19:57:05.000000000 -0400
56740@@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc 56881@@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc
56741 */ 56882 */
56742 56883
@@ -56770,9 +56911,9 @@ diff -urNp linux-2.6.32.23/net/wireless/wext.c linux-2.6.32.23/net/wireless/wext
56770 err = handler(dev, info, (union iwreq_data *) iwp, extra); 56911 err = handler(dev, info, (union iwreq_data *) iwp, extra);
56771 56912
56772 iwp->length += essid_compat; 56913 iwp->length += essid_compat;
56773diff -urNp linux-2.6.32.23/net/xfrm/xfrm_policy.c linux-2.6.32.23/net/xfrm/xfrm_policy.c 56914diff -urNp linux-2.6.32.24/net/xfrm/xfrm_policy.c linux-2.6.32.24/net/xfrm/xfrm_policy.c
56774--- linux-2.6.32.23/net/xfrm/xfrm_policy.c 2010-08-13 16:24:37.000000000 -0400 56915--- linux-2.6.32.24/net/xfrm/xfrm_policy.c 2010-08-13 16:24:37.000000000 -0400
56775+++ linux-2.6.32.23/net/xfrm/xfrm_policy.c 2010-09-04 15:54:52.000000000 -0400 56916+++ linux-2.6.32.24/net/xfrm/xfrm_policy.c 2010-09-04 15:54:52.000000000 -0400
56776@@ -1477,7 +1477,7 @@ free_dst: 56917@@ -1477,7 +1477,7 @@ free_dst:
56777 goto out; 56918 goto out;
56778 } 56919 }
@@ -56800,9 +56941,9 @@ diff -urNp linux-2.6.32.23/net/xfrm/xfrm_policy.c linux-2.6.32.23/net/xfrm/xfrm_
56800 xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl) 56941 xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
56801 { 56942 {
56802 #ifdef CONFIG_XFRM_SUB_POLICY 56943 #ifdef CONFIG_XFRM_SUB_POLICY
56803diff -urNp linux-2.6.32.23/samples/kobject/kset-example.c linux-2.6.32.23/samples/kobject/kset-example.c 56944diff -urNp linux-2.6.32.24/samples/kobject/kset-example.c linux-2.6.32.24/samples/kobject/kset-example.c
56804--- linux-2.6.32.23/samples/kobject/kset-example.c 2010-08-13 16:24:37.000000000 -0400 56945--- linux-2.6.32.24/samples/kobject/kset-example.c 2010-08-13 16:24:37.000000000 -0400
56805+++ linux-2.6.32.23/samples/kobject/kset-example.c 2010-09-04 15:54:52.000000000 -0400 56946+++ linux-2.6.32.24/samples/kobject/kset-example.c 2010-09-04 15:54:52.000000000 -0400
56806@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob 56947@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
56807 } 56948 }
56808 56949
@@ -56812,9 +56953,9 @@ diff -urNp linux-2.6.32.23/samples/kobject/kset-example.c linux-2.6.32.23/sample
56812 .show = foo_attr_show, 56953 .show = foo_attr_show,
56813 .store = foo_attr_store, 56954 .store = foo_attr_store,
56814 }; 56955 };
56815diff -urNp linux-2.6.32.23/scripts/basic/fixdep.c linux-2.6.32.23/scripts/basic/fixdep.c 56956diff -urNp linux-2.6.32.24/scripts/basic/fixdep.c linux-2.6.32.24/scripts/basic/fixdep.c
56816--- linux-2.6.32.23/scripts/basic/fixdep.c 2010-08-13 16:24:37.000000000 -0400 56957--- linux-2.6.32.24/scripts/basic/fixdep.c 2010-08-13 16:24:37.000000000 -0400
56817+++ linux-2.6.32.23/scripts/basic/fixdep.c 2010-09-04 15:54:52.000000000 -0400 56958+++ linux-2.6.32.24/scripts/basic/fixdep.c 2010-09-04 15:54:52.000000000 -0400
56818@@ -222,9 +222,9 @@ static void use_config(char *m, int slen 56959@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
56819 56960
56820 static void parse_config_file(char *map, size_t len) 56961 static void parse_config_file(char *map, size_t len)
@@ -56836,9 +56977,9 @@ diff -urNp linux-2.6.32.23/scripts/basic/fixdep.c linux-2.6.32.23/scripts/basic/
56836 56977
56837 if (*p != INT_CONF) { 56978 if (*p != INT_CONF) {
56838 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", 56979 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
56839diff -urNp linux-2.6.32.23/scripts/kallsyms.c linux-2.6.32.23/scripts/kallsyms.c 56980diff -urNp linux-2.6.32.24/scripts/kallsyms.c linux-2.6.32.24/scripts/kallsyms.c
56840--- linux-2.6.32.23/scripts/kallsyms.c 2010-08-13 16:24:37.000000000 -0400 56981--- linux-2.6.32.24/scripts/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
56841+++ linux-2.6.32.23/scripts/kallsyms.c 2010-09-04 15:54:52.000000000 -0400 56982+++ linux-2.6.32.24/scripts/kallsyms.c 2010-09-04 15:54:52.000000000 -0400
56842@@ -43,10 +43,10 @@ struct text_range { 56983@@ -43,10 +43,10 @@ struct text_range {
56843 56984
56844 static unsigned long long _text; 56985 static unsigned long long _text;
@@ -56854,9 +56995,9 @@ diff -urNp linux-2.6.32.23/scripts/kallsyms.c linux-2.6.32.23/scripts/kallsyms.c
56854 }; 56995 };
56855 #define text_range_text (&text_ranges[0]) 56996 #define text_range_text (&text_ranges[0])
56856 #define text_range_inittext (&text_ranges[1]) 56997 #define text_range_inittext (&text_ranges[1])
56857diff -urNp linux-2.6.32.23/scripts/mod/file2alias.c linux-2.6.32.23/scripts/mod/file2alias.c 56998diff -urNp linux-2.6.32.24/scripts/mod/file2alias.c linux-2.6.32.24/scripts/mod/file2alias.c
56858--- linux-2.6.32.23/scripts/mod/file2alias.c 2010-08-13 16:24:37.000000000 -0400 56999--- linux-2.6.32.24/scripts/mod/file2alias.c 2010-08-13 16:24:37.000000000 -0400
56859+++ linux-2.6.32.23/scripts/mod/file2alias.c 2010-09-04 15:54:52.000000000 -0400 57000+++ linux-2.6.32.24/scripts/mod/file2alias.c 2010-09-04 15:54:52.000000000 -0400
56860@@ -72,7 +72,7 @@ static void device_id_check(const char * 57001@@ -72,7 +72,7 @@ static void device_id_check(const char *
56861 unsigned long size, unsigned long id_size, 57002 unsigned long size, unsigned long id_size,
56862 void *symval) 57003 void *symval)
@@ -56911,9 +57052,9 @@ diff -urNp linux-2.6.32.23/scripts/mod/file2alias.c linux-2.6.32.23/scripts/mod/
56911 57052
56912 sprintf(alias, "dmi*"); 57053 sprintf(alias, "dmi*");
56913 57054
56914diff -urNp linux-2.6.32.23/scripts/mod/modpost.c linux-2.6.32.23/scripts/mod/modpost.c 57055diff -urNp linux-2.6.32.24/scripts/mod/modpost.c linux-2.6.32.24/scripts/mod/modpost.c
56915--- linux-2.6.32.23/scripts/mod/modpost.c 2010-08-13 16:24:37.000000000 -0400 57056--- linux-2.6.32.24/scripts/mod/modpost.c 2010-08-13 16:24:37.000000000 -0400
56916+++ linux-2.6.32.23/scripts/mod/modpost.c 2010-09-04 15:54:52.000000000 -0400 57057+++ linux-2.6.32.24/scripts/mod/modpost.c 2010-09-04 15:54:52.000000000 -0400
56917@@ -835,6 +835,7 @@ enum mismatch { 57058@@ -835,6 +835,7 @@ enum mismatch {
56918 INIT_TO_EXIT, 57059 INIT_TO_EXIT,
56919 EXIT_TO_INIT, 57060 EXIT_TO_INIT,
@@ -56981,9 +57122,9 @@ diff -urNp linux-2.6.32.23/scripts/mod/modpost.c linux-2.6.32.23/scripts/mod/mod
56981 goto close_write; 57122 goto close_write;
56982 57123
56983 tmp = NOFAIL(malloc(b->pos)); 57124 tmp = NOFAIL(malloc(b->pos));
56984diff -urNp linux-2.6.32.23/scripts/mod/modpost.h linux-2.6.32.23/scripts/mod/modpost.h 57125diff -urNp linux-2.6.32.24/scripts/mod/modpost.h linux-2.6.32.24/scripts/mod/modpost.h
56985--- linux-2.6.32.23/scripts/mod/modpost.h 2010-08-13 16:24:37.000000000 -0400 57126--- linux-2.6.32.24/scripts/mod/modpost.h 2010-08-13 16:24:37.000000000 -0400
56986+++ linux-2.6.32.23/scripts/mod/modpost.h 2010-09-04 15:54:52.000000000 -0400 57127+++ linux-2.6.32.24/scripts/mod/modpost.h 2010-09-04 15:54:52.000000000 -0400
56987@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e 57128@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
56988 57129
56989 struct buffer { 57130 struct buffer {
@@ -57003,9 +57144,9 @@ diff -urNp linux-2.6.32.23/scripts/mod/modpost.h linux-2.6.32.23/scripts/mod/mod
57003 57144
57004 struct module { 57145 struct module {
57005 struct module *next; 57146 struct module *next;
57006diff -urNp linux-2.6.32.23/scripts/mod/sumversion.c linux-2.6.32.23/scripts/mod/sumversion.c 57147diff -urNp linux-2.6.32.24/scripts/mod/sumversion.c linux-2.6.32.24/scripts/mod/sumversion.c
57007--- linux-2.6.32.23/scripts/mod/sumversion.c 2010-08-13 16:24:37.000000000 -0400 57148--- linux-2.6.32.24/scripts/mod/sumversion.c 2010-08-13 16:24:37.000000000 -0400
57008+++ linux-2.6.32.23/scripts/mod/sumversion.c 2010-09-04 15:54:52.000000000 -0400 57149+++ linux-2.6.32.24/scripts/mod/sumversion.c 2010-09-04 15:54:52.000000000 -0400
57009@@ -455,7 +455,7 @@ static void write_version(const char *fi 57150@@ -455,7 +455,7 @@ static void write_version(const char *fi
57010 goto out; 57151 goto out;
57011 } 57152 }
@@ -57015,9 +57156,9 @@ diff -urNp linux-2.6.32.23/scripts/mod/sumversion.c linux-2.6.32.23/scripts/mod/
57015 warn("writing sum in %s failed: %s\n", 57156 warn("writing sum in %s failed: %s\n",
57016 filename, strerror(errno)); 57157 filename, strerror(errno));
57017 goto out; 57158 goto out;
57018diff -urNp linux-2.6.32.23/scripts/pnmtologo.c linux-2.6.32.23/scripts/pnmtologo.c 57159diff -urNp linux-2.6.32.24/scripts/pnmtologo.c linux-2.6.32.24/scripts/pnmtologo.c
57019--- linux-2.6.32.23/scripts/pnmtologo.c 2010-08-13 16:24:37.000000000 -0400 57160--- linux-2.6.32.24/scripts/pnmtologo.c 2010-08-13 16:24:37.000000000 -0400
57020+++ linux-2.6.32.23/scripts/pnmtologo.c 2010-09-04 15:54:52.000000000 -0400 57161+++ linux-2.6.32.24/scripts/pnmtologo.c 2010-09-04 15:54:52.000000000 -0400
57021@@ -237,14 +237,14 @@ static void write_header(void) 57162@@ -237,14 +237,14 @@ static void write_header(void)
57022 fprintf(out, " * Linux logo %s\n", logoname); 57163 fprintf(out, " * Linux logo %s\n", logoname);
57023 fputs(" */\n\n", out); 57164 fputs(" */\n\n", out);
@@ -57044,9 +57185,9 @@ diff -urNp linux-2.6.32.23/scripts/pnmtologo.c linux-2.6.32.23/scripts/pnmtologo
57044 logoname); 57185 logoname);
57045 write_hex_cnt = 0; 57186 write_hex_cnt = 0;
57046 for (i = 0; i < logo_clutsize; i++) { 57187 for (i = 0; i < logo_clutsize; i++) {
57047diff -urNp linux-2.6.32.23/security/capability.c linux-2.6.32.23/security/capability.c 57188diff -urNp linux-2.6.32.24/security/capability.c linux-2.6.32.24/security/capability.c
57048--- linux-2.6.32.23/security/capability.c 2010-08-13 16:24:37.000000000 -0400 57189--- linux-2.6.32.24/security/capability.c 2010-08-13 16:24:37.000000000 -0400
57049+++ linux-2.6.32.23/security/capability.c 2010-09-14 23:49:20.000000000 -0400 57190+++ linux-2.6.32.24/security/capability.c 2010-09-14 23:49:20.000000000 -0400
57050@@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls 57191@@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls
57051 } 57192 }
57052 #endif /* CONFIG_AUDIT */ 57193 #endif /* CONFIG_AUDIT */
@@ -57056,9 +57197,9 @@ diff -urNp linux-2.6.32.23/security/capability.c linux-2.6.32.23/security/capabi
57056 .name = "default", 57197 .name = "default",
57057 }; 57198 };
57058 57199
57059diff -urNp linux-2.6.32.23/security/commoncap.c linux-2.6.32.23/security/commoncap.c 57200diff -urNp linux-2.6.32.24/security/commoncap.c linux-2.6.32.24/security/commoncap.c
57060--- linux-2.6.32.23/security/commoncap.c 2010-08-13 16:24:37.000000000 -0400 57201--- linux-2.6.32.24/security/commoncap.c 2010-08-13 16:24:37.000000000 -0400
57061+++ linux-2.6.32.23/security/commoncap.c 2010-09-04 15:54:52.000000000 -0400 57202+++ linux-2.6.32.24/security/commoncap.c 2010-09-04 15:54:52.000000000 -0400
57062@@ -27,7 +27,7 @@ 57203@@ -27,7 +27,7 @@
57063 #include <linux/sched.h> 57204 #include <linux/sched.h>
57064 #include <linux/prctl.h> 57205 #include <linux/prctl.h>
@@ -57081,9 +57222,9 @@ diff -urNp linux-2.6.32.23/security/commoncap.c linux-2.6.32.23/security/commonc
57081 return 0; 57222 return 0;
57082 } 57223 }
57083 57224
57084diff -urNp linux-2.6.32.23/security/integrity/ima/ima_api.c linux-2.6.32.23/security/integrity/ima/ima_api.c 57225diff -urNp linux-2.6.32.24/security/integrity/ima/ima_api.c linux-2.6.32.24/security/integrity/ima/ima_api.c
57085--- linux-2.6.32.23/security/integrity/ima/ima_api.c 2010-08-13 16:24:37.000000000 -0400 57226--- linux-2.6.32.24/security/integrity/ima/ima_api.c 2010-08-13 16:24:37.000000000 -0400
57086+++ linux-2.6.32.23/security/integrity/ima/ima_api.c 2010-09-04 15:54:52.000000000 -0400 57227+++ linux-2.6.32.24/security/integrity/ima/ima_api.c 2010-09-04 15:54:52.000000000 -0400
57087@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino 57228@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
57088 int result; 57229 int result;
57089 57230
@@ -57093,9 +57234,9 @@ diff -urNp linux-2.6.32.23/security/integrity/ima/ima_api.c linux-2.6.32.23/secu
57093 57234
57094 entry = kmalloc(sizeof(*entry), GFP_KERNEL); 57235 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
57095 if (!entry) { 57236 if (!entry) {
57096diff -urNp linux-2.6.32.23/security/integrity/ima/ima_fs.c linux-2.6.32.23/security/integrity/ima/ima_fs.c 57237diff -urNp linux-2.6.32.24/security/integrity/ima/ima_fs.c linux-2.6.32.24/security/integrity/ima/ima_fs.c
57097--- linux-2.6.32.23/security/integrity/ima/ima_fs.c 2010-08-13 16:24:37.000000000 -0400 57238--- linux-2.6.32.24/security/integrity/ima/ima_fs.c 2010-08-13 16:24:37.000000000 -0400
57098+++ linux-2.6.32.23/security/integrity/ima/ima_fs.c 2010-09-04 15:54:52.000000000 -0400 57239+++ linux-2.6.32.24/security/integrity/ima/ima_fs.c 2010-09-04 15:54:52.000000000 -0400
57099@@ -27,12 +27,12 @@ 57240@@ -27,12 +27,12 @@
57100 static int valid_policy = 1; 57241 static int valid_policy = 1;
57101 #define TMPBUFLEN 12 57242 #define TMPBUFLEN 12
@@ -57111,9 +57252,9 @@ diff -urNp linux-2.6.32.23/security/integrity/ima/ima_fs.c linux-2.6.32.23/secur
57111 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); 57252 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
57112 } 57253 }
57113 57254
57114diff -urNp linux-2.6.32.23/security/integrity/ima/ima.h linux-2.6.32.23/security/integrity/ima/ima.h 57255diff -urNp linux-2.6.32.24/security/integrity/ima/ima.h linux-2.6.32.24/security/integrity/ima/ima.h
57115--- linux-2.6.32.23/security/integrity/ima/ima.h 2010-08-13 16:24:37.000000000 -0400 57256--- linux-2.6.32.24/security/integrity/ima/ima.h 2010-08-13 16:24:37.000000000 -0400
57116+++ linux-2.6.32.23/security/integrity/ima/ima.h 2010-09-04 15:54:52.000000000 -0400 57257+++ linux-2.6.32.24/security/integrity/ima/ima.h 2010-09-04 15:54:52.000000000 -0400
57117@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino 57258@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
57118 extern spinlock_t ima_queue_lock; 57259 extern spinlock_t ima_queue_lock;
57119 57260
@@ -57125,9 +57266,9 @@ diff -urNp linux-2.6.32.23/security/integrity/ima/ima.h linux-2.6.32.23/security
57125 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; 57266 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
57126 }; 57267 };
57127 extern struct ima_h_table ima_htable; 57268 extern struct ima_h_table ima_htable;
57128diff -urNp linux-2.6.32.23/security/integrity/ima/ima_queue.c linux-2.6.32.23/security/integrity/ima/ima_queue.c 57269diff -urNp linux-2.6.32.24/security/integrity/ima/ima_queue.c linux-2.6.32.24/security/integrity/ima/ima_queue.c
57129--- linux-2.6.32.23/security/integrity/ima/ima_queue.c 2010-08-13 16:24:37.000000000 -0400 57270--- linux-2.6.32.24/security/integrity/ima/ima_queue.c 2010-08-13 16:24:37.000000000 -0400
57130+++ linux-2.6.32.23/security/integrity/ima/ima_queue.c 2010-09-04 15:54:52.000000000 -0400 57271+++ linux-2.6.32.24/security/integrity/ima/ima_queue.c 2010-09-04 15:54:52.000000000 -0400
57131@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i 57272@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
57132 INIT_LIST_HEAD(&qe->later); 57273 INIT_LIST_HEAD(&qe->later);
57133 list_add_tail_rcu(&qe->later, &ima_measurements); 57274 list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -57137,9 +57278,9 @@ diff -urNp linux-2.6.32.23/security/integrity/ima/ima_queue.c linux-2.6.32.23/se
57137 key = ima_hash_key(entry->digest); 57278 key = ima_hash_key(entry->digest);
57138 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); 57279 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
57139 return 0; 57280 return 0;
57140diff -urNp linux-2.6.32.23/security/Kconfig linux-2.6.32.23/security/Kconfig 57281diff -urNp linux-2.6.32.24/security/Kconfig linux-2.6.32.24/security/Kconfig
57141--- linux-2.6.32.23/security/Kconfig 2010-08-13 16:24:37.000000000 -0400 57282--- linux-2.6.32.24/security/Kconfig 2010-08-13 16:24:37.000000000 -0400
57142+++ linux-2.6.32.23/security/Kconfig 2010-09-17 17:39:35.000000000 -0400 57283+++ linux-2.6.32.24/security/Kconfig 2010-09-17 17:39:35.000000000 -0400
57143@@ -4,6 +4,505 @@ 57284@@ -4,6 +4,505 @@
57144 57285
57145 menu "Security options" 57286 menu "Security options"
@@ -57655,9 +57796,9 @@ diff -urNp linux-2.6.32.23/security/Kconfig linux-2.6.32.23/security/Kconfig
57655 help 57796 help
57656 This is the portion of low virtual memory which should be protected 57797 This is the portion of low virtual memory which should be protected
57657 from userspace allocation. Keeping a user from writing to low pages 57798 from userspace allocation. Keeping a user from writing to low pages
57658diff -urNp linux-2.6.32.23/security/min_addr.c linux-2.6.32.23/security/min_addr.c 57799diff -urNp linux-2.6.32.24/security/min_addr.c linux-2.6.32.24/security/min_addr.c
57659--- linux-2.6.32.23/security/min_addr.c 2010-08-13 16:24:37.000000000 -0400 57800--- linux-2.6.32.24/security/min_addr.c 2010-08-13 16:24:37.000000000 -0400
57660+++ linux-2.6.32.23/security/min_addr.c 2010-09-04 15:54:52.000000000 -0400 57801+++ linux-2.6.32.24/security/min_addr.c 2010-09-04 15:54:52.000000000 -0400
57661@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG 57802@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
57662 */ 57803 */
57663 static void update_mmap_min_addr(void) 57804 static void update_mmap_min_addr(void)
@@ -57674,9 +57815,9 @@ diff -urNp linux-2.6.32.23/security/min_addr.c linux-2.6.32.23/security/min_addr
57674 } 57815 }
57675 57816
57676 /* 57817 /*
57677diff -urNp linux-2.6.32.23/security/root_plug.c linux-2.6.32.23/security/root_plug.c 57818diff -urNp linux-2.6.32.24/security/root_plug.c linux-2.6.32.24/security/root_plug.c
57678--- linux-2.6.32.23/security/root_plug.c 2010-08-13 16:24:37.000000000 -0400 57819--- linux-2.6.32.24/security/root_plug.c 2010-08-13 16:24:37.000000000 -0400
57679+++ linux-2.6.32.23/security/root_plug.c 2010-09-14 23:33:54.000000000 -0400 57820+++ linux-2.6.32.24/security/root_plug.c 2010-09-14 23:33:54.000000000 -0400
57680@@ -70,7 +70,7 @@ static int rootplug_bprm_check_security 57821@@ -70,7 +70,7 @@ static int rootplug_bprm_check_security
57681 return 0; 57822 return 0;
57682 } 57823 }
@@ -57686,9 +57827,9 @@ diff -urNp linux-2.6.32.23/security/root_plug.c linux-2.6.32.23/security/root_pl
57686 .bprm_check_security = rootplug_bprm_check_security, 57827 .bprm_check_security = rootplug_bprm_check_security,
57687 }; 57828 };
57688 57829
57689diff -urNp linux-2.6.32.23/security/security.c linux-2.6.32.23/security/security.c 57830diff -urNp linux-2.6.32.24/security/security.c linux-2.6.32.24/security/security.c
57690--- linux-2.6.32.23/security/security.c 2010-08-13 16:24:37.000000000 -0400 57831--- linux-2.6.32.24/security/security.c 2010-08-13 16:24:37.000000000 -0400
57691+++ linux-2.6.32.23/security/security.c 2010-09-14 23:42:43.000000000 -0400 57832+++ linux-2.6.32.24/security/security.c 2010-09-28 18:16:26.000000000 -0400
57692@@ -24,7 +24,7 @@ static __initdata char chosen_lsm[SECURI 57833@@ -24,7 +24,7 @@ static __initdata char chosen_lsm[SECURI
57693 extern struct security_operations default_security_ops; 57834 extern struct security_operations default_security_ops;
57694 extern void security_fixup_ops(struct security_operations *ops); 57835 extern void security_fixup_ops(struct security_operations *ops);
@@ -57698,9 +57839,18 @@ diff -urNp linux-2.6.32.23/security/security.c linux-2.6.32.23/security/security
57698 57839
57699 static inline int verify(struct security_operations *ops) 57840 static inline int verify(struct security_operations *ops)
57700 { 57841 {
57701diff -urNp linux-2.6.32.23/security/selinux/hooks.c linux-2.6.32.23/security/selinux/hooks.c 57842@@ -106,7 +106,7 @@ int __init security_module_enable(struct
57702--- linux-2.6.32.23/security/selinux/hooks.c 2010-08-13 16:24:37.000000000 -0400 57843 * If there is already a security module registered with the kernel,
57703+++ linux-2.6.32.23/security/selinux/hooks.c 2010-09-14 23:36:11.000000000 -0400 57844 * an error will be returned. Otherwise %0 is returned on success.
57845 */
57846-int register_security(struct security_operations *ops)
57847+int __init register_security(struct security_operations *ops)
57848 {
57849 if (verify(ops)) {
57850 printk(KERN_DEBUG "%s could not verify "
57851diff -urNp linux-2.6.32.24/security/selinux/hooks.c linux-2.6.32.24/security/selinux/hooks.c
57852--- linux-2.6.32.24/security/selinux/hooks.c 2010-08-13 16:24:37.000000000 -0400
57853+++ linux-2.6.32.24/security/selinux/hooks.c 2010-09-14 23:36:11.000000000 -0400
57704@@ -131,7 +131,7 @@ int selinux_enabled = 1; 57854@@ -131,7 +131,7 @@ int selinux_enabled = 1;
57705 * Minimal support for a secondary security module, 57855 * Minimal support for a secondary security module,
57706 * just to allow the use of the capability module. 57856 * just to allow the use of the capability module.
@@ -57729,9 +57879,9 @@ diff -urNp linux-2.6.32.23/security/selinux/hooks.c linux-2.6.32.23/security/sel
57729 57879
57730 /* Unregister netfilter hooks. */ 57880 /* Unregister netfilter hooks. */
57731 selinux_nf_ip_exit(); 57881 selinux_nf_ip_exit();
57732diff -urNp linux-2.6.32.23/security/smack/smack_lsm.c linux-2.6.32.23/security/smack/smack_lsm.c 57882diff -urNp linux-2.6.32.24/security/smack/smack_lsm.c linux-2.6.32.24/security/smack/smack_lsm.c
57733--- linux-2.6.32.23/security/smack/smack_lsm.c 2010-08-13 16:24:37.000000000 -0400 57883--- linux-2.6.32.24/security/smack/smack_lsm.c 2010-08-13 16:24:37.000000000 -0400
57734+++ linux-2.6.32.23/security/smack/smack_lsm.c 2010-09-14 23:37:03.000000000 -0400 57884+++ linux-2.6.32.24/security/smack/smack_lsm.c 2010-09-14 23:37:03.000000000 -0400
57735@@ -3073,7 +3073,7 @@ static int smack_inode_getsecctx(struct 57885@@ -3073,7 +3073,7 @@ static int smack_inode_getsecctx(struct
57736 return 0; 57886 return 0;
57737 } 57887 }
@@ -57741,9 +57891,9 @@ diff -urNp linux-2.6.32.23/security/smack/smack_lsm.c linux-2.6.32.23/security/s
57741 .name = "smack", 57891 .name = "smack",
57742 57892
57743 .ptrace_access_check = smack_ptrace_access_check, 57893 .ptrace_access_check = smack_ptrace_access_check,
57744diff -urNp linux-2.6.32.23/security/tomoyo/tomoyo.c linux-2.6.32.23/security/tomoyo/tomoyo.c 57894diff -urNp linux-2.6.32.24/security/tomoyo/tomoyo.c linux-2.6.32.24/security/tomoyo/tomoyo.c
57745--- linux-2.6.32.23/security/tomoyo/tomoyo.c 2010-08-13 16:24:37.000000000 -0400 57895--- linux-2.6.32.24/security/tomoyo/tomoyo.c 2010-08-13 16:24:37.000000000 -0400
57746+++ linux-2.6.32.23/security/tomoyo/tomoyo.c 2010-09-14 23:32:36.000000000 -0400 57896+++ linux-2.6.32.24/security/tomoyo/tomoyo.c 2010-09-14 23:32:36.000000000 -0400
57747@@ -275,7 +275,7 @@ static int tomoyo_dentry_open(struct fil 57897@@ -275,7 +275,7 @@ static int tomoyo_dentry_open(struct fil
57748 * tomoyo_security_ops is a "struct security_operations" which is used for 57898 * tomoyo_security_ops is a "struct security_operations" which is used for
57749 * registering TOMOYO. 57899 * registering TOMOYO.
@@ -57753,9 +57903,9 @@ diff -urNp linux-2.6.32.23/security/tomoyo/tomoyo.c linux-2.6.32.23/security/tom
57753 .name = "tomoyo", 57903 .name = "tomoyo",
57754 .cred_alloc_blank = tomoyo_cred_alloc_blank, 57904 .cred_alloc_blank = tomoyo_cred_alloc_blank,
57755 .cred_prepare = tomoyo_cred_prepare, 57905 .cred_prepare = tomoyo_cred_prepare,
57756diff -urNp linux-2.6.32.23/sound/aoa/codecs/onyx.c linux-2.6.32.23/sound/aoa/codecs/onyx.c 57906diff -urNp linux-2.6.32.24/sound/aoa/codecs/onyx.c linux-2.6.32.24/sound/aoa/codecs/onyx.c
57757--- linux-2.6.32.23/sound/aoa/codecs/onyx.c 2010-08-13 16:24:37.000000000 -0400 57907--- linux-2.6.32.24/sound/aoa/codecs/onyx.c 2010-08-13 16:24:37.000000000 -0400
57758+++ linux-2.6.32.23/sound/aoa/codecs/onyx.c 2010-09-04 15:54:52.000000000 -0400 57908+++ linux-2.6.32.24/sound/aoa/codecs/onyx.c 2010-09-04 15:54:52.000000000 -0400
57759@@ -53,7 +53,7 @@ struct onyx { 57909@@ -53,7 +53,7 @@ struct onyx {
57760 spdif_locked:1, 57910 spdif_locked:1,
57761 analog_locked:1, 57911 analog_locked:1,
@@ -57784,9 +57934,9 @@ diff -urNp linux-2.6.32.23/sound/aoa/codecs/onyx.c linux-2.6.32.23/sound/aoa/cod
57784 onyx->spdif_locked = onyx->analog_locked = 0; 57934 onyx->spdif_locked = onyx->analog_locked = 0;
57785 mutex_unlock(&onyx->mutex); 57935 mutex_unlock(&onyx->mutex);
57786 57936
57787diff -urNp linux-2.6.32.23/sound/core/oss/pcm_oss.c linux-2.6.32.23/sound/core/oss/pcm_oss.c 57937diff -urNp linux-2.6.32.24/sound/core/oss/pcm_oss.c linux-2.6.32.24/sound/core/oss/pcm_oss.c
57788--- linux-2.6.32.23/sound/core/oss/pcm_oss.c 2010-08-13 16:24:37.000000000 -0400 57938--- linux-2.6.32.24/sound/core/oss/pcm_oss.c 2010-08-13 16:24:37.000000000 -0400
57789+++ linux-2.6.32.23/sound/core/oss/pcm_oss.c 2010-09-04 15:54:52.000000000 -0400 57939+++ linux-2.6.32.24/sound/core/oss/pcm_oss.c 2010-09-04 15:54:52.000000000 -0400
57790@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct 57940@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
57791 } 57941 }
57792 } 57942 }
@@ -57798,9 +57948,9 @@ diff -urNp linux-2.6.32.23/sound/core/oss/pcm_oss.c linux-2.6.32.23/sound/core/o
57798 #endif /* CONFIG_SND_VERBOSE_PROCFS */ 57948 #endif /* CONFIG_SND_VERBOSE_PROCFS */
57799 57949
57800 /* 57950 /*
57801diff -urNp linux-2.6.32.23/sound/core/seq/seq_lock.h linux-2.6.32.23/sound/core/seq/seq_lock.h 57951diff -urNp linux-2.6.32.24/sound/core/seq/seq_lock.h linux-2.6.32.24/sound/core/seq/seq_lock.h
57802--- linux-2.6.32.23/sound/core/seq/seq_lock.h 2010-08-13 16:24:37.000000000 -0400 57952--- linux-2.6.32.24/sound/core/seq/seq_lock.h 2010-08-13 16:24:37.000000000 -0400
57803+++ linux-2.6.32.23/sound/core/seq/seq_lock.h 2010-09-04 15:54:52.000000000 -0400 57953+++ linux-2.6.32.24/sound/core/seq/seq_lock.h 2010-09-04 15:54:52.000000000 -0400
57804@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo 57954@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
57805 #else /* SMP || CONFIG_SND_DEBUG */ 57955 #else /* SMP || CONFIG_SND_DEBUG */
57806 57956
@@ -57816,9 +57966,9 @@ diff -urNp linux-2.6.32.23/sound/core/seq/seq_lock.h linux-2.6.32.23/sound/core/
57816 57966
57817 #endif /* SMP || CONFIG_SND_DEBUG */ 57967 #endif /* SMP || CONFIG_SND_DEBUG */
57818 57968
57819diff -urNp linux-2.6.32.23/sound/drivers/mts64.c linux-2.6.32.23/sound/drivers/mts64.c 57969diff -urNp linux-2.6.32.24/sound/drivers/mts64.c linux-2.6.32.24/sound/drivers/mts64.c
57820--- linux-2.6.32.23/sound/drivers/mts64.c 2010-08-13 16:24:37.000000000 -0400 57970--- linux-2.6.32.24/sound/drivers/mts64.c 2010-08-13 16:24:37.000000000 -0400
57821+++ linux-2.6.32.23/sound/drivers/mts64.c 2010-09-04 15:54:52.000000000 -0400 57971+++ linux-2.6.32.24/sound/drivers/mts64.c 2010-09-04 15:54:52.000000000 -0400
57822@@ -65,7 +65,7 @@ struct mts64 { 57972@@ -65,7 +65,7 @@ struct mts64 {
57823 struct pardevice *pardev; 57973 struct pardevice *pardev;
57824 int pardev_claimed; 57974 int pardev_claimed;
@@ -57867,9 +58017,9 @@ diff -urNp linux-2.6.32.23/sound/drivers/mts64.c linux-2.6.32.23/sound/drivers/m
57867 58017
57868 return 0; 58018 return 0;
57869 } 58019 }
57870diff -urNp linux-2.6.32.23/sound/drivers/portman2x4.c linux-2.6.32.23/sound/drivers/portman2x4.c 58020diff -urNp linux-2.6.32.24/sound/drivers/portman2x4.c linux-2.6.32.24/sound/drivers/portman2x4.c
57871--- linux-2.6.32.23/sound/drivers/portman2x4.c 2010-08-13 16:24:37.000000000 -0400 58021--- linux-2.6.32.24/sound/drivers/portman2x4.c 2010-08-13 16:24:37.000000000 -0400
57872+++ linux-2.6.32.23/sound/drivers/portman2x4.c 2010-09-04 15:54:52.000000000 -0400 58022+++ linux-2.6.32.24/sound/drivers/portman2x4.c 2010-09-04 15:54:52.000000000 -0400
57873@@ -83,7 +83,7 @@ struct portman { 58023@@ -83,7 +83,7 @@ struct portman {
57874 struct pardevice *pardev; 58024 struct pardevice *pardev;
57875 int pardev_claimed; 58025 int pardev_claimed;
@@ -57879,9 +58029,9 @@ diff -urNp linux-2.6.32.23/sound/drivers/portman2x4.c linux-2.6.32.23/sound/driv
57879 int mode[PORTMAN_NUM_INPUT_PORTS]; 58029 int mode[PORTMAN_NUM_INPUT_PORTS];
57880 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; 58030 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
57881 }; 58031 };
57882diff -urNp linux-2.6.32.23/sound/oss/sb_audio.c linux-2.6.32.23/sound/oss/sb_audio.c 58032diff -urNp linux-2.6.32.24/sound/oss/sb_audio.c linux-2.6.32.24/sound/oss/sb_audio.c
57883--- linux-2.6.32.23/sound/oss/sb_audio.c 2010-08-13 16:24:37.000000000 -0400 58033--- linux-2.6.32.24/sound/oss/sb_audio.c 2010-08-13 16:24:37.000000000 -0400
57884+++ linux-2.6.32.23/sound/oss/sb_audio.c 2010-09-04 15:54:52.000000000 -0400 58034+++ linux-2.6.32.24/sound/oss/sb_audio.c 2010-09-04 15:54:52.000000000 -0400
57885@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, 58035@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
57886 buf16 = (signed short *)(localbuf + localoffs); 58036 buf16 = (signed short *)(localbuf + localoffs);
57887 while (c) 58037 while (c)
@@ -57891,9 +58041,9 @@ diff -urNp linux-2.6.32.23/sound/oss/sb_audio.c linux-2.6.32.23/sound/oss/sb_aud
57891 if (copy_from_user(lbuf8, 58041 if (copy_from_user(lbuf8,
57892 userbuf+useroffs + p, 58042 userbuf+useroffs + p,
57893 locallen)) 58043 locallen))
57894diff -urNp linux-2.6.32.23/sound/pci/ac97/ac97_codec.c linux-2.6.32.23/sound/pci/ac97/ac97_codec.c 58044diff -urNp linux-2.6.32.24/sound/pci/ac97/ac97_codec.c linux-2.6.32.24/sound/pci/ac97/ac97_codec.c
57895--- linux-2.6.32.23/sound/pci/ac97/ac97_codec.c 2010-08-13 16:24:37.000000000 -0400 58045--- linux-2.6.32.24/sound/pci/ac97/ac97_codec.c 2010-08-13 16:24:37.000000000 -0400
57896+++ linux-2.6.32.23/sound/pci/ac97/ac97_codec.c 2010-09-04 15:54:52.000000000 -0400 58046+++ linux-2.6.32.24/sound/pci/ac97/ac97_codec.c 2010-09-04 15:54:52.000000000 -0400
57897@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc 58047@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
57898 } 58048 }
57899 58049
@@ -57903,9 +58053,9 @@ diff -urNp linux-2.6.32.23/sound/pci/ac97/ac97_codec.c linux-2.6.32.23/sound/pci
57903 58053
57904 #ifdef CONFIG_SND_AC97_POWER_SAVE 58054 #ifdef CONFIG_SND_AC97_POWER_SAVE
57905 static void do_update_power(struct work_struct *work) 58055 static void do_update_power(struct work_struct *work)
57906diff -urNp linux-2.6.32.23/sound/pci/ac97/ac97_patch.c linux-2.6.32.23/sound/pci/ac97/ac97_patch.c 58056diff -urNp linux-2.6.32.24/sound/pci/ac97/ac97_patch.c linux-2.6.32.24/sound/pci/ac97/ac97_patch.c
57907--- linux-2.6.32.23/sound/pci/ac97/ac97_patch.c 2010-08-13 16:24:37.000000000 -0400 58057--- linux-2.6.32.24/sound/pci/ac97/ac97_patch.c 2010-08-13 16:24:37.000000000 -0400
57908+++ linux-2.6.32.23/sound/pci/ac97/ac97_patch.c 2010-09-04 15:54:52.000000000 -0400 58058+++ linux-2.6.32.24/sound/pci/ac97/ac97_patch.c 2010-09-04 15:54:52.000000000 -0400
57909@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd 58059@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
57910 return 0; 58060 return 0;
57911 } 58061 }
@@ -58212,9 +58362,9 @@ diff -urNp linux-2.6.32.23/sound/pci/ac97/ac97_patch.c linux-2.6.32.23/sound/pci
58212 .build_specific = patch_ucb1400_specific, 58362 .build_specific = patch_ucb1400_specific,
58213 }; 58363 };
58214 58364
58215diff -urNp linux-2.6.32.23/sound/pci/ens1370.c linux-2.6.32.23/sound/pci/ens1370.c 58365diff -urNp linux-2.6.32.24/sound/pci/ens1370.c linux-2.6.32.24/sound/pci/ens1370.c
58216--- linux-2.6.32.23/sound/pci/ens1370.c 2010-08-13 16:24:37.000000000 -0400 58366--- linux-2.6.32.24/sound/pci/ens1370.c 2010-08-13 16:24:37.000000000 -0400
58217+++ linux-2.6.32.23/sound/pci/ens1370.c 2010-09-04 15:54:52.000000000 -0400 58367+++ linux-2.6.32.24/sound/pci/ens1370.c 2010-09-04 15:54:52.000000000 -0400
58218@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci 58368@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
58219 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ 58369 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
58220 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ 58370 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
@@ -58224,9 +58374,9 @@ diff -urNp linux-2.6.32.23/sound/pci/ens1370.c linux-2.6.32.23/sound/pci/ens1370
58224 }; 58374 };
58225 58375
58226 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); 58376 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
58227diff -urNp linux-2.6.32.23/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.23/sound/pci/hda/patch_intelhdmi.c 58377diff -urNp linux-2.6.32.24/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.24/sound/pci/hda/patch_intelhdmi.c
58228--- linux-2.6.32.23/sound/pci/hda/patch_intelhdmi.c 2010-08-13 16:24:37.000000000 -0400 58378--- linux-2.6.32.24/sound/pci/hda/patch_intelhdmi.c 2010-08-13 16:24:37.000000000 -0400
58229+++ linux-2.6.32.23/sound/pci/hda/patch_intelhdmi.c 2010-09-04 15:54:52.000000000 -0400 58379+++ linux-2.6.32.24/sound/pci/hda/patch_intelhdmi.c 2010-09-04 15:54:52.000000000 -0400
58230@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str 58380@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
58231 cp_ready); 58381 cp_ready);
58232 58382
@@ -58242,9 +58392,9 @@ diff -urNp linux-2.6.32.23/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.23/sound
58242 } 58392 }
58243 58393
58244 58394
58245diff -urNp linux-2.6.32.23/sound/pci/intel8x0.c linux-2.6.32.23/sound/pci/intel8x0.c 58395diff -urNp linux-2.6.32.24/sound/pci/intel8x0.c linux-2.6.32.24/sound/pci/intel8x0.c
58246--- linux-2.6.32.23/sound/pci/intel8x0.c 2010-08-29 21:08:20.000000000 -0400 58396--- linux-2.6.32.24/sound/pci/intel8x0.c 2010-08-29 21:08:20.000000000 -0400
58247+++ linux-2.6.32.23/sound/pci/intel8x0.c 2010-09-04 15:54:52.000000000 -0400 58397+++ linux-2.6.32.24/sound/pci/intel8x0.c 2010-09-04 15:54:52.000000000 -0400
58248@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 58398@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
58249 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 58399 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
58250 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ 58400 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
@@ -58263,9 +58413,9 @@ diff -urNp linux-2.6.32.23/sound/pci/intel8x0.c linux-2.6.32.23/sound/pci/intel8
58263 }; 58413 };
58264 58414
58265 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, 58415 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
58266diff -urNp linux-2.6.32.23/sound/pci/intel8x0m.c linux-2.6.32.23/sound/pci/intel8x0m.c 58416diff -urNp linux-2.6.32.24/sound/pci/intel8x0m.c linux-2.6.32.24/sound/pci/intel8x0m.c
58267--- linux-2.6.32.23/sound/pci/intel8x0m.c 2010-08-13 16:24:37.000000000 -0400 58417--- linux-2.6.32.24/sound/pci/intel8x0m.c 2010-08-13 16:24:37.000000000 -0400
58268+++ linux-2.6.32.23/sound/pci/intel8x0m.c 2010-09-04 15:54:52.000000000 -0400 58418+++ linux-2.6.32.24/sound/pci/intel8x0m.c 2010-09-04 15:54:52.000000000 -0400
58269@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 58419@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
58270 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 58420 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
58271 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ 58421 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
@@ -58284,9 +58434,9 @@ diff -urNp linux-2.6.32.23/sound/pci/intel8x0m.c linux-2.6.32.23/sound/pci/intel
58284 }; 58434 };
58285 58435
58286 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, 58436 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
58287diff -urNp linux-2.6.32.23/usr/gen_init_cpio.c linux-2.6.32.23/usr/gen_init_cpio.c 58437diff -urNp linux-2.6.32.24/usr/gen_init_cpio.c linux-2.6.32.24/usr/gen_init_cpio.c
58288--- linux-2.6.32.23/usr/gen_init_cpio.c 2010-08-13 16:24:37.000000000 -0400 58438--- linux-2.6.32.24/usr/gen_init_cpio.c 2010-08-13 16:24:37.000000000 -0400
58289+++ linux-2.6.32.23/usr/gen_init_cpio.c 2010-09-04 15:54:52.000000000 -0400 58439+++ linux-2.6.32.24/usr/gen_init_cpio.c 2010-09-04 15:54:52.000000000 -0400
58290@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, 58440@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
58291 int retval; 58441 int retval;
58292 int rc = -1; 58442 int rc = -1;
@@ -58309,9 +58459,9 @@ diff -urNp linux-2.6.32.23/usr/gen_init_cpio.c linux-2.6.32.23/usr/gen_init_cpio
58309 } else 58459 } else
58310 break; 58460 break;
58311 } 58461 }
58312diff -urNp linux-2.6.32.23/virt/kvm/kvm_main.c linux-2.6.32.23/virt/kvm/kvm_main.c 58462diff -urNp linux-2.6.32.24/virt/kvm/kvm_main.c linux-2.6.32.24/virt/kvm/kvm_main.c
58313--- linux-2.6.32.23/virt/kvm/kvm_main.c 2010-08-13 16:24:37.000000000 -0400 58463--- linux-2.6.32.24/virt/kvm/kvm_main.c 2010-08-13 16:24:37.000000000 -0400
58314+++ linux-2.6.32.23/virt/kvm/kvm_main.c 2010-09-26 22:08:46.000000000 -0400 58464+++ linux-2.6.32.24/virt/kvm/kvm_main.c 2010-09-26 22:08:46.000000000 -0400
58315@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode 58465@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode
58316 return 0; 58466 return 0;
58317 } 58467 }
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index ec5f8db345..888818701c 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.16 3# Linux kernel version: 2.6.32.24
4# Thu Aug 12 15:19:19 2010 4# Tue Oct 5 09:05:07 2010
5# 5#
6# CONFIG_64BIT is not set 6# CONFIG_64BIT is not set
7CONFIG_X86_32=y 7CONFIG_X86_32=y
@@ -54,6 +54,7 @@ CONFIG_X86_HT=y
54CONFIG_X86_TRAMPOLINE=y 54CONFIG_X86_TRAMPOLINE=y
55CONFIG_X86_32_LAZY_GS=y 55CONFIG_X86_32_LAZY_GS=y
56CONFIG_KTIME_SCALAR=y 56CONFIG_KTIME_SCALAR=y
57CONFIG_ARCH_CPU_PROBE_RELEASE=y
57CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 58CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
58CONFIG_CONSTRUCTORS=y 59CONFIG_CONSTRUCTORS=y
59 60
@@ -506,7 +507,6 @@ CONFIG_HOTPLUG_PCI_SHPC=m
506CONFIG_BINFMT_ELF=y 507CONFIG_BINFMT_ELF=y
507# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 508# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
508CONFIG_HAVE_AOUT=y 509CONFIG_HAVE_AOUT=y
509CONFIG_BINFMT_AOUT=m
510CONFIG_BINFMT_MISC=m 510CONFIG_BINFMT_MISC=m
511CONFIG_HAVE_ATOMIC_IOMAP=y 511CONFIG_HAVE_ATOMIC_IOMAP=y
512CONFIG_NET=y 512CONFIG_NET=y
@@ -659,6 +659,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
659CONFIG_NETFILTER_XT_MATCH_DCCP=m 659CONFIG_NETFILTER_XT_MATCH_DCCP=m
660CONFIG_NETFILTER_XT_MATCH_DSCP=m 660CONFIG_NETFILTER_XT_MATCH_DSCP=m
661CONFIG_NETFILTER_XT_MATCH_ESP=m 661CONFIG_NETFILTER_XT_MATCH_ESP=m
662CONFIG_NETFILTER_XT_MATCH_GRADM=m
662CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 663CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
663CONFIG_NETFILTER_XT_MATCH_HELPER=m 664CONFIG_NETFILTER_XT_MATCH_HELPER=m
664CONFIG_NETFILTER_XT_MATCH_HL=m 665CONFIG_NETFILTER_XT_MATCH_HL=m
@@ -3055,6 +3056,8 @@ CONFIG_DVB_FIREDTV_INPUT=y
3055# CONFIG_DVB_FE_CUSTOMISE is not set 3056# CONFIG_DVB_FE_CUSTOMISE is not set
3056CONFIG_DVB_STB0899=m 3057CONFIG_DVB_STB0899=m
3057CONFIG_DVB_STB6100=m 3058CONFIG_DVB_STB6100=m
3059CONFIG_DVB_STV090x=m
3060CONFIG_DVB_STV6110x=m
3058CONFIG_DVB_CX24110=m 3061CONFIG_DVB_CX24110=m
3059CONFIG_DVB_CX24123=m 3062CONFIG_DVB_CX24123=m
3060CONFIG_DVB_MT312=m 3063CONFIG_DVB_MT312=m
@@ -3110,6 +3113,7 @@ CONFIG_DVB_TUNER_DIB0070=m
3110CONFIG_DVB_LNBP21=m 3113CONFIG_DVB_LNBP21=m
3111CONFIG_DVB_ISL6405=m 3114CONFIG_DVB_ISL6405=m
3112CONFIG_DVB_ISL6421=m 3115CONFIG_DVB_ISL6421=m
3116CONFIG_DVB_ISL6423=m
3113CONFIG_DVB_LGS8GXX=m 3117CONFIG_DVB_LGS8GXX=m
3114CONFIG_DAB=y 3118CONFIG_DAB=y
3115CONFIG_USB_DABUSB=m 3119CONFIG_USB_DABUSB=m
© 2015 Mike Crute